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 <[email protected]> Co-authored-by: Stop-Signs <[email protected]> Co-authored-by: Dvir <[email protected]>
new-frontiers-14 · Dec 12, 2024 · 17b74ae · 17b74ae
1 parent 7d13e63
commit 17b74ae
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 4 deletions.
diff --git a/Resources/Locale/en-US/deltav/research/technologies.ftl 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
@@ -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
@@ -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
@@ -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
@@ -449,6 +449,10 @@
       - WeaponXrayCannon
       - SpeedLoaderRifleHeavyIncendiary # Frontier
       - SpeedLoaderRifleHeavyUranium # Frontier
+      # Begin DeltaV additions
+      - LauncherSyringe
+      - MiniSyringe
+      # End DeltaV additions
 
 - type: entity
   id: ProtolatheHyperConvection
@@ -1032,15 +1036,19 @@
       - BlankMediPen # Frontier
       - MedicalAppraisalTool # Frontier
     dynamicRecipes:
-      - VialBluespace # Frontier
       - ChemicalPayload
       - CryostasisBeaker
       - BluespaceBeaker
       - JugBluespace # Frontier
       - SyringeBluespace
       - Jug
       - SyringeCryostasis
+      - VialBluespace # Frontier
       - ClothingOuterHardsuitMedical # Frontier
+      # Begin DeltaV additions
+      - LauncherSyringe
+      - MiniSyringe
+      # End DeltaV additions
   - type: Machine
     board: MedicalTechFabCircuitboard
   - type: StealTarget