From 115d9adcfc6e185e3433f02d84b1f836fd0768b7 Mon Sep 17 00:00:00 2001 From: KabKebab Date: Sun, 24 Oct 2021 14:53:07 +0200 Subject: [PATCH] fullness icons fixed + value changes. (immobility was a bad idea) --- code/__DEFINES/mobs.dm | 10 +++++----- code/_onclick/hud/alert.dm | 6 +++--- code/modules/mob/living/carbon/human/species.dm | 6 +++--- code/modules/mob/mob_movement.dm | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 7f1241c3..9e6b659f 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -149,11 +149,11 @@ #define SANITY_INSANE 0 //Fullness levels, no more infinite eating my dudes! -#define FULLNESS_LEVEL_NOMOREPLZ 70 -#define FULLNESS_LEVEL_BEEG 35 -#define FULLNESS_LEVEL_BLOATED 20 -#define FULLNESS_LEVEL_FILLED 10 -#define FULLNESS_LEVEL_HALF_FULL 5 +#define FULLNESS_LEVEL_NOMOREPLZ 280 +#define FULLNESS_LEVEL_BEEG 140 +#define FULLNESS_LEVEL_BLOATED 80 +#define FULLNESS_LEVEL_FILLED 40 +#define FULLNESS_LEVEL_HALF_FULL 20 #define FULLNESS_LEVEL_EMPTY 0 //Fatness levels, Here we go! diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 1bef381f..ced1acb8 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -180,17 +180,17 @@ /obj/screen/alert/bloated name = "Bloated stomach" desc = "Your stomach is a bit too full" - icon_state = "fat" + icon_state = "Stuffed" /obj/screen/alert/stuffed name = "Completely stuffed" desc = "Whatever you ate, you ate too much. Your stomach has stretched to accomodate its contents, forming a very obvious belly" - icon_state = "fat" + icon_state = "Bloated" /obj/screen/alert/beegbelly name = "Walking belly" desc = "You've somehow managed to fit even more in your stomach. Can you even stand?" - icon_state = "obese" + icon_state = "beegbelly" /obj/screen/alert/hungry diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 35139bc1..747b3898 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1535,11 +1535,11 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(HAS_TRAIT(H, TRAIT_FAT)) . += (1 - flight) if(HAS_TRAIT(H, TRAIT_OBESE))//GS13 fat levels move speed decrease - . += (2 - flight) + . += (1.5 - flight) if(HAS_TRAIT(H, TRAIT_MORBIDLYOBESE)) - . += (3 - flight) + . += (2 - flight) if(HAS_TRAIT(H, TRAIT_IMMOBILE)) - . += 4 // No wings are going to lift that much off the ground + . += 3 // No wings are going to lift that much off the ground if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT && !HAS_TRAIT(H, TRAIT_RESISTCOLD)) . += (BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR return . diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 86d63d6b..e02957b3 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -85,8 +85,8 @@ if(!mob.Process_Spacemove(direct)) return FALSE - if(HAS_TRAIT(mob,TRAIT_BLOB)) // GS13 are we too fat to move? - return FALSE + //if(HAS_TRAIT(mob,TRAIT_BLOB)) // GS13 are we too fat to move? (it was a bad idea) + // 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