mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 02:09:41 +00:00
some runtimes (#9037)
This commit is contained in:
@@ -221,6 +221,11 @@ var/const/CE_STABLE_THRESHOLD = 0.5
|
||||
if(!amt)
|
||||
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")
|
||||
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.
|
||||
|
||||
@@ -204,7 +204,7 @@
|
||||
if(istype(H))
|
||||
if(!H.gloves)
|
||||
H.gunshot_residue = chambered.caliber
|
||||
else
|
||||
else if (istype(H.gloves, /obj/item/clothing))
|
||||
var/obj/item/clothing/G = H.gloves
|
||||
G.gunshot_residue = chambered.caliber
|
||||
|
||||
|
||||
@@ -82,8 +82,9 @@
|
||||
removed *= mod.metabolism_percent
|
||||
ingest_rem_mult *= mod.metabolism_percent
|
||||
// Species
|
||||
removed *= M.species.metabolic_rate
|
||||
ingest_rem_mult *= M.species.metabolic_rate
|
||||
if(M.species) //CHOMPEdit
|
||||
removed *= M.species.metabolic_rate
|
||||
ingest_rem_mult *= M.species.metabolic_rate
|
||||
// Metabolism
|
||||
removed *= active_metab.metabolism_speed
|
||||
ingest_rem_mult *= active_metab.metabolism_speed
|
||||
@@ -171,9 +172,9 @@
|
||||
affect_ingest(M, alien, removed * ingest_abs_mult)
|
||||
if(CHEM_TOUCH)
|
||||
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)
|
||||
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)
|
||||
remove_self(removed)
|
||||
return
|
||||
|
||||
@@ -55,7 +55,8 @@
|
||||
|
||||
/mob/proc/init_vore()
|
||||
//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))
|
||||
//CHOMPAdd Start
|
||||
if(!soulgem)
|
||||
|
||||
Reference in New Issue
Block a user