From c6c33803aabbc973d8f128b566ccc5ff78f2129f Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Wed, 14 Dec 2016 20:11:02 -0500 Subject: [PATCH] fox box airlock --- code/game/gamemodes/nuclear/nuclearbomb.dm | 1 + code/game/machinery/doors/airlock.dm | 1 + code/modules/shuttle/shuttle_manipulator.dm | 3 --- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index c5ec4ef7c47..1ac6b6b491c 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -413,6 +413,7 @@ var/bomb_set if(force) message_admins("[src] has been !!force deleted!! in ([diskturf ? "[diskturf.x], [diskturf.y] ,[diskturf.z] - JMP":"nonexistent location"]).") log_game("[src] has been !!force deleted!! in ([diskturf ? "[diskturf.x], [diskturf.y] ,[diskturf.z]":"nonexistent location"]).") + processing_objects.Remove(src) return ..() if(blobstart.len > 0) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index dd04e1a4c29..c8c261a2787 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1131,6 +1131,7 @@ About the new airlock wires panel: M << pick(sound('sound/hallucinations/turn_around1.ogg',0,1,50), sound('sound/hallucinations/turn_around2.ogg',0,1,50)) M.Weaken(2) M.throw_at(throwtarget, 5, 1,src) + spawn(0) return 0 /obj/machinery/door/airlock/cult/narsie_act() diff --git a/code/modules/shuttle/shuttle_manipulator.dm b/code/modules/shuttle/shuttle_manipulator.dm index fb068c58536..0c9495f7359 100644 --- a/code/modules/shuttle/shuttle_manipulator.dm +++ b/code/modules/shuttle/shuttle_manipulator.dm @@ -35,9 +35,6 @@ overlays += hologram_projection overlays += hologram_ship -/obj/machinery/shuttle_manipulator/process() - return - /obj/machinery/shuttle_manipulator/attack_ghost(user as mob) attack_hand(user)