diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm
index 5577b5506be..a210f441160 100644
--- a/code/__DEFINES/jobs.dm
+++ b/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 //
diff --git a/code/modules/jobs/job_types/roguetown/adventurer/DRIFTERZ.dm b/code/modules/jobs/job_types/roguetown/adventurer/DRIFTERZ.dm
index dd24601373f..2b623faef8e 100644
--- a/code/modules/jobs/job_types/roguetown/adventurer/DRIFTERZ.dm
+++ b/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
diff --git a/code/modules/jobs/job_types/roguetown/adventurer/adventurer.dm b/code/modules/jobs/job_types/roguetown/adventurer/adventurer.dm
index 0f894e5ff56..2f8f357a54f 100644
--- a/code/modules/jobs/job_types/roguetown/adventurer/adventurer.dm
+++ b/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
diff --git a/code/modules/jobs/job_types/roguetown/adventurer/pilgrim.dm b/code/modules/jobs/job_types/roguetown/adventurer/pilgrim.dm
index 6990f8ec7a5..458b9c170e1 100644
--- a/code/modules/jobs/job_types/roguetown/adventurer/pilgrim.dm
+++ b/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
diff --git a/code/modules/jobs/job_types/roguetown/adventurer/villager.dm b/code/modules/jobs/job_types/roguetown/adventurer/villager.dm
index 6564da8cfed..fbd35883332 100644
--- a/code/modules/jobs/job_types/roguetown/adventurer/villager.dm
+++ b/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
diff --git a/code/modules/jobs/job_types/roguetown/apprentices/prince.dm b/code/modules/jobs/job_types/roguetown/apprentices/prince.dm
index 0beb0525837..13d5641ef4e 100644
--- a/code/modules/jobs/job_types/roguetown/apprentices/prince.dm
+++ b/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",
diff --git a/code/modules/jobs/job_types/roguetown/apprentices/servant.dm b/code/modules/jobs/job_types/roguetown/apprentices/servant.dm
index 442a0852a48..7369e5c8c56 100644
--- a/code/modules/jobs/job_types/roguetown/apprentices/servant.dm
+++ b/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",
diff --git a/code/modules/jobs/job_types/roguetown/apprentices/squire.dm b/code/modules/jobs/job_types/roguetown/apprentices/squire.dm
index 1fdb3ac4452..fc2e647e496 100644
--- a/code/modules/jobs/job_types/roguetown/apprentices/squire.dm
+++ b/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",
diff --git a/code/modules/jobs/job_types/roguetown/garrison/dungeoneer.dm b/code/modules/jobs/job_types/roguetown/garrison/dungeoneer.dm
index b12eeb3cd0f..fa9b684d6e0 100644
--- a/code/modules/jobs/job_types/roguetown/garrison/dungeoneer.dm
+++ b/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
+*/
diff --git a/code/modules/jobs/job_types/roguetown/garrison/garrisonguard.dm b/code/modules/jobs/job_types/roguetown/garrison/garrisonguard.dm
index 4ce0c4298fd..0e5dc79e5ee 100644
--- a/code/modules/jobs/job_types/roguetown/garrison/garrisonguard.dm
+++ b/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")
+*/
diff --git a/code/modules/jobs/job_types/roguetown/garrison/garrisonarcher.dm b/code/modules/jobs/job_types/roguetown/garrison/gatekeeper.dm
similarity index 88%
rename from code/modules/jobs/job_types/roguetown/garrison/garrisonarcher.dm
rename to code/modules/jobs/job_types/roguetown/garrison/gatekeeper.dm
index a8b8083fa53..a4265598f4e 100644
--- a/code/modules/jobs/job_types/roguetown/garrison/garrisonarcher.dm
+++ b/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
diff --git a/code/modules/jobs/job_types/roguetown/garrison/royalguard.dm b/code/modules/jobs/job_types/roguetown/garrison/royalguard.dm
index 287efe2e0fd..db5ccfe8b7e 100644
--- a/code/modules/jobs/job_types/roguetown/garrison/royalguard.dm
+++ b/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)
+*/
diff --git a/code/modules/jobs/job_types/roguetown/garrison/veteran.dm b/code/modules/jobs/job_types/roguetown/garrison/veteran.dm
index 31e1dcacaf3..6eb5a4c7521 100644
--- a/code/modules/jobs/job_types/roguetown/garrison/veteran.dm
+++ b/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
diff --git a/code/modules/jobs/job_types/roguetown/nobility/archivist.dm b/code/modules/jobs/job_types/roguetown/nobility/archivist.dm
index 69d0e99788d..9a078c8aff2 100644
--- a/code/modules/jobs/job_types/roguetown/nobility/archivist.dm
+++ b/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
diff --git a/code/modules/jobs/job_types/roguetown/nobility/captain.dm b/code/modules/jobs/job_types/roguetown/nobility/captain.dm
index c169c9aacf6..e557b4cf2f4 100644
--- a/code/modules/jobs/job_types/roguetown/nobility/captain.dm
+++ b/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")
diff --git a/code/modules/jobs/job_types/roguetown/garrison/mayor.dm b/code/modules/jobs/job_types/roguetown/nobility/elder_dwarf.dm
similarity index 87%
rename from code/modules/jobs/job_types/roguetown/garrison/mayor.dm
rename to code/modules/jobs/job_types/roguetown/nobility/elder_dwarf.dm
index 88b2daa39c2..6654189dce9 100644
--- a/code/modules/jobs/job_types/roguetown/garrison/mayor.dm
+++ b/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
diff --git a/code/modules/jobs/job_types/roguetown/nobility/feldsher.dm b/code/modules/jobs/job_types/roguetown/nobility/feldsher.dm
index f96e5a68aaa..51cf30f0ea9 100644
--- a/code/modules/jobs/job_types/roguetown/nobility/feldsher.dm
+++ b/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
diff --git a/code/modules/jobs/job_types/roguetown/nobility/hand.dm b/code/modules/jobs/job_types/roguetown/nobility/head_humen.dm
similarity index 64%
rename from code/modules/jobs/job_types/roguetown/nobility/hand.dm
rename to code/modules/jobs/job_types/roguetown/nobility/head_humen.dm
index 5424ffea61d..5dd72cedad4 100644
--- a/code/modules/jobs/job_types/roguetown/nobility/hand.dm
+++ b/code/modules/jobs/job_types/roguetown/nobility/head_humen.dm
@@ -1,19 +1,16 @@
-/datum/job/roguetown/hand
- title = "Hand"
- flag = HAND
- department_flag = NOBLEMEN
+/datum/job/roguetown/head_humen
+ title = "Head of House Humen"
+ flag = HEAD_HUMEN
+ department_flag = THE_HILLIAN_DIET
faction = "Station"
total_positions = 1
spawn_positions = 1
allowed_races = list(
- "Humen",
- "Elf",
- "Half-Elf",
- "Dwarf"
+ "Humen"
)
allowed_sexes = list(MALE, FEMALE)
- outfit = /datum/outfit/job/roguetown/hand
+ outfit = /datum/outfit/job/roguetown/head_humen
display_order = JDO_HAND
tutorial = "Once, you were a mere childhood friend of the monarch of Rockhill; now, you are one of the most important people in the kingdom. Your roles are right-hand man, confidant, and spymaster alike, and you have killed more with your whispers than with a blade."
bypass_lastclass = TRUE
@@ -22,7 +19,7 @@
min_pq = 2
cmode_music = 'sound/music/combat_noble.ogg'
-/datum/outfit/job/roguetown/hand/pre_equip(mob/living/carbon/human/H)
+/datum/outfit/job/roguetown/head_humen/pre_equip(mob/living/carbon/human/H)
. = ..()
pants = /obj/item/clothing/under/roguetown/tights/black
shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/guard
@@ -31,17 +28,6 @@
belt = /obj/item/storage/belt/rogue/leather/hand
backr = /obj/item/storage/backpack/rogue/satchel
backpack_contents = list(/obj/item/rogueweapon/knife/dagger/steel = 1, /obj/item/keyring/hand = 1)
- if(SSticker.rulertype == "Hand")
- head = /obj/item/clothing/head/roguetown/crown/serpcrown
- SSroguemachine.crown = head
- pants = /obj/item/clothing/under/roguetown/tights/black
- shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/guard
- armor = /obj/item/clothing/suit/roguetown/armor/leather/jacket/hand
- shoes = /obj/item/clothing/shoes/roguetown/boots
- belt = /obj/item/storage/belt/rogue/leather/hand
- backr = /obj/item/storage/backpack/rogue/satchel
- backpack_contents = list(/obj/item/rogueweapon/knife/dagger/steel = 1, /obj/item/keyring/hand = 1)
- l_hand = /obj/item/rogueweapon/lordscepter
if(H.mind)
H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE)
@@ -66,12 +52,3 @@
ADD_TRAIT(H, TRAIT_SEEPRICES, TRAIT_GENERIC)
ADD_TRAIT(H, TRAIT_DODGEEXPERT, TRAIT_GENERIC)
H.verbs |= /mob/living/carbon/human/proc/torture_victim
-
-/datum/job/roguetown/hand/after_spawn(mob/living/L, mob/M, latejoin = TRUE)
- ..()
- if(SSticker.rulertype == "Hand")
- SSticker.select_ruler()
- if(L)
- to_chat(world, "[L.real_name] is Regent of Rockhill.")
- to_chat(world, "
")
- addtimer(CALLBACK(L, TYPE_PROC_REF(/mob, lord_color_choice)), 50)
diff --git a/code/modules/jobs/job_types/roguetown/nobility/lord.dm b/code/modules/jobs/job_types/roguetown/nobility/lord.dm
index d36fe14545c..8c3ba4462a6 100644
--- a/code/modules/jobs/job_types/roguetown/nobility/lord.dm
+++ b/code/modules/jobs/job_types/roguetown/nobility/lord.dm
@@ -1,10 +1,10 @@
/datum/job/roguetown/lord
title = "King"
flag = LORD
- department_flag = NOBLEMEN
+ department_flag = THE_ROCK_THRONE
faction = "Station"
total_positions = 0
- spawn_positions = 1
+ spawn_positions = 0
f_title = "Queen"
allowed_races = list(
diff --git a/code/modules/jobs/job_types/roguetown/nobility/magician.dm b/code/modules/jobs/job_types/roguetown/nobility/magician.dm
index 94e63fb4542..ef82656e955 100644
--- a/code/modules/jobs/job_types/roguetown/nobility/magician.dm
+++ b/code/modules/jobs/job_types/roguetown/nobility/magician.dm
@@ -1,7 +1,7 @@
/datum/job/roguetown/magician
- title = "Court Magician"
- flag = WIZARD
- department_flag = NOBLEMEN
+ title = "Master Magos"
+ flag = MASTER_MAGOS
+ department_flag = THE_ROCK_THRONE
faction = "Station"
total_positions = 1
spawn_positions = 1
diff --git a/code/modules/jobs/job_types/roguetown/nobility/merchant.dm b/code/modules/jobs/job_types/roguetown/nobility/merchant.dm
index ac9f9a56ea9..c464ccf12a6 100644
--- a/code/modules/jobs/job_types/roguetown/nobility/merchant.dm
+++ b/code/modules/jobs/job_types/roguetown/nobility/merchant.dm
@@ -1,7 +1,7 @@
/datum/job/roguetown/merchant
title = "Merchant"
flag = MERCHANT
- department_flag = TOWNERS
+ department_flag = MGE
faction = "Station"
total_positions = 1
spawn_positions = 1
diff --git a/code/modules/jobs/job_types/roguetown/nobility/nightman.dm b/code/modules/jobs/job_types/roguetown/nobility/nightman.dm
index fc3f9cbae72..d5ca2c8fa41 100644
--- a/code/modules/jobs/job_types/roguetown/nobility/nightman.dm
+++ b/code/modules/jobs/job_types/roguetown/nobility/nightman.dm
@@ -1,7 +1,7 @@
-/datum/job/roguetown/niteman
- title = "Niteman"
- flag = NIGHTMAN
- department_flag = TOWNERS
+/datum/job/roguetown/nitemaster
+ title = "Nitemaster"
+ flag = NITEMASTER
+ department_flag = ROGUES_GUILD
faction = "Station"
total_positions = 1
spawn_positions = 1
@@ -18,13 +18,13 @@
Some accuse you of have connections with the Rogues and Bandits of the land but surely its just slander..."
allowed_sexes = list(MALE)
- outfit = /datum/outfit/job/roguetown/niteman
+ outfit = /datum/outfit/job/roguetown/nitemaster
display_order = JDO_NITEMAN
give_bank_account = 120
min_pq = 0
bypass_lastclass = TRUE
-/datum/outfit/job/roguetown/niteman/pre_equip(mob/living/carbon/human/H)
+/datum/outfit/job/roguetown/nitemaster/pre_equip(mob/living/carbon/human/H)
..()
head = /obj/item/clothing/head/roguetown/roguehood/brown
armor = /obj/item/clothing/suit/roguetown/armor/leather/jacket/niteman
@@ -49,13 +49,13 @@
H.change_stat("speed", 1)
H.change_stat("intelligence", 1)
H.change_stat("perception", 2)
- H.mind.teach_crafting_recipe(/datum/crafting_recipe/forgery_nitmaiden)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/forgery_nitemaiden)
if(H.dna?.species)
if(H.dna.species.id == "human")
H.dna.species.soundpack_m = new /datum/voicepack/male/zeth()
/* ................. Unique Nitemaster recipes ................... */
-/datum/crafting_recipe/forgery_nitmaiden
+/datum/crafting_recipe/forgery_nitemaiden
name = "Forge nitemaiden license"
time = 4 SECONDS
reqs = list(/obj/item/paper = 1,
diff --git a/code/modules/jobs/job_types/roguetown/nobility/consort.dm b/code/modules/jobs/job_types/roguetown/nobility/ruler_elf.dm
similarity index 89%
rename from code/modules/jobs/job_types/roguetown/nobility/consort.dm
rename to code/modules/jobs/job_types/roguetown/nobility/ruler_elf.dm
index fb3066f6b56..e9fa6054a16 100644
--- a/code/modules/jobs/job_types/roguetown/nobility/consort.dm
+++ b/code/modules/jobs/job_types/roguetown/nobility/ruler_elf.dm
@@ -1,19 +1,17 @@
-/datum/job/roguetown/consort
- title = "Consort"
- flag = CONSORT
- department_flag = NOBLEMEN
+/datum/job/roguetown/ruler_elf
+ title = "Ruler of House Elf"
+ flag = RULER_ELF
+ department_flag = THE_HILLIAN_DIET
faction = "Station"
total_positions = 0
spawn_positions = 1
allowed_races = list(
- "Humen",
- "Elf",
- "Half-Elf"
+ "Elf"
)
tutorial = "Yours was a marriage of political convenience rather than love, yet you have remained the ruling monarch's good friend and confidant throughout your marriage. But your love and loyalty will be tested, for daggers are equally pointed at your throat."
- outfit = /datum/outfit/job/roguetown/consort
+ outfit = /datum/outfit/job/roguetown/ruler_elf
advclass_cat_rolls = list(CTAG_CONSORT = 20)
display_order = JDO_CONSORT
@@ -23,7 +21,7 @@
cmode_music = 'sound/music/combat_noble.ogg'
-/datum/job/roguetown/consort/after_spawn(mob/living/L, mob/M, latejoin = TRUE)
+/datum/job/roguetown/ruler_elf/after_spawn(mob/living/L, mob/M, latejoin = TRUE)
..()
if(ishuman(L))
var/mob/living/carbon/human/H = L
@@ -35,7 +33,7 @@
else
SSfamilytree.AddRoyal(H, FAMILY_FATHER)
-/datum/outfit/job/roguetown/consort // Default equipment regardless of class.
+/datum/outfit/job/roguetown/ruler_elf // Default equipment regardless of class.
head = /obj/item/clothing/head/roguetown/crown/nyle
shoes = /obj/item/clothing/shoes/roguetown/boots
id = /obj/item/clothing/ring/silver
@@ -49,14 +47,14 @@
- Lowborn: A good wholesome peasant spouse. Can cook and swing a pitchfork good. Not so smart or perceptive.
*/
-/datum/advclass/consort/highborn
+/datum/advclass/ruler_elf/highborn
name = "Highborn"
tutorial = "Of a minor noble house, yours is a rather typical tale; you were trained in manners, literature, and intrigue, all to be married off to the next ruler of this backwater island."
- outfit = /datum/outfit/job/roguetown/consort/highborn
+ outfit = /datum/outfit/job/roguetown/ruler_elf/highborn
category_tags = list(CTAG_CONSORT)
-/datum/outfit/job/roguetown/consort/highborn/pre_equip(mob/living/carbon/human/H)
+/datum/outfit/job/roguetown/ruler_elf/highborn/pre_equip(mob/living/carbon/human/H)
. = ..()
if(H.gender == MALE)
pants = /obj/item/clothing/under/roguetown/tights/black
@@ -86,14 +84,14 @@
ADD_TRAIT(H, TRAIT_SEEPRICES, TRAIT_GENERIC)
ADD_TRAIT(H, TRAIT_NOBLE, TRAIT_GENERIC)
-/datum/advclass/consort/courtesan
+/datum/advclass/ruler_elf/courtesan
name = "Courtesan"
tutorial = "Though initially none envied your lot in life, it's certain that your midnight talents haven't gone to waste. Your honeyed words and charm have brought you right to being a ruler's beloved consort."
- outfit = /datum/outfit/job/roguetown/consort/courtesan
+ outfit = /datum/outfit/job/roguetown/ruler_elf/courtesan
category_tags = list(CTAG_CONSORT)
-/datum/outfit/job/roguetown/consort/courtesan/pre_equip(mob/living/carbon/human/H)
+/datum/outfit/job/roguetown/ruler_elf/courtesan/pre_equip(mob/living/carbon/human/H)
. = ..()
if(H.gender == MALE)
pants = /obj/item/clothing/under/roguetown/tights/black
@@ -125,14 +123,14 @@
ADD_TRAIT(H, TRAIT_GOODLOVER, TRAIT_GENERIC)
ADD_TRAIT(H, TRAIT_NOBLE, TRAIT_GENERIC)
-/datum/advclass/consort/lowborn
+/datum/advclass/ruler_elf/lowborn
name = "Lowborn"
tutorial = "You never could have dreamed your life would be like this. Though your origins are humble, something special about you - whether it was your good looks, your kind heart, or your bravery - has brought you into Rockhill Keep."
- outfit = /datum/outfit/job/roguetown/consort/lowborn
+ outfit = /datum/outfit/job/roguetown/ruler_elf/lowborn
category_tags = list(CTAG_CONSORT)
-/datum/outfit/job/roguetown/consort/lowborn/pre_equip(mob/living/carbon/human/H)
+/datum/outfit/job/roguetown/ruler_elf/lowborn/pre_equip(mob/living/carbon/human/H)
. = ..()
if(H.gender == MALE)
pants = /obj/item/clothing/under/roguetown/tights/green
diff --git a/code/modules/jobs/job_types/roguetown/nobility/steward.dm b/code/modules/jobs/job_types/roguetown/nobility/steward.dm
index c128a14eec2..0f60248823f 100644
--- a/code/modules/jobs/job_types/roguetown/nobility/steward.dm
+++ b/code/modules/jobs/job_types/roguetown/nobility/steward.dm
@@ -1,7 +1,7 @@
-/datum/job/roguetown/steward
- title = "Steward"
- flag = STEWARD
- department_flag = NOBLEMEN
+/datum/job/roguetown/treasurer
+ title = "Treasurer"
+ flag = TREASURER
+ department_flag = THE_ROCK_THRONE
faction = "Station"
total_positions = 1
spawn_positions = 1
@@ -16,12 +16,12 @@
display_order = JDO_STEWARD
bypass_lastclass = TRUE
tutorial = "Coin, Coin, Coin! Oh beautiful coin: Youre addicted to it, and you hold the position as the King's personal treasurer of both coin and information. You know the power silver and gold has on a man's mortal soul, and you know just what lengths theyll go to in order to get even more. Keep your festering economy and your rats alive, theyre the only two things you can weigh any trust into anymore."
- outfit = /datum/outfit/job/roguetown/steward
+ outfit = /datum/outfit/job/roguetown/treasurer
give_bank_account = 100
min_pq = 2
cmode_music = 'sound/music/combat_noble.ogg'
-/datum/outfit/job/roguetown/steward/pre_equip(mob/living/carbon/human/H)
+/datum/outfit/job/roguetown/treasurer/pre_equip(mob/living/carbon/human/H)
..()
if(H.gender == FEMALE)
H.virginity = TRUE
diff --git a/code/modules/jobs/job_types/roguetown/nobility/titles.dm b/code/modules/jobs/job_types/roguetown/nobility/titles.dm
index 7df2706bd68..499c90ab84d 100644
--- a/code/modules/jobs/job_types/roguetown/nobility/titles.dm
+++ b/code/modules/jobs/job_types/roguetown/nobility/titles.dm
@@ -1,8 +1,8 @@
/datum/job/roguetown/bogwarden
title = "Warden of the Terrorbog"
tutorial = ""
- flag = LORD
- department_flag = NOBLEMEN
+ flag = HEAD_HUMEN
+ department_flag = PROVISIONERS_GUILD
faction = "Station"
total_positions = 0
spawn_positions = 0
@@ -24,8 +24,8 @@
title = "Huntmaster of the Murderwoods"
f_title = "Huntmistress of the Murderwoods"
tutorial = ""
- flag = LORD
- department_flag = NOBLEMEN
+ flag = RULER_ELF
+ department_flag = TOWER_OF_NOC
faction = "Station"
total_positions = 0
spawn_positions = 0
@@ -43,22 +43,22 @@
armor = /obj/item/clothing/suit/roguetown/shirt/rags
shoes = /obj/item/clothing/shoes/roguetown/boots
-/datum/job/roguetown/hetman
- title = "Hetman of Mount Decapitation"
+/datum/job/roguetown/hedtman
+ title = "Hedtman of Mount Decapitation"
tutorial = ""
- flag = LORD
- department_flag = NOBLEMEN
+ flag = ELDER_DWARF
+ department_flag = MAKERS_GUILD
faction = "Station"
total_positions = 0
spawn_positions = 0
- outfit = /datum/outfit/job/roguetown/hetman
+ outfit = /datum/outfit/job/roguetown/hedtman
display_order = 6
-/datum/outfit/job/roguetown/hetman
- name = "Hetman of Mount Decapitation"
- jobtype = /datum/job/roguetown/hetman
+/datum/outfit/job/roguetown/hedtman
+ name = "Hedtman of Mount Decapitation"
+ jobtype = /datum/job/roguetown/hedtman
pants = /obj/item/clothing/under/roguetown/tights
shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt
diff --git a/code/modules/jobs/job_types/roguetown/other/deathknight.dm b/code/modules/jobs/job_types/roguetown/other/deathknight.dm
index 77d2e68b267..2e11fd87b3a 100644
--- a/code/modules/jobs/job_types/roguetown/other/deathknight.dm
+++ b/code/modules/jobs/job_types/roguetown/other/deathknight.dm
@@ -1,7 +1,7 @@
/datum/job/roguetown/deathknight
title = "Death Knight"
flag = GRAVEDIGGER
- department_flag = PEASANTS
+ department_flag = FREEFOLKS_SERFS
faction = "Station"
total_positions = 0
spawn_positions = 0
diff --git a/code/modules/jobs/job_types/roguetown/other/hamletjobs.dm b/code/modules/jobs/job_types/roguetown/other/hamletjobs.dm
index 69ebcfba34f..dd27d6a37a6 100644
--- a/code/modules/jobs/job_types/roguetown/other/hamletjobs.dm
+++ b/code/modules/jobs/job_types/roguetown/other/hamletjobs.dm
@@ -1,4 +1,4 @@
-/datum/job/roguetown/sheriff
+/*/datum/job/roguetown/sheriff
title = "Sheriff"
flag = CAPTAIN
department_flag = GARRISON
@@ -144,9 +144,9 @@
ADD_TRAIT(H, TRAIT_KNOWBANDITS, TRAIT_GENERIC)
H.verbs |= /mob/proc/haltyell
-/*
/mob/proc/haltyell()
set name = "HALT!"
set category = "Noises"
emote("haltyell")
+
*/
diff --git a/code/modules/jobs/job_types/roguetown/other/mercenary.dm b/code/modules/jobs/job_types/roguetown/other/mercenary.dm
index f48ea89d892..734b1b03528 100644
--- a/code/modules/jobs/job_types/roguetown/other/mercenary.dm
+++ b/code/modules/jobs/job_types/roguetown/other/mercenary.dm
@@ -1,7 +1,7 @@
/datum/job/roguetown/mercenary
- title = "Mercenary"
- flag = MERCENARY
- department_flag = OUTSIDERS
+ title = "Foreign Guard"
+ flag = FOREIGN_GUARD
+ department_flag = THE_HILLIAN_DIET
faction = "Station"
total_positions = 4
spawn_positions = 4
diff --git a/code/modules/jobs/job_types/roguetown/other/tester.dm b/code/modules/jobs/job_types/roguetown/other/tester.dm
index 9c05c3a817a..fb588daacf5 100644
--- a/code/modules/jobs/job_types/roguetown/other/tester.dm
+++ b/code/modules/jobs/job_types/roguetown/other/tester.dm
@@ -1,7 +1,7 @@
/datum/job/roguetown/tester
title = "Tester"
flag = GRAVEDIGGER
- department_flag = PEASANTS
+ department_flag = FREEFOLKS_SERFS
faction = "Station"
#ifdef TESTSERVER
total_positions = 99
diff --git a/code/modules/jobs/job_types/roguetown/peasants/bathmaid.dm b/code/modules/jobs/job_types/roguetown/peasants/bathmaid.dm
index 79691b436c6..5ba0877e0ee 100644
--- a/code/modules/jobs/job_types/roguetown/peasants/bathmaid.dm
+++ b/code/modules/jobs/job_types/roguetown/peasants/bathmaid.dm
@@ -1,7 +1,7 @@
/datum/job/roguetown/nitemaiden
title = "Nitemaiden"
flag = NITEMAIDEN
- department_flag = TOWNERS
+ department_flag = ROGUES_GUILD
faction = "Station"
total_positions = 4
spawn_positions = 4
diff --git a/code/modules/jobs/job_types/roguetown/peasants/beggar.dm b/code/modules/jobs/job_types/roguetown/peasants/beggar.dm
index f342e5cca71..985224b6daf 100644
--- a/code/modules/jobs/job_types/roguetown/peasants/beggar.dm
+++ b/code/modules/jobs/job_types/roguetown/peasants/beggar.dm
@@ -2,7 +2,7 @@
/datum/job/roguetown/vagrant
title = "Beggar"
flag = BEGGAR
- department_flag = PEASANTS
+ department_flag = ROGUES_GUILD
faction = "Station"
total_positions = 15
spawn_positions = 15
diff --git a/code/modules/jobs/job_types/roguetown/peasants/butcher.dm b/code/modules/jobs/job_types/roguetown/peasants/butcher.dm
index d61670b5e9c..a39ec18d68b 100644
--- a/code/modules/jobs/job_types/roguetown/peasants/butcher.dm
+++ b/code/modules/jobs/job_types/roguetown/peasants/butcher.dm
@@ -1,7 +1,7 @@
/datum/job/roguetown/butcher
title = "Butcher"
- flag = BEASTMASTER
- department_flag = PEASANTS
+ flag = BUTCHER
+ department_flag = PROVISIONERS_GUILD
faction = "Station"
total_positions = 1
spawn_positions = 1
diff --git a/code/modules/jobs/job_types/roguetown/peasants/butler.dm b/code/modules/jobs/job_types/roguetown/peasants/butler.dm
index 537fae51c5d..13d123194d0 100644
--- a/code/modules/jobs/job_types/roguetown/peasants/butler.dm
+++ b/code/modules/jobs/job_types/roguetown/peasants/butler.dm
@@ -1,10 +1,10 @@
-/datum/job/roguetown/butler
+/*/datum/job/roguetown/butler
title = "Butler"
flag = BUTLER
department_flag = NOBLEMEN
faction = "Station"
- total_positions = 1
- spawn_positions = 1
+ total_positions = 0
+ spawn_positions = 0
f_title = "Housekeeper"
allowed_races = list(
@@ -62,3 +62,4 @@
beltr = /obj/item/keyring/butler
beltl = /obj/item/storage/belt/rogue/pouch/coins/mid
backr = /obj/item/storage/backpack/rogue/satchel
+*/
diff --git a/code/modules/jobs/job_types/roguetown/peasants/cook.dm b/code/modules/jobs/job_types/roguetown/peasants/cook.dm
index fd3c80891c2..729a93727d3 100644
--- a/code/modules/jobs/job_types/roguetown/peasants/cook.dm
+++ b/code/modules/jobs/job_types/roguetown/peasants/cook.dm
@@ -1,7 +1,7 @@
/datum/job/roguetown/cook
title = "Cook"
flag = COOK
- department_flag = PEASANTS
+ department_flag = PROVISIONERS_GUILD
faction = "Station"
total_positions = 2
spawn_positions = 2
diff --git a/code/modules/jobs/job_types/roguetown/peasants/jester.dm b/code/modules/jobs/job_types/roguetown/peasants/jester.dm
index eb027dee7da..daaa36b50ec 100644
--- a/code/modules/jobs/job_types/roguetown/peasants/jester.dm
+++ b/code/modules/jobs/job_types/roguetown/peasants/jester.dm
@@ -1,7 +1,7 @@
/datum/job/roguetown/jester
title = "Jester"
- flag = JESTER
- department_flag = NOBLEMEN
+ flag = TOWN_JESTER
+ department_flag = THE_ROCK_THRONE
faction = "Station"
total_positions = 1
spawn_positions = 1
diff --git a/code/modules/jobs/job_types/roguetown/peasants/prisoner.dm b/code/modules/jobs/job_types/roguetown/peasants/runemeister.dm
similarity index 64%
rename from code/modules/jobs/job_types/roguetown/peasants/prisoner.dm
rename to code/modules/jobs/job_types/roguetown/peasants/runemeister.dm
index 90a08fa3224..e69e2fa1651 100644
--- a/code/modules/jobs/job_types/roguetown/peasants/prisoner.dm
+++ b/code/modules/jobs/job_types/roguetown/peasants/runemeister.dm
@@ -1,7 +1,7 @@
-/datum/job/roguetown/prisoner
- title = "Prisoner"
- flag = GRAVEDIGGER
- department_flag = PEASANTS
+/datum/job/roguetown/runemeister
+ title = "Runemeister"
+ flag = RUNEMEISTER
+ department_flag = MAKERS_GUILD
faction = "Station"
total_positions = 0
spawn_positions = 2
@@ -16,10 +16,9 @@
"Dark Elf",
"Aasimar"
)
- tutorial = "For a crime, or false allegation; as a hostage against another, or held for ransom: your fate until this day has been ill-starred save its first. You are of noble birth. Perhaps your story, which none but you recall, will move some pity from callous hearts or promises of riches parole your release. Maybe your old associates conspire now to release you in a daring rescue. Yet it is far surer that your tears will rust this cursed mask than the sun shine upon your face a freed soul once more." // changed to reduce dictation of character. Nikov.
+ tutorial = "Dwarven technology is finicky, fragile and incredibly complex to the average denizen of Rockhill - thankfully, the Runemeister has dedicated their livelihood to its study. Construction of new SCOMs and installations of other logistical devices are costly but otherwise worthwhile for expansion sakes. Furthermore, maintenance and enchanting modification on equipment is a specialty for this master-rune maker." // changed to reduce dictation of character. Nikov.
- outfit = /datum/outfit/job/roguetown/prisoner
- bypass_jobban = TRUE
+ outfit = /datum/outfit/job/roguetown/runemeister
display_order = JDO_PRISONER
give_bank_account = 173
min_pq = -100
@@ -28,7 +27,7 @@
cmode_music = 'sound/music/combat_bum.ogg'
-/datum/outfit/job/roguetown/prisoner/pre_equip(mob/living/carbon/human/H)
+/datum/outfit/job/roguetown/runemeister/pre_equip(mob/living/carbon/human/H)
..()
pants = /obj/item/clothing/under/roguetown/loincloth/brown
mask = /obj/item/clothing/mask/rogue/facemask/prisoner
@@ -54,7 +53,3 @@
H.change_stat("speed", -1)
H.change_stat("constitution", -1)
H.change_stat("endurance", -1)
- var/datum/antagonist/new_antag = new /datum/antagonist/prisoner()
- H.mind.add_antag_datum(new_antag)
- ADD_TRAIT(H, TRAIT_BANDITCAMP, TRAIT_GENERIC)
- ADD_TRAIT(H, TRAIT_NOBLE, TRAIT_GENERIC)
diff --git a/code/modules/jobs/job_types/roguetown/peasants/soilson.dm b/code/modules/jobs/job_types/roguetown/peasants/soilson.dm
index 932c2a90538..231c8829d09 100644
--- a/code/modules/jobs/job_types/roguetown/peasants/soilson.dm
+++ b/code/modules/jobs/job_types/roguetown/peasants/soilson.dm
@@ -1,7 +1,7 @@
/datum/job/roguetown/farmer
title = "Soilson"
- flag = FARMER
- department_flag = PEASANTS
+ flag = SOILER
+ department_flag = PROVISIONERS_GUILD
faction = "Station"
total_positions = 5
spawn_positions = 5
diff --git a/code/modules/jobs/job_types/roguetown/peasants/stevedore.dm b/code/modules/jobs/job_types/roguetown/peasants/stevedore.dm
index 91a60761712..30fe2e4a29d 100644
--- a/code/modules/jobs/job_types/roguetown/peasants/stevedore.dm
+++ b/code/modules/jobs/job_types/roguetown/peasants/stevedore.dm
@@ -1,7 +1,7 @@
/datum/job/roguetown/stevedore
title = "Stevedore"
flag = STEVEDORE
- department_flag = TOWNERS
+ department_flag = MGE
faction = "Station"
total_positions = 2
spawn_positions = 2
diff --git a/code/modules/jobs/job_types/roguetown/serfs/alchemist.dm b/code/modules/jobs/job_types/roguetown/serfs/alchemist.dm
index ce8e471db07..714e141cd29 100644
--- a/code/modules/jobs/job_types/roguetown/serfs/alchemist.dm
+++ b/code/modules/jobs/job_types/roguetown/serfs/alchemist.dm
@@ -1,7 +1,7 @@
/datum/job/roguetown/alchemist
title = "Alchemist"
flag = ALCHEMIST
- department_flag = TOWNERS
+ department_flag = TOWER_OF_NOC
faction = "Station"
total_positions = 0
spawn_positions = 0
diff --git a/code/modules/jobs/job_types/roguetown/serfs/blacksmith.dm b/code/modules/jobs/job_types/roguetown/serfs/blacksmith.dm
index cff397cc549..9c4741fc241 100644
--- a/code/modules/jobs/job_types/roguetown/serfs/blacksmith.dm
+++ b/code/modules/jobs/job_types/roguetown/serfs/blacksmith.dm
@@ -1,151 +1,7 @@
-/datum/job/roguetown/armorsmith
- title = "Armorer"
- flag = BLACKSMITH
- department_flag = TOWNERS
- faction = "Station"
- total_positions = 0
- spawn_positions = 0
-
- allowed_races = list(
- "Humen",
- "Elf",
- "Half-Elf",
- "Dwarf",
- "Aasimar"
- )
-
- tutorial = "You studied for many decades under your master with a few other apprentices to become an Armorer, a trade that certainly has seen a boom in revenue in recent times with many a bannerlord seeing the importance in maintaining a well-equipped army."
-
- outfit = /datum/outfit/job/roguetown/armorsmith
- display_order = JDO_ARMORER
- bypass_lastclass = TRUE
- give_bank_account = 30
- min_pq = 0
- selection_color = "#d68e08"
-
-/datum/outfit/job/roguetown/armorsmith/pre_equip(mob/living/carbon/human/H)
- ..()
- id = /obj/item/clothing/ring/silver/makers_guild
- head = /obj/item/clothing/head/roguetown/hatfur
- if(prob(50))
- head = /obj/item/clothing/head/roguetown/hatblu
- if(H.mind)
- H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, 4, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/armorsmithing, 4, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/weaponsmithing, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/smelting, 3, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/engineering, 3, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/traps, 2, TRUE) // For craftable beartraps
- H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE)
- ADD_TRAIT(H, TRAIT_MALUMFIRE, TRAIT_GENERIC)
- if(H.age == AGE_OLD)
- H.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, pick(1,2), TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/armorsmithing, pick(1,2), TRUE)
- if(H.gender == MALE)
- pants = /obj/item/clothing/under/roguetown/trou
- shoes = /obj/item/clothing/shoes/roguetown/shortboots//shortboots for worker roles
- shirt = /obj/item/clothing/suit/roguetown/shirt/shortshirt
- belt = /obj/item/storage/belt/rogue/leather
- beltl = /obj/item/storage/belt/rogue/pouch/coins/poor
- beltr = /obj/item/keyring/armorsmith
- cloak = /obj/item/clothing/cloak/apron/brown
- H.change_stat("strength", 1)
- H.change_stat("endurance", 2)
- H.change_stat("speed", -1)
- else
- pants = /obj/item/clothing/under/roguetown/trou
- armor = /obj/item/clothing/suit/roguetown/shirt/dress/gen/random
- shoes = /obj/item/clothing/shoes/roguetown/shortboots
- belt = /obj/item/storage/belt/rogue/leather
- cloak = /obj/item/clothing/cloak/apron/brown
- beltl = /obj/item/storage/belt/rogue/pouch/coins/poor
- beltr = /obj/item/keyring/armorsmith
- backl = /obj/item/rogueweapon/hammer/sledgehammer
- H.change_stat("strength", 1)
- H.change_stat("endurance", 2)
- H.change_stat("speed", -1)
-
-/datum/job/roguetown/weaponsmith
- title = "Weaponsmith"
- flag = BLACKSMITH
- department_flag = TOWNERS
- faction = "Station"
- total_positions = 0
- spawn_positions = 0
-
- allowed_races = list(
- "Humen",
- "Elf",
- "Half-Elf",
- "Dwarf",
- "Aasimar"
- )
-
- tutorial = "You studied for many decades under your master with a few other apprentices to become a Weaponsmith, a trade that is as ancient as the secrets of steel itself! You've repaired the blades of cooks, the cracked hoes of peasants and greased the spears of many soldiers into war."
-
- outfit = /datum/outfit/job/roguetown/weaponsmith
- display_order = JDO_WSMITH
- give_bank_account = 30
- min_pq = 0
- selection_color = "#d68e08"
-
-/datum/outfit/job/roguetown/weaponsmith/pre_equip(mob/living/carbon/human/H)
- ..()
- id = /obj/item/clothing/ring/silver/makers_guild
- head = /obj/item/clothing/head/roguetown/hatfur
- if(prob(50))
- head = /obj/item/clothing/head/roguetown/hatblu
- if(H.mind)
- H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, 4, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/armorsmithing, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/weaponsmithing, 4, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/smelting, 3, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/engineering, 3, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/traps, 2, TRUE) // For craftable beartraps
- H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE)
- ADD_TRAIT(H, TRAIT_MALUMFIRE, TRAIT_GENERIC)
- if(H.age == AGE_OLD)
- H.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, pick(1,2), TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/weaponsmithing, pick(1,2), TRUE)
- if(H.gender == MALE)
- pants = /obj/item/clothing/under/roguetown/trou
- shoes = /obj/item/clothing/shoes/roguetown/boots/leather
- shirt = /obj/item/clothing/suit/roguetown/shirt/shortshirt
- belt = /obj/item/storage/belt/rogue/leather
- beltl = /obj/item/storage/belt/rogue/pouch/coins/poor
- beltr = /obj/item/keyring/weaponsmith
- cloak = /obj/item/clothing/cloak/apron/brown
- backl = /obj/item/rogueweapon/hammer/sledgehammer
- H.change_stat("strength", 1)
- H.change_stat("endurance", 2)
- H.change_stat("speed", -1)
- else
- pants = /obj/item/clothing/under/roguetown/trou
- armor = /obj/item/clothing/suit/roguetown/shirt/dress/gen/random
- shoes = /obj/item/clothing/shoes/roguetown/shortboots
- belt = /obj/item/storage/belt/rogue/leather
- cloak = /obj/item/clothing/cloak/apron/brown
- beltl = /obj/item/storage/belt/rogue/pouch/coins/poor
- beltr = /obj/item/keyring/weaponsmith
- H.change_stat("strength", 1)
- H.change_stat("endurance", 2)
- H.change_stat("speed", -1)
-
-
/datum/job/roguetown/blacksmith
title = "Blacksmith"
flag = BLACKSMITH
- department_flag = TOWNERS
+ department_flag = MAKERS_GUILD
faction = "Station"
total_positions = 2
spawn_positions = 2
diff --git a/code/modules/jobs/job_types/roguetown/serfs/innkeep.dm b/code/modules/jobs/job_types/roguetown/serfs/innkeep.dm
index 55bcef4a6d6..1e18f754888 100644
--- a/code/modules/jobs/job_types/roguetown/serfs/innkeep.dm
+++ b/code/modules/jobs/job_types/roguetown/serfs/innkeep.dm
@@ -1,7 +1,7 @@
/datum/job/roguetown/innkeep
title = "Innkeep"
flag = INNKEEP
- department_flag = TOWNERS
+ department_flag = PROVISIONERS_GUILD
faction = "Station"
total_positions = 1
spawn_positions = 1
diff --git a/code/modules/jobs/job_types/roguetown/serfs/mason.dm b/code/modules/jobs/job_types/roguetown/serfs/mason.dm
index cc78a3f85d9..0fe97587a3e 100644
--- a/code/modules/jobs/job_types/roguetown/serfs/mason.dm
+++ b/code/modules/jobs/job_types/roguetown/serfs/mason.dm
@@ -1,7 +1,7 @@
/datum/job/roguetown/mason
title = "Mason"
flag = MASON
- department_flag = TOWNERS
+ department_flag = MAKERS_GUILD
faction = "Station"
total_positions = 2
spawn_positions = 2
diff --git a/code/modules/jobs/job_types/roguetown/serfs/scribe.dm b/code/modules/jobs/job_types/roguetown/serfs/scribe.dm
index 5686202947b..b1eb8dabef0 100644
--- a/code/modules/jobs/job_types/roguetown/serfs/scribe.dm
+++ b/code/modules/jobs/job_types/roguetown/serfs/scribe.dm
@@ -1,4 +1,4 @@
-/datum/job/roguetown/scribe
+/*/datum/job/roguetown/scribe
title = "Scribe"
flag = SCRIBE
department_flag = TOWNERS
@@ -26,3 +26,4 @@
jobtype = /datum/job/roguetown/scribe
pants = null
+*/
diff --git a/code/modules/jobs/job_types/roguetown/serfs/tailor.dm b/code/modules/jobs/job_types/roguetown/serfs/tailor.dm
index 5f7e7df9c87..5fba29ad6c3 100644
--- a/code/modules/jobs/job_types/roguetown/serfs/tailor.dm
+++ b/code/modules/jobs/job_types/roguetown/serfs/tailor.dm
@@ -2,7 +2,7 @@
title = "Tailor"
f_title = "Seamstress"
flag = TAILOR
- department_flag = TOWNERS
+ department_flag = MAKERS_GUILD
faction = "Station"
tutorial = "Cloth, furs, silk and leather are what you know best. You've tirelessly studied and poured your life into \
making clothing both for fashion and for protection for commoner and noble alike."
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index 1bb63cb7b4f..98dfd38e1e4 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -594,20 +594,24 @@ GLOBAL_LIST_INIT(roleplay_readme, world.file2list("strings/rt/Lore_Primer.txt"))
var/cat_color = SSjob.name_occupations[category[1]].selection_color //use the color of the first job in the category (the department head) as the category color
var/cat_name = ""
switch (SSjob.name_occupations[category[1]].department_flag)
- if (NOBLEMEN)
- cat_name = "Court"
- if (GARRISON)
- cat_name = "Garrison"
- if (TOWNERS)
- cat_name = "Towners"
+ if (THE_ROCK_THRONE)
+ cat_name = "The Rock Throne"
+ if (THE_HILLIAN_DIET)
+ cat_name = "The Hillian Diet"
if (TEMPLE)
cat_name = "Temple"
- if (PEASANTS)
- cat_name = "Peasants"
- if (APPRENTICES)
- cat_name = "Apprentices"
- if (OUTSIDERS)
- cat_name = "Outsiders"
+ if (MAKERS_GUILD)
+ cat_name = "Maker's Guild"
+ if (TOWER_OF_NOC)
+ cat_name = "Tower of Noc"
+ if (PROVISIONERS_GUILD)
+ cat_name = "Provisioner's Guild"
+ if (ROGUES_GUILD)
+ cat_name = "Rogue's Guild"
+ if (MGE)
+ cat_name = "Mercator Guild Emporium"
+ if (FREEFOLKS_SERFS)
+ cat_name = "Free Folks & Serfs"
dat += "