mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-23 13:18:09 +01:00
Merge pull request #6007 from CHOMPStation2/upstream-merge-14740
[MIRROR] Adds Firm Body trait and throwforce resistance
This commit is contained in:
@@ -442,6 +442,10 @@ emp_act
|
||||
var/dtype = O.damtype
|
||||
var/throw_damage = O.throwforce*(speed/THROWFORCE_SPEED_DIVISOR)
|
||||
|
||||
if(species && species.throwforce_absorb_threshold >= throw_damage)
|
||||
visible_message("<b>\The [O]</b> simply bounces off of [src]'s body!")
|
||||
return
|
||||
|
||||
var/zone
|
||||
if (istype(O.thrower, /mob/living))
|
||||
var/mob/living/L = O.thrower
|
||||
|
||||
@@ -122,6 +122,7 @@
|
||||
var/flash_mod = 1 // Stun from blindness modifier (flashes and flashbangs)
|
||||
var/flash_burn = 0 // how much damage to take from being flashed if light hypersensitive
|
||||
var/sound_mod = 1 // Multiplier to the effective *range* of flashbangs. a flashbang's bang hits an entire screen radius, with some falloff.
|
||||
var/throwforce_absorb_threshold = 0 // Ignore damage of thrown items below this value
|
||||
|
||||
var/chem_strength_heal = 1 // Multiplier to most beneficial chem strength
|
||||
var/chem_strength_pain = 1 // Multiplier to painkiller strength (could be used in a negative trait to simulate long-term addiction reducing effects, etc.)
|
||||
|
||||
@@ -62,6 +62,7 @@ var/datum/species/shapeshifter/promethean/prometheans
|
||||
oxy_mod = 0
|
||||
flash_mod = 0.5 //No centralized, lensed eyes.
|
||||
item_slowdown_mod = 1.33
|
||||
throwforce_absorb_threshold = 10
|
||||
|
||||
chem_strength_alcohol = 2
|
||||
|
||||
|
||||
@@ -79,6 +79,7 @@
|
||||
species_language = LANGUAGE_UNATHI
|
||||
health_hud_intensity = 2.5
|
||||
chem_strength_alcohol = 0.75
|
||||
throwforce_absorb_threshold = 10
|
||||
|
||||
min_age = 32
|
||||
max_age = 260
|
||||
@@ -430,6 +431,7 @@
|
||||
name_language = LANGUAGE_ZADDAT
|
||||
species_language = LANGUAGE_ZADDAT
|
||||
health_hud_intensity = 2.5
|
||||
throwforce_absorb_threshold = 5
|
||||
|
||||
minimum_breath_pressure = 20 //have fun with underpressures. any higher than this and they'll be even less suitible for life on the station
|
||||
|
||||
@@ -548,6 +550,7 @@
|
||||
health_hud_intensity = 2.5
|
||||
item_slowdown_mod = 0.1
|
||||
chem_strength_alcohol = 0
|
||||
throwforce_absorb_threshold = 5
|
||||
|
||||
num_alternate_languages = 3
|
||||
name_language = LANGUAGE_ROOTLOCAL
|
||||
|
||||
@@ -337,6 +337,7 @@
|
||||
slowdown = -0.15 //Small speedboost, as they've got a bunch of legs. Or something. I dunno.
|
||||
brute_mod = 0.8 //20% brute damage reduction
|
||||
burn_mod = 1.15 //15% burn damage increase. They're spiders. Aerosol can+lighter = dead spiders.
|
||||
throwforce_absorb_threshold = 10
|
||||
|
||||
num_alternate_languages = 3
|
||||
species_language = LANGUAGE_VESPINAE
|
||||
|
||||
@@ -226,3 +226,9 @@
|
||||
var_changes = list("trauma_mod" = 0.85)
|
||||
excludes = list(/datum/trait/negative/neural_hypersensitivity)
|
||||
can_take = ORGANICS
|
||||
|
||||
/datum/trait/positive/throw_resistance
|
||||
name = "Firm Body"
|
||||
desc = "Your body is firm enough that small thrown items can't do anything to you."
|
||||
cost = 1
|
||||
var_changes = list("throwforce_absorb_threshold" = 10)
|
||||
|
||||
Reference in New Issue
Block a user