cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix stealth box and chameleon projector escaping lockers (#40073)

Browse Source
This commit is contained in:
Tad Hardesty
2018-09-04 12:27:39 -07:00
committed by yogstation13-bot
parent c81405abd4
commit 6e71db8818
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/datums/action.dm
View File

@@ -502,14 +502,14 @@
/datum/action/item_action/agent_box/Trigger()
if(!..())
return FALSE
if(!box)
if(!QDELETED(box))
if(cooldown < world.time - 100)
box = new(get_turf(owner))
box = new(owner.drop_location())
owner.forceMove(box)
cooldown = world.time
owner.playsound_local(box, 'sound/misc/box_deploy.ogg', 50, TRUE)
else
owner.forceMove(get_turf(box))
owner.forceMove(box.drop_location())
owner.playsound_local(box, 'sound/misc/box_deploy.ogg', 50, TRUE)
QDEL_NULL(box)