mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 16:47:13 +01:00
Fixes the gulag teleporter and removes two /var in proc decelerations
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user