From 7989b8f77fc9dd5cb8b6f45105109e587a033e8a Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Sun, 11 Aug 2024 15:53:26 -0400
Subject: [PATCH 01/15] Intercom: disable tool use, make sensitive versions
 indestructible. (#1848)

* Intercom: disassemble/indestructable parents

* Intercom: fix Indestructible tags, parent order
---
 .../Entities/Structures/Wallmounts/intercom.yml           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
index 532af3258be..9489ad6c333 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
@@ -182,7 +182,7 @@
 
 - type: entity
   id: Intercom
-  parent: IntercomConstructed
+  parent: [BaseStructureDisableToolUse, IntercomConstructed] # Frontier: add BaseStructureDisableToolUse
   suffix: ""
   components:
   - type: Sprite
@@ -219,7 +219,7 @@
 
 - type: entity
   id: IntercomCommand
-  parent: Intercom
+  parent: [BaseStructureIndestructible, Intercom] # Frontier - added BaseStructureIndestructible
   suffix: Command, DO NOT MAP # Frontier - Added DO NOT MAP
   components:
   - type: ContainerFill
@@ -275,7 +275,7 @@
 
 - type: entity
   id: IntercomSecurity
-  parent: Intercom
+  parent: [BaseStructureIndestructible, Intercom] # Frontier - added BaseStructureIndestructible
   suffix: Security # Frontier - Not adding DO NOT MAP. (Prototype is already matched by "Security" for sec shipyard.)
   description: An intercom. It's been reinforced with metal from security helmets, making it a bitch-and-a-half to open.
   components:
@@ -325,7 +325,7 @@
 
 - type: entity
   id: IntercomAll
-  parent: Intercom
+  parent: [BaseStructureIndestructible, Intercom] # Frontier - added BaseStructureIndestructible
   suffix: All, DO NOT MAP # Frontier - Added DO NOT MAP
   components:
   - type: ContainerFill

From 4aa707ba6eb9f042defdcc9c0c31d76a78743f25 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Sun, 11 Aug 2024 19:53:51 +0000
Subject: [PATCH 02/15] Automatic Changelog (#1848)

---
 Resources/Changelog/Changelog.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index c35fc91ee45..eed385fd271 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6193,3 +6193,9 @@ Entries:
       message: Observer ghost can now use their own mass scanner to watch ships around.
   id: 5187
   time: '2024-08-11T15:56:44.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Tweak
+      message: NFSD and Security intercoms can no longer be disassembled.
+  id: 5188
+  time: '2024-08-11T19:53:26.0000000+00:00'

From ac6d73c0f366691cb8884b86aade9efc9f7e0d07 Mon Sep 17 00:00:00 2001
From: "Alice \"Arimah\" Heurlin" <30327355+arimah@users.noreply.github.com>
Date: Sun, 11 Aug 2024 21:54:33 +0200
Subject: [PATCH 03/15] Add poultry cube boxes! (#1847)

Also slightly rebalance the vend price of monkey and variant cube boxes.
---
 .../Catalog/Cargo/cargo_livestock.yml         |  38 ++++++-------
 .../Entities/Objects/Misc/monkeycube.yml      |   5 +-
 .../_NF/Catalog/Cargo/cargo_livestock.yml     |  10 ++++
 .../_NF/Catalog/Fills/Crates/npc.yml          |  10 ++++
 .../_NF/Entities/Objects/Misc/monkeycube.yml  |  50 ++++++++++++++++++
 .../Objects/Specific/rehydrateable.yml        |  21 ++++++++
 .../Misc/monkeycube.rsi/box_poultry.png       | Bin 0 -> 1271 bytes
 .../_NF/Objects/Misc/monkeycube.rsi/meta.json |  20 +++++++
 .../Misc/monkeycube.rsi/wrapper_chicken.png   | Bin 0 -> 324 bytes
 .../Misc/monkeycube.rsi/wrapper_duck.png      | Bin 0 -> 314 bytes
 10 files changed, 134 insertions(+), 20 deletions(-)
 create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Misc/monkeycube.yml
 create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Specific/rehydrateable.yml
 create mode 100644 Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/box_poultry.png
 create mode 100644 Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/meta.json
 create mode 100644 Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/wrapper_chicken.png
 create mode 100644 Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/wrapper_duck.png

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
index cb864d8cd0c..2479d48878d 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
@@ -31,15 +31,15 @@
   category: cargoproduct-category-name-livestock
   group: market
 
-- type: cargoProduct
-  id: LivestockChicken
-  icon:
-    sprite: Mobs/Animals/chicken.rsi
-    state: icon-1
-  product: CrateNPCChicken
-  cost: 4000
-  category: cargoproduct-category-name-livestock
-  group: market
+# - type: cargoProduct # Frontier - replaced by poultry cube crate
+#   id: LivestockChicken
+#   icon:
+#     sprite: Mobs/Animals/chicken.rsi
+#     state: icon-1
+#   product: CrateNPCChicken
+#   cost: 4000
+#   category: cargoproduct-category-name-livestock
+#   group: market
 
 - type: cargoProduct
   id: LivestockCrab
@@ -52,16 +52,16 @@
   category: cargoproduct-category-name-livestock
   group: market
 
-- type: cargoProduct
-  id: LivestockDuck
-  abstract: true # Frontier
-  icon:
-    sprite: Mobs/Animals/duck.rsi
-    state: icon-0
-  product: CrateNPCDuck
-  cost: 4000
-  category: cargoproduct-category-name-livestock
-  group: market
+# - type: cargoProduct # Frontier - replaced by poultry cube crate
+#   id: LivestockDuck
+#   abstract: true # Frontier
+#   icon:
+#     sprite: Mobs/Animals/duck.rsi
+#     state: icon-0
+#   product: CrateNPCDuck
+#   cost: 4000
+#   category: cargoproduct-category-name-livestock
+#   group: market
 
 - type: cargoProduct
   id: LivestockCorgi
diff --git a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
index ab05db0521c..1f1973fd33f 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
@@ -13,7 +13,7 @@
     state: box
   - type: StaticPrice
     price: 20
-    vendPrice: 900 # Frontier - 150 per monkey (Meat worth 200)
+    vendPrice: 960 # Frontier - 120 per monkey (meat worth 540 at a depot)
 
 - type: entity
   parent: BaseItem
@@ -67,6 +67,9 @@
   - type: Sprite
     sprite: Objects/Misc/monkeycube.rsi
     state: box_variant
+  - type: StaticPrice
+    price: 20
+    vendPrice: 800 # Frontier - 120 per monkey, 80 per kobold (meat worth 450 at a depot)
 
 - type: entity
   parent: MonkeyCubeWrapped
diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_livestock.yml
index c9dde6c4d9e..192242e6ac8 100644
--- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_livestock.yml
+++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_livestock.yml
@@ -8,3 +8,13 @@
   cost: 10000
   category: cargoproduct-category-name-livestock
   group: market
+
+- type: cargoProduct
+  id: LivestockPoultryCube
+  icon:
+    sprite: _NF/Objects/Misc/monkeycube.rsi
+    state: box_poultry
+  product: CrateNPCPoultryCube
+  cost: 2000
+  category: cargoproduct-category-name-livestock
+  group: market
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/npc.yml
index 5bc092f289b..93bb8c09471 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/npc.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/npc.yml
@@ -73,3 +73,13 @@
 - type: entity
   id: PetCarrierNPCEmotionalSupportSafe
   parent: [PetCarrier, FillNPCEmotionalSupportSafe]
+
+- type: entity
+  id: CrateNPCPoultryCube
+  parent: CrateGenericSteel
+  name: poultry cube crate
+  description: A crate containing single box of poultry cubes.
+  components:
+  - type: StorageFill
+    contents:
+      - id: PoultryCubeBox
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/monkeycube.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/monkeycube.yml
new file mode 100644
index 00000000000..2c2e82ba147
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/monkeycube.yml
@@ -0,0 +1,50 @@
+- type: entity
+  parent: BoxCardboard
+  name: poultry cube box
+  id: PoultryCubeBox
+  description: Drymate brand poultry cubes, chicken and duck. Just add water!
+  components:
+  - type: StorageFill
+    contents:
+    - id: ChickenCubeWrapped
+      amount: 6
+    - id: DuckCubeWrapped
+      amount: 2
+  - type: Sprite
+    sprite: _NF/Objects/Misc/monkeycube.rsi
+    state: box_poultry
+  - type: StaticPrice
+    price: 20
+    vendPrice: 800 # Meat only worth 180 at a depot, but can produce eggs and more poultry for free
+
+- type: entity
+  parent: MonkeyCubeWrapped
+  name: chicken cube
+  suffix: Wrapped
+  id: ChickenCubeWrapped
+  description: Unwrap this to get a chicken cube.
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: ChickenCube
+    sound:
+      path: /Audio/Effects/unwrap.ogg
+  - type: Sprite
+    sprite: _NF/Objects/Misc/monkeycube.rsi
+    state: wrapper_chicken
+
+- type: entity
+  parent: MonkeyCubeWrapped
+  name: duck cube
+  suffix: Wrapped
+  id: DuckCubeWrapped
+  description: Unwrap this to get a duck cube.
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: DuckCube
+    sound:
+      path: /Audio/Effects/unwrap.ogg
+  - type: Sprite
+    sprite: _NF/Objects/Misc/monkeycube.rsi
+    state: wrapper_duck
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/rehydrateable.yml
new file mode 100644
index 00000000000..7619a0c71f7
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/rehydrateable.yml
@@ -0,0 +1,21 @@
+- type: entity
+  parent: MonkeyCube
+  id: ChickenCube
+  name: chicken cube
+  components:
+  - type: Rehydratable
+    possibleSpawns:
+    - MobChicken
+    - MobChicken1
+    - MobChicken2
+
+- type: entity
+  parent: MonkeyCube
+  id: DuckCube
+  name: duck cube
+  components:
+  - type: Rehydratable
+    possibleSpawns:
+    - MobDuckMallard
+    - MobDuckWhite
+    - MobDuckBrown
diff --git a/Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/box_poultry.png b/Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/box_poultry.png
new file mode 100644
index 0000000000000000000000000000000000000000..db43b5812c536c15d3ac027cb8d72f113dcd002a
GIT binary patch
literal 1271
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%u1Od5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tteb3LXsBRjre|nk
zYG!7rqhMrUXryldL}t2%CRV0qRz~IuP@n{~ttchUD#*nRY8Q}atCUevQedU8UtV6W
zS8lAAUzDzIXlZE)GQ-G77pOwFxH7LKu|hYmSQ%!5OKNd)QD#9&W`3Rm$i&2?{L&Iz
zC7??oUdSzg8=F@Q4JKfK=~pBc=o{)8fV>1#=<ADLX>KlDb#X~hD#E>34K5C;EJ)Q4
zN-fSWElLJPT$(b-ssbzLqSVBa{GyQj{2W*)24v)y<QHe;7brLfn<;37XXd5kmltb-
z)%*HddFB<DB<3Zjdb-#u0Zq`$%uKN|G%+@IGc$5CwJ<O;G<0=ybT%@uFg7uBH8C=^
zG_!Pq>2=9ZF3nBND}m`vf$KFkz^NCM6mkoIHoK%2WtOF;xE1B+DuBIgm5JLeE;!AD
z>P^Av79&@jdi8;h(Fa8=QbfaqfT;(>geO}d2cGa#^MI+n2$-z*=xq~YU|`Jlba4!+
zxRvzh|9|_#4oqrojBJbfBuWo7SU0pzXkwn*U3kiNXBhXn!$whOdv;v0m~uSm8ADE+
zZf7_{w2sn=vkJ@J9w>OraYWIOTi)PNvB6P3hwV2sO0^<l4qa$|cxe*X4x4=fil-Sj
zEO6WY<IbC$w(xNNhNCuWF|D6FJEbHNR6<0)vz`8PecDs@&5qL)qI+^Qed^pB&0^kP
zJuWZVb=@v;i3Q8OJ^#6uP2_F=_%+EYz=<XD?{oQjNe#Y69qWt#!@BNhBrRBR;Q5W|
z@&6ibmdF23nNjw_G*xkd&Z%<+&(HcBM7y@g9&JCt=eSMcS+QZ9*eeyM8Ao@>H02rU
zvm0LwbO<s#@=RdD(-&fw*T@`rDo~`e%qy0mh(mQ+|Ft$3%L6yo%oUt+AwhGl1cTQU
zg*OS;k9tgX;V5G1u&Z7r6qD8YdBcM(5;56AiH4Co8Kyg**f?WRPRAR8q~=*~b|sjI
j_gE!dVcf#Tz{tk1PIhlk$$D{lP*LRR>gTe~DWM4f?a;aA

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/meta.json b/Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/meta.json
new file mode 100644
index 00000000000..3f145068680
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "box_poultry edited by Arimah from monkeycubebox from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi. wrapper_chicken and wrapper_duck made by Stagnation for Frontier Station 14.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "box_poultry"
+    },
+    {
+      "name": "wrapper_chicken"
+    },
+    {
+      "name": "wrapper_duck"
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/wrapper_chicken.png b/Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/wrapper_chicken.png
new file mode 100644
index 0000000000000000000000000000000000000000..a320eac82580c7ef59a333a034db8c2d88640268
GIT binary patch
literal 324
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;6JY5_^BHWWDSQjUV^fUz;EIDYyd-=Zt&(le)5(`Z{6OuO@-?+5h+rIIq
zf`ZK1;}7C@Pfz(gV}Z#<hP0g<T9jt24_m{(P3B1Z$%#xJWe29O-+$oCZSn61r!_Np
zym@$cHc$Aw{p_DT8C9$qSpH;vYtUu2WJ>wi93Fo#!m&qsRa1pS(VV~RP0i`=nr`}E
zS6dXplN5g5+I`YY73+k|R$YsEl{;=8s0r|B&}m}~l65E&aVeK!i)QfVKG6_zT9a+T
zg$!S#MJr_B&cDRS%*+s7A2M??mlrqCe|)JCo@u_m3|c@o2M~k6rQpdR%G1@)Wt~$(
F69D`fb0h!&

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/wrapper_duck.png b/Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/wrapper_duck.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8909a6433ecbbb254c17a10f572ddf3590eb143
GIT binary patch
literal 314
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6<1JY5_^BHWWDSQjUV^fUz;EIIh|^Yj1B22;Gn5?U^)FwR)IXV0F5f6vd)
zKe%P#LdBEMCaz&jvD|g^L`{(FL6)VRZ1?xoGDm;;^wfL9QH7ev$9N6?zr4IWAoK|H
zBv}TgUqX`)n4D3Z!Z1lTVWmlX<HH}R8vR8Mo0$9VdnfK#VIh5LvCM=w4B6S)ZUI&f
z?C<aIPyg`o<HB0KA92fA&Nb!tYZ=<S$zqAlxnS4m`0Rz;q_axW2V@u*B}(WR3M4q_
z%0rx;$RHuXaQI)S&BMA)-+{j3OO5bM^YvxW0<t-P7z8c_PX<w*u6{1-oD!M<jFES-

literal 0
HcmV?d00001


From 71f0872076fe696f3a1bc04b0247222d0d99feb7 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Sun, 11 Aug 2024 19:54:58 +0000
Subject: [PATCH 04/15] Automatic Changelog (#1847)

---
 Resources/Changelog/Changelog.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index eed385fd271..4ad3bb7b975 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6199,3 +6199,13 @@ Entries:
       message: NFSD and Security intercoms can no longer be disassembled.
   id: 5188
   time: '2024-08-11T19:53:26.0000000+00:00'
+- author: arimah
+  changes:
+    - type: Add
+      message: >-
+        You can now find poultry cube crates in cargo, with six chicken cubes
+        and two duck cubes. Just unwrap and add water!
+    - type: Remove
+      message: Chicken and duck crates are no longer available for purchase.
+  id: 5189
+  time: '2024-08-11T19:54:33.0000000+00:00'

From 42916744eec2879af8a923a6cfd697f0a1557b55 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Sun, 11 Aug 2024 22:53:56 -0400
Subject: [PATCH 05/15] Add Paradise fire extinguisher with attribution (#1851)

---
 .../Catalog/Cargo/cargo_emergency.yml         |   2 +-
 .../Objects/Misc/fire_extinguisher.yml        |   4 +--
 .../Construction/Graphs/furniture/altars.yml  |   2 +-
 .../fire_extinguisher_closed.png              | Bin 0 -> 303 bytes
 .../fire_extinguisher_open.png                | Bin 0 -> 315 bytes
 .../fire_extinguisher.rsi/inhand-left.png     | Bin 0 -> 284 bytes
 .../fire_extinguisher.rsi/inhand-right.png    | Bin 0 -> 326 bytes
 .../Misc/fire_extinguisher.rsi/meta.json      |  26 ++++++++++++++++++
 8 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_closed.png
 create mode 100644 Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_open.png
 create mode 100644 Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/inhand-left.png
 create mode 100644 Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/inhand-right.png
 create mode 100644 Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/meta.json

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
index d5ecc285ceb..66db9df98f6 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
@@ -13,7 +13,7 @@
   id: EmergencyFire
   abstract: true # Frontier
   icon:
-    sprite: Objects/Misc/fire_extinguisher.rsi
+    sprite: _NF/Objects/Misc/fire_extinguisher.rsi # Frontier
     state: fire_extinguisher_closed
   product: CrateEmergencyFire
   cost: 1500
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
index 89b421c97d4..0e1bf5d43e9 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -5,12 +5,12 @@
   description: It extinguishes fires.
   components:
   - type: Sprite
-    sprite: Objects/Misc/fire_extinguisher.rsi
+    sprite: _NF/Objects/Misc/fire_extinguisher.rsi # Frontier
     layers:
     - state: fire_extinguisher_closed
       map: [ "enum.ToggleVisuals.Layer" ]
   - type: Item
-    sprite: Objects/Misc/fire_extinguisher.rsi
+    sprite: _NF/Objects/Misc/fire_extinguisher.rsi # Frontier
     size: Normal
   - type: SolutionContainerManager
     solutions:
diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/altars.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/altars.yml
index 7f99133ca5c..0fe0c34b382 100644
--- a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/altars.yml
+++ b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/altars.yml
@@ -66,7 +66,7 @@
         name: fire extinguisher
         store: altar_component
         icon:
-          sprite: Objects/Misc/fire_extinguisher.rsi
+          sprite: _NF/Objects/Misc/fire_extinguisher.rsi # Frontier
           state: fire_extinguisher_closed
       - component: ExtinguishOnInteract # Not exclusive to candles I believe, but it's something that narrows down the list
         name: candle (any)
diff --git a/Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_closed.png b/Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..b84389a06bd18e2ef60cf5e4bc94fde649b421bf
GIT binary patch
literal 303
zcmV+~0nq-5P)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw0000yP)t-s>h%44
zdwb>O<+irASy@>&H#$*NRW~;`At5GD0UV44BI$H=x&;NL007xIIOa`FiHC=UiIls+
z$>iti!sI6h00001bW%=J06^y0W&i*Hp-DtRR5*>b($NmXAP5Ces3Kz3t@{7}I@;}R
zVv{!I^`2Zv6yTvjJc*YX(0FnFB%b7xn25kTyPZM^j1CdUf&#_J=>6h&xPw9jU}o=7
zdj{kHB1w&?_`hTavgTY$siKNUH%MOBT5A#GN(C=%$kzeIDcCD+19}>S_Xz;leqb{}
zJ3upmwAOoX&0Hb*0QL>@xA=<vKiIj7l+rA}G9QYM3CE9d_ALMa002ovPDHLkV1gtk
BevbeE

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_open.png b/Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..0cf52827fca440fc3ec9a0d956ea5e53e86f2176
GIT binary patch
literal 315
zcmV-B0mS}^P)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw0000yP)t-s>h%44
zdwb>O<+irASy@>&H##>rH&IkoAt5GD0UV44BI$H=x&;NL007xIIOa`FiHC=UiIls+
z$>itiGCWwu00001bW%=J06^y0W&i*Htw}^dR5*>b(%lZjAP5Cuse;A7t@i!jb!d07
zWTMHMaeKbt3DKB84ZtGaW<cW2x<x$6=dp2ivK<i#EC471z4rvpZI*^_pvQeDB4<JN
z3<&z&80H{`MSM4DfMZHI=fa|B2vUrtl+5Ff4LoE+8iLkw0b0i!pueC1FDJfo1w7@%
zSFQlLu#C~c$1K6|28Rl22UP`J>v^8FPC9gOqoj!TAM{*A2w|50GA|%_3Obz{x$^)3
N002ovPDHLkV1iTDfUN)k

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb697da3566cbff8c83c5fb85a8fd37c93211b3c
GIT binary patch
literal 284
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k3C%+Ln`LHy|t0|kbyw!L-uLa
z-x4&-JUqQm3-vtoosf~a>BvO^LB$C&H8<S;%%7rHwR6rKlX4-TRuB-elHGQ#_}-mc
z)&&#Z)a=Zf;M4zFSncGzPruAOrX_7LWRZ5>5P8wNd%I@-DKEoY=CdBuG2M&M++VT#
ze!S~iHjkhBp>Llq-NpMth&LnFA^Y9^+kgCPOHO=0#|$x_fnopJl==guMqBRZo=MbK
z2(SOm%va60^UgQ+JAMvbAFm#s{)Y8Q(Ovl!hB9C0J>U84@86OcY+Ljem~MZ+@~X`I
czl;k`@Y-kuSKmF&c@AWxr>mdKI;Vst0LVXiZvX%Q

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..e06a534c249a612e6885170923ec12052bd1726d
GIT binary patch
literal 326
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z89ZGaLn`LH
zy=BPP<RH@W(DBZ_>I%*G4w>1fRrj>sIdbIMF>QfQIvi~p31Z=4PyP#WJ2gCH-9B?F
z&>#?aaPs4Ztv4iVemsfgon!1d&9iJ@%+#yL?cZzWfBu|y_H15e)^?Mvhb(`8RZN*A
zdd}8p`=@Wu-u+_o3Hmg(<)g|gNvG=!|K2{8p8MW(3!4rTbBC<Lw(bAFe>*k*d_wJv
z=s1Wi3=Gc_@~YW>^<=d<m41+us}}vX+xO1F{+AEzzibLud~(*gta-2OA9kznS|aCI
ztNmUSnUsis|C*Qo@vQ;a$gS^LcTQQM^Y)6}JO@41RjaB#u3n`n$EkBrw&H!{$#os>
Q`XGxuUHx3vIVCg!0Jvd|4*&oF

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/meta.json b/Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/meta.json
new file mode 100644
index 00000000000..6f4150e8f7c
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation at commit 9bebd81ae0b0a7f952b59886a765c681205de31f",
+  "copyright": "fire_extinguisher_open, fire_extinguisher_open taken from Paradise at commit https://github.com/ParadiseSS13/Paradise/commit/fd1e9ec033f1af410bb31e883ce0b19902d305c3",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "fire_extinguisher_open"
+    },
+    {
+      "name": "fire_extinguisher_closed"
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    }
+  ]
+}

From 5afd8c53c0a886b95c2f593a3879fc07ba53fc10 Mon Sep 17 00:00:00 2001
From: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com>
Date: Mon, 12 Aug 2024 21:11:25 +0200
Subject: [PATCH 06/15] Add currency notation (#1768)

* Implement currency string notation

* Darin fix

* Update Resources/Locale/en-US/_NF/store/uplink-catalog.ftl

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

* Update Resources/Prototypes/_NF/Catalog/Fills/Items/briefcases.yml

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

* Update Content.Client/Cargo/UI/CargoConsoleMenu.xaml

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

* Update Resources/Changelog/Changelog.yml

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

* Update Resources/Prototypes/_NF/Catalog/Fills/Items/briefcases.yml

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

* Update Resources/Prototypes/_NF/Catalog/Fills/Items/briefcases.yml

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

* Update Resources/Prototypes/_NF/Catalog/Fills/Items/briefcases.yml

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

* Update Resources/Prototypes/_NF/Catalog/Fills/Items/briefcases.yml

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

* Currency-specific conversion functions

---------

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
Co-authored-by: Whatstone <whatston3@gmail.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: Checkraze <71046427+Cheackraze@users.noreply.github.com>
---
 Content.Client/Bank/UI/BankATMMenu.xaml.cs    |  7 +-
 .../Bank/UI/StationBankATMMenu.xaml.cs        |  7 +-
 Content.Client/Bank/UI/WithdrawBankATMMenu.cs |  5 +-
 Content.Client/Cargo/UI/BountyEntry.xaml.cs   |  3 +-
 Content.Client/Cargo/UI/CargoConsoleMenu.xaml |  2 +-
 .../Cargo/UI/CargoConsoleMenu.xaml.cs         |  7 +-
 .../Cargo/UI/CargoPalletMenu.xaml.cs          |  3 +-
 .../Lobby/UI/Loadouts/LoadoutWindow.xaml.cs   |  6 +-
 Content.Client/PDA/PdaMenu.xaml.cs            |  5 +-
 .../Shipyard/UI/ShipyardConsoleMenu.xaml.cs   |  9 ++-
 Content.Client/Store/Ui/StoreMenu.xaml.cs     |  3 +-
 .../Store/Ui/StoreWithdrawWindow.xaml.cs      |  3 +-
 .../UI/VendingMachineMenu.xaml.cs             |  9 ++-
 .../BountyContractUiFragmentListEntry.xaml.cs |  4 +-
 .../UI/ContrabandPalletMenu.xaml.cs           |  4 +-
 .../_NF/Pirate/UI/PirateBountyEntry.xaml.cs   |  3 +-
 .../Cargo/Systems/CargoSystem.Bounty.cs       |  3 +-
 .../_NF/Cargo/CargoSystem.PirateBounty.cs     |  5 +-
 .../Preferences/HumanoidCharacterProfile.cs   | 12 +--
 .../_NF/Bank/BankSystemExtensions.cs          | 80 +++++++++++++++++++
 Resources/Changelog/Changelog.yml             | 12 +--
 .../en-US/_NF/bank/bank-ATM-component.ftl     |  2 -
 .../Locale/en-US/_NF/loadouts/loadouts.ftl    |  4 +-
 .../humanoid-character-profile.ftl            |  2 -
 .../shipyard/shipyard-console-component.ftl   |  1 -
 .../Locale/en-US/_NF/store/uplink-catalog.ftl |  2 +-
 .../en-US/cargo/cargo-bounty-console.ftl      |  4 +-
 .../en-US/cargo/cargo-console-component.ftl   |  1 -
 .../_NF/Catalog/Fills/Items/briefcases.yml    | 10 +--
 29 files changed, 154 insertions(+), 64 deletions(-)
 create mode 100644 Content.Shared/_NF/Bank/BankSystemExtensions.cs
 delete mode 100644 Resources/Locale/en-US/_NF/preferences/humanoid-character-profile.ftl

diff --git a/Content.Client/Bank/UI/BankATMMenu.xaml.cs b/Content.Client/Bank/UI/BankATMMenu.xaml.cs
index e60d878fa85..d72ab5315d9 100644
--- a/Content.Client/Bank/UI/BankATMMenu.xaml.cs
+++ b/Content.Client/Bank/UI/BankATMMenu.xaml.cs
@@ -4,6 +4,7 @@
  * See AGPLv3.txt for details.
  */
 using Content.Client.UserInterface.Controls;
+using Content.Shared._NF.Bank;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
@@ -27,14 +28,14 @@ public BankATMMenu()
 
     public void SetBalance(int amount)
     {
-        BalanceLabel.Text = Loc.GetString("bank-atm-menu-cash-amount", ("amount", amount.ToString()));
+        BalanceLabel.Text = BankSystemExtensions.ToSpesoString(amount);
     }
 
     public void SetDeposit(int amount)
     {
         DepositButton.Disabled = amount <= 0;
         if (amount >= 0) // Valid
-            DepositLabel.Text = Loc.GetString("bank-atm-menu-cash-amount", ("amount", amount.ToString()));
+            DepositLabel.Text = BankSystemExtensions.ToSpesoString(amount);
         else
             DepositLabel.Text = Loc.GetString("bank-atm-menu-cash-error");
     }
@@ -59,6 +60,6 @@ private void OnAmountChanged(LineEdit.LineEditEventArgs args)
         if (int.TryParse(args.Text, out var amount))
         {
             Amount = amount;
-        }    
+        }
     }
 }
diff --git a/Content.Client/Bank/UI/StationBankATMMenu.xaml.cs b/Content.Client/Bank/UI/StationBankATMMenu.xaml.cs
index bbc0e9a55d2..bee11b750fb 100644
--- a/Content.Client/Bank/UI/StationBankATMMenu.xaml.cs
+++ b/Content.Client/Bank/UI/StationBankATMMenu.xaml.cs
@@ -4,6 +4,7 @@
  * See AGPLv3.txt for details.
  */
 using Content.Client.UserInterface.Controls;
+using Content.Shared._NF.Bank;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
@@ -41,14 +42,14 @@ private void OnReasonSelected(OptionButton.ItemSelectedEventArgs args)
     }
     public void SetBalance(int amount)
     {
-        BalanceLabel.Text = Loc.GetString("bank-atm-menu-cash-amount", ("amount", amount.ToString()));
+        BalanceLabel.Text = BankSystemExtensions.ToSpesoString(amount);
     }
 
     public void SetDeposit(int amount)
     {
         DepositButton.Disabled = amount <= 0;
         if (amount >= 0) // Valid
-            DepositLabel.Text = Loc.GetString("bank-atm-menu-cash-amount", ("amount", amount.ToString()));
+            DepositLabel.Text = BankSystemExtensions.ToSpesoString(amount);
         else
             DepositLabel.Text = Loc.GetString("bank-atm-menu-cash-error");
     }
@@ -74,7 +75,7 @@ private void OnAmountChanged(LineEdit.LineEditEventArgs args)
         if (int.TryParse(args.Text, out var amount))
         {
             Amount = amount;
-        }    
+        }
     }
 
     private void OnDescChanged(LineEdit.LineEditEventArgs args)
diff --git a/Content.Client/Bank/UI/WithdrawBankATMMenu.cs b/Content.Client/Bank/UI/WithdrawBankATMMenu.cs
index 4a5cbd41a55..78f61ec94e5 100644
--- a/Content.Client/Bank/UI/WithdrawBankATMMenu.cs
+++ b/Content.Client/Bank/UI/WithdrawBankATMMenu.cs
@@ -4,6 +4,7 @@
  * See AGPLv3.txt for details.
  */
 using Content.Client.UserInterface.Controls;
+using Content.Shared._NF.Bank;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
@@ -26,7 +27,7 @@ public WithdrawBankATMMenu()
 
     public void SetBalance(int amount)
     {
-        BalanceLabel.Text = Loc.GetString("bank-atm-menu-cash-amount", ("amount", amount.ToString()));
+        BalanceLabel.Text = BankSystemExtensions.ToSpesoString(amount);
     }
 
     public void SetEnabled(bool enabled)
@@ -44,6 +45,6 @@ private void OnAmountChanged(LineEdit.LineEditEventArgs args)
         if (int.TryParse(args.Text, out var amount))
         {
             Amount = amount;
-        }    
+        }
     }
 }
diff --git a/Content.Client/Cargo/UI/BountyEntry.xaml.cs b/Content.Client/Cargo/UI/BountyEntry.xaml.cs
index 027d7b3e801..acc6aa36548 100644
--- a/Content.Client/Cargo/UI/BountyEntry.xaml.cs
+++ b/Content.Client/Cargo/UI/BountyEntry.xaml.cs
@@ -1,4 +1,5 @@
 using Content.Client.Message;
+using Content.Shared._NF.Bank;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Prototypes;
 using Content.Shared.Random;
@@ -40,7 +41,7 @@ public BountyEntry(CargoBountyData bounty, TimeSpan untilNextSkip)
                 ("item", Loc.GetString(entry.Name))));
         }
         ManifestLabel.SetMarkup(Loc.GetString("bounty-console-manifest-label", ("item", string.Join(", ", items))));
-        RewardLabel.SetMarkup(Loc.GetString("bounty-console-reward-label", ("reward", bountyPrototype.Reward)));
+        RewardLabel.SetMarkup(Loc.GetString("bounty-console-reward-label", ("reward", BankSystemExtensions.ToSpesoString(bountyPrototype.Reward)))); // Frontier: bountyPrototype.Reward<BankSystemExtensions.ToSpesoString(bountyPrototype.Reward)
         DescriptionLabel.SetMarkup(Loc.GetString("bounty-console-description-label", ("description", Loc.GetString(bountyPrototype.Description))));
         IdLabel.SetMarkup(Loc.GetString("bounty-console-id-label", ("id", bounty.Id)));
 
diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
index dd7a9f110ca..bb59b2b0a86 100644
--- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
@@ -14,7 +14,7 @@
             <Label Text="{Loc 'cargo-console-menu-points-label'}"
                    StyleClasses="LabelKeyText" />
             <Label Name="PointsLabel"
-                   Text="$0" />
+                   Text="-" /> <!-- Frontier: "$0"<"-" -->
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc 'cargo-console-menu-order-capacity-label'}"
diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
index e60335bc45c..0a227dd7ea9 100644
--- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Client.UserInterface.Controls;
+using Content.Shared._NF.Bank;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Components;
 using Content.Shared.Cargo.Prototypes;
@@ -100,7 +101,7 @@ public void PopulateProducts()
                         Product = prototype,
                         ProductName = { Text = prototype.Name },
                         MainButton = { ToolTip = prototype.Description },
-                        PointCost = { Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", prototype.Cost.ToString())) },
+                        PointCost = { Text = BankSystemExtensions.ToSpesoString(prototype.Cost) }, // Frontier: 
                         Icon = { Texture = _spriteSystem.Frame0(prototype.Icon) },
                     };
                     button.MainButton.OnPressed += args =>
@@ -189,10 +190,10 @@ public void UpdateCargoCapacity(int count, int capacity)
             ShuttleCapacityLabel.Text = $"{count}/{capacity}";
         }
 
-        public void UpdateBankData(string name, int points)
+        public void UpdateBankData(string name, int bankBalance)
         {
             AccountNameLabel.Text = name;
-            PointsLabel.Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", points.ToString()));
+            PointsLabel.Text = BankSystemExtensions.ToSpesoString(bankBalance);
         }
     }
 }
diff --git a/Content.Client/Cargo/UI/CargoPalletMenu.xaml.cs b/Content.Client/Cargo/UI/CargoPalletMenu.xaml.cs
index 3ac0117dc70..1364452c234 100644
--- a/Content.Client/Cargo/UI/CargoPalletMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoPalletMenu.xaml.cs
@@ -1,4 +1,5 @@
 using Content.Client.UserInterface.Controls;
+using Content.Shared._NF.Bank;
 using Content.Shared.Cargo;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
@@ -21,7 +22,7 @@ public CargoPalletMenu()
 
     public void SetAppraisal(int amount)
     {
-        AppraisalLabel.Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", amount.ToString()));
+        AppraisalLabel.Text = BankSystemExtensions.ToSpesoString(amount);
     }
 
     public void SetCount(int count)
diff --git a/Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs b/Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
index 9902dd1836d..30c92ff26eb 100644
--- a/Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
+++ b/Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
@@ -1,4 +1,5 @@
 using Content.Client.UserInterface.Controls;
+using Content.Shared._NF.Bank;
 using Content.Shared.Preferences;
 using Content.Shared.Preferences.Loadouts;
 using Robust.Client.AutoGenerated;
@@ -51,7 +52,7 @@ public LoadoutWindow(HumanoidCharacterProfile profile, RoleLoadout loadout, Role
         CalculateLoadoutCost(loadout, collection);
         // Frontier - update bank balance label text - value should not change.
         Balance.Margin = new Thickness(5, 2, 5, 5);
-        Balance.Text = Loc.GetString("frontier-loadout-balance", ("balance", Profile.BankBalance));
+        Balance.Text = Loc.GetString("frontier-loadout-balance", ("balance", BankSystemExtensions.ToSpesoString(Profile.BankBalance)));
     }
 
     public void RefreshLoadouts(RoleLoadout loadout, ICommonSession session, IDependencyCollection collection)
@@ -85,6 +86,7 @@ private void CalculateLoadoutCost(RoleLoadout loadout, IDependencyCollection col
         }
 
         Cost.Margin = new Thickness(5, 2, 5, 5);
-        Cost.Text = Loc.GetString("frontier-loadout-cost", ("cost", cost));
+        Cost.Text = Loc.GetString("frontier-loadout-cost", ("cost", BankSystemExtensions.ToSpesoString(cost)));
     }
+    // End Frontier
 }
diff --git a/Content.Client/PDA/PdaMenu.xaml.cs b/Content.Client/PDA/PdaMenu.xaml.cs
index c53a33ee45c..39a6c7a2ba5 100644
--- a/Content.Client/PDA/PdaMenu.xaml.cs
+++ b/Content.Client/PDA/PdaMenu.xaml.cs
@@ -3,6 +3,7 @@
 using Robust.Shared.Utility;
 using Content.Shared.CartridgeLoader;
 using Content.Client.Message;
+using Content.Shared._NF.Bank;
 using Robust.Client.UserInterface;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
@@ -139,7 +140,7 @@ public PdaMenu()
                 _clipboard.SetText(_instructions);
             };
 
-            
+
 
 
             HideAllViews();
@@ -175,7 +176,7 @@ public void UpdateState(PdaUpdateState state)
             StationNameLabel.SetMarkup(Loc.GetString("comp-pda-ui-station",
                 ("station", _stationName)));
 
-            _balance = state.Balance.ToString(); // Frontier
+            _balance = BankSystemExtensions.ToSpesoString(state.Balance); // Frontier
             BalanceLabel.SetMarkup(Loc.GetString("comp-pda-ui-balance", ("balance", _balance))); // Frontier
 
             _shuttleDeed = state.OwnedShipName ?? ""; // Frontier
diff --git a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs b/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs
index 091985b3293..6cf03f61b73 100644
--- a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs
+++ b/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using Content.Client.UserInterface.Controls;
 using Content.Client.Shipyard.BUI;
+using Content.Shared._NF.Bank;
 using Content.Shared.Shipyard.BUI;
 using Content.Shared.Shipyard.Prototypes;
 using Robust.Client.AutoGenerated;
@@ -85,7 +86,7 @@ public void PopulateProducts(List<string> prototypes, string type, bool free)
                 if (_freeListings)
                     priceText = Loc.GetString("shipyard-console-menu-listing-free");
                 else
-                    priceText = Loc.GetString("shipyard-console-menu-listing-amount", ("amount", prototype!.Price.ToString()));
+                    priceText = BankSystemExtensions.ToSpesoString(prototype!.Price);
 
                 var vesselEntry = new VesselRow
                 {
@@ -132,12 +133,12 @@ public void PopulateCategories()
 
     public void UpdateState(ShipyardConsoleInterfaceState state)
     {
-        BalanceLabel.Text = Loc.GetString("shipyard-console-menu-listing-amount", ("amount", state.Balance.ToString()));
-        int shipPrice = 0;
+        BalanceLabel.Text = BankSystemExtensions.ToSpesoString(state.Balance);
+        var shipPrice = 0;
         if (!state.FreeListings)
             shipPrice = state.ShipSellValue;
 
-        ShipAppraisalLabel.Text = Loc.GetString("shipyard-console-menu-listing-amount", ("amount", shipPrice.ToString()));
+        ShipAppraisalLabel.Text = BankSystemExtensions.ToSpesoString(shipPrice);
         SellShipButton.Disabled = state.ShipDeedTitle == null;
         TargetIdButton.Text = state.IsTargetIdPresent
             ? Loc.GetString("id-card-console-window-eject-button")
diff --git a/Content.Client/Store/Ui/StoreMenu.xaml.cs b/Content.Client/Store/Ui/StoreMenu.xaml.cs
index 388b31291c1..a851471c462 100644
--- a/Content.Client/Store/Ui/StoreMenu.xaml.cs
+++ b/Content.Client/Store/Ui/StoreMenu.xaml.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using Content.Client.Actions;
 using Content.Client.Message;
+using Content.Shared._NF.Bank;
 using Content.Shared.FixedPoint;
 using Content.Shared.Store;
 using Robust.Client.AutoGenerated;
@@ -52,7 +53,7 @@ public void UpdateBalance(Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> ba
         var balanceStr = string.Empty;
         foreach (var ((_, amount), proto) in currency)
         {
-            balanceStr += Loc.GetString("store-ui-balance-display", ("amount", amount),
+            balanceStr += Loc.GetString("store-ui-balance-display", ("amount", BankSystemExtensions.ToIndependentString((int) amount)), // Frontier: amount<BankSystemExtensions.GetIndependentString((int)amount)
                 ("currency", Loc.GetString(proto.DisplayName, ("amount", 1))));
         }
 
diff --git a/Content.Client/Store/Ui/StoreWithdrawWindow.xaml.cs b/Content.Client/Store/Ui/StoreWithdrawWindow.xaml.cs
index 79368557562..dd817b280db 100644
--- a/Content.Client/Store/Ui/StoreWithdrawWindow.xaml.cs
+++ b/Content.Client/Store/Ui/StoreWithdrawWindow.xaml.cs
@@ -2,6 +2,7 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
+using Content.Shared._NF.Bank; // Frontier
 using Content.Shared.FixedPoint;
 using Content.Shared.Store;
 using Robust.Client.UserInterface.Controls;
@@ -52,7 +53,7 @@ public void CreateCurrencyButtons(Dictionary<ProtoId<CurrencyPrototype>, FixedPo
                 Id = currency.Value.ID,
                 Amount = currency.Key,
                 MinHeight = 20,
-                Text = Loc.GetString("store-withdraw-button-ui", ("currency",Loc.GetString(currency.Value.DisplayName, ("amount", currency.Key)))),
+                Text = Loc.GetString("store-withdraw-button-ui", ("currency",Loc.GetString(currency.Value.DisplayName, ("amount", BankSystemExtensions.ToIndependentString((int) currency.Key))))), // Frontier: currency.Key -> BankSystemExtensions.GetIndendependentString((int) currency.Key)
             };
             button.Disabled = false;
             button.OnPressed += args =>
diff --git a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
index eec26dbecd7..1d4b37e59c7 100644
--- a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
+++ b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
@@ -7,6 +7,7 @@
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
+using Content.Shared._NF.Bank; // Frontier
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
 using Content.Shared.Chemistry.Components.SolutionManager;
@@ -198,9 +199,9 @@ public void Populate(List<VendingMachineInventoryEntry> inventory, float priceMo
                 // New Frontiers - Unlimited vending - support items with unlimited vending stock.
                 // This code is licensed under AGPLv3. See AGPLv3.txt
                 if (entry.Amount != uint.MaxValue)
-                    vendingItem.Text = $"[${cost}] {itemName} [{entry.Amount}]";
+                    vendingItem.Text = $"[{BankSystemExtensions.ToSpesoString(cost)}] {itemName} [{entry.Amount}]";
                 else
-                    vendingItem.Text = $"[${cost}] {itemName}";
+                    vendingItem.Text = $"[{BankSystemExtensions.ToSpesoString(cost)}] {itemName}";
                 // End of modified code
                 vendingItem.Icon = icon;
                 filteredInventory.Add(i);
@@ -209,10 +210,12 @@ public void Populate(List<VendingMachineInventoryEntry> inventory, float priceMo
             SetSizeAfterUpdate(longestEntry.Length, inventory.Count);
         }
 
+        // Frontier
         public void UpdateBalance(int balance)
         {
-            BalanceLabel.Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", balance.ToString()));
+            BalanceLabel.Text = BankSystemExtensions.ToSpesoString(balance);
         }
+        // End Frontier
 
         private void SetSizeAfterUpdate(int longestEntryLength, int contentCount)
         {
diff --git a/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListEntry.xaml.cs b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListEntry.xaml.cs
index 5cce35dcdcc..f988c050917 100644
--- a/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListEntry.xaml.cs
+++ b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListEntry.xaml.cs
@@ -1,3 +1,4 @@
+using Content.Shared._NF.Bank;
 using Content.Shared._NF.BountyContracts;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
@@ -33,8 +34,7 @@ public BountyContractUiFragmentListEntry(BountyContract contract, bool canRemove
         }
 
         // bounty reward
-        BountyReward.Text = Loc.GetString("cargo-console-menu-points-amount",
-            ("amount", contract.Reward.ToString()));
+        BountyReward.Text = BankSystemExtensions.ToSpesoString(contract.Reward);
 
         // remove button
         RemoveButton.OnPressed += _ => OnRemoveButtonPressed?.Invoke(contract);
diff --git a/Content.Client/_NF/Contraband/UI/ContrabandPalletMenu.xaml.cs b/Content.Client/_NF/Contraband/UI/ContrabandPalletMenu.xaml.cs
index 6c4ab735b2f..a9fb833ffc0 100644
--- a/Content.Client/_NF/Contraband/UI/ContrabandPalletMenu.xaml.cs
+++ b/Content.Client/_NF/Contraband/UI/ContrabandPalletMenu.xaml.cs
@@ -1,4 +1,5 @@
 using Content.Client.UserInterface.Controls;
+using Content.Shared._NF.Bank;
 using Content.Shared._NF.Contraband.Components;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
@@ -37,7 +38,8 @@ public ContrabandPalletMenu(string locPrefix)
 
     public void SetAppraisal(int amount)
     {
-        AppraisalLabel.Text = Loc.GetString($"{_locPrefix}contraband-console-menu-points-amount", ("amount", amount.ToString()));
+        // TODO: switch currency function by currency in component
+        AppraisalLabel.Text = Loc.GetString($"{_locPrefix}contraband-console-menu-points-amount", ("amount", BankSystemExtensions.ToIndependentString(amount)));
     }
 
     public void SetCount(int count)
diff --git a/Content.Client/_NF/Pirate/UI/PirateBountyEntry.xaml.cs b/Content.Client/_NF/Pirate/UI/PirateBountyEntry.xaml.cs
index 0890ba05030..9252958213b 100644
--- a/Content.Client/_NF/Pirate/UI/PirateBountyEntry.xaml.cs
+++ b/Content.Client/_NF/Pirate/UI/PirateBountyEntry.xaml.cs
@@ -6,6 +6,7 @@
 using Robust.Client.AutoGenerated;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
+using Content.Shared._NF.Bank;
 
 namespace Content.Client._NF.Pirate.UI;
 
@@ -46,7 +47,7 @@ public PirateBountyEntry(PirateBountyData bounty, TimeSpan untilNextSkip)
                 ("item", Loc.GetString(entry.Name))));
         }
         ManifestLabel.SetMarkup(Loc.GetString("pirate-bounty-console-manifest-label", ("item", string.Join(", ", items))));
-        RewardLabel.SetMarkup(Loc.GetString("pirate-bounty-console-reward-label", ("reward", bountyPrototype.Reward)));
+        RewardLabel.SetMarkup(Loc.GetString("pirate-bounty-console-reward-label", ("reward", BankSystemExtensions.ToIndependentString(bountyPrototype.Reward))));
         DescriptionLabel.SetMarkup(Loc.GetString("pirate-bounty-console-description-label", ("description", Loc.GetString(bountyPrototype.Description))));
         IdLabel.SetMarkup(Loc.GetString("pirate-bounty-console-id-label", ("id", bounty.Id)));
 
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
index 4cbf2e63be8..d6a886f1c65 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
@@ -4,6 +4,7 @@
 using Content.Server.Labels;
 using Content.Server.NameIdentifier;
 using Content.Server.Paper;
+using Content.Shared._NF.Bank;
 using Content.Shared.Access.Components;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Components;
@@ -124,7 +125,7 @@ public void SetupBountyLabel(EntityUid uid, EntityUid stationId, CargoBountyData
                 ("item", Loc.GetString(entry.Name)))}");
             msg.PushNewline();
         }
-        msg.AddMarkup(Loc.GetString("bounty-console-manifest-reward", ("reward", prototype.Reward)));
+        msg.AddMarkup(Loc.GetString("bounty-console-manifest-reward", ("reward", BankSystemExtensions.ToSpesoString(prototype.Reward))));
         _paperSystem.SetContent(uid, msg.ToMarkup(), paper);
     }
 
diff --git a/Content.Server/_NF/Cargo/CargoSystem.PirateBounty.cs b/Content.Server/_NF/Cargo/CargoSystem.PirateBounty.cs
index 4c2d0ed0650..cbba0c2489d 100644
--- a/Content.Server/_NF/Cargo/CargoSystem.PirateBounty.cs
+++ b/Content.Server/_NF/Cargo/CargoSystem.PirateBounty.cs
@@ -4,6 +4,7 @@
 using Content.Server._NF.Pirate.Components;
 using Content.Server.Labels;
 using Content.Server.Paper;
+using Content.Shared._NF.Bank;
 using Content.Shared._NF.Pirate;
 using Content.Shared._NF.Pirate.Components;
 using Content.Shared._NF.Pirate.Prototypes;
@@ -141,7 +142,7 @@ private void SetupPirateBountyChest(EntityUid uid, PirateBountyData bounty, Pira
                 ("item", Loc.GetString(entry.Name)))}", out var _);
         }
         message.PushNewline();
-        message.TryAddMarkup(Loc.GetString("pirate-bounty-console-manifest-reward", ("reward", prototype.Reward)), out var _);
+        message.TryAddMarkup(Loc.GetString("pirate-bounty-console-manifest-reward", ("reward", BankSystemExtensions.ToDoubloonString(prototype.Reward))), out var _);
 
         _metaSystem.SetEntityDescription(uid, message.ToMarkup());
 
@@ -168,7 +169,7 @@ private void SetupPirateBountyManifest(EntityUid uid, PirateBountyData bounty, P
                 ("item", Loc.GetString(entry.Name)))}", out var _);
             msg.PushNewline();
         }
-        msg.TryAddMarkup(Loc.GetString("pirate-bounty-console-manifest-reward", ("reward", prototype.Reward)), out var _);
+        msg.TryAddMarkup(Loc.GetString("pirate-bounty-console-manifest-reward", ("reward", BankSystemExtensions.ToDoubloonString(prototype.Reward))), out var _);
         _paperSystem.SetContent(uid, msg.ToMarkup(), paper);
     }
 
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index e2841671538..8fa3996f2d9 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using System.Text.RegularExpressions;
+using Content.Shared._NF.Bank;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
 using Content.Shared.Humanoid;
@@ -91,7 +92,7 @@ public sealed partial class HumanoidCharacterProfile : ICharacterProfile
 
         [DataField]
         public Gender Gender { get; private set; } = Gender.Male;
- 
+
         [DataField] // Frontier: Bank balance
         public int BankBalance { get; private set; } = DefaultBalance; // Frontier: Bank balance
 
@@ -470,13 +471,8 @@ public HumanoidCharacterProfile WithoutTraitPreference(ProtoId<TraitPrototype> t
                 ("age", Age)
             );
 
-        // Frontier: bank balance text
-        public string BankBalanceText =>
-            Loc.GetString(
-                "humanoid-character-profile-bankbalance",
-                ("bankBalance", BankBalance)
-            );
-        // End Frontier
+        // Frontier
+        public string BankBalanceText => BankSystemExtensions.ToSpesoString(BankBalance);
 
         public bool MemberwiseEquals(ICharacterProfile maybeOther)
         {
diff --git a/Content.Shared/_NF/Bank/BankSystemExtensions.cs b/Content.Shared/_NF/Bank/BankSystemExtensions.cs
new file mode 100644
index 00000000000..10499785542
--- /dev/null
+++ b/Content.Shared/_NF/Bank/BankSystemExtensions.cs
@@ -0,0 +1,80 @@
+using System.Globalization;
+
+namespace Content.Shared._NF.Bank;
+
+public static class BankSystemExtensions
+{
+
+    public enum CurrencySymbolLocation
+    {
+        Default, // Dependent on local CultureInfo
+        Prefix, // Currency symbol goes before the number
+        Suffix // Currency symbols goes after the number
+    }
+
+    const int PrefixCurrencyPositivePattern = 0; //$N
+    const int PrefixCurrencyNegativePattern = 1; //-$N
+    const int SuffixCurrencyPositivePattern = 3; //N $
+    const int SuffixCurrencyNegativePattern = 8; //-N $
+
+    /// <summary>
+    /// Formats a integer to the current CultureInfo's number formatting for currency.
+    /// </summary>
+    /// <param name="amount">The amount to format</param>
+    /// <param name="culture">The optional culture to use for formatting</param>
+    /// <param name="symbolOverride">Optionally override the symbol</param>
+    /// <param name="separatorOverride">Optionally override the separator</param>
+    /// <returns></returns>
+    public static string ToCurrencyString(int amount, CultureInfo? culture = null, string? symbolOverride = null, string? separatorOverride = null, CurrencySymbolLocation symbolLocation = CurrencySymbolLocation.Default)
+    {
+        culture ??= CultureInfo.CurrentCulture;
+        var numberFormat = (NumberFormatInfo) culture.NumberFormat.Clone();
+
+        if (symbolOverride != null)
+        {
+            numberFormat.CurrencySymbol = symbolOverride;
+        }
+        if (separatorOverride != null)
+        {
+            numberFormat.CurrencyGroupSeparator = separatorOverride;
+        }
+        switch (symbolLocation)
+        {
+            case CurrencySymbolLocation.Default:
+                break; // Do nothing
+            case CurrencySymbolLocation.Prefix:
+                numberFormat.CurrencyPositivePattern = PrefixCurrencyPositivePattern;
+                numberFormat.CurrencyNegativePattern = PrefixCurrencyNegativePattern;
+                break;
+            case CurrencySymbolLocation.Suffix:
+                numberFormat.CurrencyPositivePattern = SuffixCurrencyPositivePattern;
+                numberFormat.CurrencyNegativePattern = SuffixCurrencyNegativePattern;
+                break;
+        }
+
+
+        return string.Format(numberFormat, "{0:C0}", amount);
+    }
+
+    // Convenience methods for specific currencies.
+    public static string ToIndependentString(int amount, CultureInfo? culture = null)
+    {
+        return ToCurrencyString(amount, culture, symbolOverride: "", symbolLocation: CurrencySymbolLocation.Prefix); //Prefix results in no space, prefer that.
+    }
+
+    public static string ToSpesoString(int amount, CultureInfo? culture = null)
+    {
+        return ToCurrencyString(amount, culture, symbolOverride: "$", symbolLocation: CurrencySymbolLocation.Prefix);
+    }
+
+    public static string ToDoubloonString(int amount, CultureInfo? culture = null)
+    {
+        return ToCurrencyString(amount, culture, symbolOverride: "DB", symbolLocation: CurrencySymbolLocation.Suffix);
+    }
+
+    public static string ToFUCString(int amount, CultureInfo? culture = null)
+    {
+        return ToCurrencyString(amount, culture, symbolOverride: "FUC", symbolLocation: CurrencySymbolLocation.Suffix);
+    }
+}
+
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 4ad3bb7b975..f1ca814c8ac 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4046,7 +4046,7 @@ Entries:
     - type: Tweak
       message: >-
         Added the new Expeditionary FlatpackVend to the Lodge, not restockable
-        but contains expedition unique machines like the IFF,  
+        but contains expedition unique machines like the IFF,
   id: 4914
   time: '2024-04-17T21:40:06.0000000+00:00'
 - author: GreaseMonk
@@ -4244,7 +4244,7 @@ Entries:
     - type: Add
       message: >-
         Mail carrier hoverbike flatpack that can be bought from vendomat. and
-        NFSD 
+        NFSD
     - type: Add
       message: >-
         NFSD hoverbike flatpack that can be bought from uplink (utility
@@ -4372,7 +4372,7 @@ Entries:
     - type: Tweak
       message: >-
         The cultist and syndicate migrated to the harder difficulty expeditions
-        only. 
+        only.
   id: 4958
   time: '2024-04-29T17:22:51.0000000+00:00'
 - author: erhardsteinhauer
@@ -4440,7 +4440,7 @@ Entries:
     - type: Fix
       message: >-
         All Jumpskirts in the game have been correctly listed as skirts, now
-        Harpies can wear them again. 
+        Harpies can wear them again.
   id: 4964
   time: '2024-05-01T21:37:35.0000000+00:00'
 - author: erhardsteinhauer
@@ -4858,7 +4858,7 @@ Entries:
     - type: Tweak
       message: >-
         Frontier has increased mail related profits, but lowered the amount of
-        existing mail, expect the mail to find you soon. 
+        existing mail, expect the mail to find you soon.
   id: 5017
   time: '2024-06-07T17:10:14.0000000+00:00'
 - author: dvir01
@@ -5082,7 +5082,7 @@ Entries:
     - type: Tweak
       message: >-
         Rules have been updated to place contraband and docking restrictions on
-        the safe-zone, make sure to read them again! 
+        the safe-zone, make sure to read them again!
   id: 5040
   time: '2024-06-14T22:57:57.0000000+00:00'
 - author: whatston3
diff --git a/Resources/Locale/en-US/_NF/bank/bank-ATM-component.ftl b/Resources/Locale/en-US/_NF/bank/bank-ATM-component.ftl
index c1a7d877a9f..dc8a6a29da8 100644
--- a/Resources/Locale/en-US/_NF/bank/bank-ATM-component.ftl
+++ b/Resources/Locale/en-US/_NF/bank/bank-ATM-component.ftl
@@ -23,8 +23,6 @@ station-bank-other = Other
 station-bank-required = {"("}Required{")"}
 station-bank-requires-reason = NT Requires transaction details
 station-bank-unauthorized = Unauthorized!
-
-bank-atm-menu-cash-amount = ${$amount}
 bank-atm-menu-cash-error = ERR: INVALID
 
 ## ATM entity
diff --git a/Resources/Locale/en-US/_NF/loadouts/loadouts.ftl b/Resources/Locale/en-US/_NF/loadouts/loadouts.ftl
index 4bddf64c9a9..3924bd4a7b7 100644
--- a/Resources/Locale/en-US/_NF/loadouts/loadouts.ftl
+++ b/Resources/Locale/en-US/_NF/loadouts/loadouts.ftl
@@ -1,2 +1,2 @@
-frontier-loadout-cost = Total Loadout Cost: ${$cost}
-frontier-loadout-balance = Available Balance: ${$balance}
+frontier-loadout-cost = Total Loadout Cost: {$cost}
+frontier-loadout-balance = Available Balance: {$balance}
diff --git a/Resources/Locale/en-US/_NF/preferences/humanoid-character-profile.ftl b/Resources/Locale/en-US/_NF/preferences/humanoid-character-profile.ftl
deleted file mode 100644
index 89a42b90fdb..00000000000
--- a/Resources/Locale/en-US/_NF/preferences/humanoid-character-profile.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-# Frontier
-humanoid-character-profile-bankbalance = ${$bankBalance}
diff --git a/Resources/Locale/en-US/_NF/shipyard/shipyard-console-component.ftl b/Resources/Locale/en-US/_NF/shipyard/shipyard-console-component.ftl
index 6e8b7fc045c..733c87e489a 100644
--- a/Resources/Locale/en-US/_NF/shipyard/shipyard-console-component.ftl
+++ b/Resources/Locale/en-US/_NF/shipyard/shipyard-console-component.ftl
@@ -2,7 +2,6 @@
 shipyard-console-invalid-vessel = Cannot purchase vessel:
 shipyard-console-menu-title = Shipyard Menu
 shipyard-console-menu-listing-free = Free
-shipyard-console-menu-listing-amount = ${$amount}
 shipyard-console-docking = Captain {$owner} shuttle {$vessel} en route, eta 10 seconds.
 shipyard-console-leaving = Captain {$owner} shuttle {$vessel} sold by {$player}.
 shipyard-console-docking-secret = Unregistered vessel detected entering your sector.
diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl
index ee8142a05cc..96e919a5559 100644
--- a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl
@@ -121,7 +121,7 @@ uplink-security-shotincend-name = Incendiary Shotgun Shells
 uplink-security-shotincend-desc = A box of lethal .50 calibre incendiary shotgun shells.
 uplink-security-shotslug-name = Lethal Shotgun Slug Shells
 uplink-security-shotslug-desc = A box of lethal .50 calibre slug shotgun shells.
-uplink-security-cash1000-name = 1000 Spesos
+uplink-security-cash1000-name = 1,000 Spesos
 uplink-security-cash1000-desc = Cold, hard cash.
 uplink-security-empgrenade-box-name = EMP Grenade Box
 uplink-security-empgrenade-box-desc = A box containing 4 EMP grenades.
diff --git a/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl b/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl
index 4314cbf4496..955aebb135b 100644
--- a/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl
+++ b/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl
@@ -2,14 +2,14 @@
 bounty-console-label-button-text = Print label
 bounty-console-skip-button-text = Skip
 bounty-console-time-label = Time: [color=orange]{$time}[/color]
-bounty-console-reward-label = Reward: [color=limegreen]${$reward}[/color]
+bounty-console-reward-label = Reward: [color=limegreen]{$reward}[/color]
 bounty-console-manifest-label = Manifest: [color=orange]{$item}[/color]
 bounty-console-manifest-entry =
     { $amount ->
         [1] {$item}
         *[other] {$item} x{$amount}
     }
-bounty-console-manifest-reward = Reward: ${$reward}
+bounty-console-manifest-reward = Reward: {$reward}
 bounty-console-description-label = [color=gray]{$description}[/color]
 bounty-console-id-label = ID#{$id}
 
diff --git a/Resources/Locale/en-US/cargo/cargo-console-component.ftl b/Resources/Locale/en-US/cargo/cargo-console-component.ftl
index 22d9040c46d..79f35fa585e 100644
--- a/Resources/Locale/en-US/cargo/cargo-console-component.ftl
+++ b/Resources/Locale/en-US/cargo/cargo-console-component.ftl
@@ -5,7 +5,6 @@ cargo-console-menu-account-name-none-text = None
 cargo-console-menu-shuttle-name-label = Shuttle name:{" "}
 cargo-console-menu-shuttle-name-none-text = None
 cargo-console-menu-points-label = Spesos:{" "}
-cargo-console-menu-points-amount = ${$amount}
 cargo-console-menu-shuttle-status-label = Shuttle status:{" "}
 cargo-console-menu-shuttle-status-away-text = Away
 cargo-console-menu-order-capacity-label = Order capacity:{" "}
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/briefcases.yml
index 8a5d41779cb..d32a34a4170 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Items/briefcases.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/briefcases.yml
@@ -18,7 +18,7 @@
 - type: entity
   parent: SpaceCashExpedition
   id: SpaceCashExpeditionT1
-  name: spesos (5000)
+  name: spesos (5,000)
   noSpawn: true
   components:
   - type: SpawnItemsOnUse
@@ -32,7 +32,7 @@
 - type: entity
   parent: SpaceCashExpedition
   id: SpaceCashExpeditionT2
-  name: spesos (10000)
+  name: spesos (10,000)
   noSpawn: true
   components:
   - type: SpawnItemsOnUse
@@ -46,7 +46,7 @@
 - type: entity
   parent: SpaceCashExpedition
   id: SpaceCashExpeditionT3
-  name: spesos (20000)
+  name: spesos (20,000)
   noSpawn: true
   components:
   - type: SpawnItemsOnUse
@@ -60,7 +60,7 @@
 - type: entity
   parent: SpaceCashExpedition
   id: SpaceCashExpeditionT4
-  name: spesos (40000)
+  name: spesos (40,000)
   noSpawn: true
   components:
   - type: SpawnItemsOnUse
@@ -75,7 +75,7 @@
 - type: entity
   parent: SpaceCashExpedition
   id: SpaceCashExpeditionT5
-  name: spesos (70000)
+  name: spesos (70,000)
   noSpawn: true
   components:
   - type: SpawnItemsOnUse

From 1ce6347c32e2f96fc90aed4a25b2cdf36cc63fef Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Mon, 12 Aug 2024 19:11:52 +0000
Subject: [PATCH 07/15] Automatic Changelog (#1768)

---
 Resources/Changelog/Changelog.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index f1ca814c8ac..604e0629b4b 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6209,3 +6209,9 @@ Entries:
       message: Chicken and duck crates are no longer available for purchase.
   id: 5189
   time: '2024-08-11T19:54:33.0000000+00:00'
+- author: GreaseMonk
+  changes:
+    - type: Add
+      message: Currency notation
+  id: 5190
+  time: '2024-08-12T19:11:25.0000000+00:00'

From 6b90b139a4040da3fa20ff2497424c5423b21427 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Mon, 12 Aug 2024 15:27:08 -0400
Subject: [PATCH 08/15] Add FTL knockdown immunity to hostile NPCs (#1846)

* FTLKnockdownImmune component

* Make exped enemies (human, non-human) FTL immune

---------

Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: Checkraze <71046427+Cheackraze@users.noreply.github.com>
---
 .../Systems/ShuttleSystem.FasterThanLight.cs         |  4 ++++
 .../Components/FTLKnockdownImmuneComponent.cs        | 12 ++++++++++++
 .../_NF/Entities/Mobs/NPCs/mob_hostile_base.yml      |  2 ++
 3 files changed, 18 insertions(+)
 create mode 100644 Content.Server/_NF/Shuttles/Components/FTLKnockdownImmuneComponent.cs

diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
index 89f1a627c73..1f347b1251a 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
@@ -1,6 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Numerics;
+using Content.Server._NF.Shuttles.Components; // Frontier: NPC knockdown immunity
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Events;
 using Content.Server.Station.Events;
@@ -614,6 +615,9 @@ private void DoTheDinosaur(TransformComponent xform)
             {
                 if (!_statusQuery.TryGetComponent(child, out var status))
                     continue;
+                
+                if (HasComp<FTLKnockdownImmuneComponent>(child)) // Frontier: NPC knockdown immunity
+                    continue; // Frontier: NPC knockdown immunity
 
                 _stuns.TryParalyze(child, _hyperspaceKnockdownTime, true, status);
 
diff --git a/Content.Server/_NF/Shuttles/Components/FTLKnockdownImmuneComponent.cs b/Content.Server/_NF/Shuttles/Components/FTLKnockdownImmuneComponent.cs
new file mode 100644
index 00000000000..dbccd826ed2
--- /dev/null
+++ b/Content.Server/_NF/Shuttles/Components/FTLKnockdownImmuneComponent.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Server._NF.Shuttles.Components;
+
+/// <summary>
+///     Denotes an entity as being immune from knockdown on FTL
+/// </summary>
+[RegisterComponent]
+public sealed partial class FTLKnockdownImmuneComponent : Component
+{
+}
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml
index f524f730722..6500297187f 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml
@@ -228,6 +228,7 @@
     maximumWait: 240 # 2 * 60
     nextAdvertisementTime: 0
   - type: SalvageMobRestrictionsNF
+  - type: FTLKnockdownImmune
 
 # NonHuman NPC base, no equipment, immune to vacuum/low pressure
 - type: entity
@@ -302,3 +303,4 @@
     - CanPilot
     - FootstepSound
     - DoorBumpOpener
+  - type: FTLKnockdownImmune

From 5b498af09e82c26973370843ef09c7e3e563edf7 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Mon, 12 Aug 2024 19:27:38 +0000
Subject: [PATCH 09/15] Automatic Changelog (#1846)

---
 Resources/Changelog/Changelog.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 604e0629b4b..a06752b2424 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6215,3 +6215,9 @@ Entries:
       message: Currency notation
   id: 5190
   time: '2024-08-12T19:11:25.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Tweak
+      message: Hostile NPCs no longer fall over on entering/exiting bluespace.
+  id: 5191
+  time: '2024-08-12T19:27:08.0000000+00:00'

From 24ca4c61b09ecafeb562a1f60ea53c483730abf1 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Mon, 12 Aug 2024 15:52:25 -0400
Subject: [PATCH 10/15] Expedition Console: block mission selection if shuttle
 has FTL component (#1845)

* Expedition: check for FTL component before mission

* Less text in salvage expedition console

* plural, "party supplies"->"party supply stash"

* in the area->inside the area

---------

Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
---
 .../SalvageSystem.ExpeditionConsole.cs        | 28 +++++++++++++++++++
 .../Salvage/SalvageSystem.Expeditions.cs      |  3 +-
 .../Locale/en-US/_NF/adventure/adventure.ftl  |  1 +
 .../Locale/en-US/procedural/expeditions.ftl   |  5 ++--
 .../Entities/Structures/Specific/punks.yml    |  2 +-
 5 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs b/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
index b8966db3255..23ed5b00561 100644
--- a/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
+++ b/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
@@ -59,6 +59,16 @@ private void OnSalvageClaimMessage(EntityUid uid, SalvageExpeditionConsoleCompon
         }
         // end of Frontier proximity check
 
+        // Frontier: check for FTL component - if one exists, the station won't be taken into FTL.
+        if (HasComp<FTLComponent>(grid))
+        {
+            PlayDenySound(uid, component);
+            _popupSystem.PopupEntity(Loc.GetString("shuttle-ftl-recharge"), uid, PopupType.MediumCaution);
+            UpdateConsoles(data); // Sure, why not?
+            return;
+        }
+        // End Frontier
+
         // Frontier  change - disable coordinate disks for expedition missions
         //var cdUid = Spawn(CoordinatesDisk, Transform(uid).Coordinates);
         SpawnMission(missionparams, station.Value, null);
@@ -96,6 +106,15 @@ private void UpdateConsoles(SalvageExpeditionDataComponent component)
             if (station != component.Owner)
                 continue;
 
+            // Frontier: if we have a lingering FTL component, we cannot start a new mission
+            if (!TryComp<StationDataComponent>(station, out var stationData) ||
+                    _station.GetLargestGrid(stationData) is not {Valid : true} grid || 
+                    HasComp<FTLComponent>(grid))
+            {
+                state.Cooldown = true; //Hack: disable buttons
+            }
+            // End Frontier
+
             _ui.SetUiState((uid, uiComp), SalvageConsoleUiKey.Expedition, state);
         }
     }
@@ -114,6 +133,15 @@ private void UpdateConsole(Entity<SalvageExpeditionConsoleComponent> component)
             state = new SalvageExpeditionConsoleState(TimeSpan.Zero, false, true, 0, new List<SalvageMissionParams>());
         }
 
+        // Frontier: if we have a lingering FTL component, we cannot start a new mission
+        if (!TryComp<StationDataComponent>(station, out var stationData) ||
+                _station.GetLargestGrid(stationData) is not {Valid : true} grid || 
+                HasComp<FTLComponent>(grid))
+        {
+            state.Cooldown = true; //Hack: disable buttons
+        }
+        // End Frontier
+
         _ui.SetUiState(component.Owner, SalvageConsoleUiKey.Expedition, state);
     }
     private void PlayDenySound(EntityUid uid, SalvageExpeditionConsoleComponent component)
diff --git a/Content.Server/Salvage/SalvageSystem.Expeditions.cs b/Content.Server/Salvage/SalvageSystem.Expeditions.cs
index c1cf7518b63..4ef23c62a2f 100644
--- a/Content.Server/Salvage/SalvageSystem.Expeditions.cs
+++ b/Content.Server/Salvage/SalvageSystem.Expeditions.cs
@@ -168,7 +168,8 @@ private void UpdateExpeditions()
                 continue;
 
             comp.Cooldown = false;
-            comp.NextOffer += TimeSpan.FromSeconds(_cooldown);
+            //comp.NextOffer += TimeSpan.FromSeconds(_cooldown); // Frontier
+            comp.NextOffer = currentTime + TimeSpan.FromSeconds(_cooldown); // Frontier
             GenerateMissions(comp);
             UpdateConsoles(comp);
         }
diff --git a/Resources/Locale/en-US/_NF/adventure/adventure.ftl b/Resources/Locale/en-US/_NF/adventure/adventure.ftl
index 77c511dbfca..c572adf364a 100644
--- a/Resources/Locale/en-US/_NF/adventure/adventure.ftl
+++ b/Resources/Locale/en-US/_NF/adventure/adventure.ftl
@@ -18,6 +18,7 @@ shipyard-rules-default2 =
     Thank you for choosing Nanotrasen Security Forces.
 
 shuttle-ftl-proximity = Nearby objects too massive for FTL!
+shuttle-ftl-recharge = FTL drives still spooling down!
 
 changelog-tab-title-Upstream = Upstream Changelog
 multiauth-already-connected = Already connected to Frontier Official servers.
diff --git a/Resources/Locale/en-US/procedural/expeditions.ftl b/Resources/Locale/en-US/procedural/expeditions.ftl
index a0192fabd32..dcfefe8ab5b 100644
--- a/Resources/Locale/en-US/procedural/expeditions.ftl
+++ b/Resources/Locale/en-US/procedural/expeditions.ftl
@@ -19,14 +19,15 @@ salvage-expedition-window-claim = Claim
 
 salvage-expedition-window-next = Next offer
 
-# Expedition descriptions
+# Frontier: Expedition descriptions
 salvage-expedition-desc-mining = Collect resources inside the area.
 #  You will be taxed {$tax}% of the resources collected.
 salvage-expedition-desc-structure = {$count ->
     [one] Destroy {$count} {$structure} inside the area.
-    *[other] Destroy {$count} {$structure}s inside the area.
+    *[other] Destroy {$count} {MAKEPLURAL($structure)} inside the area.
 }
 salvage-expedition-desc-elimination = Kill a large and dangerous creature inside the area.
+# End Frontier
 
 salvage-expedition-type-Mining = Mining
 salvage-expedition-type-Destruction = Destruction
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Specific/punks.yml b/Resources/Prototypes/_NF/Entities/Structures/Specific/punks.yml
index 68981fa9d59..e74c78e8102 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Specific/punks.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Specific/punks.yml
@@ -2,7 +2,7 @@
 - type: entity
   parent: CarpStatue
   id: PunkPartySupplies
-  name: party supplies
+  name: party supply stash
   description: The only thing that can hold a gang together.
   components:
   - type: Sprite

From e6cb084952be5212632e055ad213994dca6f6935 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Mon, 12 Aug 2024 19:52:51 +0000
Subject: [PATCH 11/15] Automatic Changelog (#1845)

---
 Resources/Changelog/Changelog.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index a06752b2424..68b1f00746c 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6221,3 +6221,11 @@ Entries:
       message: Hostile NPCs no longer fall over on entering/exiting bluespace.
   id: 5191
   time: '2024-08-12T19:27:08.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Fix
+      message: >-
+        Expedition ships no longer get stuck when selecting an expedition
+        shortly after returning.
+  id: 5192
+  time: '2024-08-12T19:52:25.0000000+00:00'

From 279d0660ca5f7d3cc9991e6e91059dbd46f96f8e Mon Sep 17 00:00:00 2001
From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com>
Date: Mon, 12 Aug 2024 22:58:34 +0300
Subject: [PATCH 12/15] Windows and glass airlocks in expeditions (and only
 there) block lasers (#1849)

* Windows and glass airlocks block lasers

* grilles

* descr

* cleanup

* comments

* dungeon templates yml swap

* dungeon_configs.yml comments

---------

Co-authored-by: Whatstone <whatston3@gmail.com>
---
 Resources/Maps/_NF/Dungeon/cave_factory.yml   |  10 +-
 Resources/Maps/_NF/Dungeon/experiment.yml     |   4 +-
 Resources/Maps/_NF/Dungeon/haunted.yml        |   4 +-
 Resources/Maps/_NF/Dungeon/lava_brig.yml      |   6 +-
 Resources/Maps/_NF/Dungeon/lava_mercenary.yml |   4 +-
 Resources/Maps/_NF/Dungeon/mineshaft.yml      |   2 +-
 .../Maps/_NF/Dungeon/salvage_outpost.yml      |   4 +-
 Resources/Maps/_NF/Dungeon/snowy_labs.yml     |   6 +-
 Resources/Maps/_NF/Dungeon/virology_lab.yml   |   8 +-
 .../Prototypes/Procedural/dungeon_configs.yml |  10 +-
 .../Entities/Structures/Dungeon/airlocks.yml  | 133 ++++++++++++++++++
 .../Entities/Structures/Dungeon/grille.yml    |  15 ++
 .../Entities/Structures/Dungeon/windows.yml   |  82 +++++++++++
 .../_NF/Procedural/dungeon_configs.yml        |  16 +--
 14 files changed, 267 insertions(+), 37 deletions(-)
 create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Dungeon/airlocks.yml
 create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Dungeon/grille.yml
 create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Dungeon/windows.yml

diff --git a/Resources/Maps/_NF/Dungeon/cave_factory.yml b/Resources/Maps/_NF/Dungeon/cave_factory.yml
index 4b695adca81..ad4ee2168f1 100644
--- a/Resources/Maps/_NF/Dungeon/cave_factory.yml
+++ b/Resources/Maps/_NF/Dungeon/cave_factory.yml
@@ -3143,7 +3143,7 @@ entities:
     - type: Transform
       pos: 19.5,43.5
       parent: 1
-- proto: AirlockEngineeringGlassLocked
+- proto: AirlockEngineeringGlassLockedDungeon
   entities:
   - uid: 1949
     components:
@@ -3182,7 +3182,7 @@ entities:
     - type: Transform
       pos: 27.5,46.5
       parent: 1
-- proto: AirlockMaintGlassLocked
+- proto: AirlockMaintGlassLockedDungeon
   entities:
   - uid: 754
     components:
@@ -11043,7 +11043,7 @@ entities:
     - type: Transform
       pos: 20.5,47.5
       parent: 1
-- proto: ReinforcedPlasmaWindow
+- proto: ReinforcedPlasmaWindowDungeon
   entities:
   - uid: 1378
     components:
@@ -11069,7 +11069,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 32.5,21.5
       parent: 1
-- proto: ReinforcedWindow
+- proto: ReinforcedWindowDungeon
   entities:
   - uid: 409
     components:
@@ -14380,7 +14380,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 20.5,45.5
       parent: 1
-- proto: Window
+- proto: WindowDungeon
   entities:
   - uid: 253
     components:
diff --git a/Resources/Maps/_NF/Dungeon/experiment.yml b/Resources/Maps/_NF/Dungeon/experiment.yml
index a0a3694f23c..a7aa1a0decc 100644
--- a/Resources/Maps/_NF/Dungeon/experiment.yml
+++ b/Resources/Maps/_NF/Dungeon/experiment.yml
@@ -2255,7 +2255,7 @@ entities:
     - type: Transform
       pos: 3.5,18.5
       parent: 1653
-- proto: AirlockScienceGlassLocked
+- proto: AirlockScienceGlassLockedDungeon
   entities:
   - uid: 741
     components:
@@ -8077,7 +8077,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 6.5,24.5
       parent: 1653
-- proto: ReinforcedWindow
+- proto: ReinforcedWindowDungeon
   entities:
   - uid: 739
     components:
diff --git a/Resources/Maps/_NF/Dungeon/haunted.yml b/Resources/Maps/_NF/Dungeon/haunted.yml
index 538de449ad2..210b7f4864b 100644
--- a/Resources/Maps/_NF/Dungeon/haunted.yml
+++ b/Resources/Maps/_NF/Dungeon/haunted.yml
@@ -362,7 +362,7 @@ entities:
     - type: Transform
       pos: 11.5,43.5
       parent: 1653
-- proto: AirlockMiningGlassLocked
+- proto: AirlockMiningGlassLockedDungeon
   entities:
   - uid: 492
     components:
@@ -1592,7 +1592,7 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: MiningWindow
+- proto: MiningWindowDungeon
   entities:
   - uid: 155
     components:
diff --git a/Resources/Maps/_NF/Dungeon/lava_brig.yml b/Resources/Maps/_NF/Dungeon/lava_brig.yml
index b03f914aee4..de7e1ab96dc 100644
--- a/Resources/Maps/_NF/Dungeon/lava_brig.yml
+++ b/Resources/Maps/_NF/Dungeon/lava_brig.yml
@@ -2688,7 +2688,7 @@ entities:
     - type: LoadedMap
     - type: SpreaderGrid
     - type: GridPathfinding
-- proto: AirlockBrigGlassLocked
+- proto: AirlockBrigGlassLockedDungeon
   entities:
   - uid: 1245
     components:
@@ -2712,7 +2712,7 @@ entities:
     - type: Transform
       pos: 19.5,43.5
       parent: 588
-- proto: AirlockSecurityGlassLocked
+- proto: AirlockSecurityGlassLockedDungeon
   entities:
   - uid: 1579
     components:
@@ -10052,7 +10052,7 @@ entities:
     - type: Transform
       pos: 8.5,24.5
       parent: 588
-- proto: ReinforcedWindow
+- proto: ReinforcedWindowDungeon
   entities:
   - uid: 214
     components:
diff --git a/Resources/Maps/_NF/Dungeon/lava_mercenary.yml b/Resources/Maps/_NF/Dungeon/lava_mercenary.yml
index bfd75e30333..d14ec6493ab 100644
--- a/Resources/Maps/_NF/Dungeon/lava_mercenary.yml
+++ b/Resources/Maps/_NF/Dungeon/lava_mercenary.yml
@@ -2757,7 +2757,7 @@ entities:
     - type: Transform
       pos: 19.5,43.5
       parent: 588
-- proto: AirlockMercenaryGlassLocked
+- proto: AirlockMercenaryGlassLockedDungeon
   entities:
   - uid: 254
     components:
@@ -10049,7 +10049,7 @@ entities:
     - type: Transform
       pos: 8.5,24.5
       parent: 588
-- proto: ReinforcedWindow
+- proto: ReinforcedWindowDungeon
   entities:
   - uid: 214
     components:
diff --git a/Resources/Maps/_NF/Dungeon/mineshaft.yml b/Resources/Maps/_NF/Dungeon/mineshaft.yml
index 6cdd1b1a18e..17fcf040469 100644
--- a/Resources/Maps/_NF/Dungeon/mineshaft.yml
+++ b/Resources/Maps/_NF/Dungeon/mineshaft.yml
@@ -3131,7 +3131,7 @@ entities:
     - type: Transform
       pos: 40.5,7.5
       parent: 2
-- proto: MiningWindow
+- proto: MiningWindowDungeon
   entities:
   - uid: 102
     components:
diff --git a/Resources/Maps/_NF/Dungeon/salvage_outpost.yml b/Resources/Maps/_NF/Dungeon/salvage_outpost.yml
index 8421f296868..8007bdae116 100644
--- a/Resources/Maps/_NF/Dungeon/salvage_outpost.yml
+++ b/Resources/Maps/_NF/Dungeon/salvage_outpost.yml
@@ -1965,7 +1965,7 @@ entities:
     - type: Transform
       pos: 44.5,39.5
       parent: 1653
-- proto: AirlockMiningGlass
+- proto: AirlockMiningGlassDungeon
   entities:
   - uid: 22
     components:
@@ -8770,7 +8770,7 @@ entities:
     - type: Transform
       pos: 9.5,40.5
       parent: 1653
-- proto: MiningWindow
+- proto: MiningWindowDungeon
   entities:
   - uid: 146
     components:
diff --git a/Resources/Maps/_NF/Dungeon/snowy_labs.yml b/Resources/Maps/_NF/Dungeon/snowy_labs.yml
index ac88663a5d8..453f74ff2fb 100644
--- a/Resources/Maps/_NF/Dungeon/snowy_labs.yml
+++ b/Resources/Maps/_NF/Dungeon/snowy_labs.yml
@@ -2907,7 +2907,7 @@ entities:
     - type: Transform
       pos: 3.5,18.5
       parent: 1653
-- proto: AirlockHydroGlassLocked
+- proto: AirlockHydroGlassLockedDungeon
   entities:
   - uid: 10
     components:
@@ -11088,7 +11088,7 @@ entities:
     - type: Transform
       pos: 17.5,47.5
       parent: 1653
-- proto: ReinforcedUraniumWindow
+- proto: ReinforcedUraniumWindowDungeon
   entities:
   - uid: 289
     components:
@@ -11130,7 +11130,7 @@ entities:
     - type: Transform
       pos: 3.5,13.5
       parent: 1653
-- proto: ReinforcedWindow
+- proto: ReinforcedWindowDungeon
   entities:
   - uid: 104
     components:
diff --git a/Resources/Maps/_NF/Dungeon/virology_lab.yml b/Resources/Maps/_NF/Dungeon/virology_lab.yml
index 64ea78c721a..cc35e158396 100644
--- a/Resources/Maps/_NF/Dungeon/virology_lab.yml
+++ b/Resources/Maps/_NF/Dungeon/virology_lab.yml
@@ -2637,7 +2637,7 @@ entities:
     - type: Transform
       pos: 3.5,18.5
       parent: 1653
-- proto: AirlockVirologyGlass
+- proto: AirlockVirologyGlassDungeon
   entities:
   - uid: 1472
     components:
@@ -2669,7 +2669,7 @@ entities:
     - type: Transform
       pos: 3.5,3.5
       parent: 1653
-- proto: AirlockVirologyGlassLocked
+- proto: AirlockVirologyGlassLockedDungeon
   entities:
   - uid: 115
     components:
@@ -9876,14 +9876,14 @@ entities:
     - type: Transform
       pos: 16.5,22.5
       parent: 1653
-- proto: ReinforcedPlasmaWindow
+- proto: ReinforcedPlasmaWindowDungeon
   entities:
   - uid: 533
     components:
     - type: Transform
       pos: 29.5,38.5
       parent: 1653
-- proto: ReinforcedWindow
+- proto: ReinforcedWindowDungeon
   entities:
   - uid: 395
     components:
diff --git a/Resources/Prototypes/Procedural/dungeon_configs.yml b/Resources/Prototypes/Procedural/dungeon_configs.yml
index 89715bc9400..1c96ee62557 100644
--- a/Resources/Prototypes/Procedural/dungeon_configs.yml
+++ b/Resources/Prototypes/Procedural/dungeon_configs.yml
@@ -194,20 +194,20 @@
   id: BaseAirlock
   entries:
   - id: CableApcExtension
-  - id: AirlockGlass
+  - id: AirlockGlassDungeon # Frontier: AirlockGlass<AirlockGlassDungeon
 
 - type: entitySpawnEntry
   id: BaseWindow
   entries:
-  - id: Grille
-  - id: Window
+  - id: GrilleDungeon # Frontier: Grille<GrilleDungeon
+  - id: WindowDungeon # Frontier: Window<WindowDungeon
 
 # Lava brig
 - type: entitySpawnEntry
   id: LavaBrigEntrance
   entries:
   - id: CableApcExtension
-  - id: AirlockSecurityGlass # Frontier AirlockSecurityGlassLocked<AirlockSecurityGlass
+  - id: AirlockSecurityGlassDungeon # Frontier: AirlockSecurityGlassLocked<AirlockSecurityGlassDungeon
 
 # Mineshaft
 - type: entitySpawnEntry
@@ -265,7 +265,7 @@
   id: SnowyLabsEntrance
   entries:
   - id: CableApcExtension
-  - id: AirlockFreezer # Frontier - AirlockFreezerHydroponicsLocked<AirlockFreezer
+  - id: AirlockFreezer # Frontier: AirlockFreezerHydroponicsLocked<AirlockFreezer
 
 - type: entitySpawnEntry
   id: SnowyLabsWalls
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Dungeon/airlocks.yml b/Resources/Prototypes/_NF/Entities/Structures/Dungeon/airlocks.yml
new file mode 100644
index 00000000000..5c1ebdb6ee1
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Dungeon/airlocks.yml
@@ -0,0 +1,133 @@
+# Special glass airlocks for dungeons that block lasers
+# Base
+- type: entity
+  id: AirlockGlassMurkyDungeon
+  abstract: true
+  suffix: DO NOT MAP, Dungeon only
+  description: An airlock with murky glass windows, it's hard to see what's on the other side.
+  components:
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.49,-0.49,0.49,0.49"
+        density: 100
+        mask:
+        - FullTileMask
+        layer:
+        - AirlockLayer # Blocks lasers, but not LoS
+
+# Basic airlock
+- type: entity
+  id: AirlockGlassDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockGlass
+  noSpawn: true
+
+# Maint airlock
+- type: entity
+  id: AirlockMaintGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockMaintGlassLocked
+  noSpawn: true
+
+# Engineering airlocks
+- type: entity
+  id: AirlockEngineeringGlassDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockEngineeringGlass
+  noSpawn: true
+
+- type: entity
+  id: AirlockEngineeringGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockEngineeringGlassLocked
+  noSpawn: true
+
+# Security airlocks
+- type: entity
+  id: AirlockSecurityGlassDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockSecurityGlass
+  noSpawn: true
+
+- type: entity
+  id: AirlockSecurityGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockSecurityGlassLocked
+  noSpawn: true
+
+- type: entity
+  id: AirlockBrigGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockBrigGlassLocked
+  noSpawn: true
+
+# Mining airlocks
+- type: entity
+  id: AirlockMiningGlassDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockMiningGlass
+  noSpawn: true
+
+- type: entity
+  id: AirlockMiningGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockMiningGlassLocked
+  noSpawn: true
+
+# Virology airlocks
+- type: entity
+  id: AirlockVirologyGlassDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockVirologyGlass
+  noSpawn: true
+
+- type: entity
+  id: AirlockVirologyGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockVirologyGlassLocked
+  noSpawn: true
+
+# Mercenary airlocks
+- type: entity
+  id: AirlockMercenaryGlassDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockMercenaryGlass
+  noSpawn: true
+
+- type: entity
+  id: AirlockMercenaryGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockMercenaryGlassLocked
+  noSpawn: true
+
+# Science airlock
+- type: entity
+  id: AirlockScienceGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockScienceGlassLocked
+  noSpawn: true
+
+# Hydroponics ailock
+- type: entity
+  id: AirlockHydroGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockHydroGlassLocked
+  noSpawn: true
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Dungeon/grille.yml b/Resources/Prototypes/_NF/Entities/Structures/Dungeon/grille.yml
new file mode 100644
index 00000000000..0371c11c4b1
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Dungeon/grille.yml
@@ -0,0 +1,15 @@
+# Special grilles for dungeons that block lasers
+- type: entity
+  id: GrilleDungeon
+  parent: Grille
+  noSpawn: true
+  suffix: DO NOT MAP, Dungeon only
+  components:
+    - type: Fixtures
+      fixtures:
+        fix1:
+          shape:
+            !type:PhysShapeAabb
+            bounds: "-0.5,-0.5,0.5,0.5"
+          layer:
+          - WallLayer # Blocks lasers, but not LoS
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Dungeon/windows.yml b/Resources/Prototypes/_NF/Entities/Structures/Dungeon/windows.yml
new file mode 100644
index 00000000000..32b86cf2e6e
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Dungeon/windows.yml
@@ -0,0 +1,82 @@
+# Special windows for dungeons that block lasers
+# Base
+- type: entity
+  id: WindowMurkyDungeon
+  abstract: true
+  suffix: DO NOT MAP, Dungeon only
+  description: A murky glass window, it's hard to see what's on the other side.
+  components:
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb {}
+        mask:
+        - FullTileMask
+        layer:
+        - WallLayer # Blocks lasers, but not LoS
+
+# Common window
+- type: entity
+  id: WindowDungeon
+  parent:
+  - WindowMurkyDungeon
+  - Window
+  noSpawn: true
+
+# Reinforced window
+- type: entity
+  id: ReinforcedWindowDungeon
+  parent:
+  - WindowMurkyDungeon
+  - ReinforcedWindow
+  noSpawn: true
+
+# Mining window
+- type: entity
+  id: MiningWindowDungeon
+  parent:
+  - WindowMurkyDungeon
+  - MiningWindow
+  noSpawn: true
+  components:
+  - type: Destructible # Made it as durable as common window
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlass:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+
+# Plasma window
+- type: entity
+  id: PlasmaWindowDungeon
+  parent:
+  - WindowMurkyDungeon
+  - PlasmaWindow
+  noSpawn: true
+
+# Plasma reinforced window
+- type: entity
+  id: ReinforcedPlasmaWindowDungeon
+  parent:
+  - WindowMurkyDungeon
+  - ReinforcedPlasmaWindow
+  noSpawn: true
+
+# Uranium reinforced window
+- type: entity
+  id: ReinforcedUraniumWindowDungeon
+  parent:
+  - WindowMurkyDungeon
+  - ReinforcedUraniumWindow
+  noSpawn: true
diff --git a/Resources/Prototypes/_NF/Procedural/dungeon_configs.yml b/Resources/Prototypes/_NF/Procedural/dungeon_configs.yml
index 50d0a6c8de5..181a8cc8a8f 100644
--- a/Resources/Prototypes/_NF/Procedural/dungeon_configs.yml
+++ b/Resources/Prototypes/_NF/Procedural/dungeon_configs.yml
@@ -68,13 +68,13 @@
   id: BaseAirlockNF
   entries:
   - id: CableApcExtension
-  - id: AirlockGlass
+  - id: AirlockGlassDungeon
 
 - type: entitySpawnEntry
   id: BaseWindowNF
   entries:
-  - id: Grille
-  - id: Window
+  - id: GrilleDungeon
+  - id: WindowDungeon
 
 - type: entitySpawnEntry
   id: BaseWallMountsNF
@@ -219,7 +219,7 @@
   id: MercenaryAirlockNF
   entries:
     - id: CableApcExtension
-    - id: AirlockMercenaryGlass
+    - id: AirlockMercenaryGlassDungeon
 
 - type: entitySpawnEntry
   id: LavaMercenaryWallMountsNF
@@ -272,7 +272,7 @@
   id: VirologyAirlockNF
   entries:
     - id: CableApcExtension
-    - id: AirlockVirologyGlass
+    - id: AirlockVirologyGlassDungeon
 
 # SalvageOutpost prototypes
 - type: dungeonConfig
@@ -316,10 +316,10 @@
   id: MiningAirlockNF
   entries:
     - id: CableApcExtension
-    - id: AirlockMiningGlass
+    - id: AirlockMiningGlassDungeon
 
 - type: entitySpawnEntry
   id: MiningWindowNF
   entries:
-    - id: Grille
-    - id: MiningWindow
+    - id: GrilleDungeon
+    - id: MiningWindowDungeon

From a235ff3d17733b75446d3f20387f9db3bc02f462 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Mon, 12 Aug 2024 19:59:02 +0000
Subject: [PATCH 13/15] Automatic Changelog (#1849)

---
 Resources/Changelog/Changelog.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 68b1f00746c..c23a1e2c410 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6229,3 +6229,11 @@ Entries:
         shortly after returning.
   id: 5192
   time: '2024-08-12T19:52:25.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: >-
+        Windows and glass airlocks in expeditions (and only there) now block
+        lasers.
+  id: 5193
+  time: '2024-08-12T19:58:34.0000000+00:00'

From a744c338945d910cea8dff4e73d7c406ad849e06 Mon Sep 17 00:00:00 2001
From: Vonsant <von7ant@gmail.com>
Date: Tue, 13 Aug 2024 00:03:05 +0300
Subject: [PATCH 14/15] Localisation

---
 .../_NF/Bank/BankSystemExtensions.cs          |  4 +-
 .../Locale/ru-RU/_NF/adventure/adventure.ftl  |  1 +
 .../ru-RU/_NF/bank/bank-ATM-component.ftl     |  1 -
 .../Locale/ru-RU/_NF/loadouts/loadouts.ftl    |  4 +-
 .../humanoid-character-profile.ftl            |  2 -
 .../Locale/ru-RU/_NF/store/uplink-catalog.ftl |  2 +-
 .../ru-RU/cargo/cargo-bounty-console.ftl      |  6 +--
 .../ru-RU/cargo/cargo-console-component.ftl   |  1 -
 .../Locale/ru-RU/procedural/expeditions.ftl   |  2 +-
 .../_nf/catalog/fills/crates/npc.ftl          |  2 +
 .../_nf/entities/objects/misc/monkeycube.ftl  |  8 ++++
 .../objects/specific/rehydrateable.ftl        |  4 ++
 .../entities/structures/dungeon/airlocks.ftl  | 45 +++++++++++++++++++
 .../entities/structures/dungeon/grille.ftl    |  3 ++
 .../entities/structures/dungeon/windows.ftl   | 21 +++++++++
 15 files changed, 93 insertions(+), 13 deletions(-)
 delete mode 100644 Resources/Locale/ru-RU/_NF/preferences/humanoid-character-profile.ftl
 create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/misc/monkeycube.ftl
 create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/specific/rehydrateable.ftl
 create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/structures/dungeon/airlocks.ftl
 create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/structures/dungeon/grille.ftl
 create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/structures/dungeon/windows.ftl

diff --git a/Content.Shared/_NF/Bank/BankSystemExtensions.cs b/Content.Shared/_NF/Bank/BankSystemExtensions.cs
index 10499785542..9cd7443e044 100644
--- a/Content.Shared/_NF/Bank/BankSystemExtensions.cs
+++ b/Content.Shared/_NF/Bank/BankSystemExtensions.cs
@@ -69,12 +69,12 @@ public static string ToSpesoString(int amount, CultureInfo? culture = null)
 
     public static string ToDoubloonString(int amount, CultureInfo? culture = null)
     {
-        return ToCurrencyString(amount, culture, symbolOverride: "DB", symbolLocation: CurrencySymbolLocation.Suffix);
+        return ToCurrencyString(amount, culture, symbolOverride: "ДБ", symbolLocation: CurrencySymbolLocation.Suffix);
     }
 
     public static string ToFUCString(int amount, CultureInfo? culture = null)
     {
-        return ToCurrencyString(amount, culture, symbolOverride: "FUC", symbolLocation: CurrencySymbolLocation.Suffix);
+        return ToCurrencyString(amount, culture, symbolOverride: "ТК", symbolLocation: CurrencySymbolLocation.Suffix);
     }
 }
 
diff --git a/Resources/Locale/ru-RU/_NF/adventure/adventure.ftl b/Resources/Locale/ru-RU/_NF/adventure/adventure.ftl
index 167ab08a226..43dba05d8b5 100644
--- a/Resources/Locale/ru-RU/_NF/adventure/adventure.ftl
+++ b/Resources/Locale/ru-RU/_NF/adventure/adventure.ftl
@@ -17,6 +17,7 @@ shipyard-rules-default2 =
     Космический Закон, приведут к административным мерам.
     Благодарим за выбор Департамента Службы Безопасности Фронтира.
 shuttle-ftl-proximity = Массивный объект блокирует блюспейс перемещение!
+shuttle-ftl-recharge = Блюспейс двигатель на перезарядке!
 changelog-tab-title-Upstream = Журнал изменений
 multiauth-already-connected = Уже подключены к серверу Фронтира.
 public-transit-departure = Транспорт направляется в { $destination }. Ориентировочное время в пути: { $flytime } секунд.
diff --git a/Resources/Locale/ru-RU/_NF/bank/bank-ATM-component.ftl b/Resources/Locale/ru-RU/_NF/bank/bank-ATM-component.ftl
index 00806d12c37..a48c0b74b8f 100644
--- a/Resources/Locale/ru-RU/_NF/bank/bank-ATM-component.ftl
+++ b/Resources/Locale/ru-RU/_NF/bank/bank-ATM-component.ftl
@@ -24,7 +24,6 @@ station-bank-other = Другое
 station-bank-required = { "(" }выбрать из списка{ ")" }
 station-bank-requires-reason = Требуются детали транзакции!
 station-bank-unauthorized = Не авторизовано!
-bank-atm-menu-cash-amount = ${ $amount }
 bank-atm-menu-cash-error = ERR: ОШИБКА
 
 ## ATM entity
diff --git a/Resources/Locale/ru-RU/_NF/loadouts/loadouts.ftl b/Resources/Locale/ru-RU/_NF/loadouts/loadouts.ftl
index 949560341b5..8f662b9028d 100644
--- a/Resources/Locale/ru-RU/_NF/loadouts/loadouts.ftl
+++ b/Resources/Locale/ru-RU/_NF/loadouts/loadouts.ftl
@@ -1,4 +1,4 @@
-frontier-loadout-cost = Стоимость Снаряжения: ${ $cost }
-frontier-loadout-balance = Доступный Баланс: ${ $balance }
+frontier-loadout-cost = Стоимость Снаряжения: {$cost}
+frontier-loadout-balance = Доступный Баланс: {$balance}
 # Undefined for some reason.
 loadout-group-species-restriction = Не может быть выбран вашей расой.
diff --git a/Resources/Locale/ru-RU/_NF/preferences/humanoid-character-profile.ftl b/Resources/Locale/ru-RU/_NF/preferences/humanoid-character-profile.ftl
deleted file mode 100644
index 801f8970f8f..00000000000
--- a/Resources/Locale/ru-RU/_NF/preferences/humanoid-character-profile.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-# Frontier
-humanoid-character-profile-bankbalance = ${ $bankBalance }
diff --git a/Resources/Locale/ru-RU/_NF/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_NF/store/uplink-catalog.ftl
index f6722666c16..4edf20dd04d 100644
--- a/Resources/Locale/ru-RU/_NF/store/uplink-catalog.ftl
+++ b/Resources/Locale/ru-RU/_NF/store/uplink-catalog.ftl
@@ -118,7 +118,7 @@ uplink-security-shotincend-name = Зажигательные патроны дл
 uplink-security-shotincend-desc = Коробка смертоносных зажигательных патронов калибра .50 для дробовика. Для тех случаев, когда нужно немного подогреть атмосферу.
 uplink-security-shotslug-name = Патроны с пулей для дробовика
 uplink-security-shotslug-desc = Коробка смертоносных патронов калибра .50 с пулей для дробовика. Для тех, кто предпочитает точность разбросу.
-uplink-security-cash1000-name = 1000 Кредитов
+uplink-security-cash1000-name = 1,000 Кредитов
 uplink-security-cash1000-desc = Наличные деньги в твердой валюте.
 uplink-security-empgrenade-box-name = Ящик с ЭМИ-гранатами
 uplink-security-empgrenade-box-desc = Ящик, содержащий 4 ЭМИ-гранаты.
diff --git a/Resources/Locale/ru-RU/cargo/cargo-bounty-console.ftl b/Resources/Locale/ru-RU/cargo/cargo-bounty-console.ftl
index 6324d8101d5..78ced302883 100644
--- a/Resources/Locale/ru-RU/cargo/cargo-bounty-console.ftl
+++ b/Resources/Locale/ru-RU/cargo/cargo-bounty-console.ftl
@@ -2,14 +2,14 @@ bounty-console-menu-title = Консоль запросов
 bounty-console-label-button-text = Распечатать этикетку
 bounty-console-skip-button-text = Пропустить
 bounty-console-time-label = Время: [color=orange]{ $time }[/color]
-bounty-console-reward-label = Награда: [color=limegreen]${ $reward }[/color]
-bounty-console-manifest-label = Манифест: [color=orange]{ $item }[/color]
+bounty-console-reward-label = Награда: [color=limegreen]{$reward}[/color]
+bounty-console-manifest-label = Манифест: [color=orange]{$item}[/color]
 bounty-console-manifest-entry =
     { $amount ->
         [1] { $item }
        *[other] { $item } x{ $amount }
     }
-bounty-console-manifest-reward = Награда: ${ $reward }
+bounty-console-manifest-reward = Награда: {$reward}
 bounty-console-description-label = [color=gray]{ $description }[/color]
 bounty-console-id-label = ID#{ $id }
 bounty-console-flavor-left = Запросы, полученные от местных недобросовестных торговцев.
diff --git a/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl b/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl
index 65941940223..abcf8910328 100644
--- a/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl
+++ b/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl
@@ -6,7 +6,6 @@ cargo-console-menu-account-name-none-text = Нет
 cargo-console-menu-shuttle-name-label = Название шаттла:{ " " }
 cargo-console-menu-shuttle-name-none-text = Нет
 cargo-console-menu-points-label = Кредиты:{ " " }
-cargo-console-menu-points-amount = ${ $amount }
 cargo-console-menu-shuttle-status-label = Статус шаттла:{ " " }
 cargo-console-menu-shuttle-status-away-text = Отбыл
 cargo-console-menu-order-capacity-label = Объём заказов:{ " " }
diff --git a/Resources/Locale/ru-RU/procedural/expeditions.ftl b/Resources/Locale/ru-RU/procedural/expeditions.ftl
index b265ecd96ad..53183cc5340 100644
--- a/Resources/Locale/ru-RU/procedural/expeditions.ftl
+++ b/Resources/Locale/ru-RU/procedural/expeditions.ftl
@@ -23,7 +23,7 @@ salvage-expedition-desc-mining = Собирайте ресурсы в этой 
 salvage-expedition-desc-structure =
     { $count ->
         [one] Уничтожьте { $count } { $structure } в этой зоне.
-       *[other] Уничтожьте { $count } { $structure } в этой зоне.
+       *[other] Уничтожьте { $count } {MAKEPLURAL($structure)} в этой зоне.
     }
 salvage-expedition-desc-elimination = Убейте большое и опасное существо в этой зоне.
 salvage-expedition-type-Mining = Добыча
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/catalog/fills/crates/npc.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/catalog/fills/crates/npc.ftl
index 2c1f832d7bf..35eea96c9f7 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/catalog/fills/crates/npc.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/catalog/fills/crates/npc.ftl
@@ -8,3 +8,5 @@ ent-CrateNPCEmotionalSupportSafe = ящик с ручными зверушкам
     .desc = { ent-CrateLivestock.desc }
 ent-PetCarrierNPCEmotionalSupportSafe = ручная зверушка с удобной переноской
     .desc = { ent-PetCarrier.desc }
+ent-CrateNPCPoultryCube = ящик птичьих кубиков 
+    .desc = Ящик, содержащий коробку с полным набором кубиков для создания личного курятника.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/misc/monkeycube.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/misc/monkeycube.ftl
new file mode 100644
index 00000000000..57e2e6ce2f4
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/misc/monkeycube.ftl
@@ -0,0 +1,8 @@
+ent-PoultryCubeBox = коробка куриных кубиков
+    .desc = Коробка с дегидрированными кубиками куриц и уток.
+ent-BoxTrackingDarts = ящик отслеживающих дротиков
+    .desc = Ящик, содержащий отслеживающие дротики и пинпоинтеры к ним.
+ent-ChickenCubeWrapped = куриный кубик
+    .desc = Распакуй, чтобы получить горячую цыпочку.
+ent-DuckCubeWrapped = утиный кубик
+    .desc = Распакуй, чтобы вспомнить прилипчивую песню.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/specific/rehydrateable.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/specific/rehydrateable.ftl
new file mode 100644
index 00000000000..6fb99ffbdca
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/specific/rehydrateable.ftl
@@ -0,0 +1,4 @@
+ent-ChickenCube = куриный кубик
+    .desc = Полковник Сандерс вами бы гордился.
+ent-DuckCube = утиный кубик
+    .desc = Мчится время всё вперёд, час миг век год, быстрый сказочный полёт, час миг век год, на вертолётах, на самолётах, утки у-у! Кто властитель тьмы бездонной...
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/structures/dungeon/airlocks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/structures/dungeon/airlocks.ftl
new file mode 100644
index 00000000000..324d353b3bb
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/structures/dungeon/airlocks.ftl
@@ -0,0 +1,45 @@
+ent-AirlockGlassMurkyDungeon = { ent-AirlockGlass }
+    .suffix = НЕ МАППИТЬ, ТОЛЬКО ЭКСПЫ
+    .desc = { ent-AirlockGlass.desc }
+ent-AirlockGlassDungeon = { ent-AirlockGlassMurkyDungeon }
+    .suffix = НЕ МАППИТЬ, ТОЛЬКО ЭКСПЫ
+    .desc = { ent-AirlockGlassMurkyDungeon.desc }
+ent-AirlockMaintGlassLockedDungeon = { ent-AirlockMaintGlassLocked }
+    .suffix = НЕ МАППИТЬ, ТОЛЬКО ЭКСПЫ
+    .desc = { ent-AirlockMaintGlassLocked.desc }
+ent-AirlockEngineeringGlassDungeon = { ent-AirlockEngineeringGlass }
+    .suffix = НЕ МАППИТЬ, ТОЛЬКО ЭКСПЫ
+    .desc = { ent-AirlockEngineeringGlass.desc }
+ent-AirlockSecurityGlassDungeon = { ent-AirlockSecurityGlass }
+    .suffix = НЕ МАППИТЬ, ТОЛЬКО ЭКСПЫ
+    .desc = { ent-AirlockSecurityGlass.desc }
+ent-AirlockSecurityGlassLockedDungeon = { ent-AirlockSecurityGlassLocked }
+    .suffix = НЕ МАППИТЬ, ТОЛЬКО ЭКСПЫ
+    .desc = { ent-AirlockSecurityGlassLocked.desc }
+ent-AirlockBrigGlassLockedDungeon = { ent-AirlockBrigGlassLocked }
+    .suffix = НЕ МАППИТЬ, ТОЛЬКО ЭКСПЫ
+    .desc = { ent-AirlockBrigGlassLocked.desc }
+ent-AirlockMiningGlassDungeon = { ent-AirlockMiningGlass }
+    .suffix = НЕ МАППИТЬ, ТОЛЬКО ЭКСПЫ
+    .desc = { ent-AirlockMiningGlass.desc }
+ent-AirlockMiningGlassLockedDungeon = { ent-AirlockMiningGlassLocked }
+    .suffix = НЕ МАППИТЬ, ТОЛЬКО ЭКСПЫ
+    .desc = { ent-AirlockMiningGlassLocked.desc }
+ent-AirlockVirologyGlassDungeon = { ent-AirlockVirologyGlass }
+    .suffix = НЕ МАППИТЬ, ТОЛЬКО ЭКСПЫ
+    .desc = { ent-AirlockVirologyGlass.desc }
+ent-AirlockVirologyGlassLockedDungeon = { ent-AirlockVirologyGlassLocked }
+    .suffix = НЕ МАППИТЬ, ТОЛЬКО ЭКСПЫ
+    .desc = { ent-AirlockVirologyGlassLocked.desc }
+ent-AirlockMercenaryGlassDungeon = { ent-AirlockMercenaryGlass }
+    .suffix = НЕ МАППИТЬ, ТОЛЬКО ЭКСПЫ
+    .desc = { ent-AirlockMercenaryGlass.desc }
+ent-AirlockMercenaryGlassLockedDungeon = { ent-AirlockMercenaryGlassLocked }
+    .suffix = НЕ МАППИТЬ, ТОЛЬКО ЭКСПЫ
+    .desc = { ent-AirlockMercenaryGlassLocked.desc }
+ent-AirlockScienceGlassLockedDungeon = { ent-AirlockScienceGlassLocked }
+    .suffix = НЕ МАППИТЬ, ТОЛЬКО ЭКСПЫ
+    .desc = { ent-AirlockScienceGlassLocked.desc }
+ent-AirlockHydroGlassLockedDungeon = { ent-AirlockHydroGlassLocked }
+    .suffix = НЕ МАППИТЬ, ТОЛЬКО ЭКСПЫ
+    .desc = { ent-AirlockHydroGlassLocked.desc }
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/structures/dungeon/grille.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/structures/dungeon/grille.ftl
new file mode 100644
index 00000000000..438da34f0f8
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/structures/dungeon/grille.ftl
@@ -0,0 +1,3 @@
+ent-GrilleDungeon = { ent-Grille }
+    .suffix = НЕ МАППИТЬ, ТОЛЬКО ЭКСПЫ
+    .desc = { ent-Grille.desc }
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/structures/dungeon/windows.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/structures/dungeon/windows.ftl
new file mode 100644
index 00000000000..1d0ef9021f1
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/structures/dungeon/windows.ftl
@@ -0,0 +1,21 @@
+ent-WindowMurkyDungeon = { ent-Window }
+    .suffix = НЕ МАППИТЬ, ТОЛЬКО ЭКСПЫ
+    .desc = { ent-Window.desc }
+ent-WindowDungeon = { ent-Window }
+    .suffix = НЕ МАППИТЬ, ТОЛЬКО ЭКСПЫ
+    .desc = { ent-Window.desc }
+ent-ReinforcedWindowDungeon = { ent-ReinforcedWindow }
+    .suffix = НЕ МАППИТЬ, ТОЛЬКО ЭКСПЫ
+    .desc = { ent-ReinforcedWindow.desc }
+ent-MiningWindowDungeon = { ent-MiningWindow }
+    .suffix = НЕ МАППИТЬ, ТОЛЬКО ЭКСПЫ
+    .desc = { ent-MiningWindow.desc }
+ent-PlasmaWindowDungeon = { ent-PlasmaWindow }
+    .suffix = НЕ МАППИТЬ, ТОЛЬКО ЭКСПЫ
+    .desc = { ent-PlasmaWindow.desc }
+ent-ReinforcedPlasmaWindowDungeon = { ent-ReinforcedPlasmaWindow }
+    .suffix = НЕ МАППИТЬ, ТОЛЬКО ЭКСПЫ
+    .desc = { ent-ReinforcedPlasmaWindow.desc }
+ent-ReinforcedUraniumWindowDungeon = { ent-ReinforcedUraniumWindow }
+    .suffix = НЕ МАППИТЬ, ТОЛЬКО ЭКСПЫ
+    .desc = { ent-ReinforcedUraniumWindow.desc }
\ No newline at end of file

From e273a060f92a0357016f2a317c143afdaa5bfb4b Mon Sep 17 00:00:00 2001
From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com>
Date: Tue, 13 Aug 2024 00:12:40 +0300
Subject: [PATCH 15/15] Fix linter

---
 .../prototypes/_nf/entities/objects/misc/monkeycube.ftl       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/misc/monkeycube.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/misc/monkeycube.ftl
index 57e2e6ce2f4..8a1e88adc3a 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/misc/monkeycube.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/misc/monkeycube.ftl
@@ -1,8 +1,6 @@
 ent-PoultryCubeBox = коробка куриных кубиков
     .desc = Коробка с дегидрированными кубиками куриц и уток.
-ent-BoxTrackingDarts = ящик отслеживающих дротиков
-    .desc = Ящик, содержащий отслеживающие дротики и пинпоинтеры к ним.
 ent-ChickenCubeWrapped = куриный кубик
     .desc = Распакуй, чтобы получить горячую цыпочку.
 ent-DuckCubeWrapped = утиный кубик
-    .desc = Распакуй, чтобы вспомнить прилипчивую песню.
\ No newline at end of file
+    .desc = Распакуй, чтобы вспомнить прилипчивую песню.