Trim vending machines emag inventories (#36839)

2025-07-17 23:36:28 +02:00
parent 00ce19dfb1
commit e87fc850dc
22 changed files with 12 additions and 29 deletions
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
@@ -50,5 +50,4 @@
  contrabandInventory:
    ChemistryBottleEthanol: 3
    DrinkBottleOfNothingFull: 1
-  emaggedInventory:
    DrinkPoisonWinebottleFull: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
@@ -25,11 +25,9 @@
    FoodBakedBunHotX: 2
    DrinkWineBottleFull: 1
    ToyFigurineChaplain: 1
+    ClothingNeckScarfStripedBlack: 3
  emaggedInventory:
-    ClothingOuterArmorCult: 1
-    ClothingHeadHelmetCult: 1
    ClothingOuterRobesCult: 3
    ClothingHeadHatHoodCulthood: 3
    ClothingShoesCult: 4
    BedsheetCult: 4
-    ClothingNeckScarfStripedBlack: 3
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml
@@ -25,7 +25,6 @@
  contrabandInventory:
    DrinkLithiumFlask: 1
    StrangePill: 3
-  emaggedInventory:
    ChemistryBottleToxin: 1

 - type: vendingMachineInventory
@@ -57,7 +56,6 @@
  contrabandInventory:
    DrinkLithiumFlask: 1
    StrangePill: 3
-  emaggedInventory:
    ChemistryBottlePax: 3
    ChemistryBottleMuteToxin: 3
    ChemistryBottleLead: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml
@@ -18,5 +18,3 @@
    GroundTobacco: 3
    CigarGold: 2
    Igniter: 1
-  emaggedInventory:
-    CigPackSyndicate: 1
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml
@@ -8,5 +8,4 @@
    DrinkHotCoco: 5
  contrabandInventory:
    DrinkTeapot: 2
-  emaggedInventory:
    DrinkNothing: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
@@ -11,6 +11,6 @@
    DrinkFourteenLokoCan: 2
  contrabandInventory:
    DrinkColaBottleFull: 2
+    DrinkChangelingStingCan: 2
  emaggedInventory:
    DrinkNukieCan: 2
-    DrinkChangelingStingCan: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml
@@ -8,5 +8,4 @@
  contrabandInventory:
    FoodBagel: 2
    FoodBagelPoppy: 2
-  emaggedInventory:
    FoodDonutPoison: 1
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml
@@ -13,6 +13,6 @@
    ClothingNeckStethoscope: 2
    Saw: 2
    Tourniquet: 3
+    DrinkChangelingStingCan: 2
  emaggedInventory:
    DrinkNukieCan: 2
-    DrinkChangelingStingCan: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml
@@ -7,6 +7,6 @@
    ToyFigurineClown: 1
    ToyFigurineMime: 1
    ToyFigurineNukie: 1
-  emaggedInventory:
    HappyHonkCluwne: 1
+  emaggedInventory:
    HappyHonkNukie: 1
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
@@ -24,5 +24,3 @@
    # "Legally" obtained currency
    SpaceCash100: 2
    ToyFigurineLawyer: 1
-  emaggedInventory:
-    CyberPen: 1
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
@@ -22,5 +22,4 @@
  contrabandInventory:
    ChemistryBottleUnstableMutagen: 1
    Joint: 1
-  emaggedInventory:
    ChemistryBottleLeft4Zed: 1
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
@@ -12,6 +12,6 @@
    DrinkFourteenLokoCan: 2
  contrabandInventory:
    DrinkDrGibbCan: 3
+    DrinkChangelingStingCan: 2
  emaggedInventory:
    DrinkNukieCan: 2
-    DrinkChangelingStingCan: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
@@ -41,5 +41,4 @@
  contrabandInventory:
    TobaccoSeeds: 2
    FoodSnackSemki: 2
-  emaggedInventory:
    FlyAmanitaSeeds: 1
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/smite.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/smite.yml
@@ -8,6 +8,6 @@
  contrabandInventory:
    DrinkStarkistCan: 2
    ToyHammer: 1
+    DrinkChangelingStingCan: 2
  emaggedInventory:
    DrinkNukieCan: 2
-    DrinkChangelingStingCan: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
@@ -11,6 +11,6 @@
    DrinkFourteenLokoCan: 3
  contrabandInventory:
    DrinkColaBottleFull: 2
+    DrinkChangelingStingCan: 3
  emaggedInventory:
    DrinkNukieCan: 3
-    DrinkChangelingStingCan: 3
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
@@ -11,6 +11,6 @@
  contrabandInventory:
    DrinkSpaceMountainWindBottleFull: 2
    DrinkSpaceUpBottleFull: 2
+    DrinkChangelingStingCan: 2
  emaggedInventory:
    DrinkNukieCan: 2
-    DrinkChangelingStingCan: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
@@ -11,6 +11,6 @@
    DrinkFourteenLokoCan: 2
  contrabandInventory:
    FoodBurgerCarp: 2
+    DrinkChangelingStingCan: 2
  emaggedInventory:
    DrinkNukieCan: 2
-    DrinkChangelingStingCan: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml
@@ -10,8 +10,8 @@
    FoodTinBeans: 3
    FoodTinPeaches: 3
    DrinkBeerCan: 6
-  emaggedInventory:
    KitchenKnife: 2
+  emaggedInventory:
    ClothingMaskBreath: 3
    EmergencyOxygenTankFilled: 3
    DrinkNukieCan: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml
@@ -19,9 +19,9 @@
    ToyFigurineFootsoldier: 1
    ToyFigurineNukieElite: 1
    ToyFigurineNukieCommander: 1
+    ClothingUniformJumpskirtTacticalMaid: 5
+    ClothingHandsTacticalMaidGloves: 5
  emaggedInventory:
    ClothingOuterCoatSyndieCapArmored: 1
    ClothingOuterWinterSyndieCapArmored: 1
    ClothingHeadHatTacticalMaidHeadband: 5
-    ClothingUniformJumpskirtTacticalMaid: 5
-    ClothingHandsTacticalMaidGloves: 5 
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
@@ -59,7 +59,6 @@
    ClothingHeadHatRichard: 1
    ToyFigurineBoxer: 1
    ToyFigurineMusician: 1
-  emaggedInventory:
    ClothingShoesBling: 1
    ClothingShoesBootsCowboyFancy: 1
    ClothingOuterDogi: 1
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
@@ -19,8 +19,6 @@
    ClothingHeadHatCanadaBeanie: 4
    ClothingHeadHatSantahat: 2
    ClothingHeadHatXmasCrown: 2
-
  emaggedInventory:
    ClothingNeckScarfStripedSyndieGreen: 3
    ClothingNeckScarfStripedSyndieRed: 3
-    ClothingNeckScarfStripedCentcom: 3
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml
@@ -17,5 +17,4 @@
  # Some engineer forgot to take the multitool out the youtool when working on it, happens.
  contrabandInventory:
    Multitool: 1
-  emaggedInventory:
    ClothingHandsGlovesColorYellow: 1