Chitinid (From Delta-V)

Content.Server/Chemistry/EntitySystems/InjectorSystem.cs

@@ -1,3 +1,4 @@
+using Content.Server.Abilities.Chitinid;
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Shared.Chemistry;
@@ -114,6 +115,12 @@ private void OnInjectorAfterInteract(Entity<InjectorComponent> entity, ref After
     /// </summary>
     private void InjectDoAfter(Entity<InjectorComponent> injector, EntityUid target, EntityUid user)
     {
+        if (HasComp<BlockInjectionComponent>(target)) // DeltaV
+        {
+            Popup.PopupEntity(Loc.GetString("injector-component-deny-user"), target, user);
+            return;
+        }
+
         // Create a pop-up for the user
         if (injector.Comp.ToggleState == InjectorToggleMode.Draw)
         {
@@ -254,6 +261,9 @@ private void TryInjectIntoBloodstream(Entity<InjectorComponent> injector, Entity
     private void TryInject(Entity<InjectorComponent> injector, EntityUid targetEntity,
         Entity<SolutionComponent> targetSolution, EntityUid user, bool asRefill)
     {
+        if (HasComp<BlockInjectionComponent>(targetEntity))  // DeltaV
+            return;
+
         if (!SolutionContainers.TryGetSolution(injector.Owner, injector.Comp.SolutionName, out var soln,
                 out var solution) || solution.Volume == 0)
             return;

Content.Server/Construction/ConstructionSystem.Interactions.cs

@@ -2,7 +2,6 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Construction.Components;
 using Content.Server.Temperature.Components;
-using Content.Server.Temperature.Systems;
 using Content.Shared.Construction;
 using Content.Shared.Construction.Components;
 using Content.Shared.Construction.EntitySystems;
@@ -11,6 +10,7 @@
 using Content.Shared.Interaction;
 using Content.Shared.Prying.Systems;
 using Content.Shared.Radio.EntitySystems;
+using Content.Shared.Temperature;
 using Content.Shared.Tools.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Utility;

Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs

@@ -1,4 +1,4 @@
-    using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Server.Audio;
@@ -15,8 +15,10 @@
 using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
+using Content.Server.Storage.EntitySystems;
 using Content.Server.Temperature.Components;
 using Content.Server.Temperature.Systems;
+using Content.Server.UserInterface;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
@@ -39,7 +41,6 @@
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Movement.Events;
-using Content.Shared.Nutrition;
 using Content.Shared.Nyanotrasen.Kitchen;
 using Content.Shared.Nyanotrasen.Kitchen.Components;
 using Content.Shared.Nyanotrasen.Kitchen.UI;
@@ -56,7 +57,6 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
-using Robust.Shared.Physics.Components;
 
 namespace Content.Server.Nyanotrasen.Kitchen.EntitySystems;
 
@@ -105,15 +105,12 @@ public override void Initialize()
 
         SubscribeLocalEvent<DeepFryerComponent, ComponentInit>(OnInitDeepFryer);
         SubscribeLocalEvent<DeepFryerComponent, PowerChangedEvent>(OnPowerChange);
-        SubscribeLocalEvent<DeepFryerComponent, RefreshPartsEvent>(OnRefreshParts);
         SubscribeLocalEvent<DeepFryerComponent, MachineDeconstructedEvent>(OnDeconstruct);
         SubscribeLocalEvent<DeepFryerComponent, DestructionEventArgs>(OnDestruction);
         SubscribeLocalEvent<DeepFryerComponent, ThrowHitByEvent>(OnThrowHitBy);
         SubscribeLocalEvent<DeepFryerComponent, SolutionChangedEvent>(OnSolutionChange);
         SubscribeLocalEvent<DeepFryerComponent, ContainerRelayMovementEntityEvent>(OnRelayMovement);
         SubscribeLocalEvent<DeepFryerComponent, InteractUsingEvent>(OnInteractUsing);
-        SubscribeLocalEvent<DeepFryerComponent, CanDropTargetEvent>(OnCanDragDropOn);
-        SubscribeLocalEvent<DeepFryerComponent, DragDropTargetEvent>(OnDragDropOn);
 
         SubscribeLocalEvent<DeepFryerComponent, BeforeActivatableUIOpenEvent>(OnBeforeActivatableUIOpen);
         SubscribeLocalEvent<DeepFryerComponent, DeepFryerRemoveItemMessage>(OnRemoveItem);
@@ -127,6 +124,24 @@ public override void Initialize()
         SubscribeLocalEvent<DeepFriedComponent, ExaminedEvent>(OnExamineFried);
         SubscribeLocalEvent<DeepFriedComponent, PriceCalculationEvent>(OnPriceCalculation);
         SubscribeLocalEvent<DeepFriedComponent, FoodSlicedEvent>(OnSliceDeepFried);
+
+        SubscribeLocalEvent<DeepFryerComponent, CanDropTargetEvent>(OnCanDragDropOn);
+        SubscribeLocalEvent<DeepFryerComponent, DragDropTargetEvent>(OnDragDropOn);
+        SubscribeLocalEvent<DeepFryerComponent, RefreshPartsEvent>(OnRefreshParts);
+    }
+
+    private void OnRefreshParts(EntityUid uid, DeepFryerComponent component, RefreshPartsEvent args)
+    {
+        var ratingStorage = args.PartRatings[component.MachinePartStorageMax];
+
+        component.StorageMaxEntities = component.BaseStorageMaxEntities +
+            (int) (component.StoragePerPartRating * (ratingStorage - 1));
+    }
+
+    private void OnDragDropOn(EntityUid uid, DeepFryerComponent component, ref DragDropTargetEvent args)
+    {
+        _containerSystem.Insert(args.Dragged, component.Storage);
+        args.Handled = true;
     }
 
     private void UpdateUserInterface(EntityUid uid, DeepFryerComponent component)
@@ -137,7 +152,7 @@ private void UpdateUserInterface(EntityUid uid, DeepFryerComponent component)
             component.FryingOilThreshold,
             EntityManager.GetNetEntityArray(component.Storage.ContainedEntities.ToArray()));
 
-        _uiSystem.SetUiState(new Entity<UserInterfaceComponent?>(uid, null), DeepFryerUiKey.Key, state);
+        _uiSystem.SetUiState(uid, DeepFryerUiKey.Key, state);
     }
 
     /// <summary>
@@ -167,12 +182,6 @@ public FixedPoint2 GetOilVolume(EntityUid uid, DeepFryerComponent component)
         return oilVolume;
     }
 
-    private void OnDragDropOn(EntityUid uid, DeepFryerComponent component, ref DragDropTargetEvent args)
-    {
-        _containerSystem.Insert(args.Dragged, component.Storage);
-        args.Handled = true;
-    }
-
     /// <summary>
     ///     Returns how much total waste is in the vat.
     /// </summary>
@@ -214,7 +223,7 @@ private void CookItem(EntityUid uid, DeepFryerComponent component, EntityUid ite
         if (TryComp<TemperatureComponent>(item, out var tempComp))
         {
             // Push the temperature towards what it should be but no higher.
-            var delta = (component.PoweredTemperature - tempComp.CurrentTemperature) * tempComp.HeatCapacity;
+            var delta = (component.PoweredTemperature - tempComp.CurrentTemperature) * _temperature.GetHeatCapacity(item, tempComp);
 
             if (delta > 0f)
                 _temperature.ChangeHeat(item, delta, false, tempComp);
@@ -347,12 +356,12 @@ private void DeepFry(EntityUid uid, DeepFryerComponent component, EntityUid item
 
         MakeCrispy(item);
 
-        var oilToUse = 0;
+        var itemComponent = Comp<ItemComponent>(item);
 
-        if (HasComp<ItemComponent>(item)) {
-            var itemComponent = Comp<ItemComponent>(item);
-
-            oilToUse = (int) (itemComponent.Size.Id switch
+        // Determine how much solution to spend on this item.
+        var solutionQuantity = FixedPoint2.Min(
+            component.Solution.Volume,
+            itemComponent.Size.Id switch
             {
                 "Tiny" => 1,
                 "Small" => 5,
@@ -362,15 +371,6 @@ private void DeepFry(EntityUid uid, DeepFryerComponent component, EntityUid item
                 "Ginormous" => 50,
                 _ => 10
             } * component.SolutionSizeCoefficient);
-        } else {
-            oilToUse = (int) (TryComp<PhysicsComponent>(item, out var physicsComponent) ? physicsComponent.Mass : 10);
-        }
-
-        // Determine how much solution to spend on this item.
-        var solutionQuantity = FixedPoint2.Min(
-            component.Solution.Volume,
-            oilToUse
-        );
 
         if (component.Whitelist != null && _whitelistSystem.IsWhitelistPass(component.Whitelist, item) ||
             beingEvent.TurnIntoFood)
@@ -400,6 +400,7 @@ private void OnInitDeepFryer(EntityUid uid, DeepFryerComponent component, Compon
         {
             //JJ Comment - not sure this works. Need to check if Reagent.ToString is correct.
             _prototypeManager.TryIndex<ReagentPrototype>(reagent.Reagent.ToString(), out var proto);
+
             var effectsArgs = new EntityEffectReagentArgs(uid,
                 EntityManager,
                 null,
@@ -453,14 +454,6 @@ private void OnDestruction(EntityUid uid, DeepFryerComponent component, Destruct
         _containerSystem.EmptyContainer(component.Storage, true);
     }
 
-    private void OnRefreshParts(EntityUid uid, DeepFryerComponent component, RefreshPartsEvent args)
-    {
-        var ratingStorage = args.PartRatings[component.MachinePartStorageMax];
-
-        component.StorageMaxEntities = component.BaseStorageMaxEntities +
-                                       (int) (component.StoragePerPartRating * (ratingStorage - 1));
-    }
-
     /// <summary>
     ///     Allow thrown items to land in a basket.
     /// </summary>
@@ -522,6 +515,7 @@ private void OnSolutionChange(EntityUid uid, DeepFryerComponent component, Solut
     private void OnRelayMovement(EntityUid uid, DeepFryerComponent component,
         ref ContainerRelayMovementEntityEvent args)
     {
+
         if (!_containerSystem.Remove(args.Entity, component.Storage, destination: Transform(uid).Coordinates))
             return;
 
@@ -548,7 +542,7 @@ private void OnRemoveItem(EntityUid uid, DeepFryerComponent component, DeepFryer
             if (!_containerSystem.Remove(removedItem, component.Storage))
                 return;
 
-            var user = EntityManager.GetEntity(args.Entity);
+            var user = args.Actor;
 
             _handsSystem.TryPickupAnyHand(user, removedItem);
 
@@ -601,9 +595,10 @@ private bool TryGetActiveHandSolutionContainer(
 
     private void OnScoopVat(EntityUid uid, DeepFryerComponent component, DeepFryerScoopVatMessage args)
     {
-        var user = EntityManager.GetEntity(args.Entity);
+        var user = args.Actor;
 
-        if (!TryGetActiveHandSolutionContainer(uid, user, out var heldItem, out var heldSolution,
+        if (user == null ||
+            !TryGetActiveHandSolutionContainer(uid, user, out var heldItem, out var heldSolution,
                 out var transferAmount))
             return;
 
@@ -622,7 +617,7 @@ private void OnScoopVat(EntityUid uid, DeepFryerComponent component, DeepFryerSc
 
     private void OnClearSlagStart(EntityUid uid, DeepFryerComponent component, DeepFryerClearSlagMessage args)
     {
-        var user = EntityManager.GetEntity(args.Entity);
+        var user = args.Actor;
 
         if (!TryGetActiveHandSolutionContainer(uid, user, out var heldItem, out var heldSolution,
                 out var transferAmount))
@@ -639,7 +634,7 @@ private void OnClearSlagStart(EntityUid uid, DeepFryerComponent component, DeepF
             return;
         }
 
-        var delay = Math.Clamp((float) wasteVolume * 0.1f, 1f, 5f);
+        var delay = TimeSpan.FromSeconds(Math.Clamp((float) wasteVolume * 0.1f, 1f, 5f));
 
         var ev = new ClearSlagDoAfterEvent(heldSolution.Value.Comp.Solution, transferAmount);
 
@@ -655,14 +650,15 @@ private void OnClearSlagStart(EntityUid uid, DeepFryerComponent component, DeepF
         _doAfterSystem.TryStartDoAfter(doAfterArgs);
     }
 
+    [Obsolete("Obsolete")]
     private void OnRemoveAllItems(EntityUid uid, DeepFryerComponent component, DeepFryerRemoveAllItemsMessage args)
     {
         if (component.Storage.ContainedEntities.Count == 0)
             return;
 
         _containerSystem.EmptyContainer(component.Storage);
 
-        var user = EntityManager.GetEntity(args.Entity);
+        var user = args.Actor;
 
         _adminLogManager.Add(LogType.Action, LogImpact.Low,
             $"{ToPrettyString(user)} removed all items from {ToPrettyString(uid)}.");

Content.Server/Temperature/Components/TemperatureComponent.cs

@@ -1,4 +1,3 @@
-using Content.Server.Temperature.Systems;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
 using Content.Shared.Damage;
@@ -51,15 +50,6 @@ public sealed partial class TemperatureComponent : Component
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float AtmosTemperatureTransferEfficiency = 0.1f;
 
-    [Obsolete("Use system method")]
-    public float HeatCapacity
-    {
-        get
-        {
-            return IoCManager.Resolve<IEntityManager>().System<TemperatureSystem>().GetHeatCapacity(Owner, this);
-        }
-    }
-
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public DamageSpecifier ColdDamage = new();
 
@@ -71,15 +61,15 @@ public float HeatCapacity
     /// </summary>
     /// <remarks>
     /// Okay it genuinely reaches this basically immediately for a plasma fire.
-    /// </summary>
+    /// </remarks>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public FixedPoint2 DamageCap = FixedPoint2.New(8);
 
     /// <summary>
     /// Used to keep track of when damage starts/stops. Useful for logs.
     /// </summary>
     [DataField]
-    public bool TakingDamage = false;
+    public bool TakingDamage;
 
     [DataField]
     public ProtoId<AlertPrototype> HotAlert = "Hot";

Content.Server/Temperature/Systems/TemperatureSystem.cs

@@ -414,17 +414,3 @@ private void RecalculateAndApplyParentThresholds(EntityUid uid,
         return (newHeatThreshold, newColdThreshold);
     }
 }
-
-public sealed class OnTemperatureChangeEvent : EntityEventArgs
-{
-    public float CurrentTemperature { get; }
-    public float LastTemperature { get; }
-    public float TemperatureDelta { get; }
-
-    public OnTemperatureChangeEvent(float current, float last, float delta)
-    {
-        CurrentTemperature = current;
-        LastTemperature = last;
-        TemperatureDelta = delta;
-    }
-}

Content.Server/_DV/Abilities/Chitinid/BlockInjectionComponent.cs

@@ -0,0 +1,4 @@
+namespace Content.Server.Abilities.Chitinid;
+
+[RegisterComponent]
+public sealed partial class BlockInjectionComponent : Component;

Content.Server/_DV/Abilities/Chitinid/ChitinidComponent.cs

@@ -0,0 +1,41 @@
+using Content.Shared.Damage;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Server.Abilities.Chitinid;
+
+[RegisterComponent]
+public sealed partial class ChitinidComponent : Component
+{
+    [DataField]
+    public EntProtoId ChitzitePrototype = "Chitzite";
+
+    [DataField]
+    public EntProtoId ChitziteActionId = "ActionChitzite";
+
+    [DataField]
+    public EntityUid? ChitziteAction;
+
+    [DataField]
+    public FixedPoint2 AmountAbsorbed = 0f;
+
+    [DataField]
+    public DamageSpecifier Healing = new()
+    {
+        DamageDict = new()
+        {
+            { "Radiation", -0.5 },
+        }
+    };
+
+    [DataField]
+    public FixedPoint2 MaximumAbsorbed = 30f;
+
+    [DataField]
+    public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1);
+
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    public TimeSpan NextUpdate;
+}