From e1aec88cf44f52cd082c49990fe6595dd2c0502d Mon Sep 17 00:00:00 2001
From: mikomyazaki <47489928+mikomyazaki@users.noreply.github.com>
Date: Fri, 18 Feb 2022 11:05:58 +0000
Subject: [PATCH] Being assigned a special role now clears 'role_alt_title'
 (#13205)

---
 code/game/antagonist/antagonist.dm         | 1 +
 code/game/antagonist/antagonist_add.dm     | 3 ++-
 html/changelogs/outfit_clears_job_rank.yml | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/outfit_clears_job_rank.yml

diff --git a/code/game/antagonist/antagonist.dm b/code/game/antagonist/antagonist.dm
index 2c48f34f460..8eaf23b8c49 100644
--- a/code/game/antagonist/antagonist.dm
+++ b/code/game/antagonist/antagonist.dm
@@ -199,6 +199,7 @@
 	//Ensure that antags with ANTAG_OVERRIDE_JOB do not occupy job slots.
 	if(flags & ANTAG_OVERRIDE_JOB)
 		player.assigned_role = role_text
+		player.role_alt_title = role_text
 
 	//Ensure that a player cannot be drafted for multiple antag roles, taking up slots for antag roles that they will not fill.
 	player.special_role = role_text
diff --git a/code/game/antagonist/antagonist_add.dm b/code/game/antagonist/antagonist_add.dm
index d08f7920a2d..1cc74fc0432 100644
--- a/code/game/antagonist/antagonist_add.dm
+++ b/code/game/antagonist/antagonist_add.dm
@@ -6,6 +6,7 @@
 	//do this again, just in case
 	if(flags & ANTAG_OVERRIDE_JOB)
 		player.assigned_role = role_text
+		player.role_alt_title = role_text
 	player.special_role = role_text
 
 	if(istype(player.current, /mob/abstract))
@@ -122,4 +123,4 @@
 
 	//Run the query to update the db entry with the removal time
 	var/DBQuery/update_query = dbcon.NewQuery("UPDATE ss13_antag_log SET special_role_removed = :special_role_removed: WHERE id = :id:")
-	update_query.Execute(list("id"=db_log_id,"special_role_removed"="[get_round_duration_formatted()]:00"))
\ No newline at end of file
+	update_query.Execute(list("id"=db_log_id,"special_role_removed"="[get_round_duration_formatted()]:00"))
diff --git a/html/changelogs/outfit_clears_job_rank.yml b/html/changelogs/outfit_clears_job_rank.yml
new file mode 100644
index 00000000000..b1839ad3cc0
--- /dev/null
+++ b/html/changelogs/outfit_clears_job_rank.yml
@@ -0,0 +1,6 @@
+author: mikomyazaki
+
+delete-after: True
+
+changes:
+  - bugfix: "Being assigned a special role now clears 'role_alt_title', which could lead to you getting an ID with your previous job on it when spawning as an antagonist."