Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

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

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("<span class='warning'>[M] looks rather vibrant...</span>", "<span class='notice'>The colors, man, the colors...</span>")

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)

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))

html/changelogs/AutoChangeLog-pr-14991.yml

@@ -0,0 +1,4 @@
+author: "bunny232"
+delete-after: True
+changes: 
+  - bugfix: "Polyvitiligo actually changes your color now"

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."