From cabf4cda8ebab2a65fd96bcf46ef8c731ad43d71 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Sun, 10 Nov 2024 20:57:12 -0600 Subject: [PATCH 1/4] Remove the t3 lockout (#2144) * Comments it out * fixes it hopefully * yuh * forces all techs to be researched * comments Signed-off-by: Stop-Signs * i hope this is what milon meant * Update TechDisciplinePrototype.cs Signed-off-by: Stop-Signs * Update disciplines.yml Signed-off-by: Stop-Signs * Revert "Comments it out" This reverts commit 70779979220382c14aeaa31d8633fdd69d1666b6. --------- Signed-off-by: Stop-Signs --- Resources/Prototypes/Research/disciplines.yml | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/Research/disciplines.yml b/Resources/Prototypes/Research/disciplines.yml index 7a661da1a33..b1547853275 100644 --- a/Resources/Prototypes/Research/disciplines.yml +++ b/Resources/Prototypes/Research/disciplines.yml @@ -5,10 +5,11 @@ icon: sprite: Interface/Misc/research_disciplines.rsi state: industrial + lockoutTier: 4 # DeltaV: Lockout occurs at t4 tierPrerequisites: 1: 0 - 2: 0.75 - 3: 0.75 + 2: 1 # DeltaV: raised to 1 + 3: 1 # DeltaV: raised to 1 - type: techDiscipline id: Arsenal @@ -17,10 +18,11 @@ icon: sprite: Interface/Misc/research_disciplines.rsi state: arsenal + lockoutTier: 4 # DeltaV: Lockout occurs at t4 tierPrerequisites: 1: 0 - 2: 0.75 - 3: 0.75 + 2: 1 # DeltaV: raised to 1 + 3: 1 # DeltaV: raised to 1 - type: techDiscipline id: Experimental @@ -29,10 +31,11 @@ icon: sprite: Interface/Misc/research_disciplines.rsi state: experimental + lockoutTier: 4 # DeltaV: Lockout occurs at t4 tierPrerequisites: 1: 0 - 2: 0.75 - 3: 0.75 + 2: 1 # DeltaV: raised to 1 + 3: 1 # DeltaV: raised to 1 - type: techDiscipline id: CivilianServices @@ -41,7 +44,8 @@ icon: sprite: Interface/Misc/research_disciplines.rsi state: civilianservices + lockoutTier: 4 # DeltaV: Lockout occurs at t4 tierPrerequisites: 1: 0 - 2: 0.75 - 3: 0.75 + 2: 1 # DeltaV: raised to 1 + 3: 1 # DeltaV: raised to 1 From b826e71392d121925389cc3084179bb1020c1615 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Mon, 11 Nov 2024 03:57:31 +0100 Subject: [PATCH 2/4] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 949f04b9513..1d36fdcfd7a 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: ps3moira - changes: - - message: Added Fish n' Chips. Thank the British! - type: Add - id: 167 - time: '2023-12-13T20:32:51.0000000+00:00' - author: Adrian16199 changes: - message: Felinids now meow out their words. They can also sigh now. @@ -3722,3 +3716,10 @@ id: 666 time: '2024-11-10T20:20:26.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2164 +- author: Stop-Signs + changes: + - message: Removed the T3 Lockout on epi techs + type: Remove + id: 667 + time: '2024-11-11T02:57:13.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2144 From e368075b86a9507ede27d6f240c9c3347ee6c433 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Mon, 11 Nov 2024 12:41:44 -0300 Subject: [PATCH 3/4] 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 --- .../en-US/deltav/research/technologies.ftl | 1 + .../DeltaV/Recipes/Lathes/medical.yml | 17 +++++++++++++++++ .../DeltaV/Research/civilianservices.yml | 12 ++++++++++++ .../Entities/Structures/Machines/lathe.yml | 6 ++++++ 4 files changed, 36 insertions(+) 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 index 25377b155f8..ae1a8fe69ab 100644 --- a/Resources/Locale/en-US/deltav/research/technologies.ftl +++ b/Resources/Locale/en-US/deltav/research/technologies.ftl @@ -5,3 +5,4 @@ research-technology-energy-gun = Energy Guns research-technology-energy-gun-advance = Advanced Energy Manipulation research-technology-advance-laser = Advanced Laser Manipulation research-technology-robust-melee = Robust Melee +research-technology-syringe-gun = Syringe Gun diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml index 7de2021c799..945829974eb 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml @@ -5,3 +5,20 @@ materials: Steel: 300 Glass: 100 + +- 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/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index f6f58803ed4..6761b7f1812 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -436,6 +436,8 @@ - MagazineBoxSpecialHoly - MagazineBoxSpecialMindbreaker - AdvancedTruncheon + - LauncherSyringe + - MiniSyringe # End DeltaV additions - type: entity @@ -1066,6 +1068,10 @@ - WhiteCane - AACTablet # DeltaV dynamicRecipes: + # Begin DeltaV additions + - LauncherSyringe + - MiniSyringe + # End DeltaV additions - ChemicalPayload - CryostasisBeaker - BluespaceBeaker From 5eb7ae5e44f96f1ac5f2be2b4c4a5f7d993aceee Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:42:03 +0100 Subject: [PATCH 4/4] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 1d36fdcfd7a..bdbaa3da1aa 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: Adrian16199 - changes: - - message: Felinids now meow out their words. They can also sigh now. - type: Tweak - id: 168 - time: '2023-12-13T21:28:39.0000000+00:00' - author: VMSolidus changes: - message: Harpies no longer choke on completely breathable air @@ -3723,3 +3717,11 @@ id: 667 time: '2024-11-11T02:57:13.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2144 +- author: Radezolid + changes: + - message: The syringe gun is now a researcheable technology in the T2 civilian + category. Get it from the medical techfab once it's researched. + type: Tweak + id: 668 + time: '2024-11-11T15:41:44.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2169