diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index 5f9c1ac839e..b640d3a8134 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -860,6 +860,9 @@ id: PortableGeneratorSuperPacmanMachineCircuitboard parent: BaseMachineCircuitboard name: S.U.P.E.R.P.A.C.M.A.N.-type portable generator machine board +# Hardfork coin: remove this prototype later + categories: [ HideSpawnMenu ] +# ES End components: - type: Sprite state: engineering diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml index a7b55841e50..4b02b4832fd 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml @@ -6,7 +6,10 @@ - type: entity abstract: true id: PortableGeneratorBase - parent: [ BaseMachine, SmallConstructibleMachine, StructureWheeled] +# ES Start +# Take StructureWheeled and move it to the small gen only + parent: [ BaseMachine, SmallConstructibleMachine] +# ES End components: # Basic properties - type: Transform @@ -37,9 +40,10 @@ # Visuals - type: Appearance - type: Sprite - sprite: Structures/Power/Generation/portable_generator.rsi +# ES Start + sprite: _ES/Structures/Power/portable_generator.rsi +# ES End noRot: true - # Construction, interaction - type: WiresPanel - type: UserInterface @@ -182,8 +186,10 @@ loadNodes: - output_hv - output_mv - sprite: Structures/Power/Generation/portable_generator.rsi +# ES Start + sprite: _ES/Structures/Power/portable_generator.rsi state: portgen0 +# ES End - type: PowerSupplier supplyRampRate: 5000 supplyRampTolerance: 1500 @@ -196,10 +202,14 @@ parent: PortableGeneratorSwitchableBase id: PortableGeneratorSuperPacman suffix: Uranium, 50 kW +# ES Start +# Hardfork coin: remove this prototype later + categories: [ HideSpawnMenu ] +# ES End components: - type: Sprite layers: - - state: portgen1 + - state: portgen0 map: [ "enum.GeneratorVisualLayers.Body" ] - state: portgen_on_unlit map: [ "enum.GeneratorVisualLayers.Unlit" ] @@ -209,8 +219,8 @@ visuals: enum.GeneratorVisuals.Running: enum.GeneratorVisualLayers.Body: - True: { state: portgen1on } - False: { state: portgen1 } + True: { state: portgen0on } + False: { state: portgen0 } enum.GeneratorVisualLayers.Unlit: True: { visible: true } False: { visible: false } @@ -238,8 +248,10 @@ loadNodes: - output_hv - output_mv - sprite: Structures/Power/Generation/portable_generator.rsi - state: portgen1 +# ES Start + sprite: _ES/Structures/Power/portable_generator.rsi + state: portgen0 +# ES End - type: PowerSupplier supplyRampRate: 7500 supplyRampTolerance: 2500 @@ -250,7 +262,9 @@ A small generator capable of powering individual rooms, in case of emergencies. Runs off welding fuel and is rated for up to 8 kW. Rated ages 3 and up. - parent: PortableGeneratorBase +# ES Start + parent: [PortableGeneratorBase, StructureWheeled] +# ES End id: PortableGeneratorJrPacman suffix: Welding Fuel, 8 kW components: @@ -321,7 +335,9 @@ - type: PowerMonitoringDevice group: Generator loadNode: output - sprite: Structures/Power/Generation/portable_generator.rsi +# ES Start + sprite: _ES/Structures/Power/portable_generator.rsi +# ES End state: portgen3 - type: PowerSupplier # No ramping needed on this bugger. diff --git a/Resources/Prototypes/_ES/Catalog/Tables/maintenance_loot.yml b/Resources/Prototypes/_ES/Catalog/Tables/maintenance_loot.yml index 3c3e9841a96..d217da9ef30 100644 --- a/Resources/Prototypes/_ES/Catalog/Tables/maintenance_loot.yml +++ b/Resources/Prototypes/_ES/Catalog/Tables/maintenance_loot.yml @@ -191,6 +191,7 @@ - id: WelderIndustrial - id: Plunger - id: Shovel + - id: ESJerrycan - id: ClothingEyesHudMedical - tableId: FillWelderSupplies # Welding masks diff --git a/Resources/Prototypes/_ES/Entities/Objects/Storage/ReagentContainers/jerrycan.yml b/Resources/Prototypes/_ES/Entities/Objects/Storage/ReagentContainers/jerrycan.yml new file mode 100644 index 00000000000..bc9e880d7ee --- /dev/null +++ b/Resources/Prototypes/_ES/Entities/Objects/Storage/ReagentContainers/jerrycan.yml @@ -0,0 +1,25 @@ +- type: entity + parent: [DrinkBase, DrinkVisualsOpenable, DrinkBaseOpenable, DrinkBaseMaterialStrongMetal] + id: ESJerrycan + name: jerrycan + description: A metallic container designed for holding fuel. A favorite of suspicious arsonists. + components: + - type: Openable + sound: + collection: bottleOpenSounds + closeable: true + closeSound: + collection: bottleCloseSounds + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: WeldingFuel + Quantity: 250 + - type: Sprite + sprite: _ES/Objects/Storage/ReagentContainers/jerrycan.rsi + - type: Item + sprite: _ES/Objects/Storage/ReagentContainers/jerrycan.rsi + - type: Icon + sprite: _ES/Objects/Storage/ReagentContainers/jerrycan.rsi + state: icon_empty \ No newline at end of file diff --git a/Resources/Textures/_ES/Objects/Storage/ReagentContainers/jerrycan.rsi/icon.png b/Resources/Textures/_ES/Objects/Storage/ReagentContainers/jerrycan.rsi/icon.png new file mode 100644 index 00000000000..30ae25e8aa1 Binary files /dev/null and b/Resources/Textures/_ES/Objects/Storage/ReagentContainers/jerrycan.rsi/icon.png differ diff --git a/Resources/Textures/_ES/Objects/Storage/ReagentContainers/jerrycan.rsi/icon_empty.png b/Resources/Textures/_ES/Objects/Storage/ReagentContainers/jerrycan.rsi/icon_empty.png new file mode 100644 index 00000000000..30ae25e8aa1 Binary files /dev/null and b/Resources/Textures/_ES/Objects/Storage/ReagentContainers/jerrycan.rsi/icon_empty.png differ diff --git a/Resources/Textures/_ES/Objects/Storage/ReagentContainers/jerrycan.rsi/icon_open.png b/Resources/Textures/_ES/Objects/Storage/ReagentContainers/jerrycan.rsi/icon_open.png new file mode 100644 index 00000000000..06e0bd29922 Binary files /dev/null and b/Resources/Textures/_ES/Objects/Storage/ReagentContainers/jerrycan.rsi/icon_open.png differ diff --git a/Resources/Textures/_ES/Objects/Storage/ReagentContainers/jerrycan.rsi/inhand-left.png b/Resources/Textures/_ES/Objects/Storage/ReagentContainers/jerrycan.rsi/inhand-left.png new file mode 100644 index 00000000000..b95b1abbf4d Binary files /dev/null and b/Resources/Textures/_ES/Objects/Storage/ReagentContainers/jerrycan.rsi/inhand-left.png differ diff --git a/Resources/Textures/_ES/Objects/Storage/ReagentContainers/jerrycan.rsi/inhand-right.png b/Resources/Textures/_ES/Objects/Storage/ReagentContainers/jerrycan.rsi/inhand-right.png new file mode 100644 index 00000000000..62a6aa344bb Binary files /dev/null and b/Resources/Textures/_ES/Objects/Storage/ReagentContainers/jerrycan.rsi/inhand-right.png differ diff --git a/Resources/Textures/_ES/Objects/Storage/ReagentContainers/jerrycan.rsi/meta.json b/Resources/Textures/_ES/Objects/Storage/ReagentContainers/jerrycan.rsi/meta.json new file mode 100644 index 00000000000..040caa42283 --- /dev/null +++ b/Resources/Textures/_ES/Objects/Storage/ReagentContainers/jerrycan.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Flareguy for Ephemeral Space", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "icon_open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_ES/Structures/Power/portable_generator.rsi/meta.json b/Resources/Textures/_ES/Structures/Power/portable_generator.rsi/meta.json new file mode 100644 index 00000000000..cf1f7480ac0 --- /dev/null +++ b/Resources/Textures/_ES/Structures/Power/portable_generator.rsi/meta.json @@ -0,0 +1,51 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "portgen0 states taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6f959e719255fcfaacb64807d9de8ba325a044d7 and modified for Ephemeral Space by Flareguy. portgen3 made by Flareguy for Ephemeral Space", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "portgen0" + }, + { + "name": "portgen0on", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "portgen3" + }, + { + "name": "portgen3on", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "portgen3on_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "portgen_on_unlit" + } + ] +} diff --git a/Resources/Textures/_ES/Structures/Power/portable_generator.rsi/portgen0.png b/Resources/Textures/_ES/Structures/Power/portable_generator.rsi/portgen0.png new file mode 100644 index 00000000000..610eea74f55 Binary files /dev/null and b/Resources/Textures/_ES/Structures/Power/portable_generator.rsi/portgen0.png differ diff --git a/Resources/Textures/_ES/Structures/Power/portable_generator.rsi/portgen0on.png b/Resources/Textures/_ES/Structures/Power/portable_generator.rsi/portgen0on.png new file mode 100644 index 00000000000..2c0d014101a Binary files /dev/null and b/Resources/Textures/_ES/Structures/Power/portable_generator.rsi/portgen0on.png differ diff --git a/Resources/Textures/_ES/Structures/Power/portable_generator.rsi/portgen3.png b/Resources/Textures/_ES/Structures/Power/portable_generator.rsi/portgen3.png new file mode 100644 index 00000000000..afa5784183c Binary files /dev/null and b/Resources/Textures/_ES/Structures/Power/portable_generator.rsi/portgen3.png differ diff --git a/Resources/Textures/_ES/Structures/Power/portable_generator.rsi/portgen3on.png b/Resources/Textures/_ES/Structures/Power/portable_generator.rsi/portgen3on.png new file mode 100644 index 00000000000..7aed991dc72 Binary files /dev/null and b/Resources/Textures/_ES/Structures/Power/portable_generator.rsi/portgen3on.png differ diff --git a/Resources/Textures/_ES/Structures/Power/portable_generator.rsi/portgen3on_unlit.png b/Resources/Textures/_ES/Structures/Power/portable_generator.rsi/portgen3on_unlit.png new file mode 100644 index 00000000000..7c0cb6c439e Binary files /dev/null and b/Resources/Textures/_ES/Structures/Power/portable_generator.rsi/portgen3on_unlit.png differ diff --git a/Resources/Textures/_ES/Structures/Power/portable_generator.rsi/portgen_on_unlit.png b/Resources/Textures/_ES/Structures/Power/portable_generator.rsi/portgen_on_unlit.png new file mode 100644 index 00000000000..5a75be6577b Binary files /dev/null and b/Resources/Textures/_ES/Structures/Power/portable_generator.rsi/portgen_on_unlit.png differ diff --git a/Resources/migration.yml b/Resources/migration.yml index 778f086035e..20e493d31b3 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -332,6 +332,9 @@ LockerEngineerFilled: ESLockerEngineerFilled # 2026-3-13 ESSpawnPointChemist: null +# 2026-3-17 +PortableGeneratorSuperPacman: PortableGeneratorPacman + # ES END # 2023-07-03