diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 949f04b951..bdbaa3da1a 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,16 +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. - 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 @@ -3722,3 +3710,18 @@ 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 +- 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 diff --git a/Resources/Locale/en-US/deltav/research/technologies.ftl b/Resources/Locale/en-US/deltav/research/technologies.ftl index e3a1f3a582..aa0e121ef5 100644 --- a/Resources/Locale/en-US/deltav/research/technologies.ftl +++ b/Resources/Locale/en-US/deltav/research/technologies.ftl @@ -5,4 +5,5 @@ 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 research-technology-ionized-cryogenic-emission-equipment = Ionized Cryogenic Emission Equipment diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml index 7de2021c79..945829974e 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 0000000000..73be7fb5a9 --- /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 1c5b53a034..c95893fa50 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 - WeaponColdCannon # End DeltaV additions @@ -1068,6 +1070,10 @@ - WhiteCane - AACTablet # DeltaV dynamicRecipes: + # Begin DeltaV additions + - LauncherSyringe + - MiniSyringe + # End DeltaV additions - ChemicalPayload - CryostasisBeaker - BluespaceBeaker diff --git a/Resources/Prototypes/Research/disciplines.yml b/Resources/Prototypes/Research/disciplines.yml index 7a661da1a3..b154785327 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