From 6fe50ae62930796c3b321d218dd08ec6d8356f0c Mon Sep 17 00:00:00 2001 From: Kyep Date: Wed, 22 Aug 2018 13:52:32 -0700 Subject: [PATCH] Fixes external turrets being unlinked from AI --- code/game/machinery/portable_turret.dm | 3 +-- code/game/objects/structures/depot.dm | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index a148a3c40f5..9d44ac09231 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -1013,15 +1013,14 @@ var/list/turret_icons check_anomalies = 1 check_synth = 1 ailock = 1 + var/area/syndicate_depot/core/depotarea /obj/machinery/porta_turret/syndicate/die() . = ..() - var/area/syndicate_depot/core/depotarea = areaMaster if(istype(depotarea)) depotarea.turret_died() /obj/machinery/porta_turret/syndicate/shootAt(mob/living/target) - var/area/syndicate_depot/core/depotarea = areaMaster if(istype(depotarea)) depotarea.list_add(target, depotarea.hostile_list) depotarea.declare_started() diff --git a/code/game/objects/structures/depot.dm b/code/game/objects/structures/depot.dm index 0d048467c3a..061a8647d47 100644 --- a/code/game/objects/structures/depot.dm +++ b/code/game/objects/structures/depot.dm @@ -12,8 +12,12 @@ /obj/structure/fusionreactor/Initialize() . = ..() depotarea = areaMaster - if(depotarea) + if(istype(depotarea)) depotarea.reactor = src + spawn(50) // Necessary since random spawners may take a second to spawn turrets in depot. + for(var/obj/machinery/porta_turret/syndicate/T in range(50, loc)) + if(!istype(T.depotarea)) + T.depotarea = depotarea /obj/structure/fusionreactor/Destroy() if(istype(depotarea))