diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index faa1f0d851..9c4d76e908 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -916,8 +916,40 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C /obj/item/clothing/mask/joy = 1, /obj/item/clothing/head/cueball = 1, /obj/item/clothing/under/scratch = 1, - /obj/item/clothing/under/sailor = 1) - contraband = list(/obj/item/clothing/suit/judgerobe = 1,/obj/item/clothing/head/powdered_wig = 1,/obj/item/weapon/gun/magic/wand = 2,/obj/item/clothing/glasses/sunglasses/garb = 2) + /obj/item/clothing/under/sailor=1, + /obj/item/clothing/shoes/megaboots=1, + /obj/item/clothing/gloves/megagloves=1, + /obj/item/clothing/head/helmet/megahelmet=1, + /obj/item/clothing/under/mega=1, + /obj/item/clothing/shoes/protoboots=1, + /obj/item/clothing/gloves/protogloves=1, + /obj/item/clothing/head/helmet/protohelmet = 1, + /obj/item/clothing/under/proto = 1, + /obj/item/clothing/shoes/megaxboots = 1, + /obj/item/clothing/gloves/megaxgloves = 1, + /obj/item/clothing/head/helmet/megaxhelmet = 1, + /obj/item/clothing/under/megax = 1, + /obj/item/clothing/shoes/joeboots = 1, + /obj/item/clothing/gloves/joegloves = 1, + /obj/item/clothing/head/helmet/joehelmet = 1, + /obj/item/clothing/under/joe = 1, + /obj/item/clothing/under/vault = 1, + /obj/item/clothing/under/roll = 1, + /obj/item/clothing/head/clownpiece = 1, + /obj/item/clothing/under/clownpiece = 1, + /obj/item/clothing/suit/clownpiece = 1) + contraband = list(/obj/item/clothing/suit/judgerobe = 1,/obj/item/clothing/head/powdered_wig = 1,/obj/item/weapon/gun/magic/wand = 2,/obj/item/clothing/glasses/sunglasses/garb = 2, + /obj/item/clothing/gloves/anchor_arms = 1, + /obj/item/clothing/suit/kaminacape = 1, + /obj/item/clothing/under/soldieruniform = 1, /obj/item/clothing/head/stalhelm = 1, /obj/item/clothing/suit/soldiercoat = 1, + /obj/item/clothing/under/officeruniform = 1, /obj/item/clothing/head/naziofficer = 1, /obj/item/clothing/suit/officercoat = 1, + /obj/item/clothing/head/panzer = 1, + /obj/item/clothing/under/russobluecamooutfit = 1, /obj/item/clothing/head/russobluecamohat = 1, + /obj/item/clothing/suit/russofurcoat = 1, /obj/item/clothing/head/russofurhat = 1, + /obj/item/clothing/under/rottensuit = 1, /obj/item/clothing/shoes/rottenshoes = 1, + /obj/item/clothing/head/helmet/biker = 1, /obj/item/clothing/under/bikersuit = 1, /obj/item/clothing/gloves/bikergloves = 1, + /obj/item/clothing/under/jacketsuit = 1, /obj/item/clothing/head/helmet/richard = 1, + /obj/item/clothing/under/vault13 = 1) premium = list(/obj/item/clothing/suit/pirate/captain = 2, /obj/item/clothing/head/pirate/captain = 2, /obj/item/clothing/head/helmet/roman = 1, /obj/item/clothing/head/helmet/roman/legionaire = 1, /obj/item/clothing/under/roman = 1, /obj/item/clothing/shoes/roman = 1, /obj/item/weapon/shield/riot/roman = 1, /obj/item/weapon/skub = 1) refill_canister = /obj/item/weapon/vending_refill/autodrobe @@ -1027,8 +1059,18 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C /obj/item/clothing/head/beanie=1, /obj/item/clothing/head/beanie/black=1, /obj/item/clothing/head/beanie/red=1, /obj/item/clothing/head/beanie/green=1, /obj/item/clothing/head/beanie/darkblue=1, /obj/item/clothing/head/beanie/purple=1, /obj/item/clothing/head/beanie/yellow=1, /obj/item/clothing/head/beanie/orange=1, /obj/item/clothing/head/beanie/cyan=1, /obj/item/clothing/head/beanie/christmas=1, /obj/item/clothing/head/beanie/striped=1, /obj/item/clothing/head/beanie/stripedred=1, /obj/item/clothing/head/beanie/stripedblue=1, /obj/item/clothing/head/beanie/stripedgreen=1, - /obj/item/clothing/suit/jacket/letterman_red=1) - contraband = list(/obj/item/clothing/under/syndicate/tacticool=1,/obj/item/clothing/mask/balaclava=1,/obj/item/clothing/head/ushanka=1,/obj/item/clothing/under/soviet=1,/obj/item/weapon/storage/belt/fannypack/black=2,/obj/item/clothing/suit/jacket/letterman_syndie=1,/obj/item/clothing/under/jabroni=1, /obj/item/clothing/suit/vapeshirt=1, /obj/item/clothing/under/geisha=1) + /obj/item/clothing/suit/jacket/letterman_red=1, /obj/item/clothing/under/wintercasualwear=1, /obj/item/clothing/under/casualwear=1, /obj/item/clothing/under/casualhoodie=1, + /obj/item/clothing/under/casualhoodie/skirt=1) + contraband = list(/obj/item/clothing/under/syndicate/tacticool=1,/obj/item/clothing/mask/balaclava=1,/obj/item/clothing/head/ushanka=1,/obj/item/clothing/under/soviet=1,/obj/item/weapon/storage/belt/fannypack/black=2,/obj/item/clothing/suit/jacket/letterman_syndie=1,/obj/item/clothing/under/jabroni=1, /obj/item/clothing/suit/vapeshirt=1, /obj/item/clothing/under/geisha=1, + /obj/item/clothing/under/wedding/bride_orange=1, + /obj/item/clothing/under/wedding/bride_purple=1, + /obj/item/clothing/under/wedding/bride_blue=1, + /obj/item/clothing/under/wedding/bride_red=1, + /obj/item/clothing/under/wedding/bride_white=1, + /obj/item/clothing/under/keyholesweater=1, + /obj/item/clothing/suit/doshjacket=1, + /obj/item/clothing/under/squatter_outfit = 1, + /obj/item/clothing/head/squatter_hat = 1) premium = list(/obj/item/clothing/under/suit_jacket/checkered=1,/obj/item/clothing/head/mailman=1,/obj/item/clothing/under/rank/mailman=1,/obj/item/clothing/suit/jacket/leather=1,/obj/item/clothing/suit/jacket/leather/overcoat=1,/obj/item/clothing/under/pants/mustangjeans=1,/obj/item/clothing/neck/necklace/dope=3,/obj/item/clothing/suit/jacket/letterman_nanotrasen=1) refill_canister = /obj/item/weapon/vending_refill/clothing diff --git a/code/game/objects/items/weapons/vending_items.dm b/code/game/objects/items/weapons/vending_items.dm index 6646983ab9..949b3ce938 100644 --- a/code/game/objects/items/weapons/vending_items.dm +++ b/code/game/objects/items/weapons/vending_items.dm @@ -63,11 +63,11 @@ /obj/item/weapon/vending_refill/autodrobe machine_name = "AutoDrobe" icon_state = "refill_costume" - charges = list(31, 2, 3)// of 94 standard, 6 contraband, 9 premium - init_charges = list(27, 2, 3) + charges = list(54, 23, 3)// of 94 standard, 6 contraband, 9 premium + init_charges = list(54, 23, 3) /obj/item/weapon/vending_refill/clothing machine_name = "ClothesMate" icon_state = "refill_clothes" - charges = list(31, 4, 4)// of 101 standard, 12 contraband, 10 premium(?) - init_charges = list(31, 4, 4) + charges = list(35, 13, 4)// of 101 standard, 12 contraband, 10 premium(?) + init_charges = list(35, 13, 4)