cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-27 07:08:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6192 from Heroman3003/amber-heal-fix

Browse Source 
Prevents amber slime feeding from healing slimes
This commit is contained in:
Atermonera
2019-06-04 09:15:20 -08:00
committed by GitHub
parent 995b581b67 db3b3ef6e4
commit 07cf484ac5
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_mob/subtypes/slime/xenobio/consumption.dm
+7 -6
View File
@@ -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
code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm
+1 -1
View File
@@ -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())