From 8d323f1b060c39eddee0fe879305052aa3f4a12e Mon Sep 17 00:00:00 2001 From: NanakoAC Date: Wed, 22 Mar 2017 18:15:53 +0000 Subject: [PATCH] fixed pylon things (#1966) Fix for GC/destroy issues with pylons, as discussed in discord --- code/game/gamemodes/cult/cult_structures.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index a8ab73d5b1d..30248c812a2 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -44,6 +44,8 @@ Exosuits Explosives Ablative armour + Smoke grenades + Close the damn firelocks so they can't see you */ /obj/structure/cult/pylon @@ -100,7 +102,7 @@ /obj/structure/cult/pylon/Destroy() processing_objects.Remove(src) - ..() + return ..() //Another subtype which starts with infinite empower shots. For empowered adminbus /obj/structure/cult/pylon/turret/empowered @@ -391,6 +393,7 @@ A.ignore = sacrificer A.launch(target) next_shot = world.time + shot_delay + A = null //So projectiles can GC spawn(shot_delay+1) handle_firing()