diff --git a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs index a69d4857ab..6593fbe90f 100644 --- a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs +++ b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs @@ -1,6 +1,7 @@ using Content.Shared.Emag.Components; using Robust.Shared.Prototypes; using System.Linq; +using Content.Shared._Sunrise.VendingMachines; using Content.Shared.Access.Components; using Content.Shared.Access.Systems; using Content.Shared.Advertise.Components; @@ -14,6 +15,7 @@ using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.GameStates; using Robust.Shared.Network; +using Robust.Shared.Player; using Robust.Shared.Random; using Robust.Shared.Timing; @@ -33,6 +35,7 @@ public abstract partial class SharedVendingMachineSystem : EntitySystem [Dependency] private readonly SharedSpeakOnUIClosedSystem _speakOn = default!; [Dependency] protected readonly SharedUserInterfaceSystem UISystem = default!; [Dependency] protected readonly IRobustRandom Randomizer = default!; + [Dependency] private readonly ISharedPlayerManager _player = default!; [Dependency] private readonly EmagSystem _emag = default!; public override void Initialize() @@ -436,6 +439,15 @@ public abstract partial class SharedVendingMachineSystem : EntitySystem restock = (uint) Math.Floor(amount * result / chanceOfMissingStock); } + // Sunrise-start + if (TryComp(uid, out var dependentStockComponent) && + type == InventoryType.Regular) + { + restock = (uint) Math.Floor( + amount + Math.Pow(_player.PlayerCount, 0.8f) * dependentStockComponent.Coefficient); + } + // 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/_Sunrise/PrinterDoc/PrinterDocComponent.cs b/Content.Shared/_Sunrise/PrinterDoc/PrinterDocComponent.cs index 2aac8daa7c..b4f3ebd898 100644 --- a/Content.Shared/_Sunrise/PrinterDoc/PrinterDocComponent.cs +++ b/Content.Shared/_Sunrise/PrinterDoc/PrinterDocComponent.cs @@ -33,12 +33,12 @@ public sealed partial class PrinterDocComponent : Component /// Начальные материалы принтера - бумага /// [DataField] - public int InitialPaperAmount = 10000; + public int InitialPaperAmount = 999999999; /// /// Начальные материалы принтера - чернила /// [DataField] - public int InitialInkAmount = 100; + public int InitialInkAmount = 999999999; /// /// Очередь заданий на печать или копирование diff --git a/Content.Shared/_Sunrise/VendingMachines/PlayerCountDependentStockComponent.cs b/Content.Shared/_Sunrise/VendingMachines/PlayerCountDependentStockComponent.cs index 7fa1c9ae11..b4278a29c2 100644 --- a/Content.Shared/_Sunrise/VendingMachines/PlayerCountDependentStockComponent.cs +++ b/Content.Shared/_Sunrise/VendingMachines/PlayerCountDependentStockComponent.cs @@ -7,5 +7,5 @@ public sealed partial class PlayerCountDependentStockComponent : Component { [DataField("coefficient")] - public float Coefficient = 0.5f; + public float Coefficient = 1000f; } diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml index 38181269a9..6a8fdf048e 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml @@ -61,10 +61,10 @@ - EmaggableMedibot # borg become killer - EmagSiliconLaw - - type: PointLight - color: MediumPurple - radius: 2 - softness: 1 +# - type: PointLight +# color: MediumPurple +# radius: 2 +# softness: 1 - type: UserInterface interfaces: enum.StoreUiKey.Key: @@ -93,8 +93,6 @@ - NoPaint - type: TTS voice: HermaeusMora - # Sunrise-end - # Sunrise-start - type: Electrified onHandInteract: false onInteractUsing: false diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Machines/printer.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Machines/printer.yml index 9f188d5328..43ee0f9d7f 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Structures/Machines/printer.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Machines/printer.yml @@ -48,7 +48,7 @@ - type: SolutionContainerManager solutions: inc: - maxVol: 250 + maxVol: 999999999 - type: Spillable diff --git a/Resources/migration.yml b/Resources/migration.yml index b4eb041f50..79afc6b836 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -787,7 +787,6 @@ GrenadeBlast: GrenadeBlastTimer GrenadeEMP: GrenadeEMPTimer GrenadeFlash: GrenadeFlashTimer GrenadeFrag: GrenadeFragTimer -# SL HITSCAN START BoxMagazineRifle: BoxMagazineRifleSP MagazineBoxLightRifle: MagazineBoxLightRifleSP MagazineBoxPistol: MagazineBoxPistolSP @@ -799,5 +798,4 @@ MagazineBoxMagnum: MagazineBoxMagnumSP SpeedLoaderMagnum: SpeedLoaderMagnumSP MagazineBoxRifle: MagazineBoxRifleSP BaseCartridgeLightRifle: BaseCartridgeLightRifleSP -# SL HITSCAN END # Sunrise-End