shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'citadel/master' into combat_v7

Browse Source
This commit is contained in:
silicons
2021-06-07 16:47:11 -07:00
parent d67c4d9fa8 e24ecea492
commit 40f2c06f2e
247 changed files with 7302 additions and 2875 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/martial/sleeping_carp.dm
+10 -8
View File
@@ -167,6 +167,7 @@
ADD_TRAIT(H, TRAIT_PIERCEIMMUNE, SLEEPING_CARP_TRAIT)
ADD_TRAIT(H, TRAIT_NODISMEMBER, SLEEPING_CARP_TRAIT)
ADD_TRAIT(H, TRAIT_TASED_RESISTANCE, SLEEPING_CARP_TRAIT)
ADD_TRAIT(H, TRAIT_NOPUGILIST, SLEEPING_CARP_TRAIT) // cqc doesn't get this as it's intended to be able to stack with northstar gloves
H.physiology.brute_mod *= 0.4 //brute is really not gonna cut it
H.physiology.burn_mod *= 0.7 //burn is distinctly more useful against them than brute but they're still resistant
H.physiology.stamina_mod *= 0.4 //You take less stamina damage overall, but you do not reduce the damage from stun batons as much
@@ -183,14 +184,15 @@
REMOVE_TRAIT(H, TRAIT_PIERCEIMMUNE, SLEEPING_CARP_TRAIT)
REMOVE_TRAIT(H, TRAIT_NODISMEMBER, SLEEPING_CARP_TRAIT)
REMOVE_TRAIT(H, TRAIT_TASED_RESISTANCE, SLEEPING_CARP_TRAIT)
H.physiology.brute_mod *= (1/0.4) //brute is really not gonna cut it
H.physiology.burn_mod *= (1/0.7) //burn is distinctly more useful against them than brute but they're still resistant
H.physiology.stamina_mod *= (1/0.4) //You take less stamina damage overall, but you do not reduce the damage from stun batons as much
H.physiology.stun_mod *= (1/0.3) //for those rare stuns
H.physiology.pressure_mod *= (1/0.3) //go hang out with carp
H.physiology.cold_mod *= (1/0.3) //cold mods are different to burn mods, they do stack however
H.physiology.heat_mod *= (1/2) //this is mostly so sleeping carp has a viable weakness. Cooking them alive. Setting them on fire and heating them will be their biggest weakness. The reason for this is....filet jokes.
H.physiology.stamina_buffer_mod *= (1/0.75) //to help with some stamina
REMOVE_TRAIT(H, TRAIT_NOPUGILIST, SLEEPING_CARP_TRAIT)
H.physiology.brute_mod = initial(H.physiology.brute_mod)
H.physiology.burn_mod = initial(H.physiology.burn_mod)
H.physiology.stamina_mod = initial(H.physiology.stamina_mod)
H.physiology.stun_mod = initial(H.physiology.stun_mod)
H.physiology.pressure_mod = initial(H.physiology.pressure_mod) //no more carpies
H.physiology.cold_mod = initial(H.physiology.cold_mod)
H.physiology.heat_mod = initial(H.physiology.heat_mod)
H.physiology.stamina_buffer_mod = initial(H.physiology.stamina_buffer_mod)
H.faction -= "carp" //:(
/mob/living/carbon/human/proc/sleeping_carp_help()