mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 02:09:41 +00:00
[MIRROR] Mobs will no longer be despawned if they aren't inside a cryopod (#9754)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
f62610e627
commit
785c50a552
@@ -340,6 +340,9 @@
|
||||
//Lifted from Unity stasis.dm and refactored. ~Zuhayr
|
||||
/obj/machinery/cryopod/process()
|
||||
if(occupant)
|
||||
if(occupant.loc != src)
|
||||
go_out(TRUE)
|
||||
return
|
||||
//Allow a ten minute gap between entering the pod and actually despawning.
|
||||
if(world.time - time_entered < time_till_despawn)
|
||||
return
|
||||
@@ -663,12 +666,12 @@
|
||||
for(var/obj/machinery/gateway/G in range(1,src))
|
||||
G.icon_state = "on"
|
||||
|
||||
/obj/machinery/cryopod/robot/door/gateway/go_out()
|
||||
..()
|
||||
/obj/machinery/cryopod/robot/door/gateway/go_out(var/skip_move = FALSE)
|
||||
..(skip_move)
|
||||
for(var/obj/machinery/gateway/G in range(1,src))
|
||||
G.icon_state = "off"
|
||||
|
||||
/obj/machinery/cryopod/proc/go_out()
|
||||
/obj/machinery/cryopod/proc/go_out(var/skip_move = FALSE)
|
||||
|
||||
if(!occupant)
|
||||
return
|
||||
@@ -676,8 +679,8 @@
|
||||
if(occupant.client)
|
||||
occupant.client.eye = occupant.client.mob
|
||||
occupant.client.perspective = MOB_PERSPECTIVE
|
||||
|
||||
occupant.forceMove(get_turf(src))
|
||||
if(!skip_move)
|
||||
occupant.forceMove(get_turf(src))
|
||||
if(ishuman(occupant) && applies_stasis)
|
||||
var/mob/living/carbon/human/H = occupant
|
||||
H.Stasis(0)
|
||||
|
||||
Reference in New Issue
Block a user