diff --git a/Content.Server/Singularity/EntitySystems/SingularitySystem.cs b/Content.Server/Singularity/EntitySystems/SingularitySystem.cs index 36df17dd20a..1b36fa6208f 100644 --- a/Content.Server/Singularity/EntitySystems/SingularitySystem.cs +++ b/Content.Server/Singularity/EntitySystems/SingularitySystem.cs @@ -7,7 +7,6 @@ using Content.Shared.Singularity.Events; using Robust.Server.GameStates; using Robust.Shared.Audio.Systems; using Robust.Shared.GameStates; -using Robust.Shared.Timing; // DeltaV namespace Content.Server.Singularity.EntitySystems; @@ -22,7 +21,6 @@ public sealed class SingularitySystem : SharedSingularitySystem #region Dependencies [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly PvsOverrideSystem _pvs = default!; - [Dependency] private readonly GameTiming _timing = default!; // DeltaV - Delete this when its not longer needed, idk #endregion Dependencies /// diff --git a/Content.Shared/Inventory/InventorySystem.Slots.cs b/Content.Shared/Inventory/InventorySystem.Slots.cs index 24f152a9fc4..e2a3c1e0898 100644 --- a/Content.Shared/Inventory/InventorySystem.Slots.cs +++ b/Content.Shared/Inventory/InventorySystem.Slots.cs @@ -18,7 +18,6 @@ public partial class InventorySystem : EntitySystem [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IViewVariablesManager _vvm = default!; [Dependency] private readonly RandomHelperSystem _randomHelper = default!; // Shitmed Change - [Dependency] private readonly GameTiming _gameTiming = default!; // Shitmed Change private void InitializeSlots() { @@ -347,7 +346,7 @@ public partial class InventorySystem : EntitySystem if (!TryGetSlotContainer(uid, slotName, out var container, out _, inventory)) break; - if (container.ContainedEntity is { } entityUid && TryComp(entityUid, out TransformComponent? transform) && _gameTiming.IsFirstTimePredicted) + if (container.ContainedEntity is { } entityUid && TryComp(entityUid, out TransformComponent? transform)) { _transform.AttachToGridOrMap(entityUid, transform); _randomHelper.RandomOffset(entityUid, 0.5f); diff --git a/Resources/Prototypes/Entities/Clothing/Belt/job.yml b/Resources/Prototypes/Entities/Clothing/Belt/job.yml index f2e8528daea..27bce005560 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/job.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/job.yml @@ -200,7 +200,7 @@ hypo: whitelist: tags: - - Hypospray + - Injector pill: whitelist: components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml index 71167106029..535beb54bbc 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml @@ -20,7 +20,7 @@ - Syringe components: - BreathMask - - Hypospray + - Injector maxItemSize: Small grid: - 0,0,3,1