From f922fc94f671f41a32eca6230c0e8ea8728d4cfd Mon Sep 17 00:00:00 2001 From: Shadowlight213 Date: Mon, 11 Jan 2016 17:55:16 -0800 Subject: [PATCH] Makes the pinpointer actually track the nuking AI --- code/game/gamemodes/malfunction/Malf_Modules.dm | 4 ++++ code/modules/mob/living/silicon/ai/death.dm | 2 ++ code/modules/power/apc.dm | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 6b1041d2d2e..7a2dfd0d184 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -43,6 +43,10 @@ var/obj/machinery/doomsday_device/DOOM = new /obj/machinery/doomsday_device(src) doomsday_device = DOOM verbs -= /mob/living/silicon/ai/proc/nuke_station + for(var/obj/item/weapon/pinpointer/point in world) + for(var/mob/living/silicon/ai/A in living_mob_list) + if((A.stat != DEAD) && A.nuking) + point.the_disk = A //The pinpointer now tracks the AI core /obj/machinery/doomsday_device icon = 'icons/obj/machines/nuke_terminal.dmi' diff --git a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm index 9268598c985..81b91979ea5 100644 --- a/code/modules/mob/living/silicon/ai/death.dm +++ b/code/modules/mob/living/silicon/ai/death.dm @@ -31,6 +31,8 @@ SSshuttle.emergency.mode = SHUTTLE_DOCKED SSshuttle.emergency.timer = world.time priority_announce("Hostile enviroment resolved. You have 3 minutes to board the Emergency Shuttle.", null, 'sound/AI/shuttledock.ogg', "Priority") + for(var/obj/item/weapon/pinpointer/point in world) + point.the_disk = null //Point back to the disk. if(doomsday_device) doomsday_device.timing = 0 diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 6537afd8f53..4a27c1eda3a 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -851,7 +851,7 @@ qdel(malf) src.occupier.verbs += /mob/living/silicon/ai/proc/corereturn src.occupier.cancel_camera() - if (seclevel2num(get_security_level()) == SEC_LEVEL_DELTA) + if ((seclevel2num(get_security_level()) == SEC_LEVEL_DELTA) && malf.nuking) for(var/obj/item/weapon/pinpointer/point in world) point.the_disk = src //the pinpointer will detect the shunted AI @@ -868,7 +868,7 @@ if (seclevel2num(get_security_level()) == SEC_LEVEL_DELTA) for(var/obj/item/weapon/pinpointer/point in world) for(var/mob/living/silicon/ai/A in living_mob_list) - if(A.stat != DEAD) + if((A.stat != DEAD) && A.nuking) point.the_disk = A //The pinpointer tracks the AI back into its core. else