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

Fixes #6137

Browse Source
This commit is contained in:
Zuhayr
2014-09-01 22:27:44 +09:30
parent 0184f516fb
commit ad15b7e2c1
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,10 +146,10 @@ var/global/list/frozen_items = list()
density = 1 density = 1
anchored = 1 anchored = 1
var/mob/occupant = null // Person waiting to be despawned. var/mob/occupant = null // Person waiting to be despawned.
var/orient_right = null // Flips the sprite. var/orient_right = null // Flips the sprite.
var/time_till_despawn = 9000 // 15 minutes-ish safe period before being despawned. var/time_till_despawn = 18000 // 15 minutes-ish safe period before being despawned.
var/time_entered = 0 // Used to keep track of the safe period. var/time_entered = 0 // Used to keep track of the safe period.
var/obj/item/device/radio/intercom/announce // var/obj/item/device/radio/intercom/announce //
// These items are preserved when the process() despawn proc occurs. // These items are preserved when the process() despawn proc occurs.
@@ -198,7 +198,7 @@ var/global/list/frozen_items = list()
if(W.contents.len) //Make sure we catch anything not handled by del() on the items. if(W.contents.len) //Make sure we catch anything not handled by del() on the items.
for(var/obj/item/O in W.contents) for(var/obj/item/O in W.contents)
if(istype(O,/obj/item/weapon/storage/internal)) //Stop eating pockets you fuck! if(istype(O,/obj/item/weapon/storage/internal)) //Stop eating pockets, you fuck!
continue continue
O.loc = src O.loc = src
@@ -344,6 +344,7 @@ var/global/list/frozen_items = list()
src.add_fingerprint(M) src.add_fingerprint(M)
/obj/machinery/cryopod/verb/eject() /obj/machinery/cryopod/verb/eject()
set name = "Eject Pod" set name = "Eject Pod"
set category = "Object" set category = "Object"
set src in oview(1) set src in oview(1)
@@ -355,6 +356,14 @@ var/global/list/frozen_items = list()
else else
icon_state = "body_scanner_0" icon_state = "body_scanner_0"
//Eject any items that aren't meant to be in the pod.
var/list/items = src.contents
if(occupant) items -= occupant
if(announce) items -= announce
for(var/obj/item/W in items)
W.loc = get_turf(src)
src.go_out() src.go_out()
add_fingerprint(usr) add_fingerprint(usr)
return return