Conflicts galore

This commit is contained in:
Artur
2020-05-21 21:08:12 +03:00
532 changed files with 9131 additions and 5662 deletions
+1 -1
View File
@@ -225,7 +225,7 @@
desc = "Used for watching an empty arena."
icon = 'icons/obj/stationobjs.dmi'
icon_state = "telescreen"
layer = SIGN_LAYER
plane = ABOVE_WALL_PLANE
network = list("thunder")
density = FALSE
circuit = null