diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
index fbea63bbb0..d6b16f72b7 100644
--- a/Content.Server/GameTicking/GameTicker.Spawning.cs
+++ b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -291,7 +291,10 @@ namespace Content.Server.GameTicking
 
             EntityUid? mobMaybe = null;
             var spawnPointType = SpawnPointType.Arrivals;
-            if (jobPrototype.AlwaysUseSpawner || overall < TimeSpan.FromHours(_cfg.GetCVar(SunriseCCVars.ArrivalsMinHours)))
+            if (jobPrototype.AlwaysUseSpawner ||
+                overall < TimeSpan.FromHours(_cfg.GetCVar(SunriseCCVars.ArrivalsMinHours)) ||
+                _cfg.GetCVar(SunriseCCVars.ArrivalsRoundStartSpawn)
+                )
             {
                 lateJoin = false;
                 spawnPointType = SpawnPointType.Job;
diff --git a/Content.Server/Implants/ChameleonControllerSystem.cs b/Content.Server/Implants/ChameleonControllerSystem.cs
index 9e876f9399..d1972cfa81 100644
--- a/Content.Server/Implants/ChameleonControllerSystem.cs
+++ b/Content.Server/Implants/ChameleonControllerSystem.cs
@@ -100,7 +100,7 @@ public sealed class ChameleonControllerSystem : SharedChameleonControllerSystem
             return;
 
         defaultRoleLoadout = new RoleLoadout(jobProtoId);
-        defaultRoleLoadout.SetDefault(profile, null, _proto); // only sets the default if the player has no loadout
+        defaultRoleLoadout.SetDefault(profile, null, _proto, []); // only sets the default if the player has no loadout
     }
 
     private void ChameleonControllerOutfitItemSelected(Entity<ChameleonClothingComponent> ent, ref InventoryRelayedEvent<ChameleonControllerOutfitSelectedEvent> args)
diff --git a/Content.Shared/Standing/SharedStandingStateSystem.cs b/Content.Shared/Standing/SharedStandingStateSystem.cs
index 85cd55f72f..98ddfebd25 100644
--- a/Content.Shared/Standing/SharedStandingStateSystem.cs
+++ b/Content.Shared/Standing/SharedStandingStateSystem.cs
@@ -56,7 +56,7 @@ public abstract class SharedStandingStateSystem : EntitySystem
 
     private static float _fallDeadChance;
 
-    public const float FallModifier = 0.4f;
+    public const float FallModifier = 0.2f;
 
     private const int StandingCollisionLayer = (int) CollisionGroup.LowImpassable;
 
diff --git a/Content.Shared/_Sunrise/Eye/NightVision/Systems/NightVisionDeviceSystem.cs b/Content.Shared/_Sunrise/Eye/NightVision/Systems/NightVisionDeviceSystem.cs
index 6b0c5251b4..be3ad2dd11 100644
--- a/Content.Shared/_Sunrise/Eye/NightVision/Systems/NightVisionDeviceSystem.cs
+++ b/Content.Shared/_Sunrise/Eye/NightVision/Systems/NightVisionDeviceSystem.cs
@@ -115,7 +115,7 @@ public sealed class NightVisionDeviceSystem : EntitySystem
             _cell.SetDrawEnabled((ent.Owner, draw), false);
         }
 
-        _appearance.SetData(ent, ToggleableLightVisuals.Enabled, false);
+        _appearance.SetData(ent, ToggleableVisuals.Enabled, false);
 
         var updVisEv = new NightVisionDeviceUpdateVisualsEvent();
         RaiseLocalEvent(ent, ref updVisEv);
@@ -146,7 +146,7 @@ public sealed class NightVisionDeviceSystem : EntitySystem
             _cell.SetDrawEnabled((ent.Owner, draw), ent.Comp.Activated);
         }
 
-        _appearance.SetData(ent, ToggleableLightVisuals.Enabled, ent.Comp.Activated);
+        _appearance.SetData(ent, ToggleableVisuals.Enabled, ent.Comp.Activated);
 
         var updVisEv = new NightVisionDeviceUpdateVisualsEvent();
         RaiseLocalEvent(ent, ref updVisEv);
diff --git a/Content.Shared/_Sunrise/SunriseCCVars/SunriseCCVars.cs b/Content.Shared/_Sunrise/SunriseCCVars/SunriseCCVars.cs
index d079f1226f..84503c97e4 100644
--- a/Content.Shared/_Sunrise/SunriseCCVars/SunriseCCVars.cs
+++ b/Content.Shared/_Sunrise/SunriseCCVars/SunriseCCVars.cs
@@ -446,6 +446,9 @@ public sealed partial class SunriseCCVars : CVars
     public static readonly CVarDef<int> ArrivalsMinHours =
         CVarDef.Create("transithub.arrivals_min_hours", 0, CVar.SERVER | CVar.ARCHIVE);
 
+    public static readonly CVarDef<bool> ArrivalsRoundStartSpawn =
+        CVarDef.Create("transithub.arrivals_round_start_spawn", true, CVar.SERVER | CVar.ARCHIVE);
+
     /*
      * Random items-artifacts
      */
diff --git a/Resources/ConfigPresets/Build/development.toml b/Resources/ConfigPresets/Build/development.toml
index a42a218a11..29b05be2c9 100644
--- a/Resources/ConfigPresets/Build/development.toml
+++ b/Resources/ConfigPresets/Build/development.toml
@@ -42,3 +42,6 @@ see_own_notes = true
 random_characters = true
 random_species_weights = ""
 ssd_sleep_time = 3600
+
+[transithub]
+arrivals_round_start_spawn = false
diff --git a/Resources/Prototypes/Entities/Clothing/Head/welding.yml b/Resources/Prototypes/Entities/Clothing/Head/welding.yml
index 31b1cccecc..57564b6f70 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/welding.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/welding.yml
@@ -36,7 +36,7 @@
     sprite: Clothing/Head/Welding/welding.rsi
     layers:
     - state: icon
-      map: [ "enum.ToggleVisuals.Layer" ]
+      map: [ "enum.ToggleableVisuals.Layer" ]
   - type: Clothing
     sprite: Clothing/Head/Welding/welding.rsi
     # Sunrise End
@@ -54,8 +54,8 @@
   - type: WeldingMask
   - type: GenericVisualizer
     visuals:
-      enum.ToggleVisuals.Toggled:
-        enum.ToggleVisuals.Layer:
+      enum.ToggleableVisuals.Enabled:
+        enum.ToggleableVisuals.Layer:
           True: {state: icon}
           False: {state: icon-up}
   # Sunrise-End
@@ -92,7 +92,7 @@
     # Sunrise-Start
     layers:
     - state: icon
-      map: [ "enum.ToggleVisuals.Layer" ]
+      map: [ "enum.ToggleableVisuals.Layer" ]
     # Sunrise-End
   - type: Clothing
     sprite: Clothing/Head/Welding/flame_welding_mask.rsi
@@ -114,7 +114,7 @@
     # Sunrise-Start
     layers:
     - state: icon
-      map: [ "enum.ToggleVisuals.Layer" ]
+      map: [ "enum.ToggleableVisuals.Layer" ]
     # Sunrise-End
   - type: Clothing
     sprite: Clothing/Head/Welding/blue_flame_welding_mask.rsi
@@ -136,7 +136,7 @@
     # Sunrise-Start
     layers:
     - state: icon
-      map: [ "enum.ToggleVisuals.Layer" ]
+      map: [ "enum.ToggleableVisuals.Layer" ]
     # Sunrise-End
   - type: Clothing
     sprite: Clothing/Head/Welding/paintedwelding.rsi
diff --git a/Resources/Prototypes/Recipes/Lathes/categories.yml b/Resources/Prototypes/Recipes/Lathes/categories.yml
index a8b80f687e..cfe5d4a0a4 100644
--- a/Resources/Prototypes/Recipes/Lathes/categories.yml
+++ b/Resources/Prototypes/Recipes/Lathes/categories.yml
@@ -106,11 +106,6 @@
   id: Wood
   name: lathe-category-wood
 
-# Science
-- type: latheCategory
-  id: Mech
-  name: lathe-category-mechs
-
 # Security TechFab
 - type: latheCategory
   id: Ammo
diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/official.yml b/Resources/Prototypes/Roles/Jobs/CentComm/official.yml
index 68fc11b679..9136ce64fe 100644
--- a/Resources/Prototypes/Roles/Jobs/CentComm/official.yml
+++ b/Resources/Prototypes/Roles/Jobs/CentComm/official.yml
@@ -1,20 +1,21 @@
-- type: job
-  id: CentralCommandOfficial
-  name: job-name-centcomoff
-  description: job-description-centcomoff
-  playTimeTracker: JobCentralCommandOfficial
-  setPreference: false
-  startingGear: CentcomGear
-  icon: "JobIconNanotrasen"
-  supervisors: job-supervisors-hos
-  canBeAntag: false
-  accessGroups:
-  - AllAccess
-  access:
-  - CentralCommand
-  special:
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant, DeathRattleImplantCentcomm ]
+# Sunrise-Edit: Move to _Sunrise
+#- type: job
+#  id: CentralCommandOfficial
+#  name: job-name-centcomoff
+#  description: job-description-centcomoff
+#  playTimeTracker: JobCentralCommandOfficial
+#  setPreference: false
+#  startingGear: CentcomGear
+#  icon: "JobIconNanotrasen"
+#  supervisors: job-supervisors-hos
+#  canBeAntag: false
+#  accessGroups:
+#  - AllAccess
+#  access:
+#  - CentralCommand
+#  special:
+#  - !type:AddImplantSpecial
+#    implants: [ MindShieldImplant, DeathRattleImplantCentcomm ]
 
 - type: startingGear
   id: CentcomGear
diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/magboots.yml
index 78bd7ffe89..3d130c9ace 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/magboots.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/magboots.yml
@@ -56,7 +56,7 @@
     sprite: _Sunrise/Clothing/Shoes/magboots-atmos.rsi
     layers:
     - state: icon
-      map: [ "enum.ToggleVisuals.Layer" ]
+      map: [ "enum.ToggleableVisuals.Layer" ]
   - type: Clothing
     sprite: _Sunrise/Clothing/Shoes/magboots-atmos.rsi
   - type: PowerChargerVisuals
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/zippos.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/zippos.yml
index 4e8124f092..0d4423fd5b 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/zippos.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/zippos.yml
@@ -38,7 +38,7 @@
   - type: Appearance
   - type: GenericVisualizer
     visuals:
-      enum.ToggleVisuals.Toggled:
+      enum.ToggleableVisuals.Enabled:
         open:
           True: { visible: true }
           False: { visible: false }
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/defib.yml
index e3870698de..b415e278e1 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/defib.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/defib.yml
@@ -9,13 +9,13 @@
       layers:
         - state: defib
         - state: defib-on
-          map: [ "enum.ToggleVisuals.Layer" ]
+          map: [ "enum.ToggleableVisuals.Layer" ]
           visible: false
           shader: unshaded
     - type: GenericVisualizer
       visuals:
-        enum.ToggleVisuals.Toggled:
-          enum.ToggleVisuals.Layer:
+        enum.ToggleableVisuals.Enabled:
+          enum.ToggleableVisuals.Layer:
             True: { visible: true }
             False: { visible: false }
     - type: Item
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Robotics/borg_tools.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Robotics/borg_tools.yml
index 137bb02d0e..688aa07861 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Robotics/borg_tools.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Robotics/borg_tools.yml
@@ -397,7 +397,7 @@
     - state: indwelder_cyborg-on
       visible: false
       shader: unshaded
-      map: ["enum.ToggleVisuals.Layer"]
+      map: ["enum.ToggleableVisuals.Layer"]
   - type: Item
     size: Small
   - type: SolutionContainerManager
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/cane-nt.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/cane-nt.yml
index f71599943b..cd4b588bc2 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/cane-nt.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/cane-nt.yml
@@ -8,7 +8,7 @@
     sprite: _Sunrise/Objects/Weapons/Melee/cane-nt.rsi
     layers:
     - state: cane-nt
-      map: [ "enum.ToggleVisuals.Layer" ]
+      map: [ "enum.ToggleableVisuals.Layer" ]
   - type: Stunbaton
     energyPerUse: 25
   - type: ItemToggle
@@ -56,8 +56,8 @@
   - type: Appearance
   - type: GenericVisualizer
     visuals:
-     enum.ToggleVisuals.Toggled:
-        enum.ToggleVisuals.Layer:
+     enum.ToggleableVisuals.Enabled:
+        enum.ToggleableVisuals.Layer:
           True: {state: cane-nt-active}
           False: {state: cane-nt}
   - type: Riggable
@@ -68,4 +68,4 @@
   - type: InjectableSolution
     solution: battery
   - type: DrawableSolution
-    solution: battery
\ No newline at end of file
+    solution: battery
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/telebaton.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/telebaton.yml
index 3cca790e4f..8863f47679 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/telebaton.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/telebaton.yml
@@ -23,7 +23,7 @@
     sprite: _Sunrise/Objects/Weapons/Melee/telebaton.rsi
     layers:
     - state: telebaton_off
-      map: [ "enum.ToggleVisuals.Layer" ]
+      map: [ "enum.ToggleableVisuals.Layer" ]
   - type: ItemToggleMeleeWeapon
     activatedDamage:
       types:
@@ -57,8 +57,8 @@
   - type: Appearance
   - type: GenericVisualizer
     visuals:
-     enum.ToggleVisuals.Toggled:
-        enum.ToggleVisuals.Layer:
+     enum.ToggleableVisuals.Enabled:
+        enum.ToggleableVisuals.Layer:
           True: {state: telebaton_on}
           False: {state: telebaton_off}
   - type: StaticPrice
diff --git a/Resources/Prototypes/_Sunrise/Entities/Stations/nanotrasen.yml b/Resources/Prototypes/_Sunrise/Entities/Stations/nanotrasen.yml
index 29b7d09937..49cbd0ff25 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Stations/nanotrasen.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Stations/nanotrasen.yml
@@ -31,5 +31,6 @@
   - BaseStationAllEventsEligible
   - BaseStationNanotrasen
   - BaseStationDeliveries
+  - BaseStationTransitHub
   components:
   - type: Transform