cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-12 08:27:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

still easy, but not as much as I had expected.

Browse Source
This commit is contained in:
Metis
2024-08-31 03:40:25 -04:00
parent 4453b09155
commit e5fdb2e0d6
6 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/damage_procs.dm
+5 -4
View File
@@ -43,6 +43,8 @@
//citadel code
if(AROUSAL)
adjustArousalLoss(damage * hit_percent)
if(FAT)
applyFatnessDamage(damage * hit_percent)
return TRUE
@@ -121,10 +123,9 @@
/mob/living/carbon/applyFatnessDamage(amount)
if(!check_weight_prefs(FATTENING_TYPE_WEAPON)) //Typically, this kind of damage would be applied to people through weapons.
return FALSE
adjust_fatness((amount * FAT_DAMAGE_TO_FATNESS), FATTENING_TYPE_WEAPON)
var/fat_to_add = ((amount * CONFIG_GET(number/damage_multiplier)) * FAT_DAMAGE_TO_FATNESS)
adjust_fatness(fat_to_add, FATTENING_TYPE_WEAPON)
return fat_to_add
/** adjustOrganLoss
code/modules/mob/living/carbon/human/species.dm
+2
View File
@@ -2461,6 +2461,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.adjustOrganLoss(ORGAN_SLOT_BRAIN, damage * hit_percent * H.physiology.brain_mod)
if(AROUSAL) //Citadel edit - arousal
H.adjustArousalLoss(damage * hit_percent)
if(FAT)
H.applyFatnessDamage(damage * hit_percent)
return 1
/datum/species/proc/on_hit(obj/item/projectile/P, mob/living/carbon/human/H)
code/modules/mob/living/damage_procs.dm
+5 -1
View File
@@ -43,6 +43,8 @@
return adjustCloneLoss(damage)
if(STAMINA)
return adjustStaminaLoss(damage)
if(FAT)
return applyFatnessDamage(damage)
/mob/living/proc/get_damage_amount(damagetype = BRUTE)
switch(damagetype)
@@ -60,7 +62,7 @@
return getStaminaLoss()
/mob/living/proc/apply_damages(brute = 0, burn = 0, tox = 0, oxy = 0, clone = 0, def_zone = null, blocked = FALSE, stamina = 0, brain = 0)
/mob/living/proc/apply_damages(brute = 0, burn = 0, tox = 0, oxy = 0, clone = 0, def_zone = null, blocked = FALSE, stamina = 0, brain = 0, fatness = 0)
if(blocked >= 100)
return 0
if(brute)
@@ -77,6 +79,8 @@
apply_damage(stamina, STAMINA, def_zone, blocked)
if(brain)
apply_damage(brain, BRAIN, def_zone, blocked)
if(fatness)
apply_damage(fatness, FAT, def_zone, blocked)
return 1