From 6d9e8110f5449af3cc154cdfa9fc981e9c12ceb6 Mon Sep 17 00:00:00 2001 From: coiax Date: Sat, 27 Jan 2018 01:55:21 +0000 Subject: [PATCH 1/2] Mobs start with a random nutrition amount --- code/__DEFINES/mobs.dm | 3 +++ code/modules/mob/mob.dm | 4 ++++ code/modules/mob/mob_defines.dm | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 95a7b3c63d..4bfb70a257 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -76,6 +76,9 @@ #define NUTRITION_LEVEL_HUNGRY 250 #define NUTRITION_LEVEL_STARVING 150 +#define NUTRITION_LEVEL_START_MIN 250 +#define NUTRITION_LEVEL_START_MAX 400 + //Disgust levels for humans #define DISGUST_LEVEL_MAXEDOUT 150 #define DISGUST_LEVEL_DISGUSTED 75 diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 5bc054951b..269a52be78 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -33,7 +33,11 @@ continue var/datum/atom_hud/alternate_appearance/AA = v AA.onNewMob(src) +<<<<<<< HEAD hook_vr("mob_new",list(src)) +======= + nutrition = rand(NUTRITION_LEVEL_START_MIN, NUTRITION_LEVEL_START_MAX) +>>>>>>> 6f65453... Mobs start with a random nutrition amount (#34791) . = ..() /mob/GenerateTag() diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 719d82ce6a..d5bc46c029 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -44,7 +44,7 @@ var/drowsyness = 0//Carbon var/dizziness = 0//Carbon var/jitteriness = 0//Carbon - var/nutrition = NUTRITION_LEVEL_FED + 50//Carbon + var/nutrition = NUTRITION_LEVEL_START_MIN // randomised in Initialize var/satiety = 0//Carbon var/overeatduration = 0 // How long this guy is overeating //Carbon From 396245d85f0702158df3b1719dea6199f50efacd Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 27 Jan 2018 14:16:47 -0600 Subject: [PATCH 2/2] Update mob.dm --- code/modules/mob/mob.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 269a52be78..07caeba711 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -33,11 +33,8 @@ continue var/datum/atom_hud/alternate_appearance/AA = v AA.onNewMob(src) -<<<<<<< HEAD hook_vr("mob_new",list(src)) -======= nutrition = rand(NUTRITION_LEVEL_START_MIN, NUTRITION_LEVEL_START_MAX) ->>>>>>> 6f65453... Mobs start with a random nutrition amount (#34791) . = ..() /mob/GenerateTag()