From bdf45ab8ec3139181388d6971fb5258552d0c986 Mon Sep 17 00:00:00 2001 From: Verkister Date: Sun, 14 Jun 2020 22:15:04 +0300 Subject: [PATCH 1/3] Earlyports prommie passive gain fix Fixes prommies passively gaining nutrition on every tick to reach the maxcap within minutes by just standing around regardless if they're even standing on dirt or even standing on a turf at all. --- .../carbon/human/species/station/prometheans.dm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans.dm b/code/modules/mob/living/carbon/human/species/station/prometheans.dm index fd440fbc525..a4d138b1187 100644 --- a/code/modules/mob/living/carbon/human/species/station/prometheans.dm +++ b/code/modules/mob/living/carbon/human/species/station/prometheans.dm @@ -188,14 +188,16 @@ var/datum/species/shapeshifter/promethean/prometheans if(istype(T)) if(!(H.shoes || (H.wear_suit && (H.wear_suit.body_parts_covered & FEET)))) for(var/obj/O in T) - O.clean_blood() - H.adjust_nutrition(rand(5, 15)) + if(O.clean_blood()) + H.adjust_nutrition(rand(5, 15)) if (istype(T, /turf/simulated)) var/turf/simulated/S = T - T.clean_blood() - S.dirt = 0 + if(T.clean_blood()) + H.adjust_nutrition(rand(10, 20)) + if(S.dirt > 0) + S.dirt = 0 + H.adjust_nutrition(rand(10, 20)) //VOREStation Edit Start - H.adjust_nutrition(H.nutrition < 500 ? rand(15, 30) : 0) if(H.clean_blood(1)) H.adjust_nutrition(H.nutrition < 500 ? rand(15, 30) : 0) if(H.r_hand) From 3b2d80af290bb4e4439e4ffeeeb81717787a00d2 Mon Sep 17 00:00:00 2001 From: Verkister Date: Sun, 14 Jun 2020 22:19:07 +0300 Subject: [PATCH 2/3] Update prometheans.dm --- .../mob/living/carbon/human/species/station/prometheans.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans.dm b/code/modules/mob/living/carbon/human/species/station/prometheans.dm index a4d138b1187..21c6a75a8a5 100644 --- a/code/modules/mob/living/carbon/human/species/station/prometheans.dm +++ b/code/modules/mob/living/carbon/human/species/station/prometheans.dm @@ -194,7 +194,7 @@ var/datum/species/shapeshifter/promethean/prometheans var/turf/simulated/S = T if(T.clean_blood()) H.adjust_nutrition(rand(10, 20)) - if(S.dirt > 0) + if(S.dirt > 50) S.dirt = 0 H.adjust_nutrition(rand(10, 20)) //VOREStation Edit Start From b2717bd39776f3e652b17010ce6ff6fd9e410280 Mon Sep 17 00:00:00 2001 From: Verkister Date: Sun, 14 Jun 2020 22:23:46 +0300 Subject: [PATCH 3/3] Update prometheans.dm --- .../carbon/human/species/station/prometheans.dm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans.dm b/code/modules/mob/living/carbon/human/species/station/prometheans.dm index 21c6a75a8a5..3fec201b212 100644 --- a/code/modules/mob/living/carbon/human/species/station/prometheans.dm +++ b/code/modules/mob/living/carbon/human/species/station/prometheans.dm @@ -197,28 +197,26 @@ var/datum/species/shapeshifter/promethean/prometheans if(S.dirt > 50) S.dirt = 0 H.adjust_nutrition(rand(10, 20)) - //VOREStation Edit Start if(H.clean_blood(1)) - H.adjust_nutrition(H.nutrition < 500 ? rand(15, 30) : 0) + H.adjust_nutrition(rand(5, 15)) if(H.r_hand) if(H.r_hand.clean_blood()) - H.adjust_nutrition(H.nutrition < 500 ? rand(15, 30) : 0) + H.adjust_nutrition(rand(5, 15)) if(H.l_hand) if(H.l_hand.clean_blood()) - H.adjust_nutrition(H.nutrition < 500 ? rand(15, 30) : 0) + H.adjust_nutrition(rand(5, 15)) if(H.head) if(H.head.clean_blood()) H.update_inv_head(0) - H.adjust_nutrition(H.nutrition < 500 ? rand(15, 30) : 0) + H.adjust_nutrition(rand(5, 15)) if(H.wear_suit) if(H.wear_suit.clean_blood()) H.update_inv_wear_suit(0) - H.adjust_nutrition(H.nutrition < 500 ? rand(15, 30) : 0) + H.adjust_nutrition(rand(5, 15)) if(H.w_uniform) if(H.w_uniform.clean_blood()) H.update_inv_w_uniform(0) - H.adjust_nutrition(H.nutrition < 500 ? rand(15, 30) : 0) - //VOREStation Edit End + H.adjust_nutrition(rand(5, 15)) //End cleaning code. var/datum/gas_mixture/environment = T.return_air()