]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Trim vending machines emag inventories (#36839)
authorScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Thu, 17 Jul 2025 21:36:28 +0000 (23:36 +0200)
committerGitHub <noreply@github.com>
Thu, 17 Jul 2025 21:36:28 +0000 (00:36 +0300)
22 files changed:
Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/smite.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml

index 91274386743cd254853726af06d7be91d20dc195..f9fe6cbf4a8e4b58c1e213a784363116c878fa37 100644 (file)
@@ -50,5 +50,4 @@
   contrabandInventory:
     ChemistryBottleEthanol: 3
     DrinkBottleOfNothingFull: 1
-  emaggedInventory:
     DrinkPoisonWinebottleFull: 2
index 3793bd5da4f7e3a4d3098a76b3a6e5f6ab997012..27880db1c9c06db9b7ef9c1be711cc043c8a7928 100644 (file)
     FoodBakedBunHotX: 2
     DrinkWineBottleFull: 1
     ToyFigurineChaplain: 1
+    ClothingNeckScarfStripedBlack: 3
   emaggedInventory:
-    ClothingOuterArmorCult: 1
-    ClothingHeadHelmetCult: 1
     ClothingOuterRobesCult: 3
     ClothingHeadHatHoodCulthood: 3
     ClothingShoesCult: 4
     BedsheetCult: 4
-    ClothingNeckScarfStripedBlack: 3
index 42a484e4ab381a8c9d9a0e37586cc77fc98efa19..5e5d944a62fa19630c8d31dce0a9fc15f001113b 100644 (file)
@@ -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
index 0d675fe3df5983d173e61cf7291d8dc37d0b193b..f80214f1335890bede337830a05f2f166745fd5b 100644 (file)
@@ -18,5 +18,3 @@
     GroundTobacco: 3
     CigarGold: 2
     Igniter: 1
-  emaggedInventory:
-    CigPackSyndicate: 1
index 84837be754cecdb4fe23c994dd82250e61c812ed..778da09e9891431740502feca87c6b93c3923390 100644 (file)
@@ -8,5 +8,4 @@
     DrinkHotCoco: 5
   contrabandInventory:
     DrinkTeapot: 2
-  emaggedInventory:
     DrinkNothing: 2
index 972c0fca0e0c3496ec089a29146ad7163f3606de..a82fa2c610ce37f989b3dc2d21fd788121fb69f5 100644 (file)
@@ -11,6 +11,6 @@
     DrinkFourteenLokoCan: 2
   contrabandInventory:
     DrinkColaBottleFull: 2
+    DrinkChangelingStingCan: 2
   emaggedInventory:
     DrinkNukieCan: 2
-    DrinkChangelingStingCan: 2
index fadd3a7d445f042f9e0e4092559094bcf00940b8..b4f25e936dab417f6f16791377b0e37ef773daaf 100644 (file)
@@ -8,5 +8,4 @@
   contrabandInventory:
     FoodBagel: 2
     FoodBagelPoppy: 2
-  emaggedInventory:
     FoodDonutPoison: 1
index 94d05e3629f8f52e5b8d094f5ff1a0fffc469a5e..304d2850efb9cef11b4a8960058b87f5ac54c698 100644 (file)
@@ -13,6 +13,6 @@
     ClothingNeckStethoscope: 2
     Saw: 2
     Tourniquet: 3
+    DrinkChangelingStingCan: 2
   emaggedInventory:
     DrinkNukieCan: 2
-    DrinkChangelingStingCan: 2
index 62c1d6ffcd1c9f8767c2e3d284baacc6200eb6cb..3c46c8bf8896bb1c0b9c9a83ebf45746752d3b22 100644 (file)
@@ -7,6 +7,6 @@
     ToyFigurineClown: 1
     ToyFigurineMime: 1
     ToyFigurineNukie: 1
-  emaggedInventory:
     HappyHonkCluwne: 1
+  emaggedInventory:
     HappyHonkNukie: 1
index b5dfb9c26179be8f19b478289dac350e3953aba1..319a34c4f82e9505a445f04fbd9a19d297d75af4 100644 (file)
@@ -24,5 +24,3 @@
     # "Legally" obtained currency
     SpaceCash100: 2
     ToyFigurineLawyer: 1
-  emaggedInventory:
-    CyberPen: 1
index 7158cc3055f0f76546b269cffc97a391114d4a1e..9b68de41e49260c6b81e1ab1a6e82e7a24e273c5 100644 (file)
@@ -22,5 +22,4 @@
   contrabandInventory:
     ChemistryBottleUnstableMutagen: 1
     Joint: 1
-  emaggedInventory:
     ChemistryBottleLeft4Zed: 1
index b48e876a58fcee5e9028dab3aa675e05517c1982..f9b06209116e85d4469aca533719cd5134f6ab81 100644 (file)
@@ -12,6 +12,6 @@
     DrinkFourteenLokoCan: 2
   contrabandInventory:
     DrinkDrGibbCan: 3
+    DrinkChangelingStingCan: 2
   emaggedInventory:
     DrinkNukieCan: 2
-    DrinkChangelingStingCan: 2
index 719693804fd47b9c65fa45fbd5f90e2bcfe35f36..27fbf7ab5c372dbda3019de352b8fa6ce5e0f348 100644 (file)
@@ -41,5 +41,4 @@
   contrabandInventory:
     TobaccoSeeds: 2
     FoodSnackSemki: 2
-  emaggedInventory:
     FlyAmanitaSeeds: 1
index 5523b80b8132ace74546f0f6bdd7e9943564e5dd..ebe8e17eb0294fe00b0d3121dc30b6920e817afa 100644 (file)
@@ -8,6 +8,6 @@
   contrabandInventory:
     DrinkStarkistCan: 2
     ToyHammer: 1
+    DrinkChangelingStingCan: 2
   emaggedInventory:
     DrinkNukieCan: 2
-    DrinkChangelingStingCan: 2
index 5566ea7d0d17caf4f02f11944bd15639f0090fa9..680be21b0558fd1758ed043329b68c3e5cf8dfa9 100644 (file)
@@ -11,6 +11,6 @@
     DrinkFourteenLokoCan: 3
   contrabandInventory:
     DrinkColaBottleFull: 2
+    DrinkChangelingStingCan: 3
   emaggedInventory:
     DrinkNukieCan: 3
-    DrinkChangelingStingCan: 3
index d76db2a38bfd3b2a83c56530f6bdcf9bcc70d12e..dc39da7c865a6b8ec05c253044e41bb83c18d7e6 100644 (file)
@@ -11,6 +11,6 @@
   contrabandInventory:
     DrinkSpaceMountainWindBottleFull: 2
     DrinkSpaceUpBottleFull: 2
+    DrinkChangelingStingCan: 2
   emaggedInventory:
     DrinkNukieCan: 2
-    DrinkChangelingStingCan: 2
index dac70985ab713789b646b6b647d059db3705ffa6..ec6a626f51fcb34fa87cd016076b37eb1561ebf9 100644 (file)
@@ -11,6 +11,6 @@
     DrinkFourteenLokoCan: 2
   contrabandInventory:
     FoodBurgerCarp: 2
+    DrinkChangelingStingCan: 2
   emaggedInventory:
     DrinkNukieCan: 2
-    DrinkChangelingStingCan: 2
index a36c5e4dc52dbf9957e8f75aa7eede212c6eaba8..d67412970f4dcbec5da2104414a3e6f3f03cb7cf 100644 (file)
@@ -10,8 +10,8 @@
     FoodTinBeans: 3
     FoodTinPeaches: 3
     DrinkBeerCan: 6
-  emaggedInventory:
     KitchenKnife: 2
+  emaggedInventory:
     ClothingMaskBreath: 3
     EmergencyOxygenTankFilled: 3
     DrinkNukieCan: 2
index 688706462bb1efcc98ff9d45088779c7e9b5887f..a1add7c18b2ee1b8c9d0fa23497bf1ef9b7225e4 100644 (file)
@@ -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 
index 015bfc22e12c4c31462f421ffea5b6157d517c81..b00fff1cb481381749af4a85917814a020ac76c8 100644 (file)
@@ -59,7 +59,6 @@
     ClothingHeadHatRichard: 1
     ToyFigurineBoxer: 1
     ToyFigurineMusician: 1
-  emaggedInventory:
     ClothingShoesBling: 1
     ClothingShoesBootsCowboyFancy: 1
     ClothingOuterDogi: 1
index 61089187e54d16c07ce13da38a6d687cadc4637e..8100c298068b937f48202965104b0494ae2d80c4 100644 (file)
@@ -19,8 +19,6 @@
     ClothingHeadHatCanadaBeanie: 4
     ClothingHeadHatSantahat: 2
     ClothingHeadHatXmasCrown: 2
-
   emaggedInventory:
     ClothingNeckScarfStripedSyndieGreen: 3
     ClothingNeckScarfStripedSyndieRed: 3
-    ClothingNeckScarfStripedCentcom: 3
index 71beff3cf5220da647e66d384eb9c2cc334cbbb2..ee4fdb95f691ff2b9be57404b226777a239247b0 100644 (file)
@@ -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