From 17b74aeeb83c1951327ee4ee89338d380b7a8a59 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Thu, 12 Dec 2024 12:54:21 -0500
Subject: [PATCH] Port researchable syringe gun (DeltaV#2169, DeltaV#2249)
 (#2528)

* Add the syringe gun as research (#2169)

* Tech added

* Added recipes and made printable

* Tech added

* Added recipes and made printable

* Should solve the conflict

* Should solve the merge conflict

* Emagged protolathe

* Nerf "mini" syringes (#2249)

Update chemistry.yml

* Nerf "mini" syringes

* Force transfer, max transfer amount to 5u

* 0.5u on collide, 0.5u per injection, 2s per inject

---------

Co-authored-by: Radezolid <snappednexus@gmail.com>
Co-authored-by: Stop-Signs <stopsign221@gmail.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
---
 .../en-US/deltav/research/technologies.ftl       |  1 +
 .../Prototypes/DeltaV/Recipes/Lathes/medical.yml | 16 ++++++++++++++++
 .../DeltaV/Research/civilianservices.yml         | 12 ++++++++++++
 .../Entities/Objects/Specific/chemistry.yml      | 15 ++++++++++++---
 .../Entities/Structures/Machines/lathe.yml       | 10 +++++++++-
 5 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 Resources/Locale/en-US/deltav/research/technologies.ftl
 create mode 100644 Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml
 create mode 100644 Resources/Prototypes/DeltaV/Research/civilianservices.yml

diff --git a/Resources/Locale/en-US/deltav/research/technologies.ftl b/Resources/Locale/en-US/deltav/research/technologies.ftl
new file mode 100644
index 00000000000..c76a12537bd
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/research/technologies.ftl
@@ -0,0 +1 @@
+research-technology-syringe-gun = Syringe Gun
diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml
new file mode 100644
index 00000000000..4f80f4198d4
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml
@@ -0,0 +1,16 @@
+- type: latheRecipe
+  id: LauncherSyringe
+  result: LauncherSyringe
+  completetime: 3
+  materials:
+    Steel: 1000
+    Glass: 500
+    Plastic: 500
+
+- type: latheRecipe
+  id: MiniSyringe
+  result: MiniSyringe
+  completetime: 1
+  materials:
+    Plastic: 150
+    Steel: 50
diff --git a/Resources/Prototypes/DeltaV/Research/civilianservices.yml b/Resources/Prototypes/DeltaV/Research/civilianservices.yml
new file mode 100644
index 00000000000..73be7fb5a94
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Research/civilianservices.yml
@@ -0,0 +1,12 @@
+- type: technology
+  id: SyringeGun
+  name: research-technology-syringe-gun
+  icon:
+    sprite: Objects/Weapons/Guns/Cannons/syringe_gun.rsi
+    state: syringe_gun
+  discipline: CivilianServices
+  tier: 2
+  cost: 10000
+  recipeUnlocks:
+    - LauncherSyringe
+    - MiniSyringe
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index 1f7565db972..2cddc3cf47a 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -413,12 +413,18 @@
     minimumSpeed: 3
     removalTime: 0.25
     embedOnThrow: false
+  # DeltaV - Nerfs the max volume to 5 (was 15)
+  - type: SolutionContainerManager
+    solutions:
+      injector:
+        maxVol: 5
+  # End DeltaV
   - type: SolutionInjectWhileEmbedded
-    transferAmount: 1
+    transferAmount: 0.5 # Frontier: 1 < 0.5
     solution: injector
     updateInterval: 2
   - type: SolutionInjectOnEmbed
-    transferAmount: 2
+    transferAmount: 0.5 # Frontier: 2 < 0.5
     solution: injector
   - type: Fixtures
     fixtures:
@@ -449,6 +455,9 @@
     - Syringe
     - Trash
     - SyringeGunAmmo
+  - type: Injector # Frontier
+    maxTransferAmount: 5 # Frontier
+    transferAmount: 5 # Frontier
 
 - type: entity
   parent: BaseSyringe
@@ -592,7 +601,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/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index b71b170d7d8..4158907fa6a 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -449,6 +449,10 @@
       - WeaponXrayCannon
       - SpeedLoaderRifleHeavyIncendiary # Frontier
       - SpeedLoaderRifleHeavyUranium # Frontier
+      # Begin DeltaV additions
+      - LauncherSyringe
+      - MiniSyringe
+      # End DeltaV additions
 
 - type: entity
   id: ProtolatheHyperConvection
@@ -1032,7 +1036,6 @@
       - BlankMediPen # Frontier
       - MedicalAppraisalTool # Frontier
     dynamicRecipes:
-      - VialBluespace # Frontier
       - ChemicalPayload
       - CryostasisBeaker
       - BluespaceBeaker
@@ -1040,7 +1043,12 @@
       - SyringeBluespace
       - Jug
       - SyringeCryostasis
+      - VialBluespace # Frontier
       - ClothingOuterHardsuitMedical # Frontier
+      # Begin DeltaV additions
+      - LauncherSyringe
+      - MiniSyringe
+      # End DeltaV additions
   - type: Machine
     board: MedicalTechFabCircuitboard
   - type: StealTarget