whoopsie (#1193)

Co-authored-by: La Villa Strangiato <mangodeity@gmail.com~>

Author: lavillastrangiato

code/_globalvars/lists/objects.dm

@@ -51,7 +51,7 @@ GLOBAL_LIST_INIT(rod_jobs, list(
 	"Mayor",
 	"Servant",
 	"Steward",
-	"Queen",
+	"Consort",
 	"King",
 	"Prince",
 	"Hand",

code/controllers/subsystem/familytree.dm

@@ -41,7 +41,7 @@ SUBSYSTEM_DEF(familytree)
 	var/excluded_jobs = list(
 		"Prince",
 		"Princess",
-		"Queen",
+		"Consort",
 		"King",
 		"Inquisitor",
 		)

code/controllers/subsystem/ticker.dm

@@ -260,7 +260,7 @@ SUBSYSTEM_DEF(ticker)
 
 /datum/controller/subsystem/ticker/proc/checkreqroles()
 	var/list/readied_jobs = list()
-	var/list/required_jobs = list("King", "Queen", "Hand")
+	var/list/required_jobs = list("King", "Hand")
 #ifdef DEPLOY_TEST
 	required_jobs = list()
 	readied_jobs = list("King")

code/game/gamemodes/roguetown/chaosmode.dm

@@ -235,7 +235,7 @@
 
 /datum/game_mode/chaosmode/proc/pick_maniac()
 	restricted_jobs = list("King",
-	"Queen",
+	"Consort",
 	"Prisoner",
 	"Dungeoneer",
 	"Witch Hunter",

code/game/gamemodes/roguetown/roguetown.dm

@@ -270,7 +270,7 @@ GLOBAL_LIST_INIT(roguegamemodes, list("Rebellion", "Vampire Lord", "Extended", "
 
 /datum/game_mode/chaosmode/proc/pick_maniac()
 	restricted_jobs = list("King",
-	"Queen",
+	"Consort",
 	"Merchant",
 	"Priest")
 	antag_candidates = get_players_for_role(ROLE_NBEAST)
@@ -299,7 +299,7 @@ GLOBAL_LIST_INIT(roguegamemodes, list("Rebellion", "Vampire Lord", "Extended", "
 /datum/game_mode/chaosmode/proc/pick_cultist()
 	var/remaining = 3 // 1 leader, 2 lackeys :)
 	restricted_jobs = list("King",
-	"Queen",
+	"Consort",
 	"Merchant",
 	"Priest")
 	antag_candidates = get_players_for_role(ROLE_ZIZOIDCULTIST)

code/game/objects/items/rogueweapons/melee/special.dm

@@ -61,7 +61,7 @@
 	if(ishuman(user))
 		var/mob/living/carbon/human/HU = user
 
-		if((HU.job != "King") && (HU.job != "Queen") && (HU.job != "Hand"))
+		if((HU.job != "King") && (HU.job != "Consort") && (HU.job != "Hand"))
 			to_chat(user, "<span class='danger'>The rod doesn't obey me.</span>")
 			return
 

code/modules/antagonists/roguetown/villain/vampirelord.dm

@@ -882,7 +882,7 @@ GLOBAL_LIST_EMPTY(vampire_objects)
 
 /datum/objective/vampirelord/infiltrate/two/check_completion()
 	var/datum/game_mode/chaosmode/C = SSticker.mode
-	var/list/noblejobs = list("King", "Queen", "Prince", "Princess", "Hand", "Steward")
+	var/list/noblejobs = list("King", "Consort", "Prince", "Princess", "Hand", "Steward")
 	for(var/datum/mind/V in C.vampires)
 		if(V.current.job in noblejobs)
 			return TRUE

code/modules/jobs/job_types/roguetown/church/priest.dm

@@ -108,17 +108,17 @@
 			if(HL.job == "King")
 				HL.job = "Ex-King"
 			if(HL.mind)
-				if(HL.mind.assigned_role == "Queen")
-					HL.mind.assigned_role = "Ex-Queen"
-			if(HL.job == "Queen")
-				HL.job = "Ex-Queen"
+				if(HL.mind.assigned_role == "Consort")
+					HL.mind.assigned_role = "Ex-Consort"
+			if(HL.job == "Consort")
+				HL.job = "Ex-Consort"
 		switch(HU.gender)
 			if("male")
 				HU.mind.assigned_role = "King"
 				HU.job = "King"
 			if("female")
-				HU.mind.assigned_role = "Queen"
-				HU.job = "Queen"
+				HU.mind.assigned_role = "Consort"
+				HU.job = "Consort"
 		SSticker.rulermob = HU
 		var/dispjob = mind.assigned_role
 		GLOB.badomens -= "nolord"

code/modules/jobs/jobs.dm

@@ -61,7 +61,7 @@ GLOBAL_LIST_INIT(nonhuman_positions, list(
 
 GLOBAL_LIST_INIT(noble_positions, list(
 	"King",
-	"Queen",
+	"Consort",
 	"Hand",
 	"Prince",
 	"Captain",