diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index bb3bfa1831..e340e7fa66 100644 --- a/code/__DEFINES/jobs.dm +++ b/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 diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 54454b97aa..8752b627a0 100644 --- a/code/controllers/subsystem/job.dm +++ b/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 diff --git a/code/game/gamemodes/roguetown/chaosmode.dm b/code/game/gamemodes/roguetown/chaosmode.dm index 3099f54784..b73b8dec21 100644 --- a/code/game/gamemodes/roguetown/chaosmode.dm +++ b/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 diff --git a/code/game/gamemodes/roguetown/roguetown.dm b/code/game/gamemodes/roguetown/roguetown.dm index d6a530e7ca..6fadd92495 100644 --- a/code/game/gamemodes/roguetown/roguetown.dm +++ b/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 diff --git a/code/game/gamemodes/roguetown/roguewar.dm b/code/game/gamemodes/roguetown/roguewar.dm index 5015c36cf8..d8985e18b8 100644 --- a/code/game/gamemodes/roguetown/roguewar.dm +++ b/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 diff --git a/code/modules/admin/sql_ban_system.dm b/code/modules/admin/sql_ban_system.dm index 027e255793..02598db88c 100644 --- a/code/modules/admin/sql_ban_system.dm +++ b/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 += "" 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, diff --git a/code/modules/antagonists/roguetown/villain/peasantrebel.dm b/code/modules/antagonists/roguetown/villain/peasantrebel.dm index 75245cd175..b988e83f26 100644 --- a/code/modules/antagonists/roguetown/villain/peasantrebel.dm +++ b/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 diff --git a/code/modules/antagonists/roguetown/villain/zizocult.dm b/code/modules/antagonists/roguetown/villain/zizocult.dm index 6f3e121e52..11f0564050 100644 --- a/code/modules/antagonists/roguetown/villain/zizocult.dm +++ b/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 diff --git a/code/modules/jobs/job_types/roguetown/adventurer/adventurer.dm b/code/modules/jobs/job_types/roguetown/adventurer/adventurer.dm index 697e58eb6c..0f894e5ff5 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 = PEASANTS + department_flag = OUTSIDERS faction = "Station" total_positions = 8 spawn_positions = 8 diff --git a/code/modules/jobs/job_types/roguetown/adventurer/villager.dm b/code/modules/jobs/job_types/roguetown/adventurer/villager.dm index dc9788bd31..6564da8cfe 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/villager.dm +++ b/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*/ diff --git a/code/modules/jobs/job_types/roguetown/garrison/royalguard.dm b/code/modules/jobs/job_types/roguetown/garrison/royalguard.dm index 6f95e212ce..5570c7f4c7 100644 --- a/code/modules/jobs/job_types/roguetown/garrison/royalguard.dm +++ b/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 diff --git a/code/modules/jobs/job_types/roguetown/nobility/feldsher.dm b/code/modules/jobs/job_types/roguetown/nobility/feldsher.dm index 30eb396995..2151316f63 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 = NOBLEMEN + department_flag = TOWNERS 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 22cc9af24f..bc94032e6f 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 = MERCATOR_GUILD + department_flag = TOWNERS faction = "Station" total_positions = 1 spawn_positions = 1 diff --git a/code/modules/jobs/job_types/roguetown/other/mercenary.dm b/code/modules/jobs/job_types/roguetown/other/mercenary.dm index 32870d5195..c7c0422277 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 = GRAVEDIGGER - department_flag = PEASANTS + flag = MERCENARY + department_flag = OUTSIDERS faction = "Station" total_positions = 4 spawn_positions = 4 diff --git a/code/modules/jobs/job_types/roguetown/peasants/bathmaid.dm b/code/modules/jobs/job_types/roguetown/peasants/bathmaid.dm index 01198ecd62..b87068bb87 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 = JESTER - department_flag = PEASANTS + flag = NITEMAIDEN + department_flag = TOWNERS 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 5177771ea0..ccc9209f7b 100644 --- a/code/modules/jobs/job_types/roguetown/peasants/beggar.dm +++ b/code/modules/jobs/job_types/roguetown/peasants/beggar.dm @@ -1,7 +1,7 @@ /datum/job/roguetown/vagrant title = "Beggar" - flag = APPRENTICE + flag = BEGGAR department_flag = PEASANTS faction = "Station" total_positions = 15 diff --git a/code/modules/jobs/job_types/roguetown/peasants/butler.dm b/code/modules/jobs/job_types/roguetown/peasants/butler.dm index 00f8c5dc0f..537fae51c5 100644 --- a/code/modules/jobs/job_types/roguetown/peasants/butler.dm +++ b/code/modules/jobs/job_types/roguetown/peasants/butler.dm @@ -1,7 +1,7 @@ /datum/job/roguetown/butler title = "Butler" flag = BUTLER - department_flag = PEASANTS + department_flag = NOBLEMEN faction = "Station" total_positions = 1 spawn_positions = 1 diff --git a/code/modules/jobs/job_types/roguetown/peasants/jester.dm b/code/modules/jobs/job_types/roguetown/peasants/jester.dm index 01289278e6..eb027dee7d 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 = PEASANTS + department_flag = NOBLEMEN faction = "Station" total_positions = 1 spawn_positions = 1 diff --git a/code/modules/jobs/job_types/roguetown/peasants/soilson.dm b/code/modules/jobs/job_types/roguetown/peasants/soilson.dm index 3a3bf2168b..52ee4d9b3c 100644 --- a/code/modules/jobs/job_types/roguetown/peasants/soilson.dm +++ b/code/modules/jobs/job_types/roguetown/peasants/soilson.dm @@ -22,7 +22,6 @@ f_title = "Soilbride" outfit = /datum/outfit/job/roguetown/farmer - display_order = 24 give_bank_account = 20 min_pq = -100 selection_color = "#553e01" diff --git a/code/modules/jobs/job_types/roguetown/peasants/stevedore.dm b/code/modules/jobs/job_types/roguetown/peasants/stevedore.dm index 0c61a77e99..f0963fef42 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 = MERCATOR_GUILD + department_flag = TOWNERS faction = "Station" total_positions = 4 spawn_positions = 4 diff --git a/code/modules/jobs/job_types/roguetown/roguetown.dm b/code/modules/jobs/job_types/roguetown/roguetown.dm index 3e936e7b69..9fcd63a63a 100644 --- a/code/modules/jobs/job_types/roguetown/roguetown.dm +++ b/code/modules/jobs/job_types/roguetown/roguetown.dm @@ -4,25 +4,19 @@ /datum/job/roguetown/New() . = ..() if(give_bank_account) - for(var/X in GLOB.peasant_positions) - peopleiknow += X - peopleknowme += X - for(var/X in GLOB.serf_positions) - peopleiknow += X - peopleknowme += X - for(var/X in GLOB.mercatorguild_positions) + for(var/X in GLOB.court_positions) peopleiknow += X peopleknowme += X - for(var/X in GLOB.makersguild_positions) + for(var/X in GLOB.church_positions) peopleiknow += X peopleknowme += X - for(var/X in GLOB.church_positions) + for(var/X in GLOB.towner_positions) peopleiknow += X peopleknowme += X for(var/X in GLOB.garrison_positions) peopleiknow += X peopleknowme += X - for(var/X in GLOB.noble_positions) + for(var/X in GLOB.peasant_positions) peopleiknow += X peopleknowme += X for(var/X in GLOB.apprentices_positions) diff --git a/code/modules/jobs/job_types/roguetown/serfs/alchemist.dm b/code/modules/jobs/job_types/roguetown/serfs/alchemist.dm index 5071850431..ce8e471db0 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 = SERFS + department_flag = TOWNERS 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 9a80d0677e..cab9928032 100644 --- a/code/modules/jobs/job_types/roguetown/serfs/blacksmith.dm +++ b/code/modules/jobs/job_types/roguetown/serfs/blacksmith.dm @@ -1,7 +1,7 @@ /datum/job/roguetown/armorsmith title = "Armorer" flag = BLACKSMITH - department_flag = MAKERS_GUILD + department_flag = TOWNERS faction = "Station" total_positions = 0 spawn_positions = 0 @@ -73,7 +73,7 @@ /datum/job/roguetown/weaponsmith title = "Weaponsmith" flag = BLACKSMITH - department_flag = MAKERS_GUILD + department_flag = TOWNERS faction = "Station" total_positions = 0 spawn_positions = 0 @@ -145,7 +145,7 @@ /datum/job/roguetown/blacksmith title = "Blacksmith" flag = BLACKSMITH - department_flag = MAKERS_GUILD + department_flag = TOWNERS 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 092cf07e8c..55bcef4a6d 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 = SERFS + department_flag = TOWNERS 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 61251cfc28..f92cb40d36 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 = MAKERS_GUILD + department_flag = TOWNERS 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 9e62186ed2..5686202947 100644 --- a/code/modules/jobs/job_types/roguetown/serfs/scribe.dm +++ b/code/modules/jobs/job_types/roguetown/serfs/scribe.dm @@ -1,7 +1,7 @@ /datum/job/roguetown/scribe title = "Scribe" flag = SCRIBE - department_flag = SERFS + department_flag = TOWNERS faction = "Station" total_positions = 0 spawn_positions = 0 diff --git a/code/modules/jobs/job_types/roguetown/serfs/tailor.dm b/code/modules/jobs/job_types/roguetown/serfs/tailor.dm index 65ee5c08be..75d206cac2 100644 --- a/code/modules/jobs/job_types/roguetown/serfs/tailor.dm +++ b/code/modules/jobs/job_types/roguetown/serfs/tailor.dm @@ -1,7 +1,7 @@ /datum/job/roguetown/tailor title = "Tailor" flag = TAILOR - department_flag = SERFS + department_flag = TOWNERS faction = "Station" tutorial = "Cloth, linen, silk and leather. You've tirelessly studied and poured your life into \ sewing articles of slight protection, padding, and fashion for serf and noble alike." diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index 34c6b48f3c..e95277791c 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -53,13 +53,12 @@ GLOBAL_LIST_INIT(security_positions, list( "Detective", "Security Officer")) - GLOBAL_LIST_INIT(nonhuman_positions, list( "AI", "Cyborg", ROLE_PAI)) -GLOBAL_LIST_INIT(noble_positions, list( +GLOBAL_LIST_INIT(court_positions, list( "King", "Consort", "Hand", @@ -68,10 +67,11 @@ GLOBAL_LIST_INIT(noble_positions, list( "Steward", "Court Magician", "Archivist", - "Feldsher", + "Butler", + "Jester", "Warden of the Terrorbog", "Huntmaster of the Murderwoods", - "Hetman of Mount Decapitation" + "Hetman of Mount Decapitation", )) GLOBAL_LIST_INIT(garrison_positions, list( @@ -88,24 +88,19 @@ GLOBAL_LIST_INIT(church_positions, list( "Acolyte", "Gravekeeper", "Inquisitor", - "Confessor", "Templar", - "Adept" + "Adept", + "Confessor", )) -GLOBAL_LIST_INIT(mercatorguild_positions, list( +GLOBAL_LIST_INIT(towner_positions, list( "Merchant", - "Stevedore" - )) - -GLOBAL_LIST_INIT(makersguild_positions, list( + "Stevedore", "Blacksmith", "Armorer", "Weaponsmith", "Mason", - )) - -GLOBAL_LIST_INIT(serf_positions, list( + "Feldsher", "Innkeep", "Tailor", "Alchemist", @@ -117,20 +112,15 @@ GLOBAL_LIST_INIT(peasant_positions, list( "Butcher", "Cook", "Gravedigger", - "Jester", "Miner", "Hunter", "Fisher", - "Butler", "Towner", - "Mercenary", "Niteman", "Nitemaiden", "Prisoner", "Beggar", - "Adventurer", - "Pilgrim", - "Drifter" + )) GLOBAL_LIST_INIT(apprentices_positions, list( @@ -144,11 +134,18 @@ GLOBAL_LIST_INIT(no_antag_positions, list( "King", "Priest", "Merchant", + "Royal Guard", + "Templar", + "Stevedore", + "Inquisitor", + "Adept" )) GLOBAL_LIST_INIT(allmig_positions, list( + "Mercenary", "Adventurer", - "Pilgrim" + "Pilgrim", + "Drifter" )) GLOBAL_LIST_INIT(roguewar_positions, list( @@ -174,12 +171,10 @@ GLOBAL_LIST_EMPTY(job_assignment_order) /proc/get_job_assignment_order() var/list/sorting_order = list() - sorting_order += GLOB.noble_positions - sorting_order += GLOB.garrison_positions + sorting_order += GLOB.court_positions sorting_order += GLOB.church_positions - sorting_order += GLOB.mercatorguild_positions - sorting_order += GLOB.makersguild_positions - sorting_order += GLOB.serf_positions + sorting_order += GLOB.towner_positions + sorting_order += GLOB.garrison_positions sorting_order += GLOB.peasant_positions sorting_order += GLOB.apprentices_positions sorting_order += GLOB.allmig_positions diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 61ba663f5c..8689c09ca9 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -558,14 +558,13 @@ GLOBAL_LIST_INIT(roleplay_readme, world.file2list("strings/rt/Lore_Primer.txt")) var/column_counter = 0 var/list/omegalist = list() - omegalist += list(GLOB.noble_positions) - omegalist += list(GLOB.garrison_positions) + omegalist += list(GLOB.court_positions) omegalist += list(GLOB.church_positions) - omegalist += list(GLOB.mercatorguild_positions) - omegalist += list(GLOB.makersguild_positions) + omegalist += list(GLOB.towner_positions) + omegalist += list(GLOB.garrison_positions) omegalist += list(GLOB.peasant_positions) omegalist += list(GLOB.apprentices_positions) - omegalist += list(GLOB.serf_positions) + if(istype(SSticker.mode, /datum/game_mode/chaosmode)) var/datum/game_mode/chaosmode/C = SSticker.mode @@ -596,21 +595,19 @@ GLOBAL_LIST_INIT(roleplay_readme, world.file2list("strings/rt/Lore_Primer.txt")) var/cat_name = "" switch (SSjob.name_occupations[category[1]].department_flag) if (NOBLEMEN) - cat_name = "Nobles" + cat_name = "Court" if (GARRISON) cat_name = "Garrison" - if (MERCATOR_GUILD) - cat_name = "Mercator guild" - if (MAKERS_GUILD) - cat_name = "Makers guild" - if (SERFS) - cat_name = "Subjects" + if (TOWNERS) + cat_name = "Towners" if (TEMPLE) cat_name = "Temple" if (PEASANTS) cat_name = "Peasants" if (APPRENTICES) cat_name = "Apprentices" + if (OUTSIDERS) + cat_name = "Outsiders" dat += "
" dat += "[cat_name]" @@ -635,7 +632,7 @@ GLOBAL_LIST_INIT(roleplay_readme, world.file2list("strings/rt/Lore_Primer.txt")) var/datum/job/job_datum = SSjob.name_occupations[job] if(job_datum) var/command_bold = "" - if(job in GLOB.noble_positions) + if(job in GLOB.court_positions) command_bold = " command" var/used_name = job_datum.title if(client.prefs.gender == FEMALE && job_datum.f_title) diff --git a/code/modules/roguetown/roguemachine/steward.dm b/code/modules/roguetown/roguemachine/steward.dm index acec649a7a..2eae40d159 100644 --- a/code/modules/roguetown/roguemachine/steward.dm +++ b/code/modules/roguetown/roguemachine/steward.dm @@ -156,7 +156,7 @@ SStreasury.give_money_account(-newtax, A) break if(href_list["payroll"]) - var/list/L = list(GLOB.noble_positions) + list(GLOB.garrison_positions) + list(GLOB.church_positions) + list(GLOB.serf_positions) + list(GLOB.peasant_positions) + list(GLOB.apprentices_positions) + var/list/L = list(GLOB.court_positions) + list(GLOB.garrison_positions) + list(GLOB.church_positions) + list(GLOB.towner_positions) + list(GLOB.peasant_positions) + list(GLOB.apprentices_positions) var/list/things = list() for(var/list/category in L) for(var/A in category) diff --git a/code/modules/roguetown/roguemachine/titan.dm b/code/modules/roguetown/roguemachine/titan.dm index f3abf9f42d..4dca2ae774 100644 --- a/code/modules/roguetown/roguemachine/titan.dm +++ b/code/modules/roguetown/roguemachine/titan.dm @@ -225,7 +225,7 @@ GLOBAL_LIST_INIT(laws_of_the_land, initialize_laws_of_the_land()) if(isnull(victim) || !Adjacent(user)) return - var/list/possible_positions = GLOB.noble_positions + GLOB.garrison_positions + GLOB.church_positions + GLOB.serf_positions + GLOB.peasant_positions + GLOB.apprentices_positions + GLOB.allmig_positions - "King" + var/list/possible_positions = GLOB.court_positions + GLOB.garrison_positions + GLOB.church_positions + GLOB.towner_positions + GLOB.peasant_positions + GLOB.apprentices_positions + GLOB.allmig_positions - "King" var/new_pos = input(user, "Select their new position", src, null) as anything in possible_positions if(isnull(new_pos) || !Adjacent(user))