cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-02-09 23:27:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Pinta
2023-02-22 22:52:47 -05:00
parent b81508b4d2
commit d728e9baf6
3 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1818,26 +1818,20 @@ GLOBAL_LIST_EMPTY(roundstart_races)
. += (BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR
return .
*/
if(HAS_TRAIT(H, TRAIT_FAT))
. += (1 - flight)
if(HAS_TRAIT(H, TRAIT_FATTER))
. += (1.1 - flight)
if(HAS_TRAIT(H, TRAIT_VERYFAT))
. += (1.25 - flight)
if(HAS_TRAIT(H, TRAIT_OBESE))//GS13 fat levels move speed decrease
. += (1.5 - flight)
if(HAS_TRAIT(H, TRAIT_MORBIDLYOBESE))
. += (2 - flight)
if(HAS_TRAIT(H, TRAIT_EXTREMELYOBESE))
. += (2.5 - flight)
if(HAS_TRAIT(H, TRAIT_BARELYMOBILE))
. += 2.7
if(HAS_TRAIT(H, TRAIT_IMMOBILE))
. += 3 // No wings are going to lift that much off the ground
if(HAS_TRAIT(H, TRAIT_BLOB))
. += 4
if(H.fatness)
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_WEAKLEGS) && (H.fatness > FATNESS_LEVEL_BLOB))
fatness_delay += ((H.fatness - FATNESS_LEVEL_BLOB) * FATNESS_WEAKLEGS_MODIFIER) / FATNESS_DIVISOR
. += fatness_delay
if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT && !HAS_TRAIT(H, TRAIT_RESISTCOLD))
. += (BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR
return .
//////////////////
// ATTACK PROCS //

2
code/modules/mob/mob_movement.dm
View File

@@ -85,8 +85,6 @@
if(!mob.Process_Spacemove(direct))
return FALSE
if(HAS_TRAIT(mob,TRAIT_BLOB) && HAS_TRAIT(mob,TRAIT_WEAKLEGS)) // GS13 are we too fat to move?
return FALSE
//We are now going to move
var/add_delay = mob.movement_delay()
mob.set_glide_size(DELAY_TO_GLIDE_SIZE(add_delay * (((direct & 3) && (direct & 12)) ? 2 : 1))) // set it now in case of pulled objects