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

Merge branch 'master' into xantholne-christmas01

Browse Source
This commit is contained in:
Unknown
2019-12-06 17:21:08 -07:00
parent e929728666 0598c35d70
commit 97e686cf23
269 changed files with 10257 additions and 7157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vending/clothesmate.dm
+13 -1
View File
@@ -16,6 +16,7 @@
/obj/item/clothing/suit/jacket = 4,
/obj/item/clothing/suit/jacket/puffer/vest = 4,
/obj/item/clothing/suit/jacket/puffer = 4,
/obj/item/clothing/suit/hooded/cloak/david = 4,
/obj/item/clothing/under/suit_jacket/navy = 3,
/obj/item/clothing/under/suit_jacket/really_black = 3,
/obj/item/clothing/under/suit_jacket/burgundy = 3,
@@ -24,6 +25,12 @@
/obj/item/clothing/under/kilt = 3,
/obj/item/clothing/under/overalls = 3,
/obj/item/clothing/under/sl_suit = 3,
/obj/item/clothing/under/bb_sweater = 3,
/obj/item/clothing/under/bb_sweater/black = 3,
/obj/item/clothing/under/bb_sweater/purple = 3,
/obj/item/clothing/under/bb_sweater/green = 3,
/obj/item/clothing/under/bb_sweater/red = 3,
/obj/item/clothing/under/bb_sweater/blue = 3,
/obj/item/clothing/under/pants/jeans = 5,
/obj/item/clothing/under/pants/classicjeans = 5,
/obj/item/clothing/under/pants/camo = 3,
@@ -78,6 +85,10 @@
/obj/item/clothing/suit/ianshirt = 3,
/obj/item/clothing/shoes/laceup = 5,
/obj/item/clothing/shoes/sneakers/black = 6,
/obj/item/clothing/shoes/wraps = 3,
/obj/item/clothing/shoes/wraps/silver = 3,
/obj/item/clothing/shoes/wraps/red = 3,
/obj/item/clothing/shoes/wraps/blue = 3,
/obj/item/clothing/shoes/sandal = 3,
/obj/item/clothing/gloves/fingerless = 3,
/obj/item/clothing/glasses/orange = 5,
@@ -128,7 +139,8 @@
/obj/item/clothing/under/jabroni = 2,
/obj/item/clothing/suit/vapeshirt = 2,
/obj/item/clothing/under/geisha = 4,
/obj/item/clothing/accessory/syndi_pokadots = 4)
/obj/item/clothing/accessory/syndi_pokadots = 4,
/obj/item/clothing/under/keyholesweater = 3)
premium = list(/obj/item/clothing/under/suit_jacket/checkered = 4,
/obj/item/clothing/head/mailman = 2,
/obj/item/clothing/under/rank/mailman = 2,