From b2090ce7f2607f5190fa8213b09062d113c9e7dc Mon Sep 17 00:00:00 2001 From: Casey Date: Mon, 22 Nov 2021 23:18:18 -0500 Subject: [PATCH 1/2] [MIRROR] Fixes simplemobs with 0 init nutrition runtiming --- code/modules/mob/living/simple_mob/life.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mob/living/simple_mob/life.dm b/code/modules/mob/living/simple_mob/life.dm index 652d7ce08e..58deb7ed87 100644 --- a/code/modules/mob/living/simple_mob/life.dm +++ b/code/modules/mob/living/simple_mob/life.dm @@ -54,7 +54,11 @@ healths.icon_state = "health7" //Updates the nutrition while we're here +<<<<<<< HEAD var/food_per = (nutrition / 500) * 100 //VOREStation Edit: Bandaid hardcode number to avoid misleading percentage based hunger alerts with our 6k cap. +======= + var/food_per = (nutrition / max_nutrition) * 100 +>>>>>>> a4f6cea907... Merge pull request #11872 from VOREStation/upstream-merge-8345 switch(food_per) if(90 to INFINITY) clear_alert("nutrition") From 695e9befa54b0580a34664bd92f909ca71e215a7 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Fri, 10 Dec 2021 01:22:53 -0700 Subject: [PATCH 2/2] powder that makes you say yes --- code/modules/mob/living/simple_mob/life.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/mob/living/simple_mob/life.dm b/code/modules/mob/living/simple_mob/life.dm index 58deb7ed87..254a4f0fc5 100644 --- a/code/modules/mob/living/simple_mob/life.dm +++ b/code/modules/mob/living/simple_mob/life.dm @@ -54,11 +54,7 @@ healths.icon_state = "health7" //Updates the nutrition while we're here -<<<<<<< HEAD - var/food_per = (nutrition / 500) * 100 //VOREStation Edit: Bandaid hardcode number to avoid misleading percentage based hunger alerts with our 6k cap. -======= var/food_per = (nutrition / max_nutrition) * 100 ->>>>>>> a4f6cea907... Merge pull request #11872 from VOREStation/upstream-merge-8345 switch(food_per) if(90 to INFINITY) clear_alert("nutrition")