shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into greytide-standard-uniform

Browse Source
This commit is contained in:
Hatterhat
2020-01-12 12:39:57 -06:00
parent 7216ae545c 8c50b578b4
commit 7fac15caeb
1057 changed files with 194047 additions and 195760 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vending/clothesmate.dm
+7 -1
View File
@@ -134,7 +134,13 @@
/obj/item/clothing/head/christmashatg = 3,
/obj/item/clothing/shoes/winterboots/christmasbootsr = 3,
/obj/item/clothing/shoes/winterboots/christmasbootsg = 3,
/obj/item/clothing/shoes/winterboots/santaboots = 3)
/obj/item/clothing/shoes/winterboots/santaboots = 3,
/obj/item/clothing/head/cowboyhat = 3,
/obj/item/clothing/head/cowboyhat/black = 3,
/obj/item/clothing/head/cowboyhat/white = 3,
/obj/item/clothing/head/cowboyhat/pink = 3,
/obj/item/clothing/shoes/cowboyboots = 3,
/obj/item/clothing/shoes/cowboyboots/black = 3)
contraband = list(/obj/item/clothing/under/syndicate/tacticool = 3,
/obj/item/clothing/under/syndicate/tacticool/skirt = 3,
/obj/item/clothing/mask/balaclava = 3,