cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes the knockout trait and simple mob sleeping (#18567)

Browse Source 
* makes the knockout work

* forgot to remove the calls here
This commit is contained in:
Charlie
2022-08-02 23:45:07 -05:00
committed by GitHub
parent a08468ac21
commit 359552b1f4
5 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/status_effects/debuffs.dm
+2 -2
View File
@@ -539,10 +539,10 @@
. = ..()
if(!.)
return
ADD_TRAIT(src, TRAIT_KNOCKEDOUT, "[id]")
ADD_TRAIT(owner, TRAIT_KNOCKEDOUT, "[id]")
/datum/status_effect/incapacitating/sleeping/on_remove()
REMOVE_TRAIT(src, TRAIT_KNOCKEDOUT, "[id]")
REMOVE_TRAIT(owner, TRAIT_KNOCKEDOUT, "[id]")
return ..()
/datum/status_effect/incapacitating/sleeping/tick()
code/modules/mob/living/carbon/update_status.dm
+1 -1
View File
@@ -6,7 +6,7 @@
death()
create_debug_log("died of damage, trigger reason: [reason]")
return
if(IsParalyzed() || IsSleeping() || (check_death_method() && getOxyLoss() > 50) || HAS_TRAIT(src, TRAIT_FAKEDEATH) || health <= HEALTH_THRESHOLD_CRIT && check_death_method())
if(HAS_TRAIT(src, TRAIT_KNOCKEDOUT) || (check_death_method() && getOxyLoss() > 50) || HAS_TRAIT(src, TRAIT_FAKEDEATH) || health <= HEALTH_THRESHOLD_CRIT && check_death_method())
if(stat == CONSCIOUS)
KnockOut()
create_debug_log("fell unconscious, trigger reason: [reason]")
code/modules/mob/living/silicon/ai/update_status.dm
+4 -3
View File
@@ -6,9 +6,10 @@
death()
create_debug_log("died of damage, trigger reason: [reason]")
return
else if(IsSleeping()) //Required for adminfreezing
KnockOut()
create_debug_log("fell unconscious, trigger reason: [reason]")
if(HAS_TRAIT(src, TRAIT_KNOCKEDOUT))
if(stat == CONSCIOUS)
KnockOut()
create_debug_log("fell unconscious, trigger reason: [reason]")
else if(stat == UNCONSCIOUS)
WakeUp()
create_debug_log("woke up, trigger reason: [reason]")
code/modules/mob/living/silicon/robot/update_status.dm
+10 -3
View File
@@ -14,15 +14,13 @@
death()
create_debug_log("died of damage, trigger reason: [reason]")
return
if(!is_component_functioning("actuator") || !is_component_functioning("power cell") || HAS_TRAIT(src, TRAIT_KNOCKEDOUT) || IsStunned() || IsWeakened() || IsSleeping() || getOxyLoss() > maxHealth * 0.5) // Borgs need to be able to sleep for adminfreeze
if(!is_component_functioning("actuator") || !is_component_functioning("power cell") || HAS_TRAIT(src, TRAIT_KNOCKEDOUT) || IsStunned() || IsWeakened() || getOxyLoss() > maxHealth * 0.5) // Borgs need to be able to sleep for adminfreeze
if(stat == CONSCIOUS)
KnockOut()
update_headlamp()
create_debug_log("fell unconscious, trigger reason: [reason]")
else
if(stat == UNCONSCIOUS)
WakeUp()
update_headlamp()
create_debug_log("woke up, trigger reason: [reason]")
else
if(health > 0)
@@ -38,6 +36,15 @@
diag_hud_set_health()
update_health_hud()
/mob/living/silicon/robot/KnockOut(updating = TRUE)
. = ..()
update_headlamp()
/mob/living/silicon/robot/WakeUp(updating = TRUE)
. = ..()
update_headlamp()
/mob/living/silicon/robot/update_revive(updating = TRUE)
. = ..(updating)
if(.)
code/modules/mob/living/simple_animal/simple_animal.dm
+5 -3
View File
@@ -188,9 +188,11 @@
death()
create_debug_log("died of damage, trigger reason: [reason]")
else
if(IsSleeping() && (stat == CONSCIOUS))
KnockOut()
else
if(HAS_TRAIT(src, TRAIT_KNOCKEDOUT))
if(stat == CONSCIOUS)
KnockOut()
create_debug_log("knocked out, trigger reason: [reason]")
else if(stat == UNCONSCIOUS)
WakeUp()
create_debug_log("woke up, trigger reason: [reason]")
med_hud_set_status()