Merge remote-tracking branch 'refs/remotes/wizards/master'

# Conflicts: # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/migration.yml
space-sunrise · Sep 19, 2024 · c11a663 · c11a663
2 parents 045a0c2 + e490b69
commit c11a663
Show file tree

Hide file tree

Showing 12 changed files with 14,729 additions and 12,191 deletions.
diff --git a/Content.Server/Bed/Cryostorage/CryostorageSystem.cs b/Content.Server/Bed/Cryostorage/CryostorageSystem.cs
@@ -239,6 +239,7 @@ public void HandleEnterCryostorage(Entity<CryostorageContainedComponent> ent, Ne
             Loc.GetString(
                 "earlyleave-cryo-announcement",
                 ("character", name),
+                ("entity", ent.Owner),
                 ("job", CultureInfo.CurrentCulture.TextInfo.ToTitleCase(jobName))
             ), Loc.GetString("earlyleave-cryo-sender"),
             playDefault: false

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Cojoke-dot
-  changes:
-  - message: You can no longer shoot out of crates with guns
-    type: Fix
-  id: 6901
-  time: '2024-07-11T05:14:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28961
 - author: Cojoke-dot
   changes:
   - message: The Spray Painter can now be used to paint glass airlocks to look like
@@ -3921,3 +3914,11 @@
   id: 7400
   time: '2024-09-19T10:23:45.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/31659
+- author: deltanedas
+  changes:
+  - message: Removed the flare blueprint from salvage, it's now unlocked roundstart
+      in autolathes.
+    type: Remove
+  id: 7401
+  time: '2024-09-19T13:45:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32303
diff --git a/Resources/Locale/en-US/_strings/bed/cryostorage/cryogenic-storage.ftl b/Resources/Locale/en-US/_strings/bed/cryostorage/cryogenic-storage.ftl
@@ -2,5 +2,5 @@
 ### Announcement
 
 earlyleave-cryo-job-unknown = Unknown
-earlyleave-cryo-announcement = {$character} ({$job}) has entered cryogenic storage!
+earlyleave-cryo-announcement = {$character} ({$job}) { CONJUGATE-HAVE($entity) } entered cryogenic storage!
 earlyleave-cryo-sender = Station
diff --git a/Resources/Maps/cog.yml b/Resources/Maps/cog.yml
diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml
@@ -98863,11 +98863,8 @@ entities:
   - uid: 27828
     components:
     - type: Transform
-      pos: 97.5,33.5
+      pos: 31.5,-31.5
       parent: 13329
-    - type: SingletonDeviceNetServer
-      active: False
-      available: False
 - proto: Crowbar
   entities:
   - uid: 13050
@@ -198140,7 +198137,7 @@ entities:
   - uid: 13290
     components:
     - type: Transform
-      pos: 31.5,-31.5
+      pos: 97.5,33.5
       parent: 13329
   - uid: 35415
     components:

diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml
@@ -10880,7 +10880,7 @@ entities:
       pos: -42.5,29.5
       parent: 5350
     - type: Door
-      secondsUntilStateChange: -5682.053
+      secondsUntilStateChange: -5745.716
       state: Opening
     - type: DeviceLinkSink
       invokeCounter: 2
@@ -63381,14 +63381,11 @@ entities:
         - 0
 - proto: CrewMonitoringServer
   entities:
-  - uid: 26528
+  - uid: 26984
     components:
     - type: Transform
-      pos: 108.5,-7.5
+      pos: 29.5,-36.5
       parent: 5350
-    - type: SingletonDeviceNetServer
-      active: False
-      available: False
 - proto: Crowbar
   entities:
   - uid: 10811
@@ -144591,6 +144588,11 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+  - uid: 26528
+    components:
+    - type: Transform
+      pos: 108.5,-7.5
+      parent: 5350
   - uid: 26547
     components:
     - type: Transform