diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm index b8f7509efddd7..6e3b8cee429d7 100644 --- a/code/datums/components/mood.dm +++ b/code/datums/components/mood.dm @@ -77,20 +77,20 @@ msg += "I love life!\n" msg += "Moodlets:\n"//All moodlets - var/mood_msg = null - var/tought_msg = null + var/mood_msg = "" + var/thought_msg = "" for(var/i in mood_events) var/datum/mood_event/event = mood_events[i] if(event.mood_change) mood_msg += "[event.description]\n" else - tought_msg += "[event.description]\n" + thought_msg += "[event.description]\n" if(!mood_msg) msg += "I don't have much of a reaction to anything right now.\n" msg += mood_msg - if(tought_msg) - msg += "Toughts:\n" - msg += tought_msg + if(thought_msg) + msg += "Thoughts:\n" + msg += thought_msg to_chat(user || parent, EXAMINE_BLOCK(msg)) /datum/component/mood/proc/update_mood() //Called whenever a mood event is added or removed @@ -225,7 +225,6 @@ else sanity = amount - var/mob/living/master = parent switch(sanity) if(SANITY_INSANE to SANITY_CRAZY) setInsanityEffect(MAJOR_INSANITY_PEN) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 7473a638fa6c3..4f5633a821aca 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1410,21 +1410,14 @@ GLOBAL_LIST_EMPTY(features_by_species) to_chat(H, "You no longer feel vigorous.") H.metabolism_efficiency = 1 - //Hunger slowdown for if mood isn't enabled - if(CONFIG_GET(flag/disable_human_mood)) - if(!HAS_TRAIT(H, TRAIT_NOHUNGER)) - var/hungry = (500 - H.nutrition) / 5 //So overeat would be 100 and default level would be 80 - if(hungry >= 70) - H.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/hunger, multiplicative_slowdown = (hungry / 50)) - else - H.remove_movespeed_modifier(/datum/movespeed_modifier/hunger) - if(HAS_TRAIT(H, TRAIT_POWERHUNGRY)) handle_charge(H) else switch(H.nutrition) if(NUTRITION_LEVEL_FULL to INFINITY) H.throw_alert("nutrition", /atom/movable/screen/alert/fat) + H.remove_movespeed_modifier(MOVESPEED_ID_VISIBLE_HUNGER) + H.remove_actionspeed_modifier(ACTIONSPEED_ID_SATIETY) if(NUTRITION_LEVEL_FED to NUTRITION_LEVEL_FULL) H.clear_alert("nutrition") H.remove_movespeed_modifier(MOVESPEED_ID_VISIBLE_HUNGER)