Role Overhaul As The 2025 Primer (WIP)

code/__DEFINES/jobs.dm

@@ -93,28 +93,23 @@
 #define JOB_DISPLAY_ORDER_AI 31
 #define JOB_DISPLAY_ORDER_CYBORG 32
 
-#define NOBLEMEN		(1<<0)
+#define THE_ROCK_THRONE	(1<<0)
 
-#define LORD		(1<<0)
-#define CONSORT		(1<<1)
-#define HAND		(1<<2)
-#define STEWARD		(1<<3)
-#define WIZARD		(1<<4)
-#define ARCHIVIST   (1<<5)
-#define BUTLER		(1<<6)
-#define JESTER  	(1<<7)
-#define ROYAL_GUARD	(1<<8)
+#define LORD			(1<<0)
+#define TREASURER		(1<<1)
+#define MASTER_MAGOS	(1<<2)
+#define TOWN_JESTER		(1<<3)
+#define GUILDMASTER		(1<<4)
 
 
-#define GARRISON		(1<<1)
+#define THE_HILLIAN_DIET		(1<<1)
 
-#define CAPTAIN		(1<<0)
-#define GUARDSMAN	(1<<1)
-#define WATCHMAN	(1<<2)
-#define DUNGEONEER	(1<<3)
+#define CAPTAIN			(1<<0)
+#define GATEKEEPER		(1<<1)
+#define FOREIGN_GUARD	(1<<1)
 
 
-#define TEMPLE			(1<<2)
+#define TEMPLE		(1<<2)
 
 #define PRIEST		(1<<0)
 #define ACOLYTE		(1<<1)
@@ -124,43 +119,54 @@
 #define ADEPT		(1<<5)
 
 
-#define TOWNERS			(1<<3)
+#define MAKERS_GUILD	(1<<3)
+
+#define ELDER_DWARF		(1<<0)
+#define RUNEMEISTER		(1<<1)
+#define BLACKSMITH		(1<<2)
+#define TAILOR			(1<<3)
+#define MASON			(1<<4)
+
+
+#define TOWER_OF_NOC	(1<<4)
+
+#define RULER_ELF		(1<<0)
+#define ARCHIVIST		(1<<1)
+#define ALCHEMIST		(1<<2)
+#define FELDSHER		(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 TAILOR		(1<<7)
-#define NIGHTMAN 	(1<<8)
-#define NITEMAIDEN	(1<<9)
-#define ALCHEMIST	(1<<10)
-#define SCRIBE		(1<<11)
 
+#define PROVISIONERS_GUILD	(1<<5)
 
-#define PEASANTS		(1<<4)
+#define HEAD_HUMEN			(1<<0)
+#define JAEGWARD			(1<<1)
+#define SOILER				(1<<2)
+#define BUTCHER				(1<<3)
+#define INNKEEP				(1<<4)
+#define COOK				(1<<5)
 
-#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 ROGUES_GUILD		(1<<6)
+
+#define NITEMASTER			(1<<0)
+#define NITEMAIDEN			(1<<1)
+#define ROGUE				(1<<2)
+#define BEGGAR				(1<<3)
+
+#define MGE			(1<<7)
+
+#define MERCHANT	(1<<0)
+#define STEVEDORE	(1<<1)
 
-#define OUTSIDERS		(1<<5)
+#define FREEFOLKS_SERFS		(1<<8)
 
-#define ADVENTURER	(1<<0)
-#define WAVE_DRIFTER (1<<1)
-#define MERCENARY	(1<<2)
-#define GRAVEDIGGER	(1<<3)
+#define ADVENTURER			(1<<0)
+#define WAVE_DRIFTER 		(1<<1)
+#define TOWNER				(1<<2)
+#define GRAVEDIGGER			(1<<3)
 
 
-#define APPRENTICES		(1<<7)
+#define APPRENTICES		(1<<9)
 
 #define APPRENTICE	(1<<0)
 #define SQUIRE		(1<<1)
@@ -169,11 +175,15 @@
 #define PRINCE		(1<<4)
 
 
-#define JCOLOR_NOBLE "#9c40bf"
-#define JCOLOR_MERCHANT "#c2b449"
-#define JCOLOR_SOLDIER "#b64949"
-#define JCOLOR_SERF "#669968"
-#define JCOLOR_PEASANT "#936d6c"
+#define JCOLOR_THE_ROCK_THRONE "#9c40bf"
+#define JCOLOR_THE_HILLIAN_DIET "#c2b449"
+#define JCOLOR_TEMPLE "#b64949"
+#define JCOLOR_MAKERS_GUILD "#669968"
+#define JCOLOR_TOWNER_OF_NOC "#936d6c"
+#define JCOLOR_PROVISIONERS_GUILD "#936d6c"
+#define JCOLOR_ROGUES_GUILD "#936d6c"
+#define JCOLOR_MGE "#936d6c"
+#define JCOLOR_FREEFOLKS_SERFS "#936d6c"
 
 
 // job display orders //

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

@@ -6,7 +6,7 @@
 /datum/job/roguetown/drifters
 	title = "Drifter"
 	flag = WAVE_DRIFTER
-	department_flag = PEASANTS
+	department_flag = FREEFOLKS_SERFS
 	faction = "Station"
 	show_in_credits = 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 = OUTSIDERS
+	department_flag = FREEFOLKS_SERFS
 	faction = "Station"
 	total_positions = 8
 	spawn_positions = 8

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

@@ -1,7 +1,7 @@
 /datum/job/roguetown/pilgrim
 	title = "Pilgrim"
 	flag = ADVENTURER
-	department_flag = PEASANTS
+	department_flag = FREEFOLKS_SERFS
 	faction = "Station"
 	total_positions = -1
 	spawn_positions = 20

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

@@ -1,7 +1,7 @@
 /datum/job/roguetown/villager
 	title = "Towner"
-	flag = ADVENTURER
-	department_flag = PEASANTS
+	flag = TOWNER
+	department_flag = FREEFOLKS_SERFS
 	faction = "Station"
 	total_positions = 50
 	spawn_positions = 50

code/modules/jobs/job_types/roguetown/apprentices/prince.dm

@@ -3,8 +3,8 @@
 	flag = PRINCE
 	department_flag = APPRENTICES
 	faction = "Station"
-	total_positions = 2
-	spawn_positions = 2
+	total_positions = 0
+	spawn_positions = 0
 	f_title = "Princess"
 	allowed_races = list(
 		"Humen",

code/modules/jobs/job_types/roguetown/apprentices/servant.dm

@@ -3,8 +3,8 @@
 	flag = SERVANT
 	department_flag = APPRENTICES
 	faction = "Station"
-	total_positions = 4
-	spawn_positions = 4
+	total_positions = 0
+	spawn_positions = 0
 
 	allowed_races = list(
 		"Humen",

code/modules/jobs/job_types/roguetown/apprentices/squire.dm

@@ -3,8 +3,8 @@
 	flag = SQUIRE
 	department_flag = APPRENTICES
 	faction = "Station"
-	total_positions = 2
-	spawn_positions = 2
+	total_positions = 0
+	spawn_positions = 0
 
 	allowed_races = list(
 		"Humen",

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

@@ -1,10 +1,10 @@
-/datum/job/roguetown/dungeoneer
+/*/datum/job/roguetown/dungeoneer
 	title = "Dungeoneer"
 	flag = DUNGEONEER
 	department_flag = GARRISON
 	faction = "Station"
-	total_positions = 1
-	spawn_positions = 1
+	total_positions = 0
+	spawn_positions = 0
 
 	allowed_races = list(
 		"Humen",
@@ -74,3 +74,4 @@
 			if(istype(H.wear_mask, /obj/item/clothing/mask/rogue/eyepatch || /obj/item/clothing/mask/rogue/eyepatch/left ))
 				qdel(H.wear_mask)
 				mask = /obj/item/clothing/mask/rogue/kaizoku/facemask/dishonor
+*/

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

@@ -1,10 +1,10 @@
-/datum/job/roguetown/guardsman
+/*/datum/job/roguetown/guardsman
 	title = "Garrison Guard"
 	flag = GUARDSMAN
 	department_flag = GARRISON
 	faction = "Station"
-	total_positions = 8
-	spawn_positions = 8
+	total_positions = 0
+	spawn_positions = 0
 
 	allowed_sexes = list(MALE, FEMALE)
 	allowed_races = list(
@@ -295,3 +295,4 @@ Design philosphy:
 	set name = "HALT!"
 	set category = "Noises"
 	emote("haltyell")
+*/

code/modules/jobs/job_types/roguetown/garrison/garrisonarcher.dm → code/modules/jobs/job_types/roguetown/garrison/gatekeeper.dm

@@ -1,7 +1,7 @@
-/datum/job/roguetown/watchman
-	title = "Garrison Archer"
-	flag = WATCHMAN
-	department_flag = GARRISON
+/datum/job/roguetown/gatekeeper
+	title = "Gatekeeper"
+	flag = GATEKEEPER
+	department_flag = THE_HILLIAN_DIET
 	faction = "Station"
 	total_positions = 0
 	spawn_positions = 0
@@ -25,17 +25,17 @@
 	whitelist_req = FALSE
 	bypass_lastclass = TRUE
 
-	outfit = /datum/outfit/job/roguetown/watchman
+	outfit = /datum/outfit/job/roguetown/gatekeeper
 	give_bank_account = 30
 	min_pq = 0
 
 	cmode_music = 'sound/music/combat_guard.ogg'
 
-/datum/outfit/job/roguetown/watchman
+/datum/outfit/job/roguetown/gatekeeper
 	name = "Garrison Archer"
-	jobtype = /datum/job/roguetown/watchman
+	jobtype = /datum/job/roguetown/gatekeeper
 
-/datum/outfit/job/roguetown/watchman/pre_equip(mob/living/carbon/human/H)
+/datum/outfit/job/roguetown/gatekeeper/pre_equip(mob/living/carbon/human/H)
 	..()
 	pants = /obj/item/clothing/under/roguetown/trou/leather
 	armor = /obj/item/clothing/suit/roguetown/armor/leather/hide

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

@@ -1,10 +1,10 @@
-/datum/job/roguetown/royalguard
+/*/datum/job/roguetown/royalguard
 	title = "Royal Guard"
 	flag = ROYAL_GUARD
 	department_flag = NOBLEMEN
 	faction = "Station"
-	total_positions = 2
-	spawn_positions = 2
+	total_positions = 0
+	spawn_positions = 0
 
 	allowed_sexes = list(MALE, FEMALE)
 	allowed_races = list(
@@ -142,3 +142,4 @@
 	H.verbs |= /mob/proc/haltyell
 	ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_KNOWBANDITS, TRAIT_GENERIC)
+*/

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

@@ -1,7 +1,7 @@
 /datum/job/roguetown/veteran
-	title = "Veteran"
-	flag = GUARDSMAN
-	department_flag = GARRISON
+	title = "Guildmaster"
+	flag = GUILDMASTER
+	department_flag = THE_ROCK_THRONE
 	faction = "Station"
 	total_positions = 1
 	spawn_positions = 1

code/modules/jobs/job_types/roguetown/nobility/archivist.dm

@@ -2,7 +2,7 @@
 	title = "Archivist"
 	tutorial = "A well-traveled and well-learned seeker of knowledge, the Archivist's mind has been touched by Noc himself. They settled in Rockhill some time ago, coming to the Isle of Enigma with the hope of unraveling its mysteries. If they can expand their library and teach the masses, Grimoria may yet enter a new age of enlightenment."
 	flag = ARCHIVIST
-	department_flag = NOBLEMEN
+	department_flag = TOWER_OF_NOC
 	faction = "Station"
 	total_positions = 1
 	spawn_positions = 1

code/modules/jobs/job_types/roguetown/nobility/captain.dm

@@ -1,7 +1,7 @@
 /datum/job/roguetown/captain
 	title = "Captain"
 	flag = CAPTAIN
-	department_flag = GARRISON
+	department_flag = THE_HILLIAN_DIET
 	faction = "Station"
 	total_positions = 1
 	spawn_positions = 1
@@ -110,3 +110,8 @@
 	ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_KNOWBANDITS, TRAIT_GENERIC)
 	H.verbs |= /mob/proc/haltyell
+
+/mob/proc/haltyell()
+	set name = "HALT!"
+	set category = "Noises"
+	emote("haltyell")

code/modules/jobs/job_types/roguetown/garrison/mayor.dm → code/modules/jobs/job_types/roguetown/nobility/elder_dwarf.dm

@@ -1,7 +1,7 @@
-/datum/job/roguetown/mayor
-	title = "Mayor"
-	flag = MAYOR
-	department_flag = GARRISON
+/datum/job/roguetown/elder_dwarf
+	title = "Elder of House Dwarf"
+	flag = ELDER_DWARF
+	department_flag = THE_HILLIAN_DIET
 	faction = "Station"
 	total_positions = 1
 	spawn_positions = 1
@@ -18,18 +18,18 @@
 	tutorial = "The crown may lead officially, but the townsfolk of Rockhill look to you to manage the settlement and solve lesser issues. Remember the old ways of the law... not everything must end in bloodshed, but do what is necessary to maintain the peace."
 	whitelist_req = FALSE
 	bypass_lastclass = TRUE
-	outfit = /datum/outfit/job/roguetown/mayor
+	outfit = /datum/outfit/job/roguetown/elder_dwarf
 	display_order = JDO_CHIEF
 	give_bank_account = 80
 	min_pq = 1
 
 	cmode_music = 'sound/music/combat_bog.ogg'
 
-/datum/outfit/job/roguetown/mayor
+/datum/outfit/job/roguetown/elder_dwarf
 	name = "Mayor"
-	jobtype = /datum/job/roguetown/mayor
+	jobtype = /datum/job/roguetown/elder_dwarf
 
-/datum/outfit/job/roguetown/mayor/pre_equip(mob/living/carbon/human/H)
+/datum/outfit/job/roguetown/elder_dwarf/pre_equip(mob/living/carbon/human/H)
 	..()
 	pants = /obj/item/clothing/under/roguetown/trou/leather
 	head = /obj/item/clothing/head/roguetown/brimmed

code/modules/jobs/job_types/roguetown/nobility/feldsher.dm

@@ -1,7 +1,7 @@
 /datum/job/roguetown/feldsher
 	title = "Feldsher"
 	flag = FELDSHER
-	department_flag = TOWNERS
+	department_flag = TOWER_OF_NOC
 	faction = "Station"
 	total_positions = 1
 	spawn_positions = 1