Merge branch 'master' into punishesarchie

This commit is contained in:
CygnusB
2021-01-19 06:30:10 -03:00
committed by GitHub
1465 changed files with 377136 additions and 202652 deletions
@@ -103,7 +103,7 @@
/obj/structure/closet/wardrobe/chaplain_black
name = "chapel wardrobe"
desc = "It's a storage unit for Nanotrasen-approved religious attire."
desc = "It's a storage unit for Kinaris-approved religious attire."
icon_door = "black"
/obj/structure/closet/wardrobe/chaplain_black/PopulateContents()
@@ -1,6 +1,6 @@
/obj/structure/closet/wardrobe
name = "wardrobe"
desc = "It's a storage unit for standard-issue Nanotrasen attire."
desc = "It's a storage unit for standard-issue Kinaris attire."
icon_door = "blue"
/obj/structure/closet/wardrobe/PopulateContents()
..()
@@ -60,7 +60,7 @@
return
/obj/structure/closet/wardrobe/orange
name = "prison wardrobe"
desc = "It's a storage unit for Nanotrasen-regulation prisoner attire."
desc = "It's a storage unit for Kinaris-regulation prisoner attire."
icon_door = "orange"
/obj/structure/closet/wardrobe/orange/PopulateContents()
for(var/i in 1 to 3)