From 0d6cec9d8cbea2d3bbfbe803f4850f384c59bae8 Mon Sep 17 00:00:00 2001 From: iksyp <33264221+iskyp@users.noreply.github.com> Date: Tue, 5 Jun 2018 20:34:50 -0700 Subject: [PATCH 1/2] Readds hunger slowdown --- code/modules/mob/living/carbon/human/species.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 2b5ed79d7b..6cb1997459 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1259,7 +1259,15 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(flight) . += ((health_deficiency-39) / 75) // CIT CHANGE - adds -39 to health deficiency penalty to make the transition to low health movement a little less jarring else +<<<<<<< HEAD . += ((health_deficiency-39) / 25) // CIT CHANGE - ditto +======= + . += (health_deficiency / 25) + if(CONFIG_GET(flag/disable_human_mood)) + var/hungry = (500 - H.nutrition) / 5 //So overeat would be 100 and default level would be 80 + if((hungry >= 70) && !flight) //Being hungry will still allow you to use a flightsuit/wings. + . += hungry / 50 +>>>>>>> c06c3b7... Readds Hunger Slowdown (#38294) GET_COMPONENT_FROM(mood, /datum/component/mood, H) if(mood && !flight) //How can depression slow you down if you can just fly away from your problems? From c93213ff257623d07bafa5a92a0cd294cdf90b5c Mon Sep 17 00:00:00 2001 From: deathride58 Date: Thu, 7 Jun 2018 00:35:26 -0400 Subject: [PATCH 2/2] Update species.dm --- code/modules/mob/living/carbon/human/species.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 6cb1997459..9d32cab4a8 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1259,15 +1259,11 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(flight) . += ((health_deficiency-39) / 75) // CIT CHANGE - adds -39 to health deficiency penalty to make the transition to low health movement a little less jarring else -<<<<<<< HEAD . += ((health_deficiency-39) / 25) // CIT CHANGE - ditto -======= - . += (health_deficiency / 25) if(CONFIG_GET(flag/disable_human_mood)) var/hungry = (500 - H.nutrition) / 5 //So overeat would be 100 and default level would be 80 if((hungry >= 70) && !flight) //Being hungry will still allow you to use a flightsuit/wings. . += hungry / 50 ->>>>>>> c06c3b7... Readds Hunger Slowdown (#38294) GET_COMPONENT_FROM(mood, /datum/component/mood, H) if(mood && !flight) //How can depression slow you down if you can just fly away from your problems?