Merge pull request #4 from ZomgPonies/master

fg

Author: Midaychi

Diff for: baystation12.dme

@@ -249,6 +249,7 @@
 #include "code\game\gamemodes\mutiny\directives\research_to_ripleys_directive.dm"
 #include "code\game\gamemodes\mutiny\directives\tau_ceti_needs_women_directive.dm"
 #include "code\game\gamemodes\mutiny\directives\terminations_directive.dm"
+#include "code\game\gamemodes\mutiny\directives\vox_heist.dm"
 #include "code\game\gamemodes\nations\flag_pinpointer.dm"
 #include "code\game\gamemodes\nations\flagprocs.dm"
 #include "code\game\gamemodes\nations\nationdatums.dm"

Diff for: code/controllers/emergency_shuttle_controller.dm

@@ -63,7 +63,7 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
 
 //calls the shuttle for an emergency evacuation
 /datum/emergency_shuttle_controller/proc/call_evac()
-	if(!can_call()) return
+	if(!can_call()) return 0
 
 	//set the launch timer
 	autopilot = 1
@@ -80,6 +80,8 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
 		if(istype(A, /area/hallway))
 			A.readyalert()
 
+	return 1
+
 //calls the shuttle for a routine crew transfer
 /datum/emergency_shuttle_controller/proc/call_transfer()
 	if(!can_call()) return
@@ -134,8 +136,10 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
 	return 1
 
 /datum/emergency_shuttle_controller/proc/get_shuttle_prep_time()
-	// During mutiny rounds, the shuttle takes twice as long.
-	if(ticker && istype(ticker.mode,/datum/game_mode/mutiny))
+	// During mutiny rounds, the shuttle takes longer. Unless of course the directive is finished.
+	if(!ticker) return SHUTTLE_PREPTIME
+	var/datum/game_mode/mutiny/m = ticker.mode
+	if(istype(m) && !m.ead.activated)
 		return SHUTTLE_PREPTIME * 3		//15 minutes
 
 	return SHUTTLE_PREPTIME
@@ -261,4 +265,4 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
 		var/obj/effect/bgstar/S = new/obj/effect/bgstar(locate(x,y,z))
 		S.direction = spawndir
 		spawn()
-			S.startmove()
+			S.startmove()

Diff for: code/datums/mind.dm

@@ -1257,18 +1257,7 @@ datum/mind
 			brigged_since = -1
 			return 0
 
-		var/is_currently_brigged = 0
-
-		if(istype(T.loc,/area/security/brig))
-			is_currently_brigged = 1
-			for(var/obj/item/weapon/card/id/card in current)
-				is_currently_brigged = 0
-				break // if they still have ID they're not brigged
-			for(var/obj/item/device/pda/P in current)
-				if(P.id)
-					is_currently_brigged = 0
-					break // if they still have ID they're not brigged
-
+		var/is_currently_brigged = current.is_in_brig()
 		if(!is_currently_brigged)
 			brigged_since = -1
 			return 0
@@ -1278,9 +1267,6 @@ datum/mind
 
 		return (duration <= world.time - brigged_since)
 
-
-
-
 //Initialisation procs
 /mob/proc/mind_initialize()
 	if(mind)

Diff for: code/game/gamemodes/mutiny/directives/vox_heist.dm

@@ -0,0 +1,111 @@
+datum/directive/vox_heist
+  var/list/vox = list()
+  var/list/sympathizers = list()
+
+  proc/get_vox_candidates()
+    var/list/candidates[0]
+    for(var/mob/M in player_list)
+      if(M.is_ready() && is_vox(M))
+        candidates.Add(M)
+    return candidates
+
+  proc/get_sympathizer_candidates()
+    var/list/candidates[0]
+    for(var/mob/M in player_list)
+      if(M.is_ready() && !is_vox(M) && !M.is_mechanical() && M.mind.assigned_role != "Captain")
+        candidates[M] = get_weight(M)
+    return candidates
+
+  proc/is_vox(mob/M)
+    return M.get_species() == "Vox"
+
+  proc/get_weight(mob/M)
+    // You will have a high chance of being regarded as a vox sympathizer if your
+    // relationship with NanoTrasen is negative. Otherwise, command and security
+    // staff are pretty well trusted and maltreated alien races are easy suspects.
+    var/relation = M.client.prefs.nanotrasen_relation
+    if(relation == "Opposed")
+      return 8
+    if(relation == "Skeptical")
+      return 5
+    if(command_positions.Find(M.mind.assigned_role))
+      return 1
+    var/species = M.get_species()
+    if(species == "Tajaran" || species == "Unathi")
+      return 5
+    if(security_positions.Find(M.mind.assigned_role))
+      return 2
+    return 3
+
+datum/directive/vox_heist/get_description()
+  return {"
+    <p>
+      A vox warship has commandeered a NanoTrasen transport carrying 2,500 cubic meters of liquid plasma.
+      The raiders are willing to return the stolen cargo in exchange for the capture or execution of so-called "vox pariah" that are stationed aboard [station_name()].
+      If the transport is not recovered, the estimated loss of profits is a threat to the solvency of the company.
+      Predictive analysis has identified certain members of the crew as sympathetic to the vox pariah. Detain the sympathizers to guarantee a successful exchange.
+      Lethal force is authorized by the High Command Department of Security. Further information is classified.
+    </p>
+  "}
+
+datum/directive/vox_heist/initialize()
+  var/list/vox_candidates = get_vox_candidates()
+  for(var/mob/pariah in vox_candidates)
+    vox.Add(pariah.mind)
+
+  special_orders = list(
+    "Brig or kill all Vox Pariah.")
+
+  var/list/sympathizer_candidates = get_sympathizer_candidates()
+  var/list/sympathizer_names = list()
+  var/sympathizer_count = min(rand(2,4), sympathizer_candidates.len)
+  for(var/i=0, i < sympathizer_count, i++)
+    if(!sympathizer_candidates.len)
+      break
+
+    var/mob/candidate = pickweight(sympathizer_candidates)
+    sympathizer_candidates.Remove(candidate)
+    sympathizers.Add(candidate.mind)
+    sympathizer_names.Add("[candidate.mind.assigned_role] [candidate.mind.name]")
+
+  if(sympathizers.len)
+    special_orders.Add("Brig the following sympathizers: [list2text(sympathizer_names, ", ")]")
+
+datum/directive/vox_heist/meets_prerequisites()
+  var/list/candidates = get_vox_candidates()
+  return candidates.len >= 2
+
+datum/directive/vox_heist/directives_complete()
+  if(!vox.len && !sympathizers.len)
+    return 1
+
+  for(var/datum/mind/pariah in vox)
+    if(!pariah.current.is_in_brig())
+      return 0
+
+  for(var/datum/mind/sympathizer in sympathizers)
+    if(!sympathizer.current.is_in_brig())
+      return 0
+
+  return 1
+
+datum/directive/vox_heist/get_remaining_orders()
+  var/text = ""
+  for(var/datum/mind/pariah in vox)
+    if(!pariah.current.is_in_brig())
+      text += "<li>Brig or Kill [pariah]</li>"
+  for(var/datum/mind/sympathizer in sympathizers)
+    if(!sympathizer.current.is_in_brig())
+      text += "<li>Brig [sympathizer]</li>"
+  return text
+
+/hook/death/proc/vox_or_sympathizer_killed(mob/living/carbon/human/deceased, gibbed)
+  var/datum/directive/vox_heist/D = get_directive("vox_heist")
+  if(!D) return 1
+
+  var/datum/mind/M = deceased.mind
+  if(M in D.vox)
+    D.vox.Remove(M)
+  if(M in D.sympathizers)
+    D.sympathizers.Remove(M)
+  return 1

Diff for: code/game/gamemodes/mutiny/emergency_authentication_device.dm

@@ -37,6 +37,13 @@
 		else
 			return "Inactive"
 
+	proc/launch_shuttle()
+		spawn(rand(5 SECONDS, 45 SECONDS))
+			if(emergency_shuttle.call_evac())
+				spawn(20 SECONDS)
+					var/text = "[station_name()], we have confirmed your completion of Directive X. An evacuation shuttle is en route to receive your crew for debriefing."
+					command_alert(text, "Emergency Transmission")
+
 /obj/machinery/emergency_authentication_device/attack_hand(mob/user)
 	if(activated)
 		user << "\blue \The [src] is already active!"
@@ -51,6 +58,7 @@
 		activated = 1
 		user << "\blue You activate \the [src]!"
 		state("Command acknowledged. Initiating quantum entanglement relay to NanoTrasen High Command.")
+		launch_shuttle()
 		return
 
 	if(!captains_key && !secondary_key)

Diff for: code/game/gamemodes/mutiny/mutiny.dm

@@ -193,7 +193,7 @@ datum/game_mode/mutiny
 
 	proc/unbolt_vault_door()
 		var/obj/machinery/door/airlock/vault = locate(/obj/machinery/door/airlock/vault)
-		vault.lock()
+		vault.unlock(1)
 
 	proc/make_secret_transcript()
 		var/obj/machinery/computer/telecomms/server/S = locate(/obj/machinery/computer/telecomms/server)

Diff for: code/game/jobs/job/supervisor.dm

@@ -284,6 +284,7 @@
 	access = list(access_lawyer, access_court, access_sec_doors, access_maint_tunnels)
 	minimal_access = list(access_lawyer, access_court, access_sec_doors, access_maint_tunnels)
 	alt_titles = list("Lawyer","Public Defender")
+	minimal_player_age = 21
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0

Diff for: code/game/jobs/job/support.dm

@@ -182,7 +182,7 @@
 		H.equip_or_collect(new /obj/item/clothing/under/rank/miner(H), slot_w_uniform)
 		H.equip_or_collect(new /obj/item/device/pda/shaftminer(H), slot_wear_pda)
 		H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes)
-		H.equip_or_collect(new /obj/item/weapon/pickaxe/drill(H), slot_r_hand)
+		H.equip_or_collect(new /obj/item/weapon/pickaxe/drill(H), slot_belt)
 //		H.equip_or_collect(new /obj/item/clothing/gloves/black(H), slot_gloves)
 		if(H.backbag == 1)
 			H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand)

Diff for: code/game/machinery/kitchen/smartfridge.dm

@@ -96,7 +96,7 @@
 
 			nanomanager.update_uis(src)
 
-	else if(istype(O, /obj/item/weapon/storage/bag/plants))
+	else if(istype(O, /obj/item/weapon/storage/bag/plants) || istype(O, /obj/item/weapon/storage/belt/medical))
 		var/obj/item/weapon/storage/bag/plants/P = O
 		var/plants_loaded = 0
 		for(var/obj/G in P.contents)
@@ -121,6 +121,7 @@
 
 		nanomanager.update_uis(src)
 
+
 	else
 		user << "<span class='notice'>\The [src] smartly refuses [O].</span>"
 		return 1
@@ -138,6 +139,39 @@
 
 	ui_interact(user)
 
+//Drag pill bottle to fridge to empty it into the fridge
+/obj/machinery/smartfridge/MouseDrop_T(obj/over_object as obj, mob/user as mob)
+	if(!istype(over_object, /obj/item/weapon/storage/pill_bottle)) //Only pill bottles, please
+		return
+
+	if(!src.ispowered)
+		user << "<span class='notice'>\The [src] is unpowered and useless.</span>"
+		return
+
+	var/obj/item/weapon/storage/box/pillbottles/P = over_object
+	var/items_loaded = 0
+	for(var/obj/G in P.contents)
+		if(accept_check(G))
+			if(contents.len >= max_n_of_items)
+				user << "<span class='notice'>\The [src] is full.</span>"
+				return 1
+			else
+				P.remove_from_storage(G,src)
+				if(item_quants[G.name])
+					item_quants[G.name]++
+				else
+					item_quants[G.name] = 1
+				items_loaded++
+	if(items_loaded)
+		user.visible_message( \
+		"<span class='notice'>[user] empties \the [P] into \the [src].</span>", \
+		"<span class='notice'>You empty \the [P] into \the [src].</span>")
+	if(P.contents.len > 0)
+		user << "<span class='notice'>Some items are refused.</span>"
+	nanomanager.update_uis(src)
+	updateUsrDialog()
+
+
 /*******************
 *   SmartFridge Menu
 ********************/
@@ -201,5 +235,3 @@
 	return 0
 
 
-
-

Diff for: code/game/objects/items/blueprints.dm

@@ -121,7 +121,7 @@ move an amendment</a> to the drawing.</p>
 		return
 	var/area/A = new
 	A.name = str
-	A.tag="[A.type]_[md5(str)]" // without this dynamic light system ruin everithing
+	A.tagbase="[A.type]_[md5(str)]" // without this dynamic light system ruins everything
 	//var/ma
 	//ma = A.master ? "[A.master]" : "(null)"
 	//world << "DEBUG: create_area: <br>A.name=[A.name]<br>A.tag=[A.tag]<br>A.master=[ma]"

Diff for: code/game/objects/items/weapons/storage/belt.dm

@@ -72,6 +72,7 @@
 
 
 /obj/item/weapon/storage/belt/medical
+	use_to_pickup = 1 //Allow medical belt to pick up medicine
 	name = "medical belt"
 	desc = "Can hold various medical equipment."
 	icon_state = "medicalbelt"

Diff for: code/game/objects/structures/crates_lockers/closets/fireaxe.dm

@@ -25,10 +25,10 @@
 			if(istype(O, /obj/item/device/multitool))
 				user << "\red Resetting circuitry..."
 				playsound(user, 'sound/machines/lockreset.ogg', 50, 1)
-				sleep(50) // Sleeping time~
-				src.locked = 0
-				user << "\blue You disable the locking modules."
-				update_icon()
+				if(do_after(user, 20))
+					src.locked = 0
+					user << "<span class = 'caution'> You disable the locking modules.</span>"
+					update_icon()
 				return
 			else if(istype(O, /obj/item/weapon))
 				var/obj/item/weapon/W = O
@@ -87,6 +87,9 @@
 					src.locked = 1
 					user << "\blue You re-enable the locking modules."
 					playsound(user, 'sound/machines/lockenable.ogg', 50, 1)
+					if(do_after(user,20))
+						src.locked = 1
+						user << "<span class = 'caution'> You re-enable the locking modules.</span>"
 					return
 			else
 				localopened = !localopened

Diff for: code/game/turfs/simulated/walls.dm

@@ -496,16 +496,20 @@
 					"[user] drills a hole in \the [src] and pushes \a [P] into the void", \
 					"\blue You have finished drilling in \the [src] and push the [P] into the void.", \
 					"You hear ratchet.")
-				/*
-				new /obj/item/pipe(loc, make_from=src)
-				for (var/obj/machinery/meter/meter in T)
-					if (meter.target == src)
-						new /obj/item/pipe_meter(T)
-						del(meter)
-				qdel(src)
-				*/
+
 				user.drop_item()
-				P.dir = user.dir
+				if (P.pipe_type in list (1,3,12))  // bent pipe rotation fix see construction.dm
+					P.dir = 5
+					if (user.dir == 1)
+						P.dir = 6
+					if (user.dir == 2)
+						P.dir = 9
+					if (user.dir == 4)
+						P.dir = 10
+					if (user.dir == 5)
+						P.dir = 8
+				else
+					P.dir = user.dir
 				P.x = src.x
 				P.y = src.y
 				P.z = src.z