guild clerk

_maps/map_files/dun_world/dun_world.dmm

@@ -17418,13 +17418,7 @@
 /turf/open/floor/rogue/cobblerock,
 /area/rogue/outdoors/beach)
 "eup" = (
-/obj/structure/table/wood/long_table,
-/obj/item/paper,
-/obj/item/paper{
-	pixel_x = 4;
-	pixel_y = 4
-	},
-/obj/item/natural/feather,
+/obj/structure/table/wood/long_table/mid/alt,
 /turf/open/floor/carpet/red,
 /area/rogue/indoors/town)
 "eur" = (
@@ -53070,6 +53064,11 @@
 	},
 /turf/open/floor/carpet/red,
 /area/rogue/indoors/inq/basement)
+"nqL" = (
+/obj/structure/chair/wood/rogue/chair3,
+/obj/effect/landmark/start/guild_clerk,
+/turf/open/floor/carpet/red,
+/area/rogue/indoors/town)
 "nqN" = (
 /obj/machinery/light/rogue/torchholder/lanternpost{
 	dir = 1
@@ -59822,11 +59821,9 @@
 /turf/open/floor/rogue/ruinedwood,
 /area/rogue/indoors)
 "pfB" = (
-/obj/structure/chair/wood/rogue/chair3,
 /obj/structure/fluff/walldeco/sparrowflag{
 	pixel_y = 32
 	},
-/obj/effect/landmark/start/mercenary,
 /turf/open/floor/carpet/red,
 /area/rogue/indoors/town)
 "pfG" = (
@@ -61592,6 +61589,7 @@
 /obj/effect/decal/wood/herringbone{
 	dir = 8
 	},
+/obj/structure/roguemachine/bounty,
 /turf/open/floor/rogue/ruinedwood/spiral,
 /area/rogue/indoors/town)
 "pBu" = (
@@ -92017,6 +92015,18 @@
 	},
 /turf/open/floor/rogue/grass,
 /area/rogue/outdoors/rtfield/eora)
+"wWI" = (
+/obj/effect/decal/wood/herringbone{
+	dir = 8
+	},
+/obj/structure/mineral_door/swing_door{
+	keylock = 1;
+	locked = 1;
+	lockid = "merc";
+	name = "Clerk's Office"
+	},
+/turf/open/floor/rogue/ruinedwood/spiral,
+/area/rogue/indoors/town)
 "wWM" = (
 /obj/structure/table/wood{
 	icon_state = "tablewood1"
@@ -93710,6 +93720,15 @@
 /obj/item/clothing/suit/roguetown/shirt/dress/gen/random,
 /turf/open/floor/rogue/blocks/newstone/alt,
 /area/rogue/under/cavewet/bogcaves/sunkencity)
+"xsu" = (
+/obj/structure/table/wood/long_table,
+/obj/item/paper{
+	pixel_x = 4;
+	pixel_y = 4
+	},
+/obj/item/natural/feather,
+/turf/open/floor/carpet/red,
+/area/rogue/indoors/town)
 "xsx" = (
 /obj/item/ash,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -278365,9 +278384,9 @@ qJA
 qJA
 qyR
 guo
-guo
 pBq
 kvk
+wWI
 xNs
 uky
 cBs
@@ -278819,7 +278838,7 @@ qyR
 guo
 oto
 xWk
-xWk
+xsu
 dra
 dra
 dra
@@ -279270,7 +279289,7 @@ pWT
 qyR
 guo
 aSY
-xWk
+nqL
 eup
 dra
 dra

code/__DEFINES/jobs.dm

@@ -186,6 +186,7 @@
 #define MERCENARY		(1<<2)
 #define DESERT_RIDER	(1<<3)	//Unused
 #define GRENZELHOFT		(1<<4)	//Unused
+#define MERC_CLERK		(1<<5)
 
 
 #define TRIBAL		(1<<8)
@@ -301,6 +302,7 @@
 #define JDO_GRENZELHOFT 31.1
 #define JDO_DESERT_RIDER 31.2
 #define JDO_VET 31.4
+#define JDO_MERC_CLERK 31.5
 
 #define JDO_VAGRANT 33
 #define JDO_ORPHAN 34
@@ -388,6 +390,7 @@
 #define WANDERER_ROLES \
 	/datum/job/roguetown/pilgrim,\
 	/datum/job/roguetown/adventurer,\
+	/datum/job/roguetown/guild_clerk,\
 	/datum/job/roguetown/mercenary/desert_rider,\
 	/datum/job/roguetown/mercenary/grenzelhoft,\
 	/datum/job/roguetown/bandit,\

code/game/objects/effects/landmarks.dm

@@ -334,6 +334,10 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
 	name = "Mercenary"
 	icon_state = "arrow"
 
+/obj/effect/landmark/start/guild_clerk
+	name = "Guild Clerk"
+	icon_state = "arrow"
+
 /obj/effect/landmark/start/vagrant
 	name = "Beggar"
 	icon_state = "arrow"

code/modules/jobs/job_types/roguetown/mercenaries/guild_clerk.dm

@@ -0,0 +1,57 @@
+/datum/job/roguetown/guild_clerk
+	title = "Guild Clerk"
+	flag = MERC_CLERK
+	department_flag = MERCENARIES
+	tutorial = "Tidy. Crass. Foul mouthed. The first words that come to mind for the unsung hero of the mercenary guild's contract clerk. \
+	The medium by which the mercenaries go through for the average town goer to secure a mercenary and a fair price to accompany. \
+	Not only are you responsible for organizing contracts for the mercenaries, but also ensuring the proper use and delivery of the rewards from the excidium. \
+	It's a thankless task, but someone has to do it. May as well be you."
+	allowed_sexes = list(MALE, FEMALE)
+	allowed_races = RACES_FEARED_UP // ES equivalent of upstream's RACES_VERY_SHUNNED_UP
+	allowed_ages = ALL_AGES_LIST
+	outfit = /datum/outfit/job/roguetown/mercenary/guild_clerk
+	display_order = JDO_MERC_CLERK
+	selection_color = JCOLOR_MERCENARY
+	faction = "Station"
+	total_positions = 1
+	spawn_positions = 1
+	min_pq = 6
+	max_pq = null
+	job_reopens_slots_on_death = TRUE
+	always_show_on_latechoices = TRUE
+
+/datum/outfit/job/roguetown/mercenary/guild_clerk/pre_equip(mob/living/carbon/human/H)
+	..()
+	ADD_TRAIT(H, TRAIT_SEEPRICES, type)
+
+	//More-or-less just combat clerk. DO YOUR JOB!!!!!!!
+	if(H.mind)
+		H.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE)
+		H.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE)
+		H.adjust_skillrank(/datum/skill/combat/maces, 3, TRUE)
+		H.adjust_skillrank(/datum/skill/misc/reading, 5, TRUE)
+		H.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE)
+		H.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE)
+		H.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE)
+		H.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE)
+		H.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE)
+		H.change_stat("strength", 1)
+		H.change_stat("intelligence", 2)
+		H.change_stat("fortune", 1)
+
+	//Clerk stuff.
+	if(H.gender == MALE)
+		armor = /obj/item/clothing/cloak/tabard/knight
+		shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt
+		pants = /obj/item/clothing/under/roguetown/tights
+
+	if(H.gender == FEMALE)
+		shirt = /obj/item/clothing/suit/roguetown/shirt/dress/noble // upstream uses /nobledress/green which doesn't exist in ES
+		pants = /obj/item/clothing/under/roguetown/tights/black // upstream uses /stockings/white which doesn't exist in ES
+
+	shoes = /obj/item/clothing/shoes/roguetown/boots/leather // upstream uses /armor/leather; ES uses /boots/leather
+	belt = /obj/item/storage/belt/rogue/leather
+	beltr = /obj/item/storage/belt/rogue/pouch/coins/rich //To pay out contracts, if the issuer flakes.
+	backl = /obj/item/rogueweapon/mace
+	beltl = /obj/item/roguekey/mercenary // Regular merc key — ES doesn't have upstream's /storage/keyring/mercenary_boss "captain office" keyring.
+	backr = /obj/item/storage/backpack/rogue/satchel

code/modules/jobs/jobs.dm

@@ -148,6 +148,7 @@ GLOBAL_LIST_INIT(mercenary_positions, list(
 	"Grenzelhoft Mercenary",
 	"Desert Rider Mercenary",
 	"Veteran",
+	"Guild Clerk",
 ))
 
 GLOBAL_LIST_INIT(youngfolk_positions, list(