]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
machine parts + power cell resprite (#23913)
authorNemanja <98561806+EmoGarbage404@users.noreply.github.com>
Thu, 11 Jan 2024 06:06:01 +0000 (01:06 -0500)
committerGitHub <noreply@github.com>
Thu, 11 Jan 2024 06:06:01 +0000 (23:06 -0700)
* machine parts + power cell resprite

* logic fix

22 files changed:
Content.Server/Power/EntitySystems/ChargerSystem.cs
Resources/Locale/en-US/wires/wire-names.ftl
Resources/Prototypes/Entities/Structures/Power/chargers.yml
Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png
Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png
Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png
Resources/Textures/Objects/Power/power_cells.rsi/antique.png
Resources/Textures/Objects/Power/power_cells.rsi/high.png
Resources/Textures/Objects/Power/power_cells.rsi/hyper.png
Resources/Textures/Objects/Power/power_cells.rsi/medium.png
Resources/Textures/Objects/Power/power_cells.rsi/meta.json
Resources/Textures/Objects/Power/power_cells.rsi/microreactor.png
Resources/Textures/Objects/Power/power_cells.rsi/o1.png
Resources/Textures/Objects/Power/power_cells.rsi/o2.png
Resources/Textures/Objects/Power/power_cells.rsi/small.png
Resources/Textures/Structures/Power/cell_recharger.rsi/empty.png
Resources/Textures/Structures/Power/cell_recharger.rsi/full.png
Resources/Textures/Structures/Power/cell_recharger.rsi/light-charged.png
Resources/Textures/Structures/Power/cell_recharger.rsi/light-charging.png
Resources/Textures/Structures/Power/cell_recharger.rsi/light-empty.png
Resources/Textures/Structures/Power/cell_recharger.rsi/meta.json
Resources/Textures/Structures/Power/cell_recharger.rsi/open.png

index 7926e1a84d9c07a2fc3f94ec027e1a0ea8cf6b20..6feba0d52a1bd94a3a1fb65da0745f3ebc2772e6 100644 (file)
@@ -115,13 +115,14 @@ internal sealed class ChargerSystem : EntitySystem
     private void UpdateStatus(EntityUid uid, ChargerComponent component)
     {
         var status = GetStatus(uid, component);
-        if (component.Status == status || !TryComp(uid, out ApcPowerReceiverComponent? receiver))
-            return;
+        TryComp(uid, out AppearanceComponent? appearance);
 
         if (!_container.TryGetContainer(uid, component.SlotId, out var container))
             return;
 
-        TryComp(uid, out AppearanceComponent? appearance);
+        _appearance.SetData(uid, CellVisual.Occupied, container.ContainedEntities.Count != 0, appearance);
+        if (component.Status == status || !TryComp(uid, out ApcPowerReceiverComponent? receiver))
+            return;
 
         component.Status = status;
 
@@ -155,8 +156,6 @@ internal sealed class ChargerSystem : EntitySystem
             default:
                 throw new ArgumentOutOfRangeException();
         }
-
-        _appearance.SetData(uid, CellVisual.Occupied, container.ContainedEntities.Count != 0, appearance);
     }
 
     private CellChargerStatus GetStatus(EntityUid uid, ChargerComponent component)
index 041d07d130a8d40f3ba4762451695fa195f53547..16a4ede6b1cc1e2f1fb27254f91f6c510496802d 100644 (file)
@@ -29,6 +29,7 @@ wires-board-name-hydroponicstray = HydroponicsTray
 wires-board-name-telecomserver = TelecomServer
 wires-board-name-medicalscanner = MedicalScanner
 wires-board-name-reclaimer = Reclaimer
+wires-board-name-recharger = Recharger
 wires-board-name-minigravitygenerator = MiniGravityGenerator
 wires-board-name-dawinstrument = DawInstrument
 wires-board-name-airlock = Airlock Control
index 1a9fc6f87fa3c85f17ec0d04ddfcff89f56446d5..f9ea39b63f1aa429b10baaea0855ffc7443dc04a 100644 (file)
   components:
   - type: Sprite
     sprite: Structures/Power/cell_recharger.rsi
+    layers:
+    - map: ["enum.PowerChargerVisualLayers.Base"]
+      state: "empty"
+    - map: ["enum.PowerChargerVisualLayers.Light"]
+      state: "light-off"
+      shader: "unshaded"
+    - state: open
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+      visible: false
   - type: Machine
     board: CellRechargerCircuitboard
+  - type: Wires
+    boardName: wires-board-name-recharger
+    layoutId: Recharger
+  - type: WiresPanel
+  - type: GenericVisualizer
+    visuals:
+      enum.WiresVisuals.MaintenancePanelState:
+        enum.WiresVisualLayers.MaintenancePanel:
+          True: { visible: true }
+          False: { visible: false }
   - type: PowerCellSlot
     cellSlotId: charger_slot
     # fitsInCharger is true i dont think this will ever affect anything negatively but it lets it function
index 548d47b78f157b6bf703283d10d0d58c2da61c8b..305087c37b634d1fe0fa8962937605c45200cb89 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png and b/Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png differ
index 1e0d4f86186e912fffefa03c761fffca9aeaf1b9..bf30fab981030aa21006292907d09530e03d35d3 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png and b/Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png differ
index 118f810d73740188466501e1e0a3f7b89774d6ef..b67ee6be5226a7288fc15bfe7f36a2d6b6597a5e 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png and b/Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png differ
index e8fbf6f2874d0ff566f14228910c25fdded1ff83..3c0616cc2140c6e71e140d4bca4b904214659cb1 100644 (file)
Binary files a/Resources/Textures/Objects/Power/power_cells.rsi/antique.png and b/Resources/Textures/Objects/Power/power_cells.rsi/antique.png differ
index 966d10dcab76c156f5ad2442a95f347d3268d999..ad426aab85c71e883665bf18285c71dc940a0127 100644 (file)
Binary files a/Resources/Textures/Objects/Power/power_cells.rsi/high.png and b/Resources/Textures/Objects/Power/power_cells.rsi/high.png differ
index c2af41fc069b3d21e8a24341254ecb3dc707f205..6a3a53c69b6b8f66cadb2f33ce772c02c43893b4 100644 (file)
Binary files a/Resources/Textures/Objects/Power/power_cells.rsi/hyper.png and b/Resources/Textures/Objects/Power/power_cells.rsi/hyper.png differ
index f231a622a73a600ec907d1c8fe71387d730387d1..baabc8510af0f9456788997b0d510bc82390c3e5 100644 (file)
Binary files a/Resources/Textures/Objects/Power/power_cells.rsi/medium.png and b/Resources/Textures/Objects/Power/power_cells.rsi/medium.png differ
index 66dbf308412c9a3d42e61e984dc79c04d9c4566d..6ed575b6f04dbdaa931da887ca3aa0045892ae52 100644 (file)
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/tgstation/tgstation/commit/7dcdbc1468ffdc8689b984cb6b181d48ae41dbf2, potato based on https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068 edited by @Doru991",
+    "copyright": "sprites based on https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068. power cells edited by EmoGarbage404, potato edited by @Doru991",
     "states": [
         {
             "name": "potato"
index d9e0f6d59f9171cafdb5a55134a9dcb575af12bc..5177c9aa893165c93dc4a809b82c425c7238825c 100644 (file)
Binary files a/Resources/Textures/Objects/Power/power_cells.rsi/microreactor.png and b/Resources/Textures/Objects/Power/power_cells.rsi/microreactor.png differ
index 7d28199193808ed5c3facda1ddda69cbf5837ddf..348baff449932672a0729a9153ce4e5bd4cabd20 100644 (file)
Binary files a/Resources/Textures/Objects/Power/power_cells.rsi/o1.png and b/Resources/Textures/Objects/Power/power_cells.rsi/o1.png differ
index 33c2be42d75ae553148b853f1889edb38e6de0a6..504d64fa7032c6c4f91e1a58ef4a2c70d81512ce 100644 (file)
Binary files a/Resources/Textures/Objects/Power/power_cells.rsi/o2.png and b/Resources/Textures/Objects/Power/power_cells.rsi/o2.png differ
index 32feddb0dad968ee629734199160bce89784b328..854d0053b0798ac62ada054c32529679dadc0f4a 100644 (file)
Binary files a/Resources/Textures/Objects/Power/power_cells.rsi/small.png and b/Resources/Textures/Objects/Power/power_cells.rsi/small.png differ
index e3d7f1dbd1c3c90bd0dbb3c1367d16c6763767d0..b78ee8ee5cfbe6a7a30f1205ea65f1df0baef3a0 100644 (file)
Binary files a/Resources/Textures/Structures/Power/cell_recharger.rsi/empty.png and b/Resources/Textures/Structures/Power/cell_recharger.rsi/empty.png differ
index 6f0256e3f1f435bc09697446f808e909f849f455..c133fd30e35cc0e17158a0e88392e738eb46eeb6 100644 (file)
Binary files a/Resources/Textures/Structures/Power/cell_recharger.rsi/full.png and b/Resources/Textures/Structures/Power/cell_recharger.rsi/full.png differ
index c12582f36e578df8a86aa1bfddbbfe473e849058..03b9ffcef61bb70b229921b1d591b79abfa98334 100644 (file)
Binary files a/Resources/Textures/Structures/Power/cell_recharger.rsi/light-charged.png and b/Resources/Textures/Structures/Power/cell_recharger.rsi/light-charged.png differ
index d11d1d8f124398f138158832bc93726d53f5f73e..15011fda1c0b04a0025a0e58d09b88ff5fb19e62 100644 (file)
Binary files a/Resources/Textures/Structures/Power/cell_recharger.rsi/light-charging.png and b/Resources/Textures/Structures/Power/cell_recharger.rsi/light-charging.png differ
index 3480c524fb4ab62b192f2faa6f04b95959d6ae58..82f905fdd9abce5a4aecf244bc983ca49d9c5a50 100644 (file)
Binary files a/Resources/Textures/Structures/Power/cell_recharger.rsi/light-empty.png and b/Resources/Textures/Structures/Power/cell_recharger.rsi/light-empty.png differ
index 8f449561cac126b6027c40d961171e77b483f5f0..42ad3ab990d7d92559e1dd2b7b1b03ea54dc3224 100644 (file)
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from Goonstation at commit https://github.com/goonstation/goonstation/commit/4f88b9314336631929c9cdddb1567fc08f83bf9e and modified by potato1234x (github) for ss14",
+    "copyright": "Taken from Goonstation at commit https://github.com/goonstation/goonstation/commit/4f88b9314336631929c9cdddb1567fc08f83bf9e and modified by potato1234x (github), then again by EmoGarbage404 (github) for ss14",
     "states": [
         {
             "name": "light-off"
index 059bf3abc261aa4727818fc603ed447515e31208..139296e18028b53ff332108b6e666046bc07d53b 100644 (file)
Binary files a/Resources/Textures/Structures/Power/cell_recharger.rsi/open.png and b/Resources/Textures/Structures/Power/cell_recharger.rsi/open.png differ