cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8858 from GinjaNinja32/patch-1b

Browse Source 
Fix cryopod moving robots to nullspace instead of deleting
This commit is contained in:
Zuhayr
2015-04-16 14:47:36 +09:30
parent 2ed2f82230 54044859bf
commit 7667fff30c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/machinery/cryopod.dm
View File

@@ -315,7 +315,7 @@
O.loc = src O.loc = src
//Delete all items not on the preservation list. //Delete all items not on the preservation list.
var/list/items = src.contents var/list/items = src.contents.Copy()
items -= occupant // Don't delete the occupant items -= occupant // Don't delete the occupant
items -= announce // or the autosay radio. items -= announce // or the autosay radio.
@@ -398,9 +398,9 @@
announce.autosay("[occupant.real_name] [on_store_message]", "[on_store_name]") announce.autosay("[occupant.real_name] [on_store_message]", "[on_store_name]")
visible_message("<span class='notice'>\The [initial(name)] hums and hisses as it moves [occupant.real_name] into storage.</span>", 3) visible_message("<span class='notice'>\The [initial(name)] hums and hisses as it moves [occupant.real_name] into storage.</span>", 3)
set_occupant(null)
// Delete the mob. // Delete the mob.
del(occupant) del(occupant)
set_occupant(null)
/obj/machinery/cryopod/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob) /obj/machinery/cryopod/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob)