Merge branch 'master' into 2024-10-15-deaddrop-teardown

new-frontiers-14 · Oct 15, 2024 · 6231835 · 6231835
2 parents 61384b3 + 018a5a6
commit 6231835
Show file tree

Hide file tree

Showing 31 changed files with 319 additions and 207 deletions.
diff --git a/Content.Client/Nyanotrasen/Mail/MailSystem.cs b/Content.Client/Nyanotrasen/Mail/MailSystem.cs
@@ -38,7 +38,7 @@ protected override void OnAppearanceChange(EntityUid uid, MailComponent componen
             if (args.Sprite == null)
                 return;
 
-            if (_appearance.TryGetData(uid, MailVisuals.JobIcon, out string job) ||
+            if (!_appearance.TryGetData(uid, MailVisuals.JobIcon, out string job) ||
                 !_prototypeManager.TryIndex<JobIconPrototype>(job, out var icon))
                 return;
 

diff --git a/Content.Server/Shipyard/Systems/ShipyardSystem.cs b/Content.Server/Shipyard/Systems/ShipyardSystem.cs
@@ -84,7 +84,6 @@ private void OnShipyardStartup(EntityUid uid, ShipyardConsoleComponent component
         if (!_enabled)
             return;
         InitializeConsole();
-        SetupShipyard();
     }
 
     private void OnRoundRestart(RoundRestartCleanupEvent ev)
@@ -101,7 +100,7 @@ private void SetShipyardEnabled(bool value)
 
         if (value)
         {
-            SetupShipyard();
+            SetupShipyardIfNeeded();
         }
         else
         {
@@ -148,6 +147,7 @@ public bool TryPurchaseShuttle(EntityUid stationUid, string shuttlePath, [NotNul
     private bool TryAddShuttle(string shuttlePath, [NotNullWhen(true)] out EntityUid? shuttleGrid)
     {
         shuttleGrid = null;
+        SetupShipyardIfNeeded();
         if (ShipyardMap == null)
             return false;
 
@@ -276,7 +276,7 @@ private void CleanupShipyard()
         _mapManager.DeleteMap(ShipyardMap.Value);
     }
 
-    private void SetupShipyard()
+    private void SetupShipyardIfNeeded()
     {
         if (ShipyardMap != null && _mapManager.MapExists(ShipyardMap.Value))
             return;

diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
@@ -4558,3 +4558,30 @@ Entries:
       message: The NSF Marauder is no longer available for purchase.
   id: 5402
   time: '2024-10-14T22:35:31.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Fix
+      message: Implanters in loadout selection are now properly labeled.
+  id: 5403
+  time: '2024-10-15T07:41:16.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: Skipper kitchen equipment.
+  id: 5404
+  time: '2024-10-15T07:43:15.0000000+00:00'
+- author: MisterMecky
+  changes:
+    - type: Fix
+      message: prebuilt tabletop computers can now be properly deconstructed
+  id: 5405
+  time: '2024-10-15T13:51:09.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: >-
+        Slightly changed how wearable containers (like backpacks etc) work: now
+        it's possible (but rather pointless) to put a belt in backpack, a
+        backpack in duffel, a toolbox fits in a backpack.
+  id: 5406
+  time: '2024-10-15T21:01:40.0000000+00:00'
diff --git a/Resources/Maps/_NF/POI/nfsd.yml b/Resources/Maps/_NF/POI/nfsd.yml
@@ -14857,7 +14857,7 @@ entities:
     - type: Transform
       pos: -0.5,-3.5
       parent: 1
-- proto: SpawnPointSeniorOfficer
+- proto: NFSpawnPointSeniorOfficer
   entities:
   - uid: 2700
     components:

diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/wendigo.yml b/Resources/Maps/_NF/Shuttles/Nfsd/wendigo.yml
@@ -2012,9 +2012,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-2.5
       parent: 1
-    - type: DeviceNetwork
-      configurators:
-      - invalid
     - type: AtmosPipeColor
       color: '#AA0000FF'
   - uid: 327

diff --git a/Resources/Maps/_NF/Shuttles/skipper.yml b/Resources/Maps/_NF/Shuttles/skipper.yml
@@ -829,15 +829,15 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -4.5,1.5
+      pos: -4.4,1.5
       parent: 1
 - proto: ButtonFrameGrey
   entities:
-  - uid: 307
+  - uid: 305
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,1.5
+      rot: 3.141592653589793 rad
+      pos: -4.8,1.5
       parent: 1
 - proto: CableApcExtension
   entities:
@@ -1236,6 +1236,13 @@ entities:
     - type: Transform
       pos: -1.2326875,8.501068
       parent: 1
+- proto: ClosetWallO2N2FilledRandom
+  entities:
+  - uid: 307
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 1
 - proto: ClothingOuterWinterChef
   entities:
   - uid: 415
@@ -1276,8 +1283,6 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-    - type: Physics
-      canCollide: False
     - type: ItemSlots
 - proto: CrateNPCCow
   entities:
@@ -1751,9 +1756,9 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-- proto: GasPressurePumpOn
+- proto: GasPressurePumpOnMax
   entities:
-  - uid: 37
+  - uid: 260
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2016,6 +2021,13 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,0.5
       parent: 1
+- proto: KitchenAssembler
+  entities:
+  - uid: 427
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 1
 - proto: KitchenDeepFryer
   entities:
   - uid: 265
@@ -2024,9 +2036,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -3.5,1.5
       parent: 1
-- proto: KitchenElectricGrill
+- proto: KitchenElectricRange
   entities:
-  - uid: 260
+  - uid: 422
     components:
     - type: Transform
       pos: -2.5,3.5
@@ -2145,8 +2157,7 @@ entities:
   - uid: 225
     components:
     - type: Transform
-      rot: 25.132741228718352 rad
-      pos: -3.0563135,3.7324326
+      pos: -3.3616345,3.6774707
       parent: 1
 - proto: OilJarGhee
   entities:
@@ -2182,20 +2193,16 @@ entities:
       pos: -0.5,8.5
       parent: 1
     - type: FuelGenerator
-      targetPower: 9000
+      targetPower: 10000
       on: False
-    - type: Physics
-      bodyType: Static
   - uid: 149
     components:
     - type: Transform
       pos: -2.5,8.5
       parent: 1
     - type: FuelGenerator
-      targetPower: 9000
+      targetPower: 10000
       on: False
-    - type: Physics
-      bodyType: Static
 - proto: Poweredlight
   entities:
   - uid: 244
@@ -2296,32 +2303,31 @@ entities:
   - uid: 256
     components:
     - type: Transform
-      rot: 25.132741228718352 rad
-      pos: 0.2840351,3.6642082
+      rot: 6.283185307179586 rad
+      pos: -0.64247394,3.4529877
       parent: 1
 - proto: ReagentContainerRice
   entities:
   - uid: 258
     components:
     - type: Transform
-      rot: 25.132741228718352 rad
-      pos: 0.7215351,3.6642084
+      rot: 6.283185307179586 rad
+      pos: -0.9028907,3.6509042
       parent: 1
 - proto: ReagentContainerSalt
   entities:
   - uid: 47
     components:
     - type: Transform
-      rot: 25.132741228718352 rad
-      pos: -3.5050204,3.3574338
+      pos: -3.6637177,3.5941372
       parent: 1
 - proto: ReagentContainerSugar
   entities:
   - uid: 314
     components:
     - type: Transform
-      rot: 25.132741228718352 rad
-      pos: 0.5236185,3.4662917
+      rot: 6.283185307179586 rad
+      pos: -0.9028907,3.4009042
       parent: 1
 - proto: SeedExtractor
   entities:
@@ -2351,6 +2357,14 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+- proto: ShelfKitchen
+  entities:
+  - uid: 37
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,1.5
+      parent: 1
 - proto: ShuttersNormalOpen
   entities:
   - uid: 23
@@ -2641,28 +2655,42 @@ entities:
       parent: 1
 - proto: SignalButton
   entities:
-  - uid: 422
+  - uid: 423
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,1.5
+      rot: 3.141592653589793 rad
+      pos: -4.4,1.5
       parent: 1
     - type: DeviceLinkSource
       linkedPorts:
-        303:
+        17:
         - Pressed: Toggle
-        420:
+        19:
         - Pressed: Toggle
-        302:
+        18:
         - Pressed: Toggle
-        23:
+        316:
         - Pressed: Toggle
-        404:
+        25:
         - Pressed: Toggle
-        183:
+        26:
+        - Pressed: Toggle
+        27:
+        - Pressed: Toggle
+        29:
         - Pressed: Toggle
+  - uid: 426
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.8,1.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
         172:
         - Pressed: Toggle
+        183:
+        - Pressed: Toggle
         152:
         - Pressed: Toggle
         372:
@@ -2685,34 +2713,6 @@ entities:
         - Pressed: Toggle
         28:
         - Pressed: Toggle
-        421:
-        - Pressed: Toggle
-        419:
-        - Pressed: Toggle
-  - uid: 423
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,1.5
-      parent: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        17:
-        - Pressed: Toggle
-        19:
-        - Pressed: Toggle
-        18:
-        - Pressed: Toggle
-        316:
-        - Pressed: Toggle
-        25:
-        - Pressed: Toggle
-        26:
-        - Pressed: Toggle
-        27:
-        - Pressed: Toggle
-        29:
-        - Pressed: Toggle
 - proto: Sink
   entities:
   - uid: 40
@@ -2808,12 +2808,6 @@ entities:
     - type: Transform
       pos: -3.5,3.5
       parent: 1
-  - uid: 305
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,3.5
-      parent: 1
   - uid: 309
     components:
     - type: Transform

diff --git a/Resources/Maps/_NF/Test/dev_map.yml b/Resources/Maps/_NF/Test/dev_map.yml
@@ -6934,7 +6934,7 @@ entities:
     - type: Transform
       pos: -3.5,2.5
       parent: 179
-- proto: SpawnPointSeniorOfficer
+- proto: NFSpawnPointSeniorOfficer
   entities:
   - uid: 382
     components:

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -5,7 +5,7 @@
   description: A cardboard box for storing things.
   components:
   - type: Item
-    size: Large
+    size: Normal # Frontier Large<Normal
     shape:
     - 0,0,2,2
   - type: Storage
@@ -17,6 +17,7 @@
   - type: Tag
     tags:
     - BoxCardboard
+    - Trash # Frontier
 
 - type: entity
   name: mousetrap box