diff --git a/modular_ss220/crit_rework/code/crit_rework_component.dm b/modular_ss220/crit_rework/code/crit_rework_component.dm index 3b1b7774be0d..7a682da4eabb 100644 --- a/modular_ss220/crit_rework/code/crit_rework_component.dm +++ b/modular_ss220/crit_rework/code/crit_rework_component.dm @@ -1,10 +1,9 @@ -#define OLD_CRIT_TRAIT "old-crit" +#define OLD_CRIT_TRAIT "softcrit" /datum/component/softcrit dupe_mode = COMPONENT_DUPE_UNIQUE /datum/component/softcrit/Initialize(...) - . = ..() if(!ishuman(parent)) return COMPONENT_INCOMPATIBLE softcrit_entered() @@ -20,7 +19,6 @@ UnregisterSignal(parent, COMSIG_LIVING_HANDLE_MESSAGE_MODE) /datum/component/softcrit/proc/softcrit_entered() - SIGNAL_HANDLER ADD_TRAIT(parent, TRAIT_FLOORED, OLD_CRIT_TRAIT) ADD_TRAIT(parent, TRAIT_HANDS_BLOCKED, OLD_CRIT_TRAIT) @@ -29,13 +27,12 @@ REMOVE_TRAIT(parent, TRAIT_FLOORED, OLD_CRIT_TRAIT) REMOVE_TRAIT(parent, TRAIT_HANDS_BLOCKED, OLD_CRIT_TRAIT) qdel(src) - return /datum/component/softcrit/proc/on_examine(atom/A, mob/user, list/examine_list) SIGNAL_HANDLER var/mob/living/carbon/human/owner = parent - if(owner.stat == CONSCIOUS) - examine_list += span_warning("[owner] с трудом держится в сознании.\n") + if(owner.stat != DEAD) + examine_list += span_warning("[owner] на грани потери сознания!\n") /datum/component/softcrit/proc/check_health() SIGNAL_HANDLER diff --git a/modular_ss220/modular_ss220.dme b/modular_ss220/modular_ss220.dme index f8a44c58bf45..16efe4679898 100644 --- a/modular_ss220/modular_ss220.dme +++ b/modular_ss220/modular_ss220.dme @@ -49,6 +49,7 @@ #include "crawl_speed/_crawl_speed.dme" #include "credits/_credits.dme" #include "cyrillic_fixes/_cyrillic_fixes.dme" +#include "crit_rework/_crit_rework.dme" #include "debug/_debug.dme" #include "detective_rework/detective_rework.dme" #include "discord_link/_discord_link.dme" @@ -101,5 +102,3 @@ он всегда напоминает о своём существовании. Небольшая библиотека, если так вообще можно выразиться. ---------------------------------------------------------------------*/ - -// #include "crit_rework/_crit_rework.dme"