Merge branch 'master' into master

GainStation13/code/datums/diseases/advance/symptoms/berry.dm

@@ -49,7 +49,7 @@
 			to_chat(user, "<span class='warning'>You get some juice out of you...</span>")
 		return
 	..()
-
+ 
 /obj/effect/decal/cleanable/juice
 	name = "berry juice"
 	desc = "It's blue and smells enticingly sweet."
@@ -65,3 +65,13 @@
 
 /obj/effect/decal/cleanable/juice/streak
 	random_icon_states = list("streak1", "streak2", "streak3", "streak4", "streak5")
+
+//extreme variant, for admin or item purposes
+/datum/symptom/berry/extreme
+	name = "Extreme berrification"
+	stealth = -7
+	resistance = 11
+	stage_speed = 10
+	transmittable = 2
+	level = 7
+	severity = 5

GainStation13/code/modules/clothing/under/jobs/modcivilian.dm

@@ -151,7 +151,6 @@
 	name = "grey modular bra" 
 	desc = "A tasteful grey bra that reminds you of the good old days. Now adjusts to the match the wearer's size!"
 	icon_location = 'GainStation13/icons/mob/modclothes/graymodular_bra.dmi'
-	icon = 'GainStation13/icons/mob/modclothes/gray_bra.dmi'
 	icon_state = "grey"
-	item_state = "defaultsuit"
-	item_color = "defaultsuit"
+	item_state = "grey_bra"
+	item_color = "grey_bra"