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>

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml
index 72864ba851ff073c200f6542e12afb4eab0724dc..6dc689ea5a84693852b653a9c79f713f9d5214ee 100644 (file)
--- 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 5e4b0561762dd0ee420f14213af07b0c7962a4b0..82455f1bbe34fa9896a9efb948bd17362fbbdbe9 100644 (file)
--- 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 d62cd8f92f6e88d03ccac012e036225080da9118..d04ac9601679ec3ffc8378f6f899191279ec842a 100644 (file)
--- 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 d1e80ba0c80ca9e045c2d87c3edae96431c8fcbb..4477c026971543c054b3c0adde2bf10bf4325f66 100644 (file)
--- 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 8170ba792aea99b783792c3ecdd929e0bd231ef4..414e77bcad4e22af7d31bc023dad89af80d5bad7 100644 (file)
--- 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 68665ae7fcc5f6af07543f6b8aa5fa3d88af9e3b..50a9ba4bbb74ef3a235a9a1e99838c8857bc947a 100644 (file)
--- 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 5befd85ca844210b155f57d17f50df2fa06c2feb..c7a08853a5d1eb1bba4c058b3b41e940f8bf5a13 100644 (file)
--- 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 cb9e06932fd9d2e6e0e51e06c7539fbf7f696dfe..3793bd5da4f7e3a4d3098a76b3a6e5f6ab997012 100644 (file)
--- 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 4379a978966f89e2bbce10ead42e24a5654a4216..f7b9d355dca120c25cee68d29bb5c8398f69f829 100644 (file)
--- 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 1ccda0e2733fd5c471c76b267c56c104bb71916c..be0aabccadeccb3045895c09dc70836ee68cce93 100644 (file)
--- 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 5dbb34afa719eb3c553efba68f34ffcd4fb49faa..8174bb4bee81b0c25b8f563fbc82fcb73a6e9c36 100644 (file)
--- 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 78386af931a771b3d7ed8b333151f5e6548099d2..a94c4b9fc5b7905b7ed631361bb5e3bf4ba62eb0 100644 (file)
--- 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 4b21e05235b5377da68a86a8396599acb4dccc63..0d675fe3df5983d173e61cf7291d8dc37d0b193b 100644 (file)
--- 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 a069833759d70375c76ba1bbf0c6bbe48454e8db..7b000e30ad274a0ca164f06cba737c1d109c4325 100644 (file)
--- 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 2d65fa1f71edc41bd732693eae10f2eb551f2700..84837be754cecdb4fe23c994dd82250e61c812ed 100644 (file)
--- 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 30166ca371ae9291425f777d97012dec060e2a92..972c0fca0e0c3496ec089a29146ad7163f3606de 100644 (file)
--- 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 d0304bd4ad6e5f905869d8d41c5d340c9c27645e..e485a2ffd73fa7e309ad8a05469b4b58c42be1a4 100644 (file)
--- 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 fe332ea52dcbf555ca7348fd044388733328e83b..51d4f3d64b0b69571e63ce47757e1e9cd5dd1ee7 100644 (file)
--- 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 a67ed9397b3d95c187627f4a75a7c158eec57d45..55b7328545b5ed7982abfcbeaed7d759e2264a49 100644 (file)
--- 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 046607f21aa2163fa93ce3556be4a95aa9bb8815..a6446a2cc16431f92a62a79c1fdfd210972e5804 100644 (file)
--- 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 fc8492dcf1925e7032b8fe00876f968bd62dd956..9708373dbfcf2da7ac2ef6e299c29dd8fdd3565b 100644 (file)
--- 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 16dc3e628f846ffe227ba66a17cf699197e5c18c..fadd3a7d445f042f9e0e4092559094bcf00940b8 100644 (file)
--- 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 5d732def49f7f65d44f8fc6aa70a4f7069395197..2d28d860380295d430bbf2f4b2edf2476474f855 100644 (file)
--- 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 a35793b4bd7b3a527d975040b4a02a3ce3ebd94a..63089773b1c572103bae76c8518b480df194f179 100644 (file)
--- 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 f022b4b9a59aa8006f7c0f31855d017ca014a782..0fe813178ff6585ff88697ef62c8c36d1e7d09b9 100644 (file)
--- 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 04dbf38ed76b44fbf8785a83b758ab5ae505aa88..d96c97baa1d3f87504070f0727d90142c6ee2af5 100644 (file)
--- 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 50695edc1941d92862cc1fcc8608e3cc9de9427c..62c1d6ffcd1c9f8767c2e3d284baacc6200eb6cb 100644 (file)
--- 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 470abda91e5b12cfd0fd59f763c07658d4e75223..b1e64a2c559384d7b03c94b0181ddce1f7b5a981 100644 (file)
--- 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 b585d34051a0b666cc86fdfde6d6ebfbeec55726..2df87ea4218df864f9d7b353958c41fc6b2a5573 100644 (file)
--- 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 07a650b0a380063ce6799c75947ba9e4c3b9bb30..b5dfb9c26179be8f19b478289dac350e3953aba1 100644 (file)
--- 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 72b6b7617a045a5e52daa1e4c7581d4d6056e891..c7c345f353756d430fde32a3b52c59421db13da3 100644 (file)
--- 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 d5e58e3d73b066c5facdc39d056021280cf6e0de..03655aece43e6cdafe12dcc6063b7d57cc050dc0 100644 (file)
--- 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 b194755e8644bd5cd27671a532c7ceebc40efad3..3b09aa1b5a4dc00cd47db2caf224855e0e837c7f 100644 (file)
--- 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 d51075c35849aaa82a55604c94811dee9d19c2f4..b48e876a58fcee5e9028dab3aa675e05517c1982 100644 (file)
--- 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 c53efb3e729cae66791b6d6f3a1c3255ee32546b..914a03a45bfa462d21db660de9b79fba523be459 100644 (file)
--- 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 7761453327ac3de07df81a3f6840910d2fe8f5dc..a2765923def0478584fdc18c2bea9d0e9ce3c3ea 100644 (file)
--- 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 9827d022841ebe53beb87d484860645479029843..5dbca0b3cb02677c518b8d9e75705760f883361c 100644 (file)
--- 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 afbeff6b0806293c669a8d8177544c412015c90b..0e25fb2b0584fe4e80ee1ee26d7b26c939bbdf8b 100644 (file)
--- 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 f81f5854cb4c353dadab474527b66106d85bbc90..b4526732a94d10c945d0ddc71bf8c27eb5269d9d 100644 (file)
--- 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 bd0990050b3d9c0c175807c6f96b37c488de98b0..44d0678956660db9683f179605fd83fe5f5efbe6 100644 (file)
--- 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 6b9ff67f2bbee900f961ac22585447b95db29634..7ec384a9d0e3858b00032076f3934453e9efa3e3 100644 (file)
--- 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 b797f588fe50cd9f38cd8b6c6cb3eda42de1c3de..cd89dbeb167db9cd27f75404dc956122e5803c5a 100644 (file)
--- 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 4b2a9228135db0ea6db5fc2ea207d5b1d8574613..5566ea7d0d17caf4f02f11944bd15639f0090fa9 100644 (file)
--- 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 34f0906366ac8f8efe43540dead3d242944bfcfe..8ad65643271bd773fe600eb815c2f691973638b8 100644 (file)
--- 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 7b36a3fc81cd1f8a4287fbb320f620aab74b0e52..b368534eebfe7c44140256869aad3d3c682216aa 100644 (file)
--- 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 0e7dcf7482e6d0f593e7ac1d4a3e317cf474f65a..194e0b7a39a945188304602cc8034227c99033c9 100644 (file)
--- 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 b7a5750809fe17fea59ead788cd1a4499a4a17b3..a36c5e4dc52dbf9957e8f75aa7eede212c6eaba8 100644 (file)
--- 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 8e1f6a1c3ac5fcaf0cd107d3f1613a99b5c3cf72..688706462bb1efcc98ff9d45088779c7e9b5887f 100644 (file)
--- 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 e530f98738a42cbba3f0b2921c8f04f1326703e6..015bfc22e12c4c31462f421ffea5b6157d517c81 100644 (file)
--- 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 da7e30fd763aafcc6ba576e16d81c87f0b67185a..d3b804f9014551acbc13a64f2503f8c39da356ed 100644 (file)
--- 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 405e2eff5645adc344b4063bec02c0f919ca0bd2..e0e0dcd1dac16a34de6adacc835fdaa3ea5f7104 100644 (file)
--- 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