Vending machine minor buff (#3777)

2026-01-30 19:06:45 +05:00 · 2026-01-30 19:06:45 +05:00 · 8afa2896de
commit 8afa2896de
parent 50a1b60c68
12 changed files with 70 additions and 19 deletions
--- a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
+++ b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
@ -438,7 +438,7 @@ public abstract partial class SharedVendingMachineSystem : EntitySystem

        uint restock = amount;

-        if (type == InventoryType.Regular)
+        if (type == InventoryType.Regular || type == InventoryType.Contraband)
        {
            var chanceOfMissingStock = 1 - restockQuality;
            var result = Randomizer.NextFloat(0, 1);
--- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/outerclothing/coats.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/outerclothing/coats.ftl
@ -72,3 +72,5 @@ ent-ClothingOuterLeatherCoat = leather jacket
    .desc = Perfect for performances!
 ent-ClothingOuterLeatherCoatOpened = leather jacket
    .desc = Perfect for performances!
+ent-ClothingOuterAerostaticBomberJacketArmored = armored aerostatic bomber jacket
+    .desc = A jacket once worn by the revolutionary air brigades during the Antecentennial Revolution. There are quite a few pockets on the inside, mostly for storing notebooks and compasses.
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/outerclothing/coats.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/outerclothing/coats.ftl
@ -72,3 +72,5 @@ ent-ClothingOuterLeatherCoat = кожаная куртка
    .desc = Прекрасно подходит для выступлений!
 ent-ClothingOuterLeatherCoatOpened = кожаная куртка
    .desc = Прекрасно подходит для выступлений!
+ent-ClothingOuterAerostaticBomberJacketArmored = бронированная аэростатическая куртка-бомбер
+    .desc = Куртка, которую носили революционные воздушные бригады во время Мировой революции. Внутри довольно много карманов, в основном для хранения блокнотов и компасов.
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
@ -19,3 +19,4 @@
    ClothingEyesGlassesSunglasses: 2
  contrabandInventory:
    ToyFigurineBartender: 1
+    BoxBeanbag: 1 # Sunrise Edit 
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml
@ -11,4 +11,10 @@
  contrabandInventory:
    FoodBakedDumplings: 2
    FoodSoupMiso: 2
+# Sunrise start
+    FoodRiceBoiled: 2
+    FoodRiceEgg: 2
+    FoodRicePork: 2
+# Sunrise end
 # rice?
+# Yes for rice
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
@ -25,4 +25,11 @@
    FoodBoxDonkpocket: 1
    FoodFrozenSandwich: 2
    FoodFrozenSandwichStrawberry: 2
-
+    # Sunrise Start
+    FoodMeatFish: 3 
+    FoodMeatHuman: 3
+    FoodMeatClown: 2
+    FoodMeatAnomaly: 1
+  emaggedInventory:
+    FoodMeatDragon: 2
+    # Sunrise End
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
@ -18,3 +18,11 @@
    ClothingHeadsetSecurity: 2
  contrabandInventory:
    ToyFigurineDetective: 1
+    # Sunrise Start
+    ClothingEyesBinoclardLenses: 1 
+    ClothingHandsGlovesAerostatic: 1
+    ClothingNeckHorrific: 1
+    ClothingOuterAerostaticBomberJacketArmored: 1
+    ClothingShoesGreenLizardskin: 1
+    ClothingUniformJumpsuitSuperstarCop: 1 
+    # Sunrise End
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
@ -12,7 +12,7 @@
    ClothingUniformJumpsuitLawyerGood: 1
    ClothingUniformJumpskirtLawyerGood: 1
    ClothingShoesBootsLaceup: 2
-    ClothingHeadsetIAA: 2
+    ClothingHeadsetLawyer: 2 # Sunrise Edit no more IAA headset abuse
    ClothingNeckLawyerbadge: 2
    BriefcaseBrown: 2
    ClothingHandsGlovesColorWhite: 1
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml
@ -12,3 +12,6 @@
    WeaponProtoKineticAccelerator: 4
  contrabandInventory:
    PlushieCarp: 1
+    PlushieMagicarp: 1 # Sunrise-Edit
+    PlushieHolocarp: 1 # Sunrise-Edit
+    # no rainbow carp(( 
--- 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 # Sunrise-edit
+    ClothingHandsTacticalMaidGloves: 5 # Sunrise-edit
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@ -208,7 +208,7 @@
    pack: GenericVendGoodbyes
  - type: Transform
    noRot: false
-  - type: PlayerCountDependentStock  # Sunrise-vend
+  - type: PlayerCountDependentStock  # Sunrise-Edit

 - type: entity
  parent: VendingMachine
@ -269,6 +269,7 @@
    guides:
    - Bartender
    - Drinks
+  - type: PlayerCountDependentStock  # Sunrise-Edit

 - type: entity
  parent: VendingMachineBooze
@ -366,6 +367,7 @@
    radius: 1.5
    energy: 3.0
    color: "#4b93ad"
+  - type: PlayerCountDependentStock  # Sunrise-Edit

 - type: entity
  parent: VendingMachine
@ -396,7 +398,7 @@
      shader: unshaded
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
-  - type: PlayerCountDependentStock  # Sunrise-vend
+  - type: PlayerCountDependentStock  # Sunrise-Edit

 - type: entity
  parent: VendingMachine
@ -500,7 +502,7 @@
    radius: 1.5
    energy: 2.0
    color: "#ad7c4b"
-  - type: PlayerCountDependentStock  # Sunrise-vend
+  - type: PlayerCountDependentStock  # Sunrise-Edit

 - type: entity
  parent: VendingMachine
@ -537,7 +539,7 @@
    radius: 1.5
    energy: 3.0
    color: "#3c5eb5"
-  - type: PlayerCountDependentStock  # Sunrise-vend
+  - type: PlayerCountDependentStock  # Sunrise-Edit

 - type: entity
  parent: VendingMachineCola
@ -681,7 +683,7 @@
    radius: 1.5
    energy: 3.0
    color: "#66538F"
-  - type: PlayerCountDependentStock  # Sunrise-vend
+  - type: PlayerCountDependentStock  # Sunrise-Edit

 - type: entity
  parent: VendingMachine
@ -718,7 +720,7 @@
    radius: 1.5
    energy: 3.0
    color: "#6927C5"
-  - type: PlayerCountDependentStock  # Sunrise-vend
+  - type: PlayerCountDependentStock  # Sunrise-Edit

 - type: entity
  parent: VendingMachine
@ -755,7 +757,7 @@
    radius: 1.5
    energy: 3.0
    color: "#D82929"
-  - type: PlayerCountDependentStock  # Sunrise-vend
+  - type: PlayerCountDependentStock  # Sunrise-Edit

 - type: entity
  parent: VendingMachine
@ -792,7 +794,7 @@
    radius: 1.5
    energy: 3.0
    color: "#00E645"
-  - type: PlayerCountDependentStock  # Sunrise-vend
+  - type: PlayerCountDependentStock  # Sunrise-Edit

 - type: entity
  parent: VendingMachine
@ -889,7 +891,7 @@
    radius: 1.5
    energy: 3.0
    color: "#6148c7"
-  - type: PlayerCountDependentStock  # Sunrise-vend
+  - type: PlayerCountDependentStock  # Sunrise-Edit

 - type: entity
  parent: VendingMachine
@ -956,6 +958,7 @@
  - type: GuideHelp
    guides:
    - MedicalDoctor
+  - type: PlayerCountDependentStock  # Sunrise-Edit

 - type: entity
  parent: VendingMachineMedicalBase
@ -976,6 +979,7 @@
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: AccessReader
    access: [["Medical"]]
+  - type: PlayerCountDependentStock  # Sunrise-Edit

 - type: entity
  parent: VendingMachine
@ -1124,7 +1128,7 @@
    radius: 1.5
    energy: 3.0
    color: "#c73434"
-  - type: PlayerCountDependentStock  # Sunrise-vend
+  - type: PlayerCountDependentStock  # Sunrise-Edit

 - type: entity
  parent: VendingMachineSnack
@ -1155,7 +1159,7 @@
    radius: 1.5
    energy: 3.0
    color: "#737785"
-  - type: PlayerCountDependentStock  # Sunrise-vend
+  - type: PlayerCountDependentStock  # Sunrise-Edit

 - type: entity
  parent: VendingMachineSnack
@ -1273,7 +1277,7 @@
    energy: 3.0
    color: "#389690"
  - type: RussianAccent
-  - type: PlayerCountDependentStock  # Sunrise-vend
+  - type: PlayerCountDependentStock  # Sunrise-Edit

 - type: entity
  parent: VendingMachine
@ -1472,7 +1476,7 @@
    radius: 1.5
    energy: 3.0
    color: "#ffe599"
-  - type: PlayerCountDependentStock  # Sunrise-vend
+  - type: PlayerCountDependentStock  # Sunrise-Edit

 - type: entity
  parent: VendingMachine
@ -1538,7 +1542,7 @@
    radius: 1.5
    energy: 3.0
    color: "#d4ab33"
-  - type: PlayerCountDependentStock  # Sunrise-vend
+  - type: PlayerCountDependentStock  # Sunrise-Edit

 # job clothing

@ -2318,6 +2322,7 @@
  - type: GuideHelp
    guides:
    - Medical
+  - type: PlayerCountDependentStock  # Sunrise-Edit
  #Sunrise-Start

 - type: entity
@ -2357,3 +2362,4 @@
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: AccessReader
    access: [["Medical"]]
+  - type: PlayerCountDependentStock  # Sunrise-Edit
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/coats.yml
@ -350,6 +350,22 @@
  - type: Clothing
    sprite: _Sunrise/Clothing/OuterClothing/Coats/hos_overcoat.rsi

+- type: entity
+  parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, ClothingOuterArmorBase] 
+  id: ClothingOuterAerostaticBomberJacketArmored
+  name: armored aerostatic bomber jacket
+  description: A jacket once worn by the revolutionary air brigades during the Antecentennial Revolution. There are quite a few pockets on the inside, mostly for storing notebooks and compasses.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/OuterClothing/Coats/kim.rsi
+  - type: Clothing
+    sprite: _Sunrise/Clothing/OuterClothing/Coats/kim.rsi
+  - type: Tag
+    tags:
+      - Vest
+      - NudeBottom  # INTERACTIONS
+      - WhitelistChameleon
+
 - type: entity
  parent: ClothingOuterBase
  id: ClothingOuterAerostaticBomberJacket