From ca07f531bb3dc9654a41489c55fd5298be80930f Mon Sep 17 00:00:00 2001 From: blah Date: Thu, 11 Aug 2016 14:29:14 +0100 Subject: [PATCH] Fixes the gulag teleporter and removes two /var in proc decelerations --- code/game/area/areas.dm | 4 +--- code/game/gamemodes/antag_hud.dm | 2 +- code/game/machinery/gulag_teleporter.dm | 8 +++++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 5032ea6ec26..fbdc4be4e8a 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -5,7 +5,7 @@ // the same logical /area have the parent /area object... well, you would be mistaken. If you // want to find machines, mobs, etc, in the same logical area, you will need to check all the // related areas. This returns a master contents list to assist in that. -/proc/area_contents(var/area/A) +/proc/area_contents(area/A) if(!istype(A)) return null var/list/contents = list() for(var/area/LSA in A.related) @@ -48,8 +48,6 @@ blend_mode = BLEND_MULTIPLY // Putting this in the constructor so that it stops the icons being screwed up in the map editor. - - /area/proc/poweralert(state, obj/source) if (state != poweralm) poweralm = state diff --git a/code/game/gamemodes/antag_hud.dm b/code/game/gamemodes/antag_hud.dm index 3592fbc4e00..b2863c4777f 100644 --- a/code/game/gamemodes/antag_hud.dm +++ b/code/game/gamemodes/antag_hud.dm @@ -41,7 +41,7 @@ //MIND PROCS //these are called by mind.transfer_to() -/datum/mind/proc/transfer_antag_huds(var/datum/atom_hud/antag/newhud) +/datum/mind/proc/transfer_antag_huds(datum/atom_hud/antag/newhud) leave_all_huds() ticker.mode.set_antag_hud(current, antag_hud_icon_state) if(newhud) diff --git a/code/game/machinery/gulag_teleporter.dm b/code/game/machinery/gulag_teleporter.dm index 8a1ae3a9378..d918604e6d8 100644 --- a/code/game/machinery/gulag_teleporter.dm +++ b/code/game/machinery/gulag_teleporter.dm @@ -132,7 +132,13 @@ The console is located at computer/gulag_teleporter.dm if(istype(W, /obj/item/weapon/restraints/handcuffs)) W.forceMove(get_turf(src)) continue - if(istype(W, /obj/item/weapon/implant/storage)) + if(istype(W, /obj/item/weapon/implant)) + continue + if(istype(W, /obj/item/clothing/suit/space/eva/plasmaman)) + continue + if(istype(W, /obj/item/clothing/head/helmet/space/plasmaman)) + continue + if(istype(W, /obj/item/weapon/tank/internals/plasmaman)) continue if(linked_reclaimer) linked_reclaimer.stored_items[occupant] += W