Fixes a bug with species component application (#18696)

* Update trait.dm

Update trait.dm

Fixes a bug and cleans up Omen dice application

* small godmode fix

* Proper

* Fixes organ regen
This commit is contained in:
Cameron Lennox
2025-10-27 01:51:35 -04:00
committed by GitHub
parent 4ff81edb10
commit cccd2280a7
7 changed files with 29 additions and 12 deletions
@@ -36,6 +36,9 @@
///If we dissipate radiation or keep it.
var/radiation_dissipation = TRUE
dupe_mode = COMPONENT_DUPE_UNIQUE
dupe_type = /datum/component/radiation_effects
/datum/component/radiation_effects/Initialize(glows, radiation_glow_minor_threshold, contamination, contamination_strength, radiation_color, intensity_mod, range_mod, radiation_immunity, radiation_healing, radiation_dissipation)
if(!isliving(parent))
-7
View File
@@ -534,10 +534,3 @@
. = ..()
var/mob/living/living_parent = parent
living_parent.remove_filter("omen")
/**
* The dice omen.
* Single use omen from rolling a nat 1 on a cursed d20.
*/
/datum/component/omen/dice
incidents_left = 1
+4 -1
View File
@@ -14,7 +14,9 @@
if(our_target.status_flags & GODMODE) //Already have it.
return ELEMENT_INCOMPATIBLE
our_target.status_flags |= GODMODE
our_target.status_flags &= ~CANSTUN
our_target.status_flags &= ~CANWEAKEN
our_target.status_flags &= ~CANPARALYSE
if(ishuman(target))
RegisterSignal(target, COMSIG_EXTERNAL_ORGAN_PRE_DAMAGE_APPLICATION, PROC_REF(on_external_damaged))
RegisterSignal(target, COMSIG_INTERNAL_ORGAN_PRE_DAMAGE_APPLICATION, PROC_REF(on_internal_damaged))
@@ -65,6 +67,7 @@
//And finally, remove the fact we're in godmode.
our_target.status_flags &= ~GODMODE
our_target.status_flags |= CANSTUN|CANWEAKEN|CANPARALYSE
return ..()
/datum/element/godmode/proc/on_external_damaged()