Merge branch 'master' into Delta-vCosmeticanom

Resources/Changelog/DeltaVChangelog.yml

@@ -1,30 +1,4 @@
 Entries:
-- author: deltanedas
-  changes:
-  - message: Merged last ~weeks changes from upstream.
-    type: Add
-  - message: Fixed captain requiring global whitelist instead of just the role whitelist.
-    type: Fix
-  - message: Frezon nerfed was reverted.
-    type: Tweak
-  id: 594
-  time: '2024-10-02T22:09:14.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1957
-- author: Unkn0wnGh0st333
-  changes:
-  - message: Shoukou's Bridge and Command Room have been remodeled, alongside tons
-      of station pets, and slice of life necessities added! Yay! :3
-    type: Tweak
-  id: 595
-  time: '2024-10-03T01:26:11.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1920
-- author: Avalon-Proto
-  changes:
-  - message: Goliaths are far less hardy than they once were
-    type: Tweak
-  id: 596
-  time: '2024-10-03T12:50:47.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1955
 - author: MilonPL
   changes:
   - message: Reverted the frezon price nerf. Atmosians rejoice!
@@ -3911,3 +3885,26 @@
   id: 1093
   time: '2025-03-02T00:03:28.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/3070
+- author: IAmNotGray
+  changes:
+  - message: The TEG on Elegance is now accessible by Station Engineers. Read the
+      paper on station for more information!
+    type: Tweak
+  id: 1094
+  time: '2025-03-02T17:22:21.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/3067
+- author: Field Command
+  changes:
+  - message: Reworked engineering, bridge and sec. Added perma to now include prisoner
+      slots and all that entails with that. Soft cap up from 20 to 25.
+    type: Tweak
+  id: 1095
+  time: '2025-03-02T17:30:06.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2960
+- author: deltanedas
+  changes:
+  - message: Renamed ammonia back to miasma.
+    type: Tweak
+  id: 1096
+  time: '2025-03-02T18:06:30.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/3083

Resources/Locale/en-US/_DV/gases/gases.ftl

@@ -0,0 +1 @@
+gases-miasma = Miasma

Resources/Locale/en-US/_DV/prototypes/entities/structures/piping/atmospherics/miners.ftl

@@ -0,0 +1 @@
+ent-GasMinerAmmonia = miasma gas miner

Resources/Locale/en-US/_DV/prototypes/entities/structures/storage/canisters/gas_canisters.ftl

@@ -0,0 +1,2 @@
+ent-AmmoniaCanister = miasma canister
+    .desc = A canister that can contain any type of gas. This one is supposed to contain miasma. It can be attached to connector ports using a wrench.

Resources/Prototypes/Atmospherics/gases.yml

@@ -61,15 +61,15 @@
 
 - type: gas
   id: 6
-  name: gases-ammonia
+  name: gases-miasma # DeltaV
   specificHeat: 20
   heatCapacityRatio: 1.4
   molarMass: 44
   gasOverlaySprite: /Textures/Effects/atmospherics.rsi
   gasOverlayState: miasma
   gasMolesVisible: 2
   gasVisbilityFactor: 3.5
-  color: 56941E
+  color: 1E092A # DeltaV - purple instead of green, matches the sprite
   reagent: Ammonia
   pricePerMole: 0.15
 

Resources/Prototypes/Maps/byoin.yml

@@ -3,7 +3,7 @@
   mapName: 'Byōin'
   mapPath: /Maps/byoin.yml
   minPlayers: 0
-  maxPlayers: 20
+  maxPlayers: 25
   stations:
     Byoin:
       stationProto: StandardNanotrasenStation
@@ -39,9 +39,10 @@
             Mime: [ 1, 1 ]
             Librarian: [ 1, 1 ]
             ServiceWorker: [ 1, 1 ]
+            Boxer: [ 2, 2 ]
           #engineering
-            AtmosphericTechnician: [ 1, 1 ]
-            StationEngineer: [ 1, 2 ]
+            AtmosphericTechnician: [ 2, 2 ]
+            StationEngineer: [ 2, 2 ]
             TechnicalAssistant: [ 1, 1 ]
           #medical
             Chemist: [ 1, 1 ]
@@ -52,7 +53,7 @@
             MedicalIntern: [ 1, 1 ]
           #science
             Roboticist: [ 1, 1 ]
-            Scientist: [ 1, 2 ]
+            Scientist: [ 2, 2 ]
             ResearchAssistant: [ 1, 1 ]
             ForensicMantis: [ 1, 1 ]
             Chaplain: [ 1, 1 ]
@@ -62,15 +63,18 @@
           #security
             Warden: [ 1, 1 ]
             Detective: [ 1, 1 ]
-            SecurityOfficer: [ 1, 2 ]
+            SecurityOfficer: [ 2, 2 ]
             SecurityCadet: [ 1, 1 ]
+            Brigmedic: [ 1, 1 ]
+            Prisoner: [ 2, 2 ]
+            PrisonGuard: [ 1, 1 ]
           #justice
             Clerk: [ 1, 1 ]
             Prosecutor: [ 1, 1 ]
             Lawyer: [ 1, 1 ]
           #supply
-            SalvageSpecialist: [ 1, 1 ]
-            CargoTechnician: [ 1, 2 ]
+            SalvageSpecialist: [ 2, 2 ]
+            CargoTechnician: [ 2, 2 ]
             Courier: [ 1, 1 ]
             CargoAssistant: [ 1, 1 ]
           #civilian