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

Fixes #5202

Browse Source
This commit is contained in:
Zuhayr
2014-07-31 20:46:52 +09:30
parent a3778f5a5d
commit afc40e7f44
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,7 +152,8 @@ var/global/list/frozen_items = list()
/obj/item/clothing/suit,
/obj/item/clothing/shoes/magboots,
/obj/item/blueprints,
/obj/item/clothing/head/helmet/space/
/obj/item/clothing/head/helmet/space,
/obj/item/weapon/storage/internal
)
/obj/machinery/cryopod/right
@@ -186,6 +187,8 @@ var/global/list/frozen_items = list()
if(W.contents.len) //Make sure we catch anything not handled by del() on the items.
for(var/obj/item/O in W.contents)
if(istype(O,/obj/item/weapon/storage/internal)) //Stop eating pockets you fuck!
continue
O.loc = src
//Delete all items not on the preservation list.
@@ -194,6 +197,7 @@ var/global/list/frozen_items = list()
items -= announce // or the autosay radio.
for(var/obj/item/W in items)
var/preserve = null
for(var/T in preserve_items)
if(istype(W,T))
@@ -204,11 +208,14 @@ var/global/list/frozen_items = list()
del(W)
else
frozen_items += W
W.loc = null
//Update any existing objectives involving this mob.
for(var/datum/objective/O in all_objectives)
if(istype(O,/datum/objective/mutiny) && O.target == occupant.mind) //We don't want revs to get objectives that aren't for heads of staff. Letting them win or lose based on cryo is silly so we remove the objective.
del(O) //TODO: Update rev objectives on login by head (may happen already?) ~ Z
// We don't want revs to get objectives that aren't for heads of staff. Letting
// them win or lose based on cryo is silly so we remove the objective.
if(istype(O,/datum/objective/mutiny) && O.target == occupant.mind)
del(O)
else if(O.target && istype(O.target,/datum/mind))
if(O.target == occupant.mind)
if(O.owner && O.owner.current)