From d9ee46f4ba0c104e2fed31f3e121273fbe692626 Mon Sep 17 00:00:00 2001 From: pacable <77161122+pxc1984@users.noreply.github.com> Date: Wed, 3 Jul 2024 13:35:43 +0300 Subject: [PATCH] =?UTF-8?q?Revert=20=D1=85=D1=83=D0=B5=D1=82=D1=8B=20?= =?UTF-8?q?=D0=B8=D0=B7=20=D0=BC=D0=BE=D0=B5=D0=B3=D0=BE=20=D0=9F=D0=A0?= =?UTF-8?q?=D0=B0=20=D0=B8=20=D1=80=D0=B5=D0=B2=D0=BE=D1=80=D0=BA=20=D0=B5?= =?UTF-8?q?=D0=B5=20(#168)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Revert "Увеличена ёмкость СМЭС и подстанций" This reverts commit 895fc102cfd526b237d285425443d9e439e4be53. * Reverse Signed-off-by: JDtrimble * Подредачил систему рандомизации лута в торгоматах. Посмотрим как выйдет Signed-off-by: JDtrimble * Вернул изменение СМЭСов, которое не повлияет на злосчастный фронтир --------- Signed-off-by: JDtrimble --- .../SharedVendingMachineSystem.cs | 50 ++++++++++--- .../VendingMachineComponent.cs | 21 +++++- Resources/Maps/_Sunrise/Station/box.yml | 4 +- Resources/Maps/_Sunrise/Station/centcomm.yml | 4 +- Resources/Maps/_Sunrise/Station/cluster.yml | 4 +- Resources/Maps/_Sunrise/Station/delta.yml | 4 +- Resources/Maps/_Sunrise/Station/fland.yml | 4 +- Resources/Maps/_Sunrise/Station/marathon.yml | 4 +- .../Inventories/atmosdrobe.yml | 24 +++---- .../VendingMachines/Inventories/bardrobe.yml | 30 ++++---- .../Inventories/cargodrobe.yml | 28 ++++---- .../VendingMachines/Inventories/cart.yml | 26 +++---- .../VendingMachines/Inventories/chang.yml | 17 ++--- .../VendingMachines/Inventories/chapel.yml | 36 +++++----- .../VendingMachines/Inventories/chefdrobe.yml | 22 +++--- .../VendingMachines/Inventories/chefvend.yml | 39 +++++----- .../VendingMachines/Inventories/chemdrobe.yml | 24 +++---- .../VendingMachines/Inventories/chemvend.yml | 42 +++++------ .../VendingMachines/Inventories/cigs.yml | 26 +++---- .../VendingMachines/Inventories/coffee.yml | 10 +-- .../VendingMachines/Inventories/cola.yml | 14 ++-- .../Inventories/condiments.yml | 34 ++++----- .../Inventories/dinnerware.yml | 48 ++++++------- .../VendingMachines/Inventories/discount.yml | 12 ++-- .../VendingMachines/Inventories/donut.yml | 8 +-- .../VendingMachines/Inventories/engivend.yml | 8 +-- .../VendingMachines/Inventories/genedrobe.yml | 16 ++--- .../VendingMachines/Inventories/gib.yml | 14 ++-- .../VendingMachines/Inventories/hydrobe.yml | 22 +++--- .../VendingMachines/Inventories/janidrobe.yml | 16 ++--- .../VendingMachines/Inventories/lawdrobe.yml | 37 +++++----- .../VendingMachines/Inventories/medical.yml | 16 ++--- .../VendingMachines/Inventories/medidrobe.yml | 8 +-- .../VendingMachines/Inventories/nutri.yml | 20 +++--- .../VendingMachines/Inventories/pwrgame.yml | 16 ++--- .../VendingMachines/Inventories/robotics.yml | 12 ++-- .../VendingMachines/Inventories/salvage.yml | 22 +++--- .../VendingMachines/Inventories/scidrobe.yml | 6 +- .../VendingMachines/Inventories/sec.yml | 34 ++++----- .../VendingMachines/Inventories/secdrobe.yml | 3 +- .../VendingMachines/Inventories/seeds.yml | 72 +++++++++---------- .../Inventories/shamblersjuice.yml | 14 ++-- .../VendingMachines/Inventories/snack.yml | 12 ++-- .../VendingMachines/Inventories/soda.yml | 14 ++-- .../Inventories/sovietsoda.yml | 2 +- .../VendingMachines/Inventories/spaceup.yml | 16 ++--- .../VendingMachines/Inventories/starkist.yml | 14 ++-- .../Inventories/sustenance.yml | 8 +-- .../VendingMachines/Inventories/vendomat.yml | 18 ++--- .../VendingMachines/Inventories/wallmed.yml | 10 +-- .../VendingMachines/Inventories/youtool.yml | 24 +++---- .../Entities/Structures/Power/smes.yml | 6 +- .../Entities/Structures/Power/substation.yml | 6 +- .../Entities/Structures/Power/smes.yml | 10 +++ .../Entities/Structures/Power/substation.yml | 10 +++ 55 files changed, 542 insertions(+), 479 deletions(-) create mode 100644 Resources/Prototypes/_Sunrise/Entities/Structures/Power/smes.yml create mode 100644 Resources/Prototypes/_Sunrise/Entities/Structures/Power/substation.yml diff --git a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs index 59f8489ac62..90c43cca6ec 100644 --- a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs +++ b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs @@ -1,12 +1,12 @@ -using Content.Shared.Emag.Components; -using Robust.Shared.Prototypes; using System.Linq; using Content.Shared.DoAfter; +using Content.Shared.Emag.Components; using Content.Shared.Interaction; using Content.Shared.Popups; -using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Network; +using Robust.Shared.Player; +using Robust.Shared.Prototypes; using Robust.Shared.Random; namespace Content.Shared.VendingMachines; @@ -19,6 +19,7 @@ public abstract partial class SharedVendingMachineSystem : EntitySystem [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; [Dependency] protected readonly SharedPopupSystem Popup = default!; [Dependency] protected readonly IRobustRandom Randomizer = default!; + [Dependency] protected readonly ISharedPlayerManager SharedPlayerSystem = default!; public override void Initialize() { @@ -33,7 +34,8 @@ protected virtual void OnComponentInit(EntityUid uid, VendingMachineComponent co } public void RestockInventoryFromPrototype(EntityUid uid, - VendingMachineComponent? component = null, float restockQuality = 1f) + VendingMachineComponent? component = null, + float restockQuality = 1f) { if (!Resolve(uid, ref component)) { @@ -43,9 +45,30 @@ public void RestockInventoryFromPrototype(EntityUid uid, if (!PrototypeManager.TryIndex(component.PackPrototypeId, out VendingMachineInventoryPrototype? packPrototype)) return; - AddInventoryFromPrototype(uid, packPrototype.StartingInventory, InventoryType.Regular, component, restockQuality); - AddInventoryFromPrototype(uid, packPrototype.EmaggedInventory, InventoryType.Emagged, component, restockQuality); - AddInventoryFromPrototype(uid, packPrototype.ContrabandInventory, InventoryType.Contraband, component, restockQuality); + FillPlayerCount(component); + + AddInventoryFromPrototype(uid, + packPrototype.StartingInventory, + InventoryType.Regular, + component, + restockQuality); + AddInventoryFromPrototype(uid, + packPrototype.EmaggedInventory, + InventoryType.Emagged, + component, + restockQuality); + AddInventoryFromPrototype(uid, + packPrototype.ContrabandInventory, + InventoryType.Contraband, + component, + restockQuality); + } + + private void FillPlayerCount(VendingMachineComponent component) + { + if (component.StartingPlayerCount != 0) + return; + component.StartingPlayerCount = SharedPlayerSystem.GetAllPlayerData().Count(); } /// @@ -72,7 +95,8 @@ public List GetAllInventory(EntityUid uid, Vending return inventory; } - public List GetAvailableInventory(EntityUid uid, VendingMachineComponent? component = null) + public List GetAvailableInventory(EntityUid uid, + VendingMachineComponent? component = null) { if (!Resolve(uid, ref component)) return new(); @@ -80,9 +104,11 @@ public List GetAvailableInventory(EntityUid uid, V return GetAllInventory(uid, component).Where(_ => _.Amount > 0).ToList(); } - private void AddInventoryFromPrototype(EntityUid uid, Dictionary? entries, + private void AddInventoryFromPrototype(EntityUid uid, + Dictionary? entries, InventoryType type, - VendingMachineComponent? component = null, float restockQuality = 1.0f) + VendingMachineComponent? component = null, + float restockQuality = 1.0f) { if (!Resolve(uid, ref component) || entries == null) { @@ -118,6 +144,10 @@ private void AddInventoryFromPrototype(EntityUid uid, Dictionary? restock = (uint) Math.Floor(amount * result / chanceOfMissingStock); } + // Sunrise-start + restock = (uint) Math.Floor(amount + component.StartingPlayerCount * component.PlayerCountModifier); + // Sunrise-end + if (inventory.TryGetValue(id, out var entry)) // Prevent a machine's stock from going over three times // the prototype's normal amount. This is an arbitrary diff --git a/Content.Shared/VendingMachines/VendingMachineComponent.cs b/Content.Shared/VendingMachines/VendingMachineComponent.cs index 23130bb8f39..39eeb4261e8 100644 --- a/Content.Shared/VendingMachines/VendingMachineComponent.cs +++ b/Content.Shared/VendingMachines/VendingMachineComponent.cs @@ -5,6 +5,7 @@ using Robust.Shared.Serialization; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; +using Component = Robust.Shared.GameObjects.Component; namespace Content.Shared.VendingMachines { @@ -14,7 +15,9 @@ public sealed partial class VendingMachineComponent : Component /// /// PrototypeID for the vending machine's inventory, see /// - [DataField("pack", customTypeSerializer: typeof(PrototypeIdSerializer), required: true)] + [DataField("pack", + customTypeSerializer: typeof(PrototypeIdSerializer), + required: true)] public string PackPrototypeId = string.Empty; /// @@ -136,6 +139,7 @@ public sealed partial class VendingMachineComponent : Component public TimeSpan NextEmpEject = TimeSpan.Zero; #region Client Visuals + /// /// RSI state for when the vending machine is unpowered. /// Will be displayed on the layer @@ -186,7 +190,16 @@ public sealed partial class VendingMachineComponent : Component /// [DataField("loopDeny")] public bool LoopDenyAnimation = true; + #endregion + + // Sunrise-start + [DataField("startingPlayerCount")] + public int StartingPlayerCount = 0; + + [DataField("playerCountModifier")] + public double PlayerCountModifier = 0.1; // +1 предмет за 10 онлайна на момент создания автомата + // Sunrise-end } [Serializable, NetSerializable] @@ -194,10 +207,13 @@ public sealed class VendingMachineInventoryEntry { [ViewVariables(VVAccess.ReadWrite)] public InventoryType Type; + [ViewVariables(VVAccess.ReadWrite)] public string ID; + [ViewVariables(VVAccess.ReadWrite)] public uint Amount; + public VendingMachineInventoryEntry(InventoryType type, string id, uint amount) { Type = type; @@ -236,10 +252,12 @@ public enum VendingMachineVisualLayers : byte /// Off / Broken. The other layers will overlay this if the machine is on. /// Base, + /// /// Normal / Deny / Eject /// BaseUnshaded, + /// /// Screens that are persistent (where the machine is not off or broken) /// @@ -261,6 +279,5 @@ public enum EjectWireKey : byte public sealed partial class VendingMachineSelfDispenseEvent : InstantActionEvent { - }; } diff --git a/Resources/Maps/_Sunrise/Station/box.yml b/Resources/Maps/_Sunrise/Station/box.yml index 6d3d5e7c605..11dec15d8bc 100644 --- a/Resources/Maps/_Sunrise/Station/box.yml +++ b/Resources/Maps/_Sunrise/Station/box.yml @@ -141210,7 +141210,7 @@ entities: - type: Transform pos: -3.5,51.5 parent: 8364 -- proto: SMESBasic +- proto: SMESExtended entities: - uid: 865 components: @@ -144069,7 +144069,7 @@ entities: - type: Transform pos: 62.5,-33.5 parent: 8364 -- proto: SubstationBasic +- proto: SubstationExtended entities: - uid: 1666 components: diff --git a/Resources/Maps/_Sunrise/Station/centcomm.yml b/Resources/Maps/_Sunrise/Station/centcomm.yml index 5e809f2b622..8263d003acf 100644 --- a/Resources/Maps/_Sunrise/Station/centcomm.yml +++ b/Resources/Maps/_Sunrise/Station/centcomm.yml @@ -33039,7 +33039,7 @@ entities: rot: 1.5707963267948966 rad pos: 19.5,-24.5 parent: 1668 -- proto: SMESBasic +- proto: SMESExtended entities: - uid: 327 components: @@ -33254,7 +33254,7 @@ entities: - type: Transform pos: 4.4667654,19.499214 parent: 1668 -- proto: SubstationBasic +- proto: SubstationExtended entities: - uid: 1130 components: diff --git a/Resources/Maps/_Sunrise/Station/cluster.yml b/Resources/Maps/_Sunrise/Station/cluster.yml index 53d82912bec..563a095eae4 100644 --- a/Resources/Maps/_Sunrise/Station/cluster.yml +++ b/Resources/Maps/_Sunrise/Station/cluster.yml @@ -66519,7 +66519,7 @@ entities: - type: Transform pos: 18.5,-0.5 parent: 1 -- proto: SMESBasic +- proto: SMESExtended entities: - uid: 1097 components: @@ -67724,7 +67724,7 @@ entities: - type: Transform pos: 19.622953,15.5812435 parent: 1 -- proto: SubstationBasic +- proto: SubstationExtended entities: - uid: 1469 components: diff --git a/Resources/Maps/_Sunrise/Station/delta.yml b/Resources/Maps/_Sunrise/Station/delta.yml index 7f0e6bae31c..45bb647d569 100644 --- a/Resources/Maps/_Sunrise/Station/delta.yml +++ b/Resources/Maps/_Sunrise/Station/delta.yml @@ -223940,7 +223940,7 @@ entities: - type: Transform pos: -29.5,44.5 parent: 13307 -- proto: SMESBasic +- proto: SMESExtended entities: - uid: 232 components: @@ -228562,7 +228562,7 @@ entities: - type: Transform pos: 11.549865,-31.462252 parent: 13307 -- proto: SubstationBasic +- proto: SubstationExtended entities: - uid: 1486 components: diff --git a/Resources/Maps/_Sunrise/Station/fland.yml b/Resources/Maps/_Sunrise/Station/fland.yml index c17ca2bd08d..00964a6f052 100644 --- a/Resources/Maps/_Sunrise/Station/fland.yml +++ b/Resources/Maps/_Sunrise/Station/fland.yml @@ -184376,7 +184376,7 @@ entities: - type: Transform pos: 32.5,42.5 parent: 13329 -- proto: SMESBasic +- proto: SMESExtended entities: - uid: 3711 components: @@ -188844,7 +188844,7 @@ entities: - type: Transform pos: 41.39552,9.469629 parent: 13329 -- proto: SubstationBasic +- proto: SubstationExtended entities: - uid: 2337 components: diff --git a/Resources/Maps/_Sunrise/Station/marathon.yml b/Resources/Maps/_Sunrise/Station/marathon.yml index 9dd74faf909..e4f47b34b8a 100644 --- a/Resources/Maps/_Sunrise/Station/marathon.yml +++ b/Resources/Maps/_Sunrise/Station/marathon.yml @@ -115324,7 +115324,7 @@ entities: - type: Transform pos: -10.5,-9.5 parent: 30 -- proto: SMESBasic +- proto: SMESExtended entities: - uid: 5472 components: @@ -118001,7 +118001,7 @@ entities: - type: ContainerContainer containers: cell_slot: !type:ContainerSlot {} -- proto: SubstationBasic +- proto: SubstationExtended entities: - uid: 1414 components: diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml index 8722b1ad988..72864ba851f 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml @@ -1,15 +1,15 @@ - type: vendingMachineInventory id: AtmosDrobeInventory startingInventory: - ClothingBackpackDuffelAtmospherics: 6 # Sunrise-edit - ClothingBackpackSatchelAtmospherics: 6 # Sunrise-edit - ClothingBackpackAtmospherics: 6 # Sunrise-edit - ClothingUniformJumpsuitAtmos: 5 # Sunrise-edit - ClothingUniformJumpskirtAtmos: 5 # Sunrise-edit - ClothingUniformJumpsuitAtmosCasual: 5 # Sunrise-edit - ClothingShoesColorWhite: 5 # Sunrise-edit - ClothingHeadsetEngineering: 4 # Sunrise-edit - ClothingHeadHelmetFire: 4 # Sunrise-edit - ClothingOuterSuitFire: 4 # Sunrise-edit - ClothingOuterWinterAtmos: 4 # Sunrise-edit - ClothingNeckScarfStripedLightBlue: 6 # Sunrise-edit + ClothingBackpackDuffelAtmospherics: 2 + ClothingBackpackSatchelAtmospherics: 2 + ClothingBackpackAtmospherics: 2 + ClothingUniformJumpsuitAtmos: 3 + ClothingUniformJumpskirtAtmos: 3 + ClothingUniformJumpsuitAtmosCasual: 3 + ClothingShoesColorWhite: 3 + ClothingHeadsetEngineering: 2 + ClothingHeadHelmetFire: 2 + ClothingOuterSuitFire: 2 + ClothingOuterWinterAtmos: 2 + ClothingNeckScarfStripedLightBlue: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml index 95a82b69c70..5e4b0561762 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml @@ -1,19 +1,19 @@ - type: vendingMachineInventory id: BarDrobeInventory startingInventory: - ClothingHeadHatBowlerHat: 4 # Sunrise-edit - ClothingHeadHatTophat: 4 # Sunrise-edit - ClothingEyesHudBeer: 3 # Sunrise-edit - ClothingEyesEyepatchHudBeer: 3 # Sunrise-edit - ClothingHeadsetService: 5 # Sunrise-edit - ClothingOuterApronBar: 4 # Sunrise-edit - ClothingOuterWinterBar: 4 # Sunrise-edit - ClothingUniformJumpsuitBartender: 4 # Sunrise-edit - ClothingUniformJumpskirtBartender: 4 # Sunrise-edit - ClothingUniformJumpsuitBartenderPurple: 4 # Sunrise-edit - ClothingShoesColorBlack: 4 # Sunrise-edit - ClothingOuterArmorBasicSlim: 4 # Sunrise-edit - ClothingOuterVest: 4 # Sunrise-edit - ClothingBeltBandolier: 4 # Sunrise-edit - ClothingEyesGlassesSunglasses: 4 # Sunrise-edit + ClothingHeadHatBowlerHat: 2 + ClothingHeadHatTophat: 2 + ClothingEyesHudBeer: 2 + ClothingEyesEyepatchHudBeer: 2 + ClothingHeadsetService: 2 + ClothingOuterApronBar: 2 + ClothingOuterWinterBar: 2 + ClothingUniformJumpsuitBartender: 2 + ClothingUniformJumpskirtBartender: 2 + ClothingUniformJumpsuitBartenderPurple: 2 + ClothingShoesColorBlack: 2 + ClothingOuterArmorBasicSlim: 2 + ClothingOuterVest: 2 + ClothingBeltBandolier: 2 + ClothingEyesGlassesSunglasses: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml index 8b365b9d9d0..d1e80ba0c80 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml @@ -1,17 +1,17 @@ - type: vendingMachineInventory id: CargoDrobeInventory startingInventory: - ClothingBackpackCargo: 6 # Sunrise-edit - ClothingBackpackSatchelCargo: 6 # Sunrise-edit - ClothingBackpackDuffelCargo: 6 # Sunrise-edit - ClothingUniformJumpsuitCargo: 5 # Sunrise-edit - ClothingUniformJumpskirtCargo: 5 # Sunrise-edit - ClothingShoesColorBlack: 5 # Sunrise-edit - ClothingHandsGlovesFingerless: 6 # Sunrise-edit - ClothingHeadHatCargosoft: 6 # Sunrise-edit - ClothingHeadBandBrown: 6 # Sunrise-edit - ClothingHeadsetCargo: 9 # Sunrise-edit - ClothingOuterWinterCargo: 4 # Sunrise-edit - ClothingOuterWinterMiner: 4 # Sunrise-edit - ClothingNeckScarfStripedBrown: 6 # Sunrise-edit - ClothingShoesBootsWinterCargo: 4 # Sunrise-edit + ClothingBackpackCargo: 3 + ClothingBackpackSatchelCargo: 3 + ClothingBackpackDuffelCargo: 3 + ClothingUniformJumpsuitCargo: 3 + ClothingUniformJumpskirtCargo: 3 + ClothingShoesColorBlack: 3 + ClothingHandsGlovesFingerless: 3 + ClothingHeadHatCargosoft: 3 + ClothingHeadBandBrown: 3 + ClothingHeadsetCargo: 3 + ClothingOuterWinterCargo: 2 + ClothingOuterWinterMiner: 2 + ClothingNeckScarfStripedBrown: 3 + ClothingShoesBootsWinterCargo: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml index e457d8cccd8..cb0ef3246d3 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml @@ -1,16 +1,16 @@ - type: vendingMachineInventory id: PTechInventory startingInventory: - PassengerPDA: 10 # Sunrise-edit - ClearPDA: 10 # Sunrise-edit - PassengerIDCard: 10 # Sunrise-edit - ClothingHeadsetGrey: 10 # Sunrise-edit - RubberStampApproved: 2 # Sunrise-edit - RubberStampDenied: 2 # Sunrise-edit - Paper: 20 # Sunrise-edit - EncryptionKeyCargo: 5 # Sunrise-edit - EncryptionKeyEngineering: 5 # Sunrise-edit - EncryptionKeyMedical: 5 # Sunrise-edit - EncryptionKeyScience: 5 # Sunrise-edit - EncryptionKeySecurity: 3 # Sunrise-edit - EncryptionKeyService: 6 # Sunrise-edit + PassengerPDA: 5 + ClearPDA: 5 + PassengerIDCard: 5 + ClothingHeadsetGrey: 5 + RubberStampApproved: 1 + RubberStampDenied: 1 + Paper: 10 + EncryptionKeyCargo: 2 + EncryptionKeyEngineering: 2 + EncryptionKeyMedical: 2 + EncryptionKeyScience: 2 + EncryptionKeySecurity: 1 + EncryptionKeyService: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml index 3a51c2a70f7..5befd85ca84 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml @@ -1,14 +1,11 @@ - type: vendingMachineInventory id: ChangInventory startingInventory: - FoodCondimentPacketSoy: 15 # Sunrise-edit - FoodSnackCookieFortune: 15 # Sunrise-edit - DrinkRamen: 9 # Sunrise-edit - DrinkHellRamen: 9 # Sunrise-edit - FoodSnackChowMein: 9 # Sunrise-edit - FoodSnackDanDanNoodles: 9 # Sunrise-edit - PairedChopsticks: 9 # Sunrise-edit - FoodRiceBoiled: 9 # Sunrise-vend - FoodRiceEgg: 5 # Sunrise-vend - FoodRicePork: 5 # Sunrise-vend + FoodCondimentPacketSoy: 5 + FoodSnackCookieFortune: 5 + DrinkRamen: 3 + DrinkHellRamen: 3 + FoodSnackChowMein: 3 + FoodSnackDanDanNoodles: 3 + PairedChopsticks: 3 # rice? diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml index 2e1b3e609c8..33a13dab0a0 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml @@ -1,24 +1,24 @@ - type: vendingMachineInventory id: PietyVendInventory startingInventory: - ClothingUniformJumpsuitChaplain: 4 # Sunrise-edit - ClothingUniformJumpskirtChaplain: 4 # Sunrise-edit - ClothingUniformJumpsuitMonasticRobeDark: 2 # Sunrise-edit - ClothingUniformJumpsuitMonasticRobeLight: 2 # Sunrise-edit - ClothingNeckStoleChaplain: 2 # Sunrise-edit - ClothingOuterHoodieChaplain: 2 # Sunrise-edit - ClothingOuterHoodieBlack: 2 # Sunrise-edit - ClothingHeadHatHoodNunHood: 2 # Sunrise-edit - ClothingOuterNunRobe: 2 # Sunrise-edit - ClothingHeadHatFez: 2 # Sunrise-edit - ClothingHeadHatPlaguedoctor: 2 # Sunrise-edit - ClothingHeadHatWitch: 2 # Sunrise-edit - ClothingHeadHatWitch1: 2 # Sunrise-edit - ClothingOuterPlagueSuit: 2 # Sunrise-edit - ClothingMaskPlague: 2 # Sunrise-edit - ClothingHeadsetService: 4 # Sunrise-edit - BoxCandle: 4 # Sunrise-edit - BoxCandleSmall: 4 # Sunrise-edit + ClothingUniformJumpsuitChaplain: 2 + ClothingUniformJumpskirtChaplain: 2 + ClothingUniformJumpsuitMonasticRobeDark: 1 + ClothingUniformJumpsuitMonasticRobeLight: 1 + ClothingNeckStoleChaplain: 1 + ClothingOuterHoodieChaplain: 1 + ClothingOuterHoodieBlack: 1 + ClothingHeadHatHoodNunHood: 1 + ClothingOuterNunRobe: 1 + ClothingHeadHatFez: 1 + ClothingHeadHatPlaguedoctor: 1 + ClothingHeadHatWitch: 1 + ClothingHeadHatWitch1: 1 + ClothingOuterPlagueSuit: 1 + ClothingMaskPlague: 1 + ClothingHeadsetService: 2 + BoxCandle: 2 + BoxCandleSmall: 2 Urn: 5 emaggedInventory: ClothingOuterArmorCult: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml index 6cd89409411..4379a978966 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml @@ -1,14 +1,14 @@ - type: vendingMachineInventory id: ChefDrobeInventory startingInventory: - ClothingHeadsetService: 4 # Sunrise-edit - ClothingOuterApronChef: 5 # Sunrise-edit - ClothingOuterWinterChef: 4 # Sunrise-edit - ClothingOuterJacketChef: 2 # Sunrise-edit - ClothingUniformJumpsuitChef: 2 # Sunrise-edit - ClothingMaskItalianMoustache: 4 # Sunrise-edit - ClothingUniformJumpskirtChef: 4 # Sunrise-edit - ClothingHeadHatChef: 4 # Sunrise-edit - ClothingShoesColorBlack: 4 # Sunrise-edit - ClothingShoesChef: 4 # Sunrise-edit - ClothingBeltChef: 4 # Sunrise-edit + ClothingHeadsetService: 2 + ClothingOuterApronChef: 3 + ClothingOuterWinterChef: 2 + ClothingOuterJacketChef: 1 + ClothingUniformJumpsuitChef: 1 + ClothingMaskItalianMoustache: 2 + ClothingUniformJumpskirtChef: 2 + ClothingHeadHatChef: 2 + ClothingShoesColorBlack: 2 + ClothingShoesChef: 2 + ClothingBeltChef: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml index 3b117af7a36..f844fb768ab 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml @@ -1,22 +1,23 @@ - type: vendingMachineInventory id: ChefvendInventory startingInventory: - ReagentContainerFlour: 6 # Sunrise-edit - ReagentContainerCornmeal: 6 # Sunrise-edit - ReagentContainerSugar: 6 # Sunrise-edit - ReagentContainerRice: 6 # Sunrise-edit - FoodCondimentPacketSalt: 8 # Sunrise-edit - FoodCondimentBottleEnzyme: 6 # Sunrise-edit - FoodCondimentBottleHotsauce: 2 # Sunrise-edit - FoodCondimentBottleKetchup: 2 # Sunrise-edit - FoodCondimentBottleBBQ: 2 # Sunrise-edit - FoodCondimentBottleVinegar: 6 # Sunrise-edit - ReagentContainerOliveoil: 6 # Sunrise-edit - ReagentContainerMayo: 2 # Sunrise-edit - VariantCubeBox: 2 # Sunrise-edit - FoodContainerEgg: 2 # Sunrise-edit - DrinkMilkCarton: 6 # Sunrise-edit - DrinkSoyMilkCarton: 2 # Sunrise-edit - FoodButter: 8 # Sunrise-edit - FoodCheese: 2 # Sunrise-edit - FoodMeat: 12 # Sunrise-edit + ReagentContainerFlour: 2 + ReagentContainerCornmeal: 2 + ReagentContainerSugar: 2 + ReagentContainerRice: 2 + FoodCondimentPacketSalt: 4 + FoodCondimentBottleEnzyme: 2 + FoodCondimentBottleHotsauce: 1 + FoodCondimentBottleKetchup: 1 + FoodCondimentBottleBBQ: 1 + FoodCondimentBottleVinegar: 2 + ReagentContainerOliveoil: 2 + ReagentContainerMayo: 1 + VariantCubeBox: 1 + FoodContainerEgg: 1 + DrinkMilkCarton: 2 + DrinkSoyMilkCarton: 1 + FoodButter: 4 + FoodCheese: 1 + FoodMeat: 6 + diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml index 8fa3aca8be5..d028c55cabc 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml @@ -1,15 +1,15 @@ - type: vendingMachineInventory id: ChemDrobeInventory startingInventory: - ClothingUniformJumpsuitChemistry: 3 # Sunrise-edit - ClothingUniformJumpskirtChemistry: 3 # Sunrise-edit - ClothingOuterCoatLabChem: 3 # Sunrise-edit - ClothingShoesColorWhite: 3 # Sunrise-edit - ClothingBackpackChemistry: 3 # Sunrise-edit - ClothingBackpackSatchelChemistry: 3 # Sunrise-edit - ClothingBackpackDuffelChemistry: 4 # Sunrise-edit - ChemBag: 4 # Sunrise-edit - ClothingBeltMedical: 4 # Sunrise-edit - ClothingHandsGlovesLatex: 4 # Sunrise-edit - ClothingHeadsetMedical: 4 # Sunrise-edit - ClothingOuterWinterChem: 4 # Sunrise-edit + ClothingUniformJumpsuitChemistry: 2 + ClothingUniformJumpskirtChemistry: 2 + ClothingOuterCoatLabChem: 2 + ClothingShoesColorWhite: 2 + ClothingBackpackChemistry: 2 + ClothingBackpackSatchelChemistry: 2 + ClothingBackpackDuffelChemistry: 2 + ChemBag: 2 + ClothingBeltMedical: 2 + ClothingHandsGlovesLatex: 2 + ClothingHeadsetMedical: 2 + ClothingOuterWinterChem: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml index 2c1e8d306ff..3dfe0264920 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml @@ -1,27 +1,27 @@ - type: vendingMachineInventory id: ChemVendInventory startingInventory: - Jug: 12 # Sunrise-edit - JugAluminium: 4 # Sunrise-edit - JugCarbon: 4 # Sunrise-edit - JugChlorine: 4 # Sunrise-edit - JugCopper: 4 # Sunrise-edit - JugEthanol: 4 # Sunrise-edit - JugFluorine: 4 # Sunrise-edit - JugHydrogen: 4 # Sunrise-edit - JugIodine: 4 # Sunrise-edit - JugIron: 4 # Sunrise-edit - JugLithium: 4 # Sunrise-edit - JugMercury: 4 # Sunrise-edit - JugNitrogen: 4 # Sunrise-edit - JugOxygen: 4 # Sunrise-edit - JugPhosphorus: 4 # Sunrise-edit - JugPotassium: 4 # Sunrise-edit - JugRadium: 4 # Sunrise-edit - JugSilicon: 4 # Sunrise-edit - JugSodium: 4 # Sunrise-edit - JugSugar: 4 # Sunrise-edit - JugSulfur: 4 # Sunrise-edit + Jug: 4 + JugAluminium: 2 + JugCarbon: 4 + JugChlorine: 1 + JugCopper: 2 + JugEthanol: 2 + JugFluorine: 1 + JugHydrogen: 3 + JugIodine: 1 + JugIron: 2 + JugLithium: 2 + JugMercury: 1 + JugNitrogen: 3 + JugOxygen: 3 + JugPhosphorus: 1 + JugPotassium: 2 + JugRadium: 1 + JugSilicon: 2 + JugSodium: 2 + JugSugar: 3 + JugSulfur: 1 emaggedInventory: ToxinChemistryBottle: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml index 91f36635201..4b21e05235b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml @@ -1,18 +1,18 @@ - type: vendingMachineInventory id: CigaretteMachineInventory startingInventory: - CigPackGreen: 6 # Sunrise-edit - CigPackRed: 6 # Sunrise-edit - CigPackBlue: 6 # Sunrise-edit - CigPackBlack: 6 # Sunrise-edit - CigPackMixed: 6 # Sunrise-edit - CigarCase: 3 # Sunrise-edit - SmokingPipeFilledTobacco: 3 # Sunrise-edit - Vape: 3 # Sunrise-edit - Matchbox: 6 # Sunrise-edit - PackPaperRollingFilters: 6 # Sunrise-edit - CheapLighter: 8 # Sunrise-edit - Lighter: 6 # Sunrise-edit - FlippoLighter: 4 # Sunrise-edit + CigPackGreen: 2 + CigPackRed: 2 + CigPackBlue: 2 + CigPackBlack: 2 + CigPackMixed: 2 + CigarCase: 1 + SmokingPipeFilledTobacco: 1 + Vape: 1 + Matchbox: 5 + PackPaperRollingFilters: 3 + CheapLighter: 4 + Lighter: 2 + FlippoLighter: 2 emaggedInventory: CigPackSyndicate: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml index 78b9817dfac..2d65fa1f71e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml @@ -1,10 +1,10 @@ - type: vendingMachineInventory id: HotDrinksMachineInventory startingInventory: - DrinkHotCoffee: 10 # Sunrise-edit - DrinkCafeLatte: 10 # Sunrise-edit - DrinkTeacup: 10 # Sunrise-edit - DrinkGreenTea: 10 # Sunrise-edit - DrinkHotCoco: 10 # Sunrise-edit + DrinkHotCoffee: 5 + DrinkCafeLatte: 5 + DrinkTeacup: 5 + DrinkGreenTea: 5 + DrinkHotCoco: 5 emaggedInventory: DrinkNothing: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml index 42093eada81..ace91025623 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml @@ -1,13 +1,13 @@ - type: vendingMachineInventory id: RobustSoftdrinksInventory startingInventory: - DrinkColaCan: 12 # Sunrise-edit - DrinkGrapeCan: 6 # Sunrise-edit - DrinkRootBeerCan: 6 # Sunrise-edit - DrinkIcedTeaCan: 6 # Sunrise-edit - DrinkSolDryCan: 6 # Sunrise-edit - DrinkLemonLimeCan: 6 # Sunrise-edit - DrinkFourteenLokoCan: 6 # Sunrise-edit + DrinkColaCan: 4 + DrinkGrapeCan: 2 + DrinkRootBeerCan: 2 + DrinkIcedTeaCan: 2 + DrinkSolDryCan: 2 + DrinkLemonLimeCan: 2 + DrinkFourteenLokoCan: 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 96633088d31..fe30ff5339b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml @@ -1,20 +1,20 @@ - type: vendingMachineInventory id: CondimentInventory startingInventory: - FoodCondimentPacketAstrotame: 10 # Sunrise-edit - FoodCondimentPacketBbq: 10 # Sunrise-edit - FoodCondimentPacketFrostoil: 10 # Sunrise-edit - FoodCondimentPacketHorseradish: 10 # Sunrise-edit - FoodCondimentPacketHotsauce: 10 # Sunrise-edit - FoodCondimentPacketKetchup: 10 # Sunrise-edit - FoodCondimentPacketMustard: 10 # Sunrise-edit - FoodCondimentPacketPepper: 10 # Sunrise-edit - FoodCondimentPacketSalt: 10 # Sunrise-edit - FoodCondimentPacketSoy: 10 # Sunrise-edit - FoodCondimentPacketSugar: 10 # Sunrise-edit - FoodCondimentPacketCornoil: 10 # Sunrise-edit - ForkPlastic: 15 # Sunrise-edit - SpoonPlastic: 15 # Sunrise-edit - KnifePlastic: 15 # Sunrise-edit - FoodPlatePlastic: 15 # Sunrise-edit - FoodPlateSmallPlastic: 15 # Sunrise-edit + FoodCondimentPacketAstrotame: 5 + FoodCondimentPacketBbq: 5 + FoodCondimentPacketFrostoil: 5 + FoodCondimentPacketHorseradish: 5 + FoodCondimentPacketHotsauce: 5 + FoodCondimentPacketKetchup: 5 + FoodCondimentPacketMustard: 5 + FoodCondimentPacketPepper: 5 + FoodCondimentPacketSalt: 5 + FoodCondimentPacketSoy: 5 + FoodCondimentPacketSugar: 5 + FoodCondimentPacketCornoil: 5 + ForkPlastic: 10 + SpoonPlastic: 10 + KnifePlastic: 10 + FoodPlatePlastic: 10 + FoodPlateSmallPlastic: 10 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml index 298f6322b1c..11e48f830ee 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml @@ -1,27 +1,27 @@ - type: vendingMachineInventory id: DinnerwareInventory startingInventory: - ButchCleaver: 2 # Sunrise-edit - KitchenKnife: 10 # Sunrise-edit - RollingPin: 8 # Sunrise-edit - Spoon: 8 # Sunrise-edit - Fork: 8 # Sunrise-edit - PairedChopsticks: 8 # Sunrise-edit - FoodBowlBig: 15 # Sunrise-edit - FoodPlate: 15 # Sunrise-edit - FoodPlateSmall: 15 # Sunrise-edit - FoodPlateTin: 10 # Sunrise-edit - FoodKebabSkewer: 10 # Sunrise-edit - DrinkGlass: 10 # Sunrise-edit - Beaker: 10 # Sunrise-edit - LargeBeaker: 10 # Sunrise-edit - DrinkMug: 10 # Sunrise-edit - DrinkMugBlack: 6 # Sunrise-edit - DrinkMugBlue: 6 # Sunrise-edit - DrinkMugGreen: 6 # Sunrise-edit - DrinkMugHeart: 3 # Sunrise-edit - DrinkMugMetal: 6 # Sunrise-edit - DrinkMugMoebius: 2 # Sunrise-edit - DrinkMugOne: 2 # Sunrise-edit - DrinkMugRainbow: 3 # Sunrise-edit - DrinkMugRed: 3 # Sunrise-edit + ButchCleaver: 1 + KitchenKnife: 5 + RollingPin: 4 + Spoon: 4 + Fork: 4 + PairedChopsticks: 4 + FoodBowlBig: 10 + FoodPlate: 10 + FoodPlateSmall: 10 + FoodPlateTin: 5 + FoodKebabSkewer: 5 + DrinkGlass: 5 + Beaker: 5 + LargeBeaker: 5 + DrinkMug: 5 + DrinkMugBlack: 2 + DrinkMugBlue: 2 + DrinkMugGreen: 2 + DrinkMugHeart: 1 + DrinkMugMetal: 2 + DrinkMugMoebius: 1 + DrinkMugOne: 1 + DrinkMugRainbow: 2 + DrinkMugRed: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml index 9f77ed20686..fc8492dcf19 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml @@ -1,10 +1,10 @@ - type: vendingMachineInventory id: DiscountDansInventory startingInventory: - FoodSnackCheesie: 9 # Sunrise-edit - FoodSnackChips: 9 # Sunrise-edit - FoodSnackBoritos: 9 # Sunrise-edit - DrinkEnergyDrinkCan: 8 # Sunrise-edit - FoodSnackPopcorn: 9 # Sunrise-edit - FoodSnackEnergy: 9 # Sunrise-edit + FoodSnackCheesie: 3 + FoodSnackChips: 3 + FoodSnackBoritos: 3 + DrinkEnergyDrinkCan: 4 + FoodSnackPopcorn: 3 + FoodSnackEnergy: 3 CigPackMixed: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml index c0d66fecf1e..16dc3e628f8 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml @@ -1,9 +1,9 @@ - type: vendingMachineInventory id: DonutInventory startingInventory: - FoodDonutChocolate: 10 # Sunrise-edit - FoodDonutApple: 8 # Sunrise-edit - FoodDonutPink: 8 # Sunrise-edit - FoodDonutBungo: 8 # Sunrise-edit + FoodDonutChocolate: 5 + FoodDonutApple: 3 + FoodDonutPink: 3 + FoodDonutBungo: 3 emaggedInventory: FoodDonutPoison: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml index 622884faebc..9757b14e58e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml @@ -1,11 +1,11 @@ - type: vendingMachineInventory id: EngiVendInventory startingInventory: - ClothingEyesGlassesMeson: 8 # Sunrise-edit + ClothingEyesGlassesMeson: 4 ClothingHeadHatWelding: 6 - Multitool: 6 # Sunrise-edit + Multitool: 4 NetworkConfigurator: 5 - PowerCellMedium: 10 # Sunrise-edit - ClothingHandsGlovesColorYellow: 8 # Sunrise-edit + PowerCellMedium: 5 + ClothingHandsGlovesColorYellow: 6 BoxInflatable: 2 ClothingHeadHatCone: 4 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/genedrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/genedrobe.yml index 403d48580b6..84a5f9a79b2 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/genedrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/genedrobe.yml @@ -1,11 +1,11 @@ - type: vendingMachineInventory id: GeneDrobeInventory startingInventory: - ClothingUniformJumpsuitGenetics: 3 # Sunrise-edit - ClothingUniformJumpskirtGenetics: 3 # Sunrise-edit - ClothingShoesColorWhite: 3 # Sunrise-edit - ClothingOuterCoatLabGene: 3 # Sunrise-edit - ClothingOuterWinterGen: 3 # Sunrise-edit - ClothingBackpackGenetics: 3 # Sunrise-edit - ClothingBackpackSatchelGenetics: 3 # Sunrise-edit - ClothingBackpackDuffelGenetics: 3 # Sunrise-edit + ClothingUniformJumpsuitGenetics: 2 + ClothingUniformJumpskirtGenetics: 2 + ClothingShoesColorWhite: 2 + ClothingOuterCoatLabGene: 2 + ClothingOuterWinterGen: 2 + ClothingBackpackGenetics: 2 + ClothingBackpackSatchelGenetics: 2 + ClothingBackpackDuffelGenetics: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml index df629622831..98513a48a4a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml @@ -1,13 +1,13 @@ - type: vendingMachineInventory id: DrGibbInventory startingInventory: - DrinkDrGibbCan: 12 # Sunrise-edit - DrinkGrapeCan: 6 # Sunrise-edit - DrinkRootBeerCan: 6 # Sunrise-edit - DrinkIcedTeaCan: 6 # Sunrise-edit - DrinkSolDryCan: 6 # Sunrise-edit - DrinkLemonLimeCan: 6 # Sunrise-edit - DrinkFourteenLokoCan: 6 # Sunrise-edit + DrinkDrGibbCan: 4 + DrinkGrapeCan: 2 + DrinkRootBeerCan: 2 + DrinkIcedTeaCan: 2 + DrinkSolDryCan: 2 + DrinkLemonLimeCan: 2 + DrinkFourteenLokoCan: 2 emaggedInventory: DrinkNukieCan: 2 DrinkChangelingStingCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml index ccbb2564d15..470abda91e5 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml @@ -1,15 +1,15 @@ - type: vendingMachineInventory id: HyDrobeInventory startingInventory: - ClothingBackpackHydroponics: 4 # Sunrise-edit - ClothingBackpackSatchelHydroponics: 4 # Sunrise-edit - ClothingBackpackDuffelHydroponics: 4 # Sunrise-edit - ClothingOuterApronBotanist: 4 # Sunrise-edit - ClothingUniformOveralls: 6 # Sunrise-edit - ClothingUniformJumpsuitHydroponics: 6 # Sunrise-edit - ClothingUniformJumpskirtHydroponics: 6 # Sunrise-edit - ClothingNeckScarfStripedGreen: 6 # Sunrise-edit - ClothingHeadBandBotany: 6 # Sunrise-edit - ClothingHeadsetService: 4 # Sunrise-edit - ClothingOuterWinterHydro: 4 # Sunrise-edit + ClothingBackpackHydroponics: 2 + ClothingBackpackSatchelHydroponics: 2 + ClothingBackpackDuffelHydroponics: 2 + ClothingOuterApronBotanist: 2 + ClothingUniformOveralls: 3 + ClothingUniformJumpsuitHydroponics: 3 + ClothingUniformJumpskirtHydroponics: 3 + ClothingNeckScarfStripedGreen: 3 + ClothingHeadBandBotany: 3 + ClothingHeadsetService: 2 + ClothingOuterWinterHydro: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml index 8648b7b3c5b..b585d34051a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml @@ -1,14 +1,14 @@ - type: vendingMachineInventory id: JaniDrobeInventory startingInventory: - ClothingUniformJumpsuitJanitor: 4 # Sunrise-edit - ClothingUniformJumpskirtJanitor: 4 # Sunrise-edit - ClothingHandsGlovesJanitor: 4 # Sunrise-edit - ClothingShoesColorBlack: 4 # Sunrise-edit - ClothingHeadHatPurplesoft: 4 # Sunrise-edit - ClothingBeltJanitor: 4 # Sunrise-edit - ClothingHeadsetService: 4 # Sunrise-edit - ClothingOuterWinterJani: 4 # Sunrise-edit + ClothingUniformJumpsuitJanitor: 2 + ClothingUniformJumpskirtJanitor: 2 + ClothingHandsGlovesJanitor: 2 + ClothingShoesColorBlack: 2 + ClothingHeadHatPurplesoft: 2 + ClothingBeltJanitor: 2 + ClothingHeadsetService: 2 + ClothingOuterWinterJani: 2 ClothingNeckScarfStripedPurple: 3 emaggedInventory: diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml index 3ceeb0671aa..b8106398d3e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml @@ -1,26 +1,25 @@ - type: vendingMachineInventory id: LawDrobeInventory startingInventory: - ClothingUniformJumpsuitLawyerBlue: 2 # Sunrise-edit - ClothingUniformJumpskirtLawyerBlue: 2 # Sunrise-edit - ClothingUniformJumpsuitLawyerPurple: 2 # Sunrise-edit - ClothingUniformJumpskirtLawyerPurple: 2 # Sunrise-edit - ClothingUniformJumpsuitLawyerRed: 2 # Sunrise-edit - ClothingUniformJumpskirtLawyerRed: 2 # Sunrise-edit - ClothingUniformJumpsuitLawyerBlack: 2 # Sunrise-edit - ClothingUniformJumpskirtLawyerBlack: 2 # Sunrise-edit - ClothingUniformJumpsuitLawyerGood: 2 # Sunrise-edit - ClothingUniformJumpskirtLawyerGood: 2 # Sunrise-edit - ClothingShoesBootsLaceup: 4 # Sunrise-edit + ClothingUniformJumpsuitLawyerBlue: 1 + ClothingUniformJumpskirtLawyerBlue: 1 + ClothingUniformJumpsuitLawyerPurple: 1 + ClothingUniformJumpskirtLawyerPurple: 1 + ClothingUniformJumpsuitLawyerRed: 1 + ClothingUniformJumpskirtLawyerRed: 1 + ClothingUniformJumpsuitLawyerBlack: 1 + ClothingUniformJumpskirtLawyerBlack: 1 + ClothingUniformJumpsuitLawyerGood: 1 + ClothingUniformJumpskirtLawyerGood: 1 + ClothingShoesBootsLaceup: 2 ClothingHeadsetIAA: 2 - ClothingNeckLawyerbadge: 4 # Sunrise-edit - BriefcaseBrown: 4 # Sunrise-edit - BookSpaceLaw: 6 # Sunrise-edit - ClothingHandsGlovesColorWhite: 2 # Sunrise-edit - ClothingHandsGlovesColorGray: 2 # Sunrise-edit - ClothingHandsGlovesColorBlack: 2 # Sunrise-edit - ClothingHandsGlovesColorRed: 2 # Sunrise-edit - ClothingHandsGlovesColorBlue: 2 # Sunrise-edit + ClothingNeckLawyerbadge: 2 + BriefcaseBrown: 2 + ClothingHandsGlovesColorWhite: 1 + ClothingHandsGlovesColorGray: 1 + ClothingHandsGlovesColorBlack: 1 + ClothingHandsGlovesColorRed: 1 + ClothingHandsGlovesColorBlue: 1 ClothingHeadHatBowlerHat: 1 ClothingHeadHatOutlawHat: 1 ClothingHeadHatTophat: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml index ede621eee1f..466749120bd 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml @@ -1,12 +1,12 @@ - type: vendingMachineInventory id: NanoMedPlusInventory startingInventory: - HandheldHealthAnalyzer: 5 # Sunrise-edit - Brutepack: 15 # Sunrise-edit - Ointment: 15 # Sunrise-edit - Bloodpack: 15 # Sunrise-edit - EpinephrineChemistryBottle: 5 # Sunrise-edit - Syringe: 10 # Sunrise-edit - ClothingEyesHudMedical: 4 # Sunrise-edit - ClothingEyesEyepatchHudMedical: 4 # Sunrise-edit + HandheldHealthAnalyzer: 3 + Brutepack: 5 + Ointment: 5 + Bloodpack: 5 + EpinephrineChemistryBottle: 3 + Syringe: 5 + ClothingEyesHudMedical: 2 + ClothingEyesEyepatchHudMedical: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml index 13528cd09d8..3e3543b5914 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml @@ -1,16 +1,16 @@ - type: vendingMachineInventory id: MediDrobeInventory startingInventory: - ClothingBackpackDuffelMedical: 6 # Sunrise-edit - ClothingBackpackMedical: 6 # Sunrise-edit - ClothingBackpackSatchelMedical: 6 # Sunrise-edit + ClothingBackpackDuffelMedical: 4 + ClothingBackpackMedical: 4 + ClothingBackpackSatchelMedical: 4 ClothingUniformJumpsuitMedicalDoctor: 4 ClothingUniformJumpskirtMedicalDoctor: 4 ClothingHeadHatBeretMedic: 4 ClothingHeadNurseHat: 4 ClothingOuterCoatLab: 4 ClothingShoesColorWhite: 4 - ClothingHandsGlovesLatex: 6 # Sunrise-edit + ClothingHandsGlovesLatex: 4 ClothingHandsGlovesNitrile: 2 ClothingHeadsetMedical: 4 ClothingOuterWinterMed: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml index 6e9cbb4db99..29b3cb8aee7 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml @@ -1,20 +1,20 @@ - type: vendingMachineInventory id: NutriMaxInventory startingInventory: - HydroponicsToolSpade: 8 # Sunrise-edit - HydroponicsToolMiniHoe: 8 # Sunrise-edit - HydroponicsToolClippers: 8 # Sunrise-edit - HydroponicsToolScythe: 8 # Sunrise-edit - HydroponicsToolHatchet: 8 # Sunrise-edit - Dropper: 8 # Sunrise-edit - PlantBag: 5 # Sunrise-edit + HydroponicsToolSpade: 4 + HydroponicsToolMiniHoe: 4 + HydroponicsToolClippers: 4 + HydroponicsToolScythe: 4 + HydroponicsToolHatchet: 4 + Dropper: 4 + PlantBag: 3 PlantBGoneSpray: 20 WeedSpray: 20 PestSpray: 20 Syringe: 5 - RobustHarvestChemistryBottle: 5 # Sunrise-edit - EZNutrientChemistryBottle: 5 # Sunrise-edit - Bucket: 5 # Sunrise-edit + RobustHarvestChemistryBottle: 3 + EZNutrientChemistryBottle: 3 + Bucket: 3 DiseaseSwab: 20 #TO DO: #plant analyzer diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml index 9e0e76c4d21..cb5a4f5c4bc 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml @@ -1,14 +1,14 @@ - type: vendingMachineInventory id: PwrGameInventory startingInventory: - DrinkPwrGameCan: 12 # Sunrise-edit - DrinkEnergyDrinkCan: 12 # Sunrise-edit - DrinkGrapeCan: 6 # Sunrise-edit - DrinkRootBeerCan: 6 # Sunrise-edit - DrinkIcedTeaCan: 6 # Sunrise-edit - DrinkSolDryCan: 6 # Sunrise-edit - DrinkLemonLimeCan: 6 # Sunrise-edit - DrinkFourteenLokoCan: 6 # Sunrise-edit + DrinkPwrGameCan: 4 + DrinkEnergyDrinkCan: 4 + DrinkGrapeCan: 2 + DrinkRootBeerCan: 2 + DrinkIcedTeaCan: 2 + DrinkSolDryCan: 2 + DrinkLemonLimeCan: 2 + DrinkFourteenLokoCan: 2 emaggedInventory: DrinkNukieCan: 2 DrinkChangelingStingCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml index 27e6c99bea7..c53efb3e729 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml @@ -1,9 +1,9 @@ - type: vendingMachineInventory id: RoboticsInventory startingInventory: - CableApcStack: 6 # Sunrise-edit - SciFlash: 6 # Sunrise-edit - ProximitySensor: 4 # Sunrise-edit + CableApcStack: 4 + SciFlash: 4 + ProximitySensor: 3 ClothingEyesHudDiagnostic: 2 ClothingEyesEyepatchHudDiag: 2 RemoteSignaller: 3 @@ -15,6 +15,6 @@ NitrousOxideTankFilled: 2 ClothingMaskBreathMedical: 5 ClothingHeadHatWeldingMaskFlame: 1 - Welder: 2 # Sunrise-edit - Screwdriver: 4 # Sunrise-edit - Crowbar: 4 # Sunrise-edit + Welder: 1 + Screwdriver: 2 + Crowbar: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml index c75488b532a..b5665df37ba 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml @@ -1,15 +1,15 @@ - type: vendingMachineInventory id: SalvageEquipmentInventory startingInventory: - Crowbar: 4 # Sunrise-edit - Pickaxe: 6 # Sunrise-edit - OreBag: 6 # Sunrise-edit - Flare: 6 # Sunrise-edit - FlashlightLantern: 4 # Sunrise-edit - Floodlight: 4 # Sunrise-edit - HandheldGPSBasic: 4 # Sunrise-edit - RadioHandheld: 4 # Sunrise-edit - WeaponProtoKineticAccelerator: 6 # Sunrise-edit - SeismicCharge: 4 # Sunrise-edit + Crowbar: 2 + Pickaxe: 4 + OreBag: 4 + Flare: 4 + FlashlightLantern: 2 + Floodlight: 2 + HandheldGPSBasic: 2 + RadioHandheld: 2 + WeaponProtoKineticAccelerator: 4 + SeismicCharge: 2 FultonBeacon: 1 - Fulton: 4 # Sunrise-edit + Fulton: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml index ccf67ab3bf9..9827d022841 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml @@ -1,9 +1,9 @@ - type: vendingMachineInventory id: SciDrobeInventory startingInventory: - ClothingBackpackScience: 6 # Sunrise-edit - ClothingBackpackSatchelScience: 6 # Sunrise-edit - ClothingBackpackDuffelScience: 6 # Sunrise-edit + ClothingBackpackScience: 3 + ClothingBackpackSatchelScience: 3 + ClothingBackpackDuffelScience: 3 ClothingUniformJumpsuitScientist: 3 ClothingUniformJumpskirtScientist: 3 ClothingUniformJumpsuitScientistFormal: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index dcb184665be..afbeff6b080 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -2,24 +2,24 @@ id: SecTechInventory startingInventory: SecurityWhistle: 5 - Handcuffs: 12 # Sunrise-edit - GrenadeFlashBang: 8 # Sunrise-edit - TearGasGrenade: 8 # Sunrise-edit - ClusterBangFull: 4 # Sunrise-edit - GrenadeStinger: 8 # Sunrise-edit - Flash: 10 # Sunrise-edit - Tourniquet: 10 # Sunrise-edit - FlashlightSeclite: 10 # Sunrise-edit - ClothingEyesGlassesSunglasses: 4 # Sunrise-edit - ClothingEyesHudSecurity: 4 # Sunrise-edit - ClothingEyesEyepatchHudSecurity: 4 # Sunrise-edit + Handcuffs: 8 + GrenadeFlashBang: 4 + TearGasGrenade: 4 + ClusterBangFull: 2 + GrenadeStinger: 4 + Flash: 5 + Tourniquet: 5 + FlashlightSeclite: 5 + ClothingEyesGlassesSunglasses: 2 + ClothingEyesHudSecurity: 2 + ClothingEyesEyepatchHudSecurity: 2 ClothingBeltSecurityWebbing: 5 - CombatKnife: 6 # Sunrise-edit - Zipties: 12 # Sunrise-edit - RiotShield: 4 # Sunrise-edit - RiotLaserShield: 4 # Sunrise-edit - RiotBulletShield: 4 # Sunrise-edit - RadioHandheldSecurity: 8 # Sunrise-edit + CombatKnife: 3 + Zipties: 12 + RiotShield: 2 + RiotLaserShield: 2 + RiotBulletShield: 2 + RadioHandheldSecurity: 5 # security officers need to follow a diet regimen! contrabandInventory: FoodDonutHomer: 12 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index 6d3db59b2be..fe885a94219 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -1,8 +1,6 @@ - type: vendingMachineInventory id: SecDrobeInventory startingInventory: - HandheldCamera: 6 # Sunrise-bodycam - HyperLinkBookCorporateLaw: 3 # Sunrise-Hyperlink ClothingBackpackSecurity: 3 ClothingBackpackSatchelSecurity: 3 ClothingBackpackDuffelSecurity: 3 @@ -11,6 +9,7 @@ ClothingHeadHatBeretSecurity: 3 ClothingHeadHatSecsoft: 3 ClothingHeadBandRed: 3 + HandheldCamera: 3 # Sunrise-bodycam ClothingHandsGlovesColorBlack: 3 ClothingHandsGlovesFingerless: 3 ClothingUniformJumpskirtSec: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index f2ae65ceccc..25e41702af3 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -1,41 +1,41 @@ - type: vendingMachineInventory id: MegaSeedServitorInventory startingInventory: - AloeSeeds: 4 # Sunrise-edit - AmbrosiaVulgarisSeeds: 4 # Sunrise-edit - AppleSeeds: 8 # Sunrise-edit - BananaSeeds: 8 # Sunrise-edit - CarrotSeeds: 8 # Sunrise-edit - CabbageSeeds: 8 # Sunrise-edit - ChanterelleSeeds: 8 # Sunrise-edit - ChiliSeeds: 8 # Sunrise-edit - CornSeeds: 8 # Sunrise-edit - EggplantSeeds: 8 # Sunrise-edit - EggySeeds: 8 # Sunrise-edit - GalaxythistleSeeds: 4 # Sunrise-edit - GarlicSeeds: 4 # Sunrise-edit - GrapeSeeds: 8 # Sunrise-edit - LemonSeeds: 8 # Sunrise-edit - LimeSeeds: 8 # Sunrise-edit - PineappleSeeds: 5 # Sunrise-edit - LingzhiSeeds: 4 # Sunrise-edit - OatSeeds: 8 # Sunrise-edit - OnionSeeds: 8 # Sunrise-edit - OnionRedSeeds: 8 # Sunrise-edit - OrangeSeeds: 8 # Sunrise-edit - PoppySeeds: 4 # Sunrise-edit - PotatoSeeds: 8 # Sunrise-edit - PumpkinSeeds: 8 # Sunrise-edit - RiceSeeds: 8 # Sunrise-edit - SoybeanSeeds: 8 # Sunrise-edit - SugarcaneSeeds: 8 # Sunrise-edit - TomatoSeeds: 8 # Sunrise-edit - TowercapSeeds: 8 # Sunrise-edit - WheatSeeds: 8 # Sunrise-edit - WatermelonSeeds: 8 # Sunrise-edit - CocoaSeeds: 4 # Sunrise-edit - BerrySeeds: 8 # Sunrise-edit - PeaSeeds: 8 # Sunrise-edit - CottonSeeds: 8 # Sunrise-edit + AloeSeeds: 3 + AmbrosiaVulgarisSeeds: 3 + AppleSeeds: 5 + BananaSeeds: 5 + CarrotSeeds: 5 + CabbageSeeds: 5 + ChanterelleSeeds: 5 + ChiliSeeds: 5 + CornSeeds: 5 + EggplantSeeds: 5 + EggySeeds: 5 + GalaxythistleSeeds: 3 + GarlicSeeds: 3 + GrapeSeeds: 5 + LemonSeeds: 5 + LimeSeeds: 5 + PineappleSeeds: 4 + LingzhiSeeds: 3 + OatSeeds: 5 + OnionSeeds: 5 + OnionRedSeeds: 5 + OrangeSeeds: 5 + PoppySeeds: 3 + PotatoSeeds: 5 + PumpkinSeeds: 5 + RiceSeeds: 5 + SoybeanSeeds: 5 + SugarcaneSeeds: 5 + TomatoSeeds: 5 + TowercapSeeds: 5 + WheatSeeds: 5 + WatermelonSeeds: 5 + CocoaSeeds: 3 + BerrySeeds: 5 + PeaSeeds: 5 + CottonSeeds: 5 emaggedInventory: FlyAmanitaSeeds: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml index 059e8e86b55..6ac70b26db2 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml @@ -1,13 +1,13 @@ - type: vendingMachineInventory id: ShamblersJuiceInventory startingInventory: - DrinkShamblersJuiceCan: 12 # Sunrise-edit - DrinkGrapeCan: 6 # Sunrise-edit - DrinkRootBeerCan: 6 # Sunrise-edit - DrinkIcedTeaCan: 6 # Sunrise-edit - DrinkSolDryCan: 6 # Sunrise-edit - DrinkLemonLimeCan: 6 # Sunrise-edit - DrinkFourteenLokoCan: 6 # Sunrise-edit + DrinkShamblersJuiceCan: 4 + DrinkGrapeCan: 2 + DrinkRootBeerCan: 2 + DrinkIcedTeaCan: 2 + DrinkSolDryCan: 2 + DrinkLemonLimeCan: 2 + DrinkFourteenLokoCan: 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 822f642daf8..b797f588fe5 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml @@ -1,12 +1,12 @@ - type: vendingMachineInventory id: GetmoreChocolateCorpInventory startingInventory: - FoodSnackRaisins: 6 # Sunrise-edit - FoodSnackChocolate: 6 # Sunrise-edit - FoodSnackCnDs: 6 # Sunrise-edit - FoodSnackPistachios: 6 # Sunrise-edit - FoodSnackSus: 6 # Sunrise-edit - FoodSnackSemki: 6 # Sunrise-edit + FoodSnackRaisins: 3 + FoodSnackChocolate: 3 + FoodSnackCnDs: 3 + FoodSnackPistachios: 3 + FoodSnackSus: 3 + FoodSnackSemki: 3 emaggedInventory: FoodSnackSyndi: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml index 1f994797612..339683d2c9a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml @@ -1,13 +1,13 @@ - type: vendingMachineInventory id: SodaInventory startingInventory: - DrinkColaCan: 6 # Sunrise-edit - DrinkGrapeCan: 6 # Sunrise-edit - DrinkRootBeerCan: 6 # Sunrise-edit - DrinkIcedTeaCan: 6 # Sunrise-edit - DrinkSolDryCan: 6 # Sunrise-edit - DrinkLemonLimeCan: 6 # Sunrise-edit - DrinkFourteenLokoCan: 6 # Sunrise-edit + DrinkColaCan: 3 + DrinkGrapeCan: 3 + DrinkRootBeerCan: 3 + DrinkIcedTeaCan: 3 + DrinkSolDryCan: 3 + DrinkLemonLimeCan: 3 + DrinkFourteenLokoCan: 3 emaggedInventory: DrinkNukieCan: 3 DrinkChangelingStingCan: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml index 66cad4dfb41..34f0906366a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml @@ -1,6 +1,6 @@ - type: vendingMachineInventory id: BodaInventory startingInventory: - DrinkSodaWaterCan: 20 #typically hacked product. Default product is "soda" + DrinkSodaWaterCan: 10 #typically hacked product. Default product is "soda" contrabandInventory: DrinkColaCan: 10 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml index 0d37590269f..a5f570bd46a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml @@ -1,14 +1,14 @@ - type: vendingMachineInventory id: SpaceUpInventory startingInventory: - DrinkSpaceUpCan: 12 - DrinkSpaceMountainWindCan: 12 - DrinkGrapeCan: 6 - DrinkRootBeerCan: 6 - DrinkIcedTeaCan: 6 - DrinkSolDryCan: 6 - DrinkLemonLimeCan: 6 - DrinkFourteenLokoCan: 6 + DrinkSpaceUpCan: 3 + DrinkSpaceMountainWindCan: 3 + DrinkGrapeCan: 2 + DrinkRootBeerCan: 2 + DrinkIcedTeaCan: 2 + DrinkSolDryCan: 2 + DrinkLemonLimeCan: 2 + DrinkFourteenLokoCan: 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 3c8942dc55a..b1a74fc13e7 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml @@ -1,13 +1,13 @@ - type: vendingMachineInventory id: StarkistInventory startingInventory: - DrinkStarkistCan: 12 # Sunrise-edit - DrinkGrapeCan: 6 # Sunrise-edit - DrinkRootBeerCan: 6 # Sunrise-edit - DrinkIcedTeaCan: 6 # Sunrise-edit - DrinkSolDryCan: 6 # Sunrise-edit - DrinkLemonLimeCan: 6 # Sunrise-edit - DrinkFourteenLokoCan: 6 # Sunrise-edit + DrinkStarkistCan: 4 + DrinkGrapeCan: 2 + DrinkRootBeerCan: 2 + DrinkIcedTeaCan: 2 + DrinkSolDryCan: 2 + DrinkLemonLimeCan: 2 + DrinkFourteenLokoCan: 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 aca872b14d3..b7a5750809f 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml @@ -1,10 +1,10 @@ - type: vendingMachineInventory id: SustenanceInventory startingInventory: - DrinkMREFlask: 6 # Sunrise-edit - FoodSnackNutribrick: 15 # Sunrise-edit - FoodSnackMREBrownie: 15 # Sunrise-edit - FoodCondimentPacketKetchup: 6 # Sunrise-edit + DrinkMREFlask: 3 + FoodSnackNutribrick: 5 + FoodSnackMREBrownie: 5 + FoodCondimentPacketKetchup: 5 emaggedInventory: KitchenKnife: 2 ClothingMaskBreath: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml index 071c25327b6..636c134da7c 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml @@ -1,14 +1,14 @@ - type: vendingMachineInventory id: VendomatInventory startingInventory: - HandheldRoboAnalyzer: 6 # Sunrise-edit - Nanopaste: 6 # Sunrise-edit - RemoteSignaller: 2 # Sunrise-edit + HandheldRoboAnalyzer: 4 + Nanopaste: 4 + RemoteSignaller: 1 Igniter: 2 - Wirecutter: 2 # Sunrise-edit - CableApcStack: 4 # Sunrise-edit - FlashlightLantern: 4 # Sunrise-edit + Wirecutter: 1 + CableApcStack: 2 + FlashlightLantern: 2 PowerCellSmallPrinted: 3 - MatterBinStockPart: 8 # Sunrise-edit - CapacitorStockPart: 8 # Sunrise-edit - MicroManipulatorStockPart: 8 # Sunrise-edit + MatterBinStockPart: 4 + CapacitorStockPart: 4 + MicroManipulatorStockPart: 4 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml index b96e7a52139..405e2eff564 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml @@ -1,8 +1,8 @@ - type: vendingMachineInventory id: NanoMedInventory startingInventory: - Brutepack: 8 # Sunrise-edit - Ointment: 8 # Sunrise-edit - Bloodpack: 8 # Sunrise-edit - EpinephrineChemistryBottle: 5 # Sunrise-edit - Syringe: 5 # Sunrise-edit + Brutepack: 3 + Ointment: 3 + Bloodpack: 3 + EpinephrineChemistryBottle: 3 + Syringe: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml index 43cea081f2a..2231c714ff9 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml @@ -1,18 +1,18 @@ - type: vendingMachineInventory id: YouToolInventory startingInventory: - CableApcStack: 8 # Sunrise-edit - Crowbar: 8 # Sunrise-edit - Welder: 5 # Sunrise-edit - Wirecutter: 5 # Sunrise-edit - Wrench: 5 # Sunrise-edit - Screwdriver: 5 # Sunrise-edit - trayScanner: 5 # Sunrise-edit - NetworkConfigurator: 5 # Sunrise-edit - GasAnalyzer: 5 # Sunrise-edit - FlashlightLantern: 8 # Sunrise-edit - ClothingHandsGlovesColorYellowBudget: 5 # Sunrise-edit - SprayPainter: 5 # Sunrise-edit + CableApcStack: 5 + Crowbar: 5 + Welder: 2 + Wirecutter: 3 + Wrench: 3 + Screwdriver: 3 + trayScanner: 3 + NetworkConfigurator: 3 + GasAnalyzer: 3 + FlashlightLantern: 5 + ClothingHandsGlovesColorYellowBudget: 3 + SprayPainter: 3 # Some engineer forgot to take the multitool out the youtool when working on it, happens. contrabandInventory: Multitool: 1 diff --git a/Resources/Prototypes/Entities/Structures/Power/smes.yml b/Resources/Prototypes/Entities/Structures/Power/smes.yml index c93e30f097b..1e3559e5a95 100644 --- a/Resources/Prototypes/Entities/Structures/Power/smes.yml +++ b/Resources/Prototypes/Entities/Structures/Power/smes.yml @@ -95,11 +95,11 @@ - type: entity parent: BaseSMES id: SMESBasic - suffix: Basic, 24MW # Sunrise-edit + suffix: Basic, 8MW components: - type: Battery - maxCharge: 24000000 # Sunrise-edit - startingCharge: 24000000 # Sunrise-edit + maxCharge: 8000000 + startingCharge: 8000000 - type: entity parent: SMESBasic diff --git a/Resources/Prototypes/Entities/Structures/Power/substation.yml b/Resources/Prototypes/Entities/Structures/Power/substation.yml index 8faf989bf3a..b98673cbd61 100644 --- a/Resources/Prototypes/Entities/Structures/Power/substation.yml +++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml @@ -220,11 +220,11 @@ - type: entity parent: BaseSubstation id: SubstationBasic - suffix: Basic, 7.5MJ # Sunrise-edit + suffix: Basic, 2.5MJ components: - type: Battery - maxCharge: 7500000 # Sunrise-edit - startingCharge: 7500000 # Sunrise-edit + maxCharge: 2500000 + startingCharge: 2500000 - type: entity parent: SubstationBasic diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Power/smes.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Power/smes.yml new file mode 100644 index 00000000000..4462a712f7f --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Power/smes.yml @@ -0,0 +1,10 @@ +- type: entity + parent: BaseSMES + id: SMESExtended + name: СМЭС + description: Сверхпроводящая Магнитная Энергонакопительная Станция (СМЭС) большой ёмкости. + suffix: Увеличенный, 24MW + components: + - type: Battery + maxCharge: 24000000 + startingCharge: 24000000 diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Power/substation.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Power/substation.yml new file mode 100644 index 00000000000..8156d8981e0 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Power/substation.yml @@ -0,0 +1,10 @@ +- type: entity + parent: BaseSubstation + id: SubstationExtended + name: подстанция + description: Понижает напряжение подаваемого в него электричества. + suffix: Увеличенный, 7.5MJ + components: + - type: Battery + maxCharge: 7500000 + startingCharge: 7500000