shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into perlin-genny

Browse Source
This commit is contained in:
LetterN
2021-03-31 08:19:31 +08:00
parent e3fb2d5491 8bee5004ba
commit f976a89157
91 changed files with 1114 additions and 1071 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/spells/spell_types/lichdom.dm
+8
View File
@@ -93,12 +93,14 @@
active_phylacteries++
GLOB.poi_list |= src
START_PROCESSING(SSobj, src)
RegisterSignal(SSactivity, COMSIG_THREAT_CALC, .proc/get_threat)
set_light(lon_range)
if(initial(SSticker.mode.round_ends_with_antag_death))
SSticker.mode.round_ends_with_antag_death = FALSE
/obj/item/phylactery/Destroy(force=FALSE)
STOP_PROCESSING(SSobj, src)
UnregisterSignal(SSactivity, COMSIG_THREAT_CALC)
active_phylacteries--
GLOB.poi_list -= src
if(!active_phylacteries)
@@ -113,6 +115,12 @@
if(!mind.current || (mind.current && mind.current.stat == DEAD))
addtimer(CALLBACK(src, .proc/rise), respawn_time, TIMER_UNIQUE)
/obj/item/phylactery/proc/get_threat(list/threat_list)
if(mind?.current?.stat == DEAD)
if(!("phylactery" in threat_list))
threat_list["phylactery"] = 0
threat_list["phylactery"] += 25
/obj/item/phylactery/proc/rise()
if(mind.current && mind.current.stat != DEAD)
return "[mind] already has a living body: [mind.current]"