mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 20:16:55 +01:00
Fixes #6030 - cloner autocloning people who have ghosted/cryoed
This commit is contained in:
@@ -1,3 +1,5 @@
|
||||
var/list/clonecomputers = list()
|
||||
|
||||
/obj/machinery/computer/cloning
|
||||
name = "cloning console"
|
||||
icon = 'icons/obj/computer.dmi'
|
||||
@@ -26,8 +28,13 @@
|
||||
..()
|
||||
updatemodules()
|
||||
|
||||
/obj/machinery/computer/cloning/New()
|
||||
..()
|
||||
clonecomputers += src
|
||||
|
||||
/obj/machinery/computer/cloning/Destroy()
|
||||
releasecloner()
|
||||
clonecomputers -= src
|
||||
return ..()
|
||||
|
||||
/obj/machinery/computer/cloning/process()
|
||||
|
||||
@@ -174,6 +174,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
|
||||
if(response != "Ghost")
|
||||
return //didn't want to ghost after-all
|
||||
resting = 1
|
||||
for(var/obj/machinery/computer/cloning/cloner in clonecomputers)
|
||||
for(var/datum/dna2/record/R in cloner.records)
|
||||
if(R.ckey == ckey)
|
||||
cloner.records.Remove(R)
|
||||
var/mob/dead/observer/ghost = ghostize(0) //0 parameter is so we can never re-enter our body, "Charlie, you can never come baaaack~" :3
|
||||
ghost.timeofdeath = world.time // Because the living mob won't have a time of death and we want the respawn timer to work properly.
|
||||
var/obj/structure/morgue/Morgue = locate() in M.loc
|
||||
|
||||
Reference in New Issue
Block a user