diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm
index ff87fb58e41..5e2b40d9526 100644
--- a/code/game/jobs/job/assistant.dm
+++ b/code/game/jobs/job/assistant.dm
@@ -13,21 +13,16 @@
 	minimal_access = list()	//See /datum/job/assistant/get_access()
 	alt_titles = list("Technical Assistant","Medical Intern","Research Assistant","Visitor", "Resident")
 
-/datum/job/assistant/equip(var/mob/living/carbon/human/H)
+/datum/job/assistant/equip(var/mob/living/carbon/human/H, var/alt_title)
 	if(!H)	return 0
 	switch(H.backbag)
 		if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
 		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(H), slot_back)
 		if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-	if (H.mind.role_alt_title)
-		switch(H.mind.role_alt_title)
-			if("Visitor") //I doubt someone visiting the station would want to wear an ugly grey uniform
-				H.equip_to_slot_or_del(new /obj/item/clothing/under/assistantformal(H), slot_w_uniform)
-
-			if("Resident")
-				H.equip_to_slot_or_del(new /obj/item/clothing/under/color/white(H), slot_w_uniform)
-			else
-				H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), slot_w_uniform)
+	if(has_alt_title(H, alt_title,"Visitor")) //I doubt someone visiting the station would want to wear an ugly grey uniform
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/assistantformal(H), slot_w_uniform)
+	else if(has_alt_title(H, alt_title,"Resident"))
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/color/white(H), slot_w_uniform)
 	else
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), slot_w_uniform)
 	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
diff --git a/html/changelogs/EmperorJon.yml b/html/changelogs/EmperorJon.yml
new file mode 100644
index 00000000000..8eb9bf723dd
--- /dev/null
+++ b/html/changelogs/EmperorJon.yml
@@ -0,0 +1,7 @@
+author: EmperorJon
+
+delete-after: True
+
+changes: 
+  - rscadd: "Ports Baystation's setup screen changes, thanks to PsiOmegaDelta."
+  - rscadd: "Includes character preview with toggleable equipment, visible loadout items, ghost character sprites, and custom colour underwear. Your underwear will have reset, so you'll need to set it back."