Merge pull request #2566 from Citadel-Station-13/upstream-merge-30117

[MIRROR] Crew monitoring rework part 1: crew pinpointers
2017-09-11 22:41:24 -05:00
parent a2ead1b017 bf5094cf19
commit 1d19ee6bbf
30 changed files with 493 additions and 158 deletions
@@ -50,8 +50,8 @@ GLOBAL_VAR_INIT(highlander, FALSE)
 	equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(src), slot_ears)
 	equip_to_slot_or_del(new /obj/item/clothing/head/beret/highlander(src), slot_head)
 	equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(src), slot_shoes)
-	equip_to_slot_or_del(new /obj/item/pinpointer(src), slot_l_store)
-	for(var/obj/item/pinpointer/P in src)
+	equip_to_slot_or_del(new /obj/item/pinpointer/nuke(src), slot_l_store)
+	for(var/obj/item/pinpointer/nuke/P in src)
 		P.attack_self(src)
 	var/obj/item/card/id/W = new(src)
 	W.icon_state = "centcom"
@@ -33,6 +33,7 @@ Chief Medical Officer

 	id = /obj/item/card/id/silver
 	belt = /obj/item/device/pda/heads/cmo
+	l_pocket = /obj/item/pinpointer/crew
 	ears = /obj/item/device/radio/headset/heads/cmo
 	uniform = /obj/item/clothing/under/rank/chief_medical_officer
 	shoes = /obj/item/clothing/shoes/sneakers/brown
@@ -35,9 +35,9 @@
 	if(nuking)
 		set_security_level("red")
 		nuking = FALSE
-		for(var/obj/item/pinpointer/P in GLOB.pinpointer_list)
+		for(var/obj/item/pinpointer/nuke/P in GLOB.pinpointer_list)
 			P.switch_mode_to(TRACK_NUKE_DISK) //Party's over, back to work, everyone
-			P.nuke_warning = FALSE
+			P.alert = FALSE

 	if(doomsday_device)
 		doomsday_device.timing = FALSE
@@ -0,0 +1,13 @@
+diff a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm	(rejected hunks)
+@@ -35,9 +35,9 @@
+ 	if(nuking)
+ 		set_security_level("red")
+ 		nuking = FALSE
+-		for(var/obj/item/weapon/pinpointer/P in GLOB.pinpointer_list)
+		for(var/obj/item/weapon/pinpointer/nuke/P in GLOB.pinpointer_list)
+ 			P.switch_mode_to(TRACK_NUKE_DISK) //Party's over, back to work, everyone
+-			P.nuke_warning = FALSE
+			P.alert = FALSE
+ 
+ 	if(doomsday_device)
+ 		doomsday_device.timing = FALSE
@@ -599,7 +599,7 @@
 		/obj/item/gun/ballistic/revolver/grenadelauncher/cyborg,
 		/obj/item/card/emag,
 		/obj/item/crowbar/cyborg,
-		/obj/item/pinpointer/syndicate/cyborg)
+		/obj/item/pinpointer/syndicate_cyborg)

 	ratvar_modules = list(
 		/obj/item/clockwork/slab/cyborg/security,
@@ -625,7 +625,7 @@
 		/obj/item/roller/robo,
 		/obj/item/card/emag,
 		/obj/item/crowbar/cyborg,
-		/obj/item/pinpointer/syndicate/cyborg,
+		/obj/item/pinpointer/syndicate_cyborg,
 		/obj/item/stack/medical/gauze/cyborg,
 		/obj/item/gun/medbeam)
 	ratvar_modules = list(
@@ -0,0 +1,19 @@
+diff a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm	(rejected hunks)
+@@ -519,7 +519,7 @@
+ 		/obj/item/weapon/gun/ballistic/revolver/grenadelauncher/cyborg,
+ 		/obj/item/weapon/card/emag,
+ 		/obj/item/weapon/crowbar/cyborg,
+-		/obj/item/weapon/pinpointer/syndicate/cyborg)
+		/obj/item/weapon/pinpointer/syndicate_cyborg)
+ 
+ 	ratvar_modules = list(
+ 		/obj/item/clockwork/slab/cyborg/security,
+@@ -545,7 +545,7 @@
+ 		/obj/item/roller/robo,
+ 		/obj/item/weapon/card/emag,
+ 		/obj/item/weapon/crowbar/cyborg,
+-		/obj/item/weapon/pinpointer/syndicate/cyborg,
+		/obj/item/weapon/pinpointer/syndicate_cyborg,
+ 		/obj/item/stack/medical/gauze/cyborg,
+ 		/obj/item/weapon/gun/medbeam)
+ 	ratvar_modules = list(
@@ -874,9 +874,9 @@
 			occupier.loc = src.loc
 			occupier.death()
 			occupier.gib()
-			for(var/obj/item/pinpointer/P in GLOB.pinpointer_list)
+			for(var/obj/item/pinpointer/nuke/P in GLOB.pinpointer_list)
 				P.switch_mode_to(TRACK_NUKE_DISK) //Pinpointers go back to tracking the nuke disk
-				P.nuke_warning = FALSE
+				P.alert = FALSE

 /obj/machinery/power/apc/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card)
 	if(card.AI)
@@ -0,0 +1,13 @@
+diff a/code/modules/power/apc.dm b/code/modules/power/apc.dm	(rejected hunks)
+@@ -867,9 +867,9 @@
+ 			occupier.loc = src.loc
+ 			occupier.death()
+ 			occupier.gib()
+-			for(var/obj/item/weapon/pinpointer/P in GLOB.pinpointer_list)
+			for(var/obj/item/weapon/pinpointer/nuke/P in GLOB.pinpointer_list)
+ 				P.switch_mode_to(TRACK_NUKE_DISK) //Pinpointers go back to tracking the nuke disk
+-				P.nuke_warning = FALSE
+				P.alert = FALSE
+ 
+ /obj/machinery/power/apc/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card)
+ 	if(card.AI)