cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Morgue tray now updates properly (#23109)

Browse Source 
* Morgue tray now updates properly

* Return of the guard clause

* Send signal upon ghosting/reentering

* Correct source for reenter corpse signal

* Signals split up, now works with DNR

---------

Co-authored-by: Adrer <adrermail@gmail.com>
This commit is contained in:
Adrer
2023-11-03 20:22:47 +01:00
committed by GitHub
parent 1526f3b3ed
commit aa7ea39f48
4 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/morgue.dm
+29 -9
View File
@@ -43,16 +43,33 @@
update_icon(update_state())
set_light(1, LIGHTING_MINIMUM_POWER)
/obj/structure/morgue/proc/update_state()
. = UPDATE_OVERLAYS
/obj/structure/morgue/proc/get_revivable(closing)
var/mob/living/M = locate() in contents
var/obj/structure/closet/body_bag/B = locate() in contents
if(!M)
M = locate() in B
if(!M)
return
if(closing)
RegisterSignal(M, COMSIG_LIVING_GHOSTIZED, PROC_REF(update_state))
RegisterSignal(M, COMSIG_LIVING_REENTERED_BODY, PROC_REF(update_state))
RegisterSignal(M, COMSIG_LIVING_SET_DNR, PROC_REF(update_state))
else
UnregisterSignal(M, COMSIG_LIVING_GHOSTIZED)
UnregisterSignal(M, COMSIG_LIVING_REENTERED_BODY)
UnregisterSignal(M, COMSIG_LIVING_SET_DNR)
/obj/structure/morgue/proc/update_state()
if(connected)
status = EXTENDED_TRAY
return
return update_icon(UPDATE_OVERLAYS)
if(!length(contents))
status = EMPTY_MORGUE
return
return update_icon(UPDATE_OVERLAYS)
var/mob/living/M = locate() in contents
var/obj/structure/closet/body_bag/B = locate() in contents
@@ -62,20 +79,21 @@
if(!M)
status = NOT_BODY
return
return update_icon(UPDATE_OVERLAYS)
var/mob/dead/observer/G = M.get_ghost()
if(M.mind && !M.mind.suicided && !M.suiciding)
if(M.client)
status = REVIVABLE
return
return update_icon(UPDATE_OVERLAYS)
if(G && G.client) //There is a ghost and it is connected to the server
status = GHOST_CONNECTED
return
return update_icon(UPDATE_OVERLAYS)
status = UNREVIVABLE
update_icon(UPDATE_OVERLAYS)
/obj/structure/morgue/update_overlays()
. = ..()
@@ -120,16 +138,18 @@
/obj/structure/morgue/attack_hand(mob/user as mob)
if(connected)
for(var/atom/movable/A in connected.loc)
if(!( A.anchored ))
if(!(A.anchored))
A.forceMove(src)
get_revivable(TRUE)
playsound(loc, open_sound, 50, 1)
QDEL_NULL(connected)
else
playsound(loc, open_sound, 50, 1)
get_revivable(FALSE)
connect()
add_fingerprint(user)
update_icon(update_state())
update_state()
return
/obj/structure/morgue/attackby(P as obj, mob/user as mob, params)