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

pain_mod implementation (#7330)

Browse Source
This commit is contained in:
Killian
2020-07-13 17:08:25 +01:00
committed by VirgoBot
parent 57639fdad4
commit 70e9c69ff3
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/mob/living/carbon/human/human_damage.dm
View File

@@ -288,6 +288,20 @@
oxyloss = 0 oxyloss = 0
else else
..() ..()
/mob/living/carbon/human/adjustHalLoss(var/amount)
if(species.flags & NO_PAIN)
halloss = 0
else
if(amount > 0) //only multiply it by the mod if it's positive, or else it takes longer to fade too!
amount = amount*species.pain_mod
..(amount)
/mob/living/carbon/human/setHalLoss(var/amount)
if(species.flags & NO_PAIN)
halloss = 0
else
..()
/mob/living/carbon/human/getToxLoss() /mob/living/carbon/human/getToxLoss()
if(species.flags & NO_POISON) if(species.flags & NO_POISON)

1
code/modules/mob/living/carbon/human/species/species.dm
View File

@@ -95,6 +95,7 @@
var/chemOD_threshold = 1 // Multiplier to overdose threshold; lower = easier overdosing var/chemOD_threshold = 1 // Multiplier to overdose threshold; lower = easier overdosing
var/chemOD_mod = 1 // Damage modifier for overdose; higher = more damage from ODs var/chemOD_mod = 1 // Damage modifier for overdose; higher = more damage from ODs
var/alcohol_mod = 1 // Multiplier to alcohol strength; 0.5 = half, 0 = no effect at all, 2 = double, etc. var/alcohol_mod = 1 // Multiplier to alcohol strength; 0.5 = half, 0 = no effect at all, 2 = double, etc.
var/pain_mod = 1 // Multiplier to pain effects; 0.5 = half, 0 = no effect (equal to NO_PAIN, really), 2 = double, etc.
// set below is EMP interactivity for nonsynth carbons // set below is EMP interactivity for nonsynth carbons
var/emp_sensitivity = 0 // bitflag. valid flags are: EMP_PAIN, EMP_BLIND, EMP_DEAFEN, EMP_CONFUSE, EMP_STUN, and EMP_(BRUTE/BURN/TOX/OXY)_DMG var/emp_sensitivity = 0 // bitflag. valid flags are: EMP_PAIN, EMP_BLIND, EMP_DEAFEN, EMP_CONFUSE, EMP_STUN, and EMP_(BRUTE/BURN/TOX/OXY)_DMG
var/emp_dmg_mod = 1 // Multiplier to all EMP damage sustained by the mob, if it's EMP-sensitive var/emp_dmg_mod = 1 // Multiplier to all EMP damage sustained by the mob, if it's EMP-sensitive