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

2019-12-24 00:07:32 +01:00
parent e74339ce8b 3f42677254
commit d571bbd292
82 changed files with 9095 additions and 3384 deletions
@@ -72,6 +72,11 @@
 	desc = "It's still good. Four second rule!"
 	icon_state = "flour"

+/obj/effect/decal/cleanable/greenglow/ecto
+	name = "ectoplasmic puddle"
+	desc = "You know who to call."
+	light_power = 2
+
 /obj/effect/decal/cleanable/greenglow
 	name = "glowing goo"
 	desc = "Jeez. I hope that's not for lunch."