Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HudRefactor

This commit is contained in:
Aurorablade
2015-12-17 22:43:09 -05:00
181 changed files with 15627 additions and 16269 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
icon_state = "girder"
anchored = 1
density = 1
layer = 2
layer = TURF_LAYER + 0.9
var/state = 0
var/health = 200