diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml index 72864ba851..24b990df2e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml @@ -1,15 +1,19 @@ - type: vendingMachineInventory id: AtmosDrobeInventory startingInventory: - ClothingBackpackDuffelAtmospherics: 2 - ClothingBackpackSatchelAtmospherics: 2 - ClothingBackpackAtmospherics: 2 + ClothingBackpackDuffelAtmospherics: 3 + ClothingBackpackSatchelAtmospherics: 3 + ClothingBackpackAtmospherics: 3 + ClothingHeadHatBeretEngineering: 3 + ClothingHeadsetEngineering: 3 + ClothingNeckScarfStripedLightBlue: 3 + ClothingMaskGasAtmos: 3 + ClothingOuterWinterAtmos: 2 ClothingUniformJumpsuitAtmos: 3 ClothingUniformJumpskirtAtmos: 3 ClothingUniformJumpsuitAtmosCasual: 3 ClothingShoesColorWhite: 3 - ClothingHeadsetEngineering: 2 ClothingHeadHelmetFire: 2 ClothingOuterSuitFire: 2 - ClothingOuterWinterAtmos: 2 - ClothingNeckScarfStripedLightBlue: 3 + ClothingOuterSuitAtmosFire: 1 + ClothingHeadHelmetAtmosFire: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml index cbc71f85af..f3c738096a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml @@ -4,16 +4,15 @@ ClothingHeadHatBowlerHat: 2 ClothingHeadHatTophat: 2 ClothingEyesHudBeer: 2 - ClothingEyesEyepatchHudBeer: 1 + ClothingEyesGlassesSunglasses: 2 ClothingHeadsetService: 2 - ClothingOuterApronBar: 2 + ClothingOuterArmorBasicSlim: 2 ClothingOuterWinterBar: 2 + ClothingOuterVest: 2 ClothingUniformJumpsuitBartender: 2 ClothingUniformJumpskirtBartender: 2 ClothingUniformJumpsuitBartenderPurple: 2 - ClothingShoesColorBlack: 2 - ClothingOuterArmorBasicSlim: 2 - ClothingOuterVest: 2 ClothingBeltBandolier: 2 - ClothingEyesGlassesSunglasses: 2 - + ClothingShoesColorBlack: 2 + ClothingEyesEyepatchHudBeer: 1 + ClothingOuterApronBar: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index fd943a87de..3e442cd481 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -1,13 +1,13 @@ - type: vendingMachineInventory id: BoozeOMatInventory startingInventory: - DrinkGlass: 20 #Kept glasses at top for ease to differentiate from booze. + DrinkGlass: 20 DrinkShotGlass: 10 DrinkGlassCoupeShaped: 10 DrinkVacuumFlask: 5 DrinkFlaskBar: 5 DrinkShaker: 5 - CustomDrinkJug: 2 #to allow for custom drinks in the soda/booze dispensers + CustomDrinkJug: 2 DrinkAbsintheBottleFull: 2 DrinkAleBottleFull: 5 DrinkBeerBottleFull: 5 @@ -16,7 +16,7 @@ DrinkColaBottleFull: 4 DrinkCreamCarton: 5 DrinkGinBottleFull: 3 - DrinkGildlagerBottleFull: 2 #if champagne gets less because its premium, then gildlager should match this and have two + DrinkGildlagerBottleFull: 2 DrinkGrenadineBottleFull: 2 DrinkJuiceLimeCarton: 3 DrinkJuiceOrangeCarton: 3 @@ -34,7 +34,7 @@ DrinkVodkaBottleFull: 5 DrinkWhiskeyBottleFull: 5 DrinkWineBottleFull: 5 - DrinkChampagneBottleFull: 2 #because the premium drink + DrinkChampagneBottleFull: 2 Eftpos: 4 DrinkBeerCan: 5 DrinkWineCan: 5 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml index d1e80ba0c8..9326eb79a0 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml @@ -1,17 +1,18 @@ - type: vendingMachineInventory id: CargoDrobeInventory startingInventory: - ClothingBackpackCargo: 3 - ClothingBackpackSatchelCargo: 3 - ClothingBackpackDuffelCargo: 3 - ClothingUniformJumpsuitCargo: 3 - ClothingUniformJumpskirtCargo: 3 - ClothingShoesColorBlack: 3 - ClothingHandsGlovesFingerless: 3 - ClothingHeadHatCargosoft: 3 - ClothingHeadBandBrown: 3 - ClothingHeadsetCargo: 3 - ClothingOuterWinterCargo: 2 - ClothingOuterWinterMiner: 2 - ClothingNeckScarfStripedBrown: 3 + ClothingBackpackCargo: 4 + ClothingBackpackSatchelCargo: 4 + ClothingBackpackDuffelCargo: 4 + ClothingUniformJumpsuitCargo: 4 + ClothingUniformJumpskirtCargo: 4 + ClothingShoesColorBlack: 4 + ClothingHandsGlovesFingerless: 4 + ClothingHeadHatCargosoft: 4 + ClothingHeadBandBrown: 4 + ClothingHeadsetCargo: 4 + ClothingOuterWinterCargo: 4 + ClothingOuterWinterMiner: 4 + ClothingNeckScarfStripedBrown: 4 ClothingShoesBootsWinterCargo: 2 + diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml index cb0ef3246d..0d725a504e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml @@ -1,16 +1,16 @@ - type: vendingMachineInventory id: PTechInventory startingInventory: - PassengerPDA: 5 - ClearPDA: 5 - PassengerIDCard: 5 - ClothingHeadsetGrey: 5 + PassengerPDA: 7 + ClearPDA: 7 + PassengerIDCard: 7 + ClothingHeadsetGrey: 7 RubberStampApproved: 1 RubberStampDenied: 1 - Paper: 10 - EncryptionKeyCargo: 2 - EncryptionKeyEngineering: 2 - EncryptionKeyMedical: 2 - EncryptionKeyScience: 2 - EncryptionKeySecurity: 1 + Paper: 13 + EncryptionKeyCargo: 3 + EncryptionKeyEngineering: 3 + EncryptionKeyMedical: 3 + EncryptionKeyScience: 3 + EncryptionKeySecurity: 3 EncryptionKeyService: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml index 282f58535b..30e1c6b6a2 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml @@ -3,8 +3,7 @@ startingInventory: FoodCondimentPacketSoy: 5 FoodSnackCookieFortune: 5 - DrinkRamen: 3 - DrinkHellRamen: 3 - FoodSnackChowMein: 3 - FoodSnackDanDanNoodles: 3 -# rice? + DrinkRamen: 5 + DrinkHellRamen: 5 + FoodSnackChowMein: 5 + FoodSnackDanDanNoodles: 5 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml index 3877701036..558e8e2b5e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml @@ -1,34 +1,31 @@ - type: vendingMachineInventory id: PietyVendInventory startingInventory: + ClothingUniformJumpsuitChaplain: 2 + ClothingUniformJumpskirtChaplain: 2 + ClothingUniformJumpsuitMonasticRobeDark: 2 + ClothingUniformJumpsuitMonasticRobeLight: 2 + ClothingOuterHoodieChaplain: 2 + ClothingOuterHoodieBlack: 2 + ClothingHeadHatHoodChaplainHood: 2 + ClothingHeadHatHoodNunHood: 2 + ClothingOuterNunRobe: 2 + ClothingHeadHatFez: 2 + ClothingHeadHatPlaguedoctor: 2 + ClothingHeadHatWitch: 2 + ClothingHeadHatWitch1: 2 + ClothingOuterPlagueSuit: 2 + ClothingMaskPlague: 2 + ClothingHeadsetService: 2 ClothingNeckNecklaceSilver: 2 ClothingNeckNecklaceGold: 1 ClothingNeckNecklaceTech: 1 - ClothingUniformJumpsuitChaplain: 2 - ClothingUniformJumpskirtChaplain: 2 - ClothingUniformJumpsuitMonasticRobeDark: 1 - ClothingUniformJumpsuitMonasticRobeLight: 1 ClothingNeckStoleChaplain: 1 - ClothingOuterHoodieChaplain: 1 - ClothingOuterHoodieBlack: 1 - ClothingHeadHatHoodNunHood: 1 - ClothingOuterNunRobe: 1 - ClothingHeadHatFez: 1 - ClothingHeadHatPlaguedoctor: 1 - ClothingHeadHatWitch: 1 - ClothingHeadHatWitch1: 1 - ClothingOuterPlagueSuit: 1 - ClothingMaskPlague: 1 - ClothingHeadsetService: 2 BoxCandle: 2 BoxCandleSmall: 2 Urn: 5 emaggedInventory: - #ClothingOuterArmorCult: 1 - #ClothingHeadHelmetCult: 1 - #ClothingOuterRobesCult: 3 - #ClothingHeadHatHoodCulthood: 3 - #ClothingShoesCult: 4 BedsheetCult: 4 + BibleNecronomicon: 1 ClothingNeckScarfStripedBlack: 3 ClothingNeckNecklaceUnholy: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml index 4379a97896..eb42b1c41e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml @@ -2,10 +2,10 @@ id: ChefDrobeInventory startingInventory: ClothingHeadsetService: 2 - ClothingOuterApronChef: 3 + ClothingOuterApronChef: 2 ClothingOuterWinterChef: 2 - ClothingOuterJacketChef: 1 - ClothingUniformJumpsuitChef: 1 + ClothingOuterJacketChef: 2 + ClothingUniformJumpsuitChef: 2 ClothingMaskItalianMoustache: 2 ClothingUniformJumpskirtChef: 2 ClothingHeadHatChef: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml index 1078654704..0437cf3a94 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml @@ -6,18 +6,23 @@ ReagentContainerSugar: 2 ReagentContainerRice: 2 FoodCondimentPacketSalt: 4 + FoodCondimentPacketPepper: 4 FoodCondimentBottleEnzyme: 2 - FoodCondimentBottleHotsauce: 1 - FoodCondimentBottleKetchup: 1 - FoodCondimentBottleBBQ: 1 + FoodCondimentBottleHotsauce: 2 + FoodCondimentBottleKetchup: 2 + FoodCondimentBottleBBQ: 2 FoodCondimentBottleVinegar: 2 ReagentContainerOliveoil: 2 + FoodContainerEgg: 2 + ReagentContainerMilk: 3 + ReagentContainerMilkSoy: 3 + MonkeyCubeBox: 1 ReagentContainerMayo: 1 VariantCubeBox: 1 - FoodContainerEgg: 1 DrinkMilkCarton: 2 DrinkSoyMilkCarton: 1 FoodButter: 4 FoodCheese: 1 FoodMeat: 6 Eftpos: 4 + diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml index d028c55cab..0f148a26ba 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml @@ -1,15 +1,16 @@ - type: vendingMachineInventory id: ChemDrobeInventory startingInventory: - ClothingUniformJumpsuitChemistry: 2 - ClothingUniformJumpskirtChemistry: 2 - ClothingOuterCoatLabChem: 2 - ClothingShoesColorWhite: 2 - ClothingBackpackChemistry: 2 - ClothingBackpackSatchelChemistry: 2 - ClothingBackpackDuffelChemistry: 2 - ChemBag: 2 - ClothingBeltMedical: 2 - ClothingHandsGlovesLatex: 2 - ClothingHeadsetMedical: 2 - ClothingOuterWinterChem: 2 + ClothingBackpackChemistry: 3 + ClothingBackpackSatchelChemistry: 3 + ClothingBackpackDuffelChemistry: 3 + ClothingHeadHatBeretBrigmedic: 3 + ClothingHeadsetMedical: 3 + ClothingOuterWinterChem: 3 + ClothingOuterCoatLabChem: 3 + ClothingUniformJumpsuitChemistry: 3 + ClothingUniformJumpskirtChemistry: 3 + ClothingHandsGlovesLatex: 3 + ChemBag: 3 + ClothingBeltMedical: 3 + ClothingShoesColorWhite: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml index 4b21e05235..a642e84d82 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml @@ -1,18 +1,19 @@ - type: vendingMachineInventory id: CigaretteMachineInventory startingInventory: - CigPackGreen: 2 - CigPackRed: 2 - CigPackBlue: 2 - CigPackBlack: 2 - CigPackMixed: 2 + CigPackGreen: 3 + CigPackRed: 3 + CigPackBlue: 3 + CigPackBlack: 3 CigarCase: 1 - SmokingPipeFilledTobacco: 1 + SmokingPipeFilledTobacco: 3 Vape: 1 Matchbox: 5 PackPaperRollingFilters: 3 - CheapLighter: 4 + CheapLighter: 5 Lighter: 2 + CigPackMixed: 2 FlippoLighter: 2 + emaggedInventory: - CigPackSyndicate: 1 + CigPackSyndicate: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 71780f6d82..314d58de13 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -3,75 +3,104 @@ startingInventory: ClothingBackpack: 5 ClothingBackpackDuffel: 5 - ClothingBackpackSatchel: 3 - ClothingBackpackSatchelLeather: 2 - ClothingHeadHatBeret: 4 - ClothingHeadBandBlack: 2 - ClothingHeadBandBlue: 2 - ClothingHeadBandGreen: 2 - ClothingHeadBandRed: 2 - ClothingHeadBandSkull: 2 - ClothingHeadHatGreyFlatcap: 3 - ClothingHeadHatBrownFlatcap: 3 + ClothingBackpackSatchel: 5 + ClothingBackpackSatchelLeather: 5 + ClothingBeltStorageWaistbag: 5 + ClothingHeadBandBlack: 3 + ClothingHeadBandBlue: 3 + ClothingHeadBandGreen: 3 + ClothingHeadBandRed: 3 + ClothingHeadBandSkull: 3 ClothingUniformJumpsuitColorGrey: 8 ClothingUniformJumpskirtColorGrey: 8 ClothingUniformJumpsuitColorWhite: 3 ClothingUniformJumpskirtColorWhite: 3 - ClothingUniformJumpsuitColorBlack: 3 - ClothingUniformJumpskirtColorBlack: 3 - ClothingUniformJumpsuitColorBlue: 2 - ClothingUniformJumpskirtColorBlue: 2 - ClothingUniformJumpsuitColorYellow: 2 - ClothingUniformJumpskirtColorYellow: 2 - ClothingUniformJumpsuitColorGreen: 2 - ClothingUniformJumpskirtColorGreen: 2 - ClothingUniformJumpsuitColorOrange: 2 - ClothingUniformJumpskirtColorOrange: 2 - ClothingUniformJumpsuitColorRed: 2 - ClothingUniformJumpskirtColorRed: 2 - ClothingUniformJumpsuitColorPurple: 2 - ClothingUniformJumpskirtColorPurple: 2 - ClothingUniformJumpsuitColorPink: 2 - ClothingUniformJumpskirtColorPink: 2 - ClothingUniformJumpsuitColorDarkBlue: 2 - ClothingUniformJumpskirtColorDarkBlue: 2 - ClothingUniformJumpsuitColorDarkGreen: 2 - ClothingUniformJumpskirtColorDarkGreen: 2 - ClothingUniformJumpsuitColorTeal: 2 - ClothingUniformJumpskirtColorTeal: 2 + ClothingUniformJumpsuitColorBlue: 3 + ClothingUniformJumpskirtColorBlue: 3 + ClothingUniformJumpsuitColorYellow: 3 + ClothingUniformJumpskirtColorYellow: 3 + ClothingUniformJumpsuitColorGreen: 3 + ClothingUniformJumpskirtColorGreen: 3 + ClothingUniformJumpsuitColorOrange: 3 + ClothingUniformJumpskirtColorOrange: 3 + ClothingUniformJumpsuitColorRed: 3 + ClothingUniformJumpskirtColorRed: 3 + ClothingUniformJumpsuitColorPurple: 3 + ClothingUniformJumpskirtColorPurple: 3 + ClothingUniformJumpsuitColorPink: 3 + ClothingUniformJumpskirtColorPink: 3 + ClothingUniformJumpsuitColorDarkBlue: 3 + ClothingUniformJumpskirtColorDarkBlue: 3 + ClothingUniformJumpsuitColorTeal: 3 + ClothingUniformJumpskirtColorTeal: 3 + ClothingShoesColorBlack: 8 + ClothingShoesColorBrown: 3 + ClothingShoesColorWhite: 3 + ClothingShoesColorBlue: 3 + ClothingShoesColorYellow: 3 + ClothingShoesColorGreen: 3 + ClothingShoesColorOrange: 3 + ClothingShoesColorRed: 3 + ClothingShoesColorPurple: 3 + ClothingHeadHatGreysoft: 8 + ClothingHeadHatMimesoft: 3 + ClothingHeadHatBluesoft: 3 + ClothingHeadHatYellowsoft: 3 + ClothingHeadHatGreensoft: 3 + ClothingHeadHatOrangesoft: 3 + ClothingHeadHatRedsoft: 3 + ClothingHeadHatPurplesoft: 3 + ClothingHeadHatCorpsoft: 3 + ClothingNeckScarfStripedLightBlue: 2 + ClothingNeckScarfStripedBlue: 2 + ClothingNeckScarfStripedRed: 2 + ClothingNeckScarfStripedOrange: 2 + ClothingNeckScarfStripedBrown: 2 + ClothingNeckScarfStripedPurple: 2 + ClothingNeckScarfStripedBlack: 2 + ClothingMaskNeckGaiter: 1 ClothingUniformJumpsuitHawaiBlack: 2 ClothingUniformJumpsuitHawaiBlue: 2 ClothingUniformJumpsuitHawaiRed: 2 ClothingUniformJumpsuitHawaiYellow: 2 ClothingUniformJumpsuitFlannel: 2 + #WD edit start + ClothingUniformJumpsuitCossack: 1 + ClothingOuterCoatBomber: 1 + ClothingOuterWinterCoat: 1 + ClothingOuterCoatGentle: 1 + ClothingOuterCoatInspector: 1 + ClothingUniformJumpsuitKimono: 1 + ClothingOuterPonchoClassic: 1 + ClothingOuterHoodieGrey: 1 + ClothingOuterApron: 1 + ClothingHeadHatHetmanHat: 1 + ClothingHeadHatFedoraGrey: 1 + ClothingHeadHatFedoraBrown: 1 + ClothingHeadHatTophat: 1 + ClothingHeadHatBeaverHat: 1 + ClothingHeadHatUshanka: 1 + ClothingHeadSafari: 1 + ClothingHeadFishCap: 2 + ClothingHeadHatCasa: 1 + ClothingHeadHatFez: 1 + ClothingHeadRastaHat: 1 + ClothingEyesEyepatch: 1 + ClothingShoesLeather: 1 + ClothingHeadHatBeret: 4 + ClothingHeadHatGreyFlatcap: 3 + ClothingHeadHatBrownFlatcap: 3 + ClothingUniformJumpsuitColorBlack: 3 + ClothingUniformJumpskirtColorBlack: 3 + ClothingUniformJumpsuitColorDarkGreen: 2 + ClothingUniformJumpskirtColorDarkGreen: 2 ClothingUniformJumpsuitCasualBlue: 2 ClothingUniformJumpskirtCasualBlue: 2 ClothingUniformJumpsuitCasualPurple: 2 ClothingUniformJumpskirtCasualPurple: 2 ClothingUniformJumpsuitCasualRed: 2 ClothingUniformJumpskirtCasualRed: 2 - ClothingShoesColorBlack: 8 - ClothingShoesColorBrown: 4 - ClothingShoesColorWhite: 3 - ClothingShoesColorBlue: 2 - ClothingShoesColorYellow: 2 - ClothingShoesColorGreen: 2 - ClothingShoesColorOrange: 2 - ClothingShoesColorRed: 2 - ClothingShoesColorPurple: 2 - ClothingHeadHatGreysoft: 8 - ClothingHeadHatMimesoft: 3 - ClothingHeadHatBluesoft: 2 - ClothingHeadHatYellowsoft: 2 - ClothingHeadHatGreensoft: 2 - ClothingHeadHatOrangesoft: 2 - ClothingHeadHatRedsoft: 2 ClothingHeadHatBlacksoft: 2 - ClothingHeadHatPurplesoft: 2 - ClothingHeadHatCorpsoft: 2 - ClothingHeadFishCap: 2 - ClothingHeadRastaHat: 2 - ClothingBeltStorageWaistbag: 3 ClothingEyesGlasses: 6 ClothingEyesGlassesSunglasses: 2 ClothingHandsGlovesColorBlack: 4 @@ -83,6 +112,7 @@ ClothingHandsGlovesColorGreen: 2 ClothingHandsGlovesColorOrange: 2 ClothingHandsGlovesColorPurple: 2 + #White bra start ClothingUnderwearTopBraWhite: 5 ClothingUnderwearTopBraSports: 5 @@ -150,9 +180,3 @@ ClothingUnderwearSocksStripedThigh: 2 ClothingUnderwearSocksThinKnee: 1 ClothingUnderwearSocksThinThigh: 1 - # white end - contrabandInventory: - ClothingMaskNeckGaiter: 2 - ClothingUniformJumpsuitTacticool: 1 - ClothingUniformJumpskirtTacticool: 1 - diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml index 2f9ce3d3ae..acf569ec0d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml @@ -1,12 +1,13 @@ - type: vendingMachineInventory id: RobustSoftdrinksInventory startingInventory: - DrinkColaCan: 4 - DrinkGrapeCan: 2 - DrinkRootBeerCan: 2 - DrinkIcedTeaCan: 2 - DrinkLemonLimeCan: 2 - DrinkFourteenLokoCan: 2 + DrinkColaCan: 6 + DrinkGrapeCan: 4 + DrinkRootBeerCan: 4 + DrinkIcedTeaCan: 4 + DrinkLemonLimeCan: 4 + DrinkDrGibbCan: 4 + DrinkFourteenLokoCan: 4 + DrinkColaBottleFull: 2 emaggedInventory: DrinkNukieCan: 2 - DrinkChangelingStingCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml index f45dd229a2..0d76415a6e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml @@ -1,16 +1,24 @@ - type: vendingMachineInventory id: DetDrobeInventory startingInventory: + ClothingBackpackSatchelLeather: 2 + ClothingHeadHatFedoraGrey: 2 + ClothingHeadHatFedoraBrown: 2 + ClothingHeadsetSecurity: 2 ClothingUniformJumpsuitDetective: 2 ClothingUniformJumpskirtDetective: 2 - ClothingShoesColorBrown: 2 ClothingOuterCoatDetective: 2 - ClothingHeadHatFedoraBrown: 2 + ClothingOuterVestDetective: 2 + ClothingOuterCoatGentle: 1 + ClothingOuterCoatInspector: 1 + ClothingOuterCoatJensen: 1 ClothingUniformJumpsuitDetectiveGrey: 2 ClothingUniformJumpskirtDetectiveGrey: 2 - ClothingOuterVestDetective: 2 ClothingNeckTieDet: 2 - ClothingHeadHatFedoraGrey: 2 + ClothingShoesLeather: 2 + ClothingShoesColorBrown: 2 ClothingHandsGlovesColorBlack: 2 ClothingHandsGlovesLatex: 2 - ClothingHeadsetSecurity: 2 + CigPackGreen: 4 + SmokingPipeFilledTobacco: 1 + Matchbox: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml index 86f35b5269..49cc7b2486 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml @@ -1,7 +1,7 @@ - type: vendingMachineInventory id: DinnerwareInventory startingInventory: - ButchCleaver: 1 + ButchCleaver: 2 KitchenKnife: 5 RollingPin: 4 Spoon: 4 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml index ddf7943217..4a405be40e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml @@ -1,9 +1,8 @@ - type: vendingMachineInventory id: DiscountDansInventory startingInventory: - FoodSnackCheesie: 3 - FoodSnackChips: 3 - FoodSnackBoritos: 3 - FoodSnackPopcorn: 3 - FoodSnackEnergy: 3 - CigPackMixed: 2 + FoodSnackCheesie: 4 + FoodSnackChips: 4 + FoodSnackBoritos: 4 + FoodSnackPopcorn: 4 + FoodSnackEnergy: 4 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml index 16dc3e628f..e9e7fc1d87 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml @@ -1,9 +1,19 @@ - type: vendingMachineInventory id: DonutInventory startingInventory: - FoodDonutChocolate: 5 - FoodDonutApple: 3 - FoodDonutPink: 3 - FoodDonutBungo: 3 + #WD edit start + FoodDonutPlain: 3 + FoodDonutPink: 2 + FoodDonutChocolate: 2 + FoodDonutCaramel: 2 + FoodDonutApple: 2 + FoodDonutBlumpkin: 2 + FoodDonutMeat: 2 + FoodDonutSpaceman: 2 + FoodDonutBungo: 2 + FoodDonutJellySlugcat: 1 emaggedInventory: - FoodDonutPoison: 1 + FoodDonutPoison: 3 + contrabandInventory: + FoodDonutHomer: 2 + #WD edit end diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml index 5d732def49..39df003b20 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml @@ -1,18 +1,20 @@ - type: vendingMachineInventory id: EngiDrobeInventory startingInventory: - ClothingBackpackDuffelEngineering: 3 - ClothingBackpackSatchelEngineering: 3 - ClothingBackpackEngineering: 3 - ClothingUniformJumpsuitEngineering: 3 - ClothingUniformJumpskirtEngineering: 3 - ClothingUniformJumpsuitEngineeringHazard: 3 - ClothingShoesColorBlack: 3 - ClothingOuterVestHazard: 3 - ClothingShoesBootsWork: 3 - ClothingHeadHatHardhatYellow: 3 - ClothingHeadHatHardhatOrange: 3 - ClothingHeadsetEngineering: 3 - ClothingOuterWinterEngi: 2 - ClothingNeckScarfStripedOrange: 3 + ClothingBackpackDuffelEngineering: 5 + ClothingBackpackSatchelEngineering: 5 + ClothingBackpackEngineering: 5 + ClothingHeadHatBeretEngineering: 5 + ClothingHeadHatHardhatYellow: 5 + ClothingHeadHatHardhatOrange: 5 + ClothingHeadsetEngineering: 5 + ClothingNeckScarfStripedOrange: 5 + ClothingOuterVestHazard: 5 + ClothingOuterWinterEngi: 5 + ClothingUniformJumpsuitEngineering: 5 + ClothingUniformJumpskirtEngineering: 5 + ClothingUniformJumpsuitEngineeringHazard: 5 + ClothingBeltUtility: 5 + ClothingShoesColorBlack: 5 + ClothingShoesBootsWork: 5 ClothingShoesBootsWinterEngi: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml index c91eb1ef2e..30d36ff3af 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml @@ -7,4 +7,8 @@ NetworkConfigurator: 5 PowerCellMedium: 5 ClothingHandsGlovesColorYellow: 6 - BoxInflatable: 2 + HolofanProjector: 5 + trayScanner: 5 + GeigerCounter: 5 + InflatableWallStack1: 24 + InflatableDoorStack1: 8 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml index f022b4b9a5..baca83007a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml @@ -16,3 +16,5 @@ PaperCNCSheet: 6 MysteryFigureBox: 2 BooksBag: 3 + emaggedInventory: + BalloonSyn: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/genedrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/genedrobe.yml index 84a5f9a79b..a3dd6f9482 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/genedrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/genedrobe.yml @@ -1,11 +1,12 @@ - type: vendingMachineInventory id: GeneDrobeInventory startingInventory: - ClothingUniformJumpsuitGenetics: 2 - ClothingUniformJumpskirtGenetics: 2 - ClothingShoesColorWhite: 2 - ClothingOuterCoatLabGene: 2 - ClothingOuterWinterGen: 2 ClothingBackpackGenetics: 2 ClothingBackpackSatchelGenetics: 2 ClothingBackpackDuffelGenetics: 2 + ClothingHeadHatBeretBrigmedic: 2 + ClothingOuterCoatLabGene: 2 + ClothingOuterWinterGen: 2 + ClothingUniformJumpsuitGenetics: 2 + ClothingUniformJumpskirtGenetics: 2 + ClothingShoesColorWhite: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml index 50695edc19..6d271466ce 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml @@ -2,7 +2,7 @@ id: HappyHonkDispenserInventory startingInventory: HappyHonk: 10 - HappyHonkMime: 4 + HappyHonkMime: 10 emaggedInventory: - HappyHonkCluwne: 1 - HappyHonkNukie: 1 + HappyHonkCluwne: 3 + HappyHonkNukie: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml index 470abda91e..fd24fedc14 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml @@ -1,15 +1,17 @@ - type: vendingMachineInventory id: HyDrobeInventory startingInventory: - ClothingBackpackHydroponics: 2 - ClothingBackpackSatchelHydroponics: 2 - ClothingBackpackDuffelHydroponics: 2 - ClothingOuterApronBotanist: 2 + ClothingBackpackHydroponics: 3 + ClothingBackpackSatchelHydroponics: 3 + ClothingBackpackDuffelHydroponics: 3 + ClothingHeadBandBotany: 3 + ClothingHeadsetService: 3 + ClothingOuterWinterHydro: 3 + ClothingOuterApronBotanist: 3 + ClothingBeltPlant: 3 ClothingUniformOveralls: 3 ClothingUniformJumpsuitHydroponics: 3 ClothingUniformJumpskirtHydroponics: 3 + ClothingHandsGlovesLeather: 3 + ClothingShoesColorGreen: 3 ClothingNeckScarfStripedGreen: 3 - ClothingHeadBandBotany: 3 - ClothingHeadsetService: 2 - ClothingOuterWinterHydro: 2 - diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml index b585d34051..ae465470d4 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml @@ -1,16 +1,15 @@ - type: vendingMachineInventory id: JaniDrobeInventory startingInventory: - ClothingUniformJumpsuitJanitor: 2 - ClothingUniformJumpskirtJanitor: 2 + ClothingBackpack: 4 + ClothingHeadHatPurplesoft: 4 + ClothingHeadsetService: 4 + ClothingNeckScarfStripedPurple: 4 + ClothingOuterWinterJani: 4 + ClothingUniformJumpsuitJanitor: 4 + ClothingUniformJumpskirtJanitor: 4 + ClothingBeltJanitor: 4 + ClothingHandsGlovesColorBlack: 4 + ClothingShoesGaloshes: 2 + ClothingShoesColorBlack: 4 ClothingHandsGlovesJanitor: 2 - ClothingShoesColorBlack: 2 - ClothingHeadHatPurplesoft: 2 - ClothingBeltJanitor: 2 - ClothingHeadsetService: 2 - ClothingOuterWinterJani: 2 - ClothingNeckScarfStripedPurple: 3 - - emaggedInventory: - ClothingUniformJumpskirtJanimaid: 2 - ClothingUniformJumpskirtJanimaidmini: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml index 8f39a102a8..56b892a804 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml @@ -1,19 +1,24 @@ - type: vendingMachineInventory id: LawDrobeInventory startingInventory: - ClothingUniformJumpsuitLawyerBlue: 1 - ClothingUniformJumpskirtLawyerBlue: 1 - ClothingUniformJumpsuitLawyerPurple: 1 - ClothingUniformJumpskirtLawyerPurple: 1 - ClothingUniformJumpsuitLawyerRed: 1 - ClothingUniformJumpskirtLawyerRed: 1 - ClothingUniformJumpsuitLawyerBlack: 1 - ClothingUniformJumpskirtLawyerBlack: 1 - ClothingUniformJumpsuitLawyerGood: 1 - ClothingUniformJumpskirtLawyerGood: 1 - ClothingShoesBootsLaceup: 2 + ClothingBackpack: 2 ClothingHeadsetService: 2 + ClothingEyesGlassesSunglasses: 2 + ClothingEyesGlasses: 2 ClothingNeckLawyerbadge: 2 + ClothingUniformJumpsuitLawyerBlue: 2 + ClothingUniformJumpskirtLawyerBlue: 2 + ClothingUniformJumpsuitLawyerPurple: 2 + ClothingUniformJumpskirtLawyerPurple: 2 + ClothingUniformJumpsuitLawyerRed: 2 + ClothingUniformJumpskirtLawyerRed: 2 + ClothingUniformJumpsuitLawyerBlack: 2 + ClothingUniformJumpskirtLawyerBlack: 2 + ClothingUniformJumpsuitLawyerGood: 2 + ClothingUniformJumpskirtLawyerGood: 2 + ClothingHandsGlovesColorWhite: 2 + ClothingShoesBootsLaceup: 2 + RubberStampLawyer: 1 Eftpos: 3 emaggedInventory: CyberPen: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml index 7617186dd9..8125fa0dc4 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml @@ -9,6 +9,3 @@ ClothingHeadHatVioletwizard: 3 ClothingOuterWizardViolet: 3 ClothingShoesWizard: 9 - #TO DO: - #only missing staff - #and if wizarditis reagent when hacked if we want this. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml index 09c7ba7f99..df23526d30 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml @@ -5,6 +5,12 @@ Brutepack: 5 Ointment: 5 Bloodpack: 5 + Gauze: 5 EpinephrineChemistryBottle: 3 Syringe: 5 - Eftpos: 2 #WD edit + EmergencyMedipen: 2 + SyringeBicaridine: 1 + SyringeDermaline: 1 + Eftpos: 2 + emaggedInventory: + SyringeEphedrine: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml index a511b08d65..f4d80b5d5c 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml @@ -4,18 +4,29 @@ ClothingBackpackDuffelMedical: 4 ClothingBackpackMedical: 4 ClothingBackpackSatchelMedical: 4 + ClothingHeadHelmetVoidParamed: 2 + ClothingOuterHardsuitVoidParamed: 2 + ClothingHeadHatBeretBrigmedic: 4 + ClothingHeadNurseHat: 4 + ClothingHeadHatParamedicsoft: 4 + ClothingHeadsetMedical: 4 + ClothingEyesHudMedical: 5 + ClothingMaskSterile: 4 + ClothingOuterWinterMed: 4 + ClothingOuterWinterPara: 4 + ClothingOuterCoatParamedicWB: 4 + ClothingOuterCoatLab: 4 + ClothingUniformJumpsuitParamedic: 4 + ClothingUniformJumpskirtParamedic: 4 + ClothingHandsGlovesLatex: 4 + ClothingShoesColorWhite: 9 + ClothingOuterHospitalGown: 5 + UniformScrubsColorGreen: 5 + UniformScrubsColorBlue: 5 + UniformScrubsColorPurple: 5 ClothingUniformJumpsuitMedicalDoctor: 4 ClothingUniformJumpskirtMedicalDoctor: 4 ClothingEyesEyepatchHudMedical: 1 ClothingHeadHatBeretMedic: 4 - ClothingHeadNurseHat: 4 - ClothingOuterCoatLab: 4 - ClothingShoesColorWhite: 4 - ClothingHandsGlovesLatex: 4 - ClothingHeadsetMedical: 4 - ClothingOuterWinterMed: 2 - ClothingOuterHospitalGown: 5 - UniformScrubsColorGreen: 4 - UniformScrubsColorBlue: 4 - UniformScrubsColorPurple: 4 ClothingShoesBootsWinterMed: 2 + diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml index 08b400518d..614a018c87 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml @@ -7,17 +7,16 @@ HydroponicsToolScythe: 4 HydroponicsToolHatchet: 4 PlantBag: 4 - HandheldSeedAnalyzer: 4 PlantBGoneSpray: 20 WeedSpray: 20 PestSpray: 20 Syringe: 5 - RobustHarvestChemistryBottle: 3 - EZNutrientChemistryBottle: 3 - Bucket: 3 + RobustHarvestChemistryBottle: 5 + Bucket: 5 DiseaseSwab: 20 - Eftpos: 4 #WD edit - #TO DO: - #plant analyzer + HandheldSeedAnalyzer: 4 + EZNutrientChemistryBottle: 3 + Eftpos: 4 + emaggedInventory: Left4ZedChemistryBottle: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml index 96513fca8a..800865c859 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml @@ -1,13 +1,13 @@ - type: vendingMachineInventory id: PwrGameInventory startingInventory: - DrinkPwrGameCan: 4 - DrinkEnergyDrinkCan: 4 - DrinkGrapeCan: 2 - DrinkRootBeerCan: 2 - DrinkIcedTeaCan: 2 - DrinkLemonLimeCan: 2 - DrinkFourteenLokoCan: 2 + DrinkPwrGameCan: 5 + DrinkEnergyDrinkCan: 5 + DrinkGrapeCan: 5 + DrinkRootBeerCan: 5 + DrinkIcedTeaCan: 5 + DrinkLemonLimeCan: 5 + DrinkDrGibbCan: 5 + DrinkFourteenLokoCan: 5 emaggedInventory: DrinkNukieCan: 2 - DrinkChangelingStingCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml index abccb7e714..969dee34fb 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml @@ -1,12 +1,15 @@ - type: vendingMachineInventory id: RoboDrobeInventory startingInventory: - ClothingOuterCoatRobo: 2 - ClothingUniformJumpsuitRoboticist: 2 - ClothingUniformJumpskirtRoboticist: 2 - ClothingShoesColorBlack: 2 - ClothingHandsGlovesRobohands: 2 ClothingHeadHatCorpsoft: 2 ClothingHeadBandSkull: 2 ClothingHeadsetRobotics: 2 + ClothingEyesHudDiagnostic: 2 ClothingOuterWinterRobo: 2 + ClothingOuterCoatRobo: 2 + ClothingUniformJumpsuitRoboticist: 2 + ClothingUniformJumpskirtRoboticist: 2 + ClothingHandsGlovesFingerless: 2 + ClothingShoesColorBlack: 2 + ClothingHandsGlovesRobohands: 2 + diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml index 077aa2dca4..16a1d8dc78 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml @@ -1,19 +1,19 @@ - type: vendingMachineInventory id: RoboticsInventory startingInventory: - CableApcStack: 4 + CableApcStack: 10 + ProximitySensor: 10 + RemoteSignaller: 10 SciFlash: 4 - ProximitySensor: 3 ClothingEyesHudDiagnostic: 2 - RemoteSignaller: 3 - Igniter: 3 # its more ordnance but yeah + Igniter: 3 HandheldHealthAnalyzer: 3 Scalpel: 2 SawElectric: 2 - #Bonesetter: 2 add when robotics NitrousOxideTankFilled: 2 ClothingMaskBreathMedical: 5 ClothingHeadHatWeldingMaskFlame: 1 Welder: 1 Screwdriver: 2 Crowbar: 2 + diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml index b5665df37b..63ce6940da 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml @@ -1,15 +1,24 @@ - type: vendingMachineInventory id: SalvageEquipmentInventory startingInventory: - Crowbar: 2 - Pickaxe: 4 - OreBag: 4 - Flare: 4 - FlashlightLantern: 2 - Floodlight: 2 - HandheldGPSBasic: 2 - RadioHandheld: 2 WeaponProtoKineticAccelerator: 4 - SeismicCharge: 2 - FultonBeacon: 1 - Fulton: 2 + WeaponCrusher: 4 + WeaponCrusherDagger: 4 + WeaponGrapplingGun: 3 + HandheldGPSBasic: 10 + Crowbar: 6 + BoxMRE: 6 + Pickaxe: 6 + SurvivalKnife: 3 + OreBag: 6 + Flare: 20 + FlashlightLantern: 6 + Floodlight: 2 + RadioHandheld: 10 + StackHolderHealingItem: 2 + InflatableWallStack1: 40 + InflatableDoorStack1: 10 + SeismicCharge: 3 + FultonBeacon: 2 + Fulton: 3 + diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml index 9827d02284..4f433bd84d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml @@ -1,17 +1,23 @@ - type: vendingMachineInventory id: SciDrobeInventory startingInventory: - ClothingBackpackScience: 3 - ClothingBackpackSatchelScience: 3 - ClothingBackpackDuffelScience: 3 - ClothingUniformJumpsuitScientist: 3 - ClothingUniformJumpskirtScientist: 3 - ClothingUniformJumpsuitScientistFormal: 3 - ClothingOuterCoatRnd: 3 - ClothingShoesColorWhite: 3 - ClothingNeckTieSci: 3 - ClothingHeadsetScience: 3 - ClothingMaskGas: 3 - ClothingOuterWinterSci: 2 - ClothingNeckScarfStripedPurple: 3 + ClothingBackpackScience: 6 + ClothingBackpackSatchelScience: 6 + ClothingBackpackDuffelScience: 6 + ClothingHeadHatBeretRND: 6 + ClothingHeadsetScience: 6 + ClothingMaskGas: 6 + ClothingNeckScarfStripedPurple: 6 + ClothingNeckTieSci: 6 + ClothingOuterCoatRnd: 6 + ClothingOuterWinterSci: 6 + ClothingUniformJumpsuitScientist: 6 + ClothingUniformJumpskirtScientist: 6 + ClothingUniformJumpsuitScientistFormal: 6 + ClothingHandsGlovesLatex: 6 + ClothingShoesColorWhite: 6 + ClothingOuterBioScientist: 2 + ClothingHeadHatHoodBioScientist: 2 ClothingShoesBootsWinterSci: 2 + + diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index cd72ef973e..a09b6efc20 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -1,27 +1,29 @@ - type: vendingMachineInventory id: SecTechInventory startingInventory: - SecurityWhistle: 5 Handcuffs: 8 + Zipties: 12 GrenadeFlashBang: 4 - TearGasGrenade: 4 - ClusterBangFull: 2 + TearSmokeGrenade: 4 + SmokeGrenade: 6 GrenadeStinger: 4 - Flash: 5 - Tourniquet: 5 - Bola: 5 + Flash: 7 + Bola: 7 FlashlightSeclite: 5 ClothingEyesGlassesSunglasses: 2 - ClothingEyesHudSecurity: 2 - ClothingEyesEyepatchHudSecurity: 1 - ClothingEyesGlassesSecurity: 4 ClothingBeltSecurityWebbing: 5 - Zipties: 12 RiotShield: 2 RiotLaserShield: 2 RiotBulletShield: 2 - # security officers need to follow a diet regimen! + SecurityWhistle: 5 + TearGasGrenade: 4 + ClusterBangFull: 2 + Tourniquet: 5 + contrabandInventory: FoodDonutHomer: 12 FoodBoxDonut: 2 - #box evidence + + emaggedInventory: + ExGrenade: 1 + Truncheon: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index fb269ddc43..b3634d4dab 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -1,26 +1,27 @@ - type: vendingMachineInventory id: SecDrobeInventory startingInventory: - ClothingBackpackSecurity: 3 - ClothingBackpackSatchelSecurity: 3 - ClothingBackpackDuffelSecurity: 3 - ClothingUniformJumpsuitSec: 3 - ClothingShoesBootsJack: 3 - ClothingHeadHatBeretSecurity: 3 - ClothingHeadHatSecsoft: 3 - ClothingHeadBandRed: 3 - ClothingHandsGlovesColorBlack: 3 - ClothingHandsGlovesFingerless: 3 - ClothingUniformJumpskirtSec: 3 - ClothingUniformJumpsuitSecGrey: 3 - ClothingUniformJumpskirtSecGrey: 3 - ClothingUniformJumpsuitSecBlue: 3 - ClothingHeadsetSecurity: 3 - ClothingOuterWinterSec: 2 + ClothingBackpackSecurity: 4 + ClothingBackpackSatchelSecurity: 4 + ClothingBackpackDuffelSecurity: 4 + ClothingHeadHatBeret: 4 + ClothingHeadHatSecsoft: 4 + ClothingHeadBandRed: 4 + ClothingHeadsetSecurity: 4 + ClothingEyesGlassesSecurity: 4 + ClothingOuterWinterSec: 4 ClothingOuterArmorBasic: 4 + ClothingUniformJumpsuitSec: 4 + ClothingUniformJumpskirtSec: 4 + ClothingUniformJumpsuitSecGrey: 4 + ClothingUniformJumpsuitSecBlue: 4 + ClothingHandsGlovesColorBlack: 4 + ClothingShoesBootsJack: 4 + ClothingShoesBootsCombat: 4 + ClothingHeadHatBeretSecurity: 3 + ClothingHandsGlovesFingerless: 3 + ClothingUniformJumpskirtSecGrey: 3 ClothingNeckScarfStripedRed: 3 - ClothingEyesBlindfold: 1 - ClothingShoesBootsCombat: 1 - ClothingShoesBootsWinterSec: 2 - ClothingShoesBootsCowboyBlack: 1 - ClothingHeadHatCowboyBlack: 1 \ No newline at end of file + ClothingShoesBootsWinterSec: 3 + ClothingShoesBootsCowboyBlack: 3 + ClothingHeadHatCowboyBlack: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index 25e41702af..a9646559d9 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -1,8 +1,8 @@ - type: vendingMachineInventory id: MegaSeedServitorInventory startingInventory: - AloeSeeds: 3 - AmbrosiaVulgarisSeeds: 3 + AloeSeeds: 5 + AmbrosiaVulgarisSeeds: 5 AppleSeeds: 5 BananaSeeds: 5 CarrotSeeds: 5 @@ -12,20 +12,18 @@ CornSeeds: 5 EggplantSeeds: 5 EggySeeds: 5 - GalaxythistleSeeds: 3 - GarlicSeeds: 3 + GalaxythistleSeeds: 5 + GarlicSeeds: 5 GrapeSeeds: 5 LemonSeeds: 5 LimeSeeds: 5 - PineappleSeeds: 4 - LingzhiSeeds: 3 + LingzhiSeeds: 5 OatSeeds: 5 OnionSeeds: 5 OnionRedSeeds: 5 OrangeSeeds: 5 - PoppySeeds: 3 + PoppySeeds: 5 PotatoSeeds: 5 - PumpkinSeeds: 5 RiceSeeds: 5 SoybeanSeeds: 5 SugarcaneSeeds: 5 @@ -33,6 +31,8 @@ TowercapSeeds: 5 WheatSeeds: 5 WatermelonSeeds: 5 + PineappleSeeds: 4 + PumpkinSeeds: 5 CocoaSeeds: 3 BerrySeeds: 5 PeaSeeds: 5 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml index 08c0162c08..9ebf93ecc8 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml @@ -2,11 +2,13 @@ id: ShamblersJuiceInventory startingInventory: DrinkShamblersJuiceCan: 4 - DrinkGrapeCan: 2 - DrinkRootBeerCan: 2 - DrinkIcedTeaCan: 2 - DrinkLemonLimeCan: 2 - DrinkFourteenLokoCan: 2 + DrinkGrapeCan: 4 + DrinkRootBeerCan: 4 + DrinkIcedTeaCan: 4 + DrinkLemonLimeCan: 4 + DrinkDrGibbCan: 4 + DrinkFourteenLokoCan: 4 + emaggedInventory: DrinkNukieCan: 2 - DrinkChangelingStingCan: 2 + diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml index b797f588fe..e7f7c61f58 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml @@ -1,12 +1,16 @@ - type: vendingMachineInventory id: GetmoreChocolateCorpInventory startingInventory: - FoodSnackRaisins: 3 - FoodSnackChocolate: 3 + FoodSnackRaisins: 4 + FoodSnackChocolate: 4 + FoodSnackPopcorn: 4 + DrinkRamen: 4 + DrinkHellRamen: 4 FoodSnackCnDs: 3 FoodSnackPistachios: 3 FoodSnackSus: 3 FoodSnackSemki: 3 + emaggedInventory: FoodSnackSyndi: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml index 494f05f6a3..abf61f3bdc 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml @@ -1,12 +1,13 @@ - type: vendingMachineInventory id: SodaInventory startingInventory: - DrinkColaCan: 3 - DrinkGrapeCan: 3 - DrinkRootBeerCan: 3 - DrinkIcedTeaCan: 3 - DrinkLemonLimeCan: 3 - DrinkFourteenLokoCan: 3 + DrinkColaCan: 4 + DrinkGrapeCan: 4 + DrinkRootBeerCan: 4 + DrinkIcedTeaCan: 4 + DrinkLemonLimeCan: 4 + DrinkDrGibbCan: 4 + DrinkFourteenLokoCan: 4 emaggedInventory: DrinkNukieCan: 3 DrinkChangelingStingCan: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml index 34f0906366..8fb25c0087 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml @@ -1,6 +1,6 @@ - type: vendingMachineInventory id: BodaInventory startingInventory: - DrinkSodaWaterCan: 10 #typically hacked product. Default product is "soda" + DrinkSodaWaterCan: 20 contrabandInventory: DrinkColaCan: 10 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml index 0dc33cf07f..00a77794a9 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml @@ -1,13 +1,14 @@ - type: vendingMachineInventory id: SpaceUpInventory startingInventory: - DrinkSpaceUpCan: 3 - DrinkSpaceMountainWindCan: 3 - DrinkGrapeCan: 2 - DrinkRootBeerCan: 2 - DrinkIcedTeaCan: 2 - DrinkLemonLimeCan: 2 - DrinkFourteenLokoCan: 2 + DrinkSpaceUpCan: 4 + DrinkSpaceMountainWindCan: 4 + DrinkGrapeCan: 4 + DrinkRootBeerCan: 4 + DrinkIcedTeaCan: 4 + DrinkLemonLimeCan: 4 + DrinkDrGibbCan: 4 + DrinkFourteenLokoCan: 4 emaggedInventory: DrinkNukieCan: 2 DrinkChangelingStingCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml index 6afbe1eae6..eb38164840 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml @@ -2,11 +2,12 @@ id: StarkistInventory startingInventory: DrinkStarkistCan: 4 - DrinkGrapeCan: 2 - DrinkRootBeerCan: 2 - DrinkIcedTeaCan: 2 - DrinkLemonLimeCan: 2 - DrinkFourteenLokoCan: 2 + DrinkGrapeCan: 4 + DrinkRootBeerCan: 4 + DrinkIcedTeaCan: 4 + DrinkLemonLimeCan: 4 + DrinkDrGibbCan: 4 + DrinkFourteenLokoCan: 4 emaggedInventory: DrinkNukieCan: 2 DrinkChangelingStingCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml index 9fa3499e15..59eced2370 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml @@ -1,7 +1,7 @@ - type: vendingMachineInventory id: SustenanceInventory startingInventory: - DrinkMREFlask: 3 + DrinkMREFlask: 5 FoodSnackNutribrick: 5 FoodSnackMREBrownie: 5 FoodCondimentPacketKetchup: 5 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/tankdispenser.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/tankdispenser.yml index fce18024a7..2435e1d5e6 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/tankdispenser.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/tankdispenser.yml @@ -1,8 +1,10 @@ - type: vendingMachineInventory id: TankDispenserEVAInventory startingInventory: - OxygenTankFilled: 10 - NitrogenTankFilled: 10 + OxygenTankFilled: 7 + EmergencyOxygenTankFilled: 10 + ExtendedEmergencyOxygenTankFilled: 3 + NitrogenTankFilled: 7 - type: vendingMachineInventory id: TankDispenserEngineeringInventory diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index f39cda0ed4..2a68af6cc5 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -21,7 +21,6 @@ ClothingOuterSanta: 2 ClothingHeadHatSkub: 2 ClothingOuterSkub: 2 - ClothingHeadHatBeretFrench: 2 ClothingOuterSuitChicken: 2 ClothingHeadHatChickenhead: 2 ClothingOuterSuitMonkey: 2 @@ -29,8 +28,6 @@ ClothingHeadHatShrineMaidenWig: 2 ClothingOuterSuitShrineMaiden: 2 Gohei: 2 - ClothingHeadHatRedRacoon: 2 - ClothingOuterRedRacoon: 2 ClothingHeadPaperSack: 2 ClothingHeadPaperSackSmile: 2 ClothingEyesBlindfold: 1 @@ -44,6 +41,23 @@ ClothingUniformJumpsuitKimono: 1 ClothingHeadHatCasa: 1 ClothingHeadHatHairflower: 1 + ClothingShoesClownLarge: 1 + ClothingMaskItalianMoustache: 1 + ClothingShoesFlippers: 1 + ClothingMaskRat: 1 + ClothingMaskRaven: 1 + ClothingMaskBear: 1 + ClothingMaskJackal: 1 + ClothingMaskFox: 1 + ClothingShoeSlippersDuck: 3 + ClothingShoesSlippers: 1 + ClothingHeadHatHoodMoth: 2 + ClothingNeckCloakMoth: 2 + ClothingOuterDogi: 1 + ClothingHeadHatMagician: 1 + ClothingHeadHatBeretFrench: 2 + ClothingHeadHatRedRacoon: 2 + ClothingOuterRedRacoon: 2 ClothingHeadHatGladiator: 1 ClothingUniformJumpsuitGladiator: 1 ClothingHeadHatCowboyBrown: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/virodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/virodrobe.yml index b9144167a1..de742497b4 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/virodrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/virodrobe.yml @@ -1,12 +1,16 @@ - type: vendingMachineInventory id: ViroDrobeInventory startingInventory: - ClothingUniformJumpsuitVirology: 2 - ClothingUniformJumpskirtVirology: 2 - ClothingShoesColorWhite: 2 - ClothingOuterCoatLabViro: 2 - ClothingOuterWinterViro: 2 - ClothingMaskSterile: 2 ClothingBackpackVirology: 2 ClothingBackpackSatchelVirology: 2 ClothingBackpackDuffelVirology: 2 + + ClothingMaskSterile: 2 + ClothingHeadsetMedical: 2 + ClothingEyesGlasses: 2 + ClothingOuterCoatLabViro: 2 + ClothingOuterWinterViro: 2 + ClothingUniformJumpsuitVirology: 2 + ClothingUniformJumpskirtVirology: 2 + ClothingHandsGlovesLatex: 2 + ClothingShoesColorWhite: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml index 405e2eff56..7fec8454b5 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml @@ -1,8 +1,13 @@ - type: vendingMachineInventory id: NanoMedInventory startingInventory: - Brutepack: 3 - Ointment: 3 - Bloodpack: 3 + HandheldHealthAnalyzer: 3 + Brutepack: 5 + Ointment: 5 + Bloodpack: 5 + Gauze: 5 EpinephrineChemistryBottle: 3 - Syringe: 3 + Syringe: 5 + EmergencyMedipen: 2 + SyringeBicaridine: 1 + SyringeDermaline: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml index 0f8c73dac3..bb08661f3d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml @@ -18,7 +18,6 @@ ClothingOuterCoatBomber: 3 ClothingHeadHatSantahat: 2 ClothingHeadHatXmasCrown: 2 - emaggedInventory: ClothingNeckScarfStripedSyndieGreen: 3 ClothingNeckScarfStripedSyndieRed: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml index 2231c714ff..15e7f6c22e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml @@ -3,18 +3,17 @@ startingInventory: CableApcStack: 5 Crowbar: 5 - Welder: 2 - Wirecutter: 3 - Wrench: 3 - Screwdriver: 3 - trayScanner: 3 - NetworkConfigurator: 3 - GasAnalyzer: 3 + Welder: 5 + Wirecutter: 5 + Wrench: 5 + Screwdriver: 5 + trayScanner: 5 + NetworkConfigurator: 5 + GasAnalyzer: 5 FlashlightLantern: 5 - ClothingHandsGlovesColorYellowBudget: 3 - SprayPainter: 3 - # Some engineer forgot to take the multitool out the youtool when working on it, happens. + ClothingHandsGlovesColorYellowBudget: 5 + AirlockPainter: 5 + Multitool: 5 + contrabandInventory: - Multitool: 1 - emaggedInventory: - ClothingHandsGlovesColorYellow: 1 + ClothingHandsGlovesColorYellow: 2