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

Merge branch 'master' into plant-adding

Browse Source
This commit is contained in:
DragonTrance
2021-02-21 12:06:48 -07:00
committed by GitHub
parent 0dea34de3a 7d7c6fedc9
commit 3ebb7488de
246 changed files with 4270 additions and 3557 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/mood.dm
+10 -1
View File
@@ -161,6 +161,7 @@
holdmyinsanityeffect = insanity_effect
HandleNutrition(owner)
HandleThirst(owner)
/datum/component/mood/proc/setSanity(amount, minimum=SANITY_INSANE, maximum=SANITY_NEUTRAL)//I'm sure bunging this in here will have no negative repercussions.
var/mob/living/master = parent
@@ -289,7 +290,6 @@
/datum/component/mood/proc/hud_click(datum/source, location, control, params, mob/user)
print_mood(user)
/datum/component/mood/proc/HandleNutrition(mob/living/L)
switch(L.nutrition)
if(NUTRITION_LEVEL_FULL to INFINITY)
@@ -305,5 +305,14 @@
if(0 to NUTRITION_LEVEL_STARVING)
add_event(null, "nutrition", /datum/mood_event/starving)
/datum/component/mood/proc/HandleThirst(mob/living/L)
switch(L.thirst)
if(NUTRITION_LEVEL_HUNGRY to INFINITY)
clear_event(null, "thirst")
if(NUTRITION_LEVEL_STARVING to NUTRITION_LEVEL_HUNGRY)
add_event(null, "thirst", /datum/mood_event/thirsty)
if(0 to NUTRITION_LEVEL_STARVING)
add_event(null, "thirst", /datum/mood_event/dehydrated)
#undef MINOR_INSANITY_PEN
#undef MAJOR_INSANITY_PEN