Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods

2019-07-31 19:24:39 -05:00
parent 7738c97b80 3d597ea508
commit 3499d73f6b
1257 changed files with 31159 additions and 17321 deletions
@@ -219,7 +219,7 @@
 	name = "stabilized plasma"
 	desc = "A puddle of stabilized plasma."
 	icon_state = "flour"
-	color = "#C8A5DC"
+	color = "#9e0089"

 /obj/effect/decal/cleanable/insectguts
 	name = "insect guts"