Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

2019-09-13 12:58:02 -05:00
parent 2bf4d00d29 b2cde8e121
commit 53895106dc
966 changed files with 9385 additions and 2942 deletions
@@ -42,6 +42,9 @@
 /obj/effect/decal/cleanable/glass/ex_act()
 	qdel(src)

+/obj/effect/decal/cleanable/glass/plasma
+	icon_state = "plasmatiny"
+
 /obj/effect/decal/cleanable/dirt
 	name = "dirt"
 	desc = "Someone should clean that up."