cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-22 04:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

cryo afk popup fix (#18427)

Browse Source
This commit is contained in:
SteelSlayer
2022-07-18 04:38:18 -05:00
committed by GitHub
parent bc4639b8f9
commit d90235f4dd
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
+8 -7
View File
@@ -2157,26 +2157,27 @@
log_admin("[key_name(usr)] despawned [M] in cryo.")
message_admins("[key_name_admin(usr)] despawned [M] in cryo.")
else
var/fast_despawn = FALSE
if(href_list["fast_despawn"])
var/area/mob_area = get_area(M)
var/should_despawn = FALSE
if(mob_area.fast_despawn)
if(alert(owner, "[M] is an area where players being AFK cryo'd should be despawned immediately. \
Do you wish to immediately de-spawn them, or just continue moving them to the cryopod?", "Cryo or De-Spawn", "De-Spawn", "Move to Cryopod") == "De-Spawn")
fast_despawn = TRUE
should_despawn = TRUE
if(!cryo_ssd(M))
return
if(human)
var/mob/living/carbon/human/H = M
var/msg = "[key_name(usr)] [fast_despawn ? "despawned" : "sent"] [H.job] [H] [fast_despawn ? "in" : "to"] cryo."
var/msg = "[key_name(usr)] [should_despawn ? "despawned" : "sent"] [H.job] [H] [should_despawn ? "in" : "to"] cryo."
log_admin(msg)
message_admins(msg)
else
var/msg = "[key_name(usr)] [fast_despawn ? "despawned" : "sent"] [M] [fast_despawn ? "in" : "to"] cryo."
var/msg = "[key_name(usr)] [should_despawn ? "despawned" : "sent"] [M] [should_despawn ? "in" : "to"] cryo."
log_admin(msg)
message_admins(msg)
if(fast_despawn)
var/obj/machinery/cryopod/P = M.loc // They're already in the cryopod because of `cryo_ssd(M)` above.
if(should_despawn)
var/obj/machinery/cryopod/P = M.loc // They've already been placed in the cryopod because of `cryo_ssd(M)` above.
P.despawn_occupant()
return
code/modules/admin/verbs/randomverbs.dm
+1 -2
View File
@@ -1070,8 +1070,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(istype(H.loc, /obj/machinery/cryopod))
msg += "<TD><A href='?_src_=holder;cryossd=[H.UID()];cryoafk=1'>De-Spawn</A></TD>"
else
var/area/A = get_area(H)
msg += "<TD><A href='?_src_=holder;cryossd=[H.UID()];cryoafk=1;fast_despawn=[A.fast_despawn]'>Cryo</A></TD>"
msg += "<TD><A href='?_src_=holder;cryossd=[H.UID()];cryoafk=1'>Cryo</A></TD>"
msg += "</TR>"
msg += "</TABLE></BODY></HTML>"
src << browse(msg, "window=Player_ssd_afk_check;size=600x300")