diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl index 65fde10511..9a6a6ddca1 100644 --- a/Resources/Locale/en-US/research/technologies.ftl +++ b/Resources/Locale/en-US/research/technologies.ftl @@ -25,6 +25,7 @@ research-technology-virology = Virology research-technology-cryogenics = Cryogenics research-technology-chemical-dispensary = Chemical Dispensary research-technology-crew-monitoring = Crew Monitoring +research-technology-bluespace-chemistry = Bluespace Chemistry research-technology-cloning = Cloning research-technology-basic-robotics = Basic Robotics diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index 88fcfbce66..610c26eac4 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -271,6 +271,33 @@ - Syringe - Trash +- type: entity + id: SyringeBluespace + parent: BaseSyringe + name: bluespace syringe + description: Injecting with advanced bluespace technology. + components: + - type: Sprite + layers: + - state: syringe1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - state: bluespace_base0 + map: ["enum.SolutionContainerLayers.Base"] + - type: Icon + sprite: Objects/Specific/Chemistry/syringe.rsi + state: bluespace_base0 + - type: SolutionContainerManager + solutions: + injector: + maxVol: 100 + - type: Injector + delay: 2.5 + injectOnly: false + - type: SolutionContainerVisuals + maxFillLevels: 2 + fillBaseName: syringe + - type: entity name: pill parent: BaseItem diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 2c54578e1b..639cabd5f1 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -242,6 +242,8 @@ - ClothingShoesBootsMag - NodeScanner - HolofanProjector + - BluespaceBeaker + - SyringeBluespace - WeaponForceGun - WeaponTetherGun - WeaponGrapplingGun @@ -521,6 +523,8 @@ - Drill - Saw - Hemostat + - BluespaceBeaker + - SyringeBluespace - type: Machine board: MedicalTechFabCircuitboard diff --git a/Resources/Prototypes/Recipes/Lathes/chemistry.yml b/Resources/Prototypes/Recipes/Lathes/chemistry.yml index 709447bd9b..e2285e9be8 100644 --- a/Resources/Prototypes/Recipes/Lathes/chemistry.yml +++ b/Resources/Prototypes/Recipes/Lathes/chemistry.yml @@ -36,6 +36,27 @@ Plastic: 100 Steel: 25 +- type: latheRecipe + id: BluespaceBeaker + result: BluespaceBeaker + completetime: 2 + materials: + Steel: 500 + Plastic: 500 + Plasma: 150 + Silver: 50 + +- type: latheRecipe + id: SyringeBluespace + result: SyringeBluespace + completetime: 2 + materials: + Steel: 100 + Plastic: 150 + Glass: 250 + Plasma: 100 + Silver: 50 + - type: latheRecipe id: PillCanister result: PillCanister diff --git a/Resources/Prototypes/Research/biochemical.yml b/Resources/Prototypes/Research/biochemical.yml index 938ed8b065..b0b1d1ddea 100644 --- a/Resources/Prototypes/Research/biochemical.yml +++ b/Resources/Prototypes/Research/biochemical.yml @@ -102,16 +102,30 @@ # Tier 3 - type: technology - id: Cloning - name: research-technology-cloning + id: BluespaceChemistry + name: research-technology-bluespace-chemistry icon: - sprite: Structures/Machines/cloning.rsi - state: pod_0 + sprite: Objects/Specific/Chemistry/beaker_bluespace.rsi + state: beakerbluespace discipline: Biochemical tier: 3 - cost: 15000 + cost: 10000 recipeUnlocks: - - CloningPodMachineCircuitboard - - MedicalScannerMachineCircuitboard - - CloningConsoleComputerCircuitboard - - BiomassReclaimerMachineCircuitboard + - BluespaceBeaker + - SyringeBluespace + +# look into revisiting this later once medical isn't a hellhole +#- type: technology +# id: Cloning +# name: research-technology-cloning +# icon: +# sprite: Structures/Machines/cloning.rsi +# state: pod_0 +# discipline: Biochemical +# tier: 3 +# cost: 15000 +# recipeUnlocks: +# - CloningPodMachineCircuitboard +# - MedicalScannerMachineCircuitboard +# - CloningConsoleComputerCircuitboard +# - BiomassReclaimerMachineCircuitboard diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/bluespace_base0.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/bluespace_base0.png new file mode 100644 index 0000000000..2339e6b288 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/bluespace_base0.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/meta.json index dc8abe0ecf..68413c692d 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/meta.json @@ -1,12 +1,21 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris https://github.com/discordia-space/CEV-Eris/commit/989b7b343045f30120c198ee100c9fee7ff8a989", + "copyright": "Taken from cev-eris https://github.com/discordia-space/CEV-Eris/commit/989b7b343045f30120c198ee100c9fee7ff8a989, bluespace syringe sprites modified by EmoGarbage404 (github)", "size": { "x": 32, "y": 32 }, "states": [ + { + "name": "bluespace_base0", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, { "name": "syringe_base0" },