Merge branch 'master' into upstream-merge-11110

This commit is contained in:
Nadyr
2021-07-16 19:09:43 -04:00
committed by GitHub
529 changed files with 1341 additions and 1359 deletions
+3 -3
View File
@@ -3,9 +3,9 @@
icon = 'icons/obj/stationobjs.dmi'
icon_state = "glassbox1"
desc = "A display case for prized possessions. It taunts you to kick it."
density = 1
anchored = 1
unacidable = 1//Dissolving the case would also delete the gun.
density = TRUE
anchored = TRUE
unacidable = TRUE//Dissolving the case would also delete the gun.
var/health = 30
var/occupied = 1
var/destroyed = 0