Merge branch '13164'

2020-08-16 18:51:36 -07:00
parent a900c07846 f41c412cb9
commit 83e72b4f96
2 changed files with 8 additions and 2 deletions
@@ -58,6 +58,12 @@
 	if(exposed_temperature > 300)
 		PlasmaBurn(exposed_temperature)

+// Plasma floor that can't be removed, for disco
+
+/turf/open/floor/mineral/plasma/disco
+	name = "disco floor"
+/turf/open/floor/mineral/plasma/disco/crowbar_act(mob/living/user, obj/item/I)
+	return

 //GOLD