From: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> Date: Mon, 12 Jan 2026 20:56:37 +0000 (-0800) Subject: Medical Cyborg Modules Rework. (#42123) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=c9ec5e81f0605649fbb13845715d49743fe7387e;p=space-station-14.git Medical Cyborg Modules Rework. (#42123) * PUSH!!! * Femtanyl * eh swap em back * My PR is ruined!!! * review 2 electric boogaloo --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> --- diff --git a/Resources/Locale/en-US/robotics/borg_modules.ftl b/Resources/Locale/en-US/robotics/borg_modules.ftl index 83d97e7429..c9c674e865 100644 --- a/Resources/Locale/en-US/robotics/borg_modules.ftl +++ b/Resources/Locale/en-US/robotics/borg_modules.ftl @@ -4,6 +4,7 @@ borg-slot-circuitboards-empty = Circuitboards borg-slot-flatpacks-empty = Flatpacks borg-slot-tiles-empty = Floor tiles borg-slot-topicals-empty = Topicals +borg-slot-injector-dropper-empty = Precision injectors borg-slot-small-containers-empty = Small containers borg-slot-chemical-containers-empty = Chemical containers borg-slot-documents-empty = Books and papers diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml index 35e748f89c..eca0b4b88f 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml @@ -103,7 +103,7 @@ state: generic - type: RandomSpawner rarePrototypes: - - BorgModuleAdvancedChemical + - BorgModuleAdvancedTopical - BorgModuleAdvancedCleaning - BorgModuleAdvancedTool diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index f8661051bc..34d74a89ad 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -865,7 +865,7 @@ - type: entity id: BorgModuleTopicals parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ] - name: topicals cyborg module + name: first aid cyborg module components: - type: Sprite layers: @@ -874,6 +874,7 @@ - type: ItemBorgModule hands: - item: HandheldHealthAnalyzer + - item: AdvancedJetInjector - item: Gauze hand: emptyLabel: borg-slot-topicals-empty @@ -895,13 +896,6 @@ whitelist: components: - Healing - - item: Bloodpack - hand: - emptyLabel: borg-slot-topicals-empty - emptyRepresentative: Bloodpack - whitelist: - components: - - Healing - type: BorgModuleIcon icon: { sprite: Interface/Actions/actions_borg.rsi, state: treatment-module } @@ -921,7 +915,6 @@ - item: Crowbar - item: BorgFireExtinguisher - item: BorgHandheldGPSBasic - - item: HandLabeler - type: BorgModuleIcon icon: { sprite: Interface/Actions/actions_borg.rsi, state: defib-module } @@ -933,79 +926,83 @@ - type: Sprite layers: - state: medical - - state: icon-chem + - state: icon-chemist - type: ItemBorgModule hands: - - item: HandheldHealthAnalyzer + - item: HandLabeler - item: Syringe - - item: BorgDropper - - item: BaseChemistryEmptyVial hand: - emptyLabel: borg-slot-small-containers-empty - emptyRepresentative: BaseChemistryEmptyVial + emptyLabel: borg-slot-injector-dropper-empty + emptyRepresentative: Syringe whitelist: - components: - - FitsInDispenser - - item: BaseChemistryEmptyVial + tags: + - Dropper + - Syringe + - item: PillCanister hand: emptyLabel: borg-slot-small-containers-empty - emptyRepresentative: BaseChemistryEmptyVial + emptyRepresentative: PillCanister + whitelist: + tags: + - PillCanister + - Bottle + - Pill + - item: Beaker + hand: + emptyLabel: borg-slot-chemical-containers-empty + emptyRepresentative: Beaker whitelist: components: - FitsInDispenser - - item: BaseChemistryEmptyVial + tags: + - ChemDispensable + - item: Beaker hand: - emptyLabel: borg-slot-small-containers-empty - emptyRepresentative: BaseChemistryEmptyVial + emptyLabel: borg-slot-chemical-containers-empty + emptyRepresentative: Beaker whitelist: components: - FitsInDispenser + tags: + - ChemDispensable - type: BorgModuleIcon icon: { sprite: Interface/Actions/actions_borg.rsi, state: chem-module } - type: entity - id: BorgModuleAdvancedChemical + id: BorgModuleAdvancedTopical parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ] - name: advanced chemical cyborg module + name: advanced first aid cyborg module description: Advanced medical module containing the cyborg adaptation of the highly coveted hypospray. Now your cyborgs can inject crew-harmers with chloral hydrate even faster! components: - type: Sprite layers: - state: medical - - state: icon-chemist + - state: icon-chem - type: ItemBorgModule hands: - item: HandheldHealthAnalyzer - item: BorgHypo - - item: Syringe - - item: BorgDropper - - item: Beaker + - item: Gauze hand: - emptyLabel: borg-slot-chemical-containers-empty - emptyRepresentative: Beaker + emptyLabel: borg-slot-topicals-empty + emptyRepresentative: Gauze whitelist: components: - - FitsInDispenser - tags: - - ChemDispensable - - item: Beaker + - Healing + - item: Brutepack hand: - emptyLabel: borg-slot-chemical-containers-empty - emptyRepresentative: Beaker + emptyLabel: borg-slot-topicals-empty + emptyRepresentative: Brutepack whitelist: components: - - FitsInDispenser - tags: - - ChemDispensable - - item: Beaker + - Healing + - item: Ointment hand: - emptyLabel: borg-slot-chemical-containers-empty - emptyRepresentative: Beaker + emptyLabel: borg-slot-topicals-empty + emptyRepresentative: Ointment whitelist: components: - - FitsInDispenser - tags: - - ChemDispensable + - Healing - type: BorgModuleIcon icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-chem-module } diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml index 5d47f01544..f482c07787 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml @@ -40,7 +40,7 @@ - BorgModuleAdvancedCleaning - BorgModuleAdvancedTool - BorgModuleAdvancedClowning - - BorgModuleAdvancedChemical + - BorgModuleAdvancedTopical - BorgModuleAdvancedMining - type: latheRecipePack diff --git a/Resources/Prototypes/Recipes/Lathes/robot_modules.yml b/Resources/Prototypes/Recipes/Lathes/robot_modules.yml index 51f32d000e..e969c31551 100644 --- a/Resources/Prototypes/Recipes/Lathes/robot_modules.yml +++ b/Resources/Prototypes/Recipes/Lathes/robot_modules.yml @@ -72,8 +72,8 @@ - type: latheRecipe parent: BaseGoldBorgModuleRecipe - id: BorgModuleAdvancedChemical - result: BorgModuleAdvancedChemical + id: BorgModuleAdvancedTopical + result: BorgModuleAdvancedTopical # Science Modules diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index 889df6b3d9..622df1ba5e 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -132,7 +132,7 @@ tier: 2 cost: 5000 recipeUnlocks: - - BorgModuleAdvancedChemical + - BorgModuleAdvancedTopical - AdvancedJetInjector - type: technology diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index ab7bc3c3ab..7bf3da6fef 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -295,7 +295,7 @@ id: ChefPilot # Tagged entity can control someone wearing a Chef's hat if inside their hat. - type: Tag - id: ChemDispensable # Storage whitelist: ChemDispenserEmpty, SmartFridge, BorgModuleAdvancedChemical + id: ChemDispensable # Storage whitelist: ChemDispenserEmpty, SmartFridge, BorgModuleChemical - type: Tag id: Chicken # Reproductive partner key. MetamorphRecipe: FoodBurgerChicken diff --git a/Resources/migration.yml b/Resources/migration.yml index 53c7093d08..6f2d29e3cc 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -763,3 +763,6 @@ SpacemenFigureSpawner: SpacemenFigurineSpawner90 # 2026-01-07 HandheldHealthAnalyzerUnpowered: HandheldHealthAnalyzer HandheldHealthAnalyzerEmpty: HandheldHealthAnalyzer + +#2026-01-09 +BorgModuleAdvancedChemical: BorgModuleAdvancedTopical