Рефактор химимплантов

Content.Server/Implants/SubdermalImplantSystem.cs

@@ -21,7 +21,8 @@
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Random;
 using System.Numerics;
-using Content.Shared.SS220.ReagentImplanter;
+using Content.Shared.SS220.ChemicalImplant;
+using FastAccessors;
 
 namespace Content.Server.Implants;
 
@@ -47,7 +48,7 @@ public override void Initialize()
 
         _physicsQuery = GetEntityQuery<PhysicsComponent>();
 
-        SubscribeLocalEvent<SubdermalImplantComponent, UseReagentCapsuleImplantEvent>(OnReagentCapsuleImplant);
+        SubscribeLocalEvent<SubdermalImplantComponent, UseChemicalImplantEvent>(OnChemicaImplant); // SS220 - chemical-implants start
         SubscribeLocalEvent<SubdermalImplantComponent, UseFreedomImplantEvent>(OnFreedomImplant);
         SubscribeLocalEvent<StoreComponent, ImplantRelayEvent<AfterInteractUsingEvent>>(OnStoreRelay);
         SubscribeLocalEvent<SubdermalImplantComponent, ActivateImplantEvent>(OnActivateImplantEvent);
@@ -56,28 +57,25 @@ public override void Initialize()
 
     }
 
-    private void OnReagentCapsuleImplant(EntityUid uid, SubdermalImplantComponent component, UseReagentCapsuleImplantEvent args)
+    // SS220 - chemical-implants start
+    private void OnChemicaImplant(EntityUid uid, SubdermalImplantComponent component, UseChemicalImplantEvent args)
     {
-        if (!TryComp<SolutionContainerManagerComponent>(args.Performer, out var ownerSolutionContainerComp)
-            || !TryComp<ReagentCapsuleComponent>(uid, out var reagentCapsule)
-            || !TryComp<SolutionContainerManagerComponent>(uid, out var capsuleContainer))
+        if (component.ImplantedEntity is not { } ent
+            ||!TryComp<SolutionContainerManagerComponent>(args.Performer, out var performerSolution)
+            || !TryComp<SolutionContainerManagerComponent>(uid, out var implantSolution))
             return;
 
-        if (args.Handled || reagentCapsule.IsUsed)
-            return;
-
-        if (!_solutionContainer.TryGetSolution(new(args.Performer, ownerSolutionContainerComp), "chemicals", out var chemicals))
-            return;
-
-        if (!_solutionContainer.TryGetSolution(new(uid, capsuleContainer), "beaker", out var beaker))
+        if (args.Handled)
             return;
 
-        _solutionContainer.TryTransferSolution(chemicals.Value, beaker.Value.Comp.Solution, beaker.Value.Comp.Solution.Volume);
-        reagentCapsule.IsUsed = true;
         args.Handled = true;
 
+        QueueDel(uid);
+
     }
 
+    // SS220 - chemical-implants end
+
     private void OnStoreRelay(EntityUid uid, StoreComponent store, ImplantRelayEvent<AfterInteractUsingEvent> implantRelay)
     {
         var args = implantRelay.Event;

Content.Shared/Implants/Components/SubdermalImplantComponent.cs

@@ -51,7 +51,7 @@ public sealed partial class SubdermalImplantComponent : Component
     public EntityWhitelist? Blacklist;
 }
 
-public sealed partial class UseReagentCapsuleImplantEvent : InstantActionEvent
+public sealed partial class UseChemicalImplantEvent : InstantActionEvent
 {
 
 }

Content.Shared/Implants/SharedImplanterSystem.cs

@@ -7,7 +7,7 @@
 using Content.Shared.IdentityManagement;
 using Content.Shared.Implants.Components;
 using Content.Shared.Popups;
-using Content.Shared.SS220.ReagentImplanter;
+using Content.Shared.SS220.ChemicalImplant;
 using Content.Shared.Whitelist;
 using Robust.Shared.Containers;
 using Robust.Shared.Serialization;
@@ -100,11 +100,6 @@ public bool CanImplant(
             return false;
         }
 
-        if(TryComp<ReagentCapsuleComponent>(implant, out var capsuleComp) && capsuleComp.IsUsed)
-        {
-            _popup.PopupEntity(Loc.GetString("implanter-inject-used-capsule"), target);
-        }
-
         var ev = new AddImplantAttemptEvent(user, target, implant.Value, implanter);
         RaiseLocalEvent(target, ev);
         return !ev.Cancelled;

Content.Shared/SS220/ChemicalImplant/ChemicalImplantComponent.cs

@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.SS220.ChemicalImplant
+{
+    [RegisterComponent, NetworkedComponent]
+    public sealed partial class ChemicalImplantComponent : Component
+    {
+    }
+
+}

Resources/Prototypes/SS220/ReagentInjector/reagents_implanter.yml → Resources/Prototypes/SS220/ChemicalImplants/chemimplanters.yml

@@ -1,7 +1,7 @@
 # Base
 - type: entity
-  name: Reagents Capsule Implanter
-  id: BaseReagentsCapsuleImplanter
+  name: Chemical Implanter
+  id: BaseChemicalImplanter
   parent: BaseItem
   abstract: true
   noSpawn: true
@@ -19,7 +19,7 @@
         priority: 0
         whitelist:
           tags:
-            - SubdermalImplant
+            - ChemicalImplant
     - type: Sprite
       sprite: SS220/Objects/ReagentInjector/injector.rsi
       state: injector
@@ -29,23 +29,26 @@
         injector_full:
           whitelist:
             tags:
-              - SubdermalImplant
+              - ChemicalImplant
     - type: Item
       sprite: SS220/Objects/ReagentInjector/injector.rsi
       heldPrefix: 0
     - type: Appearance
+    - type: Tag
+      tags:
+        - ChemicalImplant
 
 - type: entity
-  id: ReagentsCapsuleInjector
+  id: ChemicalImplanter
   name: reagent-injector-name
   description: reagent-injector-desc
-  parent: BaseReagentsCapsuleImplanter
+  parent: BaseChemicalImplanter
   components:
     - type: Implanter
-      implant: EmptyCapsule
+      implant: EmptyChemicalImplant
 
 - type: entity
-  id: ActionOpenReagentsCapsule
+  id: ActionUseChemicalImplant
   name: reagent-injector-action-name
   description: reagent-injector-action-desc
   noSpawn: true
@@ -58,16 +61,4 @@
     icon:
       sprite: SS220/Objects/ReagentInjector/injector.rsi
       state: icon_empty
-    event: !type:UseReagentCapsuleImplantEvent
-
-# Other
-- type: listing
-  id: UplinkReagentsCapsuleInjector
-  name: reagent-injector-name
-  description: uplink-reagent-injector-desc
-  icon: { sprite: SS220/Objects/ReagentInjector/injector.rsi, state: injector }
-  productEntity: ReagentsCapsuleInjector
-  cost:
-    Telecrystal: 6
-  categories:
-    - UplinkInjectors
+    event: !type:UseChemicalImplantEvent

Resources/Prototypes/SS220/ReagentInjector/reagents_capsule.yml → Resources/Prototypes/SS220/ChemicalImplants/chemimplants.yml

@@ -1,13 +1,13 @@
-# Base
+# capsules
 - type: entity
-  parent: BaseSubdermalImplant
-  id: BaseReagentsCapsule
-  name: reagents capsule
+  id: EmptyChemicalImplant
+  name: empty-reagent-capsule-name
+  description: empty-reagent-capsule-desk
   components:
-    - type: ReagentCapsule
+    - type: ChemicalImplant
     - type: SubdermalImplant
       permanent: true
-      implantAction: ActionOpenReagentsCapsule
+      implantAction: ActionUseChemicalImplant
     - type: Sprite
       sprite: SS220/Objects/ReagentInjector/capsules.rsi
       state: capsule
@@ -24,34 +24,23 @@
       solution: beaker
     - type: ExaminableSolution
       solution: beaker
+    - type: InteractionOutline
+    - type: Clickable
     - type: Appearance
     - type: SolutionContainerVisuals
       maxFillLevels: 1
       changeColor: false
       emptySpriteName: capsule_used
+    - type: Tag
+      tags:
+        - ChemicalImplant
 
-# capsules
 - type: entity
-  parent: BaseReagentsCapsule
-  id: EmptyCapsule
-  name: empty-reagent-capsule-name
-  description: empty-reagent-capsule-desk
-  components:
-    - type: SubdermalImplant
-      permanent: false
-    - type: Appearance
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          maxVol: 30
-
-- type: entity
-  parent: BaseReagentsCapsule
-  id: CombatCapsule
+  parent: EmptyChemicalImplant
+  id: CombatChemicalImplant
   name: combat-reagent-capsule-name
   description: combat-reagent-capsule-desk
   components:
-    - type: Appearance
     - type: Sprite
       sprite: SS220/Objects/ReagentInjector/capsules.rsi
       layers:
@@ -68,8 +57,8 @@
             Quantity: 5
 
 - type: entity
-  parent: BaseReagentsCapsule
-  id: DABCapsule
+  parent: EmptyChemicalImplant
+  id: DABChemicalImplant
   name: dab-reagent-capsule-name
   description: dab-reagent-capsule-desc
   components:
@@ -91,8 +80,8 @@
             Quantity: 10
 
 - type: entity
-  parent: BaseReagentsCapsule
-  id: ExperementalReanimatorCapsule
+  parent: EmptyChemicalImplant
+  id: ExpReanimatorChemicalImplant
   name: unstable-reanimator-reagent-capsule-name
   description: unstable-reanimator-reagent-capsule-desc
   components:
@@ -114,8 +103,8 @@
             Quantity: 10
 
 - type: entity
-  parent: BaseReagentsCapsule
-  id: SuicideCapsule
+  parent: EmptyChemicalImplant
+  id: SuicideChemicalImplant
   name: suicide-reagent-capsule-name
   description: suicide-reagent-capsule-desc
   components:
@@ -133,73 +122,3 @@
           reagents:
           - ReagentId: Amatoxin
             Quantity: 10
-# Uplink
-- type: listing
-  id: UplinkEmptyCapsule
-  name: uplink-empty-reagent-capsule-name
-  description: uplink-empty-reagent-capsule-desk
-  icon: { sprite: SS220/Objects/ReagentInjector/capsules.rsi, state: capsule }
-  productEntity: EmptyCapsule
-  cost:
-    Telecrystal: 1
-  categories:
-    - UplinkInjectors
-
-- type: listing
-  id: UplinkCombatCapsule
-  name: uplink-combat-reagent-capsule-name
-  description: uplink-combat-reagent-capsule-desk
-  icon: { sprite: SS220/Objects/ReagentInjector/capsules.rsi, state: combat }
-  productEntity: CombatCapsule
-  cost:
-    Telecrystal: 4
-  categories:
-    - UplinkInjectors
-  conditions:
-    - !type:StoreWhitelistCondition
-      whitelist:
-        tags:
-          - NukeOpsUplink
-
-- type: listing
-  id: UplinkDABCapsule
-  name: uplink-dab-reagent-capsule-name
-  description: uplink-dab-reagent-capsule-desc
-  icon: { sprite: SS220/Objects/ReagentInjector/capsules.rsi, state: dab }
-  productEntity: DABCapsule
-  cost:
-    Telecrystal: 2
-  categories:
-    - UplinkInjectors
-
-- type: listing
-  id: UplinkExperementalReanimatorCapsule
-  name: uplink-expadrenaline-reagent-capsule-name
-  description: uplink-expadrenaline-reagent-capsule-desc
-  icon: { sprite: SS220/Objects/ReagentInjector/capsules.rsi, state: reanim }
-  productEntity: ExperementalReanimatorCapsule
-  cost:
-    Telecrystal: 4
-  categories:
-    - UplinkInjectors
-  conditions:
-    - !type:StoreWhitelistCondition
-      whitelist:
-        tags:
-          - NukeOpsUplink
-
-- type: listing
-  id: UplinkSuicideCapsule
-  name: uplink-suicide-reagent-capsule-name
-  description: uplink-suicide-reagent-capsule-desc
-  icon: { sprite: SS220/Objects/ReagentInjector/capsules.rsi, state: dead }
-  productEntity: SuicideCapsule
-  cost:
-    Telecrystal: 2
-  categories:
-    - UplinkInjectors
-  conditions:
-    - !type:StoreWhitelistCondition
-      blacklist:
-        tags:
-          - NukeOpsUplink