diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm
index bb13ffbc47f..075f3c079df 100644
--- a/code/controllers/subsystems/job.dm
+++ b/code/controllers/subsystems/job.dm
@@ -513,7 +513,8 @@
return EquipRank(H, rank, 1)
var/list/spawn_in_storage = list()
- to_chat(H,"You have ten minutes to reach the station before you will be forced there.")
+ if(spawning_at == "Arrivals Shuttle")
+ to_chat(H,SPAN_NOTICE("You have ten minutes to reach the station before you will be forced there."))
if(H.needs_wheelchair())
H.equip_wheelchair()
@@ -560,7 +561,8 @@
BITSET(H.hud_updateflag, IMPLOYAL_HUD)
BITSET(H.hud_updateflag, SPECIALROLE_HUD)
- to_chat(H, "[current_map.command_spawn_message]")
+ if(spawning_at == "Arrivals Shuttle")
+ to_chat(H, "[current_map.command_spawn_message]")
Debug("EP/([H]): Completed.")
@@ -977,9 +979,16 @@
if(!uniform) // silicons don't have uniforms or gear
return
var/datum/outfit/U = new uniform
+ var/spawned_uniform = FALSE
+ var/spawned_suit = FALSE
for(var/item in prefs.gear)
var/datum/gear/L = gear_datums[item]
if(L.slot == slot_w_uniform)
- H.equip_or_collect(new U.uniform(H), H.back)
- break
+ if(U.uniform && !spawned_uniform)
+ H.equip_or_collect(new U.uniform(H), H.back)
+ spawned_uniform = TRUE
+ if(L.slot == slot_wear_suit)
+ if(U.suit && !spawned_suit)
+ H.equip_or_collect(new U.suit(H), H.back)
+ spawned_suit = TRUE
#undef Debug
diff --git a/html/changelogs/CryoFixes.yml b/html/changelogs/CryoFixes.yml
new file mode 100644
index 00000000000..eb02cb6967c
--- /dev/null
+++ b/html/changelogs/CryoFixes.yml
@@ -0,0 +1,8 @@
+author: TheGreyWolf
+
+delete-after: True
+
+changes:
+ - bugfix: "Odin arrival message will no longer appear when spawning at cryo."
+ - bugfix: "Spawning at cryo will no longer show a message saying you have 10 min to get to Aurora."
+ - bugfix: "When using the autodrobe while playing a role getting a suit, such as the chef, it will now be put into the bag if the suit slot is occupied."