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

Merge pull request #14513 from Putnam3145/chaos-for-secret

Browse Source 
Makes threat a subsystem instead of dynamic-attached
This commit is contained in:
silicons
2021-03-27 01:33:27 -06:00
committed by GitHub
parent d53f930baa 899b94f0f3
commit bdbb33842e
13 changed files with 117 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/death.dm
+1 -1
View File
@@ -87,7 +87,7 @@
addtimer(CALLBACK(src, .proc/med_hud_set_status), (DEFIB_TIME_LIMIT * 10) + 1)
stop_pulling()
var/signal = SEND_SIGNAL(src, COMSIG_MOB_DEATH, gibbed)
var/signal = SEND_SIGNAL(src, COMSIG_MOB_DEATH, gibbed) | SEND_GLOBAL_SIGNAL(COMSIG_GLOB_MOB_DEATH, src, gibbed)
var/turf/T = get_turf(src)
if(mind && mind.name && mind.active && !istype(T.loc, /area/ctf) && !(signal & COMPONENT_BLOCK_DEATH_BROADCAST))
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]"