medical dlc

Resources/Locale/en-US/_corvaxnext/research/medical_technologies.ftl

@@ -1,3 +1,6 @@
+next-research-technology-medicine = Basic medicine
+next-research-technology-surgery = Basic surgery
+next-research-technology-chemistry = Basic chemistry
 next-research-technology-crew-monitoring = Crew monitoring
 next-research-technology-biochemical-stasis = Biochemical stasis
 next-research-technology-bodybags = Body bags

Resources/Locale/en-US/_corvaxnext/research/robotics_technologies.ftl

@@ -1,4 +1,4 @@
-next-research-technology-robotics = Robotics
+next-research-technology-robotics = Basic robotics
 next-research-technology-critter-mech = Critter mech
 next-research-technology-honk-mech = Honk mech
 next-research-technology-ripley-aplu-mech = Ripley mech

Resources/Locale/en-US/_corvaxnext/research/security_technologies.ftl

@@ -1,5 +1,3 @@
 next-research-technology-riot-control = Riot control gear
 next-research-technology-riot-control-advanced = Advanced riot control gear
-next-research-technology-grips-lightweight = Lightweight nano-magnetic gloves
-next-research-technology-grips-advanced = Advanced nano-magnetic gloves
 next-research-technology-war-crimes = War crimes

Resources/Locale/ru-RU/_corvaxnext/research/armory_technologies.ftl

@@ -7,4 +7,3 @@ next-research-technology-combat-laser-advanced = Продвинутые боев
 next-research-technology-combat-laser-concentrated = Концентрированные боевые лазеры
 next-research-technology-combat-laser-wave-harnessing = Волновые боевые лазеры
 next-research-technology-combat-laser-experimental = Экспериментальные боевые лазеры
-next-research-technology-war-crimes = Военные приступления

Resources/Locale/ru-RU/_corvaxnext/research/medical_technologies.ftl

@@ -1,7 +1,10 @@
+next-research-technology-medicine = Базовая медицина
+next-research-technology-surgery = Базовая хирургия
+next-research-technology-chemistry = Базовая химия
 next-research-technology-crew-monitoring = Мониторинг экипажа
 next-research-technology-biochemical-stasis = Биохимический стазис
 next-research-technology-bodybags = Мешки для тел
 next-research-technology-bodybags-bluespace = Блюспейс мешки для тел
 next-research-technology-chemistry-bluespace = Блюспейс химия
 
-next-research-technology-biochemical-stasis-machines = оборудование биохимического стазиса
+next-research-technology-biochemical-stasis-machines = Оборудование биохимического стазиса

Resources/Locale/ru-RU/_corvaxnext/research/security_technologies.ftl

@@ -1,4 +1,3 @@
 next-research-technology-riot-control = Сняражение контроля беспорядков
 next-research-technology-riot-control-advanced = Продвинутое снаряжение контроля беспорядков
-next-research-technology-grips-lightweight = Перчатки наноразмерного магнетизма
-next-research-technology-grips-advanced = Продвинутые перчатки наноразмерного магнетизма
+next-research-technology-war-crimes = Военные преступления

Resources/Locale/ru-RU/_corvaxnext/research/shuttle_technologies.ftl

@@ -3,4 +3,4 @@ next-research-technology-shuttle-weapon-advanced = Продвинутые бое
 
 next-research-technology-shuttle-weapon-machines = Оборудование боевых шаттлов
 next-research-technology-shuttle-weapon-advanced-machines = Продвинутое оборудование боевых шаттлов
-next-research-technology-shuttlecraft-machines = Базовое конструкции шаттлостроения
+next-research-technology-shuttlecraft-machines = Базовые конструкции шаттлостроения

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -904,7 +904,9 @@
   - type: Lathe
     idleState: icon
     runningState: icon
-    staticRecipes:
+    staticRecipes: # Corvax-Next-EDIT-RNDResearch
+      - WhiteCane
+    dynamicRecipes:
       - Brutepack
       - Ointment
       - Gauze
@@ -915,10 +917,6 @@
       - ClothingHandsGlovesNitrile
       - ClothingMaskSterile
       - DiseaseSwab
-      - Beaker
-      - LargeBeaker
-      - Dropper
-      - Jug
       - Syringe
       - Implanter
       - PillCanister
@@ -942,8 +940,6 @@
       - Saw
       - Hemostat
       - ClothingEyesGlassesChemical
-      - WhiteCane
-    dynamicRecipes:
       - ChemicalPayload
       - CryostasisBeaker
       - BluespaceBeaker
@@ -953,10 +949,10 @@
       - NTBodyBag # Corvax-Next-AdvancedBodyBags
       - PrisonerBodyBag # Corvax-Next-AdvancedBodyBags
       - RadiationBodyBag # Corvax-Next-AdvancedBodyBags
+      - HandheldCrewMonitor # Corvax-Next-RNDResearch
   - type: EmagLatheRecipes
     emagDynamicRecipes:
       - SyndicateBodyBag # Corvax-Next-AdvancedBodyBags
-      - HandheldCrewMonitor # Corvax-Next-RNDResearch
   - type: Machine
     board: MedicalTechFabCircuitboard
   - type: StealTarget

Resources/Prototypes/Entities/Structures/Machines/research.yml

@@ -121,6 +121,8 @@
 # <-- CARGO -->
     - BluespaceCargoTransport
 # <-- MEDICAL -->
+    - Medicine
+    - Surgery
     - Chemistry
     - CrewMonitoring
     - BodyBags

Resources/Prototypes/_CorvaxNext/Research/Disciplines/medical_disciplines.yml

@@ -1,5 +1,5 @@
 - type: techDiscipline
-  id: BiochemicalStasis
+  id: Medicine
   name: next-research-discipline-medical
   color: "#00BFFF"
   icon:
@@ -9,7 +9,7 @@
     1: 0
 
 - type: techDiscipline
-  id: CrewMonitoring
+  id: Surgery
   name: next-research-discipline-medical
   color: "#00BFFF"
   icon:
@@ -19,7 +19,17 @@
     1: 0
 
 - type: techDiscipline
-  id: BodyBags
+  id: Chemistry
+  name: next-research-discipline-medical
+  color: "#00BFFF"
+  icon:
+    sprite: _CorvaxNext/Interface/Misc/research_disciplines.rsi
+    state: chemistry
+  tierPrerequisites:
+    1: 0
+
+- type: techDiscipline
+  id: BiochemicalStasis
   name: next-research-discipline-medical
   color: "#00BFFF"
   icon:
@@ -29,7 +39,17 @@
     1: 0
 
 - type: techDiscipline
-  id: Chemistry
+  id: CrewMonitoring
+  name: next-research-discipline-medical
+  color: "#00BFFF"
+  icon:
+    sprite: _CorvaxNext/Interface/Misc/research_disciplines.rsi
+    state: medical
+  tierPrerequisites:
+    1: 0
+
+- type: techDiscipline
+  id: BodyBags
   name: next-research-discipline-medical
   color: "#00BFFF"
   icon:

Resources/Prototypes/_CorvaxNext/Research/medical.yml

@@ -1,3 +1,74 @@
+- type: technology
+  id: Medicine
+  name: next-research-technology-medicine
+  icon:
+    sprite: Objects/Specific/Medical/firstaidkits.rsi
+    state: firstaid
+  discipline: Medicine
+  tier: 1
+  cost: 3500
+  recipeUnlocks:
+   - Brutepack
+   - Ointment
+   - Gauze
+   - Defibrillator
+   - HandheldHealthAnalyzer
+   - ClothingHandsGlovesLatex
+   - ClothingHandsGlovesNitrile
+   - ClothingMaskSterile
+   - DiseaseSwab
+   - RollerBedSpawnFolded
+   - CheapRollerBedSpawnFolded
+   - EmergencyRollerBedSpawnFolded
+   - Medkit
+   - MedkitBurn
+   - MedkitToxin
+   - MedkitO2
+   - MedkitBrute
+   - MedkitAdvanced
+   - MedkitRadiation
+   - MedkitCombat
+
+- type: technology
+  id: Surgery
+  name: next-research-technology-surgery
+  icon:
+    sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
+    state: scalpel
+  discipline: Surgery
+  tier: 1
+  cost: 4000
+  recipeUnlocks:
+   - Scalpel
+   - Retractor
+   - Cautery
+   - Drill
+   - Saw
+   - Hemostat
+   - Implanter
+  technologyPrerequisites:
+  - Medicine
+
+- type: technology
+  id: Chemistry
+  name: next-research-technology-chemistry
+  icon:
+    sprite: Objects/Specific/Chemistry/beaker_large.rsi
+    state: beakerlarge
+  discipline: Chemistry
+  tier: 1
+  cost: 3500
+  recipeUnlocks:
+   - HandLabeler
+   - Beaker
+   - LargeBeaker
+   - Dropper
+   - Jug
+   - PillCanister
+   - ChemistryEmptyBottle01
+   - ClothingEyesGlassesChemical
+   - Syringe
+
 - type: technology
   id: CrewMonitoring
   name: next-research-technology-crew-monitoring
@@ -6,9 +77,11 @@
     state: scanner
   discipline: CrewMonitoring
   tier: 1
-  cost: 18000
+  cost: 14000
   recipeUnlocks:
    - HandheldCrewMonitor
+  technologyPrerequisites:
+  - Medicine
 
 - type: technology
   id: BiochemicalStasis
@@ -18,37 +91,43 @@
     state: beakernoreact
   discipline: BiochemicalStasis
   tier: 1
-  cost: 7500
+  cost: 7200
   recipeUnlocks:
    - CryostasisBeaker
    - SyringeCryostasis
+  technologyPrerequisites:
+  - Medicine
 
 - type: technology
   id: BodyBags
   name: next-research-technology-bodybags
   icon:
-    sprite: _CorvaxNext/Objects/Specific/Medical/nanotrasen.rsi
+    sprite: _CorvaxNext/Objects/Specific/Medical/BodyBags/nanotrasen.rsi
     state: ntbag_folded
   discipline: BodyBags
   tier: 1
   cost: 5000
   recipeUnlocks:
+   - BodyBag
    - NTBodyBag
    - PrisonerBodyBag
    - RadiationBodyBag
+  technologyPrerequisites:
+  - Medicine
 
 - type: technology
   id: BodyBagsBluespace
   name: next-research-technology-bodybags-bluespace
   icon:
-    sprite: _CorvaxNext/Objects/Specific/Medical/bluespace.rsi
+    sprite: _CorvaxNext/Objects/Specific/Medical/BodyBags/bluespace.rsi
     state: bluespacebag_folded
   discipline: BodyBags
   tier: 1
   cost: 9500
   recipeUnlocks:
    - BluespaceBodyBag
   technologyPrerequisites:
+  - Medicine
   - BodyBags
 
 - type: technology
@@ -58,8 +137,10 @@
     sprite: Objects/Specific/Chemistry/beaker_bluespace.rsi
     state: beakerbluespace
   discipline: Chemistry
-  tier: 1 # CORVAX NEXT TODO: BASE CHEMISTRY
+  tier: 1
   cost: 12000
   recipeUnlocks:
    - BluespaceBeaker
    - SyringeBluespace
+  technologyPrerequisites:
+  - Chemistry

Resources/Textures/_CorvaxNext/Interface/Misc/research_disciplines.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | weapon, shuttle and equipment icon by PuroSlavKing (Github)",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | weapon, shuttle, atmospher and equipment icon by PuroSlavKing (Github)",
   "size": {
     "x": 8,
     "y": 8
@@ -10,9 +10,15 @@
     {
       "name": "engineering"
     },
+    {
+      "name": "atmospher"
+    },
     {
       "name": "medical"
     },
+    {
+      "name": "chemistry"
+    },
     {
       "name": "scientific"
     },