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

some runtimes (#9037)

Browse Source
This commit is contained in:
Kashargul
2024-09-25 08:12:05 +02:00
committed by GitHub
parent 47eecc62c1
commit c4e436b8fe
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/organs/blood.dm
View File

@@ -221,6 +221,11 @@ var/const/CE_STABLE_THRESHOLD = 0.5
if(!amt) if(!amt)
return 0 return 0
//CHOMNPAdd Start, deathbringers for example delete those before the fire damage is calculated
if(!vessel)
return 0
//CHOMPAdd End
var/current_blood = vessel.get_reagent_amount("blood") var/current_blood = vessel.get_reagent_amount("blood")
if(current_blood < BLOOD_MINIMUM_STOP_PROCESS) if(current_blood < BLOOD_MINIMUM_STOP_PROCESS)
return 0 //We stop processing under 3 units of blood because apparently weird shit can make it overflowrandomly. return 0 //We stop processing under 3 units of blood because apparently weird shit can make it overflowrandomly.

2
code/modules/projectiles/guns/projectile_ch.dm
View File

@@ -204,7 +204,7 @@
if(istype(H)) if(istype(H))
if(!H.gloves) if(!H.gloves)
H.gunshot_residue = chambered.caliber H.gunshot_residue = chambered.caliber
else else if (istype(H.gloves, /obj/item/clothing))
var/obj/item/clothing/G = H.gloves var/obj/item/clothing/G = H.gloves
G.gunshot_residue = chambered.caliber G.gunshot_residue = chambered.caliber

9
code/modules/reagents/reagents/_reagents.dm
View File

@@ -82,8 +82,9 @@
removed *= mod.metabolism_percent removed *= mod.metabolism_percent
ingest_rem_mult *= mod.metabolism_percent ingest_rem_mult *= mod.metabolism_percent
// Species // Species
removed *= M.species.metabolic_rate if(M.species) //CHOMPEdit
ingest_rem_mult *= M.species.metabolic_rate removed *= M.species.metabolic_rate
ingest_rem_mult *= M.species.metabolic_rate
// Metabolism // Metabolism
removed *= active_metab.metabolism_speed removed *= active_metab.metabolism_speed
ingest_rem_mult *= active_metab.metabolism_speed ingest_rem_mult *= active_metab.metabolism_speed
@@ -171,9 +172,9 @@
affect_ingest(M, alien, removed * ingest_abs_mult) affect_ingest(M, alien, removed * ingest_abs_mult)
if(CHEM_TOUCH) if(CHEM_TOUCH)
affect_touch(M, alien, removed) affect_touch(M, alien, removed)
if(overdose && (volume > overdose * M?.species.chemOD_threshold) && (active_metab.metabolism_class != CHEM_TOUCH || can_overdose_touch)) if(overdose && (volume > overdose * M?.species?.chemOD_threshold) && (active_metab.metabolism_class != CHEM_TOUCH || can_overdose_touch)) //CHOMPEdit
overdose(M, alien, removed) overdose(M, alien, removed)
if(M.species.allergens & allergen_type) //uhoh, we can't handle this! if(M.species?.allergens & allergen_type) //uhoh, we can't handle this! //CHOMPEdit
M.add_chemical_effect(CE_ALLERGEN, allergen_factor * removed) M.add_chemical_effect(CE_ALLERGEN, allergen_factor * removed)
remove_self(removed) remove_self(removed)
return return

3
code/modules/vore/eating/living_vr.dm
View File

@@ -55,7 +55,8 @@
/mob/proc/init_vore() /mob/proc/init_vore()
//Something else made organs, meanwhile. //Something else made organs, meanwhile.
AddElement(/datum/element/slosh) // CHOMPEdit - Sloshy element if(!isnewplayer(src))
AddElement(/datum/element/slosh) // CHOMPEdit - Sloshy element
if(LAZYLEN(vore_organs)) if(LAZYLEN(vore_organs))
//CHOMPAdd Start //CHOMPAdd Start
if(!soulgem) if(!soulgem)