From 2ffe539ba254ad929e209709c9fdcd2f84a87af9 Mon Sep 17 00:00:00 2001 From: Smith <182301147+AgentSmithRadio@users.noreply.github.com> Date: Mon, 3 Feb 2025 18:33:14 -0500 Subject: [PATCH] contrabandInventory Changes (Fixed) (#32934) * Reimport of .yml files, edit to medidrobe.yml * Fixed typo for "Richard" in AutoDrobe contrabandInventory * contrabandInventory Revision * Add a spare bible to PietyVend (#32363) Update chapel.yml * Bible to normal inventory, not contraband * Balance changes based on maintainer feedback. * VendoMat change to Proximity Sensor and Borg Arm. * Revert "VendoMat change to Proximity Sensor and Borg Arm." This reverts commit 44c68daaaedeea26f9376db7f65d1e01771a761e. * PR Rebase, Fixing Reversion * seeds.yml Bungo Seeds swapped for Tobacco Seeds. --------- Co-authored-by: Jarmer123 <148848017+Jarmer123@users.noreply.github.com> --- .../Catalog/VendingMachines/Inventories/atmosdrobe.yml | 2 ++ .../Catalog/VendingMachines/Inventories/bardrobe.yml | 3 ++- .../Catalog/VendingMachines/Inventories/boozeomat.yml | 3 +++ .../Catalog/VendingMachines/Inventories/cargodrobe.yml | 4 ++++ .../Prototypes/Catalog/VendingMachines/Inventories/cart.yml | 3 +++ .../Catalog/VendingMachines/Inventories/centdrobe.yml | 3 +++ .../Catalog/VendingMachines/Inventories/chang.yml | 3 +++ .../Catalog/VendingMachines/Inventories/chapel.yml | 4 ++++ .../Catalog/VendingMachines/Inventories/chefdrobe.yml | 2 ++ .../Catalog/VendingMachines/Inventories/chefvend.yml | 5 +++++ .../Catalog/VendingMachines/Inventories/chemdrobe.yml | 2 ++ .../Catalog/VendingMachines/Inventories/chemvend.yml | 6 ++++++ .../Prototypes/Catalog/VendingMachines/Inventories/cigs.yml | 4 ++++ .../Catalog/VendingMachines/Inventories/clothesmate.yml | 2 ++ .../Catalog/VendingMachines/Inventories/coffee.yml | 4 +++- .../Prototypes/Catalog/VendingMachines/Inventories/cola.yml | 2 ++ .../Catalog/VendingMachines/Inventories/condiments.yml | 5 +++++ .../Catalog/VendingMachines/Inventories/curadrobe.yml | 2 ++ .../Catalog/VendingMachines/Inventories/detdrobe.yml | 2 ++ .../Catalog/VendingMachines/Inventories/dinnerware.yml | 6 +++++- .../Catalog/VendingMachines/Inventories/discount.yml | 5 ++++- .../Catalog/VendingMachines/Inventories/donut.yml | 3 +++ .../Catalog/VendingMachines/Inventories/engidrobe.yml | 3 +++ .../Catalog/VendingMachines/Inventories/engivend.yml | 3 +++ .../Catalog/VendingMachines/Inventories/games.yml | 4 ++++ .../Prototypes/Catalog/VendingMachines/Inventories/gib.yml | 4 ++++ .../Catalog/VendingMachines/Inventories/happyhonk.yml | 6 +++++- .../Catalog/VendingMachines/Inventories/hydrobe.yml | 2 ++ .../Catalog/VendingMachines/Inventories/janidrobe.yml | 3 ++- .../Catalog/VendingMachines/Inventories/lawdrobe.yml | 1 + .../Catalog/VendingMachines/Inventories/medical.yml | 3 ++- .../Catalog/VendingMachines/Inventories/medidrobe.yml | 3 +++ .../Catalog/VendingMachines/Inventories/nutri.yml | 3 +++ .../Catalog/VendingMachines/Inventories/pwrgame.yml | 2 ++ .../Catalog/VendingMachines/Inventories/robotics.yml | 2 ++ .../Catalog/VendingMachines/Inventories/salvage.yml | 4 +++- .../Catalog/VendingMachines/Inventories/scidrobe.yml | 2 ++ .../Prototypes/Catalog/VendingMachines/Inventories/sec.yml | 1 + .../Catalog/VendingMachines/Inventories/secdrobe.yml | 3 +++ .../Catalog/VendingMachines/Inventories/seeds.yml | 3 +++ .../Catalog/VendingMachines/Inventories/shamblersjuice.yml | 3 ++- .../Catalog/VendingMachines/Inventories/snack.yml | 3 +-- .../Prototypes/Catalog/VendingMachines/Inventories/soda.yml | 4 +++- .../Catalog/VendingMachines/Inventories/sovietsoda.yml | 2 ++ .../Catalog/VendingMachines/Inventories/spaceup.yml | 5 ++++- .../Catalog/VendingMachines/Inventories/starkist.yml | 4 +++- .../Catalog/VendingMachines/Inventories/sustenance.yml | 5 +++++ .../Catalog/VendingMachines/Inventories/syndiedrobe.yml | 5 ++++- .../Catalog/VendingMachines/Inventories/theater.yml | 4 ++++ .../Catalog/VendingMachines/Inventories/vendomat.yml | 3 +++ .../Catalog/VendingMachines/Inventories/wallmed.yml | 2 ++ 51 files changed, 152 insertions(+), 15 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml index 72864ba851..6dc689ea5a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml @@ -13,3 +13,5 @@ ClothingOuterSuitFire: 2 ClothingOuterWinterAtmos: 2 ClothingNeckScarfStripedLightBlue: 3 + contrabandInventory: + ToyFigurineAtmosTech: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml index 5e4b056176..82455f1bbe 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml @@ -16,4 +16,5 @@ ClothingOuterVest: 2 ClothingBeltBandolier: 2 ClothingEyesGlassesSunglasses: 2 - + contrabandInventory: + ToyFigurineBartender: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index d62cd8f92f..d04ac96016 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -46,5 +46,8 @@ DrinkSakeBottleFull: 3 DrinkBeerCan: 5 DrinkWineCan: 5 + contrabandInventory: + EthanolChemistryBottle: 3 + DrinkBottleOfNothingFull: 1 emaggedInventory: DrinkPoisonWinebottleFull: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml index d1e80ba0c8..4477c02697 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml @@ -15,3 +15,7 @@ ClothingOuterWinterMiner: 2 ClothingNeckScarfStripedBrown: 3 ClothingShoesBootsWinterCargo: 2 + contrabandInventory: + ToyFigurineCargoTech: 1 + ToyFigurineSalvage: 1 + ToyFigurineQuartermaster: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml index 8170ba792a..414e77bcad 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml @@ -16,3 +16,6 @@ EncryptionKeyScience: 2 EncryptionKeySecurity: 1 EncryptionKeyService: 3 + contrabandInventory: + BalloonNT: 2 + LuxuryPen: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml index 68665ae7fc..50a9ba4bbb 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml @@ -18,3 +18,6 @@ ClothingOuterCoatExpensive: 1 ClothingNeckScarfStripedCentcom: 3 ClothingNeckCloakCentcom: 3 + contrabandInventory: + ToyFigurineCaptain: 1 + ToyFigurineHeadOfPersonnel: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml index 5befd85ca8..c7a08853a5 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml @@ -8,4 +8,7 @@ FoodSnackChowMein: 3 FoodSnackDanDanNoodles: 3 PairedChopsticks: 3 + contrabandInventory: + FoodBakedDumplings: 2 + FoodSoupMiso: 2 # rice? diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml index cb9e06932f..3793bd5da4 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml @@ -21,6 +21,10 @@ BoxCandleSmall: 2 Urn: 5 Bible: 1 + contrabandInventory: + FoodBakedBunHotX: 2 + DrinkWineBottleFull: 1 + ToyFigurineChaplain: 1 emaggedInventory: ClothingOuterArmorCult: 1 ClothingHeadHelmetCult: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml index 4379a97896..f7b9d355dc 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml @@ -12,3 +12,5 @@ ClothingShoesColorBlack: 2 ClothingShoesChef: 2 ClothingBeltChef: 2 + contrabandInventory: + ToyFigurineChef: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml index 1ccda0e273..be0aabccad 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml @@ -20,4 +20,9 @@ FoodButter: 3 FoodCheese: 1 FoodMeat: 6 + contrabandInventory: + EggBoxBroken: 1 + FoodBoxDonkpocket: 1 + FoodFrozenSandwich: 2 + FoodFrozenSandwichStrawberry: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml index 5dbb34afa7..8174bb4bee 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml @@ -14,3 +14,5 @@ ClothingHandsGlovesLatex: 2 ClothingHeadsetMedical: 2 ClothingOuterWinterChem: 2 + contrabandInventory: + ToyFigurineChemist: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml index 78386af931..a94c4b9fc5 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml @@ -22,6 +22,9 @@ JugSodium: 2 JugSugar: 3 JugSulfur: 1 + contrabandInventory: + DrinkLithiumFlask: 1 + StrangePill: 3 emaggedInventory: ToxinChemistryBottle: 1 @@ -50,6 +53,9 @@ JugSugar: 3 JugSulfur: 1 JugWeldingFuel: 1 + contrabandInventory: + DrinkLithiumFlask: 1 + StrangePill: 3 emaggedInventory: PaxChemistryBottle: 3 MuteToxinChemistryBottle: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml index 4b21e05235..0d675fe3df 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml @@ -14,5 +14,9 @@ CheapLighter: 4 Lighter: 2 FlippoLighter: 2 + contrabandInventory: + GroundTobacco: 3 + CigarGold: 2 + Igniter: 1 emaggedInventory: CigPackSyndicate: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index a069833759..7b000e30ad 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -96,4 +96,6 @@ ClothingMaskNeckGaiter: 2 ClothingUniformJumpsuitTacticool: 1 ClothingUniformJumpskirtTacticool: 1 + ToyFigurinePassenger: 1 + ToyFigurineGreytider: 1 # DO NOT ADD MORE, USE UNIFORM DYING diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml index 2d65fa1f71..84837be754 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml @@ -1,4 +1,4 @@ -- type: vendingMachineInventory +- type: vendingMachineInventory id: HotDrinksMachineInventory startingInventory: DrinkHotCoffee: 5 @@ -6,5 +6,7 @@ DrinkTeacup: 5 DrinkGreenTea: 5 DrinkHotCoco: 5 + contrabandInventory: + DrinkTeapot: 2 emaggedInventory: DrinkNothing: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml index 30166ca371..972c0fca0e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml @@ -9,6 +9,8 @@ DrinkLemonLimeCan: 2 DrinkLemonLimeCranberryCan: 2 DrinkFourteenLokoCan: 2 + contrabandInventory: + DrinkColaBottleFull: 2 emaggedInventory: DrinkNukieCan: 2 DrinkChangelingStingCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml index d0304bd4ad..e485a2ffd7 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml @@ -18,3 +18,8 @@ KnifePlastic: 10 FoodPlatePlastic: 10 FoodPlateSmallPlastic: 10 + contrabandInventory: + FoodShakerSalt: 1 + FoodShakerPepper: 1 + FoodCondimentBottleKetchup: 1 + ReagentContainerMayo: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml index fe332ea52d..51d4f3d64b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml @@ -14,4 +14,6 @@ ClothingUniformJumpskirtLibrarian: 3 ClothingShoesBootsLaceup: 2 ClothingHeadsetService: 2 + contrabandInventory: + ToyFigurineLibrarian: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml index a67ed9397b..55b7328545 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml @@ -15,3 +15,5 @@ ClothingHandsGlovesColorBlack: 2 ClothingHandsGlovesLatex: 2 ClothingHeadsetSecurity: 2 + contrabandInventory: + ToyFigurineDetective: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml index 046607f21a..a6446a2cc1 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml @@ -1,4 +1,4 @@ -- type: vendingMachineInventory +- type: vendingMachineInventory id: DinnerwareInventory startingInventory: ButchCleaver: 1 @@ -27,3 +27,7 @@ DrinkMugOne: 1 DrinkMugRainbow: 2 DrinkMugRed: 2 + contrabandInventory: + CandyBowl: 1 + BarSpoon: 2 + DrinkShaker: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml index fc8492dcf1..9708373dbf 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml @@ -1,4 +1,4 @@ -- type: vendingMachineInventory +- type: vendingMachineInventory id: DiscountDansInventory startingInventory: FoodSnackCheesie: 3 @@ -8,3 +8,6 @@ FoodSnackPopcorn: 3 FoodSnackEnergy: 3 CigPackMixed: 2 + contrabandInventory: + FoodSnackDanDanNoodles: 3 + FoodBakedBunHoney: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml index 16dc3e628f..fadd3a7d44 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml @@ -5,5 +5,8 @@ FoodDonutApple: 3 FoodDonutPink: 3 FoodDonutBungo: 3 + contrabandInventory: + FoodBagel: 2 + FoodBagelPoppy: 2 emaggedInventory: FoodDonutPoison: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml index 5d732def49..2d28d86038 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml @@ -16,3 +16,6 @@ ClothingOuterWinterEngi: 2 ClothingNeckScarfStripedOrange: 3 ClothingShoesBootsWinterEngi: 2 + contrabandInventory: + ToyFigurineEngineer: 1 + ToyFigurineChiefEngineer: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml index a35793b4bd..63089773b1 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml @@ -10,3 +10,6 @@ ClothingHandsGlovesColorYellow: 6 BoxInflatable: 2 ClothingHeadHatCone: 4 + contrabandInventory: + CowToolboxFilled: 1 + DrinkBeerCan: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml index f022b4b9a5..0fe813178f 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml @@ -16,3 +16,7 @@ PaperCNCSheet: 6 MysteryFigureBox: 2 BooksBag: 3 + contrabandInventory: + Basketball: 1 + FoodSnackBoritos: 3 + DrinkSpaceMountainWindCan: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml index 04dbf38ed7..d96c97baa1 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml @@ -9,6 +9,10 @@ DrinkLemonLimeCan: 2 DrinkLemonLimeCranberryCan: 2 DrinkFourteenLokoCan: 2 + contrabandInventory: + ClothingNeckStethoscope: 2 + Saw: 2 + Tourniquet: 3 emaggedInventory: DrinkNukieCan: 2 DrinkChangelingStingCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml index 50695edc19..62c1d6ffcd 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml @@ -1,8 +1,12 @@ -- type: vendingMachineInventory +- type: vendingMachineInventory id: HappyHonkDispenserInventory startingInventory: HappyHonk: 10 HappyHonkMime: 4 + contrabandInventory: + ToyFigurineClown: 1 + ToyFigurineMime: 1 + ToyFigurineNukie: 1 emaggedInventory: HappyHonkCluwne: 1 HappyHonkNukie: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml index 470abda91e..b1e64a2c55 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml @@ -12,4 +12,6 @@ ClothingHeadBandBotany: 3 ClothingHeadsetService: 2 ClothingOuterWinterHydro: 2 + contrabandInventory: + ToyFigurineBotanist: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml index b585d34051..2df87ea421 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml @@ -10,7 +10,8 @@ ClothingHeadsetService: 2 ClothingOuterWinterJani: 2 ClothingNeckScarfStripedPurple: 3 - + contrabandInventory: + ToyFigurineJanitor: 1 emaggedInventory: ClothingUniformJumpskirtJanimaid: 2 ClothingUniformJumpskirtJanimaidmini: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml index 07a650b0a3..b5dfb9c261 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml @@ -23,5 +23,6 @@ ClothingHeadHatPwig: 1 # "Legally" obtained currency SpaceCash100: 2 + ToyFigurineLawyer: 1 emaggedInventory: CyberPen: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml index 72b6b7617a..c7c345f353 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml @@ -10,4 +10,5 @@ BoxBottle: 3 ClothingEyesHudMedical: 2 ClothingEyesEyepatchHudMedical: 2 - + contrabandInventory: + FoodApple: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml index d5e58e3d73..03655aece4 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml @@ -25,3 +25,6 @@ ClothingShoesBootsWinterMed: 2 contrabandInventory: ClothingUniformJumpskirtOfLife: 1 + ToyFigurineMedicalDoctor: 1 + ToyFigurineParamedic: 1 + ToyFigurineChiefMedicalOfficer: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml index b194755e86..3b09aa1b5a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml @@ -19,5 +19,8 @@ BoxAgrichem: 1 #TO DO: #plant analyzer + contrabandInventory: + UnstableMutagenChemistryBottle: 1 + Joint: 1 emaggedInventory: Left4ZedChemistryBottle: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml index d51075c358..b48e876a58 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml @@ -10,6 +10,8 @@ DrinkLemonLimeCan: 2 DrinkLemonLimeCranberryCan: 2 DrinkFourteenLokoCan: 2 + contrabandInventory: + DrinkDrGibbCan: 3 emaggedInventory: DrinkNukieCan: 2 DrinkChangelingStingCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml index c53efb3e72..914a03a45b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml @@ -18,3 +18,5 @@ Welder: 1 Screwdriver: 2 Crowbar: 2 + contrabandInventory: + FoodBurgerRobot: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml index 7761453327..a2765923de 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml @@ -1,4 +1,4 @@ -- type: vendingMachineInventory +- type: vendingMachineInventory id: SalvageEquipmentInventory startingInventory: Crowbar: 2 @@ -10,3 +10,5 @@ RadioHandheld: 2 WeaponGrapplingGun: 4 WeaponProtoKineticAccelerator: 4 + contrabandInventory: + PlushieCarp: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml index 9827d02284..5dbca0b3cb 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml @@ -15,3 +15,5 @@ ClothingOuterWinterSci: 2 ClothingNeckScarfStripedPurple: 3 ClothingShoesBootsWinterSci: 2 + contrabandInventory: + ToyFigurineResearchDirector: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index afbeff6b08..0e25fb2b05 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -22,6 +22,7 @@ RadioHandheldSecurity: 5 # security officers need to follow a diet regimen! contrabandInventory: + WeaponMeleeNeedle: 2 FoodDonutHomer: 12 FoodBoxDonut: 2 #box evidence diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index f81f5854cb..b4526732a9 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -27,3 +27,6 @@ ClothingHeadHelmetJustice: 1 contrabandInventory: ClothingMaskClownSecurity: 1 + ToyFigurineSecurity: 1 + ToyFigurineWarden: 1 + ToyFigurineHeadOfSecurity: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index bd0990050b..44d0678956 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -39,5 +39,8 @@ TowercapSeeds: 5 WheatSeeds: 5 WatermelonSeeds: 5 + contrabandInventory: + TobaccoSeeds: 2 + FoodSnackSemki: 2 emaggedInventory: FlyAmanitaSeeds: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml index 6b9ff67f2b..7ec384a9d0 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml @@ -9,6 +9,7 @@ DrinkLemonLimeCan: 2 DrinkLemonLimeCranberryCan: 2 DrinkFourteenLokoCan: 2 + contrabandInventory: + DrinkChangelingStingCan: 2 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..cd89dbeb16 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml @@ -7,6 +7,5 @@ FoodSnackPistachios: 3 FoodSnackSus: 3 FoodSnackSemki: 3 - emaggedInventory: + contrabandInventory: FoodSnackSyndi: 3 - diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml index 4b2a922813..5566ea7d0d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml @@ -1,4 +1,4 @@ -- type: vendingMachineInventory +- type: vendingMachineInventory id: SodaInventory startingInventory: DrinkColaCan: 3 @@ -9,6 +9,8 @@ DrinkLemonLimeCan: 3 DrinkLemonLimeCranberryCan: 3 DrinkFourteenLokoCan: 3 + contrabandInventory: + DrinkColaBottleFull: 2 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..8ad6564327 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml @@ -3,4 +3,6 @@ startingInventory: DrinkSodaWaterCan: 10 #typically hacked product. Default product is "soda" contrabandInventory: + DrinkSodaWaterBottleFull: 2 DrinkColaCan: 10 + ClothingHeadHatUshanka: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml index 7b36a3fc81..b368534eeb 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml @@ -1,4 +1,4 @@ -- type: vendingMachineInventory +- type: vendingMachineInventory id: SpaceUpInventory startingInventory: DrinkSpaceUpCan: 3 @@ -10,6 +10,9 @@ DrinkLemonLimeCan: 2 DrinkLemonLimeCranberryCan: 2 DrinkFourteenLokoCan: 2 + contrabandInventory: + DrinkSpaceMountainWindBottleFull: 2 + DrinkSpaceUpBottleFull: 2 emaggedInventory: DrinkNukieCan: 2 DrinkChangelingStingCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml index 0e7dcf7482..194e0b7a39 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml @@ -1,4 +1,4 @@ -- type: vendingMachineInventory +- type: vendingMachineInventory id: StarkistInventory startingInventory: DrinkStarkistCan: 4 @@ -9,6 +9,8 @@ DrinkLemonLimeCan: 2 DrinkLemonLimeCranberryCan: 2 DrinkFourteenLokoCan: 2 + contrabandInventory: + FoodBurgerCarp: 2 emaggedInventory: DrinkNukieCan: 2 DrinkChangelingStingCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml index b7a5750809..a36c5e4dc5 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml @@ -5,6 +5,11 @@ FoodSnackNutribrick: 5 FoodSnackMREBrownie: 5 FoodCondimentPacketKetchup: 5 + contrabandInventory: + FoodTinMRE: 3 + FoodTinBeans: 3 + FoodTinPeaches: 3 + DrinkBeerCan: 6 emaggedInventory: KitchenKnife: 2 ClothingMaskBreath: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml index 8e1f6a1c3a..688706462b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml @@ -15,7 +15,10 @@ ClothingNeckScarfStripedSyndieGreen: 2 ClothingNeckScarfStripedSyndieRed: 2 ClothingShoesBootsWinterSyndicate: 2 - + contrabandInventory: + ToyFigurineFootsoldier: 1 + ToyFigurineNukieElite: 1 + ToyFigurineNukieCommander: 1 emaggedInventory: ClothingOuterCoatSyndieCapArmored: 1 ClothingOuterWinterSyndieCapArmored: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index e530f98738..015bfc22e1 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -55,6 +55,10 @@ ClothingShoesBootsCowboyBrown: 1 ClothingShoesBootsCowboyBlack: 1 ClothingShoesBootsCowboyWhite: 1 + contrabandInventory: + ClothingHeadHatRichard: 1 + ToyFigurineBoxer: 1 + ToyFigurineMusician: 1 emaggedInventory: ClothingShoesBling: 1 ClothingShoesBootsCowboyFancy: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml index da7e30fd76..d3b804f901 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml @@ -10,3 +10,6 @@ MatterBinStockPart: 4 CapacitorStockPart: 4 MicroManipulatorStockPart: 4 + contrabandInventory: + ProximitySensor: 1 + LeftArmBorg: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml index 405e2eff56..e0e0dcd1da 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml @@ -6,3 +6,5 @@ Bloodpack: 3 EpinephrineChemistryBottle: 3 Syringe: 3 + contrabandInventory: + PowerCellSmall: 2 -- 2.51.2