upstream-merge-28062

This commit is contained in:
LetterJay
2017-06-12 12:20:07 -05:00
parent 87ce1e1780
commit 55d30f865b
29 changed files with 667 additions and 141 deletions
@@ -84,6 +84,7 @@
new /obj/item/device/flashlight/seclite(src)
new /obj/item/weapon/pinpointer(src)
new /obj/item/clothing/under/rank/head_of_security/grey(src)
new /obj/item/clothing/under/rank/head_of_security/grey(src)
new /obj/item/weapon/storage/lockbox/secmedal(src)
/obj/structure/closet/secure_closet/warden
+1
View File
@@ -248,6 +248,7 @@
/obj/structure/grille/ratvar
icon_state = "ratvargrille"
name = "cog grille"
desc = "A strangely-shaped grille."
broken_type = /obj/structure/grille/ratvar/broken
+1 -1
View File
@@ -50,7 +50,7 @@
deconstruct()
/obj/structure/lattice/clockwork
name = "clockwork lattice"
name = "cog lattice"
desc = "A lightweight support lattice. These hold the Justicar's station together."
icon = 'icons/obj/smooth_structures/lattice_clockwork.dmi'