Merge branch 'master' into upstream-merge-30297

2017-09-12 23:36:35 -05:00
parent 9e73d297cc 23e40446ae
commit cd0997aa1e
297 changed files with 11347 additions and 8518 deletions
@@ -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)
@@ -170,6 +170,7 @@ By design, d1 is the smallest direction and d2 is the highest
 		return 0

 /obj/structure/cable/singularity_pull(S, current_size)
+	..()
 	if(current_size >= STAGE_FIVE)
 		deconstruct()