From b5eef250b8d6d12740388da20b0f283ce6bfd6ba Mon Sep 17 00:00:00 2001
From: KashRas2 <dreamasriel2@gmail.com>
Date: Fri, 30 Aug 2024 19:43:48 +0300
Subject: [PATCH 1/3] a lot of fixes

---
 Content.Client/ADT/Economy/UI/AtmWindow.xaml  |   4 +-
 .../ADT/Economy/UI/AtmWindow.xaml.cs          |   2 +-
 .../HyperNobliumProductionReaction.cs         |   4 --
 ...=> SharedCanBuildWallOnTopRPDComponent.cs} |   0
 ... SharedCanBuildWindowOnTopRPDComponent.cs} |   0
 Resources/Locale/ru-RU/ADT/economy/atm.ftl    |   2 +
 .../Entities/Objects/Device/door_remote.ftl   |   2 +
 .../Prototypes/ADT/Access/engineering.yml     |   5 ++
 .../Prototypes/ADT/Atmospherics/reactions.yml |   2 +-
 .../Entities/Objects/Devices/door_remote.yml  |  16 ++++++
 .../ADT/Entities/Structures/Machines/atm.yml  |   7 +--
 .../Structures/Piping/Atmospherics/pipes.yml  |   5 ++
 .../Structures/Piping/Disposal/pipes.yml      |  11 ++++
 .../Catalog/Fills/Lockers/engineer.yml        |   2 +
 .../Structures/Doors/Firelocks/firelock.yml   |   1 +
 .../Entities/Structures/Walls/walls.yml       |   2 +-
 .../Textures/ADT/Interface/Atmos/status.png   | Bin 0 -> 157 bytes
 .../ADT/Structures/Machines/atm.rsi/atm.png   | Bin 0 -> 4471 bytes
 .../Structures/Machines/atm.rsi/atm_off.png   | Bin 0 -> 1737 bytes
 .../ADT/Structures/Machines/atm.rsi/meta.json |  52 ++++++++++++++++--
 .../ADT/Structures/Machines/atm.rsi/off.png   | Bin 1057 -> 0 bytes
 .../ADT/Structures/Machines/atm.rsi/on.png    | Bin 652 -> 0 bytes
 .../color.rsi/equipped-INNERCLOTHING.png      | Bin 518 -> 1010 bytes
 .../Uniforms/Jumpskirt/color.rsi/icon.png     | Bin 300 -> 455 bytes
 .../Uniforms/Jumpskirt/color.rsi/meta.json    |   2 +-
 .../color.rsi/equipped-INNERCLOTHING.png      | Bin 540 -> 1160 bytes
 .../Uniforms/Jumpsuit/color.rsi/icon.png      | Bin 293 -> 437 bytes
 .../Uniforms/Jumpsuit/color.rsi/meta.json     |   2 +-
 28 files changed, 102 insertions(+), 19 deletions(-)
 rename Content.Shared/ADT/Construction/{SharedCanBuildWallOnTopRCDFAPComponent.cs => SharedCanBuildWallOnTopRPDComponent.cs} (100%)
 rename Content.Shared/ADT/Construction/{SharedCanBuildWindowOnTopRCDFAPComponent.cs => SharedCanBuildWindowOnTopRPDComponent.cs} (100%)
 create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/door_remote.ftl
 create mode 100644 Resources/Prototypes/ADT/Access/engineering.yml
 create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Devices/door_remote.yml
 create mode 100644 Resources/Textures/ADT/Interface/Atmos/status.png
 create mode 100644 Resources/Textures/ADT/Structures/Machines/atm.rsi/atm.png
 create mode 100644 Resources/Textures/ADT/Structures/Machines/atm.rsi/atm_off.png
 delete mode 100644 Resources/Textures/ADT/Structures/Machines/atm.rsi/off.png
 delete mode 100644 Resources/Textures/ADT/Structures/Machines/atm.rsi/on.png

diff --git a/Content.Client/ADT/Economy/UI/AtmWindow.xaml b/Content.Client/ADT/Economy/UI/AtmWindow.xaml
index a2a32b316a3..4ad95c800c2 100644
--- a/Content.Client/ADT/Economy/UI/AtmWindow.xaml
+++ b/Content.Client/ADT/Economy/UI/AtmWindow.xaml
@@ -1,12 +1,12 @@
 <DefaultWindow xmlns="https://spacestation14.io"
                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-               Title="ATM"
+               Title="{Loc 'atm-ui-name'}"
                SetSize="400 220"
                Resizable="False">
 
     <BoxContainer Name="AuthorizationPage" HorizontalExpand="True" VerticalExpand="True">
         <BoxContainer HorizontalAlignment="Center" HorizontalExpand="True" VerticalAlignment="Center" Orientation="Vertical" MinSize="325 160">
-            <Label Text="Nanotrasen ATM"/>
+            <Label Text="{Loc 'atm-ui-nanotrasen-atm'}"/>
             <Label Name="BalanceLabel" Visible="False"/>
             <controls:HighDivider Name="Divider" Visible="False"/>
             <Label Name="StatusLabel"/>
diff --git a/Content.Client/ADT/Economy/UI/AtmWindow.xaml.cs b/Content.Client/ADT/Economy/UI/AtmWindow.xaml.cs
index 51490ae316d..b8a7489dd01 100644
--- a/Content.Client/ADT/Economy/UI/AtmWindow.xaml.cs
+++ b/Content.Client/ADT/Economy/UI/AtmWindow.xaml.cs
@@ -33,7 +33,7 @@ public AtmWindow()
 
     public void UpdateState(BoundUserInterfaceState state)
     {
-        if(state is not ATMBuiState cast) return;
+        if (state is not ATMBuiState cast) return;
 
         if (!cast.HasCard)
         {
diff --git a/Content.Server/ADT/Atmos/Reactions/HyperNobliumProductionReaction.cs b/Content.Server/ADT/Atmos/Reactions/HyperNobliumProductionReaction.cs
index 441bb8453bf..a331eb0eb7a 100644
--- a/Content.Server/ADT/Atmos/Reactions/HyperNobliumProductionReaction.cs
+++ b/Content.Server/ADT/Atmos/Reactions/HyperNobliumProductionReaction.cs
@@ -10,10 +10,6 @@ public sealed partial class HyperNobliumProductionReaction : IGasReactionEffect
 {
     public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem, float heatScale)
     {
-        var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium);
-        if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f)
-            return ReactionResult.NoReaction;
-
         var initialNitrogen = mixture.GetMoles(Gas.Nitrogen);
         var initialTritium = mixture.GetMoles(Gas.Tritium);
         var initialBZ = mixture.GetMoles(Gas.BZ);
diff --git a/Content.Shared/ADT/Construction/SharedCanBuildWallOnTopRCDFAPComponent.cs b/Content.Shared/ADT/Construction/SharedCanBuildWallOnTopRPDComponent.cs
similarity index 100%
rename from Content.Shared/ADT/Construction/SharedCanBuildWallOnTopRCDFAPComponent.cs
rename to Content.Shared/ADT/Construction/SharedCanBuildWallOnTopRPDComponent.cs
diff --git a/Content.Shared/ADT/Construction/SharedCanBuildWindowOnTopRCDFAPComponent.cs b/Content.Shared/ADT/Construction/SharedCanBuildWindowOnTopRPDComponent.cs
similarity index 100%
rename from Content.Shared/ADT/Construction/SharedCanBuildWindowOnTopRCDFAPComponent.cs
rename to Content.Shared/ADT/Construction/SharedCanBuildWindowOnTopRPDComponent.cs
diff --git a/Resources/Locale/ru-RU/ADT/economy/atm.ftl b/Resources/Locale/ru-RU/ADT/economy/atm.ftl
index a1e20b13f86..33a908571fb 100644
--- a/Resources/Locale/ru-RU/ADT/economy/atm.ftl
+++ b/Resources/Locale/ru-RU/ADT/economy/atm.ftl
@@ -5,3 +5,5 @@ atm-ui-enter-pin = Введите PIN
 atm-ui-select-withdraw-amount = Выберите сумму вывода.
 atm-ui-insert-card = Вставьте карту.
 atm-ui-balance = Баланс: { $balance }$
+atm-ui-nanotrasen-atm = Nanotrasen ATM 1.5
+atm-ui-name = Банкомат
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/door_remote.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/door_remote.ftl
new file mode 100644
index 00000000000..f69e9f11a56
--- /dev/null
+++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/door_remote.ftl
@@ -0,0 +1,2 @@
+ent-ADTDoorRemoteFirefight = пульт от пожарных шлюзов
+    .desc = Гаджет, который может открывать и закрывать пожарные шлюзы дистанционно.
diff --git a/Resources/Prototypes/ADT/Access/engineering.yml b/Resources/Prototypes/ADT/Access/engineering.yml
new file mode 100644
index 00000000000..7116d5d32f8
--- /dev/null
+++ b/Resources/Prototypes/ADT/Access/engineering.yml
@@ -0,0 +1,5 @@
+- type: accessGroup
+  id: ADTFireFight
+  tags:
+    - Engineering
+    - Atmospherics
diff --git a/Resources/Prototypes/ADT/Atmospherics/reactions.yml b/Resources/Prototypes/ADT/Atmospherics/reactions.yml
index da8881bf330..52e7c214bc9 100644
--- a/Resources/Prototypes/ADT/Atmospherics/reactions.yml
+++ b/Resources/Prototypes/ADT/Atmospherics/reactions.yml
@@ -202,7 +202,7 @@
   id: ZaukerProduction
   priority: 9
   minimumTemperature: 50000
-  maximumTemperature: 75000
+  maximumTemperature: 100000
   minimumRequirements:
   - 0     # oxygen
   - 0     # nitrogen
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/ADT/Entities/Objects/Devices/door_remote.yml
new file mode 100644
index 00000000000..237e7df69c9
--- /dev/null
+++ b/Resources/Prototypes/ADT/Entities/Objects/Devices/door_remote.yml
@@ -0,0 +1,16 @@
+- type: entity
+  parent: DoorRemoteDefault
+  id: ADTDoorRemoteFirefight
+  name: fire-fighting door remote
+  description: A gadget which can open and bolt FireDoors remotely.
+  components:
+    - type: Sprite
+      layers:
+        - state: door_remotebase
+        - state: door_remotelightscolour
+          color: "#ff9900"
+        - state: door_remotescreencolour
+          color: "#e02020"
+    - type: Access
+      groups:
+        - ADTFireFight
diff --git a/Resources/Prototypes/ADT/Entities/Structures/Machines/atm.yml b/Resources/Prototypes/ADT/Entities/Structures/Machines/atm.yml
index 1a2c8517aa6..0fc148c9603 100644
--- a/Resources/Prototypes/ADT/Entities/Structures/Machines/atm.yml
+++ b/Resources/Prototypes/ADT/Entities/Structures/Machines/atm.yml
@@ -8,19 +8,18 @@
     - Wallmount
   components:
   - type: WallMount
-    arc: 360
   - type: Transform
     anchored: true
   - type: Clickable
   - type: InteractionOutline
   - type: Sprite
     sprite: ADT/Structures/Machines/atm.rsi
-    snapCardinals: true
+    snapCardinals: false
     state:
     layers:
-    - state: "off"
+    - state: "atm_off"
       map: ["enum.ATMVisualLayers.Base"]
-    - state: "on"
+    - state: "atm"
       map: ["enum.ATMVisualLayers.BaseUnshaded"]
       shader: unshaded
   - type: ATM
diff --git a/Resources/Prototypes/ADT/Entities/Structures/Piping/Atmospherics/pipes.yml b/Resources/Prototypes/ADT/Entities/Structures/Piping/Atmospherics/pipes.yml
index 89e3c8744f2..4b5e2771e6a 100644
--- a/Resources/Prototypes/ADT/Entities/Structures/Piping/Atmospherics/pipes.yml
+++ b/Resources/Prototypes/ADT/Entities/Structures/Piping/Atmospherics/pipes.yml
@@ -1,6 +1,7 @@
 - type: entity
   parent: GasPipeHalf
   id: ADTGasPipeHalf
+  categories: [ HideSpawnMenu ]
   suffix: Half, ADT
   components:
   - type: Transform
@@ -14,6 +15,7 @@
 - type: entity
   parent: GasPipeStraight
   id: ADTGasPipeStraight
+  categories: [ HideSpawnMenu ]
   suffix: Straight, ADT
   components:
   - type: Transform
@@ -27,6 +29,7 @@
 - type: entity
   parent: GasPipeBend
   id: ADTGasPipeBend
+  categories: [ HideSpawnMenu ]
   suffix: Bend, ADT
   components:
   - type: Transform
@@ -40,6 +43,7 @@
 - type: entity
   parent: GasPipeTJunction
   id: ADTGasPipeTJunction
+  categories: [ HideSpawnMenu ]
   suffix: TJunction, ADT
   components:
   - type: Transform
@@ -53,6 +57,7 @@
 - type: entity
   parent: GasPipeFourway
   id: ADTGasPipeFourway
+  categories: [ HideSpawnMenu ]
   suffix: Fourway, ADT
   components:
   - type: Transform
diff --git a/Resources/Prototypes/ADT/Entities/Structures/Piping/Disposal/pipes.yml b/Resources/Prototypes/ADT/Entities/Structures/Piping/Disposal/pipes.yml
index 772808d8bd0..ca5355087ec 100644
--- a/Resources/Prototypes/ADT/Entities/Structures/Piping/Disposal/pipes.yml
+++ b/Resources/Prototypes/ADT/Entities/Structures/Piping/Disposal/pipes.yml
@@ -1,6 +1,7 @@
 - type: entity
   parent: DisposalPipe
   id: ADTDisposalPipe
+  categories: [ HideSpawnMenu ]
   components:
   - type: Transform
     anchored: false
@@ -13,6 +14,7 @@
 - type: entity
   parent: DisposalTagger
   id: ADTDisposalTagger
+  categories: [ HideSpawnMenu ]
   components:
   - type: Transform
     anchored: false
@@ -25,6 +27,7 @@
 - type: entity
   parent: DisposalTrunk
   id: ADTDisposalTrunk
+  categories: [ HideSpawnMenu ]
   components:
   - type: Transform
     anchored: false
@@ -37,6 +40,7 @@
 - type: entity
   parent: DisposalRouter
   id: ADTDisposalRouter
+  categories: [ HideSpawnMenu ]
   components:
   - type: Transform
     anchored: false
@@ -49,6 +53,7 @@
 - type: entity
   parent: DisposalRouterFlipped
   id: ADTDisposalRouterFlipped
+  categories: [ HideSpawnMenu ]
   components:
   - type: Transform
     anchored: false
@@ -61,6 +66,7 @@
 - type: entity
   parent: DisposalJunction
   id: ADTDisposalJunction
+  categories: [ HideSpawnMenu ]
   components:
   - type: Transform
     anchored: false
@@ -73,6 +79,7 @@
 - type: entity
   parent: DisposalJunctionFlipped
   id: ADTDisposalJunctionFlipped
+  categories: [ HideSpawnMenu ]
   components:
   - type: Transform
     anchored: false
@@ -85,6 +92,7 @@
 - type: entity
   parent: DisposalYJunction
   id: ADTDisposalYJunction
+  categories: [ HideSpawnMenu ]
   components:
   - type: Transform
     anchored: false
@@ -97,6 +105,7 @@
 - type: entity
   parent: DisposalBend
   id: ADTDisposalBend
+  categories: [ HideSpawnMenu ]
   components:
   - type: Transform
     anchored: false
@@ -109,6 +118,7 @@
 - type: entity
   parent: DisposalSignalRouter
   id: ADTDisposalSignalRouter
+  categories: [ HideSpawnMenu ]
   components:
   - type: Transform
     anchored: false
@@ -121,6 +131,7 @@
 - type: entity
   parent: DisposalSignalRouterFlipped
   id: ADTDisposalSignalRouterFlipped
+  categories: [ HideSpawnMenu ]
   components:
   - type: Transform
     anchored: false
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
index 87e27a57e3c..b93a65ef212 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
@@ -94,6 +94,7 @@
       - id: GasAnalyzer
       - id: MedkitOxygenFilled
       - id: HolofanProjector
+      - id: ADTDoorRemoteFirefight # ADT-Atmos-Remote
   # ADT-RPD-Start
       - id: ADTRPD
       - id: ADTRPDAmmo
@@ -115,6 +116,7 @@
       - id: GasAnalyzer
       - id: MedkitOxygenFilled
       - id: HolofanProjector
+      - id: ADTDoorRemoteFirefight # ADT-Atmos-Remote
   # ADT-RPD-Start
       - id: ADTRPD
       - id: ADTRPDAmmo
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
index e4b24243011..abfb72d2cd7 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -105,6 +105,7 @@
       arc: 360
     - type: StaticPrice
       price: 150
+    - type: DoorBolt # ADT-Atmos-Remote
     - type: AccessReader
       access: [ [ "Engineering" ] ]
     - type: PryUnpowered
diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
index 2fdf21c6fd2..9e2be32bee9 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -80,7 +80,7 @@
             max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
-  - type: CanBuildWindowOnTopRPD # ADT-RPD
+  - type: CanBuildWallOnTopRPD # ADT-RPD
   - type: IconSmooth
     key: bricks
     base: brick
diff --git a/Resources/Textures/ADT/Interface/Atmos/status.png b/Resources/Textures/ADT/Interface/Atmos/status.png
new file mode 100644
index 0000000000000000000000000000000000000000..165a9b9d9f1e32fa1975aae8ed6a8702f55fd351
GIT binary patch
literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^6+kS<!3HFspS(2{NTqnXIEG~0dwbDQu)#op<sk2}
zWX9|5tZ^Z!FDDx8{j_N2&dG0H>=3&n&wN;ytu2~|XS;+%o}s~=q=X$u4-|AaKK#bq
x&$~BPj6p1c5rWus4lqFwPecQ2M8nrq{@1g0*lq-EC<WTb;OXk;vd$@?2>@_<H4Oj&

literal 0
HcmV?d00001

diff --git a/Resources/Textures/ADT/Structures/Machines/atm.rsi/atm.png b/Resources/Textures/ADT/Structures/Machines/atm.rsi/atm.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b0bf33511b00b0b26c6d64e8dea046eb245604a
GIT binary patch
literal 4471
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/ADT/Structures/Machines/atm.rsi/atm_off.png b/Resources/Textures/ADT/Structures/Machines/atm.rsi/atm_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c2c163ce97e3366acd7a1395318a9da7d4dac7a
GIT binary patch
literal 1737
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/ADT/Structures/Machines/atm.rsi/meta.json b/Resources/Textures/ADT/Structures/Machines/atm.rsi/meta.json
index 3b03dd69518..1afb84a9f02 100644
--- a/Resources/Textures/ADT/Structures/Machines/atm.rsi/meta.json
+++ b/Resources/Textures/ADT/Structures/Machines/atm.rsi/meta.json
@@ -5,13 +5,57 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/Baystation12/Baystation12 at commit 0c2c999f74f2998912ae009223df83cbd987aa5d",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/blob/master/icons/obj/terminals.dmi",
   "states": [
     {
-      "name": "off"
+      "name": "atm_off",
+      "directions": 4
     },
     {
-      "name": "on"
+      "name": "atm",
+      "directions": 4,
+      "delays": [
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ]
+      ]
     }
-   ]
+  ]
 }
diff --git a/Resources/Textures/ADT/Structures/Machines/atm.rsi/off.png b/Resources/Textures/ADT/Structures/Machines/atm.rsi/off.png
deleted file mode 100644
index 209b9a6c0ac220939ab7c0c765fdbd4d6f5bf818..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1057
zcmV++1m63JP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004SX+uL$X=7sm
z04R}lk-ba9P!z>aTT4YNMRX8x$WX<hg`yyirGj0mLtDYBOY)kuLXw7;6e+HPi$lRd
zbn$EOKhRZhRS*P45OH(&YmpM~YYHvWzQ@b`aq`aP<^=F(bY|FnNx(22o=vBu)xw$-
zdPfk$v?U~DW?M_S#XNehpGWvaeTa)*z3+8hgGJS5fUlo;j#=CxrfHDbaxB4n#G|Y%
z7l}`ZW1I#gz7@LS@tfe1$6tbZKDz+;MNg^J!Ab|SGB=2)iKB*IWvzL{mxNVwB}a9f
z&ID{^kw%KLP*BAtbU27pH7T?1zC_cvj0$-eJuTG0$x%X?yfIR%)K#Ubk*?C#Q4_iU
z&(qdsXT0v=6cBuM-OouNv=21uuKRoHx{Wg+@B&<$ZGVMwn*S!f-qxbWKx7BFylHF7
z0dTboj6GX2mzz?6j$hM&j|*U^0F2xN1M6N^t@k*80`lARi|&BKBVdZ|M>hTdQ7>pO
zhtAdj00009a7bBm000XT000XT0n*)m`~Uy~JxN4CR9FdPU>F4>Jp>r>1%SV6=6`(h
z#L8{lJsqb#EQAbEH`OJi1h4$f)0gqe<8^?%t}26wssdgE2uc3<@q>Y3H*QsU9q{n-
zZH6<OPT<y!CZk|1%W!4yb-1XGvnIpWci-TAYz({(K-O^o&OKx<23t`@i9uXWjv;Pu
z7F=%Uk}VAP-ra!nu`!si38ISyR41Sd;pEFoh%vx0PDMx(L^)tX>jES#)MXMC1)vb<
zPpl)#=1GlxaCKbV0&q4i22l<mB?O4E6xlIEMFA;k;QG;v3^0sr5iT~%vSrI~$uX>)
ze;6zW3IR|mCk8yb^#ZO;(^?<Q#%Bk?C@>GSh8su>!#U9%L)rK5-x)YLIWfdR0yxWP
zkYrv_-+$|rP=@cHzB0J#DKqT8bQgpE72^R?%D}c{2be}CIQh64j?P)lFsZKyr#%Ei
z0A?V_au7hLu~`h$1ENJ_q>#B7Y`lpOSu-dEKmeWowZek|gmHm4PoCkD0*m7f0gz^O
zsCIOp!}x3wm_ZNH0t$W*K=uS!0F9tH1R5?SGJr4)z$}LG3DJzWvdH}T^BK4pRQ_8>
z`4Tb%ul&(vn;GynNTQ;ma2nw6s)8a1Di4UM6-g<$@TLKf?O$HJVc?Mv0Xu|GjEBMA
zzz)pDMSOVn0WJm7O9&8j0LTECBb-u02$=_$C&qG+Vw?p8%p_35RNu)G#wCfqxbHaL
z_y-wAFa$om`ost{h^*EzzQjk8Pev7wh5#)?0017+tnAiBc!~f301jnXNoGw=04e|g
b00;m8000000Mb*F00000NkvXXu0mjfpB>BM

diff --git a/Resources/Textures/ADT/Structures/Machines/atm.rsi/on.png b/Resources/Textures/ADT/Structures/Machines/atm.rsi/on.png
deleted file mode 100644
index 02ac1c863d641494109ff28eee870cdfc4e34ab9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 652
zcmV;70(1R|P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004SX+uL$X=7sm
z04R}lk-ba9P!z>aTT4YNMRX8x$WX<hg`yyirGj0mLtDYBOY)kuLXw7;6e+HPi$lRd
zbn$EOKhRZhRS*P45OH(&YmpM~YYHvWzQ@b`aq`aP<^=F(bY|FnNx(22o=vBu)xw$-
zdPfk$v?U~DW?M_S#XNehpGWvaeTa)*z3+8hgGJS5fUlo;j#=CxrfHDbaxB4n#G|Y%
z7l}`ZW1I#gz7@LS@tfe1$6tbZKDz+;MNg^J!Ab|SGB=2)iKB*IWvzL{mxNVwB}a9f
z&ID{^kw%KLP*BAtbU27pH7T?1zC_cvj0$-eJuTG0$x%X?yfIR%)K#Ubk*?C#Q4_iU
z&(qdsXT0v=6cBuM-OouNv=21uuKRoHx{Wg+@B&<$ZGVMwn*S!f-qxbWKx7BFylHF7
z0dTboj6GX2mzz?6j$hM&j|*U^0F2xN1M6N^t@k*80`lARi|&BKBVdZ|M>hTdQ7>pO
zhtAdj00009a7bBm000XT000XT0n*)m`~Uy|s7XXYR9FdPU>F6XAut*OBRvEdi46eZ
zs@4DTseRiPO0-$X<}e|12(cr4Js3b32GIF1aZ+faT|F8CgCYb-iCbdTGA>)T45!+t
zs3@Frq)6bigQQ$QilxYEzkmOZ%%v{-q@v9KA2OnN%LwY)IM__Px>f1_?@Op5AUEOI
z2nrFU{Tcs7pA?eqW1QJ={`~n2yLay%Y%xCSp3x8(4S~@R7=|GL0HlU8D!V@dm;e9(
m4rN$LW=%~1DgXcg2mk;800000(o>TF0000<MNUMnLSTa9Ya3Vq

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png
index 3faba7285ff1b3898e47a23c7299d33e20a05c0c..46f996e848f7a5b5b2dd799275a1f0393fbd222d 100644
GIT binary patch
delta 999
zcmV<D0~q{<1o8)v8Gi-<0063Kaozv`00DDSM?wIu&K&6g00XQ^L_t(|UhSGaYg9oL
zhG(lR+hs{7qCp7=f`|%fEG_&1%M|((1PNFLv`|PT1i_!6MM}Ys!qO(7A^|}NN))jR
zn{L^yuDpSFISjk^&Y7KacP~5B+{Mhyd*(T3=3eKVmRs=FT7U5My9^*lz=9LVTVTNh
zARmHx3p8~Lyxx6Z(Dr*9x1t@X8u<C^esS>gpZm7=#XaA7G8+46^J#H;{i<6#f686E
za!EC(#sN})<Nn>z(A`&WT&#Yuu^@i)#=84;_}2jfes{awR<GA9K78CeS^T-x(+<C<
z@yH|~zCN75#(%}f=m!CSI2TA!EEGmS95C1jC?$k(`p|<G7A>1rzY+k#4kFU?a<S3?
z842j0Vmp-SLr=nw(XRwR`rP}{<I)2%A`mU;pCSs%^d*2;{ZasuJ`Nf*96t2A1c2Xu
zpJ}6@N?!tq)h`7g>BE~i?d9nUFT>kx0D!lHKTdPf%YVLA`u@Bz`lSH)dgE)422t1t
zz_9nn#R90(_vek#uRH^!h<xAU-z9)?-v_Y^pES<bm;GY(RRES(R*L0r*Y*2-xA}0}
z-M(|(y?gt~?Y!7>oleIc_j>O5=twoE2GW_cYsGLla7#;VH|hE3_kl`3xU-~B&yRch
zUx}IpmVfoN(hmk8KSp@^k9($i{rNDg^n(D%!;c?Dlb$>qQhWmtf~9^C02zK&0AdfL
z(C|;K9|Qo#S?$5lGr~$g7=R2%{wK(PrVRT@V6Yuh>Z<{SdaNn^GJvLd%F50h0aj$2
zGH;H6rg+NA&Kv<&WScT?j)10k%F50h0aj$2GJkK5fTnoL%FY}CF=Tm1mm>KYqwkMl
z-9XHRj5-2vH3b8ZBt>H)l=T8B7F0EdtVzHfBpT}lWZ_2DJovi`z@*DjOvLQ0)_@Qr
zWgptWw79&QkGYUl0r2nUk&N7W{9t6?wAtVg7|a;6@Ak8oql~q-I6@r(5&(p`4Wu`$
z&wm9808z*Aha=1Z$SnZxGgU6@1?mKV1*6fHTDJhpQDoR!rNyL%pQ6X#ShQ7p1h6`b
z2F?Niy^d%!j{t4~|FB|}NZkPV3Y7L}v(u`#0O|vl+U=8C0NG@{z{LxzsyRbWe%a^y
zkHbRNB=~j=2Ln}&La?z`xj7903mbv~SYYMnH2^GZ2m)Z4pAQ9KWkV2vS=R>ul9dfX
z0DJ>xQ6pq!Lofh_YU=!a=oaulhEmlCr~$+nJkMh?fO+;#9k%5NsDtu6Yb<;O{0H2_
V4t)y#VHyAc002ovPDHLkV1fV(-2?yt

delta 503
zcmV<T0SNx`2ZjWY8Gi!+005o0f$RVP00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E
z000$GOjJdbl$6oY(f|Md*x1-rRaNNd=l}o!T;Uo500007bW%=J|NsC0|Nj6QO9Ms#
z000SaNLh0L01m(a01m(bYSxJf0004JNkl<ZSV!%a+m3@U41Yu&7Wn^9-Wg*WJJ@NZ
z?$auR3O3`MT&M_geyIgm0P0Tx()7|QsED-IaJF3K61dFl@|3ma+3rw1mTlW$Ny9ZG
z&_{)yo&O5W*Y+9V@(tj82hg@Z_%+0Kx66F}dH;@ZPplJ-M#AkA5d0V5o<2L!EUNVH
zVBdFFz$~iteSc4QLi9U*Q0fQ3Ez3ulTmF$wIgSm-Q35jGC77ZXaFUsF-vcfiM*&Fv
z9%G4Yi1{)Wz7Ms8cGkY~Lv6CiL787yf2ajm0BQmLA;7*6rW)RNA;UWh_GD1p)P^^v
zPju^=5o~)5gb>3N*fjv{wa9X60AS-DhUkUyv!VvT=5P>efR2AM1$530cm~jt5<s=s
zL6Dl1<x~XV8ND3=22cY`mOo^64S4f?kQTTYGgQA^gtWkimy4qUWCcCM3QoTdiUQBl
tiu(H?F9@~IH6D}{OsYTA0(=cP&tEA7RCze0Ajbdz002ovPDHLkV1h3C-7NqB

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png
index 64642a11589e4ee7d66ac750216c4f7ed0c4d69c..7026bf4e33bfa375612f410ac2db4eec7bc871ae 100644
GIT binary patch
delta 440
zcmV;p0Z0C<0>=Z88Gi-<0047(dh`GQ00DDSM?wIu&K&6g00DtXL_t(oN9~urOG053
z#*gdW6t{2)qdjPFX>{-d8Xf9S2tsHQa!7CzB=Aqj!BOaAXl!u^+M{TQHqq^_S03S!
zg9x4j%58Yx<-GTLxaW7C^8scg<&#M{z65}vKu{nk;8I{XdVfx^xIQNDa#A{7?J)g(
z(Wtt<X?8~NO1UK8Kfm(%^(VN$yiQj3_~<~2hlS-k4}=?lX(JFb2aJBda{y+~j2R4S
zAZs0*%2**x3J{>%87ynhj5PoiY29AA%3uPxY2GD`%X1k$j0KiiYXIE&J8ZAtHhtUV
z1c?Cw3jiK8BY&EY2Z3>{!QpELfHO*=1Fi$$*;;!-y8xg9dVmlb0C!A<CwsR7ECZL2
zUO>2e<#z*Q^Z6v3%Sjx^(!B0Ut$rp?k8jeyZ%GtIGM~+4KApN$H9KqhDg7qvErS_=
z4Turs_-(S@Ml=EF?%xK0x_Tf?09yWS0N!aZ0dNs<1Tj<T0WJ=dgX6buy-UbFhWq#z
iWiG)!f(Hfug#rs<N(wM&%TbU30000<MNUMnLSTY$O}(!G

delta 284
zcmX@kyoPClWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hKfKQ0)
zlqpj#UcC7K|Nk2|ZiI%0zIgEhC=>HgiU~-umjw9*1Eqj~LCTxi4JgD};1OBOz`%D9
zgc)~C%zg_L?DceU46*Qk+waJCRDq-3W#X#u_C@S1`b$iFr~Cff!7zti=`8!-#--s5
zro6hQtxdC{#A2+~)7o5l4Yx&x#B+R97G(I!x0H*ad`sH`*_(M^UYx(JB);Ig9K%W<
zd!a+@NAKTV#Ij>em}&ygG0Ad<umFc?H@XgND$HWgz9pP_c7~QxnJuH1-NZ&Od4^{;
aqKvEDMQ#f{32z2Ejlt8^&t;ucLK6T0$Z7Qe

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json
index 7e6832bd12c..27282867741 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 and modified by Flareguy for Space Station 14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 and modified by Flareguy for Space Station 14 + New style changes by discord:prazat",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png
index 5c333dfc11811bc991f2cd4e82637351c4ead25c..5150d22162fe3a67224d03a7ebc4dffc3cefe0c1 100644
GIT binary patch
delta 1150
zcmV-^1cCdU1c(Wc8Gi-<0063Kaozv`00DDSM?wIu&K&6g00crwL_t(|UhP^vYgADX
zy<273E=xKQ4N5=|L{vy)Y2gQ0rqG`tNWdzfg+eMJ2>t{uQVM<)mNo$u2?#<^qKIAC
zbjxn_<OI%gyu96)nfEFCZnKZK@7^<WX70?~k4~8L)|qqtLw`#^>j87lKsyEI+yUAk
z*iM1}bqc)Pew$GCJ8L)GhBS5j_<1+k`~D|<+4&TnZatdxeX#yGxwv{cteia&u3Wlc
z8q;C`#b3L7d(w6L#jD`OKen)7{Q9-k@MHgX010^R_xqi}V353fzjLJgndOrK&v`5|
zjgS~0Mqs1z9)J8}5dd&1NKhyWApj0C*ho;3B&6X34_HuIn-xEk0Jt4M)bgsV3ZR~V
z?~9lYv+#kZ<a_Wl2_XBN`)YBufO-VH1>YCp1+(y#05ASb0+f9O8Z-nST3rdibNo$S
zFUZ1I0=)P$2~hT7O+<T*zOXW^%?1LH9pZkLNUz^!;eW^Ddhllw!1TtnM}Y_&6F|3*
z`*{h-!jH%G;Ah4F1<`zu_ewxoec)AmTE7@yzw_do2>>VpAsW*lpYf{&QW*p&zK+kj
zz>04oU~y?FS?u@2a5xO>_cz1MTUW!I*B`>xvyIT}^}^v`5DpIxOk-L|I(2#_8IMO{
zVWAtQ{eS-Yxo5&ReXK!{?yu8;LCB(%<y+!23#Da&QavCpN15--E`v!D7eLHBAe>nV
zhCs8{9wrZn^D<%q<{oQ<ym>#%8`6p*#vyO<<stxra?wMtz`H64&;=Q+t?LBOLd-;f
z)&b19Y45Tu>HR;Rf|U~xPXPoR4NO&f00XY#SAXUKT6Ab}Qq%%ynuo+OfCk`xfCt|+
z1*j|w9~D5~d0jlKUm5r&0w^E^Vb!P4Sqc>Of06hu0*X?k3FEW`G{FjW%Fud1o$NOO
zyY+x3SfNfCS`Vm`{U%_y9?%3U)G0&j0Uq|bEG^>j(}N%P;k^Otejvs%djMBrJR9I%
z9DnZ%6roVo7<wmxo1vAQ3+UztkIZ$8I=(rQrHJQ$%D`iB9?<gm-YSF119StDr?DFk
z?@jb5drJ&J+?FHg=9B0D>`GgAh1>)HnA1S5QFdHV0<Z_johTT>dOO4%19S@Lp@iNS
zsFDCEj7C{J2c&Kf;B^$8$5!|A#DMsS9)Dx-(pKdjz};9XQU?LFI!>ob_W<3MRqOGr
zu4)390#%k$v%oY0D1a5*GX;v4!4v~<KVYHTJ-Q2^P45ewKeuce(@MhEZ~KYfNr>eb
zk4C0D3MOHdeY(A7fGVee;xZ62C0gzXm<Rwsd`SWCJki%`dHp`^<|qp@i}L0=fOkT~
z0(cH3^ALc(@v*$u`^+9daNY{3+WKim$Rk580yy`|z9ygMEnEWUO~Eb#;v@083Gfs^
zB(){L6O7_wq>2J4ma`}s+#a9;SyPXP^t3+Qo#KBUIa~x3r9czLnR^2M0*kZ~eI4h?
Q8vp<R07*qoM6N<$f~3<FhyVZp

delta 526
zcmV+p0`dKb37iCw8Gi!+005o0f$RVP00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E
z000kAOjJdbl$6oY(f|MdRaI30008r3l&Js!00neXPE-H?|Nj8{whmJO000SaNLh0L
z01m<c01m<d6(~x80004nNkl<ZSV!%a;c|o^420qE{hztJYkxQiker=%rv2g0iNp;b
zC<<4OAL;=-0P0r(rRr28Xep)Eiqc|f2;efZ(<*Dt(ymZfy}Vv8Sf%2;BhW{N%E5nE
z%~$&!;q(nK_yfS&lClNJ*D?CNhHJ$-QEev3M{E9^{|5BiXM!TH(C?Mj+K|A=EA+>n
zFhle&`lPKt0e_?fu=?KubXhDpK$pd{*ntj<B?sUg;)nt8^biMmfO<#(8ea;~WQTyA
z|IYw?z$*6I`eT3>w4KFXTR-aUwjRI(pdP>suzv`trmx*a_}2NwTeOjugLpl_Vxu)T
zB(VLNa>>=Xq{EH@T+gO;e*$3Rj+Zo!pBXU#cDAu-h=2HZ5#ItjzX9+=bam}Jz5^$j
zl*N<>V2-%|S-c1%U`7m}o9vAMoEagY%i=|5ha+frZ(-b7Trvqsdn35^9&oh0{YmgU
zpHELGky;aGfPch`)`SHR&jH0(<r5&<+$BEd3@~s0tCoy(z<2c5faCZA-<UW)fFO;i
Q00000Ne4wvM6N<$g3$!=6#xJL

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png
index c0087d4d2505fd8d7c362df3d838feb8d39a3d87..7c7e5128584ef26a890dea981f5e58ff66a003bd 100644
GIT binary patch
delta 422
zcmV;X0a^Z~0<{B>8Gi-<0047(dh`GQ00DDSM?wIu&K&6g00D1FL_t(oN9~rsOF~f;
z$B*mV6t{2)!!@J?m&OJyXmqGQAqb&Ks6oLgkf1+72S=eFL!*mO5v^e~M4RaL))!yl
zD~G0YqKC`9%f0V<xaV`e-*Yc!WX&V9=KK->f&xK-pnyw(!GG{R!Nc`Bd6sf@clCzp
z@8d?@b*4EO$!q&n`S|>j_vyD_{qQ(h&84jkDQ*^)dmack0Lw-qRt^}w|L*{-o)t40
z)IilbIhC<Om=qvDw{x@fo)v2VD$=?*b=hD7IB&L-#>tTk`y;{3sx<)C{2lXE@6vR(
zDF_k+0y6+O(0`0*J`N<tuqH>W834hsLMQwUfN!h!gmwWy1@r(RGyvAP6`tzd3eW~V
zLiz#1+AF^sAe+x8*<4QIIF{yFR}K#M<nDGXz3Y}lQ6!7`To$vLOI26!)5}|;ZvZXO
zdzGDS*O{(hHX;4y)ns3!-h}!(VvWS~{xAN!dmxR!@E<M<0zgn8D3FE%KN(=ZAp$s;
QbpQYW07*qoM6N<$f^2QT7ytkO

delta 277
zcmdnWyp(BzWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g*fKQ0)
zlqpj#Uc9(^_3E29Z~p)Pzo(}sG&B?_Id^p#2aw_@3GxdDih}^dz2?1<Krzk&kH}&M
z2EIce%qXhi)c_Q1@^o<wvG9L8A+TPkL4m`?QTKiQ<FbjF32w)jul&|XoS$*h=7XbS
zNObn9%wUZP-uZL&-%rr!VRSC(+1oIO?Nf?N<4xDqLOE;)PE{-D#VeXD-jL^bFk6|k
z%rWLlwz5c*{ehU(%6S}ZckU^AGThMHdVv4IVu2hM^&>W%(RGQ10?%p~qNhnpG|%D7
R`UG?jgQu&X%Q~loCII^iYK{N^

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/meta.json
index 7e6832bd12c..27282867741 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 and modified by Flareguy for Space Station 14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 and modified by Flareguy for Space Station 14 + New style changes by discord:prazat",
   "size": {
     "x": 32,
     "y": 32

From ec4317861d17dd5be87370a3fc1619392f79b1d9 Mon Sep 17 00:00:00 2001
From: KashRas2 <dreamasriel2@gmail.com>
Date: Fri, 30 Aug 2024 19:54:41 +0300
Subject: [PATCH 2/3] =?UTF-8?q?=D0=AD=D1=82=D0=BE=D0=B3=D0=BE=20=D0=BD?=
 =?UTF-8?q?=D0=B5=20=D0=B1=D1=8B=D0=BB=D0=BE=20=D0=B2=20=D1=81=D1=86=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=D1=80=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Resources/Textures/ADT/Interface/Atmos/status.png | Bin 157 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 Resources/Textures/ADT/Interface/Atmos/status.png

diff --git a/Resources/Textures/ADT/Interface/Atmos/status.png b/Resources/Textures/ADT/Interface/Atmos/status.png
deleted file mode 100644
index 165a9b9d9f1e32fa1975aae8ed6a8702f55fd351..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^6+kS<!3HFspS(2{NTqnXIEG~0dwbDQu)#op<sk2}
zWX9|5tZ^Z!FDDx8{j_N2&dG0H>=3&n&wN;ytu2~|XS;+%o}s~=q=X$u4-|AaKK#bq
x&$~BPj6p1c5rWus4lqFwPecQ2M8nrq{@1g0*lq-EC<WTb;OXk;vd$@?2>@_<H4Oj&


From 785a2cda4c01d3203e3ede280daf7eb3f35a75b4 Mon Sep 17 00:00:00 2001
From: KashRas2 <dreamasriel2@gmail.com>
Date: Fri, 30 Aug 2024 19:56:23 +0300
Subject: [PATCH 3/3] =?UTF-8?q?=D0=BE=D1=87=D0=B5=D1=80=D0=B5=D0=B4=D0=BD?=
 =?UTF-8?q?=D0=B0=D1=8F=20=D0=BF=D0=B0=D1=80=D1=82=D0=B8=D1=8F=20=D1=84?=
 =?UTF-8?q?=D0=B8=D0=BA=D1=81=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Prototypes/ADT/Entities/Objects/Devices/cartridges.yml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/ADT/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/ADT/Entities/Objects/Devices/cartridges.yml
index 9116fa6556e..42b2aff81ce 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Devices/cartridges.yml
+++ b/Resources/Prototypes/ADT/Entities/Objects/Devices/cartridges.yml
@@ -13,5 +13,5 @@
     programName: bank-program-name
     icon:
       sprite: ADT/Structures/Machines/atm.rsi
-      state: off
+      state: atm_off
   - type: BankCartridge