From ae7dc13cdd33f993e550f15e1b540b61fb220c7e Mon Sep 17 00:00:00 2001 From: Henri215 <77684085+Henri215@users.noreply.github.com> Date: Tue, 7 Mar 2023 02:00:36 -0300 Subject: [PATCH] Reorganizes and Adds Items to the Clothing Vendors V2 (#20434) --- .../game/machinery/vendors/generic_vendors.dm | 288 +++++++++++------- .../machinery/vendors/wardrobe_vendors.dm | 2 + 2 files changed, 177 insertions(+), 113 deletions(-) diff --git a/code/game/machinery/vendors/generic_vendors.dm b/code/game/machinery/vendors/generic_vendors.dm index 66c1e9bb3d5..523d56dc618 100644 --- a/code/game/machinery/vendors/generic_vendors.dm +++ b/code/game/machinery/vendors/generic_vendors.dm @@ -121,17 +121,36 @@ icon_panel = "syndi" icon_broken = "wide_vendor" ads_list = list("Warning, not all hats are dog/monkey compatible. Apply forcefully with care.","Apply directly to the forehead.","Who doesn't love spending cash on hats?!","From the people that brought you collectable hat crates, Hatlord!") - products = list(/obj/item/clothing/head/bowlerhat = 10, + products = list(/obj/item/clothing/head/that = 2, + /obj/item/clothing/head/bowlerhat = 10, /obj/item/clothing/head/beaverhat = 10, /obj/item/clothing/head/boaterhat = 10, /obj/item/clothing/head/fedora = 10, + /obj/item/clothing/head/cowboyhat = 10, + /obj/item/clothing/head/cowboyhat/black = 10, /obj/item/clothing/head/fez = 10, + /obj/item/clothing/head/soft/solgov = 10, /obj/item/clothing/head/beret = 10, + /obj/item/clothing/head/beret/black = 10, + /obj/item/clothing/head/hairflower = 10, + /obj/item/clothing/head/mailman = 1, /obj/item/clothing/head/soft/rainbow = 1) contraband = list(/obj/item/clothing/head/bearpelt = 5) - prices = list(/obj/item/clothing/head/bowlerhat = 20, /obj/item/clothing/head/beaverhat = 20, /obj/item/clothing/head/boaterhat = 20, - /obj/item/clothing/head/fedora = 20, /obj/item/clothing/head/beret = 20, /obj/item/clothing/head/fez = 20, - /obj/item/clothing/head/bearpelt = 30, /obj/item/clothing/head/soft/rainbow = 40) + prices = list(/obj/item/clothing/head/that = 30, + /obj/item/clothing/head/bowlerhat = 20, + /obj/item/clothing/head/beaverhat = 20, + /obj/item/clothing/head/boaterhat = 20, + /obj/item/clothing/head/fedora = 20, + /obj/item/clothing/head/cowboyhat = 20, + /obj/item/clothing/head/cowboyhat/black = 20, + /obj/item/clothing/head/fez = 20, + /obj/item/clothing/head/soft/solgov = 20, + /obj/item/clothing/head/beret = 20, + /obj/item/clothing/head/beret/black = 20, + /obj/item/clothing/head/hairflower = 20, + /obj/item/clothing/head/mailman = 60, + /obj/item/clothing/head/soft/rainbow = 40, + /obj/item/clothing/head/bearpelt = 30) refill_canister = /obj/item/vending_refill/hatdispenser /obj/machinery/economy/vending/suitdispenser @@ -142,16 +161,54 @@ icon_panel = "syndi" icon_broken = "wide_vendor" ads_list = list("Pre-Ironed, Pre-Washed, Pre-Wor-*BZZT*","Blood of your enemies washes right out!","Who are YOU wearing?","Look dapper! Look like an idiot!","Dont carry your size? How about you shave off some pounds you fat lazy- *BZZT*") - products = list(/obj/item/clothing/under/color/black = 10, /obj/item/clothing/under/color/grey = 10, /obj/item/clothing/under/color/white = 10, /obj/item/clothing/under/color/darkred = 10, /obj/item/clothing/under/color/red = 10, /obj/item/clothing/under/color/lightred = 10, - /obj/item/clothing/under/color/brown = 10, /obj/item/clothing/under/color/orange = 10, /obj/item/clothing/under/color/lightbrown = 10, /obj/item/clothing/under/color/yellow = 10, /obj/item/clothing/under/color/yellowgreen = 10, /obj/item/clothing/under/color/lightgreen = 10, - /obj/item/clothing/under/color/green = 10, /obj/item/clothing/under/color/aqua = 10, /obj/item/clothing/under/color/darkblue = 10, /obj/item/clothing/under/color/blue = 10, /obj/item/clothing/under/color/lightblue = 10, /obj/item/clothing/under/color/purple = 10, - /obj/item/clothing/under/color/lightpurple = 10, /obj/item/clothing/under/color/pink = 10, /obj/item/clothing/under/color/rainbow = 1) - contraband = list(/obj/item/clothing/under/syndicate/tacticool = 5,/obj/item/clothing/under/color/orange/prison = 5) - prices = list(/obj/item/clothing/under/color/black = 30, /obj/item/clothing/under/color/grey = 30, /obj/item/clothing/under/color/white = 50, /obj/item/clothing/under/color/darkred = 50, /obj/item/clothing/under/color/red = 50, /obj/item/clothing/under/color/lightred = 50, - /obj/item/clothing/under/color/brown = 30, /obj/item/clothing/under/color/orange = 50, /obj/item/clothing/under/color/lightbrown = 30, /obj/item/clothing/under/color/yellow = 50, /obj/item/clothing/under/color/yellowgreen = 50, /obj/item/clothing/under/color/lightgreen = 50, - /obj/item/clothing/under/color/green = 50, /obj/item/clothing/under/color/aqua = 50, /obj/item/clothing/under/color/darkblue = 50, /obj/item/clothing/under/color/blue = 50, /obj/item/clothing/under/color/lightblue = 30, /obj/item/clothing/under/color/purple = 50, - /obj/item/clothing/under/color/lightpurple = 50, /obj/item/clothing/under/color/pink = 50, /obj/item/clothing/under/syndicate/tacticool = 75, - /obj/item/clothing/under/color/orange/prison = 75, /obj/item/clothing/under/color/rainbow = 100) + products = list(/obj/item/clothing/under/color/black = 10, + /obj/item/clothing/under/dress/blackskirt = 10, + /obj/item/clothing/under/color/grey = 10, + /obj/item/clothing/under/color/white = 10, + /obj/item/clothing/under/color/darkred = 10, + /obj/item/clothing/under/color/red = 10, + /obj/item/clothing/under/color/lightred = 10, + /obj/item/clothing/under/color/brown = 10, + /obj/item/clothing/under/color/orange = 10, + /obj/item/clothing/under/color/lightbrown = 10, + /obj/item/clothing/under/color/yellow = 10, + /obj/item/clothing/under/color/yellowgreen = 10, + /obj/item/clothing/under/color/lightgreen = 10, + /obj/item/clothing/under/color/green = 10, + /obj/item/clothing/under/color/aqua = 10, + /obj/item/clothing/under/color/darkblue = 10, + /obj/item/clothing/under/color/blue = 10, + /obj/item/clothing/under/color/lightblue = 10, + /obj/item/clothing/under/color/purple = 10, + /obj/item/clothing/under/color/lightpurple = 10, + /obj/item/clothing/under/color/pink = 10, + /obj/item/clothing/under/color/rainbow = 1) + contraband = list(/obj/item/clothing/under/syndicate/tacticool = 5, + /obj/item/clothing/under/color/orange/prison = 5) + prices = list(/obj/item/clothing/under/color/black = 30, + /obj/item/clothing/under/dress/blackskirt = 30, + /obj/item/clothing/under/color/grey = 30, + /obj/item/clothing/under/color/white = 50, + /obj/item/clothing/under/color/darkred = 50, + /obj/item/clothing/under/color/red = 50, + /obj/item/clothing/under/color/lightred = 50, + /obj/item/clothing/under/color/brown = 30, + /obj/item/clothing/under/color/orange = 50, + /obj/item/clothing/under/color/lightbrown = 30, + /obj/item/clothing/under/color/yellow = 50, + /obj/item/clothing/under/color/yellowgreen = 50, + /obj/item/clothing/under/color/lightgreen = 50, + /obj/item/clothing/under/color/green = 50, + /obj/item/clothing/under/color/aqua = 50, + /obj/item/clothing/under/color/darkblue = 50, + /obj/item/clothing/under/color/blue = 50, + /obj/item/clothing/under/color/lightblue = 30, + /obj/item/clothing/under/color/purple = 50, + /obj/item/clothing/under/color/lightpurple = 50, + /obj/item/clothing/under/color/pink = 50, + /obj/item/clothing/under/color/rainbow = 100, + /obj/item/clothing/under/syndicate/tacticool = 75, + /obj/item/clothing/under/color/orange/prison = 75) refill_canister = /obj/item/vending_refill/suitdispenser /obj/machinery/economy/vending/shoedispenser @@ -162,14 +219,38 @@ icon_panel = "syndi" icon_broken = "wide_vendor" ads_list = list("Put your foot down!","One size fits all!","IM WALKING ON SUNSHINE!","No hobbits allowed.","NO PLEASE WILLY, DONT HURT ME- *BZZT*") - products = list(/obj/item/clothing/shoes/black = 10, /obj/item/clothing/shoes/brown = 10, /obj/item/clothing/shoes/blue = 10, - /obj/item/clothing/shoes/green = 10, /obj/item/clothing/shoes/yellow = 10, /obj/item/clothing/shoes/purple = 10, - /obj/item/clothing/shoes/red = 10, /obj/item/clothing/shoes/white = 10, /obj/item/clothing/shoes/sandal = 10, /obj/item/clothing/shoes/rainbow = 1) + products = list(/obj/item/clothing/shoes/black = 10, + /obj/item/clothing/shoes/brown = 10, + /obj/item/clothing/shoes/blue = 10, + /obj/item/clothing/shoes/green = 10, + /obj/item/clothing/shoes/yellow = 10, + /obj/item/clothing/shoes/purple = 10, + /obj/item/clothing/shoes/red = 10, + /obj/item/clothing/shoes/white = 10, + /obj/item/clothing/shoes/laceup = 10, + /obj/item/clothing/shoes/sandal = 10, + /obj/item/clothing/shoes/jackboots = 10, + /obj/item/clothing/shoes/winterboots = 10, + /obj/item/clothing/shoes/cowboy = 10, + /obj/item/clothing/shoes/cowboy/black = 10, + /obj/item/clothing/shoes/rainbow = 1) contraband = list(/obj/item/clothing/shoes/orange = 5) - prices= list(/obj/item/clothing/shoes/black = 20, /obj/item/clothing/shoes/brown = 20, /obj/item/clothing/shoes/blue = 20, - /obj/item/clothing/shoes/green = 20, /obj/item/clothing/shoes/yellow = 20, /obj/item/clothing/shoes/purple = 20, - /obj/item/clothing/shoes/red = 20, /obj/item/clothing/shoes/white = 20, /obj/item/clothing/shoes/sandal = 20, - /obj/item/clothing/shoes/orange = 40, /obj/item/clothing/shoes/rainbow = 40) + prices= list(/obj/item/clothing/shoes/black = 20, + /obj/item/clothing/shoes/brown = 20, + /obj/item/clothing/shoes/blue = 20, + /obj/item/clothing/shoes/green = 20, + /obj/item/clothing/shoes/yellow = 20, + /obj/item/clothing/shoes/purple = 20, + /obj/item/clothing/shoes/red = 20, + /obj/item/clothing/shoes/white = 20, + /obj/item/clothing/shoes/laceup = 40, + /obj/item/clothing/shoes/sandal = 20, + /obj/item/clothing/shoes/jackboots = 20, + /obj/item/clothing/shoes/winterboots = 20, + /obj/item/clothing/shoes/cowboy = 20, + /obj/item/clothing/shoes/cowboy/black = 20, + /obj/item/clothing/shoes/orange = 40, + /obj/item/clothing/shoes/rainbow = 40) refill_canister = /obj/item/vending_refill/shoedispenser //don't forget to change the refill size if you change the machine's contents! @@ -182,26 +263,29 @@ slogan_list = list("Dress for success!","Prepare to look swagalicious!","Look at all this free swag!","Why leave style up to fate? Use the ClothesMate!") vend_delay = 15 vend_reply = "Thank you for using the ClothesMate!" - products = list(/obj/item/clothing/head/that = 2, - /obj/item/clothing/head/fedora = 1, - /obj/item/clothing/glasses/monocle = 1, + products = list(/obj/item/clothing/suit/ianshirt = 2, + /obj/item/clothing/under/misc/overalls = 2, + /obj/item/clothing/under/misc/mailman = 1, /obj/item/clothing/under/suit/navy = 2, - /obj/item/clothing/under/costume/kilt = 1, - /obj/item/clothing/under/misc/overalls = 1, /obj/item/clothing/under/suit/really_black = 2, + /obj/item/clothing/under/suit/checkered = 1, /obj/item/clothing/suit/storage/lawyer/blackjacket = 2, /obj/item/clothing/under/pants/jeans = 3, - /obj/item/clothing/under/pants/classicjeans = 2, - /obj/item/clothing/under/pants/camo = 1, - /obj/item/clothing/under/pants/blackjeans = 2, - /obj/item/clothing/under/pants/khaki = 2, - /obj/item/clothing/under/pants/white = 2, - /obj/item/clothing/under/pants/red = 1, - /obj/item/clothing/under/pants/black = 2, - /obj/item/clothing/under/pants/tan = 2, - /obj/item/clothing/under/pants/blue = 1, - /obj/item/clothing/under/pants/track = 1, - /obj/item/clothing/suit/jacket/miljacket = 1, + /obj/item/clothing/under/pants/classicjeans = 3, + /obj/item/clothing/under/pants/mustangjeans = 1, + /obj/item/clothing/under/pants/camo = 3, + /obj/item/clothing/under/pants/blackjeans = 3, + /obj/item/clothing/under/pants/khaki = 3, + /obj/item/clothing/under/pants/white = 3, + /obj/item/clothing/under/pants/red = 3, + /obj/item/clothing/under/pants/black = 3, + /obj/item/clothing/under/pants/tan = 3, + /obj/item/clothing/under/pants/blue = 3, + /obj/item/clothing/under/pants/track = 3, + /obj/item/clothing/suit/jacket/miljacket = 3, + /obj/item/clothing/suit/jacket/miljacket/white = 3, + /obj/item/clothing/suit/jacket/miljacket/desert = 3, + /obj/item/clothing/suit/jacket/miljacket/navy = 3, /obj/item/clothing/head/beanie = 3, /obj/item/clothing/head/beanie/black = 3, /obj/item/clothing/head/beanie/red = 3, @@ -217,48 +301,48 @@ /obj/item/clothing/head/beanie/stripedblue = 3, /obj/item/clothing/head/beanie/stripedgreen = 3, /obj/item/clothing/head/beanie/rasta = 3, - /obj/item/clothing/accessory/scarf/red = 1, - /obj/item/clothing/accessory/scarf/green = 1, - /obj/item/clothing/accessory/scarf/darkblue = 1, - /obj/item/clothing/accessory/scarf/purple = 1, - /obj/item/clothing/accessory/scarf/yellow = 1, - /obj/item/clothing/accessory/scarf/orange = 1, - /obj/item/clothing/accessory/scarf/lightblue = 1, - /obj/item/clothing/accessory/scarf/white = 1, - /obj/item/clothing/accessory/scarf/black = 1, - /obj/item/clothing/accessory/scarf/zebra = 1, - /obj/item/clothing/accessory/scarf/christmas = 1, - /obj/item/clothing/accessory/stripedredscarf = 1, - /obj/item/clothing/accessory/stripedbluescarf = 1, - /obj/item/clothing/accessory/stripedgreenscarf = 1, - /obj/item/clothing/accessory/waistcoat = 1, + /obj/item/clothing/accessory/scarf/red = 3, + /obj/item/clothing/accessory/scarf/green = 3, + /obj/item/clothing/accessory/scarf/darkblue = 3, + /obj/item/clothing/accessory/scarf/purple = 3, + /obj/item/clothing/accessory/scarf/yellow = 3, + /obj/item/clothing/accessory/scarf/orange = 3, + /obj/item/clothing/accessory/scarf/lightblue = 3, + /obj/item/clothing/accessory/scarf/white = 3, + /obj/item/clothing/accessory/scarf/black = 3, + /obj/item/clothing/accessory/scarf/zebra = 3, + /obj/item/clothing/accessory/scarf/christmas = 3, + /obj/item/clothing/accessory/stripedredscarf = 3, + /obj/item/clothing/accessory/stripedbluescarf = 3, + /obj/item/clothing/accessory/stripedgreenscarf = 3, + /obj/item/clothing/accessory/blue = 3, + /obj/item/clothing/accessory/red = 3, + /obj/item/clothing/accessory/black = 3, + /obj/item/clothing/accessory/waistcoat = 2, /obj/item/clothing/under/dress/sundress = 2, - /obj/item/clothing/under/dress/stripeddress = 1, - /obj/item/clothing/under/dress/sailordress = 1, - /obj/item/clothing/under/dress/redeveninggown = 1, - /obj/item/clothing/under/dress/blacktango = 1, + /obj/item/clothing/under/dress/stripeddress = 2, + /obj/item/clothing/under/dress/sailordress = 2, + /obj/item/clothing/under/dress/redeveninggown = 2, + /obj/item/clothing/under/dress/blacktango = 2, + /obj/item/clothing/suit/hooded/wintercoat = 3, /obj/item/clothing/suit/jacket = 3, + /obj/item/clothing/suit/hooded/hoodie = 3, + /obj/item/clothing/suit/hooded/hoodie/blue = 3, /obj/item/clothing/suit/jacket/motojacket = 3, + /obj/item/clothing/suit/jacket/leather = 1, + /obj/item/clothing/suit/blacktrenchcoat = 3, + /obj/item/clothing/suit/browntrenchcoat = 3, + /obj/item/clothing/mask/bandana = 2, + /obj/item/clothing/mask/bandana/black = 2, /obj/item/clothing/glasses/regular = 2, /obj/item/clothing/glasses/sunglasses_fake = 2, - /obj/item/clothing/head/sombrero = 1, - /obj/item/clothing/suit/poncho = 1, - /obj/item/clothing/suit/ianshirt = 1, - /obj/item/clothing/shoes/laceup = 2, - /obj/item/clothing/shoes/black = 4, - /obj/item/clothing/shoes/sandal = 1, /obj/item/clothing/gloves/fingerless = 2, /obj/item/storage/belt/fannypack = 1, /obj/item/storage/belt/fannypack/blue = 1, /obj/item/storage/belt/fannypack/red = 1, /obj/item/clothing/suit/mantle = 2, /obj/item/clothing/suit/mantle/old = 1, - /obj/item/clothing/suit/mantle/regal = 2, - /obj/item/clothing/under/suit/checkered = 1, - /obj/item/clothing/head/mailman = 1, - /obj/item/clothing/under/misc/mailman = 1, - /obj/item/clothing/suit/jacket/leather = 1, - /obj/item/clothing/under/pants/mustangjeans = 1) + /obj/item/clothing/suit/mantle/regal = 2) contraband = list(/obj/item/clothing/under/syndicate/tacticool = 1, /obj/item/clothing/mask/balaclava = 1, @@ -266,16 +350,14 @@ /obj/item/clothing/under/costume/soviet = 1, /obj/item/storage/belt/fannypack/black = 1) - prices = list(/obj/item/clothing/head/that = 20, - /obj/item/clothing/head/fedora = 20, - /obj/item/clothing/glasses/monocle = 20, - /obj/item/clothing/under/suit/navy = 75, - /obj/item/clothing/under/costume/kilt = 75, + prices = list(/obj/item/clothing/under/suit/navy = 75, /obj/item/clothing/under/misc/overalls = 75, + /obj/item/clothing/under/suit/checkered = 125, /obj/item/clothing/under/suit/really_black = 75, /obj/item/clothing/suit/storage/lawyer/blackjacket = 75, /obj/item/clothing/under/pants/jeans = 75, /obj/item/clothing/under/pants/classicjeans = 75, + /obj/item/clothing/under/pants/mustangjeans = 100, /obj/item/clothing/under/pants/camo = 75, /obj/item/clothing/under/pants/blackjeans = 75, /obj/item/clothing/under/pants/khaki = 75, @@ -286,6 +368,9 @@ /obj/item/clothing/under/pants/blue = 75, /obj/item/clothing/under/pants/track = 75, /obj/item/clothing/suit/jacket/miljacket = 75, + /obj/item/clothing/suit/jacket/miljacket/white = 75, + /obj/item/clothing/suit/jacket/miljacket/desert = 75, + /obj/item/clothing/suit/jacket/miljacket/navy = 75, /obj/item/clothing/head/beanie = 30, /obj/item/clothing/head/beanie/black = 30, /obj/item/clothing/head/beanie/red = 30, @@ -315,22 +400,28 @@ /obj/item/clothing/accessory/stripedredscarf = 20, /obj/item/clothing/accessory/stripedbluescarf = 20, /obj/item/clothing/accessory/stripedgreenscarf = 20, + /obj/item/clothing/accessory/blue = 20, + /obj/item/clothing/accessory/red = 20, + /obj/item/clothing/accessory/black = 20, /obj/item/clothing/accessory/waistcoat = 20, /obj/item/clothing/under/dress/sundress = 75, /obj/item/clothing/under/dress/stripeddress = 75, /obj/item/clothing/under/dress/sailordress = 75, /obj/item/clothing/under/dress/redeveninggown = 100, /obj/item/clothing/under/dress/blacktango = 100, + /obj/item/clothing/suit/hooded/wintercoat = 75, /obj/item/clothing/suit/jacket = 75, + /obj/item/clothing/suit/hooded/hoodie = 75, + /obj/item/clothing/suit/hooded/hoodie/blue = 75, /obj/item/clothing/suit/jacket/motojacket = 75, + /obj/item/clothing/suit/jacket/leather = 100, + /obj/item/clothing/suit/blacktrenchcoat = 75, + /obj/item/clothing/suit/browntrenchcoat = 75, /obj/item/clothing/glasses/regular = 20, /obj/item/clothing/glasses/sunglasses_fake = 20, - /obj/item/clothing/head/sombrero = 40, - /obj/item/clothing/suit/poncho = 75, /obj/item/clothing/suit/ianshirt = 75, - /obj/item/clothing/shoes/laceup = 40, - /obj/item/clothing/shoes/black = 20, - /obj/item/clothing/shoes/sandal = 20, + /obj/item/clothing/mask/bandana = 30, + /obj/item/clothing/mask/bandana/black = 30, /obj/item/clothing/gloves/fingerless = 10, /obj/item/storage/belt/fannypack = 50, /obj/item/storage/belt/fannypack/blue = 50, @@ -338,11 +429,7 @@ /obj/item/clothing/suit/mantle = 20, /obj/item/clothing/suit/mantle/old = 20, /obj/item/clothing/suit/mantle/regal = 30, - /obj/item/clothing/under/suit/checkered = 125, - /obj/item/clothing/head/mailman = 60, - /obj/item/clothing/under/misc/mailman = 100, - /obj/item/clothing/suit/jacket/leather = 100, - /obj/item/clothing/under/pants/mustangjeans = 100) + /obj/item/clothing/under/misc/mailman = 100) refill_canister = /obj/item/vending_refill/clothing @@ -392,9 +479,7 @@ /obj/item/clothing/head/flatcap = 1, /obj/item/clothing/suit/storage/labcoat/mad = 1, /obj/item/clothing/glasses/gglasses = 1, - /obj/item/clothing/shoes/jackboots = 1, /obj/item/clothing/under/dress/schoolgirl = 1, - /obj/item/clothing/under/dress/blackskirt = 1, /obj/item/clothing/suit/toggle/owlwings = 1, /obj/item/clothing/under/costume/owl = 1, /obj/item/clothing/mask/gas/owl_mask = 1, @@ -402,11 +487,9 @@ /obj/item/clothing/under/costume/griffin = 1, /obj/item/clothing/shoes/griffin = 1, /obj/item/clothing/head/griffin = 1, - /obj/item/clothing/accessory/waistcoat = 1, /obj/item/clothing/under/suit/black = 1, - /obj/item/clothing/head/that =1, + /obj/item/clothing/head/that = 1, /obj/item/clothing/under/costume/kilt = 1, - /obj/item/clothing/accessory/waistcoat = 1, /obj/item/clothing/glasses/monocle =1, /obj/item/clothing/head/bowlerhat = 1, /obj/item/cane = 1, @@ -417,17 +500,13 @@ /obj/item/clothing/mask/gas/plaguedoctor = 1, /obj/item/clothing/suit/apron = 1, /obj/item/clothing/under/misc/waiter = 1, - /obj/item/clothing/suit/jacket/miljacket = 1, - /obj/item/clothing/suit/jacket/miljacket/white = 1, - /obj/item/clothing/suit/jacket/miljacket/desert = 1, - /obj/item/clothing/suit/jacket/miljacket/navy = 1, + /obj/item/clothing/accessory/cowboyshirt = 1, + /obj/item/clothing/accessory/cowboyshirt/navy = 1, /obj/item/clothing/under/costume/pirate = 1, /obj/item/clothing/suit/pirate_brown = 1, /obj/item/clothing/suit/pirate_black =1, /obj/item/clothing/under/costume/pirate_rags =1, /obj/item/clothing/head/pirate = 1, - /obj/item/clothing/head/bandana = 1, - /obj/item/clothing/head/bandana = 1, /obj/item/clothing/under/costume/soviet = 1, /obj/item/clothing/head/ushanka = 1, /obj/item/clothing/suit/imperium_monk = 1, @@ -459,17 +538,12 @@ /obj/item/clothing/suit/poncho = 1, /obj/item/clothing/suit/poncho/green = 1, /obj/item/clothing/suit/poncho/red = 1, - /obj/item/clothing/accessory/blue = 1, - /obj/item/clothing/accessory/red = 1, - /obj/item/clothing/accessory/black = 1, /obj/item/clothing/accessory/horrible = 1, /obj/item/clothing/under/costume/maid = 1, /obj/item/clothing/under/costume/janimaid = 1, /obj/item/clothing/under/costume/jester = 1, /obj/item/clothing/head/jester = 1, /obj/item/clothing/under/pants/camo = 1, - /obj/item/clothing/mask/bandana = 1, - /obj/item/clothing/mask/bandana/black = 1, /obj/item/clothing/shoes/singery = 1, /obj/item/clothing/under/costume/singery = 1, /obj/item/clothing/shoes/singerb = 1, @@ -518,9 +592,7 @@ /obj/item/clothing/head/flatcap = 30, /obj/item/clothing/suit/storage/labcoat/mad = 75, /obj/item/clothing/glasses/gglasses = 20, - /obj/item/clothing/shoes/jackboots = 30, /obj/item/clothing/under/dress/schoolgirl = 75, - /obj/item/clothing/under/dress/blackskirt = 75, /obj/item/clothing/suit/toggle/owlwings = 120, /obj/item/clothing/under/costume/owl = 100, /obj/item/clothing/mask/gas/owl_mask = 50, @@ -531,7 +603,6 @@ /obj/item/clothing/under/suit/black = 75, /obj/item/clothing/head/that = 30, /obj/item/clothing/under/costume/kilt = 75, - /obj/item/clothing/accessory/waistcoat = 30, /obj/item/clothing/glasses/monocle = 30, /obj/item/clothing/head/bowlerhat = 20, /obj/item/cane = 50, @@ -542,17 +613,13 @@ /obj/item/clothing/mask/gas/plaguedoctor = 50, /obj/item/clothing/suit/apron = 75, /obj/item/clothing/under/misc/waiter = 75, - /obj/item/clothing/suit/jacket/miljacket = 75, - /obj/item/clothing/suit/jacket/miljacket/white = 75, - /obj/item/clothing/suit/jacket/miljacket/desert = 75, - /obj/item/clothing/suit/jacket/miljacket/navy = 75, + /obj/item/clothing/accessory/cowboyshirt = 75, + /obj/item/clothing/accessory/cowboyshirt/navy = 75, /obj/item/clothing/under/costume/pirate = 100, /obj/item/clothing/suit/pirate_brown = 100, /obj/item/clothing/suit/pirate_black = 100, /obj/item/clothing/under/costume/pirate_rags = 100, /obj/item/clothing/head/pirate = 50, - /obj/item/clothing/head/bandana = 50, - /obj/item/clothing/head/bandana = 50, /obj/item/clothing/under/costume/soviet = 100, /obj/item/clothing/head/ushanka = 50, /obj/item/clothing/suit/imperium_monk = 120, @@ -584,17 +651,12 @@ /obj/item/clothing/suit/poncho = 75, /obj/item/clothing/suit/poncho/green = 75, /obj/item/clothing/suit/poncho/red = 75, - /obj/item/clothing/accessory/blue = 20, - /obj/item/clothing/accessory/red = 20, - /obj/item/clothing/accessory/black = 20, /obj/item/clothing/accessory/horrible = 30, /obj/item/clothing/under/costume/maid = 75, /obj/item/clothing/under/costume/janimaid = 75, /obj/item/clothing/under/costume/jester = 100, /obj/item/clothing/head/jester = 50, /obj/item/clothing/under/pants/camo = 75, - /obj/item/clothing/mask/bandana = 30, - /obj/item/clothing/mask/bandana/black = 30, /obj/item/clothing/shoes/singery = 20, /obj/item/clothing/under/costume/singery = 75, /obj/item/clothing/shoes/singerb = 20, diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm index e6d513f2a9f..d5c139fdb1e 100644 --- a/code/game/machinery/vendors/wardrobe_vendors.dm +++ b/code/game/machinery/vendors/wardrobe_vendors.dm @@ -551,6 +551,7 @@ /obj/item/reagent_containers/glass/bucket = 3, /obj/item/clothing/suit/apron = 3, /obj/item/clothing/suit/apron/overalls = 3, + /obj/item/clothing/suit/hooded/wintercoat/hydro = 3, /obj/item/clothing/mask/bandana/botany = 3, /obj/item/clothing/accessory/armband/hydro = 3, /obj/item/storage/backpack/botany = 2, @@ -561,6 +562,7 @@ /obj/item/reagent_containers/glass/bucket = 15, /obj/item/clothing/suit/apron = 50, /obj/item/clothing/suit/apron/overalls = 50, + /obj/item/clothing/suit/hooded/wintercoat/hydro = 75, /obj/item/clothing/mask/bandana/botany = 20, /obj/item/clothing/accessory/armband/hydro = 20, /obj/item/storage/backpack/botany = 50,