Generator resprite (+ jerrycans)

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

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.

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

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

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
+    }
+  ]
+}

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"
+        }
+    ]
+}

Resources/migration.yml

@@ -332,6 +332,9 @@ LockerEngineerFilled: ESLockerEngineerFilled
 # 2026-3-13
 ESSpawnPointChemist: null
 
+# 2026-3-17
+PortableGeneratorSuperPacman: PortableGeneratorPacman
+
 # ES END
 
 # 2023-07-03