Merge pull request #164 from Animusin/update22

Update22

code/game/objects/items/rogueitems/keyrings.dm

@@ -254,6 +254,9 @@
 /obj/item/keyring/merchant
 	keys = list(/obj/item/roguekey/shop, /obj/item/roguekey/merchant)
 
+/obj/item/keyring/stevedore
+	keys = list(/obj/item/roguekey/shop, /obj/item/roguekey/warehouse)
+
 /obj/item/keyring/mguard
 	keys = list(/obj/item/roguekey/dungeon, /obj/item/roguekey/garrison, /obj/item/roguekey/walls, /obj/item/roguekey/manor)
 

code/modules/jobs/job_types/roguetown/other/merc_classes/blackoak.dm

@@ -27,13 +27,15 @@
 	backpack_contents = list(/obj/item/roguekey/mercenary, /obj/item/storage/belt/rogue/pouch/coins/poor)
 	if(H.mind)
 		H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE)
-		H.mind.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE)
+		H.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE)
+		H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE)
+		H.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE)
 		H.change_stat("endurance", 2)
 		H.change_stat("strength", 1)
 	ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC)

code/modules/jobs/job_types/roguetown/other/merc_classes/boltslinger.dm

@@ -52,5 +52,4 @@
 		H.change_stat("perception", 3)
 		H.change_stat("endurance", 1)
 		H.change_stat("strength", 1)
-	ADD_TRAIT(H, TRAIT_NOSEGRAB, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC)

code/modules/jobs/job_types/roguetown/other/merc_classes/grenzelhoft.dm

@@ -21,9 +21,9 @@
 		H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE)	//Big sword user so - really helps them.
 		H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE)
-		H.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE)
+		H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, pick(1,1,2), TRUE)
-		H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, pick(1,1,2), TRUE)
+		H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, pick(2,3), TRUE) // Equal chance between skilled and average, can use a cudgel to beat less dangerous targets into submission
 		H.mind.adjust_skillrank(/datum/skill/combat/shields, pick(0,0,1), TRUE)
 		H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE)
@@ -40,6 +40,7 @@
 	shoes = /obj/item/clothing/shoes/roguetown/grenzelhoft
 	gloves = /obj/item/clothing/gloves/roguetown/grenzelgloves
 	belt = /obj/item/storage/belt/rogue/leather
+	beltl = /obj/item/rogueweapon/mace/cudgel
 	shirt = /obj/item/clothing/suit/roguetown/shirt/grenzelhoft
 	head = /obj/item/clothing/head/roguetown/grenzelhofthat
 	armor = /obj/item/clothing/suit/roguetown/armor/plate/half/grenzelhoft
@@ -53,5 +54,5 @@
 	H.change_stat("strength", 2) // They need this to roll at least min STR for the Zwei.
 	H.change_stat("endurance", 1)
 	H.change_stat("constitution", 2)
-	ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC)
+	ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC)
 	H.patron = GLOB.patronlist[/datum/patron/forgotten] // SCREAM IF YOU LOVE THE FORGOTTEN GOD

code/modules/jobs/job_types/roguetown/other/merc_classes/steppesman.dm

@@ -48,5 +48,4 @@
 	H.change_stat("perception", 1)
 	H.change_stat("constitution", 1)
 	H.change_stat("speed", 1)
-	ADD_TRAIT(H, TRAIT_NOSEGRAB, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_DODGEEXPERT, TRAIT_GENERIC)

code/modules/jobs/job_types/roguetown/other/merc_classes/underdweller.dm

@@ -19,15 +19,12 @@
     shoes = /obj/item/clothing/shoes/roguetown/boots/leather
     belt = /obj/item/storage/belt/rogue/leather
     neck = /obj/item/clothing/neck/roguetown/chaincoif
-    beltl = /obj/item/rogueweapon/woodcut/pick
     beltr = /obj/item/rogueweapon/huntingknife
     backl = /obj/item/storage/backpack/rogue/backpack
     backr = /obj/item/rogueweapon/shield/wood
     backpack_contents = list(/obj/item/roguekey/mercenary, /obj/item/storage/belt/rogue/pouch/coins/poor)
     if(H.mind)
-        H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE)
-        H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 4, TRUE)
-        H.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE)
+        H.mind.adjust_skillrank(/datum/skill/combat/shields, pick(2,2,3), TRUE)
         H.mind.adjust_skillrank(/datum/skill/labor/mining, 3, TRUE)
         H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE)
         H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE)
@@ -41,5 +38,16 @@
         H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE)
         H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE)
         H.change_stat("fortune", 1)
+        H.change_stat("endurance", 1)
         H.change_stat("strength", 1)
+
+    if(H.dna.species.id == "dwarf")
+        H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE)
+        H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE)
+        beltl = /obj/item/rogueweapon/woodcut/pick // Dorfs get a pick as their primary weapon and axes/maces to use it
+    else       
+        H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE)
+        H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE)
+        beltl = /obj/item/rogueweapon/sword/sabre // Dark elves get a sabre as their primary weapon and swords skill, who woulda thought
+
     ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC)

code/modules/jobs/job_types/roguetown/other/merc_classes/zybantine.dm

@@ -41,7 +41,7 @@
 		H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE)
-		H.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE)
+		H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE)
@@ -50,5 +50,4 @@
 		H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE)
 		H.change_stat("strength", 1)
 		H.change_stat("endurance", 2)
-	ADD_TRAIT(H, TRAIT_NOSEGRAB, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC)

code/modules/jobs/job_types/roguetown/peasants/grabber.dm

@@ -1,10 +1,10 @@
 /datum/job/roguetown/grabber
-	title = "Hauler"
+	title = "Stevedore"
 	flag = GRABBER
 	department_flag = PEASANTS
 	faction = "Station"
-	total_positions = 3
-	spawn_positions = 3
+	total_positions = 4
+	spawn_positions = 4
 
 	allowed_races = list(
 		"Humen",
@@ -16,20 +16,23 @@
 		"Aasimar"
 	)
 
-	tutorial = "Hauler is one of the lowest positions in town, they are expected to aid steward, merchant, masons, and blacksmiths in hauling goods and deliveries."
+	tutorial = "Being a stevedore is one of the lowest yet most needed positions in town, as they are expected to aid the Merchant, Steward, Masons, and Blacksmiths in hauling materials and goods while keeping a guarding eye on the town's warehouses for the safety of the items stashed within."
 
 	outfit = /datum/outfit/job/roguetown/grabber
 	give_bank_account = TRUE
 	display_order = JDO_GRABBER
 	bypass_lastclass = FALSE
 	whitelist_req = FALSE
 
+/datum/job/roguetown/grabber/after_spawn(mob/living/L, mob/M, latejoin = TRUE)
+	..()
 /datum/outfit/job/roguetown/grabber/pre_equip(mob/living/carbon/human/H)
 	..()
 	if(H.mind)
-		H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) // You get a cudgel for nonlethal self defense and that's it.
+		H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) // You get a cudgel for nonlethal self defense and that's it.
 		H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE)
+		H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE)//they can use the merchant machine and that's it
 		H.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/misc/swimming, 4, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE)
@@ -38,30 +41,26 @@
 	if(H.gender == MALE)
 		shoes = /obj/item/clothing/shoes/roguetown/boots/leather
 		pants = /obj/item/clothing/under/roguetown/tights/sailor
-		neck = /obj/item/storage/belt/rogue/pouch/coins/poor
+		head = /obj/item/clothing/head/roguetown/headband/red
 		beltr = /obj/item/rogueweapon/mace/cudgel
-		beltl = /obj/item/roguekey/warehouse
+		beltl = /obj/item/storage/belt/rogue/pouch/coins/poor
+		wrists = /obj/item/keyring/stevedore
 		belt = /obj/item/storage/belt/rogue/leather/rope
-		shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/sailor
-		if(prob(30))
-			shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/sailor/red
-		if(prob(23))
-			armor = /obj/item/clothing/suit/roguetown/armor/leather/vest/sailor
-		H.change_stat("endurance", 2)
-		H.change_stat("constitution", 2)
-		H.change_stat("speed", 1)
+		armor = /obj/item/clothing/suit/roguetown/armor/leather/vest/sailor
+		shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/sailor/red
+		H.change_stat("endurance", 1)
+		H.change_stat("constitution", 1)
+		H.change_stat("strength", 1)//thug bodytype
 	else
 		shoes = /obj/item/clothing/shoes/roguetown/gladiator
 		pants = /obj/item/clothing/under/roguetown/tights/sailor
 		beltr = /obj/item/rogueweapon/mace/cudgel
-		neck = /obj/item/storage/belt/rogue/pouch/coins/poor
-		beltl = /obj/item/roguekey/warehouse
+		beltl = /obj/item/storage/belt/rogue/pouch/coins/poor
+		wrists = /obj/item/keyring/stevedore
 		belt = /obj/item/storage/belt/rogue/leather/rope
 		shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/sailor
-		if(prob(23))
-			armor = /obj/item/clothing/suit/roguetown/armor/leather/vest/sailor
-		if(prob(77))
-			shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/sailor/red
+		armor = /obj/item/clothing/suit/roguetown/armor/leather/vest/sailor
+		head = /obj/item/clothing/head/roguetown/headband
 		H.change_stat("endurance", 1)
 		H.change_stat("intelligence", 1)
-		H.change_stat("constitution", 1)
+		H.change_stat("speed", 1)

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

@@ -54,9 +54,6 @@
 				H.patron = GLOB.patronlist[default_patron]
 		to_chat(H, "<span class='warning'>[ourpatron] had not endorsed my practices in my younger years. I've since grown acustomed to [H.patron].")
 	if(H.mind)
-		if(H.gender == FEMALE)
-			H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE)
-			H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE)
 		if(H.dna)
 			H.dna.species.random_underwear(H.gender)
 			if(H.dna.species)

code/modules/jobs/jobs.dm

@@ -102,6 +102,7 @@ GLOBAL_LIST_INIT(serf_positions, list(
 
 GLOBAL_LIST_INIT(peasant_positions, list(
 	"Soilson",
+	"Stevedore",
 	"Butcher",
 	"Cook",
 	"Gravedigger",
@@ -114,7 +115,6 @@ GLOBAL_LIST_INIT(peasant_positions, list(
 	"Adventurer",
 	"Towner",
 	"Pilgrim",
-	"Grabber",
 	"Mercenary",
 	"Niteman",
 	"Nitemaiden",