Merge pull request #40 from coficoficofi/PLEASE-GOD-WORK

Hopefully, fixes latejoin monarchs (???) - makes Throne of Rockhill the Throne of Azure Peak

code/controllers/subsystem/ticker.dm

@@ -67,7 +67,7 @@ SUBSYSTEM_DEF(ticker)
 	var/end_state = "undefined"
 	var/job_change_locked = FALSE
 	var/list/royals_readied = list()
-	var/rulertype = "King" // reports whether king or queen rules
+	var/rulertype = "Monarch" // reports whether king or queen rules
 	var/rulermob = null // reports what the ruling mob is.
 	var/failedstarts = 0
 	var/list/manualmodes = list()
@@ -542,7 +542,7 @@ SUBSYSTEM_DEF(ticker)
 	for(var/mob/living/carbon/human/K in world)
 		if(istype(K, /mob/living/carbon/human/dummy))
 			continue
-		if(K.job == "King")
+		if(K.job == "Monarch")
 			rulermob = K
 			return
 

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

@@ -83,7 +83,7 @@
 	for(var/mob/living/carbon/human/HU in get_step(src, src.dir))
 		if(!HU.mind)
 			continue
-		if(HU.mind.assigned_role == "King")
+		if(HU.mind.assigned_role == "Monarch")
 			continue
 		if(!HU.head)
 			continue
@@ -93,22 +93,22 @@
 		//Abdicate previous King
 		for(var/mob/living/carbon/human/HL in GLOB.human_list)
 			if(HL.mind)
-				if(HL.mind.assigned_role == "King" || HL.mind.assigned_role == "Queen Consort")
+				if(HL.mind.assigned_role == "Monarch" || HL.mind.assigned_role == "Consort")
 					HL.mind.assigned_role = "Towner" //So they don't get the innate traits of the king
 			//would be better to change their title directly, but that's not possible since the title comes from the job datum
-			if(HL.job == "King")
-				HL.job = "King Emeritus"
-			if(HL.job == "Queen Consort")
-				HL.job = "Queen Dowager"
+			if(HL.job == "Monarch")
+				HL.job = "Monarch Emeritus"
+			if(HL.job == "Consort")
+				HL.job = "Consort Dowager"
 
 		//Coronate new King (or Queen)
-		HU.mind.assigned_role = "King"
-		HU.job = "King"
+		HU.mind.assigned_role = "Monarch"
+		HU.job = "Monarch"
 		switch(HU.gender)
 			if("male")
-				SSticker.rulertype = "King"
+				SSticker.rulertype = "Monarch"
 			if("female")
-				SSticker.rulertype = "Queen"
+				SSticker.rulertype = "Monarch"
 		SSticker.rulermob = HU
 		var/dispjob = mind.assigned_role
 		removeomen(OMEN_NOLORD)

code/modules/roguetown/roguemachine/throne.dm

@@ -1,7 +1,7 @@
 GLOBAL_VAR(king_throne)
 
 /obj/structure/roguethrone
-	name = "throne of rockhill"
+	name = "throne of Azure Peak"
 	desc = "A big throne, to hold the Lord's giant personality. Say 'help' with the crown on your head if you are confused."
 	icon = 'icons/roguetown/misc/96x96.dmi'
 	icon_state = "throne"