Skip to content

Commit

Permalink
Adds Advanced SMES, an SMES with higher capacity for mapping (space-w…
Browse files Browse the repository at this point in the history
…izards#33757)

* Adds Advanced SMES machine and board to autolathe roundstart

* Make Advanced SMES T2 Advanced Powercells research, reduce cost, remove from random spawner, add sprites by augustsun

* fix attribution formatting

* Update smes.yml to address review

Co-authored-by: ScarKy0 <[email protected]>

* add new sprites and change naming scheme, testing something

* address review, tested it a bit more, works ingame

---------

Co-authored-by: ScarKy0 <[email protected]>
  • Loading branch information
ArtisticRoomba and ScarKy0 authored Dec 17, 2024
1 parent 27cb17f commit e7330ec
Show file tree
Hide file tree
Showing 9 changed files with 82 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,25 @@
amount: 4
defaultPrototype: PowerCellSmall

- type: entity
id: SMESAdvancedMachineCircuitboard
parent: BaseMachineCircuitboard
name: advanced SMES machine board
description: A machine printed circuit board for an Advanced SMES.
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: power_mod
- type: MachineBoard
prototype: SMESAdvancedEmpty
stackRequirements:
Capacitor: 2
CableHV: 20
componentRequirements:
PowerCell:
amount: 4
defaultPrototype: PowerCellMedium

- type: entity
id: CellRechargerCircuitboard
parent: BaseMachineCircuitboard
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,7 @@
- MassMediaCircuitboard
- ReagentGrinderIndustrialMachineCircuitboard
- JukeboxCircuitBoard
- SMESAdvancedMachineCircuitboard
- type: EmagLatheRecipes
emagDynamicRecipes:
- ShuttleGunDusterCircuitboard
Expand Down
45 changes: 45 additions & 0 deletions Resources/Prototypes/Entities/Structures/Power/smes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,48 @@
components:
- type: Battery
startingCharge: 0

- type: entity
parent: BaseSMES
id: SMESAdvanced
suffix: Advanced, 16MJ
name: advanced SMES
description: An even-higher-capacity superconducting magnetic energy storage (SMES) unit.
components:
- type: Sprite
sprite: Structures/Power/smes.rsi
snapCardinals: true
layers:
- state: advancedsmes
- map: [ "enum.SmesVisualLayers.Charge" ]
state: "smes-og1" # -og0 does not exist
shader: unshaded
visible: false
- map: [ "enum.SmesVisualLayers.Input" ]
state: "smes-oc0"
shader: unshaded
- map: [ "enum.SmesVisualLayers.Output" ]
state: "smes-op1"
shader: unshaded
- map: ["enum.WiresVisualLayers.MaintenancePanel"]
state: advancedsmes-open
- type: Machine
board: SMESAdvancedMachineCircuitboard
- type: Battery
maxCharge: 16000000
startingCharge: 16000000
- type: PowerMonitoringDevice
group: SMES
sourceNode: input
loadNode: output
collectionName: smes
sprite: Structures/Power/smes.rsi
state: advancedsmes-static

- type: entity
parent: SMESAdvanced
id: SMESAdvancedEmpty
suffix: Empty
components:
- type: Battery
startingCharge: 0
5 changes: 5 additions & 0 deletions Resources/Prototypes/Recipes/Lathes/electronics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,11 @@
id: SMESMachineCircuitboard
result: SMESMachineCircuitboard

- type: latheRecipe
parent: BaseGoldCircuitboardRecipe
id: SMESAdvancedMachineCircuitboard
result: SMESAdvancedMachineCircuitboard

- type: latheRecipe
parent: BaseCircuitboardRecipe
id: PortableGeneratorPacmanMachineCircuitboard
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Research/industrial.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
recipeUnlocks:
- PowerCellHigh
- TurboItemRechargerCircuitboard
- SMESAdvancedMachineCircuitboard

- type: technology
id: MechanicalCompression
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 11 additions & 2 deletions Resources/Textures/Structures/Power/smes.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,25 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept, advanced-smes, advanced-smes-static, advanced-smes-open modified from smes, smes-open, and static by august-sun (GitHub)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "advancedsmes"
},
{
"name": "advancedsmes-static"
},
{
"name": "advancedsmes-open"
},
{
"name": "smes"
},
{
{
"name": "static"
},
{
Expand Down

0 comments on commit e7330ec

Please sign in to comment.