diff --git a/code/datums/outfits/costumes/halloween.dm b/code/datums/outfits/costumes/halloween.dm index 0fdad908c2..76b510807a 100644 --- a/code/datums/outfits/costumes/halloween.dm +++ b/code/datums/outfits/costumes/halloween.dm @@ -32,7 +32,7 @@ /decl/hierarchy/outfit/costume/horrorcop name = OUTFIT_COSTUME("Slasher Movie Cop") - uniform = /obj/item/clothing/under/pcrc{ starting_accessories=list(/obj/item/clothing/accessory/holster/hip) } + uniform = /obj/item/clothing/under/corp/pcrc{ starting_accessories=list(/obj/item/clothing/accessory/holster/hip) } shoes = /obj/item/clothing/shoes/black gloves = /obj/item/clothing/gloves/black glasses = /obj/item/clothing/glasses/fakesunglasses @@ -78,10 +78,9 @@ name = OUTFIT_COSTUME("Firefighter") uniform = /obj/item/clothing/under/pants shoes = /obj/item/clothing/shoes/boots/workboots - head = /obj/item/clothing/head/hardhat/red + head = /obj/item/clothing/head/hardhat/firefighter gloves = /obj/item/clothing/gloves/black suit = /obj/item/clothing/suit/fire/firefighter - mask = /obj/item/clothing/mask/gas /decl/hierarchy/outfit/costume/highlander name = OUTFIT_COSTUME("Highlander") diff --git a/code/datums/outfits/misc.dm b/code/datums/outfits/misc.dm index c9a43077b5..7facd60d5e 100644 --- a/code/datums/outfits/misc.dm +++ b/code/datums/outfits/misc.dm @@ -21,7 +21,7 @@ name = "Soviet soldier" uniform = /obj/item/clothing/under/soviet shoes = /obj/item/clothing/shoes/boots/combat - head = /obj/item/clothing/head/ushanka + head = /obj/item/clothing/head/ushanka/soviet gloves = /obj/item/clothing/gloves/combat back = /obj/item/weapon/storage/backpack/satchel belt = /obj/item/weapon/gun/projectile/revolver/mateba diff --git a/code/datums/supplypacks/costumes.dm b/code/datums/supplypacks/costumes.dm index 4af40491d3..1cf5292f9f 100644 --- a/code/datums/supplypacks/costumes.dm +++ b/code/datums/supplypacks/costumes.dm @@ -62,8 +62,8 @@ /obj/item/clothing/suit/nun, /obj/item/clothing/suit/imperium_monk, /obj/item/clothing/suit/ianshirt, - /obj/item/clothing/under/gimmick/rank/captain/suit, - /obj/item/clothing/under/gimmick/rank/head_of_personnel/suit, + /obj/item/clothing/under/suit_jacket/green, + /obj/item/clothing/under/suit_jacket/teal, /obj/item/clothing/under/lawyer/purpsuit, /obj/item/clothing/under/rank/mailman, /obj/item/clothing/under/dress/dress_saloon, diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 82070a520a..1a20865b03 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -167,14 +167,14 @@ qdel(src) /obj/effect/landmark/costume/madscientist/New() - new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc) + new /obj/item/clothing/under/suit_jacket/green(src.loc) new /obj/item/clothing/head/flatcap(src.loc) new /obj/item/clothing/suit/storage/toggle/labcoat/mad(src.loc) new /obj/item/clothing/glasses/gglasses(src.loc) delete_me = 1 /obj/effect/landmark/costume/elpresidente/New() - new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc) + new /obj/item/clothing/under/suit_jacket/green(src.loc) new /obj/item/clothing/head/flatcap(src.loc) new /obj/item/clothing/mask/smokable/cigarette/cigar/havana(src.loc) new /obj/item/clothing/shoes/boots/jackboots(src.loc) diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 82550df2ae..7643191642 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -37,6 +37,19 @@ sprite_name = "miniFE" rand_overlays = 0 +/obj/item/weapon/extinguisher/atmo + name = "atmospheric fire extinguisher" + desc = "A heavy duty fire extinguisher meant to fight large fires." + icon_state = "atmos_extinguisher0" + item_state = "atmos_extinguisher" + throwforce = 12 + w_class = ITEMSIZE_LARGE + force = 3.0 + max_water = 600 + spray_particles = 3 + sprite_name = "atmo_extinguisher" + rand_overlays = 0 + /obj/item/weapon/extinguisher/Initialize() create_reagents(max_water) reagents.add_reagent("firefoam", max_water) diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 54413bb6e0..e3fbab67e0 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -8,7 +8,7 @@ w_class = ITEMSIZE_NORMAL origin_tech = list(TECH_COMBAT = 4) attack_verb = list("flogged", "whipped", "lashed", "disciplined") - + hitsound = 'sound/weapons/whip.ogg' reach = 2 /obj/item/weapon/melee/chainofcommand/suicide_act(mob/user) @@ -16,6 +16,20 @@ user.visible_message(span("danger", "\The [user] [T.is] strangling [T.himself] with \the [src]! It looks like [T.he] [T.is] trying to commit suicide."), span("danger", "You start to strangle yourself with \the [src]!"), span("danger", "You hear the sound of someone choking!")) return (OXYLOSS) +/obj/item/weapon/melee/chainofcommand/curator_whip + name = "leather whip" + desc = "A fine weapon for some treasure hunting." + icon_state = "curator_whip" + force = 5 + throwforce = 5 + origin_tech = list(TECH_COMBAT = 2) + +/obj/item/weapon/melee/chainofcommand/curator_whip/toy + name = "toy whip" + desc = "A fake whip. Perfect for fake treasure hunting" + force = 2 + throwforce = 2 + /obj/item/weapon/melee/umbrella name = "umbrella" desc = "To keep the rain off you. Use with caution on windy days." diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 9489c83057..f5e5d02907 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -372,10 +372,28 @@ max_w_class = ITEMSIZE_NORMAL max_storage_space = ITEMSIZE_COST_NORMAL * 7 +/obj/item/weapon/storage/belt/bandolier + name = "shotgun bandolier" + desc = "Designed to hold shotgun shells. Can't really hold more than that." + icon_state = "bandolier1" + storage_slots = 8 + max_w_class = ITEMSIZE_TINY + can_hold = list( + /obj/item/ammo_casing/a12g, + /obj/item/ammo_casing/a12g/pellet, + /obj/item/ammo_casing/a12g/blank, + /obj/item/ammo_casing/a12g/practice, + /obj/item/ammo_casing/a12g/beanbag, + /obj/item/ammo_casing/a12g/stunshell, + /obj/item/ammo_casing/a12g/flash, + /obj/item/ammo_casing/a12g/emp, + /obj/item/ammo_casing/a12g/flechette + ) + /obj/item/weapon/storage/belt/security/tactical/bandolier - name = "combat belt" + name = "combat bandolier" desc = "Can hold security gear like handcuffs and flashes, with more pouches for more storage." - icon_state = "bandolier" + icon_state = "bandolier2" /obj/item/weapon/storage/belt/janitor name = "janitorial belt" diff --git a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm index 0db94e5aaf..04a46fb124 100644 --- a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm +++ b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm @@ -51,7 +51,7 @@ open_icon.Blend(icon(base_icon, "open"), ICON_OVERLAY) open_icon.Blend(color, BLEND_ADD) open_icon.Blend(icon(base_icon, "interior"), ICON_OVERLAY) - + door_back_icon = icon(base_icon, "door_back") door_back_icon.Blend(color, BLEND_ADD) @@ -74,7 +74,7 @@ this_decal_icon.Blend(decals[thing], BLEND_ADD) closed_emagged_icon.Blend(this_decal_icon, ICON_OVERLAY) door_front_icon.Blend(this_decal_icon, ICON_OVERLAY) - + door_front_icon.AddAlphaMask(icon(base_icon, "door_front")) // Remove pesky 'more than just door' decals closed_locked_icon = icon(closed_emagged_icon) @@ -622,6 +622,13 @@ "vertical_stripe_simple" = COLOR_OFF_WHITE, ) +/decl/closet_appearance/oxygen/fire/atmos + color = COLOR_YELLOW_GRAY + extra_decals = list( + "extinguisher" = COLOR_TEAL, + "vertical_stripe_simple" = COLOR_TEAL, + ) + /decl/closet_appearance/alien color = COLOR_PURPLE diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index 5e0944ed41..dedfceecad 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -41,7 +41,6 @@ /obj/item/device/radio/headset/headset_qm/alt, //VOREStation Edit, /obj/item/clothing/gloves/black, /obj/item/clothing/gloves/fingerless, - /obj/item/clothing/suit/fire/firefighter, /obj/item/weapon/tank/emergency/oxygen, /obj/item/clothing/mask/gas, /obj/item/clothing/glasses/meson, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 674a2e04b8..0d568a142f 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -102,10 +102,10 @@ starts_with = list( /obj/item/clothing/accessory/storage/brown_vest, - /obj/item/clothing/suit/fire/firefighter, - /obj/item/clothing/head/hardhat/red, + /obj/item/clothing/suit/fire/heavy, + /obj/item/clothing/head/hardhat/firefighter/atmos, /obj/item/device/flashlight, - /obj/item/weapon/extinguisher, + /obj/item/weapon/extinguisher/atmo, ///obj/item/clamp, //VOREStation Removal: without leaks those are pointless, /obj/item/device/radio/headset/headset_eng, /obj/item/device/radio/headset/headset_eng/alt, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index ce3e36d05f..f0613c9dec 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -58,8 +58,8 @@ /obj/item/clothing/shoes/white, /obj/item/clothing/under/rank/head_of_personnel_whimsy, /obj/item/clothing/head/caphat/hop, - /obj/item/clothing/under/gimmick/rank/head_of_personnel/suit, - /obj/item/clothing/under/gimmick/rank/head_of_personnel/suit/skirt, + /obj/item/clothing/under/suit_jacket/teal, + /obj/item/clothing/under/suit_jacket/teal/skirt, /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/suit/storage/hooded/wintercoat/hop) diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 07c5276a6f..61a8fe6afd 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -65,7 +65,7 @@ closet_appearance = /decl/closet_appearance/oxygen/fire starts_with = list( - /obj/item/clothing/suit/fire/firefighter, + /obj/item/clothing/suit/fire, /obj/item/clothing/mask/gas, /obj/item/weapon/tank/oxygen/red, /obj/item/weapon/extinguisher, @@ -73,7 +73,7 @@ /obj/structure/closet/firecloset/full starts_with = list( - /obj/item/clothing/suit/fire/firefighter, + /obj/item/clothing/suit/fire, /obj/item/clothing/mask/gas, /obj/item/device/flashlight, /obj/item/weapon/tank/oxygen/red, @@ -82,13 +82,24 @@ /obj/structure/closet/firecloset/full/double starts_with = list( - /obj/item/clothing/suit/fire/firefighter = 2, + /obj/item/clothing/suit/fire = 2, /obj/item/clothing/mask/gas = 2, /obj/item/device/flashlight = 2, /obj/item/weapon/tank/oxygen/red = 2, /obj/item/weapon/extinguisher = 2, /obj/item/clothing/head/hardhat/red = 2) +/obj/structure/closet/firecloset/full/atmos + name = "atmos fire-safety closet" + desc = "It's a storage unit for atmospheric fire-fighting supplies." + closet_appearance = /decl/closet_appearance/oxygen/fire/atmos + + starts_with = list( + /obj/item/clothing/suit/fire/heavy, + /obj/item/weapon/tank/oxygen/red, + /obj/item/weapon/extinguisher/atmo, + /obj/item/clothing/head/hardhat/firefighter/atmos) + /* * Tool Closet */ diff --git a/code/game/objects/structures/crates_lockers/closets/walllocker.dm b/code/game/objects/structures/crates_lockers/closets/walllocker.dm index 561f15369d..4be5c9c2fa 100644 --- a/code/game/objects/structures/crates_lockers/closets/walllocker.dm +++ b/code/game/objects/structures/crates_lockers/closets/walllocker.dm @@ -131,7 +131,7 @@ /obj/structure/closet/walllocker_double/kitchen/east pixel_x = 32 dir = EAST - + /obj/structure/closet/walllocker_double/medical name = "Medical Cabinet" desc = "A wall mounted medical supply cabinet. Probably full of drugs!" //not actually full of drugs, sorry! @@ -152,7 +152,7 @@ /obj/structure/closet/walllocker_double/medical/east pixel_x = 32 dir = EAST - + /obj/structure/closet/walllocker_double/hydrant name = "fire-safety closet" desc = "It's a storage cabinet packed with fire-fighting supplies." @@ -161,7 +161,7 @@ density = FALSE starts_with = list( - /obj/item/clothing/suit/fire/firefighter, + /obj/item/clothing/suit/fire, /obj/item/clothing/mask/gas, /obj/item/device/flashlight, /obj/item/weapon/tank/oxygen/red, diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index d503f6a953..af3c5d8d43 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -475,7 +475,7 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/captain, /obj/item/clothing/shoes/boots/winter/command, /obj/item/clothing/head/beret/centcom/captain, - /obj/item/clothing/under/gimmick/rank/captain/suit, - /obj/item/clothing/under/gimmick/rank/captain/suit/skirt, + /obj/item/clothing/under/suit_jacket/green, + /obj/item/clothing/under/suit_jacket/green/skirt, /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/head/caphat) diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index bbcd3e8840..a0c01e52cd 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -17,7 +17,7 @@ pixel_y = (dir & 3)? (dir ==1 ? -27 : 27) : 0 else has_extinguisher = new/obj/item/weapon/extinguisher(src) - + update_icon() /obj/structure/extinguisher_cabinet/attackby(obj/item/O, mob/user) @@ -80,9 +80,11 @@ if(has_extinguisher) if(istype(has_extinguisher, /obj/item/weapon/extinguisher/mini)) suffix = "mini" + if(istype(has_extinguisher, /obj/item/weapon/extinguisher/atmo)) + suffix = "advanced" else suffix = "standard" - + icon_state = "[initial(icon_state)][opened ? "" : "_closed"]_[suffix]" /obj/structure/extinguisher_cabinet/old diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 4025094d37..be1f7619a3 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -204,6 +204,14 @@ sweaters[initial(sweater_type.name)] = sweater_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(sweaters)) +/datum/gear/accessory/virginkiller + display_name = "virgin killer sweater (colorable)" + path = /obj/item/clothing/accessory/sweater/virgin + +/datum/gear/accessory/virginkiller/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + /datum/gear/accessory/bracelet/material display_name = "bracelet selection" description = "Choose from a number of bracelets." diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 946d2bca2b..413f33db6a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -127,7 +127,7 @@ gear_tweaks += gear_tweak_free_color_choice /datum/gear/head/cap/mbill - display_name = "cap, bill" + display_name = "cap, major bill's" path = /obj/item/clothing/head/soft/mbill /datum/gear/head/cap/sol diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 2f6c808046..57ae1e234c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -35,9 +35,13 @@ path = /obj/item/clothing/suit/storage/toggle/bomber /datum/gear/suit/bomber_alt - display_name = "bomber jacket 2" + display_name = "bomber jacket, alt" path = /obj/item/clothing/suit/storage/bomber/alt +/datum/gear/suit/bomber_retro + display_name = "bomber jacket, retro" + path = /obj/item/clothing/suit/storage/toggle/bomber/retro + /datum/gear/suit/leather_jacket display_name = "leather jacket, black" path = /obj/item/clothing/suit/storage/toggle/leather_jacket @@ -101,7 +105,7 @@ path = /obj/item/clothing/suit/storage/trench/grey /datum/gear/suit/duster - display_name = "cowboy duster" + display_name = "cowboy duster, colorable" path = /obj/item/clothing/suit/storage/duster /datum/gear/suit/duster/New() @@ -533,14 +537,6 @@ display_name = "denim vest, corporate" path = /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen/sleeveless -/datum/gear/suit/miscellaneous/kimono - display_name = "kimono" - path = /obj/item/clothing/suit/kimono - -/datum/gear/suit/miscellaneous/kimono/New() - ..() - gear_tweaks += gear_tweak_free_color_choice - /datum/gear/suit/miscellaneous/dep_jacket display_name = "department jacket selection" path = /obj/item/clothing/suit/storage/toggle/sec_dep_jacket @@ -569,17 +565,13 @@ gear_tweaks += new/datum/gear_tweak/path(jacket) /datum/gear/suit/miscellaneous/peacoat - display_name = "peacoat" + display_name = "peacoat, colorable" path = /obj/item/clothing/suit/storage/toggle/peacoat /datum/gear/suit/miscellaneous/peacoat/New() ..() gear_tweaks += gear_tweak_free_color_choice -/datum/gear/suit/miscellaneous/kamishimo - display_name = "kamishimo" - path = /obj/item/clothing/suit/kamishimo - /datum/gear/suit/snowsuit display_name = "snowsuit" path = /obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit @@ -615,7 +607,7 @@ allowed_roles = list("Quartermaster","Shaft Miner","Cargo Technician","Head of Personnel") /datum/gear/suit/miscellaneous/cardigan - display_name = "cardigan" + display_name = "cardigan, colorable" path = /obj/item/clothing/suit/storage/toggle/cardigan /datum/gear/suit/miscellaneous/cardigan/New() @@ -625,4 +617,45 @@ /datum/gear/suit/cmddressjacket display_name = "command dress jacket" path = /obj/item/clothing/suit/storage/cmddressjacket - allowed_roles = list("Site Manager", "Head of Personnel", "Command Secretary") \ No newline at end of file +<<<<<<< HEAD + allowed_roles = list("Site Manager", "Head of Personnel", "Command Secretary") +||||||| parent of 0085a5bd10... Adds more clothing from Polaris and various sources (#11546) + allowed_roles = list("Site Manager", "Head of Personnel", "Command Secretary") +======= + allowed_roles = list("Site Manager", "Head of Personnel", "Command Secretary") + +/datum/gear/suit/miscellaneous/kimono + display_name = "traditional kimono, colorable" + path = /obj/item/clothing/suit/kimono + +/datum/gear/suit/miscellaneous/kimono/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/suit/miscellaneous/kamishimo + display_name = "traditional kamishimo, colorable" + path = /obj/item/clothing/suit/kamishimo + +/datum/gear/suit/miscellaneous/kamishimo/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/suit/miscellaneous/kimono + display_name = "kimono selection" + path = /obj/item/clothing/suit/kimono/red + +/datum/gear/suit/miscellaneous/kimono/New() + ..() + var/list/kimonos = list( + "Red kimono" = /obj/item/clothing/suit/kimono/red, + "Orange kimono" = /obj/item/clothing/suit/kimono/orange, + "Yellow kimono" = /obj/item/clothing/suit/kimono/yellow, + "Green kimono" = /obj/item/clothing/suit/kimono/green, + "Blue kimono" = /obj/item/clothing/suit/kimono/blue, + "Purple kimono" = /obj/item/clothing/suit/kimono/purple, + "Violet kimono" = /obj/item/clothing/suit/kimono/violet, + "Pink kimono" = /obj/item/clothing/suit/kimono/pink, + "Earth kimono" = /obj/item/clothing/suit/kimono/earth + ) + gear_tweaks += new/datum/gear_tweak/path(kimonos) +>>>>>>> 0085a5bd10... Adds more clothing from Polaris and various sources (#11546) diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index b9dd7c5643..f881e2452d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -425,6 +425,7 @@ display_name = "sweater, grey" path = /obj/item/clothing/under/rank/psych/turtleneck/sweater +<<<<<<< HEAD /datum/gear/uniform/brandsuit/aether display_name = "jumpsuit, aether" path = /obj/item/clothing/under/aether @@ -450,14 +451,38 @@ display_name = "jumpsuit, ward-takahashi" path = /obj/item/clothing/under/wardt +||||||| parent of 0085a5bd10... Adds more clothing from Polaris and various sources (#11546) +/datum/gear/uniform/brandsuit/aether + display_name = "jumpsuit, aether" + path = /obj/item/clothing/under/aether + +/datum/gear/uniform/brandsuit/focal + display_name = "jumpsuit, focal" + path = /obj/item/clothing/under/focal + +/datum/gear/uniform/mbill + display_name = "outfit, major bill's" + path = /obj/item/clothing/under/mbill + +/datum/gear/uniform/pcrc + display_name = "uniform, PCRC (Security)" + path = /obj/item/clothing/under/pcrc + allowed_roles = list("Security Officer","Head of Security","Warden") + +/datum/gear/uniform/brandsuit/grayson + display_name = "outfit, grayson" + path = /obj/item/clothing/under/grayson + +/datum/gear/uniform/brandsuit/wardt + display_name = "jumpsuit, ward-takahashi" + path = /obj/item/clothing/under/wardt + +======= +>>>>>>> 0085a5bd10... Adds more clothing from Polaris and various sources (#11546) /datum/gear/uniform/frontier display_name = "outfit, frontier" path = /obj/item/clothing/under/frontier -/datum/gear/uniform/brandsuit/hephaestus - display_name = "jumpsuit, hephaestus" - path = /obj/item/clothing/under/hephaestus - /datum/gear/uniform/yogapants display_name = "yoga pants" path = /obj/item/clothing/under/pants/yogapants @@ -668,7 +693,7 @@ /datum/gear/uniform/verglasdress display_name = "verglas dress" - path = /obj/item/clothing/under/verglasdress + path = /obj/item/clothing/under/dress/verglasdress /datum/gear/uniform/fashionminiskirt display_name = "fashionable miniskirt" @@ -718,4 +743,84 @@ "Brown Cowboy Outfit" = /obj/item/clothing/under/cowboy/brown, "Grey Cowboy Outfit" = /obj/item/clothing/under/cowboy/grey ) - gear_tweaks += new/datum/gear_tweak/path(cowboy_outfits) \ No newline at end of file + gear_tweaks += new/datum/gear_tweak/path(cowboy_outfits) + +/datum/gear/uniform/utility/gsa + display_name = "utility, galactic survey" + path = /obj/item/clothing/under/gsa + +/datum/gear/uniform/utility/gsa_work + display_name = "heavy utility, galactic survey" + path = /obj/item/clothing/under/gsa_work + +/* + * Branded Uniforms + */ + +/datum/gear/uniform/brandsuit/mbill + display_name = "uniform, major bill's" + path = /obj/item/clothing/under/mbill + +/datum/gear/uniform/brandsuit/mbill_flight + display_name = "uniform, major bill's flightsuit (Pilot)" + path = /obj/item/clothing/under/mbill_flight + allowed_roles = list("Pilot") + +/datum/gear/uniform/brandsuit/aether + display_name = "jumpsuit, aether" + path = /obj/item/clothing/under/corp/aether + +/datum/gear/uniform/brandsuit/focal + display_name = "jumpsuit, focal" + path = /obj/item/clothing/under/corp/focal + +/datum/gear/uniform/brandsuit/pcrc + display_name = "uniform, PCRC (Security)" + path = /obj/item/clothing/under/corp/pcrc + allowed_roles = list("Security Officer","Head of Security","Warden") + +/datum/gear/uniform/brandsuit/grayson + display_name = "outfit, grayson" + path = /obj/item/clothing/under/corp/grayson + +/datum/gear/uniform/brandsuit/grayson_jump + display_name = "jumpsuit, grayson" + path = /obj/item/clothing/under/corp/grayson_jump + +/datum/gear/uniform/brandsuit/wardt + display_name = "jumpsuit, ward-takahashi" + path = /obj/item/clothing/under/corp/wardt + +/datum/gear/uniform/brandsuit/hephaestus + display_name = "jumpsuit, hephaestus" + path = /obj/item/clothing/under/corp/hephaestus + +/datum/gear/uniform/brandsuit/centauri + display_name = "jumpsuit, centauri provisions" + path = /obj/item/clothing/under/corp/centauri + +/datum/gear/uniform/brandsuit/morpheus + display_name = "jumpsuit, morpheus" + path = /obj/item/clothing/under/corp/morpheus + +/datum/gear/uniform/brandsuit/wulf + display_name = "jumpsuit, wulf" + path = /obj/item/clothing/under/corp/wulf + +/datum/gear/uniform/brandsuit/zenghu + display_name = "jumpsuit, zeng-hu" + path = /obj/item/clothing/under/corp/zenghu + +/datum/gear/uniform/brandsuit/xion + display_name = "jumpsuit, xion" + path = /obj/item/clothing/under/corp/xion + +/datum/gear/uniform/brandsuit/vedmed + display_name = "jumpsuit, vey-med (Medical)" + path = /obj/item/clothing/under/corp/veymed + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic") + +/datum/gear/uniform/brandsuit/kaleidoscope + display_name = "outfit, kaleidoscope (Science)" + path = /obj/item/clothing/under/corp/kaleidoscope + allowed_roles = list("Research Director","Scientist","Xenobiologist") \ No newline at end of file diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 1d7bcee6b2..8d7ec44f54 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -36,8 +36,8 @@ max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/gloves/combat //Combined effect of SWAT gloves and insulated gloves - desc = "These tactical gloves are somewhat fire and impact resistant in addition to being shock absorbant." //Clarified its description compared to swat gloves - name = "Combat gloves" + desc = "These tactical gloves are somewhat fire and impact resistant." + name = "combat gloves" icon_state = "swat" item_state = "swat" siemens_coefficient = 0 @@ -167,3 +167,10 @@ /obj/item/clothing/gloves/ranger/yellow glovecolor = "yellow" + +/obj/item/clothing/gloves/waterwings + name = "water wings" + desc = "Swim aids designed to help a wearer float in water and learn to swim." + icon_state = "waterwings" + + diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 47a5b89f1a..86ce792d4c 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -1,3 +1,14 @@ +/* + * Contains: + * Hard Hats + * Firefighter Hats + * Ranger Hats + */ + +/* + * Hard Hats + */ + /obj/item/clothing/head/hardhat name = "hard hat" desc = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight." @@ -18,27 +29,61 @@ icon_state = "hardhat0_orange" name = "orange hard hat" -/obj/item/clothing/head/hardhat/red - icon_state = "hardhat0_red" - name = "firefighter helmet" - heat_protection = HEAD - max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE - min_pressure_protection = 0.2* ONE_ATMOSPHERE - max_pressure_protection = 20 * ONE_ATMOSPHERE - - /obj/item/clothing/head/hardhat/white icon_state = "hardhat0_white" name = "sleek hard hat" - heat_protection = HEAD - max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE - min_pressure_protection = 0.2* ONE_ATMOSPHERE - max_pressure_protection = 20 * ONE_ATMOSPHERE /obj/item/clothing/head/hardhat/dblue name = "blue hard hat" icon_state = "hardhat0_dblue" +/* + * Firefighter Hats + */ + +/obj/item/clothing/head/hardhat/red + icon_state = "hardhat0_red" + name = "emergency fire helmet" + heat_protection = HEAD + max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + min_pressure_protection = 0.2* ONE_ATMOSPHERE + max_pressure_protection = 20 * ONE_ATMOSPHERE + +/obj/item/clothing/head/hardhat/firefighter + name = "firefighter helmet" + desc = "A helmet with face mask specially designed for firefighting. It's airtight and has a port for internals." + icon_state = "helmet_firefighter" + item_flags = THICKMATERIAL | AIRTIGHT + permeability_coefficient = 0 + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR + max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE+5000 + min_pressure_protection = 0.5 * ONE_ATMOSPHERE + max_pressure_protection = 20 * ONE_ATMOSPHERE + body_parts_covered = HEAD|FACE|EYES + cold_protection = HEAD + min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE + flash_protection = FLASH_PROTECTION_MODERATE + sprite_sheets = list( + SPECIES_TAJARAN = 'icons/inventory/head/mob_tajaran.dmi', + SPECIES_UNATHI = 'icons/inventory/head/mob_unathi.dmi' + ) + +/obj/item/clothing/head/hardhat/firefighter/atmos + name = "atmospheric firefighter helmet" + desc = "An atmospheric firefighter's helmet, includes a face mask specially designed for firefighting. It's airtight and has a port for internals." + icon_state = "atmos_fire" + max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + 10000 + +/obj/item/clothing/head/hardhat/firefighter/chief + name = "chief firefighter helmet" + desc = "A helmet with face mask specially designed for firefighting. This one is in the colors of the Chief Engineer. It's airtight and has a port for internals." + icon_state = "helmet_firefighter_ce" + max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + 10000 + +/* + * Ranger Hats + */ + /obj/item/clothing/head/hardhat/ranger var/hatcolor = "white" name = "ranger helmet" diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 1d3759fae9..724b77a9af 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -6,8 +6,8 @@ * Pumpkin head * Kitty ears * Holiday hats - Crown of Wrath - Warning cone + * Crown of Wrath + * Warning cone */ /* @@ -146,7 +146,7 @@ */ /obj/item/clothing/head/ushanka name = "ushanka" - desc = "Perfect for winter in Siberia, da?" + desc = "Perfect for those cold winter nights." icon_state = "ushankadown" flags_inv = HIDEEARS @@ -158,6 +158,19 @@ src.icon_state = initial(icon_state) to_chat(user, "You lower the ear flaps on the ushanka.") +/obj/item/clothing/head/ushanka/black + icon_state = "blkushankadown" + +/obj/item/clothing/head/ushanka/soviet + name = "soviet ushanka" + desc = "Perfect for winter in Siberia, da?" + icon_state = "sovushankadown" + +/obj/item/clothing/head/ushanka/hedberg + name = "\improper Hedberg-Hammarstrom fur hat" + desc = "An Hedberg-Hammarstrom private security ushanka." + icon_state = "hedbergushankadown" + /* * Pumpkin head */ diff --git a/code/modules/clothing/head/pilot_helmet_vr.dm b/code/modules/clothing/head/pilot_helmet_vr.dm index de4d52b622..ab4b2335c8 100644 --- a/code/modules/clothing/head/pilot_helmet_vr.dm +++ b/code/modules/clothing/head/pilot_helmet_vr.dm @@ -57,7 +57,7 @@ ) action_button_name = "Toggle Visor" -/obj/item/clothing/head/pilot_vr/alt/attack_self(mob/user as mob) +/obj/item/clothing/head/pilot_vr/talon/attack_self(mob/user as mob) if(src.icon_state == initial(icon_state)) src.icon_state = "[icon_state]up" to_chat(user, "You raise the visor on the pilot helmet.") @@ -65,3 +65,25 @@ src.icon_state = initial(icon_state) to_chat(user, "You lower the visor on the pilot helmet.") update_clothing_icon() //so our mob-overlays update + +//////////Major Bill's Pilot Headgear////////// + +/obj/item/clothing/head/pilot_vr/mbill + name = "\improper Major Bill's pilot helmet" + desc = "An Major Bill's Transportation version of the standard pilot helmet. Protects the head from impacts. This one has a retractable visor" + icon_state = "pilot3" + item_icons = list(slot_head_str = 'icons/inventory/head/mob_vr.dmi') + catalogue_data = list(/datum/category_item/catalogue/information/organization/major_bills) + sprite_sheets = list( + SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi' + ) + action_button_name = "Toggle Visor" + +/obj/item/clothing/head/pilot_vr/mbill/attack_self(mob/user as mob) + if(src.icon_state == initial(icon_state)) + src.icon_state = "[icon_state]up" + to_chat(user, "You raise the visor on the pilot helmet.") + else + src.icon_state = initial(icon_state) + to_chat(user, "You lower the visor on the pilot helmet.") + update_clothing_icon() //so our mob-overlays update \ No newline at end of file diff --git a/code/modules/clothing/head/solgov.dm b/code/modules/clothing/head/solgov.dm index 6b2623ff52..3befe1fbf1 100644 --- a/code/modules/clothing/head/solgov.dm +++ b/code/modules/clothing/head/solgov.dm @@ -1,6 +1,20 @@ -//SolGov uniform hats +/* + * SolGov Uniform Hats + * Contents: + * Utility + * Service + * Dress + * Government Departments (Berets) + * SifGuard (Berets) + * Fleet (Berets) + * Ushanka + * Almachi + * Unused Baylore Stuff + */ -//Utility +/* + * Utility + */ /obj/item/clothing/head/soft/solgov name = "\improper SolGov cap" desc = "It's a blue ballcap in Solar Confederate Government colors." @@ -72,8 +86,9 @@ desc = "A grey utility cover bearing the crest of the SCG Marines." icon_state = "greyutility" -//Service - +/* + * Service + */ /obj/item/clothing/head/service name = "service cover" desc = "A service uniform cover." @@ -130,8 +145,9 @@ desc = "A green campaign cover with an SCG Marine crest. Typically found on the heads of Drill Sergeants." icon_state = "greendrill" -//Dress - +/* + * Dress + */ /obj/item/clothing/head/dress name = "dress cover" desc = "A dress uniform cover." @@ -168,10 +184,9 @@ desc = "A white dress uniform cover with an SCG Marine crest and gold stripe." icon_state = "whitewheelcap_com" -//Berets - -//Government Departments - +/* + * Government Departments (Berets) + */ /obj/item/clothing/head/beret/solgov name = "\improper SCG beret" desc = "A beret in basic Solar Confederate Government colors. For peacekeepers that are more inclined towards style than safety." @@ -207,9 +222,9 @@ desc = "A white beret denoting service in the Interstellar Health Service. For medics that are more inclined towards style than safety." icon_state = "beret_white" - -//SifGuard - +/* + * SifGuard (Berets) + */ /obj/item/clothing/head/beret/solgov/sifguard name = "\improper SifGuard beret" desc = "A black beret belonging to the Sif Defense Force. For personnel that are more inclined towards style than safety." @@ -250,7 +265,9 @@ desc = "An Sif Defense Force beret carrying insignia of the Anti-Piracy taskforce. For personnel that are more inclined towards style than safety." icon_state = "beret_black_patrol" -//Fleet +/* + * Fleet (Berets) + */ /obj/item/clothing/head/beret/solgov/fleet name = "fleet beret" @@ -303,7 +320,50 @@ icon_state = "beret_whiterim_com" /* -Unused Baylore Stuff + * Ushanka + */ +/obj/item/clothing/head/ushanka/solgov + name = "\improper SifGuard fur hat" + desc = "An Sif Defense Force synthfur-lined hat for operating in cold environments." + icon_state = "sifguardushankadown" + +/obj/item/clothing/head/ushanka/solgov/fleet + name = "fleet fur hat" + desc = "An SCG Fleet synthfur-lined hat for operating in cold environments." + icon_state = "flushankadown" + +/obj/item/clothing/head/ushanka/solgov/marine + name = "marine fur hat" + desc = "An SCG Marine synthfur-lined hat for operating in cold environments." + icon_state = "mar1ushankadown" + +/obj/item/clothing/head/ushanka/solgov/marine/green + name = "green marine fur hat" + desc = "An SCG Marine synthfur-lined hat for operating in cold environments." + icon_state = "mar2ushankadown" + +/* + * Almachi + */ +/obj/item/clothing/head/almach + name = "\improper Almach Militia service cover" + desc = "A service uniform cover, occasionally worn by crew within the defunct Almach Militia." + icon_state = "almachhat" + item_state = "almachhat" + item_state_slots = list( + slot_l_hand_str = "helmet", + slot_r_hand_str = "helmet") + body_parts_covered = 0 + +/obj/item/clothing/head/terran/navy/service/command + name = "\improper Almach Militia command service cover" + desc = "A service uniform cover, occasionally worn by command crew within the defunct Almach Militia." + icon_state = "almachhat_comm" + item_state = "almachhat_comm" + +/* + * Unused Baylore Stuff + * /obj/item/clothing/head/beret/solgov/fleet/branch name = "first fleet beret" desc = "An SCG Fleet beret carrying insignia of First Fleet, the Sol Guard, stationed in Sol. For personnel that are more inclined towards style than safety." @@ -328,45 +388,5 @@ Unused Baylore Stuff name = "fifth fleet beret" desc = "An SCG Fleet beret carrying insignia of Fifth Fleet, the Quick Reaction Force, recently formed and outfited with last tech. For personnel that are more inclined towards style than safety." icon_state = "beret_navy_fifth" - -*/ - -//ushanka - -/obj/item/clothing/head/ushanka/solgov - name = "\improper SifGuard fur hat" - desc = "An Sif Defense Force synthfur-lined hat for operating in cold environments." - icon_state = "sifguardushankadown" - -/obj/item/clothing/head/ushanka/solgov/fleet - name = "fleet fur hat" - desc = "An SCG Fleet synthfur-lined hat for operating in cold environments." - icon_state = "flushankadown" - -/obj/item/clothing/head/ushanka/solgov/marine - name = "marine fur hat" - desc = "An SCG Marine synthfur-lined hat for operating in cold environments." - icon_state = "barushankadown" - -/obj/item/clothing/head/ushanka/solgov/marine/green - name = "\improper Hedberg-Hammarstrom fur hat" - desc = "An Hedberg-Hammarstrom private security synthfur-lined hat for operating in cold environments." - icon_state = "arushankadown" - -//Almachi - -/obj/item/clothing/head/almach - name = "\improper Almach Militia service cover" - desc = "A service uniform cover, occasionally worn by crew within the defunct Almach Militia." - icon_state = "almachhat" - item_state = "almachhat" - item_state_slots = list( - slot_l_hand_str = "helmet", - slot_r_hand_str = "helmet") - body_parts_covered = 0 - -/obj/item/clothing/head/terran/navy/service/command - name = "\improper Almach Militia command service cover" - desc = "A service uniform cover, occasionally worn by command crew within the defunct Almach Militia." - icon_state = "almachhat_comm" - item_state = "almachhat_comm" + * + */ \ No newline at end of file diff --git a/code/modules/clothing/head/solgov_vr.dm b/code/modules/clothing/head/solgov_vr.dm index 925782f9dc..1a540af194 100644 --- a/code/modules/clothing/head/solgov_vr.dm +++ b/code/modules/clothing/head/solgov_vr.dm @@ -1,6 +1,17 @@ -//SolGov uniform hats +/* + * SolGov Uniform Hats + * Contents: + * Utility + * Service + * Dress + * Berets + * Ushanka + * Terran + */ -//Utility +/* + * Utility + */ /obj/item/clothing/head/soft/solgov name = "\improper SolGov cap" //YW EDIT: SolGov desc = "It's a blue ballcap in Solar Central Government colors." //YW EDIT: SolGov @@ -37,7 +48,9 @@ name = "urban utility cover" desc = "A grey utility cover bearing the crest of the USDF Marines." //YW EDIT: TCG to USDF -//Service +/* + * Service + */ /obj/item/clothing/head/service/sifguard name = "\improper NDF peaked cap" desc = "A peaked black uniform cap belonging to the Nanotrasen Defense Force Corps." @@ -74,7 +87,9 @@ name = "campaign cover" desc = "A green campaign cover with an USDF Marine crest. Only found on the heads of Drill Sergeants." //YW EDIT: TCG to USDF -//Dress +/* + * Dress + */ /obj/item/clothing/head/dress/fleet/garrison name = "fleet garrison cap" desc = "A white dress uniform cap. The classic sailor's choice." @@ -95,8 +110,9 @@ name = "marine officer's dress wheel cover" desc = "A white dress uniform cover with an USDF Marine crest and gold stripe." //YW EDIT: TCG to USDF -//Berets - +/* + * Berets + */ /obj/item/clothing/head/beret/solgov name = "peacekeeper beret" desc = "A beret in Solar Central Government colors. For peacekeepers that are more inclined towards style than safety." //YW EDIT: Terran Commonwealth to Solar Central Government @@ -238,26 +254,29 @@ name = "fifth fleet beret" desc = "An USDF Fleet beret carrying insignia of Fifth Fleet, the Quick Reaction Force, recently formed and outfited with last tech. For personnel that are more inclined towards style than safety." //YW EDIT: TCG to USDF -//ushanka - +/* + * Ushanka + */ /obj/item/clothing/head/ushanka/solgov name = "\improper NDF fur hat" desc = "An Nanotrasen Defense Force synthfur-lined hat for operating in cold environments." + icon_state = "ntguardushankadown" /obj/item/clothing/head/ushanka/solgov/fleet name = "fleet fur hat" desc = "An USDF Fleet synthfur-lined hat for operating in cold environments." //YW EDIT: TCG to USDF -/obj/item/clothing/head/ushanka/solgov/army +/obj/item/clothing/head/ushanka/solgov/marine name = "marine fur hat" desc = "An USDF Marine synthfur-lined hat for operating in cold environments." //YW EDIT: TCG to USDF -/obj/item/clothing/head/ushanka/solgov/army/green +/obj/item/clothing/head/ushanka/solgov/marine/green name = "green marine fur hat" desc = "An USDF Marine synthfur-lined hat for operating in cold environments." //YW EDIT: TCG to USDF -//Terran - +/* + * Terran + */ /obj/item/clothing/head/terran/navy/service name = "Ares service cover" desc = "A service uniform cover, worn by low-ranking crew within the Ares Confederation Navy." diff --git a/code/modules/clothing/spacesuits/void/station.dm b/code/modules/clothing/spacesuits/void/station.dm index dd35822ecc..d10be1aa91 100644 --- a/code/modules/clothing/spacesuits/void/station.dm +++ b/code/modules/clothing/spacesuits/void/station.dm @@ -328,7 +328,7 @@ icon_state = "rig0-atmos" item_state_slots = list(slot_r_hand_str = "atmos_helm", slot_l_hand_str = "atmos_helm") armor = list(melee = 40, bullet = 5, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 50) - max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE+15000 light_overlay = "helmet_light_dual" min_pressure_protection = 0 * ONE_ATMOSPHERE max_pressure_protection = 20* ONE_ATMOSPHERE @@ -339,7 +339,7 @@ icon_state = "rig-atmos" item_state_slots = list(slot_r_hand_str = "atmos_voidsuit", slot_l_hand_str = "atmos_voidsuit") armor = list(melee = 40, bullet = 5, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 50) - max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE + max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE+15000 min_pressure_protection = 0 * ONE_ATMOSPHERE max_pressure_protection = 20* ONE_ATMOSPHERE breach_threshold = 16 //Extra Thicc diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 73d253415d..bce11495c7 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -183,12 +183,12 @@ /obj/item/clothing/suit/storage/hazardvest/green name = "green hazard vest" - desc = "A high-visibility vest used by emergency responders. This one is green!" + desc = "A high-visibility vest used by emergency responders." icon_state = "hazard_g" /obj/item/clothing/suit/storage/hazardvest/white name = "white hazard vest" - desc = "A high-visibility vest used in work zones. This one has a red cross!" + desc = "A high-visibility vest used in work zones. This one bears the symbol of a disaster relief team!" icon_state = "hazard_w" //Lawyer @@ -246,9 +246,17 @@ //Mime /obj/item/clothing/suit/suspenders - name = "suspenders" + name = "red suspenders" desc = "They suspend the illusion of the mime's play." icon = 'icons/inventory/belt/item.dmi' icon_state = "suspenders" blood_overlay_type = "armor" //it's the less thing that I can put here body_parts_covered = 0 + +/obj/item/clothing/suit/suspenders/blue + name = "blue suspenders" + icon_state = "suspenders_blue" + +/obj/item/clothing/suit/suspenders/grey + name = "grey suspenders" + icon_state = "suspenders_grey" \ No newline at end of file diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index d0f8949d8d..a8f6bf57a1 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -270,16 +270,57 @@ body_parts_covered = UPPER_TORSO|ARMS flags_inv = HIDETIE|HIDEHOLSTER +/* + * Kimonos + */ + /obj/item/clothing/suit/kimono - name = "kimono" + name = "traditional kimono" desc = "A traditional Japanese kimono." icon_state = "kimono" addblends = "kimono_a" /obj/item/clothing/suit/kamishimo - name = "kamishimo" + name = "traditional kamishimo" desc = "Traditional Japanese menswear." icon_state = "kamishimo" + addblends = "kamishimo_a" + +/obj/item/clothing/suit/kimono/red + name = "red kimono" + icon_state = "kimono_red" + +/obj/item/clothing/suit/kimono/orange + name = "orange kimono" + icon_state = "kimono_orange" + +/obj/item/clothing/suit/kimono/yellow + name = "yellow kimono" + icon_state = "kimono_yellow" + +/obj/item/clothing/suit/kimono/green + name = "green kimono" + icon_state = "kimono_green" + +/obj/item/clothing/suit/kimono/blue + name = "blue kimono" + icon_state = "kimono_blue" + +/obj/item/clothing/suit/kimono/purple + name = "purple kimono" + icon_state = "kimono_purple" + +/obj/item/clothing/suit/kimono/violet + name = "violet kimono" + icon_state = "kimono_violet" + +/obj/item/clothing/suit/kimono/pink + name = "pink kimono" + icon_state = "kimono_pink" + +/obj/item/clothing/suit/kimono/earth + name = "earth kimono" + icon_state = "kimono_earth" /* * Coats @@ -480,6 +521,11 @@ min_cold_protection_temperature = T0C - 20 siemens_coefficient = 0.7 +/obj/item/clothing/suit/storage/toggle/bomber/retro + name = "retro bomber jacket" + desc = "A retro style, fur-lined leather bomber jacket that invokes the early days of space exploration when spacemen were spacemen, and laser guns had funny little antennae on them." + icon_state = "retro_bomber" + /obj/item/clothing/suit/storage/bomber/alt name = "bomber jacket" desc = "A thick, well-worn WW2 leather bomber jacket." diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index fb1494f4bc..31f550da77 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -10,9 +10,10 @@ */ /obj/item/clothing/suit/fire - name = "firesuit" + name = "emergency firesuit" desc = "A suit that protects against fire and heat." - icon_state = "fire" + icon_state = "firesuit" + item_state_slots = list(slot_r_hand_str = "black_suit", slot_l_hand_str = "black_suit") w_class = ITEMSIZE_LARGE//bulky item gas_transfer_coefficient = 0.90 permeability_coefficient = 0.50 @@ -27,16 +28,16 @@ min_pressure_protection = 0.2 * ONE_ATMOSPHERE max_pressure_protection = 20 * ONE_ATMOSPHERE - /obj/item/clothing/suit/fire/firefighter - icon_state = "firesuit" - -/obj/item/clothing/suit/fire/heavy //Is this even used?? -S2- name = "firesuit" + icon_state = "firesuit2" + max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE+5000 + +/obj/item/clothing/suit/fire/heavy + name = "atmospheric firesuit" desc = "A suit that protects against extreme fire and heat." - //icon_state = "thermal" - item_state_slots = list(slot_r_hand_str = "black_suit", slot_l_hand_str = "black_suit") - w_class = ITEMSIZE_LARGE//bulky item + icon_state = "atmos_firesuit" + max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE+10000 slowdown = 1.5 /* diff --git a/code/modules/clothing/under/accessories/clothing.dm b/code/modules/clothing/under/accessories/clothing.dm index 46fb4fc79a..a78848d985 100644 --- a/code/modules/clothing/under/accessories/clothing.dm +++ b/code/modules/clothing/under/accessories/clothing.dm @@ -14,6 +14,21 @@ icon_state = "tan_jacket" slot = ACCESSORY_SLOT_OVER +/obj/item/clothing/accessory/jacket/red + name = "red suit jacket" + desc = "Relaxing suit jacket." + icon_state = "red_jacket" + +/obj/item/clothing/accessory/jacket/teal + name = "teal suit jacket" + desc = "Relaxing suit jacket." + icon_state = "teal_jacket" + +/obj/item/clothing/accessory/jacket/green + name = "green suit jacket" + desc = "Relaxing suit jacket." + icon_state = "green_jacket" + /obj/item/clothing/accessory/jacket/charcoal name = "charcoal suit jacket" desc = "Strict suit jacket." @@ -39,6 +54,11 @@ desc = "Chairman suit jacket." icon_state = "gambler_jacket" +/obj/item/clothing/accessory/jacket/extravagant + name = "extravagant suit jacket" + desc = "Luxury suit jacket." + icon_state = "extravagant_jacket" + /* * Hawaiian */ @@ -433,6 +453,12 @@ desc = "A comfortable turtleneck in a dark red." icon_state = "turtleneck_red" +/obj/item/clothing/accessory/sweater/virgin + name = "virgin killer" + desc = "A knit sweater that leaves little to the imagination." + icon_state = "virginkiller" + body_parts_covered = UPPER_TORSO|LOWER_TORSO + /* * Misc */ diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index c675c1b68c..da5d5627be 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -68,6 +68,11 @@ icon_state = "chef" rolled_sleeves = 0 +/obj/item/clothing/under/rank/chef/alt + desc = "It's an apron which is given only to the chefs that swear the most." + name = "souschef's uniform" + icon_state = "souschef" + /obj/item/clothing/under/rank/clown name = "clown suit" desc = "Honk!" @@ -95,6 +100,9 @@ permeability_coefficient = 0.50 rolled_sleeves = 0 +/obj/item/clothing/under/rank/hydroponics/alt + icon_state = "hydro" + /obj/item/clothing/under/rank/internalaffairs desc = "The plain, professional attire of an Internal Affairs Agent. The collar is immaculately starched." name = "Internal Affairs uniform" @@ -115,6 +123,10 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) rolled_sleeves = 0 +/obj/item/clothing/under/rank/janitor/alt + name = "janitor's overalls" + icon_state = "janitor_alt" + /obj/item/clothing/under/lawyer desc = "Slick threads." name = "lawyer suit" diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 03bfa4d003..9154bc0818 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -94,6 +94,7 @@ H.update_inv_w_uniform(1) to_chat(H, "You roll the sleeves of your shirt [unrolled ? "up" : "down"]") */ + /obj/item/clothing/under/det/grey icon_state = "detective2" desc = "A serious-looking tan dress shirt paired with freshly-pressed black slacks." @@ -121,6 +122,11 @@ desc = "A serious-looking tan dress shirt paired with freshly-pressed black slacks, complete with a red striped tie and waistcoat." starting_accessories = list(/obj/item/clothing/accessory/tie/red_long, /obj/item/clothing/accessory/wcoat) +/obj/item/clothing/under/det/black/waistcoat + icon_state = "detective3" + desc = "A serious-looking tan dress shirt paired with freshly-pressed black slacks, a red tie, and a charcoal vest." + starting_accessories = list(/obj/item/clothing/accessory/tie/red_long, /obj/item/clothing/accessory/wcoat) + /obj/item/clothing/under/det/skirt name = "detective's skirt" icon_state = "detective_skirt" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 37fd676a4c..bc4d45685d 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -1,3 +1,9 @@ +/obj/item/clothing/under/gimmick //used to fix an error + name = "gimmick jumpsuit" + desc = "Something about this jumpsuit feels... off..." + icon_state = "grey" + item_state_slots = list(slot_r_hand_str = "grey", slot_l_hand_str = "grey") + /obj/item/clothing/under/pj/red name = "red pj's" desc = "Sleepwear." @@ -95,19 +101,6 @@ icon_state = "ert_uniform" item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black") -/obj/item/clothing/under/gov - desc = "A neat proper uniform of someone on offical business. The collar is immaculately starched." - name = "Green formal uniform" - icon_state = "greensuit" - item_state_slots = list(slot_r_hand_str = "centcom", slot_l_hand_str = "centcom") - rolled_sleeves = 0 - starting_accessories = list(/obj/item/clothing/accessory/tie/darkgreen) - -/obj/item/clothing/under/gov/skirt - name = "Green formal skirt uniform" - desc = "A neat proper uniform of someone on offical business. The top button is sewn shut." - icon_state = "greensuit_skirt" - /obj/item/clothing/under/space name = "\improper NASA jumpsuit" desc = "It has a NASA logo on it and is made of space-proofed materials." @@ -168,25 +161,6 @@ desc = "A silk black blouse with a matching gray skirt. Feels proper." icon_state = "gentlesuit_skirt" -/obj/item/clothing/under/gimmick/rank/captain/suit - name = "site manager's suit" - desc = "A green suit and yellow necktie. Exemplifies authority." - icon_state = "green_suit" - item_state_slots = list(slot_r_hand_str = "centcom", slot_l_hand_str = "centcom") - -/obj/item/clothing/under/gimmick/rank/captain/suit/skirt - name = "site manager's skirt suit" - icon_state = "green_suit_skirt" - -/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit - name = "head of personnel's suit" - desc = "A teal suit and yellow necktie. An authoritative yet tacky ensemble." - icon_state = "teal_suit" - item_state_slots = list(slot_r_hand_str = "green", slot_l_hand_str = "green") - -/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit/skirt - name = "head of personnel's skirt suit" - icon_state = "teal_suit_skirt" /obj/item/clothing/under/suit_jacket name = "black suit" @@ -218,17 +192,6 @@ icon_state = "black_suit_fem" item_state = "black_formal_skirt" -/obj/item/clothing/under/suit_jacket/red - name = "red suit" - desc = "A red suit and blue tie. Somewhat formal." - icon_state = "red_suit" - item_state_slots = list(slot_r_hand_str = "lawyer_red", slot_l_hand_str = "lawyer_red") - -/obj/item/clothing/under/suit_jacket/red/skirt - name = "red skirt suit" - desc = "A red suit and blue necktie. Somewhat formal." - icon_state = "red_suit_skirt" - /obj/item/clothing/under/schoolgirl name = "schoolgirl uniform" desc = "It's just like one of my Japanese animes!" @@ -288,13 +251,6 @@ item_state_slots = list(slot_r_hand_str = "yellow", slot_l_hand_str = "yellow") body_parts_covered = LOWER_TORSO -/obj/item/clothing/under/moderncoat - name = "modern wrapped coat" - desc = "The cutting edge of fashion." - icon_state = "moderncoat" - item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red") - body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS - /obj/item/clothing/under/ascetic name = "plain ascetic garb" desc = "Popular with freshly grown vatborn and new age cultists alike." @@ -322,8 +278,9 @@ icon_state = "whitegoldrobe" /* - * dress + * Dress Stuff */ + /obj/item/clothing/under/dress body_parts_covered = UPPER_TORSO|LOWER_TORSO @@ -565,14 +522,40 @@ desc = "A red and black dress fit for a countess." icon_state = "countess" -/obj/item/clothing/under/verglasdress +/obj/item/clothing/under/dress/verglasdress name = "verglas dress" desc = "The modern twist on a forgotten pattern, the Verglas style utilizes comfortable velvet and silver white satin to create an otherworldly effect evocative of winter, or the void." icon_state = "verglas_dress" +/obj/item/clothing/under/dress/goddess + name = "goddess dress" + desc = "A blue and orange dress fit for a goddess." + icon_state = "goddess" + +/obj/item/clothing/under/dress/alpine + name = "alpine dress" + desc = "A green and white dress that makes you want to yodel." + icon_state = "corsetdress" + +/obj/item/clothing/under/dress/goldwrap + name = "golden dress" + desc = "A dress so ostentatious that you feel poorer just looking at it." + icon_state = "golddress" + +/obj/item/clothing/under/dress/golddress + name = "golden wrap" + desc = "An outfit so ostentatious that you feel poorer just looking at it." + icon_state = "goldwrap" + +/obj/item/clothing/under/dress/hightrousers + name = "high-waisted trousers" + desc = "A waistline this high is just made for ripping bodices, swashing buckles, or - just occasionally - sucking blood." + icon_state = "gayvampire" + /* - * wedding stuff + * Wedding Stuff */ + /obj/item/clothing/under/wedding body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS @@ -619,8 +602,8 @@ icon_state = "whitegown" /* -Uniforms and such -*/ + * Uniforms and such + */ /obj/item/clothing/under/sundress name = "sundress" @@ -732,6 +715,52 @@ Uniforms and such name = "burgundy skirt" icon_state = "burgundy_suit_skirt" +/obj/item/clothing/under/suit_jacket/red + name = "red suit" + desc = "A red suit and blue tie. Somewhat formal." + icon_state = "red_suit" + item_state_slots = list(slot_r_hand_str = "lawyer_red", slot_l_hand_str = "lawyer_red") + starting_accessories = list(/obj/item/clothing/accessory/tie/navy, /obj/item/clothing/accessory/jacket/red) + +/obj/item/clothing/under/suit_jacket/red/skirt + name = "red skirt" + icon_state = "red_suit_skirt" + +/obj/item/clothing/under/suit_jacket/teal + name = "teal suit" + desc = "A teal suit and yellow necktie. An authoritative yet tacky ensemble." + icon_state = "teal_suit" + item_state_slots = list(slot_r_hand_str = "green", slot_l_hand_str = "green") + starting_accessories = list(/obj/item/clothing/accessory/tie/yellow, /obj/item/clothing/accessory/jacket/teal) + +/obj/item/clothing/under/suit_jacket/teal/skirt + name = "teal skirt suit" + icon_state = "teal_suit_skirt" + +/obj/item/clothing/under/suit_jacket/green + name = "green suit" + desc = "A green suit and yellow necktie. Exemplifies authority." + icon_state = "green_suit" + item_state_slots = list(slot_r_hand_str = "centcom", slot_l_hand_str = "centcom") + starting_accessories = list(/obj/item/clothing/accessory/tie/yellow, /obj/item/clothing/accessory/jacket/green) + +/obj/item/clothing/under/gov + name = "green formal uniform" + desc = "A neat proper uniform of someone on offical business. The collar is immaculately starched." + icon_state = "greensuit" + item_state_slots = list(slot_r_hand_str = "centcom", slot_l_hand_str = "centcom") + starting_accessories = list(/obj/item/clothing/accessory/tie/darkgreen) + rolled_sleeves = 0 + +/obj/item/clothing/under/gov/skirt + name = "green formal skirt" + desc = "A neat proper uniform of someone on offical business. The top button is sewn shut." + icon_state = "greensuit_skirt" + +/obj/item/clothing/under/suit_jacket/green/skirt + name = "green skirt suit" + icon_state = "green_suit_skirt" + /obj/item/clothing/under/suit_jacket/checkered name = "checkered suit" desc = "That's a very nice suit you have there. Shame if something were to happen to it, eh?" @@ -750,6 +779,13 @@ Uniforms and such item_state_slots = list(slot_r_hand_str = "lawyer_black", slot_l_hand_str = "lawyer_black") starting_accessories = list(/obj/item/clothing/accessory/tie/black, /obj/item/clothing/accessory/jacket/gambler) +/obj/item/clothing/under/suit_jacket/extravagant + name = "extravagant suit" + desc = "An extravagant suit. Perfect for being over dramatic." + icon_state = "extravagant_suit" + item_state_slots = list(slot_r_hand_str = "lawyer_black", slot_l_hand_str = "lawyer_black") + starting_accessories = list(/obj/item/clothing/accessory/jacket/extravagant) + /obj/item/clothing/under/suit_jacket/tan name = "tan suit" desc = "A tan suit. Smart, but casual." @@ -902,12 +938,24 @@ Uniforms and such icon_state = "flowerskirt" /obj/item/clothing/under/fashionminiskirt - name = "fashionable miniskirt" - desc = "An impractically short miniskirt allegedly making waves through the local fashion scene." - icon_state = "miniskirt_fashion" + name = "fashionable miniskirt" + desc = "An impractically short miniskirt allegedly making waves through the local fashion scene." + icon_state = "miniskirt_fashion" + +/obj/item/clothing/under/retrosweater + name = "retro sweater" + desc = "A rugged cableknit sweater and leather pants, fit for a dashing space adventurer." + icon_state = "retro_sweater" + +/obj/item/clothing/under/wednesday + name = "cropped sweater skirt" + desc = "A cropped green sweater and matching miniskirt." + icon_state = "wednesday" + /* - * swimsuit + * Swimsuit */ + /obj/item/clothing/under/swimsuit/ siemens_coefficient = 1 body_parts_covered = 0 @@ -974,8 +1022,9 @@ Uniforms and such /* - * pyjamas + * Pyjamas */ + /obj/item/clothing/under/bluepyjamas name = "blue pyjamas" desc = "Slightly old-fashioned sleepwear." @@ -990,74 +1039,12 @@ Uniforms and such item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red") body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS -/* - *Misc Uniforms - */ - -/obj/item/clothing/under/aether - name = "\improper Aether jumpsuit" - desc = "A jumpsuit belonging to Aether Atmospherics and Recycling, a Trans-Stellar that supplies recycling and atmospheric systems to colonies." - icon_state = "aether" - worn_state = "aether" - -/obj/item/clothing/under/pcrc - name = "\improper PCRC uniform" - desc = "A uniform belonging to Proxima Centauri Risk Control, a private security firm." - icon_state = "pcrc" - item_state = "jensensuit" - worn_state = "pcrc" - -/obj/item/clothing/under/grayson - name = "\improper Grayson overalls" - desc = "A set of overalls belonging to Grayson Manufactories, a mining Trans-Stellar." - icon_state = "mechanic" - worn_state = "mechanic" - -/obj/item/clothing/under/wardt - name = "\improper Ward-Takahashi jumpsuit" - desc = "A jumpsuit belonging to Ward-Takahashi, a Trans-Stellar in the consumer goods market." - icon_state = "robotics2" - worn_state = "robotics2" - -/obj/item/clothing/under/mbill - name = "\improper Major Bill's uniform" - desc = "A uniform belonging to Major Bill's Transportation, a shipping megacorporation." - icon_state = "mbill" - worn_state = "mbill" - catalogue_data = list(/datum/category_item/catalogue/information/organization/major_bills) - -/obj/item/clothing/under/confederacy - name = "\improper Confederacy uniform" - desc = "A military uniform belonging to the Confederacy of Man, an independent human government." - icon_state = "confed" - worn_state = "confed" - -/obj/item/clothing/under/saare - name = "\improper SAARE uniform" - desc = "A dress uniform belonging to Stealth Assault Enterprises, a minor private military corporation." - icon_state = "saare" - worn_state = "saare" - -/obj/item/clothing/under/focal - name = "\improper Focal Point jumpsuit" - desc = "A jumpsuit belonging to Focal Point Energistics, an engineering megacorporation." - icon_state = "focal" - worn_state = "focal" - -/obj/item/clothing/under/hephaestus - name = "\improper Hephaestus jumpsuit" - desc = "A jumpsuit belonging to Hephaestus Industries, a Trans-Stellar best known for its arms production." - icon_state = "heph" - worn_state = "heph" - /obj/item/clothing/under/rank/psych/turtleneck/sweater desc = "A warm looking sweater and a pair of dark blue slacks." name = "sweater" icon_state = "turtleneck" worn_state = "turtleneck" -//Uniforms end above here. - /obj/item/clothing/under/medigown name = "medical gown" desc = "A flimsy examination gown, the back ties never close." @@ -1221,4 +1208,197 @@ Uniforms and such desc = "Some patched together rags. Better than being naked." force = 0 icon_state = "rag" - worn_state = "rag" \ No newline at end of file + worn_state = "rag" + +/obj/item/clothing/under/curator + name = "curator uniform" + desc = "A rugged uniform suitable for treasure hunting." + icon_state = "curator" + worn_state = "curator" + +/* + * Modern + */ + +/obj/item/clothing/under/moderncoat + name = "modern wrapped coat" + desc = "The cutting edge of fashion." + icon_state = "mod_coat" + worn_state = "mod_coat" + item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red") + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS + +/obj/item/clothing/under/modjump + name = "modern jumpsuit" + desc = "A stylish jumpsuit of modern culture." + icon_state = "mod_jump" + worn_state = "mod_jump" + item_state_slots = list(slot_r_hand_str = "orange", slot_l_hand_str = "orange") + +/obj/item/clothing/under/modjump2 + name = "modern outfit" + desc = "A stylish outfit of modern culture." + icon_state = "mod_jump2" + worn_state = "mod_jump2" + item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black") + +/obj/item/clothing/under/modjump3 + name = "cyber jumpsuit" + desc = "A cool cyberpunk styled jumpsuit. The lights on the back glitched out and don't work." + icon_state = "cyber" + worn_state = "cyber" + item_state_slots = list(slot_r_hand_str = "grey", slot_l_hand_str = "grey") + +/* + * Corporate Uniforms + */ + +/obj/item/clothing/under/mbill + name = "\improper Major Bill's uniform" + desc = "A uniform belonging to Major Bill's Transportation, a shipping megacorporation." + icon_state = "mbill" + worn_state = "mbill" + catalogue_data = list(/datum/category_item/catalogue/information/organization/major_bills) + +/obj/item/clothing/under/mbill_flight + name = "\improper Major Bill's flightsuit" + desc = "A flightsuit belonging to Major Bill's Transportation, a shipping megacorporation." + icon_state = "mbill_flight" + worn_state = "mbill_flight" + catalogue_data = list(/datum/category_item/catalogue/information/organization/major_bills) + starting_accessories = list(/obj/item/clothing/accessory/storage/webbing/pilot1) + rolled_sleeves = 0 + +/obj/item/clothing/under/corp/aether + name = "\improper Aether jumpsuit" + desc = "A jumpsuit belonging to Aether Atmospherics and Recycling, a Trans-Stellar that supplies recycling and atmospheric systems to colonies." + icon_state = "aether" + worn_state = "aether" + +/obj/item/clothing/under/corp/pcrc + name = "\improper PCRC uniform" + desc = "A uniform belonging to Proxima Centauri Risk Control, a private security firm." + icon_state = "pcrc" + item_state = "jensensuit" + worn_state = "pcrc" + +/obj/item/clothing/under/corp/centauri + name = "\improper Centauri Provisions jumpsuit" + desc = "A jumpsuit belonging to Centauri Provisions, a Trans-Stellar best known for its food and drink products." + icon_state = "centauri" + worn_state = "centauri" + +/obj/item/clothing/under/corp/grayson + name = "\improper Grayson overalls" + desc = "A set of overalls belonging to Grayson Manufactories, a mining Trans-Stellar." + icon_state = "grayson_mech" + worn_state = "grayson_mech" + +/obj/item/clothing/under/corp/grayson_jump + name = "\improper Grayson jumpsuit" + desc = "A jumpsuit belonging to Grayson Manufactories, a mining Trans-Stellar." + icon_state = "grayson" + worn_state = "grayson" + rolled_sleeves = 0 + +/obj/item/clothing/under/corp/wardt + name = "\improper Ward-Takahashi jumpsuit" + desc = "A jumpsuit belonging to Ward-Takahashi, a Trans-Stellar in the consumer goods market." + icon_state = "robotics2" + worn_state = "robotics2" + +/obj/item/clothing/under/corp/confederacy + name = "\improper Confederacy uniform" + desc = "A military uniform belonging to the Confederacy of Man, an independent human government." + icon_state = "confed" + worn_state = "confed" + +/obj/item/clothing/under/corp/saare + name = "\improper SAARE uniform" + desc = "A dress uniform belonging to Stealth Assault Enterprises, a minor private military corporation." + icon_state = "saare" + worn_state = "saare" + +/obj/item/clothing/under/corp/focal + name = "\improper Focal Point jumpsuit" + desc = "A jumpsuit belonging to Focal Point Energistics, an engineering megacorporation." + icon_state = "focal" + worn_state = "focal" + +/obj/item/clothing/under/corp/wulf + name = "\improper Wulf jumpsuit" + desc = "A jumpsuit belonging to Wulf Aeronautics, a ship-building and propulsion systems Trans-Stellar." + icon_state = "wulf" + worn_state = "wulf" + rolled_sleeves = 0 + +/obj/item/clothing/under/corp/hephaestus + name = "\improper Hephaestus jumpsuit" + desc = "A jumpsuit belonging to Hephaestus, a Trans-Stellar best known for high-grade arms manufacturing." + icon_state = "heph" + worn_state = "heph" + rolled_sleeves = 0 + +/obj/item/clothing/under/corp/kaleidoscope + name = "\improper Kaleidoscope uniform" + desc = "A science uniform belonging to Kaleidoscope Cosmetics, a cosmetic and gene-modification trans-stellar." + icon_state = "kaleido" + worn_state = "kaleido" + rolled_sleeves = 0 + +/obj/item/clothing/under/corp/veymed + name = "\improper Vey-Med uniform" + desc = "A uniform belonging to Vey-Medical, a Skrellian biomedical Trans-Stellar." + icon_state = "veymed" + worn_state = "veymed" + rolled_sleeves = 0 + +/obj/item/clothing/under/corp/wardt + name = "\improper Ward-Takahashi jumpsuit" + desc = "A jumpsuit belonging to Ward-Takahashi, a Trans-Stellar in the consumer goods market." + icon_state = "robotics2" + worn_state = "robotics2" + +/obj/item/clothing/under/corp/xion + name = "\improper Xion jumpsuit" + desc = "A jumpsuit belonging to Xion Manufacturing, an industrial equipment Trans-Stellar." + icon_state = "xion" + worn_state = "xion" + rolled_sleeves = 0 + +/obj/item/clothing/under/corp/zenghu + name = "\improper Zeng-Hu jumpsuit" + desc = "A jumpsuit belonging to Zeng-Hu Pharmaceuticals, a Trans-Stellar in the business of exactly what you'd expect.." + icon_state = "zenghu" + worn_state = "zenghu" + starting_accessories = list(/obj/item/clothing/accessory/tie/red) + rolled_sleeves = 0 + +/obj/item/clothing/under/corp/morpheus + name = "\improper Morpheus jumpsuit" + desc = "A uniform belonging to Morpheus Cyberkinetics, a positronic-run cybernetics Trans-Stellar." + icon_state = "morpheus" + worn_state = "morpheus" + +/obj/item/clothing/under/corp/xion + name = "\improper Xion jumpsuit" + desc = "A jumpsuit belonging to Xion Manufacturing, an industrial equipment Trans-Stellar." + icon_state = "xion" + worn_state = "xion" + rolled_sleeves = 0 + +/obj/item/clothing/under/corp/hedberg + name = "\improper Hedberg law enforcement uniform" + desc = "A sturdy civilian law enforcement uniform belonging to the Hedberg-Hammarstrom private security corporation." + icon_state = "hedberg" + worn_state = "hedberg" + armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) //Equivalent to security officer's jumpsuit + rolled_sleeves = 0 + +/obj/item/clothing/under/corp/hedbergtech + name = "\improper Hedberg technician uniform" + desc = "A technician's uniform belonging to the Hedberg-Hammarstrom private security corporation. It is lightly shielded against radiation." + icon_state = "hedberg_tech" + worn_state = "hedberg_tech" + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10) // Equivalent to engineer's jumpsuit. + rolled_sleeves = 0 \ No newline at end of file diff --git a/code/modules/clothing/under/solgov.dm b/code/modules/clothing/under/solgov.dm index 5854c006e2..82386c9769 100644 --- a/code/modules/clothing/under/solgov.dm +++ b/code/modules/clothing/under/solgov.dm @@ -71,6 +71,14 @@ worn_state = "blackutility_crew" armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 10) +/obj/item/clothing/under/sifcop + name = "\improper SifGuard law enforcement uniform" + desc = "A sturdy law enforcement uniform typical of Vir's civilian law enforcement officers." + icon_state = "sifcop" + worn_state = "sifcop" + armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) //Equivalent to security officer's jumpsuit + rolled_sleeves = 0 + /obj/item/clothing/under/solgov/utility/sifguard_skirt name = "\improper SifGuard skirt" desc = "A black turtleneck and skirt, the elusive ladies' uniform of the Sif Defense Force." @@ -469,7 +477,7 @@ permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 30, rad = 0) -//Terrans +//SAARE /obj/item/clothing/under/saare name = "master SAARE uniform" @@ -497,4 +505,21 @@ name = "SAARE command service uniform" desc = "The service uniform of Stealth Assault Enterprises, for high-ranking mercenaries." icon_state = "terranservice_comm" - worn_state = "terranservice_comm" \ No newline at end of file + worn_state = "terranservice_comm" + +//Galactic Survey + +/obj/item/clothing/under/gsa + name = "\improper Galactic Survey utility uniform" + desc = "A jumpsuit belonging to the Galactic Survey Administration, SolGov's scientific exploration division." + icon_state = "gsa" + worn_state = "gsa" + rolled_sleeves = 0 + +/obj/item/clothing/under/gsa_work + name = "\improper Galactic Survey worksuit" + desc = "A padded work suit belonging to the Galactic Survey Administration, SolGov's scientific exploration division. It has minor radiation shielding." + icon_state = "gsa_work" + worn_state = "gsa_work" + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10) + rolled_sleeves = 0 \ No newline at end of file diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index a438d1b01d..c339c4762d 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -693,7 +693,8 @@ /obj/item/weapon/weldingtool = 8, /obj/item/clothing/head/welding = 8, /obj/item/weapon/light/tube = 10, - /obj/item/clothing/suit/fire = 4, + /obj/item/clothing/head/hardhat/firefighter = 4, + /obj/item/clothing/suit/fire/firefighter = 4, /obj/item/weapon/stock_parts/scanning_module = 5, /obj/item/weapon/stock_parts/micro_laser = 5, /obj/item/weapon/stock_parts/matter_bin = 5, diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index f541a180e4..dfaf094c90 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -737,10 +737,10 @@ /obj/item/clothing/under/color/white = 5, /obj/item/clothing/under/color/yellow = 5, /obj/item/clothing/under/color/yellowgreen = 5, - /obj/item/clothing/under/aether = 5, - /obj/item/clothing/under/focal = 5, - /obj/item/clothing/under/hephaestus = 5, - /obj/item/clothing/under/wardt = 5, + /obj/item/clothing/under/corp/aether = 5, + /obj/item/clothing/under/corp/focal = 5, + /obj/item/clothing/under/corp/hephaestus = 5, + /obj/item/clothing/under/corp/wardt = 5, /obj/item/clothing/under/kilt = 5, /obj/item/clothing/under/fluff/latexmaid = 5, /obj/item/clothing/under/dress/lilacdress = 5, @@ -909,10 +909,10 @@ /obj/item/clothing/under/color/white = 50, /obj/item/clothing/under/color/yellow = 50, /obj/item/clothing/under/color/yellowgreen = 50, - /obj/item/clothing/under/aether = 50, - /obj/item/clothing/under/focal = 50, - /obj/item/clothing/under/hephaestus = 50, - /obj/item/clothing/under/wardt = 50, + /obj/item/clothing/under/corp/aether = 50, + /obj/item/clothing/under/corp/focal = 50, + /obj/item/clothing/under/corp/hephaestus = 50, + /obj/item/clothing/under/corp/wardt = 50, /obj/item/clothing/under/kilt = 50, /obj/item/clothing/under/fluff/latexmaid = 50, /obj/item/clothing/under/dress/lilacdress = 50, @@ -1231,6 +1231,9 @@ /obj/item/clothing/suit/jacket/puffer/vest = 5, /obj/item/clothing/suit/storage/flannel/red = 5, /obj/item/clothing/suit/unathi/robe = 5, +<<<<<<< HEAD +||||||| parent of 0085a5bd10... Adds more clothing from Polaris and various sources (#11546) + /obj/item/clothing/suit/storage/snowsuit = 5, /obj/item/clothing/suit/storage/toggle/internalaffairs = 5, /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket = 5, /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket = 5, @@ -1318,6 +1321,7 @@ /obj/item/clothing/suit/jacket/puffer/vest = 100, /obj/item/clothing/suit/storage/flannel/red = 100, /obj/item/clothing/suit/unathi/robe = 100, + /obj/item/clothing/suit/storage/snowsuit = 100, /obj/item/clothing/suit/storage/toggle/internalaffairs = 100, /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket = 100, /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket = 100, @@ -1486,6 +1490,2368 @@ contraband = list(/obj/item/clothing/head/syndicatefake = 1, /obj/item/clothing/suit/syndicatefake = 1) +/obj/machinery/seed_storage/brig + name = "Prisoners' food seed storage" + starting_seeds = list( + /obj/item/seeds/appleseed = 3, + /obj/item/seeds/bananaseed = 3, + /obj/item/seeds/berryseed = 3, + /obj/item/seeds/cabbageseed = 3, + /obj/item/seeds/carrotseed = 3, + /obj/item/seeds/celery = 3, + /obj/item/seeds/chantermycelium = 3, + /obj/item/seeds/cherryseed = 3, + /obj/item/seeds/chiliseed = 3, + /obj/item/seeds/cocoapodseed = 3, + /obj/item/seeds/cornseed = 3, + /obj/item/seeds/durian = 3, + /obj/item/seeds/eggplantseed = 3, + /obj/item/seeds/grapeseed = 3, + /obj/item/seeds/grassseed = 3, + /obj/item/seeds/replicapod = 3, + /obj/item/seeds/lavenderseed = 3, + /obj/item/seeds/lemonseed = 3, + /obj/item/seeds/lettuce = 3, + /obj/item/seeds/limeseed = 3, + /obj/item/seeds/mtearseed = 2, + /obj/item/seeds/orangeseed = 3, + /obj/item/seeds/onionseed = 3, + /obj/item/seeds/peanutseed = 3, + /obj/item/seeds/plumpmycelium = 3, + /obj/item/seeds/poppyseed = 3, + /obj/item/seeds/potatoseed = 3, + /obj/item/seeds/pumpkinseed = 3, + /obj/item/seeds/rhubarb = 3, + /obj/item/seeds/riceseed = 3, + /obj/item/seeds/rose = 3, + /obj/item/seeds/soyaseed = 3, + /obj/item/seeds/pineapple = 3, + /obj/item/seeds/sugarcaneseed = 3, + /obj/item/seeds/sunflowerseed = 3, + /obj/item/seeds/shandseed = 2, + /obj/item/seeds/tobaccoseed = 3, + /obj/item/seeds/tomatoseed = 3, + /obj/item/seeds/towermycelium = 3, + /obj/item/seeds/vanilla = 3, + /obj/item/seeds/watermelonseed = 3, + /obj/item/seeds/wheatseed = 3, + /obj/item/seeds/whitebeetseed = 3, + /obj/item/seeds/wabback = 2) + +/obj/machinery/vending/hydronutrients/brig + name = "Brig NutriMax" + desc = "A plant nutrients vendor. Seems some items aren't included." + products = list(/obj/item/weapon/reagent_containers/glass/bottle/eznutrient = 6,/obj/item/weapon/reagent_containers/glass/bottle/left4zed = 4,/obj/item/weapon/reagent_containers/glass/bottle/robustharvest = 3,/obj/item/weapon/plantspray/pests = 20, + /obj/item/weapon/reagent_containers/glass/beaker = 4,/obj/item/weapon/storage/bag/plants = 5) + premium = list(/obj/item/weapon/reagent_containers/glass/bottle/ammonia = 10,/obj/item/weapon/reagent_containers/glass/bottle/diethylamine = 5) + +/obj/machinery/vending/abductor + name = "Abduct-U" + desc = "A mysterious machine which can fabricate many tools for acquiring test subjects." + icon = 'icons/obj/abductor_vr.dmi' + icon_state = "dispenser_2way" + products = list(/obj/item/weapon/card/id/syndicate/station_access = 1, + /obj/item/weapon/storage/box/syndie_kit/chameleon = 1, + /obj/item/clothing/mask/bandana = 1, + /obj/item/clothing/glasses/sunglasses = 1, + /obj/item/device/radio/headset/syndicate/alt = 1, + /obj/item/device/pda = 1, + /obj/item/device/communicator = 1, + /obj/item/weapon/tape_roll = 2, + /obj/item/weapon/handcuffs = 4, + /obj/item/weapon/handcuffs/legcuffs = 4, + /obj/item/weapon/cell/device/weapon/recharge/alien = 2, + /obj/item/device/chameleon = 1, + /obj/item/weapon/storage/mre/menu11 = 2, + /obj/item/device/flash = 2, + /obj/item/weapon/pen/reagent/paralysis = 4, + /obj/item/device/perfect_tele/alien = 1 + ) + vend_delay = 15 + +/obj/machinery/vending/loadout + name = "Fingers and Toes" + desc = "A special vendor for gloves and shoes!" + product_ads = "Do you have fingers and toes? COVER THEM UP!;Show me your toes! Wait. NO DON'T! BUY NEW SHOES!;Don't leave prints, BUY SOME GLOVES!;Remember to check your shoes for micros! You don't have to let them out, but just check for them!;Fingers and Toes is not liable for micro entrapment or abuse under the feet of our patrons.!;This little piggy went WE WE WE all the way down to FINGERS AND TOES to pick up some sweet new gloves and shoes." + icon = 'icons/obj/vending_vr.dmi' + icon_state = "glovesnshoes" + products = list(/obj/item/clothing/gloves/evening = 5, + /obj/item/clothing/gloves/fingerless = 5, + /obj/item/clothing/gloves/black = 5, + /obj/item/clothing/gloves/blue = 5, + /obj/item/clothing/gloves/brown = 5, + /obj/item/clothing/gloves/color = 5, + /obj/item/clothing/gloves/green = 5, + /obj/item/clothing/gloves/grey = 5, + /obj/item/clothing/gloves/sterile/latex = 5, + /obj/item/clothing/gloves/light_brown = 5, + /obj/item/clothing/gloves/sterile/nitrile = 5, + /obj/item/clothing/gloves/orange = 5, + /obj/item/clothing/gloves/purple = 5, + /obj/item/clothing/gloves/red = 5, + /obj/item/clothing/gloves/fluff/siren = 5, + /obj/item/clothing/gloves/white = 5, + /obj/item/clothing/gloves/duty = 5, + /obj/item/clothing/shoes/athletic = 5, + /obj/item/clothing/shoes/boots/fluff/siren = 5, + /obj/item/clothing/shoes/slippers = 5, + /obj/item/clothing/shoes/boots/cowboy/classic = 5, + /obj/item/clothing/shoes/boots/cowboy = 5, + /obj/item/clothing/shoes/boots/duty = 5, + /obj/item/clothing/shoes/flats/white/color = 5, + /obj/item/clothing/shoes/flipflop = 5, + /obj/item/clothing/shoes/heels = 5, + /obj/item/clothing/shoes/hitops/black = 5, + /obj/item/clothing/shoes/hitops/blue = 5, + /obj/item/clothing/shoes/hitops/green = 5, + /obj/item/clothing/shoes/hitops/orange = 5, + /obj/item/clothing/shoes/hitops/purple = 5, + /obj/item/clothing/shoes/hitops/red = 5, + /obj/item/clothing/shoes/flats/white/color = 5, + /obj/item/clothing/shoes/hitops/yellow = 5, + /obj/item/clothing/shoes/boots/jackboots = 5, + /obj/item/clothing/shoes/boots/jungle = 5, + /obj/item/clothing/shoes/black/cuffs = 5, + /obj/item/clothing/shoes/black/cuffs/blue = 5, + /obj/item/clothing/shoes/black/cuffs/red = 5, + /obj/item/clothing/shoes/sandal = 5, + /obj/item/clothing/shoes/black = 5, + /obj/item/clothing/shoes/blue = 5, + /obj/item/clothing/shoes/brown = 5, + /obj/item/clothing/shoes/laceup = 5, + /obj/item/clothing/shoes/green = 5, + /obj/item/clothing/shoes/laceup/brown = 5, + /obj/item/clothing/shoes/orange = 5, + /obj/item/clothing/shoes/purple = 5, + /obj/item/clothing/shoes/red = 5, + /obj/item/clothing/shoes/white = 5, + /obj/item/clothing/shoes/yellow = 5, + /obj/item/clothing/shoes/skater = 5, + /obj/item/clothing/shoes/boots/cowboy/snakeskin = 5, + /obj/item/clothing/shoes/boots/jackboots/toeless = 5, + /obj/item/clothing/shoes/boots/workboots/toeless = 5, + /obj/item/clothing/shoes/boots/winter = 5, + /obj/item/clothing/shoes/boots/workboots = 5, + /obj/item/clothing/shoes/footwraps = 5) + prices = list(/obj/item/clothing/gloves/evening = 50, + /obj/item/clothing/gloves/fingerless = 50, + /obj/item/clothing/gloves/black = 50, + /obj/item/clothing/gloves/blue = 50, + /obj/item/clothing/gloves/brown = 50, + /obj/item/clothing/gloves/color = 50, + /obj/item/clothing/gloves/green = 50, + /obj/item/clothing/gloves/grey = 50, + /obj/item/clothing/gloves/sterile/latex = 100, + /obj/item/clothing/gloves/light_brown = 50, + /obj/item/clothing/gloves/sterile/nitrile = 100, + /obj/item/clothing/gloves/orange = 50, + /obj/item/clothing/gloves/purple = 50, + /obj/item/clothing/gloves/red = 50, + /obj/item/clothing/gloves/fluff/siren = 50, + /obj/item/clothing/gloves/white = 50, + /obj/item/clothing/gloves/duty = 150, + /obj/item/clothing/shoes/athletic = 50, + /obj/item/clothing/shoes/boots/fluff/siren = 50, + /obj/item/clothing/shoes/slippers = 50, + /obj/item/clothing/shoes/boots/cowboy/classic = 50, + /obj/item/clothing/shoes/boots/cowboy = 50, + /obj/item/clothing/shoes/boots/duty = 100, + /obj/item/clothing/shoes/flats/white/color = 50, + /obj/item/clothing/shoes/flipflop = 50, + /obj/item/clothing/shoes/heels = 50, + /obj/item/clothing/shoes/hitops/black = 50, + /obj/item/clothing/shoes/hitops/blue = 50, + /obj/item/clothing/shoes/hitops/green = 50, + /obj/item/clothing/shoes/hitops/orange = 50, + /obj/item/clothing/shoes/hitops/purple = 50, + /obj/item/clothing/shoes/hitops/red = 50, + /obj/item/clothing/shoes/flats/white/color = 50, + /obj/item/clothing/shoes/hitops/yellow = 50, + /obj/item/clothing/shoes/boots/jackboots = 50, + /obj/item/clothing/shoes/boots/jungle = 100, + /obj/item/clothing/shoes/black/cuffs = 50, + /obj/item/clothing/shoes/black/cuffs/blue = 50, + /obj/item/clothing/shoes/black/cuffs/red = 50, + /obj/item/clothing/shoes/sandal = 50, + /obj/item/clothing/shoes/black = 50, + /obj/item/clothing/shoes/blue = 50, + /obj/item/clothing/shoes/brown = 50, + /obj/item/clothing/shoes/laceup = 50, + /obj/item/clothing/shoes/green = 50, + /obj/item/clothing/shoes/laceup/brown = 50, + /obj/item/clothing/shoes/orange = 50, + /obj/item/clothing/shoes/purple = 50, + /obj/item/clothing/shoes/red = 50, + /obj/item/clothing/shoes/white = 50, + /obj/item/clothing/shoes/yellow = 50, + /obj/item/clothing/shoes/skater = 50, + /obj/item/clothing/shoes/boots/cowboy/snakeskin = 50, + /obj/item/clothing/shoes/boots/jackboots/toeless = 50, + /obj/item/clothing/shoes/boots/workboots/toeless = 50, + /obj/item/clothing/shoes/boots/winter = 50, + /obj/item/clothing/shoes/boots/workboots = 50, + /obj/item/clothing/shoes/footwraps = 50) + premium = list(/obj/item/clothing/gloves/rainbow = 1, + /obj/item/clothing/shoes/rainbow = 1,) + contraband = list(/obj/item/clothing/shoes/syndigaloshes = 1, + /obj/item/clothing/shoes/clown_shoes = 1) + +/obj/machinery/vending/loadout/uniform + name = "The Basics" + desc = "A vendor using compressed matter cartridges to store large amounts of basic station uniforms." + product_ads = "Don't get caught naked!;Pick up your uniform!;Using compressed matter cartridges and VERY ETHICAL labor practices, we bring you the uniforms you need!;No uniform? No problem!;We've got your covered!;The Basics is not responsible for being crushed under the amount of things inside our machines. DO NOT VEND IN EXCESS!!" + icon_state = "loadout" + vend_delay = 16 + products = list(/obj/item/device/pda = 50, + /obj/item/device/radio/headset = 50, + /obj/item/weapon/storage/backpack/ = 10, + /obj/item/weapon/storage/backpack/messenger = 10, + /obj/item/weapon/storage/backpack/satchel = 10, + /obj/item/clothing/under/color = 5, + /obj/item/clothing/under/color/aqua = 5, + /obj/item/clothing/under/color/black = 5, + /obj/item/clothing/under/color/blackjumpskirt = 5, + /obj/item/clothing/under/color/blue = 5, + /obj/item/clothing/under/color/brown = 5, + /obj/item/clothing/under/color/green = 5, + /obj/item/clothing/under/color/grey = 5, + /obj/item/clothing/under/color/orange = 5, + /obj/item/clothing/under/color/pink = 5, + /obj/item/clothing/under/color/red = 5, + /obj/item/clothing/under/color/white = 5, + /obj/item/clothing/under/color/yellow = 5, + /obj/item/clothing/shoes/black = 20, + /obj/item/clothing/shoes/white = 20) + prices = list() + +/obj/machinery/vending/loadout/accessory + name = "Looty Inc." + desc = "A special vendor for accessories." + product_ads = "Want shinies? We have the shinies.;Need that special something to complete your outfit? We have what you need!;Ditch that old dull dangly something you've got and pick up one of our shinies!;Bracelets, collars, scarfs rings and more! We have the fancy things you need!;Does your pet need a collar? We don't judge! Keep them in line with one of one of ours!;Top of the line materials! 'Hand crafted' goods!" + icon_state = "accessory" + vend_delay = 6 + products = list(/obj/item/clothing/accessory = 5, + /obj/item/clothing/accessory/armband/med/color = 10, + /obj/item/clothing/accessory/asymmetric = 5, + /obj/item/clothing/accessory/asymmetric/purple = 5, + /obj/item/clothing/accessory/asymmetric/green = 5, + /obj/item/clothing/accessory/bracelet = 5, + /obj/item/clothing/accessory/bracelet/material = 5, + /obj/item/clothing/accessory/bracelet/friendship = 5, + /obj/item/clothing/accessory/chaps = 5, + /obj/item/clothing/accessory/chaps/black = 5, + /obj/item/weapon/storage/briefcase/clutch = 1, + /obj/item/clothing/accessory/collar = 5, + /obj/item/clothing/accessory/collar/bell = 5, + /obj/item/clothing/accessory/collar/spike = 5, + /obj/item/clothing/accessory/collar/pink = 5, + /obj/item/clothing/accessory/collar/holo = 5, + /obj/item/clothing/accessory/collar/shock = 5, + /obj/item/weapon/storage/belt/fannypack = 1, + /obj/item/weapon/storage/belt/fannypack/white = 5, + /obj/item/clothing/accessory/fullcape = 5, + /obj/item/clothing/accessory/halfcape = 5, + /obj/item/clothing/accessory/hawaiian = 5, + /obj/item/clothing/accessory/hawaiian/blue = 5, + /obj/item/clothing/accessory/hawaiian/pink = 5, + /obj/item/clothing/accessory/hawaiian/red = 5, + /obj/item/clothing/accessory/hawaiian/yellow = 5, + /obj/item/clothing/accessory/locket = 5, + /obj/item/weapon/storage/backpack/purse = 1, + /obj/item/clothing/accessory/sash = 5, + /obj/item/clothing/accessory/scarf = 5, + /obj/item/clothing/accessory/scarf/red = 5, + /obj/item/clothing/accessory/scarf/darkblue = 5, + /obj/item/clothing/accessory/scarf/purple = 5, + /obj/item/clothing/accessory/scarf/yellow = 5, + /obj/item/clothing/accessory/scarf/orange = 5, + /obj/item/clothing/accessory/scarf/lightblue = 5, + /obj/item/clothing/accessory/scarf/white = 5, + /obj/item/clothing/accessory/scarf/black = 5, + /obj/item/clothing/accessory/scarf/zebra = 5, + /obj/item/clothing/accessory/scarf/christmas = 5, + /obj/item/clothing/accessory/scarf/stripedred = 5, + /obj/item/clothing/accessory/scarf/stripedgreen = 5, + /obj/item/clothing/accessory/scarf/stripedblue = 5, + /obj/item/clothing/accessory/jacket = 5, + /obj/item/clothing/accessory/jacket/checkered = 5, + /obj/item/clothing/accessory/jacket/burgundy = 5, + /obj/item/clothing/accessory/jacket/navy = 5, + /obj/item/clothing/accessory/jacket/charcoal = 5, + /obj/item/clothing/accessory/vest = 5, + /obj/item/clothing/accessory/sweater = 5, + /obj/item/clothing/accessory/sweater/pink = 5, + /obj/item/clothing/accessory/sweater/mint = 5, + /obj/item/clothing/accessory/sweater/blue = 5, + /obj/item/clothing/accessory/sweater/heart = 5, + /obj/item/clothing/accessory/sweater/nt = 5, + /obj/item/clothing/accessory/sweater/keyhole = 5, + /obj/item/clothing/accessory/sweater/winterneck = 5, + /obj/item/clothing/accessory/sweater/uglyxmas = 5, + /obj/item/clothing/accessory/sweater/flowersweater = 5, + /obj/item/clothing/accessory/sweater/redneck = 5, + /obj/item/clothing/accessory/tie = 5, + /obj/item/clothing/accessory/tie/horrible = 5, + /obj/item/clothing/accessory/tie/white = 5, + /obj/item/clothing/accessory/tie/navy = 5, + /obj/item/clothing/accessory/tie/yellow = 5, + /obj/item/clothing/accessory/tie/darkgreen = 5, + /obj/item/clothing/accessory/tie/black = 5, + /obj/item/clothing/accessory/tie/red_long = 5, + /obj/item/clothing/accessory/tie/red_clip = 5, + /obj/item/clothing/accessory/tie/blue_long = 5, + /obj/item/clothing/accessory/tie/blue_clip = 5, + /obj/item/clothing/accessory/tie/red = 5, + /obj/item/clothing/accessory/wcoat = 5, + /obj/item/clothing/accessory/wcoat/red = 5, + /obj/item/clothing/accessory/wcoat/grey = 5, + /obj/item/clothing/accessory/wcoat/brown = 5, + /obj/item/clothing/accessory/wcoat/gentleman = 5, + /obj/item/clothing/accessory/wcoat/swvest = 5, + /obj/item/clothing/accessory/wcoat/swvest/blue = 5, + /obj/item/clothing/accessory/wcoat/swvest/red = 5, + /obj/item/weapon/storage/wallet = 5, + /obj/item/weapon/storage/wallet/poly = 5, + /obj/item/weapon/storage/wallet/womens = 5, + /obj/item/weapon/lipstick = 5, + /obj/item/weapon/lipstick/purple = 5, + /obj/item/weapon/lipstick/jade = 5, + /obj/item/weapon/lipstick/black = 5, + /obj/item/clothing/ears/earmuffs = 5, + /obj/item/clothing/ears/earmuffs/headphones = 5, + /obj/item/clothing/ears/earring/stud = 5, + /obj/item/clothing/ears/earring/dangle = 5, + /obj/item/clothing/gloves/ring/mariner = 5, + /obj/item/clothing/gloves/ring/engagement = 5, + /obj/item/clothing/gloves/ring/seal/signet = 5, + /obj/item/clothing/gloves/ring/seal/mason = 5, + /obj/item/clothing/gloves/ring/material/plastic = 5, + /obj/item/clothing/gloves/ring/material/steel = 5, + /obj/item/clothing/gloves/ring/material/gold = 5, + /obj/item/clothing/glasses/eyepatch = 5, + /obj/item/clothing/glasses/gglasses = 5, + /obj/item/clothing/glasses/regular/hipster = 5, + /obj/item/clothing/glasses/rimless = 5, + /obj/item/clothing/glasses/thin = 5, + /obj/item/clothing/glasses/monocle = 5, + /obj/item/clothing/glasses/goggles = 5, + /obj/item/clothing/glasses/fluff/spiffygogs = 5, + /obj/item/clothing/glasses/fakesunglasses = 5, + /obj/item/clothing/glasses/fakesunglasses/aviator = 5, + /obj/item/clothing/mask/bandana/blue = 5, + /obj/item/clothing/mask/bandana/gold = 5, + /obj/item/clothing/mask/bandana/green = 5, + /obj/item/clothing/mask/bandana/red = 5, + /obj/item/clothing/mask/surgical = 5) + prices = list(/obj/item/clothing/accessory = 50, + /obj/item/clothing/accessory/armband/med/color = 50, + /obj/item/clothing/accessory/asymmetric = 50, + /obj/item/clothing/accessory/asymmetric/purple = 50, + /obj/item/clothing/accessory/asymmetric/green = 50, + /obj/item/clothing/accessory/bracelet = 50, + /obj/item/clothing/accessory/bracelet/material = 50, + /obj/item/clothing/accessory/bracelet/friendship = 50, + /obj/item/clothing/accessory/chaps = 50, + /obj/item/clothing/accessory/chaps/black = 50, + /obj/item/weapon/storage/briefcase/clutch = 50, + /obj/item/clothing/accessory/collar = 50, + /obj/item/clothing/accessory/collar/bell = 50, + /obj/item/clothing/accessory/collar/spike = 50, + /obj/item/clothing/accessory/collar/pink = 50, + /obj/item/clothing/accessory/collar/holo = 50, + /obj/item/clothing/accessory/collar/shock = 50, + /obj/item/weapon/storage/belt/fannypack = 50, + /obj/item/weapon/storage/belt/fannypack/white = 50, + /obj/item/clothing/accessory/fullcape = 50, + /obj/item/clothing/accessory/halfcape = 50, + /obj/item/clothing/accessory/hawaiian = 5, + /obj/item/clothing/accessory/hawaiian/blue = 5, + /obj/item/clothing/accessory/hawaiian/pink = 5, + /obj/item/clothing/accessory/hawaiian/red = 5, + /obj/item/clothing/accessory/hawaiian/yellow = 5, + /obj/item/clothing/accessory/locket = 50, + /obj/item/weapon/storage/backpack/purse = 50, + /obj/item/clothing/accessory/sash = 50, + /obj/item/clothing/accessory/scarf = 5, + /obj/item/clothing/accessory/scarf/red = 50, + /obj/item/clothing/accessory/scarf/darkblue = 50, + /obj/item/clothing/accessory/scarf/purple = 50, + /obj/item/clothing/accessory/scarf/yellow = 100, + /obj/item/clothing/accessory/scarf/orange = 50, + /obj/item/clothing/accessory/scarf/lightblue = 50, + /obj/item/clothing/accessory/scarf/white = 50, + /obj/item/clothing/accessory/scarf/black = 50, + /obj/item/clothing/accessory/scarf/zebra = 50, + /obj/item/clothing/accessory/scarf/christmas = 50, + /obj/item/clothing/accessory/scarf/stripedred = 50, + /obj/item/clothing/accessory/scarf/stripedgreen = 50, + /obj/item/clothing/accessory/scarf/stripedblue = 50, + /obj/item/clothing/accessory/jacket = 50, + /obj/item/clothing/accessory/jacket/checkered = 50, + /obj/item/clothing/accessory/jacket/burgundy = 50, + /obj/item/clothing/accessory/jacket/navy = 50, + /obj/item/clothing/accessory/jacket/charcoal = 50, + /obj/item/clothing/accessory/vest = 50, + /obj/item/clothing/accessory/sweater = 50, + /obj/item/clothing/accessory/sweater/pink = 50, + /obj/item/clothing/accessory/sweater/mint = 50, + /obj/item/clothing/accessory/sweater/blue = 50, + /obj/item/clothing/accessory/sweater/heart = 50, + /obj/item/clothing/accessory/sweater/nt = 5, + /obj/item/clothing/accessory/sweater/keyhole = 50, + /obj/item/clothing/accessory/sweater/winterneck = 50, + /obj/item/clothing/accessory/sweater/uglyxmas = 5, + /obj/item/clothing/accessory/sweater/flowersweater = 50, + /obj/item/clothing/accessory/sweater/redneck = 50, + /obj/item/clothing/accessory/tie = 50, + /obj/item/clothing/accessory/tie/horrible = 50, + /obj/item/clothing/accessory/tie/white = 50, + /obj/item/clothing/accessory/tie/navy = 50, + /obj/item/clothing/accessory/tie/yellow = 50, + /obj/item/clothing/accessory/tie/darkgreen = 50, + /obj/item/clothing/accessory/tie/black = 50, + /obj/item/clothing/accessory/tie/red_long = 50, + /obj/item/clothing/accessory/tie/red_clip = 50, + /obj/item/clothing/accessory/tie/blue_long = 50, + /obj/item/clothing/accessory/tie/blue_clip = 50, + /obj/item/clothing/accessory/tie/red = 50, + /obj/item/clothing/accessory/wcoat = 50, + /obj/item/clothing/accessory/wcoat/red = 50, + /obj/item/clothing/accessory/wcoat/grey = 50, + /obj/item/clothing/accessory/wcoat/brown = 50, + /obj/item/clothing/accessory/wcoat/gentleman = 50, + /obj/item/clothing/accessory/wcoat/swvest = 50, + /obj/item/clothing/accessory/wcoat/swvest/blue = 50, + /obj/item/clothing/accessory/wcoat/swvest/red = 50, + /obj/item/weapon/storage/wallet = 50, + /obj/item/weapon/storage/wallet/poly = 50, + /obj/item/weapon/storage/wallet/womens = 50, + /obj/item/weapon/lipstick = 50, + /obj/item/weapon/lipstick/purple = 50, + /obj/item/weapon/lipstick/jade = 50, + /obj/item/weapon/lipstick/black = 50, + /obj/item/clothing/ears/earmuffs = 50, + /obj/item/clothing/ears/earmuffs/headphones = 50, + /obj/item/clothing/ears/earring/stud = 50, + /obj/item/clothing/ears/earring/dangle = 50, + /obj/item/clothing/gloves/ring/mariner = 50, + /obj/item/clothing/gloves/ring/engagement = 50, + /obj/item/clothing/gloves/ring/seal/signet = 50, + /obj/item/clothing/gloves/ring/seal/mason = 50, + /obj/item/clothing/gloves/ring/material/plastic = 50, + /obj/item/clothing/gloves/ring/material/steel = 50, + /obj/item/clothing/gloves/ring/material/gold = 100, + /obj/item/clothing/glasses/eyepatch = 50, + /obj/item/clothing/glasses/gglasses = 50, + /obj/item/clothing/glasses/regular/hipster = 50, + /obj/item/clothing/glasses/rimless = 50, + /obj/item/clothing/glasses/thin = 50, + /obj/item/clothing/glasses/monocle = 50, + /obj/item/clothing/glasses/goggles = 50, + /obj/item/clothing/glasses/fluff/spiffygogs = 50, + /obj/item/clothing/glasses/fakesunglasses = 50, + /obj/item/clothing/glasses/fakesunglasses/aviator = 50, + /obj/item/clothing/mask/bandana/blue = 50, + /obj/item/clothing/mask/bandana/gold = 50, + /obj/item/clothing/mask/bandana/green = 50, + /obj/item/clothing/mask/bandana/red = 50, + /obj/item/clothing/mask/surgical = 50) + premium = list(/obj/item/weapon/bedsheet/rainbow = 1) + contraband = list(/obj/item/clothing/mask/gas/clown_hat = 1) + +/obj/machinery/vending/loadout/clothing + name = "General Jump" + desc = "A special vendor using compressed matter cartridges to store large amounts of clothing." + product_ads = "Tired of your grey jumpsuit? Spruce yourself up!;We have the outfit for you!;Don't let that grey jumpsuit get you down, get a ROBUST outfit right now!;Using compressed matter catridges and VERY ETHICAL labor practices to bring YOU the clothing you crave!;Are you sure you want to go to work in THAT?;All of our wares have a whole TWO pockets!" + icon_state = "clothing" + vend_delay = 16 + products = list(/obj/item/clothing/under/bathrobe = 5, + /obj/item/clothing/under/dress/black_corset = 5, + /obj/item/clothing/under/blazer = 5, + /obj/item/clothing/under/blazer/skirt = 5, + /obj/item/clothing/under/cheongsam = 5, + /obj/item/clothing/under/cheongsam/red = 5, + /obj/item/clothing/under/cheongsam/blue = 5, + /obj/item/clothing/under/cheongsam/black = 5, + /obj/item/clothing/under/cheongsam/darkred = 5, + /obj/item/clothing/under/cheongsam/green = 5, + /obj/item/clothing/under/cheongsam/purple = 5, + /obj/item/clothing/under/cheongsam/darkblue = 5, + /obj/item/clothing/under/croptop = 5, + /obj/item/clothing/under/croptop/red = 5, + /obj/item/clothing/under/croptop/grey = 5, + /obj/item/clothing/under/cuttop = 5, + /obj/item/clothing/under/cuttop/red = 5, + /obj/item/clothing/under/suit_jacket/female/skirt = 5, + /obj/item/clothing/under/dress/dress_fire = 5, + /obj/item/clothing/under/dress/flamenco = 5, + /obj/item/clothing/under/dress/flower_dress = 5, + /obj/item/clothing/under/fluff/gnshorts = 5, + /obj/item/clothing/under/color = 5, + /obj/item/clothing/under/color/aqua = 5, + /obj/item/clothing/under/color/black = 5, + /obj/item/clothing/under/color/blackf = 5, + /obj/item/clothing/under/color/blackjumpskirt = 5, + /obj/item/clothing/under/color/blue = 5, + /obj/item/clothing/under/color/brown = 5, + /obj/item/clothing/under/color/darkblue = 5, + /obj/item/clothing/under/color/darkred = 5, + /obj/item/clothing/under/color/green = 5, + /obj/item/clothing/under/color/grey = 5, + /obj/item/clothing/under/color/lightblue = 5, + /obj/item/clothing/under/color/lightbrown = 5, + /obj/item/clothing/under/color/lightgreen = 5, + /obj/item/clothing/under/color/lightpurple = 5, + /obj/item/clothing/under/color/lightred = 5, + /obj/item/clothing/under/color/orange = 5, + /obj/item/clothing/under/color/pink = 5, + /obj/item/clothing/under/color/prison = 5, + /obj/item/clothing/under/color/ranger = 5, + /obj/item/clothing/under/color/red = 5, + /obj/item/clothing/under/color/white = 5, + /obj/item/clothing/under/color/yellow = 5, + /obj/item/clothing/under/color/yellowgreen = 5, + /obj/item/clothing/under/aether = 5, + /obj/item/clothing/under/focal = 5, + /obj/item/clothing/under/hephaestus = 5, + /obj/item/clothing/under/wardt = 5, + /obj/item/clothing/under/kilt = 5, + /obj/item/clothing/under/fluff/latexmaid = 5, + /obj/item/clothing/under/dress/lilacdress = 5, + /obj/item/clothing/under/dress/white2 = 5, + /obj/item/clothing/under/dress/white4 = 5, + /obj/item/clothing/under/dress/maid = 5, + /obj/item/clothing/under/dress/maid/sexy = 5, + /obj/item/clothing/under/dress/maid/janitor = 5, + /obj/item/clothing/under/moderncoat = 5, + /obj/item/clothing/under/permit = 5, + /obj/item/clothing/under/oldwoman = 5, + /obj/item/clothing/under/frontier = 5, + /obj/item/clothing/under/mbill = 5, + /obj/item/clothing/under/pants/baggy/ = 5, + /obj/item/clothing/under/pants/baggy/classicjeans = 5, + /obj/item/clothing/under/pants/baggy/mustangjeans = 5, + /obj/item/clothing/under/pants/baggy/blackjeans = 5, + /obj/item/clothing/under/pants/baggy/greyjeans = 5, + /obj/item/clothing/under/pants/baggy/youngfolksjeans = 5, + /obj/item/clothing/under/pants/baggy/white = 5, + /obj/item/clothing/under/pants/baggy/red = 5, + /obj/item/clothing/under/pants/baggy/black = 5, + /obj/item/clothing/under/pants/baggy/tan = 5, + /obj/item/clothing/under/pants/baggy/track = 5, + /obj/item/clothing/under/pants/baggy/khaki = 5, + /obj/item/clothing/under/pants/baggy/camo = 5, + /obj/item/clothing/under/pants/utility/ = 5, + /obj/item/clothing/under/pants/utility/orange = 5, + /obj/item/clothing/under/pants/utility/blue = 5, + /obj/item/clothing/under/pants/utility/white = 5, + /obj/item/clothing/under/pants/utility/red = 5, + /obj/item/clothing/under/pants/chaps = 5, + /obj/item/clothing/under/pants/chaps/black = 5, + /obj/item/clothing/under/pants/track = 5, + /obj/item/clothing/under/pants/track/red = 5, + /obj/item/clothing/under/pants/track/white = 5, + /obj/item/clothing/under/pants/track/green = 5, + /obj/item/clothing/under/pants/track/blue = 5, + /obj/item/clothing/under/pants/yogapants = 5, + /obj/item/clothing/under/ascetic = 5, + /obj/item/clothing/under/dress/white3 = 5, + /obj/item/clothing/under/skirt/pleated = 5, + /obj/item/clothing/under/dress/darkred = 5, + /obj/item/clothing/under/dress/redeveninggown = 5, + /obj/item/clothing/under/dress/red_swept_dress = 5, + /obj/item/clothing/under/dress/sailordress = 5, + /obj/item/clothing/under/dress/sari = 5, + /obj/item/clothing/under/dress/sari/green = 5, + /obj/item/clothing/under/qipao = 5, + /obj/item/clothing/under/qipao/red = 5, + /obj/item/clothing/under/qipao/white = 5, + /obj/item/clothing/under/shorts/red = 5, + /obj/item/clothing/under/shorts/green = 5, + /obj/item/clothing/under/shorts/blue = 5, + /obj/item/clothing/under/shorts/black = 5, + /obj/item/clothing/under/shorts/grey = 5, + /obj/item/clothing/under/shorts/white = 5, + /obj/item/clothing/under/shorts/jeans = 5, + /obj/item/clothing/under/shorts/jeans/ = 5, + /obj/item/clothing/under/shorts/jeans/classic = 5, + /obj/item/clothing/under/shorts/jeans/mustang = 5, + /obj/item/clothing/under/shorts/jeans/youngfolks = 5, + /obj/item/clothing/under/shorts/jeans/black = 5, + /obj/item/clothing/under/shorts/jeans/grey = 5, + /obj/item/clothing/under/shorts/khaki/ = 5, + /obj/item/clothing/under/skirt/loincloth = 5, + /obj/item/clothing/under/skirt/khaki = 5, + /obj/item/clothing/under/skirt/blue = 5, + /obj/item/clothing/under/skirt/red = 5, + /obj/item/clothing/under/skirt/denim = 5, + /obj/item/clothing/under/skirt/pleated = 5, + /obj/item/clothing/under/skirt/outfit/plaid_blue = 5, + /obj/item/clothing/under/skirt/outfit/plaid_red = 5, + /obj/item/clothing/under/skirt/outfit/plaid_purple = 5, + /obj/item/clothing/under/overalls/sleek = 5, + /obj/item/clothing/under/sl_suit = 5, + /obj/item/clothing/under/gentlesuit = 5, + /obj/item/clothing/under/gentlesuit/skirt = 5, + /obj/item/clothing/under/suit_jacket = 5, + /obj/item/clothing/under/suit_jacket/really_black/skirt = 5, + /obj/item/clothing/under/suit_jacket/really_black = 5, + /obj/item/clothing/under/suit_jacket/female/skirt = 5, + /obj/item/clothing/under/suit_jacket/female/ = 5, + /obj/item/clothing/under/suit_jacket/red = 5, + /obj/item/clothing/under/suit_jacket/red/skirt = 5, + /obj/item/clothing/under/suit_jacket/charcoal = 5, + /obj/item/clothing/under/suit_jacket/charcoal/skirt = 5, + /obj/item/clothing/under/suit_jacket/navy = 5, + /obj/item/clothing/under/suit_jacket/navy/skirt = 5, + /obj/item/clothing/under/suit_jacket/burgundy = 5, + /obj/item/clothing/under/suit_jacket/burgundy/skirt = 5, + /obj/item/clothing/under/suit_jacket/checkered = 5, + /obj/item/clothing/under/suit_jacket/checkered/skirt = 5, + /obj/item/clothing/under/suit_jacket/tan = 5, + /obj/item/clothing/under/suit_jacket/tan/skirt = 5, + /obj/item/clothing/under/scratch = 5, + /obj/item/clothing/under/scratch/skirt = 5, + /obj/item/clothing/under/sundress = 5, + /obj/item/clothing/under/sundress_white = 5, + /obj/item/clothing/under/rank/psych/turtleneck/sweater = 5, + /obj/item/weapon/storage/box/fluff/swimsuit = 5, + /obj/item/weapon/storage/box/fluff/swimsuit/blue = 5, + /obj/item/weapon/storage/box/fluff/swimsuit/purple = 5, + /obj/item/weapon/storage/box/fluff/swimsuit/green = 5, + /obj/item/weapon/storage/box/fluff/swimsuit/red = 5, + /obj/item/weapon/storage/box/fluff/swimsuit/white = 5, + /obj/item/weapon/storage/box/fluff/swimsuit/earth = 5, + /obj/item/weapon/storage/box/fluff/swimsuit/engineering = 5, + /obj/item/weapon/storage/box/fluff/swimsuit/science = 5, + /obj/item/weapon/storage/box/fluff/swimsuit/security = 5, + /obj/item/weapon/storage/box/fluff/swimsuit/medical = 5, + /obj/item/weapon/storage/box/fluff/swimsuit/cowbikini = 5, + /obj/item/clothing/under/utility = 5, + /obj/item/clothing/under/utility/grey = 5, + /obj/item/clothing/under/utility/blue = 5, + /obj/item/clothing/under/fluff/v_nanovest = 5, + /obj/item/clothing/under/dress/westernbustle = 5, + /obj/item/clothing/under/wedding/bride_white = 5, + /obj/item/weapon/storage/backpack/ = 5, + /obj/item/weapon/storage/backpack/messenger = 5, + /obj/item/weapon/storage/backpack/satchel = 5) + prices = list(/obj/item/clothing/under/bathrobe = 50, + /obj/item/clothing/under/dress/black_corset = 50, + /obj/item/clothing/under/blazer = 50, + /obj/item/clothing/under/blazer/skirt = 50, + /obj/item/clothing/under/cheongsam = 50, + /obj/item/clothing/under/cheongsam/red = 50, + /obj/item/clothing/under/cheongsam/blue = 50, + /obj/item/clothing/under/cheongsam/black = 50, + /obj/item/clothing/under/cheongsam/darkred = 50, + /obj/item/clothing/under/cheongsam/green = 50, + /obj/item/clothing/under/cheongsam/purple = 50, + /obj/item/clothing/under/cheongsam/darkblue = 50, + /obj/item/clothing/under/croptop = 50, + /obj/item/clothing/under/croptop/red = 50, + /obj/item/clothing/under/croptop/grey = 50, + /obj/item/clothing/under/cuttop = 50, + /obj/item/clothing/under/cuttop/red = 50, + /obj/item/clothing/under/suit_jacket/female/skirt = 50, + /obj/item/clothing/under/dress/dress_fire = 50, + /obj/item/clothing/under/dress/flamenco = 50, + /obj/item/clothing/under/dress/flower_dress = 50, + /obj/item/clothing/under/fluff/gnshorts = 50, + /obj/item/clothing/under/color = 50, + /obj/item/clothing/under/color/aqua = 50, + /obj/item/clothing/under/color/black = 50, + /obj/item/clothing/under/color/blackf = 50, + /obj/item/clothing/under/color/blackjumpskirt = 50, + /obj/item/clothing/under/color/blue = 50, + /obj/item/clothing/under/color/brown = 50, + /obj/item/clothing/under/color/darkblue = 50, + /obj/item/clothing/under/color/darkred = 50, + /obj/item/clothing/under/color/green = 50, + /obj/item/clothing/under/color/grey = 50, + /obj/item/clothing/under/color/lightblue = 50, + /obj/item/clothing/under/color/lightbrown = 50, + /obj/item/clothing/under/color/lightgreen = 50, + /obj/item/clothing/under/color/lightpurple = 50, + /obj/item/clothing/under/color/lightred = 50, + /obj/item/clothing/under/color/orange = 50, + /obj/item/clothing/under/color/pink = 50, + /obj/item/clothing/under/color/prison = 50, + /obj/item/clothing/under/color/ranger = 50, + /obj/item/clothing/under/color/red = 50, + /obj/item/clothing/under/color/white = 50, + /obj/item/clothing/under/color/yellow = 50, + /obj/item/clothing/under/color/yellowgreen = 50, + /obj/item/clothing/under/aether = 50, + /obj/item/clothing/under/focal = 50, + /obj/item/clothing/under/hephaestus = 50, + /obj/item/clothing/under/wardt = 50, + /obj/item/clothing/under/kilt = 50, + /obj/item/clothing/under/fluff/latexmaid = 50, + /obj/item/clothing/under/dress/lilacdress = 50, + /obj/item/clothing/under/dress/white2 = 50, + /obj/item/clothing/under/dress/white4 = 50, + /obj/item/clothing/under/dress/maid = 50, + /obj/item/clothing/under/dress/maid/sexy = 50, + /obj/item/clothing/under/dress/maid/janitor = 50, + /obj/item/clothing/under/moderncoat = 50, + /obj/item/clothing/under/permit = 50, + /obj/item/clothing/under/oldwoman = 50, + /obj/item/clothing/under/frontier = 50, + /obj/item/clothing/under/mbill = 50, + /obj/item/clothing/under/pants/baggy/ = 50, + /obj/item/clothing/under/pants/baggy/classicjeans = 50, + /obj/item/clothing/under/pants/baggy/mustangjeans = 50, + /obj/item/clothing/under/pants/baggy/blackjeans = 50, + /obj/item/clothing/under/pants/baggy/greyjeans = 50, + /obj/item/clothing/under/pants/baggy/youngfolksjeans = 50, + /obj/item/clothing/under/pants/baggy/white = 50, + /obj/item/clothing/under/pants/baggy/red = 50, + /obj/item/clothing/under/pants/baggy/black = 50, + /obj/item/clothing/under/pants/baggy/tan = 50, + /obj/item/clothing/under/pants/baggy/track = 50, + /obj/item/clothing/under/pants/baggy/khaki = 50, + /obj/item/clothing/under/pants/baggy/camo = 50, + /obj/item/clothing/under/pants/utility/ = 50, + /obj/item/clothing/under/pants/utility/orange = 50, + /obj/item/clothing/under/pants/utility/blue = 50, + /obj/item/clothing/under/pants/utility/white = 50, + /obj/item/clothing/under/pants/utility/red = 50, + /obj/item/clothing/under/pants/chaps = 50, + /obj/item/clothing/under/pants/chaps/black = 50, + /obj/item/clothing/under/pants/track = 50, + /obj/item/clothing/under/pants/track/red = 50, + /obj/item/clothing/under/pants/track/white = 50, + /obj/item/clothing/under/pants/track/green = 50, + /obj/item/clothing/under/pants/track/blue = 50, + /obj/item/clothing/under/pants/yogapants = 50, + /obj/item/clothing/under/ascetic = 50, + /obj/item/clothing/under/dress/white3 = 50, + /obj/item/clothing/under/skirt/pleated = 50, + /obj/item/clothing/under/dress/darkred = 50, + /obj/item/clothing/under/dress/redeveninggown = 50, + /obj/item/clothing/under/dress/red_swept_dress = 50, + /obj/item/clothing/under/dress/sailordress = 50, + /obj/item/clothing/under/dress/sari = 50, + /obj/item/clothing/under/dress/sari/green = 50, + /obj/item/clothing/under/qipao = 50, + /obj/item/clothing/under/qipao/red = 50, + /obj/item/clothing/under/qipao/white = 50, + /obj/item/clothing/under/shorts/red = 50, + /obj/item/clothing/under/shorts/green = 50, + /obj/item/clothing/under/shorts/blue = 50, + /obj/item/clothing/under/shorts/black = 50, + /obj/item/clothing/under/shorts/grey = 50, + /obj/item/clothing/under/shorts/white = 50, + /obj/item/clothing/under/shorts/jeans = 50, + /obj/item/clothing/under/shorts/jeans/ = 50, + /obj/item/clothing/under/shorts/jeans/classic = 50, + /obj/item/clothing/under/shorts/jeans/mustang = 50, + /obj/item/clothing/under/shorts/jeans/youngfolks = 50, + /obj/item/clothing/under/shorts/jeans/black = 50, + /obj/item/clothing/under/shorts/jeans/grey = 50, + /obj/item/clothing/under/shorts/khaki/ = 50, + /obj/item/clothing/under/skirt/loincloth = 50, + /obj/item/clothing/under/skirt/khaki = 50, + /obj/item/clothing/under/skirt/blue = 50, + /obj/item/clothing/under/skirt/red = 50, + /obj/item/clothing/under/skirt/denim = 50, + /obj/item/clothing/under/skirt/pleated = 50, + /obj/item/clothing/under/skirt/outfit/plaid_blue = 50, + /obj/item/clothing/under/skirt/outfit/plaid_red = 50, + /obj/item/clothing/under/skirt/outfit/plaid_purple = 50, + /obj/item/clothing/under/overalls/sleek = 50, + /obj/item/clothing/under/sl_suit = 50, + /obj/item/clothing/under/gentlesuit = 50, + /obj/item/clothing/under/gentlesuit/skirt = 50, + /obj/item/clothing/under/suit_jacket = 50, + /obj/item/clothing/under/suit_jacket/really_black/skirt = 50, + /obj/item/clothing/under/suit_jacket/really_black = 50, + /obj/item/clothing/under/suit_jacket/female/skirt = 50, + /obj/item/clothing/under/suit_jacket/female/ = 50, + /obj/item/clothing/under/suit_jacket/red = 50, + /obj/item/clothing/under/suit_jacket/red/skirt = 50, + /obj/item/clothing/under/suit_jacket/charcoal = 50, + /obj/item/clothing/under/suit_jacket/charcoal/skirt = 50, + /obj/item/clothing/under/suit_jacket/navy = 50, + /obj/item/clothing/under/suit_jacket/navy/skirt = 50, + /obj/item/clothing/under/suit_jacket/burgundy = 50, + /obj/item/clothing/under/suit_jacket/burgundy/skirt = 50, + /obj/item/clothing/under/suit_jacket/checkered = 50, + /obj/item/clothing/under/suit_jacket/checkered/skirt = 50, + /obj/item/clothing/under/suit_jacket/tan = 50, + /obj/item/clothing/under/suit_jacket/tan/skirt = 50, + /obj/item/clothing/under/scratch = 50, + /obj/item/clothing/under/scratch/skirt = 50, + /obj/item/clothing/under/sundress = 50, + /obj/item/clothing/under/sundress_white = 50, + /obj/item/clothing/under/rank/psych/turtleneck/sweater = 50, + /obj/item/weapon/storage/box/fluff/swimsuit = 50, + /obj/item/weapon/storage/box/fluff/swimsuit/blue = 50, + /obj/item/weapon/storage/box/fluff/swimsuit/purple = 50, + /obj/item/weapon/storage/box/fluff/swimsuit/green = 50, + /obj/item/weapon/storage/box/fluff/swimsuit/red = 50, + /obj/item/weapon/storage/box/fluff/swimsuit/white = 50, + /obj/item/weapon/storage/box/fluff/swimsuit/earth = 50, + /obj/item/weapon/storage/box/fluff/swimsuit/engineering = 50, + /obj/item/weapon/storage/box/fluff/swimsuit/science = 50, + /obj/item/weapon/storage/box/fluff/swimsuit/security = 50, + /obj/item/weapon/storage/box/fluff/swimsuit/medical = 50, + /obj/item/weapon/storage/box/fluff/swimsuit/cowbikini = 50, + /obj/item/clothing/under/utility = 50, + /obj/item/clothing/under/utility/grey = 50, + /obj/item/clothing/under/utility/blue = 50, + /obj/item/clothing/under/fluff/v_nanovest = 50, + /obj/item/clothing/under/dress/westernbustle = 50, + /obj/item/clothing/under/wedding/bride_white = 50, + /obj/item/weapon/storage/backpack/ = 50, + /obj/item/weapon/storage/backpack/messenger = 50, + /obj/item/weapon/storage/backpack/satchel = 50) + premium = list(/obj/item/clothing/under/color/rainbow = 1) + contraband = list(/obj/item/clothing/under/rank/clown = 1) + +/obj/machinery/vending/loadout/loadout_misc + name = "Bits and Bobs" + desc = "A special vendor for things and also stuff!" + product_ads = "You never know when you might need an umbrella.;Hey kid... want some cardemon cards?;Miscellaneous for your miscellaneous heart.;Who's bob? Wouldn't you like to know.;I'm sorry there's no grappling hooks in our umbrellas.;We sell things AND stuff." + icon_state = "loadout_misc" + products = list(/obj/item/weapon/cane = 5, + /obj/item/weapon/pack/cardemon = 25, + /obj/item/weapon/deck/holder = 5, + /obj/item/weapon/deck/cah = 5, + /obj/item/weapon/deck/cah/black = 5, + /obj/item/weapon/deck/tarot = 5, + /obj/item/weapon/deck/cards = 5, + /obj/item/weapon/pack/spaceball = 10, + /obj/item/weapon/storage/pill_bottle/dice = 5, + /obj/item/weapon/storage/pill_bottle/dice_nerd = 5, + /obj/item/weapon/melee/umbrella/random = 10) + prices = list(/obj/item/weapon/cane = 100, + /obj/item/weapon/pack/cardemon = 100, + /obj/item/weapon/deck/holder = 100, + /obj/item/weapon/deck/cah = 100, + /obj/item/weapon/deck/cah/black = 100, + /obj/item/weapon/deck/tarot = 100, + /obj/item/weapon/deck/cards = 100, + /obj/item/weapon/pack/spaceball = 100, + /obj/item/weapon/storage/pill_bottle/dice = 100, + /obj/item/weapon/storage/pill_bottle/dice_nerd = 100, + /obj/item/weapon/melee/umbrella/random = 100) + premium = list(/obj/item/toy/bosunwhistle = 1) + contraband = list(/obj/item/toy/katana = 1) + +/obj/machinery/vending/loadout/overwear + name = "Big D's Best" + desc = "A special vendor using compressed matter cartridges to store large amounts of overwear!" + product_ads = "Dress your best! It's what big D would want.;Overwear for all occasions!;Big D has what you need if what you need is some form of jacket!;Need a new hoodie? Bid D has you covered.;Big D says you need a new suit!;Big D smiles when he sees you in one of his coats!" + icon_state = "suit" + vend_delay = 16 + products = list(/obj/item/clothing/suit/storage/apron = 5, + /obj/item/clothing/suit/storage/flannel/aqua = 5, + /obj/item/clothing/suit/storage/toggle/bomber = 5, + /obj/item/clothing/suit/storage/bomber/alt = 5, + /obj/item/clothing/suit/storage/flannel/brown = 5, + /obj/item/clothing/suit/storage/toggle/cardigan = 5, + /obj/item/clothing/accessory/poncho/roles/cloak/custom = 5, + /obj/item/clothing/suit/storage/duster = 5, + /obj/item/clothing/suit/storage/toggle/denim_jacket = 5, + /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen = 5, + /obj/item/clothing/suit/storage/toggle/denim_jacket/sleeveless = 5, + /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen/sleeveless = 5, + /obj/item/clothing/suit/storage/fluff/gntop = 5, + /obj/item/clothing/suit/greatcoat = 5, + /obj/item/clothing/suit/storage/flannel = 5, + /obj/item/clothing/suit/storage/greyjacket = 5, + /obj/item/clothing/suit/storage/hazardvest = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/black = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/red = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/blue = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/green = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/orange = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/yellow = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/cti = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/mu = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/nt = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/smw = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/nrti = 5, + /obj/item/clothing/suit/storage/fluff/jacket/field = 5, + /obj/item/clothing/suit/storage/fluff/jacket/air_cavalry = 5, + /obj/item/clothing/suit/storage/fluff/jacket/air_force = 5, + /obj/item/clothing/suit/storage/fluff/jacket/navy = 5, + /obj/item/clothing/suit/storage/fluff/jacket/special_forces = 5, + /obj/item/clothing/suit/kamishimo = 5, + /obj/item/clothing/suit/kimono = 5, + /obj/item/clothing/suit/storage/toggle/labcoat = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/blue = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/blue_edge = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/green = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/orange = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/pink = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/red = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/yellow = 5, + /obj/item/clothing/suit/leathercoat = 5, + /obj/item/clothing/suit/storage/toggle/leather_jacket = 5, + /obj/item/clothing/suit/storage/leather_jacket_alt = 5, + /obj/item/clothing/suit/storage/toggle/brown_jacket = 5, + /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen = 5, + /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen = 5, + /obj/item/clothing/suit/storage/toggle/leather_jacket/sleeveless = 5, + /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless = 5, + /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen/sleeveless = 5, + /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen/sleeveless = 5, + /obj/item/clothing/suit/storage/miljacket = 5, + /obj/item/clothing/suit/storage/miljacket/alt = 5, + /obj/item/clothing/suit/storage/miljacket/green = 5, + /obj/item/clothing/suit/storage/apron/overalls = 5, + /obj/item/clothing/suit/storage/toggle/peacoat = 5, + /obj/item/clothing/accessory/poncho = 5, + /obj/item/clothing/accessory/poncho/green = 5, + /obj/item/clothing/accessory/poncho/red = 5, + /obj/item/clothing/accessory/poncho/purple = 5, + /obj/item/clothing/accessory/poncho/blue = 5, + /obj/item/clothing/suit/jacket/puffer = 5, + /obj/item/clothing/suit/jacket/puffer/vest = 5, + /obj/item/clothing/suit/storage/flannel/red = 5, + /obj/item/clothing/suit/unathi/robe = 5, + /obj/item/clothing/suit/storage/snowsuit = 5, +======= + /obj/item/clothing/suit/storage/snowsuit = 5, + /obj/item/clothing/suit/storage/toggle/internalaffairs = 5, + /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket = 5, + /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket = 5, + /obj/item/clothing/suit/suspenders = 5, + /obj/item/clothing/suit/storage/toggle/track = 5, + /obj/item/clothing/suit/storage/toggle/track/blue = 5, + /obj/item/clothing/suit/storage/toggle/track/green = 5, + /obj/item/clothing/suit/storage/toggle/track/red = 5, + /obj/item/clothing/suit/storage/toggle/track/white = 5, + /obj/item/clothing/suit/storage/trench = 5, + /obj/item/clothing/suit/storage/trench/grey = 5, + /obj/item/clothing/suit/varsity = 5, + /obj/item/clothing/suit/varsity/red = 5, + /obj/item/clothing/suit/varsity/purple = 5, + /obj/item/clothing/suit/varsity/green = 5, + /obj/item/clothing/suit/varsity/blue = 5, + /obj/item/clothing/suit/varsity/brown = 5, + /obj/item/clothing/suit/storage/hooded/wintercoat = 5, + /obj/item/clothing/suit/storage/hooded/wintercoat/aformal = 5, + /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey = 5) + prices = list(/obj/item/clothing/suit/storage/apron = 100, + /obj/item/clothing/suit/storage/flannel/aqua = 100, + /obj/item/clothing/suit/storage/toggle/bomber = 100, + /obj/item/clothing/suit/storage/bomber/alt = 100, + /obj/item/clothing/suit/storage/flannel/brown = 100, + /obj/item/clothing/suit/storage/toggle/cardigan = 100, + /obj/item/clothing/accessory/poncho/roles/cloak/custom = 100, + /obj/item/clothing/suit/storage/duster = 100, + /obj/item/clothing/suit/storage/toggle/denim_jacket = 100, + /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen = 100, + /obj/item/clothing/suit/storage/toggle/denim_jacket/sleeveless = 100, + /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen/sleeveless = 100, + /obj/item/clothing/suit/storage/fluff/gntop = 100, + /obj/item/clothing/suit/greatcoat = 100, + /obj/item/clothing/suit/storage/flannel = 100, + /obj/item/clothing/suit/storage/greyjacket = 100, + /obj/item/clothing/suit/storage/hazardvest = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/black = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/red = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/blue = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/green = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/orange = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/yellow = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/cti = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/mu = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/nt = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/smw = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/nrti = 100, + /obj/item/clothing/suit/storage/fluff/jacket/field = 100, + /obj/item/clothing/suit/storage/fluff/jacket/air_cavalry = 100, + /obj/item/clothing/suit/storage/fluff/jacket/air_force = 100, + /obj/item/clothing/suit/storage/fluff/jacket/navy = 100, + /obj/item/clothing/suit/storage/fluff/jacket/special_forces = 100, + /obj/item/clothing/suit/kamishimo = 100, + /obj/item/clothing/suit/kimono = 100, + /obj/item/clothing/suit/storage/toggle/labcoat = 100, + /obj/item/clothing/suit/storage/toggle/labcoat/blue = 100, + /obj/item/clothing/suit/storage/toggle/labcoat/blue_edge = 100, + /obj/item/clothing/suit/storage/toggle/labcoat/green = 100, + /obj/item/clothing/suit/storage/toggle/labcoat/orange = 100, + /obj/item/clothing/suit/storage/toggle/labcoat/pink = 100, + /obj/item/clothing/suit/storage/toggle/labcoat/red = 100, + /obj/item/clothing/suit/storage/toggle/labcoat/yellow = 100, + /obj/item/clothing/suit/leathercoat = 100, + /obj/item/clothing/suit/storage/toggle/leather_jacket = 100, + /obj/item/clothing/suit/storage/leather_jacket_alt = 100, + /obj/item/clothing/suit/storage/toggle/brown_jacket = 100, + /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen = 100, + /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen = 100, + /obj/item/clothing/suit/storage/toggle/leather_jacket/sleeveless = 100, + /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless = 100, + /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen/sleeveless = 100, + /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen/sleeveless = 100, + /obj/item/clothing/suit/storage/miljacket = 100, + /obj/item/clothing/suit/storage/miljacket/alt = 100, + /obj/item/clothing/suit/storage/miljacket/green = 100, + /obj/item/clothing/suit/storage/apron/overalls = 100, + /obj/item/clothing/suit/storage/toggle/peacoat = 100, + /obj/item/clothing/accessory/poncho = 100, + /obj/item/clothing/accessory/poncho/green = 100, + /obj/item/clothing/accessory/poncho/red = 100, + /obj/item/clothing/accessory/poncho/purple = 100, + /obj/item/clothing/accessory/poncho/blue = 100, + /obj/item/clothing/suit/jacket/puffer = 100, + /obj/item/clothing/suit/jacket/puffer/vest = 100, + /obj/item/clothing/suit/storage/flannel/red = 100, + /obj/item/clothing/suit/unathi/robe = 100, + /obj/item/clothing/suit/storage/snowsuit = 100, + /obj/item/clothing/suit/storage/toggle/internalaffairs = 100, + /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket = 100, + /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket = 100, + /obj/item/clothing/suit/suspenders = 100, + /obj/item/clothing/suit/storage/toggle/track = 100, + /obj/item/clothing/suit/storage/toggle/track/blue = 100, + /obj/item/clothing/suit/storage/toggle/track/green = 100, + /obj/item/clothing/suit/storage/toggle/track/red = 100, + /obj/item/clothing/suit/storage/toggle/track/white = 100, + /obj/item/clothing/suit/storage/trench = 100, + /obj/item/clothing/suit/storage/trench/grey = 100, + /obj/item/clothing/suit/varsity = 100, + /obj/item/clothing/suit/varsity/red = 100, + /obj/item/clothing/suit/varsity/purple = 100, + /obj/item/clothing/suit/varsity/green = 100, + /obj/item/clothing/suit/varsity/blue = 100, + /obj/item/clothing/suit/varsity/brown = 100, + /obj/item/clothing/suit/storage/hooded/wintercoat = 100, + /obj/item/clothing/suit/storage/hooded/wintercoat/aformal = 100, + /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey = 100) + premium = list(/obj/item/clothing/suit/imperium_monk = 3, + /obj/item/clothing/suit/storage/hooded/wintercoat/cosmic = 1) + contraband = list(/obj/item/toy/katana = 1) + +/obj/machinery/vending/loadout/costume + name = "Thespian's Delight" + desc = "Sometimes nerds need costumes!" + product_ads = "Don't let your art be stifled!;Remember, practice makes perfect!;Break a leg!;Don't make me get the cane!;Thespian's Delight entering stage right!;Costumes for your acting needs!" + icon = 'icons/obj/vending.dmi' + icon_state = "theater" + products = list(/obj/item/clothing/suit/storage/hooded/carp_costume = 3, + /obj/item/clothing/suit/storage/hooded/carp_costume = 3, + /obj/item/clothing/suit/chickensuit = 3, + /obj/item/clothing/head/chicken = 3, + /obj/item/clothing/head/helmet/gladiator = 3, + /obj/item/clothing/under/gladiator = 3, + /obj/item/clothing/suit/storage/toggle/labcoat/mad = 3, + /obj/item/clothing/under/suit_jacket/green = 3, + /obj/item/clothing/glasses/gglasses = 3, + /obj/item/clothing/head/flatcap = 3, + /obj/item/clothing/shoes/boots/jackboots = 3, + /obj/item/clothing/under/schoolgirl = 3, + /obj/item/clothing/head/kitty = 3, + /obj/item/clothing/glasses/sunglasses/blindfold = 3, + /obj/item/clothing/head/beret = 3, + /obj/item/clothing/under/skirt = 3, + /obj/item/clothing/under/suit_jacket = 3, + /obj/item/clothing/head/that = 3, + /obj/item/clothing/accessory/wcoat = 3, + /obj/item/clothing/under/scratch = 3, + /obj/item/clothing/shoes/white = 3, + /obj/item/clothing/gloves/white = 3, + /obj/item/clothing/under/kilt = 3, + /obj/item/clothing/glasses/monocle = 3, + /obj/item/clothing/under/sl_suit = 3, + /obj/item/clothing/mask/fakemoustache = 3, + /obj/item/weapon/cane = 3, + /obj/item/clothing/head/bowler = 3, + /obj/item/clothing/head/plaguedoctorhat = 3, + /obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 3, + /obj/item/clothing/mask/gas/plaguedoctor/fluff = 3, + /obj/item/clothing/under/owl = 3, + /obj/item/clothing/mask/gas/owl_mask = 3, + /obj/item/clothing/under/waiter = 3, + /obj/item/clothing/suit/storage/apron = 3, + /obj/item/clothing/under/pirate = 3, + /obj/item/clothing/head/pirate = 3, + /obj/item/clothing/suit/pirate = 3, + /obj/item/clothing/glasses/eyepatch = 3, + /obj/item/clothing/head/ushanka = 3, + /obj/item/clothing/under/soviet = 3, + /obj/item/clothing/suit/imperium_monk = 1, + /obj/item/clothing/suit/holidaypriest = 3, + /obj/item/clothing/head/witchwig = 3, + /obj/item/clothing/under/sundress = 3, + /obj/item/weapon/staff/broom = 3, + /obj/item/clothing/suit/wizrobe/fake = 3, + /obj/item/clothing/head/wizard/fake = 3, + /obj/item/weapon/staff = 3, + /obj/item/clothing/mask/gas/sexyclown = 3, + /obj/item/clothing/under/sexyclown = 3, + /obj/item/clothing/mask/gas/sexymime = 3, + /obj/item/clothing/under/sexymime = 3, + /obj/item/clothing/suit/storage/hooded/knight_costume = 3, + /obj/item/clothing/suit/storage/hooded/knight_costume/galahad = 3, + /obj/item/clothing/suit/storage/hooded/knight_costume/lancelot = 3, + /obj/item/clothing/suit/storage/hooded/knight_costume/robin = 3, + /obj/item/clothing/suit/armor/combat/crusader_costume = 3, + /obj/item/clothing/suit/armor/combat/crusader_costume/bedevere = 3, + /obj/item/clothing/head/helmet/combat/crusader_costume = 3, + /obj/item/clothing/head/helmet/combat/bedevere_costume = 3, + /obj/item/clothing/gloves/combat/knight_costume = 3, + /obj/item/clothing/gloves/combat/knight_costume/brown = 3, + /obj/item/clothing/shoes/knight_costume = 3, + /obj/item/clothing/shoes/knight_costume/black = 3) + prices = list(/obj/item/clothing/suit/storage/hooded/carp_costume = 200, + /obj/item/clothing/suit/storage/hooded/carp_costume = 200, + /obj/item/clothing/suit/chickensuit = 200, + /obj/item/clothing/head/chicken = 200, + /obj/item/clothing/head/helmet/gladiator = 300, + /obj/item/clothing/under/gladiator = 500, + /obj/item/clothing/suit/storage/toggle/labcoat/mad = 200, + /obj/item/clothing/under/suit_jacket/green = 200, + /obj/item/clothing/glasses/gglasses = 200, + /obj/item/clothing/head/flatcap = 200, + /obj/item/clothing/shoes/boots/jackboots = 200, + /obj/item/clothing/under/schoolgirl = 200, + /obj/item/clothing/head/kitty = 200, + /obj/item/clothing/glasses/sunglasses/blindfold = 200, + /obj/item/clothing/head/beret = 200, + /obj/item/clothing/under/skirt = 200, + /obj/item/clothing/under/suit_jacket = 200, + /obj/item/clothing/head/that = 200, + /obj/item/clothing/accessory/wcoat = 200, + /obj/item/clothing/under/scratch = 200, + /obj/item/clothing/shoes/white = 200, + /obj/item/clothing/gloves/white = 200, + /obj/item/clothing/under/kilt = 200, + /obj/item/clothing/glasses/monocle = 400, + /obj/item/clothing/under/sl_suit = 200, + /obj/item/clothing/mask/fakemoustache = 200, + /obj/item/weapon/cane = 300, + /obj/item/clothing/head/bowler = 200, + /obj/item/clothing/head/plaguedoctorhat = 300, + /obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 300, + /obj/item/clothing/mask/gas/plaguedoctor/fluff = 600, + /obj/item/clothing/under/owl = 400, + /obj/item/clothing/mask/gas/owl_mask = 400, + /obj/item/clothing/under/waiter = 100, + /obj/item/clothing/suit/storage/apron = 200, + /obj/item/clothing/under/pirate = 300, + /obj/item/clothing/head/pirate = 400, + /obj/item/clothing/suit/pirate = 600, + /obj/item/clothing/glasses/eyepatch = 200, + /obj/item/clothing/head/ushanka = 200, + /obj/item/clothing/under/soviet = 200, + /obj/item/clothing/suit/imperium_monk = 2000, + /obj/item/clothing/suit/holidaypriest = 200, + /obj/item/clothing/head/witchwig = 200, + /obj/item/clothing/under/sundress = 50, + /obj/item/weapon/staff/broom = 400, + /obj/item/clothing/suit/wizrobe/fake = 200, + /obj/item/clothing/head/wizard/fake = 200, + /obj/item/weapon/staff = 400, + /obj/item/clothing/mask/gas/sexyclown = 600, + /obj/item/clothing/under/sexyclown = 200, + /obj/item/clothing/mask/gas/sexymime = 600, + /obj/item/clothing/under/sexymime = 200, + /obj/item/clothing/suit/storage/hooded/knight_costume = 200, + /obj/item/clothing/suit/storage/hooded/knight_costume/galahad = 200, + /obj/item/clothing/suit/storage/hooded/knight_costume/lancelot = 200, + /obj/item/clothing/suit/storage/hooded/knight_costume/robin = 200, + /obj/item/clothing/suit/armor/combat/crusader_costume = 200, + /obj/item/clothing/suit/armor/combat/crusader_costume/bedevere = 200, + /obj/item/clothing/head/helmet/combat/crusader_costume = 200, + /obj/item/clothing/head/helmet/combat/bedevere_costume = 200, + /obj/item/clothing/gloves/combat/knight_costume = 200, + /obj/item/clothing/gloves/combat/knight_costume/brown = 200, + /obj/item/clothing/shoes/knight_costume = 200, + /obj/item/clothing/shoes/knight_costume/black = 200) + premium = list(/obj/item/clothing/suit/imperium_monk = 3, + /obj/item/clothing/suit/barding/agatha = 2, + /obj/item/clothing/suit/barding/alt_agatha = 2, + /obj/item/clothing/suit/barding/mason = 2, + /obj/item/clothing/suit/drake_cloak = 2) + contraband = list(/obj/item/clothing/head/syndicatefake = 1, + /obj/item/clothing/suit/syndicatefake = 1) + +/obj/machinery/seed_storage/brig + name = "Prisoners' food seed storage" + starting_seeds = list( + /obj/item/seeds/appleseed = 3, + /obj/item/seeds/bananaseed = 3, + /obj/item/seeds/berryseed = 3, + /obj/item/seeds/cabbageseed = 3, + /obj/item/seeds/carrotseed = 3, + /obj/item/seeds/celery = 3, + /obj/item/seeds/chantermycelium = 3, + /obj/item/seeds/cherryseed = 3, + /obj/item/seeds/chiliseed = 3, + /obj/item/seeds/cocoapodseed = 3, + /obj/item/seeds/cornseed = 3, + /obj/item/seeds/durian = 3, + /obj/item/seeds/eggplantseed = 3, + /obj/item/seeds/grapeseed = 3, + /obj/item/seeds/grassseed = 3, + /obj/item/seeds/replicapod = 3, + /obj/item/seeds/lavenderseed = 3, + /obj/item/seeds/lemonseed = 3, + /obj/item/seeds/lettuce = 3, + /obj/item/seeds/limeseed = 3, + /obj/item/seeds/mtearseed = 2, + /obj/item/seeds/orangeseed = 3, + /obj/item/seeds/onionseed = 3, + /obj/item/seeds/peanutseed = 3, + /obj/item/seeds/plumpmycelium = 3, + /obj/item/seeds/poppyseed = 3, + /obj/item/seeds/potatoseed = 3, + /obj/item/seeds/pumpkinseed = 3, + /obj/item/seeds/rhubarb = 3, + /obj/item/seeds/riceseed = 3, + /obj/item/seeds/rose = 3, + /obj/item/seeds/soyaseed = 3, + /obj/item/seeds/pineapple = 3, + /obj/item/seeds/sugarcaneseed = 3, + /obj/item/seeds/sunflowerseed = 3, + /obj/item/seeds/shandseed = 2, + /obj/item/seeds/tobaccoseed = 3, + /obj/item/seeds/tomatoseed = 3, + /obj/item/seeds/towermycelium = 3, + /obj/item/seeds/vanilla = 3, + /obj/item/seeds/watermelonseed = 3, + /obj/item/seeds/wheatseed = 3, + /obj/item/seeds/whitebeetseed = 3, + /obj/item/seeds/wabback = 2) + +/obj/machinery/vending/hydronutrients/brig + name = "Brig NutriMax" + desc = "A plant nutrients vendor. Seems some items aren't included." + products = list(/obj/item/weapon/reagent_containers/glass/bottle/eznutrient = 6,/obj/item/weapon/reagent_containers/glass/bottle/left4zed = 4,/obj/item/weapon/reagent_containers/glass/bottle/robustharvest = 3,/obj/item/weapon/plantspray/pests = 20, + /obj/item/weapon/reagent_containers/glass/beaker = 4,/obj/item/weapon/storage/bag/plants = 5) + premium = list(/obj/item/weapon/reagent_containers/glass/bottle/ammonia = 10,/obj/item/weapon/reagent_containers/glass/bottle/diethylamine = 5) + +/obj/machinery/vending/abductor + name = "Abduct-U" + desc = "A mysterious machine which can fabricate many tools for acquiring test subjects." + icon = 'icons/obj/abductor_vr.dmi' + icon_state = "dispenser_2way" + products = list(/obj/item/weapon/card/id/syndicate/station_access = 1, + /obj/item/weapon/storage/box/syndie_kit/chameleon = 1, + /obj/item/clothing/mask/bandana = 1, + /obj/item/clothing/glasses/sunglasses = 1, + /obj/item/device/radio/headset/syndicate/alt = 1, + /obj/item/device/pda = 1, + /obj/item/device/communicator = 1, + /obj/item/weapon/tape_roll = 2, + /obj/item/weapon/handcuffs = 4, + /obj/item/weapon/handcuffs/legcuffs = 4, + /obj/item/weapon/cell/device/weapon/recharge/alien = 2, + /obj/item/device/chameleon = 1, + /obj/item/weapon/storage/mre/menu11 = 2, + /obj/item/device/flash = 2, + /obj/item/weapon/pen/reagent/paralysis = 4, + /obj/item/device/perfect_tele/alien = 1 + ) + vend_delay = 15 + +/obj/machinery/vending/loadout + name = "Fingers and Toes" + desc = "A special vendor for gloves and shoes!" + product_ads = "Do you have fingers and toes? COVER THEM UP!;Show me your toes! Wait. NO DON'T! BUY NEW SHOES!;Don't leave prints, BUY SOME GLOVES!;Remember to check your shoes for micros! You don't have to let them out, but just check for them!;Fingers and Toes is not liable for micro entrapment or abuse under the feet of our patrons.!;This little piggy went WE WE WE all the way down to FINGERS AND TOES to pick up some sweet new gloves and shoes." + icon = 'icons/obj/vending_vr.dmi' + icon_state = "glovesnshoes" + products = list(/obj/item/clothing/gloves/evening = 5, + /obj/item/clothing/gloves/fingerless = 5, + /obj/item/clothing/gloves/black = 5, + /obj/item/clothing/gloves/blue = 5, + /obj/item/clothing/gloves/brown = 5, + /obj/item/clothing/gloves/color = 5, + /obj/item/clothing/gloves/green = 5, + /obj/item/clothing/gloves/grey = 5, + /obj/item/clothing/gloves/sterile/latex = 5, + /obj/item/clothing/gloves/light_brown = 5, + /obj/item/clothing/gloves/sterile/nitrile = 5, + /obj/item/clothing/gloves/orange = 5, + /obj/item/clothing/gloves/purple = 5, + /obj/item/clothing/gloves/red = 5, + /obj/item/clothing/gloves/fluff/siren = 5, + /obj/item/clothing/gloves/white = 5, + /obj/item/clothing/gloves/duty = 5, + /obj/item/clothing/shoes/athletic = 5, + /obj/item/clothing/shoes/boots/fluff/siren = 5, + /obj/item/clothing/shoes/slippers = 5, + /obj/item/clothing/shoes/boots/cowboy/classic = 5, + /obj/item/clothing/shoes/boots/cowboy = 5, + /obj/item/clothing/shoes/boots/duty = 5, + /obj/item/clothing/shoes/flats/white/color = 5, + /obj/item/clothing/shoes/flipflop = 5, + /obj/item/clothing/shoes/heels = 5, + /obj/item/clothing/shoes/hitops/black = 5, + /obj/item/clothing/shoes/hitops/blue = 5, + /obj/item/clothing/shoes/hitops/green = 5, + /obj/item/clothing/shoes/hitops/orange = 5, + /obj/item/clothing/shoes/hitops/purple = 5, + /obj/item/clothing/shoes/hitops/red = 5, + /obj/item/clothing/shoes/flats/white/color = 5, + /obj/item/clothing/shoes/hitops/yellow = 5, + /obj/item/clothing/shoes/boots/jackboots = 5, + /obj/item/clothing/shoes/boots/jungle = 5, + /obj/item/clothing/shoes/black/cuffs = 5, + /obj/item/clothing/shoes/black/cuffs/blue = 5, + /obj/item/clothing/shoes/black/cuffs/red = 5, + /obj/item/clothing/shoes/sandal = 5, + /obj/item/clothing/shoes/black = 5, + /obj/item/clothing/shoes/blue = 5, + /obj/item/clothing/shoes/brown = 5, + /obj/item/clothing/shoes/laceup = 5, + /obj/item/clothing/shoes/green = 5, + /obj/item/clothing/shoes/laceup/brown = 5, + /obj/item/clothing/shoes/orange = 5, + /obj/item/clothing/shoes/purple = 5, + /obj/item/clothing/shoes/red = 5, + /obj/item/clothing/shoes/white = 5, + /obj/item/clothing/shoes/yellow = 5, + /obj/item/clothing/shoes/skater = 5, + /obj/item/clothing/shoes/boots/cowboy/snakeskin = 5, + /obj/item/clothing/shoes/boots/jackboots/toeless = 5, + /obj/item/clothing/shoes/boots/workboots/toeless = 5, + /obj/item/clothing/shoes/boots/winter = 5, + /obj/item/clothing/shoes/boots/workboots = 5, + /obj/item/clothing/shoes/footwraps = 5) + prices = list(/obj/item/clothing/gloves/evening = 50, + /obj/item/clothing/gloves/fingerless = 50, + /obj/item/clothing/gloves/black = 50, + /obj/item/clothing/gloves/blue = 50, + /obj/item/clothing/gloves/brown = 50, + /obj/item/clothing/gloves/color = 50, + /obj/item/clothing/gloves/green = 50, + /obj/item/clothing/gloves/grey = 50, + /obj/item/clothing/gloves/sterile/latex = 100, + /obj/item/clothing/gloves/light_brown = 50, + /obj/item/clothing/gloves/sterile/nitrile = 100, + /obj/item/clothing/gloves/orange = 50, + /obj/item/clothing/gloves/purple = 50, + /obj/item/clothing/gloves/red = 50, + /obj/item/clothing/gloves/fluff/siren = 50, + /obj/item/clothing/gloves/white = 50, + /obj/item/clothing/gloves/duty = 150, + /obj/item/clothing/shoes/athletic = 50, + /obj/item/clothing/shoes/boots/fluff/siren = 50, + /obj/item/clothing/shoes/slippers = 50, + /obj/item/clothing/shoes/boots/cowboy/classic = 50, + /obj/item/clothing/shoes/boots/cowboy = 50, + /obj/item/clothing/shoes/boots/duty = 100, + /obj/item/clothing/shoes/flats/white/color = 50, + /obj/item/clothing/shoes/flipflop = 50, + /obj/item/clothing/shoes/heels = 50, + /obj/item/clothing/shoes/hitops/black = 50, + /obj/item/clothing/shoes/hitops/blue = 50, + /obj/item/clothing/shoes/hitops/green = 50, + /obj/item/clothing/shoes/hitops/orange = 50, + /obj/item/clothing/shoes/hitops/purple = 50, + /obj/item/clothing/shoes/hitops/red = 50, + /obj/item/clothing/shoes/flats/white/color = 50, + /obj/item/clothing/shoes/hitops/yellow = 50, + /obj/item/clothing/shoes/boots/jackboots = 50, + /obj/item/clothing/shoes/boots/jungle = 100, + /obj/item/clothing/shoes/black/cuffs = 50, + /obj/item/clothing/shoes/black/cuffs/blue = 50, + /obj/item/clothing/shoes/black/cuffs/red = 50, + /obj/item/clothing/shoes/sandal = 50, + /obj/item/clothing/shoes/black = 50, + /obj/item/clothing/shoes/blue = 50, + /obj/item/clothing/shoes/brown = 50, + /obj/item/clothing/shoes/laceup = 50, + /obj/item/clothing/shoes/green = 50, + /obj/item/clothing/shoes/laceup/brown = 50, + /obj/item/clothing/shoes/orange = 50, + /obj/item/clothing/shoes/purple = 50, + /obj/item/clothing/shoes/red = 50, + /obj/item/clothing/shoes/white = 50, + /obj/item/clothing/shoes/yellow = 50, + /obj/item/clothing/shoes/skater = 50, + /obj/item/clothing/shoes/boots/cowboy/snakeskin = 50, + /obj/item/clothing/shoes/boots/jackboots/toeless = 50, + /obj/item/clothing/shoes/boots/workboots/toeless = 50, + /obj/item/clothing/shoes/boots/winter = 50, + /obj/item/clothing/shoes/boots/workboots = 50, + /obj/item/clothing/shoes/footwraps = 50) + premium = list(/obj/item/clothing/gloves/rainbow = 1, + /obj/item/clothing/shoes/rainbow = 1,) + contraband = list(/obj/item/clothing/shoes/syndigaloshes = 1, + /obj/item/clothing/shoes/clown_shoes = 1) + +/obj/machinery/vending/loadout/uniform + name = "The Basics" + desc = "A vendor using compressed matter cartridges to store large amounts of basic station uniforms." + product_ads = "Don't get caught naked!;Pick up your uniform!;Using compressed matter cartridges and VERY ETHICAL labor practices, we bring you the uniforms you need!;No uniform? No problem!;We've got your covered!;The Basics is not responsible for being crushed under the amount of things inside our machines. DO NOT VEND IN EXCESS!!" + icon_state = "loadout" + vend_delay = 16 + products = list(/obj/item/device/pda = 50, + /obj/item/device/radio/headset = 50, + /obj/item/weapon/storage/backpack/ = 10, + /obj/item/weapon/storage/backpack/messenger = 10, + /obj/item/weapon/storage/backpack/satchel = 10, + /obj/item/clothing/under/color = 5, + /obj/item/clothing/under/color/aqua = 5, + /obj/item/clothing/under/color/black = 5, + /obj/item/clothing/under/color/blackjumpskirt = 5, + /obj/item/clothing/under/color/blue = 5, + /obj/item/clothing/under/color/brown = 5, + /obj/item/clothing/under/color/green = 5, + /obj/item/clothing/under/color/grey = 5, + /obj/item/clothing/under/color/orange = 5, + /obj/item/clothing/under/color/pink = 5, + /obj/item/clothing/under/color/red = 5, + /obj/item/clothing/under/color/white = 5, + /obj/item/clothing/under/color/yellow = 5, + /obj/item/clothing/shoes/black = 20, + /obj/item/clothing/shoes/white = 20) + prices = list() + +/obj/machinery/vending/loadout/accessory + name = "Looty Inc." + desc = "A special vendor for accessories." + product_ads = "Want shinies? We have the shinies.;Need that special something to complete your outfit? We have what you need!;Ditch that old dull dangly something you've got and pick up one of our shinies!;Bracelets, collars, scarfs rings and more! We have the fancy things you need!;Does your pet need a collar? We don't judge! Keep them in line with one of one of ours!;Top of the line materials! 'Hand crafted' goods!" + icon_state = "accessory" + vend_delay = 6 + products = list(/obj/item/clothing/accessory = 5, + /obj/item/clothing/accessory/armband/med/color = 10, + /obj/item/clothing/accessory/asymmetric = 5, + /obj/item/clothing/accessory/asymmetric/purple = 5, + /obj/item/clothing/accessory/asymmetric/green = 5, + /obj/item/clothing/accessory/bracelet = 5, + /obj/item/clothing/accessory/bracelet/material = 5, + /obj/item/clothing/accessory/bracelet/friendship = 5, + /obj/item/clothing/accessory/chaps = 5, + /obj/item/clothing/accessory/chaps/black = 5, + /obj/item/weapon/storage/briefcase/clutch = 1, + /obj/item/clothing/accessory/collar = 5, + /obj/item/clothing/accessory/collar/bell = 5, + /obj/item/clothing/accessory/collar/spike = 5, + /obj/item/clothing/accessory/collar/pink = 5, + /obj/item/clothing/accessory/collar/holo = 5, + /obj/item/clothing/accessory/collar/shock = 5, + /obj/item/weapon/storage/belt/fannypack = 1, + /obj/item/weapon/storage/belt/fannypack/white = 5, + /obj/item/clothing/accessory/fullcape = 5, + /obj/item/clothing/accessory/halfcape = 5, + /obj/item/clothing/accessory/hawaiian = 5, + /obj/item/clothing/accessory/hawaiian/blue = 5, + /obj/item/clothing/accessory/hawaiian/pink = 5, + /obj/item/clothing/accessory/hawaiian/red = 5, + /obj/item/clothing/accessory/hawaiian/yellow = 5, + /obj/item/clothing/accessory/locket = 5, + /obj/item/weapon/storage/backpack/purse = 1, + /obj/item/clothing/accessory/sash = 5, + /obj/item/clothing/accessory/scarf = 5, + /obj/item/clothing/accessory/scarf/red = 5, + /obj/item/clothing/accessory/scarf/darkblue = 5, + /obj/item/clothing/accessory/scarf/purple = 5, + /obj/item/clothing/accessory/scarf/yellow = 5, + /obj/item/clothing/accessory/scarf/orange = 5, + /obj/item/clothing/accessory/scarf/lightblue = 5, + /obj/item/clothing/accessory/scarf/white = 5, + /obj/item/clothing/accessory/scarf/black = 5, + /obj/item/clothing/accessory/scarf/zebra = 5, + /obj/item/clothing/accessory/scarf/christmas = 5, + /obj/item/clothing/accessory/scarf/stripedred = 5, + /obj/item/clothing/accessory/scarf/stripedgreen = 5, + /obj/item/clothing/accessory/scarf/stripedblue = 5, + /obj/item/clothing/accessory/jacket = 5, + /obj/item/clothing/accessory/jacket/checkered = 5, + /obj/item/clothing/accessory/jacket/burgundy = 5, + /obj/item/clothing/accessory/jacket/navy = 5, + /obj/item/clothing/accessory/jacket/charcoal = 5, + /obj/item/clothing/accessory/vest = 5, + /obj/item/clothing/accessory/sweater = 5, + /obj/item/clothing/accessory/sweater/pink = 5, + /obj/item/clothing/accessory/sweater/mint = 5, + /obj/item/clothing/accessory/sweater/blue = 5, + /obj/item/clothing/accessory/sweater/heart = 5, + /obj/item/clothing/accessory/sweater/nt = 5, + /obj/item/clothing/accessory/sweater/keyhole = 5, + /obj/item/clothing/accessory/sweater/winterneck = 5, + /obj/item/clothing/accessory/sweater/uglyxmas = 5, + /obj/item/clothing/accessory/sweater/flowersweater = 5, + /obj/item/clothing/accessory/sweater/redneck = 5, + /obj/item/clothing/accessory/tie = 5, + /obj/item/clothing/accessory/tie/horrible = 5, + /obj/item/clothing/accessory/tie/white = 5, + /obj/item/clothing/accessory/tie/navy = 5, + /obj/item/clothing/accessory/tie/yellow = 5, + /obj/item/clothing/accessory/tie/darkgreen = 5, + /obj/item/clothing/accessory/tie/black = 5, + /obj/item/clothing/accessory/tie/red_long = 5, + /obj/item/clothing/accessory/tie/red_clip = 5, + /obj/item/clothing/accessory/tie/blue_long = 5, + /obj/item/clothing/accessory/tie/blue_clip = 5, + /obj/item/clothing/accessory/tie/red = 5, + /obj/item/clothing/accessory/wcoat = 5, + /obj/item/clothing/accessory/wcoat/red = 5, + /obj/item/clothing/accessory/wcoat/grey = 5, + /obj/item/clothing/accessory/wcoat/brown = 5, + /obj/item/clothing/accessory/wcoat/gentleman = 5, + /obj/item/clothing/accessory/wcoat/swvest = 5, + /obj/item/clothing/accessory/wcoat/swvest/blue = 5, + /obj/item/clothing/accessory/wcoat/swvest/red = 5, + /obj/item/weapon/storage/wallet = 5, + /obj/item/weapon/storage/wallet/poly = 5, + /obj/item/weapon/storage/wallet/womens = 5, + /obj/item/weapon/lipstick = 5, + /obj/item/weapon/lipstick/purple = 5, + /obj/item/weapon/lipstick/jade = 5, + /obj/item/weapon/lipstick/black = 5, + /obj/item/clothing/ears/earmuffs = 5, + /obj/item/clothing/ears/earmuffs/headphones = 5, + /obj/item/clothing/ears/earring/stud = 5, + /obj/item/clothing/ears/earring/dangle = 5, + /obj/item/clothing/gloves/ring/mariner = 5, + /obj/item/clothing/gloves/ring/engagement = 5, + /obj/item/clothing/gloves/ring/seal/signet = 5, + /obj/item/clothing/gloves/ring/seal/mason = 5, + /obj/item/clothing/gloves/ring/material/plastic = 5, + /obj/item/clothing/gloves/ring/material/steel = 5, + /obj/item/clothing/gloves/ring/material/gold = 5, + /obj/item/clothing/glasses/eyepatch = 5, + /obj/item/clothing/glasses/gglasses = 5, + /obj/item/clothing/glasses/regular/hipster = 5, + /obj/item/clothing/glasses/rimless = 5, + /obj/item/clothing/glasses/thin = 5, + /obj/item/clothing/glasses/monocle = 5, + /obj/item/clothing/glasses/goggles = 5, + /obj/item/clothing/glasses/fluff/spiffygogs = 5, + /obj/item/clothing/glasses/fakesunglasses = 5, + /obj/item/clothing/glasses/fakesunglasses/aviator = 5, + /obj/item/clothing/mask/bandana/blue = 5, + /obj/item/clothing/mask/bandana/gold = 5, + /obj/item/clothing/mask/bandana/green = 5, + /obj/item/clothing/mask/bandana/red = 5, + /obj/item/clothing/mask/surgical = 5) + prices = list(/obj/item/clothing/accessory = 50, + /obj/item/clothing/accessory/armband/med/color = 50, + /obj/item/clothing/accessory/asymmetric = 50, + /obj/item/clothing/accessory/asymmetric/purple = 50, + /obj/item/clothing/accessory/asymmetric/green = 50, + /obj/item/clothing/accessory/bracelet = 50, + /obj/item/clothing/accessory/bracelet/material = 50, + /obj/item/clothing/accessory/bracelet/friendship = 50, + /obj/item/clothing/accessory/chaps = 50, + /obj/item/clothing/accessory/chaps/black = 50, + /obj/item/weapon/storage/briefcase/clutch = 50, + /obj/item/clothing/accessory/collar = 50, + /obj/item/clothing/accessory/collar/bell = 50, + /obj/item/clothing/accessory/collar/spike = 50, + /obj/item/clothing/accessory/collar/pink = 50, + /obj/item/clothing/accessory/collar/holo = 50, + /obj/item/clothing/accessory/collar/shock = 50, + /obj/item/weapon/storage/belt/fannypack = 50, + /obj/item/weapon/storage/belt/fannypack/white = 50, + /obj/item/clothing/accessory/fullcape = 50, + /obj/item/clothing/accessory/halfcape = 50, + /obj/item/clothing/accessory/hawaiian = 5, + /obj/item/clothing/accessory/hawaiian/blue = 5, + /obj/item/clothing/accessory/hawaiian/pink = 5, + /obj/item/clothing/accessory/hawaiian/red = 5, + /obj/item/clothing/accessory/hawaiian/yellow = 5, + /obj/item/clothing/accessory/locket = 50, + /obj/item/weapon/storage/backpack/purse = 50, + /obj/item/clothing/accessory/sash = 50, + /obj/item/clothing/accessory/scarf = 5, + /obj/item/clothing/accessory/scarf/red = 50, + /obj/item/clothing/accessory/scarf/darkblue = 50, + /obj/item/clothing/accessory/scarf/purple = 50, + /obj/item/clothing/accessory/scarf/yellow = 100, + /obj/item/clothing/accessory/scarf/orange = 50, + /obj/item/clothing/accessory/scarf/lightblue = 50, + /obj/item/clothing/accessory/scarf/white = 50, + /obj/item/clothing/accessory/scarf/black = 50, + /obj/item/clothing/accessory/scarf/zebra = 50, + /obj/item/clothing/accessory/scarf/christmas = 50, + /obj/item/clothing/accessory/scarf/stripedred = 50, + /obj/item/clothing/accessory/scarf/stripedgreen = 50, + /obj/item/clothing/accessory/scarf/stripedblue = 50, + /obj/item/clothing/accessory/jacket = 50, + /obj/item/clothing/accessory/jacket/checkered = 50, + /obj/item/clothing/accessory/jacket/burgundy = 50, + /obj/item/clothing/accessory/jacket/navy = 50, + /obj/item/clothing/accessory/jacket/charcoal = 50, + /obj/item/clothing/accessory/vest = 50, + /obj/item/clothing/accessory/sweater = 50, + /obj/item/clothing/accessory/sweater/pink = 50, + /obj/item/clothing/accessory/sweater/mint = 50, + /obj/item/clothing/accessory/sweater/blue = 50, + /obj/item/clothing/accessory/sweater/heart = 50, + /obj/item/clothing/accessory/sweater/nt = 5, + /obj/item/clothing/accessory/sweater/keyhole = 50, + /obj/item/clothing/accessory/sweater/winterneck = 50, + /obj/item/clothing/accessory/sweater/uglyxmas = 5, + /obj/item/clothing/accessory/sweater/flowersweater = 50, + /obj/item/clothing/accessory/sweater/redneck = 50, + /obj/item/clothing/accessory/tie = 50, + /obj/item/clothing/accessory/tie/horrible = 50, + /obj/item/clothing/accessory/tie/white = 50, + /obj/item/clothing/accessory/tie/navy = 50, + /obj/item/clothing/accessory/tie/yellow = 50, + /obj/item/clothing/accessory/tie/darkgreen = 50, + /obj/item/clothing/accessory/tie/black = 50, + /obj/item/clothing/accessory/tie/red_long = 50, + /obj/item/clothing/accessory/tie/red_clip = 50, + /obj/item/clothing/accessory/tie/blue_long = 50, + /obj/item/clothing/accessory/tie/blue_clip = 50, + /obj/item/clothing/accessory/tie/red = 50, + /obj/item/clothing/accessory/wcoat = 50, + /obj/item/clothing/accessory/wcoat/red = 50, + /obj/item/clothing/accessory/wcoat/grey = 50, + /obj/item/clothing/accessory/wcoat/brown = 50, + /obj/item/clothing/accessory/wcoat/gentleman = 50, + /obj/item/clothing/accessory/wcoat/swvest = 50, + /obj/item/clothing/accessory/wcoat/swvest/blue = 50, + /obj/item/clothing/accessory/wcoat/swvest/red = 50, + /obj/item/weapon/storage/wallet = 50, + /obj/item/weapon/storage/wallet/poly = 50, + /obj/item/weapon/storage/wallet/womens = 50, + /obj/item/weapon/lipstick = 50, + /obj/item/weapon/lipstick/purple = 50, + /obj/item/weapon/lipstick/jade = 50, + /obj/item/weapon/lipstick/black = 50, + /obj/item/clothing/ears/earmuffs = 50, + /obj/item/clothing/ears/earmuffs/headphones = 50, + /obj/item/clothing/ears/earring/stud = 50, + /obj/item/clothing/ears/earring/dangle = 50, + /obj/item/clothing/gloves/ring/mariner = 50, + /obj/item/clothing/gloves/ring/engagement = 50, + /obj/item/clothing/gloves/ring/seal/signet = 50, + /obj/item/clothing/gloves/ring/seal/mason = 50, + /obj/item/clothing/gloves/ring/material/plastic = 50, + /obj/item/clothing/gloves/ring/material/steel = 50, + /obj/item/clothing/gloves/ring/material/gold = 100, + /obj/item/clothing/glasses/eyepatch = 50, + /obj/item/clothing/glasses/gglasses = 50, + /obj/item/clothing/glasses/regular/hipster = 50, + /obj/item/clothing/glasses/rimless = 50, + /obj/item/clothing/glasses/thin = 50, + /obj/item/clothing/glasses/monocle = 50, + /obj/item/clothing/glasses/goggles = 50, + /obj/item/clothing/glasses/fluff/spiffygogs = 50, + /obj/item/clothing/glasses/fakesunglasses = 50, + /obj/item/clothing/glasses/fakesunglasses/aviator = 50, + /obj/item/clothing/mask/bandana/blue = 50, + /obj/item/clothing/mask/bandana/gold = 50, + /obj/item/clothing/mask/bandana/green = 50, + /obj/item/clothing/mask/bandana/red = 50, + /obj/item/clothing/mask/surgical = 50) + premium = list(/obj/item/weapon/bedsheet/rainbow = 1) + contraband = list(/obj/item/clothing/mask/gas/clown_hat = 1) + +/obj/machinery/vending/loadout/clothing + name = "General Jump" + desc = "A special vendor using compressed matter cartridges to store large amounts of clothing." + product_ads = "Tired of your grey jumpsuit? Spruce yourself up!;We have the outfit for you!;Don't let that grey jumpsuit get you down, get a ROBUST outfit right now!;Using compressed matter catridges and VERY ETHICAL labor practices to bring YOU the clothing you crave!;Are you sure you want to go to work in THAT?;All of our wares have a whole TWO pockets!" + icon_state = "clothing" + vend_delay = 16 + products = list(/obj/item/clothing/under/bathrobe = 5, + /obj/item/clothing/under/dress/black_corset = 5, + /obj/item/clothing/under/blazer = 5, + /obj/item/clothing/under/blazer/skirt = 5, + /obj/item/clothing/under/cheongsam = 5, + /obj/item/clothing/under/cheongsam/red = 5, + /obj/item/clothing/under/cheongsam/blue = 5, + /obj/item/clothing/under/cheongsam/black = 5, + /obj/item/clothing/under/cheongsam/darkred = 5, + /obj/item/clothing/under/cheongsam/green = 5, + /obj/item/clothing/under/cheongsam/purple = 5, + /obj/item/clothing/under/cheongsam/darkblue = 5, + /obj/item/clothing/under/croptop = 5, + /obj/item/clothing/under/croptop/red = 5, + /obj/item/clothing/under/croptop/grey = 5, + /obj/item/clothing/under/cuttop = 5, + /obj/item/clothing/under/cuttop/red = 5, + /obj/item/clothing/under/suit_jacket/female/skirt = 5, + /obj/item/clothing/under/dress/dress_fire = 5, + /obj/item/clothing/under/dress/flamenco = 5, + /obj/item/clothing/under/dress/flower_dress = 5, + /obj/item/clothing/under/fluff/gnshorts = 5, + /obj/item/clothing/under/color = 5, + /obj/item/clothing/under/color/aqua = 5, + /obj/item/clothing/under/color/black = 5, + /obj/item/clothing/under/color/blackf = 5, + /obj/item/clothing/under/color/blackjumpskirt = 5, + /obj/item/clothing/under/color/blue = 5, + /obj/item/clothing/under/color/brown = 5, + /obj/item/clothing/under/color/darkblue = 5, + /obj/item/clothing/under/color/darkred = 5, + /obj/item/clothing/under/color/green = 5, + /obj/item/clothing/under/color/grey = 5, + /obj/item/clothing/under/color/lightblue = 5, + /obj/item/clothing/under/color/lightbrown = 5, + /obj/item/clothing/under/color/lightgreen = 5, + /obj/item/clothing/under/color/lightpurple = 5, + /obj/item/clothing/under/color/lightred = 5, + /obj/item/clothing/under/color/orange = 5, + /obj/item/clothing/under/color/pink = 5, + /obj/item/clothing/under/color/prison = 5, + /obj/item/clothing/under/color/ranger = 5, + /obj/item/clothing/under/color/red = 5, + /obj/item/clothing/under/color/white = 5, + /obj/item/clothing/under/color/yellow = 5, + /obj/item/clothing/under/color/yellowgreen = 5, + /obj/item/clothing/under/corp/aether = 5, + /obj/item/clothing/under/corp/focal = 5, + /obj/item/clothing/under/corp/hephaestus = 5, + /obj/item/clothing/under/corp/wardt = 5, + /obj/item/clothing/under/kilt = 5, + /obj/item/clothing/under/fluff/latexmaid = 5, + /obj/item/clothing/under/dress/lilacdress = 5, + /obj/item/clothing/under/dress/white2 = 5, + /obj/item/clothing/under/dress/white4 = 5, + /obj/item/clothing/under/dress/maid = 5, + /obj/item/clothing/under/dress/maid/sexy = 5, + /obj/item/clothing/under/dress/maid/janitor = 5, + /obj/item/clothing/under/moderncoat = 5, + /obj/item/clothing/under/permit = 5, + /obj/item/clothing/under/oldwoman = 5, + /obj/item/clothing/under/frontier = 5, + /obj/item/clothing/under/mbill = 5, + /obj/item/clothing/under/pants/baggy/ = 5, + /obj/item/clothing/under/pants/baggy/classicjeans = 5, + /obj/item/clothing/under/pants/baggy/mustangjeans = 5, + /obj/item/clothing/under/pants/baggy/blackjeans = 5, + /obj/item/clothing/under/pants/baggy/greyjeans = 5, + /obj/item/clothing/under/pants/baggy/youngfolksjeans = 5, + /obj/item/clothing/under/pants/baggy/white = 5, + /obj/item/clothing/under/pants/baggy/red = 5, + /obj/item/clothing/under/pants/baggy/black = 5, + /obj/item/clothing/under/pants/baggy/tan = 5, + /obj/item/clothing/under/pants/baggy/track = 5, + /obj/item/clothing/under/pants/baggy/khaki = 5, + /obj/item/clothing/under/pants/baggy/camo = 5, + /obj/item/clothing/under/pants/utility/ = 5, + /obj/item/clothing/under/pants/utility/orange = 5, + /obj/item/clothing/under/pants/utility/blue = 5, + /obj/item/clothing/under/pants/utility/white = 5, + /obj/item/clothing/under/pants/utility/red = 5, + /obj/item/clothing/under/pants/chaps = 5, + /obj/item/clothing/under/pants/chaps/black = 5, + /obj/item/clothing/under/pants/track = 5, + /obj/item/clothing/under/pants/track/red = 5, + /obj/item/clothing/under/pants/track/white = 5, + /obj/item/clothing/under/pants/track/green = 5, + /obj/item/clothing/under/pants/track/blue = 5, + /obj/item/clothing/under/pants/yogapants = 5, + /obj/item/clothing/under/ascetic = 5, + /obj/item/clothing/under/dress/white3 = 5, + /obj/item/clothing/under/skirt/pleated = 5, + /obj/item/clothing/under/dress/darkred = 5, + /obj/item/clothing/under/dress/redeveninggown = 5, + /obj/item/clothing/under/dress/red_swept_dress = 5, + /obj/item/clothing/under/dress/sailordress = 5, + /obj/item/clothing/under/dress/sari = 5, + /obj/item/clothing/under/dress/sari/green = 5, + /obj/item/clothing/under/qipao = 5, + /obj/item/clothing/under/qipao/red = 5, + /obj/item/clothing/under/qipao/white = 5, + /obj/item/clothing/under/shorts/red = 5, + /obj/item/clothing/under/shorts/green = 5, + /obj/item/clothing/under/shorts/blue = 5, + /obj/item/clothing/under/shorts/black = 5, + /obj/item/clothing/under/shorts/grey = 5, + /obj/item/clothing/under/shorts/white = 5, + /obj/item/clothing/under/shorts/jeans = 5, + /obj/item/clothing/under/shorts/jeans/ = 5, + /obj/item/clothing/under/shorts/jeans/classic = 5, + /obj/item/clothing/under/shorts/jeans/mustang = 5, + /obj/item/clothing/under/shorts/jeans/youngfolks = 5, + /obj/item/clothing/under/shorts/jeans/black = 5, + /obj/item/clothing/under/shorts/jeans/grey = 5, + /obj/item/clothing/under/shorts/khaki/ = 5, + /obj/item/clothing/under/skirt/loincloth = 5, + /obj/item/clothing/under/skirt/khaki = 5, + /obj/item/clothing/under/skirt/blue = 5, + /obj/item/clothing/under/skirt/red = 5, + /obj/item/clothing/under/skirt/denim = 5, + /obj/item/clothing/under/skirt/pleated = 5, + /obj/item/clothing/under/skirt/outfit/plaid_blue = 5, + /obj/item/clothing/under/skirt/outfit/plaid_red = 5, + /obj/item/clothing/under/skirt/outfit/plaid_purple = 5, + /obj/item/clothing/under/overalls/sleek = 5, + /obj/item/clothing/under/sl_suit = 5, + /obj/item/clothing/under/gentlesuit = 5, + /obj/item/clothing/under/gentlesuit/skirt = 5, + /obj/item/clothing/under/suit_jacket = 5, + /obj/item/clothing/under/suit_jacket/really_black/skirt = 5, + /obj/item/clothing/under/suit_jacket/really_black = 5, + /obj/item/clothing/under/suit_jacket/female/skirt = 5, + /obj/item/clothing/under/suit_jacket/female/ = 5, + /obj/item/clothing/under/suit_jacket/red = 5, + /obj/item/clothing/under/suit_jacket/red/skirt = 5, + /obj/item/clothing/under/suit_jacket/charcoal = 5, + /obj/item/clothing/under/suit_jacket/charcoal/skirt = 5, + /obj/item/clothing/under/suit_jacket/navy = 5, + /obj/item/clothing/under/suit_jacket/navy/skirt = 5, + /obj/item/clothing/under/suit_jacket/burgundy = 5, + /obj/item/clothing/under/suit_jacket/burgundy/skirt = 5, + /obj/item/clothing/under/suit_jacket/checkered = 5, + /obj/item/clothing/under/suit_jacket/checkered/skirt = 5, + /obj/item/clothing/under/suit_jacket/tan = 5, + /obj/item/clothing/under/suit_jacket/tan/skirt = 5, + /obj/item/clothing/under/scratch = 5, + /obj/item/clothing/under/scratch/skirt = 5, + /obj/item/clothing/under/sundress = 5, + /obj/item/clothing/under/sundress_white = 5, + /obj/item/clothing/under/rank/psych/turtleneck/sweater = 5, + /obj/item/weapon/storage/box/fluff/swimsuit = 5, + /obj/item/weapon/storage/box/fluff/swimsuit/blue = 5, + /obj/item/weapon/storage/box/fluff/swimsuit/purple = 5, + /obj/item/weapon/storage/box/fluff/swimsuit/green = 5, + /obj/item/weapon/storage/box/fluff/swimsuit/red = 5, + /obj/item/weapon/storage/box/fluff/swimsuit/white = 5, + /obj/item/weapon/storage/box/fluff/swimsuit/earth = 5, + /obj/item/weapon/storage/box/fluff/swimsuit/engineering = 5, + /obj/item/weapon/storage/box/fluff/swimsuit/science = 5, + /obj/item/weapon/storage/box/fluff/swimsuit/security = 5, + /obj/item/weapon/storage/box/fluff/swimsuit/medical = 5, + /obj/item/weapon/storage/box/fluff/swimsuit/cowbikini = 5, + /obj/item/clothing/under/utility = 5, + /obj/item/clothing/under/utility/grey = 5, + /obj/item/clothing/under/utility/blue = 5, + /obj/item/clothing/under/fluff/v_nanovest = 5, + /obj/item/clothing/under/dress/westernbustle = 5, + /obj/item/clothing/under/wedding/bride_white = 5, + /obj/item/weapon/storage/backpack/ = 5, + /obj/item/weapon/storage/backpack/messenger = 5, + /obj/item/weapon/storage/backpack/satchel = 5) + prices = list(/obj/item/clothing/under/bathrobe = 50, + /obj/item/clothing/under/dress/black_corset = 50, + /obj/item/clothing/under/blazer = 50, + /obj/item/clothing/under/blazer/skirt = 50, + /obj/item/clothing/under/cheongsam = 50, + /obj/item/clothing/under/cheongsam/red = 50, + /obj/item/clothing/under/cheongsam/blue = 50, + /obj/item/clothing/under/cheongsam/black = 50, + /obj/item/clothing/under/cheongsam/darkred = 50, + /obj/item/clothing/under/cheongsam/green = 50, + /obj/item/clothing/under/cheongsam/purple = 50, + /obj/item/clothing/under/cheongsam/darkblue = 50, + /obj/item/clothing/under/croptop = 50, + /obj/item/clothing/under/croptop/red = 50, + /obj/item/clothing/under/croptop/grey = 50, + /obj/item/clothing/under/cuttop = 50, + /obj/item/clothing/under/cuttop/red = 50, + /obj/item/clothing/under/suit_jacket/female/skirt = 50, + /obj/item/clothing/under/dress/dress_fire = 50, + /obj/item/clothing/under/dress/flamenco = 50, + /obj/item/clothing/under/dress/flower_dress = 50, + /obj/item/clothing/under/fluff/gnshorts = 50, + /obj/item/clothing/under/color = 50, + /obj/item/clothing/under/color/aqua = 50, + /obj/item/clothing/under/color/black = 50, + /obj/item/clothing/under/color/blackf = 50, + /obj/item/clothing/under/color/blackjumpskirt = 50, + /obj/item/clothing/under/color/blue = 50, + /obj/item/clothing/under/color/brown = 50, + /obj/item/clothing/under/color/darkblue = 50, + /obj/item/clothing/under/color/darkred = 50, + /obj/item/clothing/under/color/green = 50, + /obj/item/clothing/under/color/grey = 50, + /obj/item/clothing/under/color/lightblue = 50, + /obj/item/clothing/under/color/lightbrown = 50, + /obj/item/clothing/under/color/lightgreen = 50, + /obj/item/clothing/under/color/lightpurple = 50, + /obj/item/clothing/under/color/lightred = 50, + /obj/item/clothing/under/color/orange = 50, + /obj/item/clothing/under/color/pink = 50, + /obj/item/clothing/under/color/prison = 50, + /obj/item/clothing/under/color/ranger = 50, + /obj/item/clothing/under/color/red = 50, + /obj/item/clothing/under/color/white = 50, + /obj/item/clothing/under/color/yellow = 50, + /obj/item/clothing/under/color/yellowgreen = 50, + /obj/item/clothing/under/corp/aether = 50, + /obj/item/clothing/under/corp/focal = 50, + /obj/item/clothing/under/corp/hephaestus = 50, + /obj/item/clothing/under/corp/wardt = 50, + /obj/item/clothing/under/kilt = 50, + /obj/item/clothing/under/fluff/latexmaid = 50, + /obj/item/clothing/under/dress/lilacdress = 50, + /obj/item/clothing/under/dress/white2 = 50, + /obj/item/clothing/under/dress/white4 = 50, + /obj/item/clothing/under/dress/maid = 50, + /obj/item/clothing/under/dress/maid/sexy = 50, + /obj/item/clothing/under/dress/maid/janitor = 50, + /obj/item/clothing/under/moderncoat = 50, + /obj/item/clothing/under/permit = 50, + /obj/item/clothing/under/oldwoman = 50, + /obj/item/clothing/under/frontier = 50, + /obj/item/clothing/under/mbill = 50, + /obj/item/clothing/under/pants/baggy/ = 50, + /obj/item/clothing/under/pants/baggy/classicjeans = 50, + /obj/item/clothing/under/pants/baggy/mustangjeans = 50, + /obj/item/clothing/under/pants/baggy/blackjeans = 50, + /obj/item/clothing/under/pants/baggy/greyjeans = 50, + /obj/item/clothing/under/pants/baggy/youngfolksjeans = 50, + /obj/item/clothing/under/pants/baggy/white = 50, + /obj/item/clothing/under/pants/baggy/red = 50, + /obj/item/clothing/under/pants/baggy/black = 50, + /obj/item/clothing/under/pants/baggy/tan = 50, + /obj/item/clothing/under/pants/baggy/track = 50, + /obj/item/clothing/under/pants/baggy/khaki = 50, + /obj/item/clothing/under/pants/baggy/camo = 50, + /obj/item/clothing/under/pants/utility/ = 50, + /obj/item/clothing/under/pants/utility/orange = 50, + /obj/item/clothing/under/pants/utility/blue = 50, + /obj/item/clothing/under/pants/utility/white = 50, + /obj/item/clothing/under/pants/utility/red = 50, + /obj/item/clothing/under/pants/chaps = 50, + /obj/item/clothing/under/pants/chaps/black = 50, + /obj/item/clothing/under/pants/track = 50, + /obj/item/clothing/under/pants/track/red = 50, + /obj/item/clothing/under/pants/track/white = 50, + /obj/item/clothing/under/pants/track/green = 50, + /obj/item/clothing/under/pants/track/blue = 50, + /obj/item/clothing/under/pants/yogapants = 50, + /obj/item/clothing/under/ascetic = 50, + /obj/item/clothing/under/dress/white3 = 50, + /obj/item/clothing/under/skirt/pleated = 50, + /obj/item/clothing/under/dress/darkred = 50, + /obj/item/clothing/under/dress/redeveninggown = 50, + /obj/item/clothing/under/dress/red_swept_dress = 50, + /obj/item/clothing/under/dress/sailordress = 50, + /obj/item/clothing/under/dress/sari = 50, + /obj/item/clothing/under/dress/sari/green = 50, + /obj/item/clothing/under/qipao = 50, + /obj/item/clothing/under/qipao/red = 50, + /obj/item/clothing/under/qipao/white = 50, + /obj/item/clothing/under/shorts/red = 50, + /obj/item/clothing/under/shorts/green = 50, + /obj/item/clothing/under/shorts/blue = 50, + /obj/item/clothing/under/shorts/black = 50, + /obj/item/clothing/under/shorts/grey = 50, + /obj/item/clothing/under/shorts/white = 50, + /obj/item/clothing/under/shorts/jeans = 50, + /obj/item/clothing/under/shorts/jeans/ = 50, + /obj/item/clothing/under/shorts/jeans/classic = 50, + /obj/item/clothing/under/shorts/jeans/mustang = 50, + /obj/item/clothing/under/shorts/jeans/youngfolks = 50, + /obj/item/clothing/under/shorts/jeans/black = 50, + /obj/item/clothing/under/shorts/jeans/grey = 50, + /obj/item/clothing/under/shorts/khaki/ = 50, + /obj/item/clothing/under/skirt/loincloth = 50, + /obj/item/clothing/under/skirt/khaki = 50, + /obj/item/clothing/under/skirt/blue = 50, + /obj/item/clothing/under/skirt/red = 50, + /obj/item/clothing/under/skirt/denim = 50, + /obj/item/clothing/under/skirt/pleated = 50, + /obj/item/clothing/under/skirt/outfit/plaid_blue = 50, + /obj/item/clothing/under/skirt/outfit/plaid_red = 50, + /obj/item/clothing/under/skirt/outfit/plaid_purple = 50, + /obj/item/clothing/under/overalls/sleek = 50, + /obj/item/clothing/under/sl_suit = 50, + /obj/item/clothing/under/gentlesuit = 50, + /obj/item/clothing/under/gentlesuit/skirt = 50, + /obj/item/clothing/under/suit_jacket = 50, + /obj/item/clothing/under/suit_jacket/really_black/skirt = 50, + /obj/item/clothing/under/suit_jacket/really_black = 50, + /obj/item/clothing/under/suit_jacket/female/skirt = 50, + /obj/item/clothing/under/suit_jacket/female/ = 50, + /obj/item/clothing/under/suit_jacket/red = 50, + /obj/item/clothing/under/suit_jacket/red/skirt = 50, + /obj/item/clothing/under/suit_jacket/charcoal = 50, + /obj/item/clothing/under/suit_jacket/charcoal/skirt = 50, + /obj/item/clothing/under/suit_jacket/navy = 50, + /obj/item/clothing/under/suit_jacket/navy/skirt = 50, + /obj/item/clothing/under/suit_jacket/burgundy = 50, + /obj/item/clothing/under/suit_jacket/burgundy/skirt = 50, + /obj/item/clothing/under/suit_jacket/checkered = 50, + /obj/item/clothing/under/suit_jacket/checkered/skirt = 50, + /obj/item/clothing/under/suit_jacket/tan = 50, + /obj/item/clothing/under/suit_jacket/tan/skirt = 50, + /obj/item/clothing/under/scratch = 50, + /obj/item/clothing/under/scratch/skirt = 50, + /obj/item/clothing/under/sundress = 50, + /obj/item/clothing/under/sundress_white = 50, + /obj/item/clothing/under/rank/psych/turtleneck/sweater = 50, + /obj/item/weapon/storage/box/fluff/swimsuit = 50, + /obj/item/weapon/storage/box/fluff/swimsuit/blue = 50, + /obj/item/weapon/storage/box/fluff/swimsuit/purple = 50, + /obj/item/weapon/storage/box/fluff/swimsuit/green = 50, + /obj/item/weapon/storage/box/fluff/swimsuit/red = 50, + /obj/item/weapon/storage/box/fluff/swimsuit/white = 50, + /obj/item/weapon/storage/box/fluff/swimsuit/earth = 50, + /obj/item/weapon/storage/box/fluff/swimsuit/engineering = 50, + /obj/item/weapon/storage/box/fluff/swimsuit/science = 50, + /obj/item/weapon/storage/box/fluff/swimsuit/security = 50, + /obj/item/weapon/storage/box/fluff/swimsuit/medical = 50, + /obj/item/weapon/storage/box/fluff/swimsuit/cowbikini = 50, + /obj/item/clothing/under/utility = 50, + /obj/item/clothing/under/utility/grey = 50, + /obj/item/clothing/under/utility/blue = 50, + /obj/item/clothing/under/fluff/v_nanovest = 50, + /obj/item/clothing/under/dress/westernbustle = 50, + /obj/item/clothing/under/wedding/bride_white = 50, + /obj/item/weapon/storage/backpack/ = 50, + /obj/item/weapon/storage/backpack/messenger = 50, + /obj/item/weapon/storage/backpack/satchel = 50) + premium = list(/obj/item/clothing/under/color/rainbow = 1) + contraband = list(/obj/item/clothing/under/rank/clown = 1) + +/obj/machinery/vending/loadout/loadout_misc + name = "Bits and Bobs" + desc = "A special vendor for things and also stuff!" + product_ads = "You never know when you might need an umbrella.;Hey kid... want some cardemon cards?;Miscellaneous for your miscellaneous heart.;Who's bob? Wouldn't you like to know.;I'm sorry there's no grappling hooks in our umbrellas.;We sell things AND stuff." + icon_state = "loadout_misc" + products = list(/obj/item/weapon/cane = 5, + /obj/item/weapon/pack/cardemon = 25, + /obj/item/weapon/deck/holder = 5, + /obj/item/weapon/deck/cah = 5, + /obj/item/weapon/deck/cah/black = 5, + /obj/item/weapon/deck/tarot = 5, + /obj/item/weapon/deck/cards = 5, + /obj/item/weapon/pack/spaceball = 10, + /obj/item/weapon/storage/pill_bottle/dice = 5, + /obj/item/weapon/storage/pill_bottle/dice_nerd = 5, + /obj/item/weapon/melee/umbrella/random = 10) + prices = list(/obj/item/weapon/cane = 100, + /obj/item/weapon/pack/cardemon = 100, + /obj/item/weapon/deck/holder = 100, + /obj/item/weapon/deck/cah = 100, + /obj/item/weapon/deck/cah/black = 100, + /obj/item/weapon/deck/tarot = 100, + /obj/item/weapon/deck/cards = 100, + /obj/item/weapon/pack/spaceball = 100, + /obj/item/weapon/storage/pill_bottle/dice = 100, + /obj/item/weapon/storage/pill_bottle/dice_nerd = 100, + /obj/item/weapon/melee/umbrella/random = 100) + premium = list(/obj/item/toy/bosunwhistle = 1) + contraband = list(/obj/item/toy/katana = 1) + +/obj/machinery/vending/loadout/overwear + name = "Big D's Best" + desc = "A special vendor using compressed matter cartridges to store large amounts of overwear!" + product_ads = "Dress your best! It's what big D would want.;Overwear for all occasions!;Big D has what you need if what you need is some form of jacket!;Need a new hoodie? Bid D has you covered.;Big D says you need a new suit!;Big D smiles when he sees you in one of his coats!" + icon_state = "suit" + vend_delay = 16 + products = list(/obj/item/clothing/suit/storage/apron = 5, + /obj/item/clothing/suit/storage/flannel/aqua = 5, + /obj/item/clothing/suit/storage/toggle/bomber = 5, + /obj/item/clothing/suit/storage/bomber/alt = 5, + /obj/item/clothing/suit/storage/flannel/brown = 5, + /obj/item/clothing/suit/storage/toggle/cardigan = 5, + /obj/item/clothing/accessory/poncho/roles/cloak/custom = 5, + /obj/item/clothing/suit/storage/duster = 5, + /obj/item/clothing/suit/storage/toggle/denim_jacket = 5, + /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen = 5, + /obj/item/clothing/suit/storage/toggle/denim_jacket/sleeveless = 5, + /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen/sleeveless = 5, + /obj/item/clothing/suit/storage/fluff/gntop = 5, + /obj/item/clothing/suit/greatcoat = 5, + /obj/item/clothing/suit/storage/flannel = 5, + /obj/item/clothing/suit/storage/greyjacket = 5, + /obj/item/clothing/suit/storage/hazardvest = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/black = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/red = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/blue = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/green = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/orange = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/yellow = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/cti = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/mu = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/nt = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/smw = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/nrti = 5, + /obj/item/clothing/suit/storage/fluff/jacket/field = 5, + /obj/item/clothing/suit/storage/fluff/jacket/air_cavalry = 5, + /obj/item/clothing/suit/storage/fluff/jacket/air_force = 5, + /obj/item/clothing/suit/storage/fluff/jacket/navy = 5, + /obj/item/clothing/suit/storage/fluff/jacket/special_forces = 5, + /obj/item/clothing/suit/kamishimo = 5, + /obj/item/clothing/suit/kimono = 5, + /obj/item/clothing/suit/storage/toggle/labcoat = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/blue = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/blue_edge = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/green = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/orange = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/pink = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/red = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/yellow = 5, + /obj/item/clothing/suit/leathercoat = 5, + /obj/item/clothing/suit/storage/toggle/leather_jacket = 5, + /obj/item/clothing/suit/storage/leather_jacket_alt = 5, + /obj/item/clothing/suit/storage/toggle/brown_jacket = 5, + /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen = 5, + /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen = 5, + /obj/item/clothing/suit/storage/toggle/leather_jacket/sleeveless = 5, + /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless = 5, + /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen/sleeveless = 5, + /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen/sleeveless = 5, + /obj/item/clothing/suit/storage/miljacket = 5, + /obj/item/clothing/suit/storage/miljacket/alt = 5, + /obj/item/clothing/suit/storage/miljacket/green = 5, + /obj/item/clothing/suit/storage/apron/overalls = 5, + /obj/item/clothing/suit/storage/toggle/peacoat = 5, + /obj/item/clothing/accessory/poncho = 5, + /obj/item/clothing/accessory/poncho/green = 5, + /obj/item/clothing/accessory/poncho/red = 5, + /obj/item/clothing/accessory/poncho/purple = 5, + /obj/item/clothing/accessory/poncho/blue = 5, + /obj/item/clothing/suit/jacket/puffer = 5, + /obj/item/clothing/suit/jacket/puffer/vest = 5, + /obj/item/clothing/suit/storage/flannel/red = 5, + /obj/item/clothing/suit/unathi/robe = 5, + /obj/item/clothing/suit/storage/snowsuit = 5, +>>>>>>> 0085a5bd10... Adds more clothing from Polaris and various sources (#11546) + /obj/item/clothing/suit/storage/toggle/internalaffairs = 5, + /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket = 5, + /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket = 5, + /obj/item/clothing/suit/suspenders = 5, + /obj/item/clothing/suit/storage/toggle/track = 5, + /obj/item/clothing/suit/storage/toggle/track/blue = 5, + /obj/item/clothing/suit/storage/toggle/track/green = 5, + /obj/item/clothing/suit/storage/toggle/track/red = 5, + /obj/item/clothing/suit/storage/toggle/track/white = 5, + /obj/item/clothing/suit/storage/trench = 5, + /obj/item/clothing/suit/storage/trench/grey = 5, + /obj/item/clothing/suit/varsity = 5, + /obj/item/clothing/suit/varsity/red = 5, + /obj/item/clothing/suit/varsity/purple = 5, + /obj/item/clothing/suit/varsity/green = 5, + /obj/item/clothing/suit/varsity/blue = 5, + /obj/item/clothing/suit/varsity/brown = 5, + /obj/item/clothing/suit/storage/hooded/wintercoat = 5, + /obj/item/clothing/suit/storage/hooded/wintercoat/aformal = 5, + /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey = 5) + prices = list(/obj/item/clothing/suit/storage/apron = 100, + /obj/item/clothing/suit/storage/flannel/aqua = 100, + /obj/item/clothing/suit/storage/toggle/bomber = 100, + /obj/item/clothing/suit/storage/bomber/alt = 100, + /obj/item/clothing/suit/storage/flannel/brown = 100, + /obj/item/clothing/suit/storage/toggle/cardigan = 100, + /obj/item/clothing/accessory/poncho/roles/cloak/custom = 100, + /obj/item/clothing/suit/storage/duster = 100, + /obj/item/clothing/suit/storage/toggle/denim_jacket = 100, + /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen = 100, + /obj/item/clothing/suit/storage/toggle/denim_jacket/sleeveless = 100, + /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen/sleeveless = 100, + /obj/item/clothing/suit/storage/fluff/gntop = 100, + /obj/item/clothing/suit/greatcoat = 100, + /obj/item/clothing/suit/storage/flannel = 100, + /obj/item/clothing/suit/storage/greyjacket = 100, + /obj/item/clothing/suit/storage/hazardvest = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/black = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/red = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/blue = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/green = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/orange = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/yellow = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/cti = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/mu = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/nt = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/smw = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/nrti = 100, + /obj/item/clothing/suit/storage/fluff/jacket/field = 100, + /obj/item/clothing/suit/storage/fluff/jacket/air_cavalry = 100, + /obj/item/clothing/suit/storage/fluff/jacket/air_force = 100, + /obj/item/clothing/suit/storage/fluff/jacket/navy = 100, + /obj/item/clothing/suit/storage/fluff/jacket/special_forces = 100, + /obj/item/clothing/suit/kamishimo = 100, + /obj/item/clothing/suit/kimono = 100, + /obj/item/clothing/suit/storage/toggle/labcoat = 100, + /obj/item/clothing/suit/storage/toggle/labcoat/blue = 100, + /obj/item/clothing/suit/storage/toggle/labcoat/blue_edge = 100, + /obj/item/clothing/suit/storage/toggle/labcoat/green = 100, + /obj/item/clothing/suit/storage/toggle/labcoat/orange = 100, + /obj/item/clothing/suit/storage/toggle/labcoat/pink = 100, + /obj/item/clothing/suit/storage/toggle/labcoat/red = 100, + /obj/item/clothing/suit/storage/toggle/labcoat/yellow = 100, + /obj/item/clothing/suit/leathercoat = 100, + /obj/item/clothing/suit/storage/toggle/leather_jacket = 100, + /obj/item/clothing/suit/storage/leather_jacket_alt = 100, + /obj/item/clothing/suit/storage/toggle/brown_jacket = 100, + /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen = 100, + /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen = 100, + /obj/item/clothing/suit/storage/toggle/leather_jacket/sleeveless = 100, + /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless = 100, + /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen/sleeveless = 100, + /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen/sleeveless = 100, + /obj/item/clothing/suit/storage/miljacket = 100, + /obj/item/clothing/suit/storage/miljacket/alt = 100, + /obj/item/clothing/suit/storage/miljacket/green = 100, + /obj/item/clothing/suit/storage/apron/overalls = 100, + /obj/item/clothing/suit/storage/toggle/peacoat = 100, + /obj/item/clothing/accessory/poncho = 100, + /obj/item/clothing/accessory/poncho/green = 100, + /obj/item/clothing/accessory/poncho/red = 100, + /obj/item/clothing/accessory/poncho/purple = 100, + /obj/item/clothing/accessory/poncho/blue = 100, + /obj/item/clothing/suit/jacket/puffer = 100, + /obj/item/clothing/suit/jacket/puffer/vest = 100, + /obj/item/clothing/suit/storage/flannel/red = 100, + /obj/item/clothing/suit/unathi/robe = 100, + /obj/item/clothing/suit/storage/toggle/internalaffairs = 100, + /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket = 100, + /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket = 100, + /obj/item/clothing/suit/suspenders = 100, + /obj/item/clothing/suit/storage/toggle/track = 100, + /obj/item/clothing/suit/storage/toggle/track/blue = 100, + /obj/item/clothing/suit/storage/toggle/track/green = 100, + /obj/item/clothing/suit/storage/toggle/track/red = 100, + /obj/item/clothing/suit/storage/toggle/track/white = 100, + /obj/item/clothing/suit/storage/trench = 100, + /obj/item/clothing/suit/storage/trench/grey = 100, + /obj/item/clothing/suit/varsity = 100, + /obj/item/clothing/suit/varsity/red = 100, + /obj/item/clothing/suit/varsity/purple = 100, + /obj/item/clothing/suit/varsity/green = 100, + /obj/item/clothing/suit/varsity/blue = 100, + /obj/item/clothing/suit/varsity/brown = 100, + /obj/item/clothing/suit/storage/hooded/wintercoat = 100, + /obj/item/clothing/suit/storage/hooded/wintercoat/aformal = 100, + /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey = 100) + premium = list(/obj/item/clothing/suit/imperium_monk = 3, + /obj/item/clothing/suit/storage/hooded/wintercoat/cosmic = 1) + contraband = list(/obj/item/toy/katana = 1) + +/obj/machinery/vending/loadout/costume + name = "Thespian's Delight" + desc = "Sometimes nerds need costumes!" + product_ads = "Don't let your art be stifled!;Remember, practice makes perfect!;Break a leg!;Don't make me get the cane!;Thespian's Delight entering stage right!;Costumes for your acting needs!" + icon = 'icons/obj/vending.dmi' + icon_state = "theater" + products = list(/obj/item/clothing/suit/storage/hooded/carp_costume = 3, + /obj/item/clothing/suit/storage/hooded/carp_costume = 3, + /obj/item/clothing/suit/chickensuit = 3, + /obj/item/clothing/head/chicken = 3, + /obj/item/clothing/head/helmet/gladiator = 3, + /obj/item/clothing/under/gladiator = 3, + /obj/item/clothing/suit/storage/toggle/labcoat/mad = 3, + /obj/item/clothing/under/suit_jacket/green = 3, + /obj/item/clothing/glasses/gglasses = 3, + /obj/item/clothing/head/flatcap = 3, + /obj/item/clothing/shoes/boots/jackboots = 3, + /obj/item/clothing/under/schoolgirl = 3, + /obj/item/clothing/head/kitty = 3, + /obj/item/clothing/glasses/sunglasses/blindfold = 3, + /obj/item/clothing/head/beret = 3, + /obj/item/clothing/under/skirt = 3, + /obj/item/clothing/under/suit_jacket = 3, + /obj/item/clothing/head/that = 3, + /obj/item/clothing/accessory/wcoat = 3, + /obj/item/clothing/under/scratch = 3, + /obj/item/clothing/shoes/white = 3, + /obj/item/clothing/gloves/white = 3, + /obj/item/clothing/under/kilt = 3, + /obj/item/clothing/glasses/monocle = 3, + /obj/item/clothing/under/sl_suit = 3, + /obj/item/clothing/mask/fakemoustache = 3, + /obj/item/weapon/cane = 3, + /obj/item/clothing/head/bowler = 3, + /obj/item/clothing/head/plaguedoctorhat = 3, + /obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 3, + /obj/item/clothing/mask/gas/plaguedoctor/fluff = 3, + /obj/item/clothing/under/owl = 3, + /obj/item/clothing/mask/gas/owl_mask = 3, + /obj/item/clothing/under/waiter = 3, + /obj/item/clothing/suit/storage/apron = 3, + /obj/item/clothing/under/pirate = 3, + /obj/item/clothing/head/pirate = 3, + /obj/item/clothing/suit/pirate = 3, + /obj/item/clothing/glasses/eyepatch = 3, + /obj/item/clothing/head/ushanka = 3, + /obj/item/clothing/under/soviet = 3, + /obj/item/clothing/suit/imperium_monk = 1, + /obj/item/clothing/suit/holidaypriest = 3, + /obj/item/clothing/head/witchwig = 3, + /obj/item/clothing/under/sundress = 3, + /obj/item/weapon/staff/broom = 3, + /obj/item/clothing/suit/wizrobe/fake = 3, + /obj/item/clothing/head/wizard/fake = 3, + /obj/item/weapon/staff = 3, + /obj/item/clothing/mask/gas/sexyclown = 3, + /obj/item/clothing/under/sexyclown = 3, + /obj/item/clothing/mask/gas/sexymime = 3, + /obj/item/clothing/under/sexymime = 3, + /obj/item/clothing/suit/storage/hooded/knight_costume = 3, + /obj/item/clothing/suit/storage/hooded/knight_costume/galahad = 3, + /obj/item/clothing/suit/storage/hooded/knight_costume/lancelot = 3, + /obj/item/clothing/suit/storage/hooded/knight_costume/robin = 3, + /obj/item/clothing/suit/armor/combat/crusader_costume = 3, + /obj/item/clothing/suit/armor/combat/crusader_costume/bedevere = 3, + /obj/item/clothing/head/helmet/combat/crusader_costume = 3, + /obj/item/clothing/head/helmet/combat/bedevere_costume = 3, + /obj/item/clothing/gloves/combat/knight_costume = 3, + /obj/item/clothing/gloves/combat/knight_costume/brown = 3, + /obj/item/clothing/shoes/knight_costume = 3, + /obj/item/clothing/shoes/knight_costume/black = 3) + prices = list(/obj/item/clothing/suit/storage/hooded/carp_costume = 200, + /obj/item/clothing/suit/storage/hooded/carp_costume = 200, + /obj/item/clothing/suit/chickensuit = 200, + /obj/item/clothing/head/chicken = 200, + /obj/item/clothing/head/helmet/gladiator = 300, + /obj/item/clothing/under/gladiator = 500, + /obj/item/clothing/suit/storage/toggle/labcoat/mad = 200, + /obj/item/clothing/under/suit_jacket/green = 200, + /obj/item/clothing/glasses/gglasses = 200, + /obj/item/clothing/head/flatcap = 200, + /obj/item/clothing/shoes/boots/jackboots = 200, + /obj/item/clothing/under/schoolgirl = 200, + /obj/item/clothing/head/kitty = 200, + /obj/item/clothing/glasses/sunglasses/blindfold = 200, + /obj/item/clothing/head/beret = 200, + /obj/item/clothing/under/skirt = 200, + /obj/item/clothing/under/suit_jacket = 200, + /obj/item/clothing/head/that = 200, + /obj/item/clothing/accessory/wcoat = 200, + /obj/item/clothing/under/scratch = 200, + /obj/item/clothing/shoes/white = 200, + /obj/item/clothing/gloves/white = 200, + /obj/item/clothing/under/kilt = 200, + /obj/item/clothing/glasses/monocle = 400, + /obj/item/clothing/under/sl_suit = 200, + /obj/item/clothing/mask/fakemoustache = 200, + /obj/item/weapon/cane = 300, + /obj/item/clothing/head/bowler = 200, + /obj/item/clothing/head/plaguedoctorhat = 300, + /obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 300, + /obj/item/clothing/mask/gas/plaguedoctor/fluff = 600, + /obj/item/clothing/under/owl = 400, + /obj/item/clothing/mask/gas/owl_mask = 400, + /obj/item/clothing/under/waiter = 100, + /obj/item/clothing/suit/storage/apron = 200, + /obj/item/clothing/under/pirate = 300, + /obj/item/clothing/head/pirate = 400, + /obj/item/clothing/suit/pirate = 600, + /obj/item/clothing/glasses/eyepatch = 200, + /obj/item/clothing/head/ushanka = 200, + /obj/item/clothing/under/soviet = 200, + /obj/item/clothing/suit/imperium_monk = 2000, + /obj/item/clothing/suit/holidaypriest = 200, + /obj/item/clothing/head/witchwig = 200, + /obj/item/clothing/under/sundress = 50, + /obj/item/weapon/staff/broom = 400, + /obj/item/clothing/suit/wizrobe/fake = 200, + /obj/item/clothing/head/wizard/fake = 200, + /obj/item/weapon/staff = 400, + /obj/item/clothing/mask/gas/sexyclown = 600, + /obj/item/clothing/under/sexyclown = 200, + /obj/item/clothing/mask/gas/sexymime = 600, + /obj/item/clothing/under/sexymime = 200, + /obj/item/clothing/suit/storage/hooded/knight_costume = 200, + /obj/item/clothing/suit/storage/hooded/knight_costume/galahad = 200, + /obj/item/clothing/suit/storage/hooded/knight_costume/lancelot = 200, + /obj/item/clothing/suit/storage/hooded/knight_costume/robin = 200, + /obj/item/clothing/suit/armor/combat/crusader_costume = 200, + /obj/item/clothing/suit/armor/combat/crusader_costume/bedevere = 200, + /obj/item/clothing/head/helmet/combat/crusader_costume = 200, + /obj/item/clothing/head/helmet/combat/bedevere_costume = 200, + /obj/item/clothing/gloves/combat/knight_costume = 200, + /obj/item/clothing/gloves/combat/knight_costume/brown = 200, + /obj/item/clothing/shoes/knight_costume = 200, + /obj/item/clothing/shoes/knight_costume/black = 200) + premium = list(/obj/item/clothing/suit/imperium_monk = 3, + /obj/item/clothing/suit/barding/agatha = 2, + /obj/item/clothing/suit/barding/alt_agatha = 2, + /obj/item/clothing/suit/barding/mason = 2, + /obj/item/clothing/suit/drake_cloak = 2) + contraband = list(/obj/item/clothing/head/syndicatefake = 1, + /obj/item/clothing/suit/syndicatefake = 1) + /obj/machinery/vending/entertainer name = "Thespian's Delight" desc = "Sometimes nerds need costumes!" @@ -1518,7 +3884,7 @@ /obj/item/clothing/head/helmet/gladiator = 3, /obj/item/clothing/under/gladiator = 3, /obj/item/clothing/suit/storage/toggle/labcoat/mad = 3, - /obj/item/clothing/under/gimmick/rank/captain/suit = 3, + /obj/item/clothing/under/suit_jacket/green = 3, /obj/item/clothing/glasses/gglasses = 3, /obj/item/clothing/head/flatcap = 3, /obj/item/clothing/shoes/boots/jackboots = 3, @@ -1850,10 +4216,10 @@ /obj/item/clothing/under/color/white = 5, /obj/item/clothing/under/color/yellow = 5, /obj/item/clothing/under/color/yellowgreen = 5, - /obj/item/clothing/under/aether = 5, - /obj/item/clothing/under/focal = 5, - /obj/item/clothing/under/hephaestus = 5, - /obj/item/clothing/under/wardt = 5, + /obj/item/clothing/under/corp/aether = 5, + /obj/item/clothing/under/corp/focal = 5, + /obj/item/clothing/under/corp/hephaestus = 5, + /obj/item/clothing/under/corp/wardt = 5, /obj/item/clothing/under/kilt = 5, /obj/item/clothing/under/fluff/latexmaid = 5, /obj/item/clothing/under/dress/lilacdress = 5, @@ -2266,7 +4632,7 @@ /obj/item/clothing/head/helmet/gladiator = 3, /obj/item/clothing/under/gladiator = 3, /obj/item/clothing/suit/storage/toggle/labcoat/mad = 3, - /obj/item/clothing/under/gimmick/rank/captain/suit = 3, + /obj/item/clothing/under/suit_jacket/green = 3, /obj/item/clothing/glasses/gglasses = 3, /obj/item/clothing/head/flatcap = 3, /obj/item/clothing/shoes/boots/jackboots = 3, diff --git a/icons/inventory/accessory/item.dmi b/icons/inventory/accessory/item.dmi index 4aa7121c5e..9c51533b02 100644 Binary files a/icons/inventory/accessory/item.dmi and b/icons/inventory/accessory/item.dmi differ diff --git a/icons/inventory/accessory/mob.dmi b/icons/inventory/accessory/mob.dmi index d4c479ef0d..dcf3765fe4 100644 Binary files a/icons/inventory/accessory/mob.dmi and b/icons/inventory/accessory/mob.dmi differ diff --git a/icons/inventory/belt/item.dmi b/icons/inventory/belt/item.dmi index b4bc29446f..8c32c4552b 100644 Binary files a/icons/inventory/belt/item.dmi and b/icons/inventory/belt/item.dmi differ diff --git a/icons/inventory/belt/mob.dmi b/icons/inventory/belt/mob.dmi index c3f0f0d956..25de974858 100644 Binary files a/icons/inventory/belt/mob.dmi and b/icons/inventory/belt/mob.dmi differ diff --git a/icons/inventory/hands/item.dmi b/icons/inventory/hands/item.dmi index 9949cefb10..556cfcfb56 100644 Binary files a/icons/inventory/hands/item.dmi and b/icons/inventory/hands/item.dmi differ diff --git a/icons/inventory/head/item.dmi b/icons/inventory/head/item.dmi index b74c635711..35a07f74bf 100644 Binary files a/icons/inventory/head/item.dmi and b/icons/inventory/head/item.dmi differ diff --git a/icons/inventory/head/item_vr.dmi b/icons/inventory/head/item_vr.dmi index c80a9e2927..1f298898de 100644 Binary files a/icons/inventory/head/item_vr.dmi and b/icons/inventory/head/item_vr.dmi differ diff --git a/icons/inventory/head/item_vr_vulpkanin.dmi b/icons/inventory/head/item_vr_vulpkanin.dmi index b83b041501..dce35a0549 100644 Binary files a/icons/inventory/head/item_vr_vulpkanin.dmi and b/icons/inventory/head/item_vr_vulpkanin.dmi differ diff --git a/icons/inventory/head/mob.dmi b/icons/inventory/head/mob.dmi index ed9e936b7d..1e8a6315bd 100644 Binary files a/icons/inventory/head/mob.dmi and b/icons/inventory/head/mob.dmi differ diff --git a/icons/inventory/head/mob_tajaran.dmi b/icons/inventory/head/mob_tajaran.dmi index 84f3982c2d..6493b9948f 100644 Binary files a/icons/inventory/head/mob_tajaran.dmi and b/icons/inventory/head/mob_tajaran.dmi differ diff --git a/icons/inventory/head/mob_vr.dmi b/icons/inventory/head/mob_vr.dmi index dff6cb7eab..2c417cdd25 100644 Binary files a/icons/inventory/head/mob_vr.dmi and b/icons/inventory/head/mob_vr.dmi differ diff --git a/icons/inventory/head/mob_vr_teshari.dmi b/icons/inventory/head/mob_vr_teshari.dmi index bed3f6532f..4ebb53d2d8 100644 Binary files a/icons/inventory/head/mob_vr_teshari.dmi and b/icons/inventory/head/mob_vr_teshari.dmi differ diff --git a/icons/inventory/head/mob_vr_unathi.dmi b/icons/inventory/head/mob_vr_unathi.dmi index 730be5905f..fd9a2904ca 100644 Binary files a/icons/inventory/head/mob_vr_unathi.dmi and b/icons/inventory/head/mob_vr_unathi.dmi differ diff --git a/icons/inventory/head/mob_vr_vulpkanin.dmi b/icons/inventory/head/mob_vr_vulpkanin.dmi index bff1c5f81b..902887853f 100644 Binary files a/icons/inventory/head/mob_vr_vulpkanin.dmi and b/icons/inventory/head/mob_vr_vulpkanin.dmi differ diff --git a/icons/inventory/suit/item.dmi b/icons/inventory/suit/item.dmi index 3f12359223..6390e02435 100644 Binary files a/icons/inventory/suit/item.dmi and b/icons/inventory/suit/item.dmi differ diff --git a/icons/inventory/suit/item_vr_vulpkanin.dmi b/icons/inventory/suit/item_vr_vulpkanin.dmi index feeb780f60..92b5f1fc06 100644 Binary files a/icons/inventory/suit/item_vr_vulpkanin.dmi and b/icons/inventory/suit/item_vr_vulpkanin.dmi differ diff --git a/icons/inventory/suit/mob.dmi b/icons/inventory/suit/mob.dmi index ddad77a5c3..8736d3d420 100644 Binary files a/icons/inventory/suit/mob.dmi and b/icons/inventory/suit/mob.dmi differ diff --git a/icons/inventory/suit/mob_vr_vulpkanin.dmi b/icons/inventory/suit/mob_vr_vulpkanin.dmi index 7d0e5376bd..8e6bf59b58 100644 Binary files a/icons/inventory/suit/mob_vr_vulpkanin.dmi and b/icons/inventory/suit/mob_vr_vulpkanin.dmi differ diff --git a/icons/inventory/uniform/item.dmi b/icons/inventory/uniform/item.dmi index eb30629c03..9f46849608 100644 Binary files a/icons/inventory/uniform/item.dmi and b/icons/inventory/uniform/item.dmi differ diff --git a/icons/inventory/uniform/mob.dmi b/icons/inventory/uniform/mob.dmi index f51574cbd9..a6bb42e1d7 100644 Binary files a/icons/inventory/uniform/mob.dmi and b/icons/inventory/uniform/mob.dmi differ diff --git a/icons/inventory/uniform/mob_rolled_down.dmi b/icons/inventory/uniform/mob_rolled_down.dmi index 7c7afd8594..01da7ea4a3 100644 Binary files a/icons/inventory/uniform/mob_rolled_down.dmi and b/icons/inventory/uniform/mob_rolled_down.dmi differ diff --git a/icons/inventory/uniform/mob_sleeves_rolled.dmi b/icons/inventory/uniform/mob_sleeves_rolled.dmi index 5803d1a3a1..88ccb64ad1 100644 Binary files a/icons/inventory/uniform/mob_sleeves_rolled.dmi and b/icons/inventory/uniform/mob_sleeves_rolled.dmi differ diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi index 7a3adca781..327eb3b9ce 100644 Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ diff --git a/icons/mob/items/lefthand_melee.dmi b/icons/mob/items/lefthand_melee.dmi index 1aca98f66f..e965d64b43 100644 Binary files a/icons/mob/items/lefthand_melee.dmi and b/icons/mob/items/lefthand_melee.dmi differ diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi index 4098221f59..75d2c9ac51 100644 Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ diff --git a/icons/mob/items/righthand_melee.dmi b/icons/mob/items/righthand_melee.dmi index b4a1a9f341..3fee6cb6bd 100644 Binary files a/icons/mob/items/righthand_melee.dmi and b/icons/mob/items/righthand_melee.dmi differ diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi index b8b832471d..1ee1f2fc1f 100644 Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 0ad63f5424..c153951397 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 06be929179..97ee06a906 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index a8b57870bf..2e9090c763 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ diff --git a/maps/southern_cross/loadout/loadout_vr.dm b/maps/southern_cross/loadout/loadout_vr.dm index db62b7394b..45b886e8b4 100644 --- a/maps/southern_cross/loadout/loadout_vr.dm +++ b/maps/southern_cross/loadout/loadout_vr.dm @@ -9,6 +9,11 @@ allowed_roles = list("Pilot") /datum/gear/head/pilot/talon - display_name = "helmet, Talon pilot (Pilot)" + display_name = "helmet, talon pilot (Pilot)" path = /obj/item/clothing/head/pilot_vr/talon + allowed_roles = list("Pilot") + +/datum/gear/head/pilot/mbill + display_name = "helmet, major bill's (Pilot)" + path = /obj/item/clothing/head/pilot_vr/mbill allowed_roles = list("Pilot") \ No newline at end of file diff --git a/sound/weapons/whip.ogg b/sound/weapons/whip.ogg new file mode 100644 index 0000000000..3c9a4aff09 Binary files /dev/null and b/sound/weapons/whip.ogg differ