[Feature] Syringe gun! (#1018)

* Syringe Ops real syringe ops real (#967) * ebin syringeops * its fucking real * 1984 * Update BaseSolutionInjectOnEventComponent.cs minor spelling mistake webeditops * locale * Update Content.Server/_Goobstation/Weapons/Ranged/SyringeGunSystem.cs Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: gluesniffler <[email protected]> Co-authored-by: Kayzel <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Rxup · Jan 25, 2025 · 50ca47e · 50ca47e
1 parent 4af7163
commit 50ca47e
Show file tree

Hide file tree

Showing 34 changed files with 381 additions and 9 deletions.
diff --git a/Content.Server/Chemistry/Components/BaseSolutionInjectOnEventComponent.cs b/Content.Server/Chemistry/Components/BaseSolutionInjectOnEventComponent.cs
@@ -57,4 +57,10 @@ public abstract partial class BaseSolutionInjectOnEventComponent : Component
     /// </summary>
     [DataField]
     public SlotFlags BlockSlots = SlotFlags.NONE;
+
+    /// <summary>
+    ///     GoobStation: If this injection transfers EVERYTHING as soon as it is embedded after a gunshot.
+    /// </summary>
+    [DataField]
+    public bool Shot = false;
 }
diff --git a/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Server.Chemistry.Components;
+using Content.Shared.Chemistry.Components; // GoobStation
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Events;
 using Content.Shared.Inventory;
@@ -40,6 +41,11 @@ private void HandleProjectileHit(Entity<SolutionInjectOnProjectileHitComponent>
 
     private void HandleEmbed(Entity<SolutionInjectOnEmbedComponent> entity, ref EmbedEvent args)
     {
+        // GoobStation Change Start
+        if (_tag.HasTag(entity, "Syringe") && !entity.Comp.Shot)
+            entity.Comp.PierceArmor = false; // This way syringes that are thrown still inject but do not pierce armor.
+        // GoobStation Change End
+
         DoInjection((entity.Owner, entity.Comp), args.Embedded, args.Shooter);
     }
 
@@ -95,6 +101,7 @@ private bool TryInjectTargets(Entity<BaseSolutionInjectOnEventComponent> injecto
             // TODO blocking injection with a hardsuit should probably done with a cancellable event or something
             if (!injector.Comp.PierceArmor && _inventory.TryGetSlotEntity(target, "outerClothing", out var suit) && _tag.HasTag(suit.Value, "Hardsuit"))
             {
+                injector.Comp.Shot = false;
                 // Only show popup to attacker
                 if (source != null)
                     _popup.PopupEntity(Loc.GetString(injector.Comp.BlockedByHardsuitPopupMessage, ("weapon", injector.Owner), ("target", target)), target, source.Value, PopupType.SmallCaution);
@@ -132,8 +139,16 @@ private bool TryInjectTargets(Entity<BaseSolutionInjectOnEventComponent> injecto
         if (targetBloodstreams.Count == 0)
             return false;
 
-        // Extract total needed solution from the injector
-        var removedSolution = _solutionContainer.SplitSolution(injectorSolution.Value, injector.Comp.TransferAmount * targetBloodstreams.Count);
+        // GoobStation Change Start
+        Solution removedSolution;
+        if (injector.Comp.Shot)
+        {
+            removedSolution = _solutionContainer.SplitSolution(injectorSolution.Value, injectorSolution.Value.Comp.Solution.Volume);
+            injector.Comp.Shot = false; // Prevent them from abusing this.
+        }
+        else
+            removedSolution = _solutionContainer.SplitSolution(injectorSolution.Value, injector.Comp.TransferAmount * targetBloodstreams.Count);
+        // GoobStation Change End
         // Adjust solution amount based on transfer efficiency
         var solutionToInject = removedSolution.SplitSolution(removedSolution.Volume * injector.Comp.TransferEfficiency);
         // Calculate how much of the adjusted solution each target will get

diff --git a/Content.Server/Chemistry/EntitySystems/SolutionInjectWhileEmbeddedSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionInjectWhileEmbeddedSystem.cs
@@ -28,7 +28,6 @@ public sealed class SolutionInjectWhileEmbeddedSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
-
         SubscribeLocalEvent<SolutionInjectWhileEmbeddedComponent, MapInitEvent>(OnMapInit);
     }
 

diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -116,7 +116,7 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
 
                         RaiseLocalEvent(ent!.Value, new AmmoShotEvent()
                         {
-                            FiredProjectiles = shotProjectiles,
+                            FiredProjectiles = shotProjectiles
                         });
 
                         SetCartridgeSpent(ent.Value, cartridge, true);

diff --git a/Content.Server/_Goobstation/Weapons/Ranged/SyringeGunSystem.cs b/Content.Server/_Goobstation/Weapons/Ranged/SyringeGunSystem.cs
@@ -0,0 +1,29 @@
+using Content.Server.Chemistry.Components;
+using Content.Shared.Weapons.Ranged.Events;
+using Content.Shared._Goobstation.Weapons.Ranged;
+namespace Content.Server._Goobstation.Weapons.Ranged;
+
+/// <summary>
+///     System for handling projectiles and altering their properties when fired from a Syringe Gun.
+/// </summary>
+public sealed class SyringeGunSystem : EntitySystem
+{
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<SyringeGunComponent, AmmoShotEvent>(OnFire);
+    }
+
+    private void OnFire(Entity<SyringeGunComponent> gun, ref AmmoShotEvent args)
+    {
+        foreach (var projectile in args.FiredProjectiles)
+        {
+            if (TryComp(projectile, out SolutionInjectOnEmbedComponent? inject))
+            {
+                inject.Shot = true;
+                inject.PierceArmor = gun.Comp.PierceArmor;
+            }
+        }
+    }
+
+}
diff --git a/Content.Shared/_Goobstation/Weapons/Ranged/SyringeGunComponent.cs b/Content.Shared/_Goobstation/Weapons/Ranged/SyringeGunComponent.cs
@@ -0,0 +1,13 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._Goobstation.Weapons.Ranged;
+
+/// <summary>
+///     Component that allows guns to instantly inject all the contents of any syringe on a target.
+/// </summary>
+[RegisterComponent]
+public sealed partial class SyringeGunComponent : Component
+{
+    [DataField]
+    public bool PierceArmor;
+}
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -213,6 +213,9 @@ uplink-decoy-kit-desc = State-of-the-art distraction technology straight from RN
 uplink-chemistry-kit-name = Chemical Synthesis Kit
 uplink-chemistry-kit-desc = A starter kit for the aspiring chemist, includes toxin and vestine for all your criminal needs!
 
+uplink-dart-syringe-gun-name = Dart Syringe Gun
+uplink-dart-syringe-gun-desc = A gun that takes in syringes as ammunition, and injects their contents on its victims. Can pierce through armor.
+
 uplink-knives-kit-name = Throwing Knives Kit
 uplink-knives-kit-desc = A set of 4 syndicate branded throwing knives, perfect for embedding into the body of your victims.
 

diff --git a/Resources/Locale/ru-RU/backmen/entities/syringe_gun.ftl b/Resources/Locale/ru-RU/backmen/entities/syringe_gun.ftl
@@ -0,0 +1,6 @@
+ent-DartSyringeGun = дротиковый шприцемёт
+    .desc = Нелегально модифицированная версия шприцемёта которая позволяет пробивать броню.
+ent-SyringeGun = шприцемёт
+    .desc = Девайс, позволяющий выстреливать шприцами и моментально вводить их содержимое в цель.
+ent-RapidSyringeGun = улучшенный шприцемёт
+    .desc = Улучшенная версия шприцемёта с более быстрой скорострельностью и большой вместимостью шприцов.
diff --git a/Resources/Locale/ru-RU/backmen/research/technologies.ftl b/Resources/Locale/ru-RU/backmen/research/technologies.ftl
@@ -3,3 +3,4 @@ research-technology-metempsychosis = Метемпсихоз
 research-technology-navigation = Навигация
 research-technology-psionic-countermeasures = Псионические контрмеры
 research-technology-teleportation = Телепортация
+research-technology-medical-defense = Экстремальные методы контроля
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl
@@ -171,3 +171,6 @@ ent-SyringeRomerol = { ent-PrefilledSyringe }
 ent-SyringeStimulants = { ent-PrefilledSyringe }
     .desc = { ent-PrefilledSyringe.desc }
     .suffix = Стимулятор
+ent-SyringePax = { ent-PrefilledSyringe }
+    .desc = { ent-PrefilledSyringe.desc }
+    .suffix = Пакс
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -244,6 +244,8 @@
     - id: FlatpackMetempsychoticMachine # backmen
     - id: MedicalBiofabMachineBoard # backmen
     - id: MedTekCartridge
+    - id: RapidSyringeGun # backmen
+    - id: BoxSyringePax # backmen
 
 # Hardsuit table, used for suit storage as well
 - type: entityTable

diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -359,6 +359,40 @@
         maxVol: 15
   - type: Injector
     injectOnly: false
+    # GoobStation Start - Added embeddable properties for syringe gun
+  - type: EmbeddableProjectile
+    offset: "-0.1,0"
+    minimumSpeed: 3
+    removalTime: 0.25
+    embedOnThrow: true
+  - type: SolutionInjectOnEmbed
+    transferAmount: 2
+    solution: injector
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.2
+        density: 5
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
+      projectile:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.1,-0.3,0.1,0.3"
+        hard: false
+        mask:
+        - Impassable
+        - BulletImpassable
+  - type: Projectile
+    deleteOnCollide: false
+    onlyCollideWhenShot: true
+    damage:
+      types:
+        Piercing: 5
+    # GoobStation End
   - type: ExaminableSolution
     solution: injector
   - type: Spillable
@@ -374,6 +408,7 @@
   - type: Tag
     tags:
     - Syringe
+    - SyringeGunAmmo # GoobStation
 
 - type: entity
   parent: BaseSyringe
@@ -386,6 +421,7 @@
     tags:
     - Syringe
     - Trash
+    - SyringeGunAmmo # GoobStation
 
 - type: entity
   name: mini syringe
@@ -409,7 +445,7 @@
     offset: "-0.1,0"
     minimumSpeed: 3
     removalTime: 0.25
-    embedOnThrow: false
+    embedOnThrow: true
   - type: SolutionInjectWhileEmbedded
     transferAmount: 1
     solution: injector
@@ -589,7 +625,7 @@
     areaInsertRadius: 1
     storageInsertSound: /Audio/Effects/pill_insert.ogg
     storageRemoveSound: /Audio/Effects/pill_remove.ogg
-    whitelist: 
+    whitelist:
       tags:
       - Pill
   - type: Dumpable
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
@@ -103,7 +103,7 @@
     containers:
       storagebase: !type:Container
         ents: []
-        
+
 - type: entity
   name: syringe gun
   parent: BaseStorageItem

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -786,6 +786,7 @@
       - WeaponFlareGunSecurity
       - WeaponLaserCarbinePractice
       - Zipties
+      - SyringeGun #Goobstation
     dynamicRecipes:
       - BoxBeanbag
       - BoxShotgunIncendiary
@@ -842,6 +843,7 @@
       - ClothingHeadHelmetInsulated
       - ShellSoulbreaker
       - WeaponXrayCannon
+      - RapidSyringeGun # Goobstation
       - SecurityCyberneticEyes # Shitmed Change
       - MedicalCyberneticEyes # Shitmed Change
   - type: MaterialStorage
@@ -963,19 +965,22 @@
       - Hemostat
       - ClothingEyesGlassesChemical
       - WhiteCane
+      - SyringeGun # backmen
     dynamicRecipes:
       - ChemicalPayload
       - CryostasisBeaker
       - BluespaceBeaker
       - SyringeBluespace
       - SyringeCryostasis
       - BluespacePillCanister # backmen
-      # Shitmed Change
+      - RapidSyringeGun # backmen
+      # Shitmed Change start
       - EnergyScalpel
       - EnergyCautery
       - AdvancedRetractor
       - OmnimedTool
       - MedicalCyberneticEyes
+      # Shitmed Change end
   - type: Machine
     board: MedicalTechFabCircuitboard
   - type: StealTarget

diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
@@ -188,6 +188,19 @@
   recipeUnlocks:
   - CargoTelepadMachineCircuitboard
 
+# GoobStation - Why civilian? Because fuck you.
+- type: technology
+  id: MedicalDefense
+  name: research-technology-medical-defense
+  icon:
+    sprite: _Goobstation/Objects/Weapons/Guns/Cannons/syringe_gun.rsi
+    state: rapid-syringe-gun
+  discipline: CivilianServices
+  tier: 2
+  cost: 10000
+  recipeUnlocks:
+  - RapidSyringeGun
+
 # Tier 3
 
 - type: technology

diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -60,7 +60,7 @@
   equipment:
     id: CMOPDA
     ears: ClothingHeadsetCMO
-    belt: ClothingBeltMedicalFilled
+    belt: ClothingBeltMilitaryWebbingCMOFilled # Goobstation
   storage:
     back:
     - Flash
diff --git a/Resources/Prototypes/_Backmen/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Backmen/Catalog/uplink_catalog.yml
@@ -162,3 +162,22 @@
     Telecrystal: 10
   categories:
     - UplinkDeception
+
+- type: listing
+  id: UplinkDartSyringeGun
+  name: uplink-dart-syringe-gun-name
+  description: uplink-dart-syringe-gun-desc
+  icon: { sprite: /Textures/_Goobstation/Objects/Weapons/Guns/Cannons/syringe_gun.rsi, state: dart-syringe-gun }
+  productEntity: DartSyringeGun
+  cost:
+    Telecrystal: 30 # goob
+  categories:
+  - UplinkChemicals
+  conditions:
+  - !type:BuyerJobCondition
+    whitelist:
+    - MedicalDoctor
+    - MedicalIntern
+    - Psychologist
+    - Chemist
+    - Paramedic
-Original file line number
+Diff line change
@@ Expand Up @@
         public override void Initialize()
         {
             base.Initialize();
             SubscribeLocalEvent<SolutionInjectWhileEmbeddedComponent, MapInitEvent>(OnMapInit);
         }
@@ Expand Down @@