From c7a7346939ae5782c43eab89c3b87b430cdce1a9 Mon Sep 17 00:00:00 2001 From: bunny232 Date: Mon, 19 Jul 2021 07:36:22 -0400 Subject: [PATCH 1/2] monophobia nerf --- code/datums/brain_damage/severe.dm | 2 +- tgstation.dme | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm index 3ba00d305b..ed0a9fbab8 100644 --- a/code/datums/brain_damage/severe.dm +++ b/code/datums/brain_damage/severe.dm @@ -164,7 +164,7 @@ /datum/brain_trauma/severe/monophobia/on_life() ..() if(check_alone()) - stress = min(stress + 0.5, 100) + stress = min(stress + 0.25, 100) if(stress > 10 && (prob(5))) stress_reaction() else diff --git a/tgstation.dme b/tgstation.dme index 298443fd4e..4ffe7a19af 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3621,6 +3621,7 @@ #include "code\modules\vehicles\atv.dm" #include "code\modules\vehicles\bicycle.dm" #include "code\modules\vehicles\lavaboat.dm" +#include "code\modules\vehicles\motorized_wheelchair.dm" #include "code\modules\vehicles\pimpin_ride.dm" #include "code\modules\vehicles\ridden.dm" #include "code\modules\vehicles\scooter.dm" @@ -3632,7 +3633,6 @@ #include "code\modules\vehicles\wheelchair.dm" #include "code\modules\vehicles\cars\car.dm" #include "code\modules\vehicles\cars\clowncar.dm" -#include "code\modules\vehicles\motorized_wheelchair.dm" #include "code\modules\vending\_vending.dm" #include "code\modules\vending\assist.dm" #include "code\modules\vending\autodrobe.dm" From f3363c7b4e8106eceb07ec0961e27e69945638ac Mon Sep 17 00:00:00 2001 From: bunny232 Date: Sun, 8 Aug 2021 09:05:47 -0400 Subject: [PATCH 2/2] Update skin.dm --- code/datums/diseases/advance/symptoms/skin.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/datums/diseases/advance/symptoms/skin.dm b/code/datums/diseases/advance/symptoms/skin.dm index d7a457aec1..1593d108a6 100644 --- a/code/datums/diseases/advance/symptoms/skin.dm +++ b/code/datums/diseases/advance/symptoms/skin.dm @@ -32,10 +32,8 @@ BONUS var/mob/living/M = A.affected_mob switch(A.stage) if(5) - var/static/list/banned_reagents = list(/datum/reagent/colorful_reagent/crayonpowder/invisible, /datum/reagent/colorful_reagent/crayonpowder/white) - var/color = pick(subtypesof(/datum/reagent/colorful_reagent/crayonpowder) - banned_reagents) if(M.reagents.total_volume <= (M.reagents.maximum_volume/10)) // no flooding humans with 1000 units of colorful reagent - M.reagents.add_reagent(color, 5) + M.reagents.add_reagent(/datum/reagent/colorful_reagent, 5) else if (prob(50)) // spam M.visible_message("[M] looks rather vibrant...", "The colors, man, the colors...")