From c7a7346939ae5782c43eab89c3b87b430cdce1a9 Mon Sep 17 00:00:00 2001 From: bunny232 Date: Mon, 19 Jul 2021 07:36:22 -0400 Subject: [PATCH 1/6] 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/6] 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...") From b4bcfc3ffb5678b90dbf11cb54be9400b8c418f8 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Thu, 12 Aug 2021 17:06:08 -0700 Subject: [PATCH 3/6] Update repair.dm --- code/modules/procedural_mapping/mapGenerators/repair.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/procedural_mapping/mapGenerators/repair.dm b/code/modules/procedural_mapping/mapGenerators/repair.dm index d9380a40dd..a36ac88d6c 100644 --- a/code/modules/procedural_mapping/mapGenerators/repair.dm +++ b/code/modules/procedural_mapping/mapGenerators/repair.dm @@ -41,6 +41,7 @@ set waitfor = FALSE var/turf/B = L atoms += B + B.assemble_baseturfs(B.type) for(var/A in B) atoms += A if(istype(A,/obj/structure/cable)) From d1a1c737d4d1722b8a940f56f5d4ac81aec1b7be Mon Sep 17 00:00:00 2001 From: BlueWildrose <57083662+BlueWildrose@users.noreply.github.com> Date: Fri, 13 Aug 2021 11:29:54 -0700 Subject: [PATCH 4/6] Blacklists incapacitated mobs from being sentience event candidates --- code/modules/events/sentience.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/events/sentience.dm b/code/modules/events/sentience.dm index ba14a5307f..d90792c88f 100644 --- a/code/modules/events/sentience.dm +++ b/code/modules/events/sentience.dm @@ -37,7 +37,7 @@ continue if(L.mob_biotypes & blacklisted_biotypes) //hey can you don't continue - if(!(L in GLOB.player_list) && !L.mind) + if(!(L in GLOB.player_list) && !L.mind && !L.incapacitated()) potential += L if(!potential.len) From 82e50c82cc08c0e2550c39fe9ae51e9aa18b191f Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 15 Aug 2021 02:20:14 -0500 Subject: [PATCH 5/6] Automatic changelog generation for PR #15005 [ci skip] --- html/changelogs/AutoChangeLog-pr-15005.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15005.yml diff --git a/html/changelogs/AutoChangeLog-pr-15005.yml b/html/changelogs/AutoChangeLog-pr-15005.yml new file mode 100644 index 0000000000..2c26c56975 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15005.yml @@ -0,0 +1,4 @@ +author: "BlueWildrose" +delete-after: True +changes: + - bugfix: "Incapacitated mobs are blacklisted from being human-level intelligence sentience event candidates. This is particularly important due to slimes in BZ stasis on the station." From 8b532b8a214b395e1f0b6096e2deba2066e78f52 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 15 Aug 2021 02:20:37 -0500 Subject: [PATCH 6/6] Automatic changelog generation for PR #14991 [ci skip] --- html/changelogs/AutoChangeLog-pr-14991.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14991.yml diff --git a/html/changelogs/AutoChangeLog-pr-14991.yml b/html/changelogs/AutoChangeLog-pr-14991.yml new file mode 100644 index 0000000000..db9ef4fe87 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14991.yml @@ -0,0 +1,4 @@ +author: "bunny232" +delete-after: True +changes: + - bugfix: "Polyvitiligo actually changes your color now"