diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index c0fb234c..9854950f 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -163,7 +163,7 @@ icon_state = "hungry" /obj/screen/alert/thirsty - name = "Thristy" + name = "Thirsty" desc = "Some water would be good right about now." icon_state = "thirsty" diff --git a/code/modules/mob/living/carbon/carbon_movement.dm b/code/modules/mob/living/carbon/carbon_movement.dm index 7d3c22b6..93d3e1db 100644 --- a/code/modules/mob/living/carbon/carbon_movement.dm +++ b/code/modules/mob/living/carbon/carbon_movement.dm @@ -40,8 +40,8 @@ if(HAS_TRAIT(src, TRAIT_NOHUNGER)) nutrition = NUTRITION_LEVEL_FED - 1 //just less than feeling vigorous else if(nutrition && stat != DEAD) - nutrition -= HUNGER_FACTOR/3 - thirst -= THIRST_FACTOR/5 + nutrition -= HUNGER_FACTOR/12 + thirst -= THIRST_FACTOR/12 if(m_intent == MOVE_INTENT_RUN) nutrition -= HUNGER_FACTOR/5 - thirst -= THIRST_FACTOR/10 //running around depleats thirst more so. \ No newline at end of file + thirst -= THIRST_FACTOR/5 //running around depleats thirst more so. \ No newline at end of file diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 189c8d94..5c109c73 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -255,6 +255,7 @@ //hydration /datum/reagent/water/on_mob_life(mob/living/carbon/M) M.thirst += hydration + ..() /* * Water reaction to turf diff --git a/tgstation.dme b/tgstation.dme index 5158277d..570d468d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1807,7 +1807,6 @@ #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_spaghetti.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_sushi.dm" #include "code\modules\games\cas.dm" -#include "code\modules\goonchat\browserOutput.dm" #include "code\modules\holiday\easter.dm" #include "code\modules\holiday\holidays.dm" #include "code\modules\holiday\halloween\bartholomew.dm"