From 0d9e4a96b90f9b8a27b3c940485bfe968aed0931 Mon Sep 17 00:00:00 2001
From: Doxxmedearly <38594443+Doxxmedearly@users.noreply.github.com>
Date: Sat, 11 Jun 2022 14:13:08 -0400
Subject: [PATCH] Cryogenic Announcement Tweaks (#14253)

---
 code/game/machinery/cryopod.dm                    | 4 ++--
 code/modules/ghostroles/spawner/human/human.dm    | 1 +
 html/changelogs/doxxmedearly-cryonnouncements.yml | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 html/changelogs/doxxmedearly-cryonnouncements.yml

diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index e46dc3eca8b..a1cad4cf13a 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -402,8 +402,8 @@ var/global/list/frozen_crew = list()
 				W.forceMove(control_computer)
 			else
 				W.forceMove(T)
-
-	global_announcer.autosay("[occupant.real_name], [occupant.mind.role_alt_title], [on_store_message] [on_store_location].", "[on_store_name]")
+	if(isStationLevel(z))
+		global_announcer.autosay("[occupant.real_name], [occupant.mind.role_alt_title], [on_store_message] [on_store_location].", "[on_store_name]")
 	visible_message(SPAN_NOTICE("\The [src] hums and hisses as it moves [occupant] to [on_store_location]."))
 	playsound(loc, on_store_sound, 25)
 	frozen_crew += occupant
diff --git a/code/modules/ghostroles/spawner/human/human.dm b/code/modules/ghostroles/spawner/human/human.dm
index 33df932a780..5ad86dec3a5 100644
--- a/code/modules/ghostroles/spawner/human/human.dm
+++ b/code/modules/ghostroles/spawner/human/human.dm
@@ -97,6 +97,7 @@
 
 	if(assigned_role)
 		M.mind.assigned_role = assigned_role
+		M.mind.role_alt_title = assigned_role
 	if(special_role)
 		M.mind.special_role = special_role
 	if(faction)
diff --git a/html/changelogs/doxxmedearly-cryonnouncements.yml b/html/changelogs/doxxmedearly-cryonnouncements.yml
new file mode 100644
index 00000000000..d474deabf24
--- /dev/null
+++ b/html/changelogs/doxxmedearly-cryonnouncements.yml
@@ -0,0 +1,5 @@
+author: Doxxmedearly
+delete-after: True
+changes:
+  - bugfix: "Ghost roles jobs will no longer show up as a blank space when entering cryo."
+  - tweak: "The cryogenic oversight announcer will only announce when people cryo if the cryopod is on the Horizon."