jobdisplays

code/__DEFINES/jobs.dm

@@ -100,17 +100,19 @@
 #define HAND		(1<<2)
 #define STEWARD		(1<<3)
 #define WIZARD		(1<<4)
-#define CAPTAIN		(1<<5)
-#define ARCHIVIST   (1<<6)
-#define FELDSHER    (1<<8)
-#define NIGHTMAN    (1<<9)
+#define ARCHIVIST   (1<<5)
+#define BUTLER		(1<<6)
+#define JESTER  	(1<<7)
+#define ROYAL_GUARD	(1<<8)
+
 
 #define GARRISON		(1<<1)
 
-#define GUARDSMAN	(1<<0)
-#define DUNGEONEER	(1<<1)
+#define CAPTAIN		(1<<0)
+#define GUARDSMAN	(1<<1)
 #define WATCHMAN	(1<<2)
-#define MAYOR       (1<<3)
+#define DUNGEONEER	(1<<3)
+
 
 #define TEMPLE			(1<<2)
 
@@ -121,39 +123,42 @@
 #define INQUISITOR	(1<<4)
 #define ADEPT		(1<<5)
 
-#define MERCATOR_GUILD	(1<<3)
+
+#define TOWNERS			(1<<3)
 
 #define MERCHANT	(1<<0)
 #define STEVEDORE	(1<<1)
+#define BLACKSMITH	(1<<2)
+#define MASON		(1<<3)
+#define FELDSHER    (1<<4)
+#define INNKEEP		(1<<5)
+#define COOK		(1<<6)
+#define NIGHTMAN    (1<<7)
+#define NITEMAIDEN	(1<<8)
+#define ALCHEMIST	(1<<9)
+#define TAILOR		(1<<10)
+#define SCRIBE		(1<<11)
 
-#define MAKERS_GUILD	(1<<4)
 
-#define BLACKSMITH	(1<<0)
-#define MASON		(1<<1)
+#define PEASANTS		(1<<4)
 
-#define SERFS			(1<<5)
-
-#define INNKEEP		(1<<0)
-#define ALCHEMIST	(1<<3)
+#define MAYOR       (1<<0)
+#define FARMER		(1<<1)
+#define BEASTMASTER	(1<<2)
+#define FISHER		(1<<3)
+#define LUMBERJACK	(1<<4)
+#define MINER		(1<<5)
+#define HUNTER		(1<<6)
+#define BEGGAR		(1<<6)
 
-#define TAILOR		(1<<5)
-#define SCRIBE		(1<<7)
-#define COOK		(1<<10)
 
-#define PEASANTS		(1<<6)
+#define OUTSIDERS		(1<<5)
 
-#define HUNTER		(1<<0)
-#define FARMER		(1<<1)
-#define BEASTMASTER	(1<<2)
-#define FISHER		(1<<4)
-#define LUMBERJACK	(1<<5)
-#define MINER		(1<<6)
-#define BUTLER		(1<<7)
-#define JESTER		(1<<8)
-#define ADVENTURER	(1<<9)
+#define ADVENTURER	(1<<0)
+#define WAVE_DRIFTER (1<<1)
+#define MERCENARY	(1<<2)
+#define GRAVEDIGGER	(1<<3)
 
-#define WAVE_DRIFTER (1<<16)
-#define GRAVEDIGGER	(1<<18)
 
 #define APPRENTICES		(1<<7)
 
@@ -163,6 +168,7 @@
 #define ORPHAN		(1<<3)
 #define PRINCE		(1<<4)
 
+
 #define JCOLOR_NOBLE "#9c40bf"
 #define JCOLOR_MERCHANT "#c2b449"
 #define JCOLOR_SOLDIER "#b64949"
@@ -176,61 +182,51 @@
 #define JDO_CONSORT 1.1
 #define JDO_PRINCE 1.2
 #define JDO_HAND 2
-#define JDO_STEWARD 3
-
-#define JDO_MAGICIAN 4
-#define JDO_WAPP 5
+#define JDO_ROYALGUARD 3
+#define JDO_STEWARD 4
+#define JDO_MAGICIAN 5
+#define JDO_WAPP 5.1
 #define JDO_ARCHIVIST 6
-#define JDO_FELDSHER 6.1
-
-#define JDO_CAPTAIN 7
-#define JDO_ROYALGUARD 7.1
-#define JDO_GARRISONGUARD 8
-#define JDO_GARRISONARCHER 9
-#define JDO_DUNGEONEER 10
-#define JDO_SQUIRE 11
-
-
-#define JDO_PRIEST 12
-#define JDO_CLERIC 13
-#define JDO_ACOLYTE 14
-#define JDO_GRAVEKEEPER 15
-#define JDO_TEMPLAR 15.1
-#define JDO_INQUISITOR 16
-#define JDO_ADEPT 17
-
-#define JDO_MERCHANT 18
-#define JDO_STEVEDORE 19
-
-#define JDO_ARMORER 20
-#define JDO_WSMITH 21
-#define JDO_BAPP 22
-#define JDO_MASON 23
-
-#define JDO_BUTLER 24
-#define JDO_SERVANT 25
-
-#define JDO_TAILOR 25.1
-
-#define JDO_INNKEEP 26
-#define JDO_COOK 27
-
-#define JDO_CHIEF 27.1
-#define JDO_VET 27.2
-#define JDO_BUTCHER 27.3
-#define JDO_SOILSON 27.4
-
-#define JDO_NITEMAN 28.1
-#define JDO_NITEMAIDEN 28.2
-
-#define JDO_JESTER 29
-#define JDO_PRISONER 30
-#define JDO_VILLAGER 32
-
-#define JDO_ADVENTURER 32.1
-#define JDO_PILGRIM 32.2
-#define JDO_DRIFTER 32.3
-
-#define JDO_MERCENARY 33
-
-#define JDO_VAGRANT 34
+#define JDO_BUTLER 7
+#define JDO_JESTER 8
+#define JDO_SERVANT 9.1
+
+#define JDO_CAPTAIN 10
+#define JDO_GARRISONGUARD 11
+#define JDO_GARRISONARCHER 12
+#define JDO_SQUIRE 13
+#define JDO_DUNGEONEER 14
+#define JDO_PRISONER 15
+
+#define JDO_PRIEST 20
+#define JDO_ACOLYTE 21
+#define JDO_GRAVEKEEPER 22
+#define JDO_TEMPLAR 23
+#define JDO_INQUISITOR 24
+#define JDO_ADEPT 24.1
+#define JDO_CLERIC 25
+
+#define JDO_MERCHANT 30
+#define JDO_STEVEDORE 30.1
+#define JDO_ARMORER 31
+#define JDO_WSMITH 31.1
+#define JDO_BAPP 31.2
+#define JDO_MASON 31.3
+#define JDO_FELDSHER 34
+#define JDO_TAILOR 35
+#define JDO_INNKEEP 36
+#define JDO_COOK 36.1
+#define JDO_NITEMAN 37.1
+#define JDO_NITEMAIDEN 37.2
+#define JDO_VILLAGER 38
+
+#define JDO_CHIEF 40
+#define JDO_VET 41
+#define JDO_BUTCHER 42
+#define JDO_SOILSON 43
+
+#define JDO_ADVENTURER 50
+#define JDO_PILGRIM 51
+#define JDO_DRIFTER 52
+#define JDO_MERCENARY 53
+#define JDO_VAGRANT 54

code/controllers/subsystem/job.dm

@@ -175,7 +175,7 @@ SUBSYSTEM_DEF(job)
 //		if(istype(job, GetJob(SSjob.overflow_role))) // We don't want to give him assistant, that's boring!
 //			continue
 
-		if(job.title in GLOB.noble_positions) //If you want a command position, select it!
+		if(job.title in GLOB.court_positions) //If you want a command position, select it!
 			continue
 
 		if(is_banned_from(player.ckey, job.title) || QDELETED(player))
@@ -268,7 +268,7 @@ SUBSYSTEM_DEF(job)
 //This is basically to ensure that there's atleast a few heads in the round
 /datum/controller/subsystem/job/proc/FillHeadPosition()
 	for(var/level in level_order)
-		for(var/noble_position in GLOB.noble_positions)
+		for(var/noble_position in GLOB.court_positions)
 			var/datum/job/job = GetJob(noble_position)
 			if(!job)
 				continue
@@ -286,7 +286,7 @@ SUBSYSTEM_DEF(job)
 //This proc is called at the start of the level loop of DivideOccupations() and will cause head jobs to be checked before any other jobs of the same level
 //This is also to ensure we get as many heads as possible
 /datum/controller/subsystem/job/proc/CheckHeadPositions(level)
-	for(var/noble_position in GLOB.noble_positions)
+	for(var/noble_position in GLOB.court_positions)
 		var/datum/job/job = GetJob(noble_position)
 		if(!job)
 			continue

code/game/gamemodes/roguetown/chaosmode.dm

@@ -214,13 +214,13 @@
 					blockme = TRUE
 				if(rebelguy.assigned_role in GLOB.garrison_positions)
 					blockme = TRUE
-				if(rebelguy.assigned_role in GLOB.noble_positions)
+				if(rebelguy.assigned_role in GLOB.court_positions)
 					blockme = TRUE
 				if(rebelguy.assigned_role in GLOB.apprentices_positions)
 					blockme = TRUE
 				if(rebelguy.assigned_role in GLOB.church_positions)
 					blockme = TRUE
-				if(rebelguy.assigned_role in GLOB.serf_positions)
+				if(rebelguy.assigned_role in GLOB.towner_positions)
 					blockme = TRUE
 				if(blockme)
 					continue

code/game/gamemodes/roguetown/roguetown.dm

@@ -212,11 +212,11 @@ GLOBAL_LIST_INIT(roguegamemodes, list("Rebellion", "Vampire Lord", "Extended", "
 					break
 				if(!(bandaids in allantags)) // We don't want to double dip... I guess? Two birds one stone tho, A already bandit check would check pre_bandits
 					continue
-				if(bandaids.assigned_role in GLOB.noble_positions) // Job cat string stoppers
+				if(bandaids.assigned_role in GLOB.court_positions) // Job cat string stoppers
 					continue
 				if(bandaids.assigned_role in GLOB.church_positions) // Many of these guys vanishing would suck
 					continue
-				if(bandaids.assigned_role in GLOB.serf_positions) // Many of these guys vanishing would suck
+				if(bandaids.assigned_role in GLOB.towner_positions) // Many of these guys vanishing would suck
 					continue
 
 				allantags -= bandaids
@@ -249,13 +249,13 @@ GLOBAL_LIST_INIT(roguegamemodes, list("Rebellion", "Vampire Lord", "Extended", "
 					blockme = TRUE
 				if(rebelguy.assigned_role in GLOB.garrison_positions)
 					blockme = TRUE
-				if(rebelguy.assigned_role in GLOB.noble_positions)
+				if(rebelguy.assigned_role in GLOB.court_positions)
 					blockme = TRUE
 				if(rebelguy.assigned_role in GLOB.apprentices_positions)
 					blockme = TRUE
 				if(rebelguy.assigned_role in GLOB.church_positions)
 					blockme = TRUE
-				if(rebelguy.assigned_role in GLOB.serf_positions)
+				if(rebelguy.assigned_role in GLOB.towner_positions)
 					blockme = TRUE
 				if(blockme)
 					continue
@@ -340,7 +340,7 @@ GLOBAL_LIST_INIT(roguegamemodes, list("Rebellion", "Vampire Lord", "Extended", "
 		var/blockme = FALSE
 		if(!(vampire in allantags))
 			blockme = TRUE
-		if(vampire.assigned_role in GLOB.noble_positions)
+		if(vampire.assigned_role in GLOB.court_positions)
 			continue
 		if(vampire.assigned_role in GLOB.apprentices_positions)
 			blockme = TRUE
@@ -372,7 +372,7 @@ GLOBAL_LIST_INIT(roguegamemodes, list("Rebellion", "Vampire Lord", "Extended", "
 		var/blockme = FALSE
 		if(!(werewolf in allantags))
 			blockme = TRUE
-		if(werewolf.assigned_role in GLOB.noble_positions)
+		if(werewolf.assigned_role in GLOB.court_positions)
 			blockme = TRUE
 		if(werewolf.assigned_role in GLOB.apprentices_positions)
 			blockme = TRUE

code/game/gamemodes/roguetown/roguewar.dm

@@ -210,13 +210,13 @@
 							break
 					if(rebelguy.assigned_role in GLOB.garrison_positions)
 						found = FALSE
-					if(rebelguy.assigned_role in GLOB.noble_positions)
+					if(rebelguy.assigned_role in GLOB.court_positions)
 						found = FALSE
 					if(rebelguy.assigned_role in GLOB.apprentices_positions)
 						found = FALSE
 					if(rebelguy.assigned_role in GLOB.church_positions)
 						found = FALSE
-					if(rebelguy.assigned_role in GLOB.serf_positions)
+					if(rebelguy.assigned_role in GLOB.towner_positions)
 						found = FALSE
 					if(!found)
 						continue

code/modules/admin/sql_ban_system.dm

@@ -235,7 +235,7 @@
 		var/break_counter = 0
 		//note to future developers: RT doesn't have command staff so toggle_head was removed, go back in the git history if you need to readd it
 		//departments/groups that don't have command staff would throw a javascript error since there's no corresponding reference for toggle_head()
-		var/list/headless_job_lists = list("Nobles" = GLOB.noble_positions,
+		var/list/headless_job_lists = list("Nobles" = GLOB.court_positions,
 							"Garrison" = GLOB.garrison_positions,
 							"Church" = GLOB.church_positions,
 							"Abstract" = list("Appearance", "Emote", "Deadchat", "OOC"))
@@ -252,7 +252,7 @@
 				break_counter++
 			output += "</div></div>"
 		var/list/long_job_lists = list("Peasants" = GLOB.peasant_positions,
-									"Towners" = GLOB.serf_positions,
+									"Towners" = GLOB.towner_positions,
 									"Apprentices" = GLOB.apprentices_positions,
 									"Antagonist Positions" = list(ROLE_VILLAIN, ROLE_WEREWOLF,
 									ROLE_VAMPIRE, ROLE_NBEAST, ROLE_BANDIT,

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

@@ -44,7 +44,7 @@
 /datum/antagonist/prebel/can_be_owned(datum/mind/new_owner)
 	. = ..()
 	if(.)
-		if(new_owner.assigned_role in GLOB.noble_positions)
+		if(new_owner.assigned_role in GLOB.court_positions)
 			return FALSE
 		if(new_owner.assigned_role in GLOB.garrison_positions)
 			return FALSE
@@ -112,7 +112,7 @@
 		return FALSE
 	if(!can_be_owned(candidate.mind))
 		return FALSE
-	if(candidate.mind.assigned_role in GLOB.noble_positions)
+	if(candidate.mind.assigned_role in GLOB.court_positions)
 		return FALSE
 	if(candidate.mind.assigned_role in GLOB.garrison_positions)
 		return FALSE

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

@@ -82,7 +82,7 @@ GLOBAL_LIST_EMPTY(ritualslist)
 	if(.)
 		if(new_owner.current == SSticker.rulermob)
 			return FALSE
-		if(new_owner.assigned_role in GLOB.noble_positions)
+		if(new_owner.assigned_role in GLOB.court_positions)
 			return FALSE
 		if(new_owner.assigned_role in GLOB.garrison_positions)
 			return FALSE

code/modules/jobs/job_types/roguetown/adventurer/adventurer.dm

@@ -3,7 +3,7 @@ GLOBAL_LIST_EMPTY(billagerspawns)
 /datum/job/roguetown/adventurer
 	title = "Adventurer"
 	flag = ADVENTURER
-	department_flag = PEASANTS
+	department_flag = OUTSIDERS
 	faction = "Station"
 	total_positions = 8
 	spawn_positions = 8

code/modules/jobs/job_types/roguetown/adventurer/villager.dm

@@ -33,11 +33,11 @@
 	for(var/X in GLOB.peasant_positions)
 		peopleiknow += X
 		peopleknowme += X
-	for(var/X in GLOB.serf_positions)
+	for(var/X in GLOB.towner_positions)
 		peopleiknow += X
 	for(var/X in GLOB.church_positions)
 		peopleiknow += X
 	for(var/X in GLOB.garrison_positions)
 		peopleiknow += X
-	for(var/X in GLOB.noble_positions)
+	for(var/X in GLOB.court_positions)
 		peopleiknow += X*/

code/modules/jobs/job_types/roguetown/garrison/royalguard.dm

@@ -1,7 +1,7 @@
 /datum/job/roguetown/royalguard
 	title = "Royal Guard"
-	flag = GUARDSMAN
-	department_flag = GARRISON
+	flag = ROYAL_GUARD
+	department_flag = NOBLEMEN
 	faction = "Station"
 	total_positions = 2
 	spawn_positions = 2