From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Mon, 6 Nov 2023 03:00:11 +0000 (+0000) Subject: Microreactor power cell research (#21473) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=3be6c5b9d57a35c7c089e7603ceac758acddc3a0;p=space-station-14.git Microreactor power cell research (#21473) * buff microreactor cell and tweak a little * add portable fission research --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl index cb4f30de6a..28c7377082 100644 --- a/Resources/Locale/en-US/research/technologies.ftl +++ b/Resources/Locale/en-US/research/technologies.ftl @@ -19,6 +19,7 @@ research-technology-advanced-atmospherics = Advanced Atmospherics research-technology-advanced-tools = Advanced Tools research-technology-super-powercells = Super Powercells research-technology-bluespace-storage = Bluespace Storage +research-technology-portable-fission = Portable Fission research-technology-chemistry = Chemistry research-technology-surgical-tools = Surgical Tools diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml index 4ed3e207c5..01680dec3a 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml @@ -208,25 +208,41 @@ startingCharge: 0 - type: entity - name: small microreactor cell - description: A rechargeable standardized microreactor cell. Intended for low-power devices, it slowly recharges by itself. + parent: BasePowerCell id: PowerCellMicroreactor + name: microreactor power cell + description: A rechargeable standardized microreactor cell. Has lower capacity but slowly recharges by itself. suffix: Full - parent: BasePowerCell components: - - type: Sprite - layers: - - map: [ "enum.PowerCellVisualLayers.Base" ] - state: microreactor - - map: [ "enum.PowerCellVisualLayers.Unshaded" ] - state: o2 - shader: unshaded - - type: Battery - maxCharge: 50 - startingCharge: 50 - - type: BatterySelfRecharger - autoRecharge: true - autoRechargeRate: 0.16667 #takes about 5 minutes to charge itself back to full + - type: Sprite + layers: + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: microreactor + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: o2 + shader: unshaded + - type: Battery + maxCharge: 720 + startingCharge: 720 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 12 # takes 1 minute to charge itself back to full + +- type: entity + parent: PowerCellMicroreactor + id: PowerCellMicroreactorPrinted + suffix: Empty + components: + - type: Sprite + layers: + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: microreactor + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: o2 + shader: unshaded + visible: false + - type: Battery + startingCharge: 0 - type: entity name: antique power cell prototype diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 38839d9f9f..fb77167b73 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -249,6 +249,7 @@ - VoiceTrigger - Igniter - PowerCellMedium + - PowerCellMicroreactor - PowerCellHigh - WeaponPistolCHIMP - SynthesizerInstrument diff --git a/Resources/Prototypes/Recipes/Lathes/powercells.yml b/Resources/Prototypes/Recipes/Lathes/powercells.yml index b7d9281093..2982c070be 100644 --- a/Resources/Prototypes/Recipes/Lathes/powercells.yml +++ b/Resources/Prototypes/Recipes/Lathes/powercells.yml @@ -25,3 +25,13 @@ Glass: 400 Plastic: 200 Gold: 50 + +- type: latheRecipe + id: PowerCellMicroreactor + result: PowerCellMicroreactorPrinted + completetime: 10 + materials: + Steel: 500 + Glass: 400 + Uranium: 200 + Gold: 100 diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index 797ec2b7b7..154bebe198 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -209,3 +209,17 @@ - ClothingBackpackHolding - ClothingBackpackSatchelHolding - ClothingBackpackDuffelHolding + +- type: technology + id: PortableFission + name: research-technology-portable-fission + icon: + sprite: Objects/Power/power_cells.rsi + state: microreactor + discipline: Industrial + tier: 3 + cost: 10000 + recipeUnlocks: + - PowerCellMicroreactor + technologyPrerequisites: + - SuperPowercells