Merge pull request #5516 from Citadel-Station-13/upstream-merge-35668

[MIRROR] Quote the armor lists
This commit is contained in:
deathride58
2018-02-17 19:29:50 +00:00
committed by GitHub
148 changed files with 734 additions and 730 deletions
+1 -1
View File
@@ -37,7 +37,7 @@
icon_state = "xmashat"
desc = "A crappy paper hat that you are REQUIRED to wear."
flags_inv = 0
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
/obj/effect/landmark/xmastree
name = "christmas tree spawner"