AdventureTimeSS14 · KashRas2 · Aug 30, 2024 · Aug 30, 2024 · Aug 30, 2024 · Aug 30, 2024
diff --git 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
@@ -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
@@ -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/...SharedCanBuildWallOnTopRCDFAPComponent.cs → ...on/SharedCanBuildWallOnTopRPDComponent.cs b/...SharedCanBuildWallOnTopRCDFAPComponent.cs → ...on/SharedCanBuildWallOnTopRPDComponent.cs
diff --git a/...aredCanBuildWindowOnTopRCDFAPComponent.cs → .../SharedCanBuildWindowOnTopRPDComponent.cs b/...aredCanBuildWindowOnTopRCDFAPComponent.cs → .../SharedCanBuildWindowOnTopRPDComponent.cs
diff --git 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
@@ -0,0 +1,2 @@
+ent-ADTDoorRemoteFirefight = пульт от пожарных шлюзов
+    .desc = Гаджет, который может открывать и закрывать пожарные шлюзы дистанционно.
diff --git a/Resources/Prototypes/ADT/Access/engineering.yml 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
@@ -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/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
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Devices/door_remote.yml 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/Structures/Machines/atm.rsi/atm.png b/Resources/Textures/ADT/Structures/Machines/atm.rsi/atm.png
diff --git a/Resources/Textures/ADT/Structures/Machines/atm.rsi/atm_off.png b/Resources/Textures/ADT/Structures/Machines/atm.rsi/atm_off.png
diff --git 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
diff --git a/Resources/Textures/ADT/Structures/Machines/atm.rsi/on.png b/Resources/Textures/ADT/Structures/Machines/atm.rsi/on.png
diff --git a/...urces/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png b/...urces/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png
diff --git 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
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png
diff --git 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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ent-ADTDoorRemoteFirefight = пульт от пожарных шлюзов
		.desc = Гаджет, который может открывать и закрывать пожарные шлюзы дистанционно.