From db3b3ef6e4b4261e616c247d2813a66c534f3d58 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sun, 2 Jun 2019 17:00:48 +1000 Subject: [PATCH] Prevents amber slime feeding from healing slimes --- .../subtypes/slime/xenobio/consumption.dm | 13 +++++++------ .../simple_mob/subtypes/slime/xenobio/subtypes.dm | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/consumption.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/consumption.dm index b997dde35d..84af3fcc3c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/consumption.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/consumption.dm @@ -1,7 +1,7 @@ // Handles hunger, starvation, growth, and eatting humans. // Might be best to make this a /mob/living proc and override. -/mob/living/simple_mob/slime/xenobio/proc/adjust_nutrition(input) +/mob/living/simple_mob/slime/xenobio/proc/adjust_nutrition(input, var/heal = 1) nutrition = between(0, nutrition + input, get_max_nutrition()) if(input > 0) @@ -12,11 +12,12 @@ adjustToxLoss(-10) // Heal 1 point of damage per 5 nutrition coming in. - adjustBruteLoss(-input * 0.2) - adjustFireLoss(-input * 0.2) - adjustToxLoss(-input * 0.2) - adjustOxyLoss(-input * 0.2) - adjustCloneLoss(-input * 0.2) + if(heal) + adjustBruteLoss(-input * 0.2) + adjustFireLoss(-input * 0.2) + adjustToxLoss(-input * 0.2) + adjustOxyLoss(-input * 0.2) + adjustCloneLoss(-input * 0.2) /mob/living/simple_mob/slime/xenobio/proc/get_max_nutrition() // Can't go above it diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm index 52fbb7924d..fe148b544b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm @@ -450,7 +450,7 @@ continue if(istype(L, /mob/living/simple_mob/slime/xenobio)) var/mob/living/simple_mob/slime/xenobio/X = L - X.adjust_nutrition(rand(15, 25)) + X.adjust_nutrition(rand(15, 25), 0) if(ishuman(L)) var/mob/living/carbon/human/H = L if(H.isSynthetic())