From 0386bd332d7e1b280b1c5506078c0cd411b28c99 Mon Sep 17 00:00:00 2001 From: JrInventor05 <125007252+JrInventor05@users.noreply.github.com> Date: Mon, 12 May 2025 08:14:13 +0800 Subject: [PATCH] Make the Syringe gun a science research (#37251) * LauncherSyringe * fix * fixfortest * Update technologies.ftl * Change * Change --- .../Locale/en-US/research/technologies.ftl | 1 + .../Entities/Objects/Specific/chemistry.yml | 10 +++++++++- .../Recipes/Lathes/Packs/medical.yml | 2 ++ .../Prototypes/Recipes/Lathes/medical.yml | 20 +++++++++++++++++++ .../Prototypes/Research/civilianservices.yml | 13 ++++++++++++ 5 files changed, 45 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl index b2c4b8bc0d..1d4af6465b 100644 --- a/Resources/Locale/en-US/research/technologies.ftl +++ b/Resources/Locale/en-US/research/technologies.ftl @@ -71,6 +71,7 @@ research-technology-advanced-cleaning = Advanced Cleaning research-technology-meat-manipulation = Meat Manipulation research-technology-honk-mech = H.O.N.K. Mech research-technology-advanced-spray = Advanced Spray +research-technology-launcher-syringe = Syringe Gun research-technology-bluespace-cargo-transport = Bluespace Cargo Transport research-technology-clowning-utilities = Clowning Utilities research-technology-quantum-fiber-weaving = Quantum Fiber Weaving diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index ce945ac95b..86214ca224 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -459,6 +459,14 @@ map: ["enum.SolutionContainerLayers.Fill"] visible: false - state: syringeproj + - type: SolutionContainerManager + solutions: + injector: + maxVol: 5 + - type: Injector + minTransferAmount: 1 + maxTransferAmount: 5 + transferAmount: 5 - type: SolutionContainerVisuals maxFillLevels: 3 fillBaseName: minisyringe @@ -474,7 +482,7 @@ solution: injector updateInterval: 2 - type: SolutionInjectOnEmbed - transferAmount: 2 + transferAmount: 1 solution: injector - type: Fixtures fixtures: diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml index fb28209e85..6e855f393d 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml @@ -93,6 +93,8 @@ - SyringeCryostasis - BluespaceBeaker - SyringeBluespace + - LauncherSyringe + - MiniSyringe - type: latheRecipePack id: MedicalBoards diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml index f09babc770..2f968893b1 100644 --- a/Resources/Prototypes/Recipes/Lathes/medical.yml +++ b/Resources/Prototypes/Recipes/Lathes/medical.yml @@ -216,3 +216,23 @@ materials: Steel: 100 Plastic: 100 + +- type: latheRecipe + id: LauncherSyringe + result: LauncherSyringe + completetime: 10 + materials: + Silver: 200 + Steel: 1000 + Plastic: 200 + Glass: 100 + +- type: latheRecipe + id: MiniSyringe + result: MiniSyringe + completetime: 2 + materials: + Steel: 200 + Glass: 100 + Plastic: 100 + diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index b078dd7cd6..d06b7c1ce5 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -226,3 +226,16 @@ recipeUnlocks: - BluespaceBeaker - SyringeBluespace + +- type: technology + id: LauncherSyringe + name: research-technology-launcher-syringe + icon: + sprite: Objects/Weapons/Guns/Cannons/syringe_gun.rsi + state: syringe_gun + discipline: CivilianServices + tier: 3 + cost: 15000 + recipeUnlocks: + - LauncherSyringe + - MiniSyringe -- 2.51.2