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

Strong Legs high weight fix

Browse Source 
Moved the min() function call to before the Strong Legs modifier is applied, if a character has it. This makes it so the trait has a tangible effect even at very high fatness, increasing its usefulness and making it a more worthwhile pick, while helping the roleplay of very fat characters who can still move relatively well, which is why the trait exists in the first place
This commit is contained in:
Alphas00
2023-12-20 13:57:55 +01:00
parent 16974c6b57
commit d13881f125
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species.dm
+7 -6
View File
@@ -1281,7 +1281,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
/datum/species/proc/handle_fatness_trait(mob/living/carbon/human/H, trait, trait_lose, trait_gain, fatness_lose, fatness_gain, chat_lose, chat_gain)
if(H.fatness < fatness_lose)
if (chat_lose)
to_chat(H, chat_lose)
to_chat(H, chat_lose)
if (trait)
REMOVE_TRAIT(H, trait, OBESITY)
if (trait_lose)
@@ -1514,7 +1514,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(FATNESS_LEVEL_FAT to FATNESS_LEVEL_FATTER)
H.throw_alert("fatness", /obj/screen/alert/fat)
if(0 to FATNESS_LEVEL_FAT)
H.clear_alert("fatness")
@@ -1651,11 +1651,12 @@ GLOBAL_LIST_EMPTY(roundstart_races)
var/fatness_delay = (H.fatness / FATNESS_DIVISOR)
if(H.fatness < FATNESS_LEVEL_BARELYMOBILE)
fatness_delay = fatness_delay - flight
fatness_delay = min(fatness_delay, FATNESS_MAX_MOVE_PENALTY)
if(HAS_TRAIT(H, TRAIT_STRONGLEGS))
fatness_delay = fatness_delay * FATNESS_STRONGLEGS_MODIFIER
fatness_delay = min(fatness_delay, FATNESS_MAX_MOVE_PENALTY)
if(HAS_TRAIT(H, TRAIT_WEAKLEGS))
if(H.fatness <= FATNESS_LEVEL_IMMOBILE)
@@ -1663,8 +1664,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(H.fatness > FATNESS_LEVEL_IMMOBILE)
fatness_delay += (H.fatness / FATNESS_LEVEL_IMMOBILE) * FATNESS_WEAKLEGS_MODIFIER
fatness_delay = min(fatness_delay, 60)
. += fatness_delay
. += fatness_delay
if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT && !HAS_TRAIT(H, TRAIT_RESISTCOLD))
. += (BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR