cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Split NO_SCAN into two flags (#10420)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-03-15 13:45:38 -07:00
committed by GitHub
parent f862d60640
commit 15a65537e9
40 changed files with 101 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
modular_chomp/code/modules/mob/living/carbon/human/species/station/traits/negative.dm
View File

@@ -48,23 +48,6 @@
..()
H.add_modifier(/datum/modifier/trait/majorempweakness)
/datum/trait/negative/nodefib
name = "Unreviveable"
desc = "For whatever strange genetic reason, defibs cannot restart your heart."
cost = 0
custom_only = FALSE
var_changes = list("flags" = NO_DEFIB)
can_take = ORGANICS //Mostly because I think synth code bypasses the no defib thing. Or maybe that is just vox
excludes = list(/datum/trait/negative/noresleeve) //No, just, no
/datum/trait/negative/noresleeve
name = "Unsleeveable"
desc = "Your genetics have been ruined, to the point where resleeving can no longer bring you back, including the autoresleever."
cost = -1
custom_only = TRUE
var_changes = list("flags" = NO_SCAN)
excludes = list(/datum/trait/negative/nodefib) //No, just, no
/datum/trait/negative/meltable
name = "Water Weakness"
desc = "Due to your biology, water is harmful to you."
@@ -81,14 +64,6 @@
var_changes = list("water_resistance" = 0, "water_damage_mod" = 0.8)
excludes = list(/datum/trait/negative/meltable)
/datum/trait/negative/onelife
name = "One Life"
desc = "For whatever reason, once you dead, that is final."
cost = -2
custom_only = TRUE
var_changes = list("flags" = NO_SCAN | NO_DEFIB)
excludes = list(/datum/trait/negative/nodefib, /datum/trait/negative/noresleeve)
/datum/trait/negative/lightweight_light
name = "Lesser Lightweight"
desc = "Your light weight and poor balance make you very susceptible to unhelpful bumping if you are unprepared)"

4
modular_chomp/code/modules/mob/living/simple_mob/subtypes/metroid/metConsumption.dm
View File

@@ -102,10 +102,10 @@
if(L.getCloneLoss() >= L.getMaxHealth() * 1.5)
to_chat(src, "This subject does not have an edible life energy...")
return FALSE
//VOREStation Addition start
//VOREStation Addition start //This is a modular_chomp file... why is there a vorestation edit? TODO: Reassess this file. Port upstream if needed.
if(istype(L, /mob/living/carbon/human))
var/mob/living/carbon/human/H = L
if(H.species.flags & NO_SCAN)
if(H.species.flags & NO_DNA)
to_chat(src, "This subject's life energy is beyond my reach...")
return FALSE
//VOREStation Addition end