Return of the tailor (#1246)

* roles

* Update stonehamlet.dmm

* dyeee

* Update storage.dm

code/__DEFINES/colors.dm

@@ -90,7 +90,7 @@
 #define CLOTHING_ROYAL_BLACK	"#2f352f"
 #define CLOTHING_BOG_GREEN		"#58793f"
 #define CLOTHING_ROYAL_TEAL		"#249589"
-#define CLOTHING_PEAR_YELLOW	"#b5b004"
+#define CLOTHING_PEAR_YELLOW	"#a19d20"
 #define CLOTHING_CHALK_WHITE	"#c7c0b5"
 
 
@@ -99,8 +99,8 @@
 
 #define CLOTHING_SOOT_BLACK		"#4b4b50"
 #define CLOTHING_WINESTAIN_RED	"#6b3737"
-#define CLOTHING_PEASANT_BROWN	"#705243"
-#define CLOTHING_MUD_BROWN		"#685542"
+#define CLOTHING_PEASANT_BROWN	"#574a43"
+#define CLOTHING_MUD_BROWN		"#57493a"
 #define CLOTHING_CHESTNUT		"#5f3d21"
 #define CLOTHING_OLD_LEATHER	"#473a30"
 #define CLOTHING_SPRING_GREEN	"#435436"
@@ -125,6 +125,8 @@
 			return CLOTHING_ROYAL_PURPLE
 		if("Forest Green")
 			return CLOTHING_FOREST_GREEN
+		if("Spring Green")
+			return CLOTHING_SPRING_GREEN
 		if("Sky Blue")
 			return CLOTHING_SKY_BLUE
 		if("Mustard Yellow")

code/__DEFINES/jobs.dm

@@ -133,10 +133,10 @@
 #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 TAILOR		(1<<7)
+#define NIGHTMAN    (1<<8)
+#define NITEMAIDEN	(1<<9)
+#define ALCHEMIST	(1<<10)
 #define SCRIBE		(1<<11)
 
 

code/game/area/roguetownareas.dm

@@ -655,6 +655,9 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
 	droning_sound_dusk = null
 	droning_sound_night = null
 
+/area/rogue/indoors/town/tailor
+	name = "tailorshop"
+	icon_state = "tavern"
 
 // so you can teleport to the farm
 /area/rogue/indoors/soilsons

code/game/objects/effects/spawners/roguemapgen.dm

@@ -290,7 +290,8 @@
 		/obj/item/reagent_containers/food/snacks/smallrat = 15,
 		/obj/item/reagent_containers/food/snacks/smallrat/dead = 10,
 		/obj/item/roguecoin/copper = 50,
-		/mob/living/carbon/human/species/human/northern/bum/skilled/madman  = 25,
+		/mob/living/carbon/human/species/human/northern/bum/skilled/madman  = 10,
+		/obj/structure/idle_enemy/bigrat = 10
 		)
 
 /*	..................   Skeleton Fighter Danger   ................... */

code/game/objects/items/rogueitems/natural/clothfibersthorn.dm

@@ -124,8 +124,6 @@
 	if(wet)
 		. += span_notice("It's wet!")
 
-/obj/item/natural/cloth/bandit
-	color = "#ff0000"
 
 // CLEANING
 
@@ -313,6 +311,9 @@
 	icon2 = "clothroll2"
 	icon2step = 10
 
+/obj/item/natural/bundle/cloth/partial
+	amount = 6
+
 /obj/item/natural/bundle/stick
 	name = "bundle of sticks"
 	desc = "A bundle of wooden sticks, weak when seperated, mighty together."

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

@@ -19,3 +19,6 @@
 
 /obj/item/reagent_containers/glass/bottle/waterskin/milk // Filled subtype used by the cheesemaker
 	list_reagents = list(/datum/reagent/consumable/milk = 64)
+
+/obj/item/reagent_containers/glass/bottle/waterskin/half
+	list_reagents = list(/datum/reagent/water = 32)

code/game/objects/items/rogueweapons/melee/knives.dm

@@ -403,8 +403,8 @@
 	desc = "A tool favored by poor woodland inhabitants, easy to make, useful for skinning the flesh of beast and man alike."
 	icon_state = "stone_knife"
 	resistance_flags = FLAMMABLE // Weapon made mostly of wood
-	max_integrity = 30
-	max_blade_int = 30
+	max_integrity = 28
+	max_blade_int = 28
 	wdefense = TERRIBLE_PARRY
 	smeltresult = /obj/item/ash
 	sellprice = 5

code/game/objects/lighting/_base_roguelight.dm

@@ -119,7 +119,7 @@
 						foundstab = TRUE
 						break
 				if(foundstab)
-					var/prob2spoil = 33
+					var/prob2spoil = 25
 					if(user.mind.get_skill_level(/datum/skill/craft/cooking))
 						prob2spoil = 1
 					user.visible_message(span_notice("[user] starts to cook [W] over [src]."))

code/game/objects/structures/dystation.dm

@@ -42,32 +42,39 @@
 		"Ash Grey" ="#999999",
 		"Chalk White" ="#c7c0b5",
 		"Cream" ="#b0ae80",
-		"Blood Red" ="#770d0d",
-		"Plum Purple" ="#4b2265",
+		"Soot Black" ="#4b4b50",
 		"Dark Ink" ="#372b2b",
-		"Forest Green" ="#3f8b24",
-		"Sky Blue" ="#1b3c7a",
-		"Mustard Yellow" ="#979044",
-
 		"Royal Black" ="#2f352f",
+		"Winestain Red" ="#6b3737",
+		"Blood Red" ="#770d0d",
 		"Royal Red" ="#8f3636",
 		"Royal Majenta" ="#822b52",
+		"Red Ochre" = "#6f2d28",
+		"Maroon" ="#672c0d",
+		"Salmon" ="#a56176",
+		"Russet" ="#733f18",
+		"Peasant Brown" ="#705243",
+		"Chestnut" ="#5f3d21",
+
 		"Bark Brown"="#685542",
+		"Mud Brown" ="#685542",
+		"Old Leather" ="#473a30",
+		"Spring Green" ="#435436",
+		"Forest Green" ="#3f8b24",
 		"Bog Green" ="#58793f",
 		"Mage Green" ="#759259",
 		"Royal Teal" ="#249589",
+		"Berry Blue" ="#38455b",
 		"Pear Yellow" ="#b5b004",
 		"Mage Yellow" ="#d2bc2b",
+		"Mustard Yellow" ="#979044",
+		"Yellow Ochre" ="#9b7a02",
 		"Fyritius Orange" ="#b47011",
 		"Mage Orange" ="#ad5e29",
 		"Royal Purple" ="#865c9c",
+		"Plum Purple" ="#4b2265",
 		"Mage Blue" ="#4756d8",
-
-		"Salmon" ="#a56176",
-		"Russet" ="#733f18",
-		"Yellow Ochre" ="#9b7a02",
-		"Red Ochre" = "#6f2d28",
-		"Maroon" ="#672c0d"
+		"Sky Blue" ="#1b3c7a",
 		)
 
 
@@ -271,6 +278,14 @@
 	return ..()
 
 /obj/machinery/simple_dye_bin/attackby(obj/item/I, mob/living/user)
+	if(istype(I, /obj/item/luxury_dyes))
+		playsound(src, "bubbles", 50, 1)
+		if(do_after(user, 3 SECONDS))
+			user.visible_message("<span class='notice'>[user] adds the [I].</span>")
+			new /obj/machinery/dye_bin(get_turf(src.loc))
+			qdel(I)
+			qdel(src)
+
 	if(allow_mobs && istype(I, /obj/item/clothing/head/mob_holder))
 		var/obj/item/clothing/head/mob_holder/H = I
 		if(inserted)
@@ -292,6 +307,7 @@
 	else
 		return ..()
 
+
 /obj/machinery/simple_dye_bin/AllowDrop()
 	return FALSE
 

code/modules/clothing/rogueclothes/pants.dm

@@ -89,7 +89,7 @@
 	body_parts_covered = GROIN|LEG_RIGHT
 
 /obj/item/clothing/under/roguetown/tights/vagrant/Initialize()
-	color = pick("#6b5445", "#435436", "#704542", "#79763f")
+	color = pick(CLOTHING_MUD_BROWN, CLOTHING_OLD_LEATHER,  CLOTHING_SPRING_GREEN, CLOTHING_BARK_BROWN, CLOTHING_SOOT_BLACK	)
 	..()
 
 /obj/item/clothing/under/roguetown/tights/sailor
@@ -213,7 +213,7 @@
 	name = "leather trousers"
 	desc = "Standard leather pants for hardy workers."
 	icon_state = "leathertrou"
-	
+
 	armor = ARMOR_LEATHER_BAD
 	prevent_crits = CUT_AND_MINOR_CRITS
 	max_integrity = INTEGRITY_POOR
@@ -226,7 +226,7 @@
 	sleeved = 'icons/roguetown/clothing/onmob/helpers/stonekeep_merc.dmi'
 	detail_tag = "_detail"
 	colorgrenz = TRUE
-	
+
 	armor = ARMOR_PADDED
 	prevent_crits = MINOR_CRITICALS
 	max_integrity = INTEGRITY_STANDARD
@@ -281,11 +281,11 @@
 	name = "iron chain chausses"
 	desc = "Chain mail chausses made of iron rings woven together, offering protection against cuts and stabs."
 	smeltresult = /obj/item/ingot/iron
-	
+
 	armor = ARMOR_MAILLE_IRON
 	max_integrity = INTEGRITY_STRONG //250 Integrity.
 	prevent_crits = ALL_EXCEPT_BLUNT_AND_STAB //Non-riveted, iron chain can be broken apart with a powerful thrust.
-	
+
 
 //..................................................................................................................................
 /*---------------\

code/modules/clothing/rogueclothes/shirts.dm

@@ -110,7 +110,7 @@
 	body_parts_covered = CHEST|ARM_RIGHT|VITALS
 
 /obj/item/clothing/suit/roguetown/shirt/undershirt/vagrant/Initialize()
-	color = pick(CLOTHING_MUD_BROWN, CLOTHING_PEAR_YELLOW, CLOTHING_BOG_GREEN, CLOTHING_BARK_BROWN	)
+	color = pick(CLOTHING_MUD_BROWN, CLOTHING_OLD_LEATHER,  CLOTHING_SPRING_GREEN, CLOTHING_BARK_BROWN	)
 	..()
 
 /obj/item/clothing/suit/roguetown/shirt/shortshirt

code/modules/clothing/rogueclothes/storage.dm

@@ -141,12 +141,17 @@
 
 /obj/item/storage/belt/rogue/leather/cloth/lady
 	color = "#575160"
+/obj/item/storage/belt/rogue/leather/cloth/lady/Initialize()
+	. = ..()
+	new /obj/item/needle(src)
 
 /obj/item/storage/belt/rogue/leather/cloth/tailor
 	color = "#756889"
 /obj/item/storage/belt/rogue/leather/cloth/tailor/Initialize()
 	. = ..()
 	new /obj/item/roguekey/tailor(src)
+	new /obj/item/rogueweapon/knife/dagger(src)
+	new /obj/item/needle(src)
 
 /obj/item/storage/belt/rogue/leather/cloth/bandit
 	color = "#ff0000"

code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm

@@ -18,12 +18,12 @@
 /datum/outfit/job/roguetown/adventurer/rogue/pre_equip(mob/living/carbon/human/H)
 	..()
 	shoes = /obj/item/clothing/shoes/roguetown/boots
-	H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE)
-	H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE)
 	H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE)
 	H.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE)
 	H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE)
-	H.mind.adjust_skillrank(/datum/skill/combat/swords, pick(0,0,1), TRUE)
+	H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, 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/misc/swimming, 2, TRUE)
@@ -32,7 +32,7 @@
 	H.mind.adjust_skillrank(/datum/skill/misc/reading, pick(0,1,1), TRUE)
 	H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 5, TRUE)
 	H.mind.adjust_skillrank(/datum/skill/misc/stealing, 5, TRUE)
-	H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 4, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 3, TRUE)
 	H.mind.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE)
 	pants = /obj/item/clothing/under/roguetown/trou/leather
 	shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/black
@@ -43,11 +43,14 @@
 	armor = /obj/item/clothing/suit/roguetown/armor/leather
 	cloak = /obj/item/clothing/cloak/raincloak/mortus
 	backl = /obj/item/storage/backpack/rogue/satchel
-	beltr = /obj/item/rogueweapon/mace/cudgel
+	beltr = /obj/item/rogueweapon/knife/dagger/steel
 	backr = /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow
 	beltl = /obj/item/quiver/bolts
 	neck = /obj/item/clothing/neck/roguetown/coif
-	backpack_contents = list(/obj/item/lockpick = 1, /obj/item/rogueweapon/knife/dagger/steel)
+	if(prob(30))
+		mask = /obj/item/clothing/mask/rogue/shepherd/rag
+
+	backpack_contents = list(/obj/item/lockpick = 1, /obj/item/rogueweapon/mace/cudgel = 1)
 	ADD_TRAIT(H, TRAIT_DODGEEXPERT, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC)		//Rogues are known for commonly lacking standard morals, as well as seeing fucked-shit, so - this tracks.
 	H.change_stat("strength", -1)

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

@@ -6,63 +6,31 @@
 	"Half-Elf",
 	"Dwarf",
 	"Tiefling",
-	"Aasimar"
 	)
-	outfit = /datum/outfit/job/roguetown/adventurer/tailor
-//	category_tags = list(CTAG_PILGRIM)	Actually these guys are pure bloat, pilgrims need to have their own take on stuff, not be carbon copies.
+	outfit = /datum/outfit/job/roguetown/adventurer/weaver
+	category_tags = list(CTAG_PILGRIM)
 
-/datum/outfit/job/roguetown/adventurer/tailor/pre_equip(mob/living/carbon/human/H)
+/datum/outfit/job/roguetown/adventurer/weaver/pre_equip(mob/living/carbon/human/H)
 	..()
 	H.mind.adjust_skillrank(/datum/skill/misc/sewing, 4, TRUE)
 	H.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE)
-	H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE)
 	H.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE)
 	H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE)
 	H.mind.adjust_skillrank(/datum/skill/labor/farming, 1, TRUE)
 	H.mind.adjust_skillrank(/datum/skill/craft/tanning, 3, TRUE)
 	H.mind.adjust_skillrank(/datum/skill/craft/carpentry, 1, TRUE)
-	H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE)
+	head = /obj/item/clothing/head/roguetown/fashionablehat
 	belt = /obj/item/storage/belt/rogue/leather/cloth/lady
 	pants = /obj/item/clothing/under/roguetown/tights/random
 	shoes = /obj/item/clothing/shoes/roguetown/shortboots
 	backl = /obj/item/storage/backpack/rogue/satchel
 	neck = /obj/item/storage/belt/rogue/pouch/coins/mid
 	shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt
-	beltr = /obj/item/rogueweapon/knife/villager
-	cloak = /obj/item/clothing/cloak/raincloak/furcloak
-	beltl = /obj/item/needle
-	backpack_contents = list(/obj/item/natural/cloth = 1, /obj/item/natural/cloth = 1, /obj/item/natural/bundle/fibers = 1, /obj/item/needle = 1)
-	H.change_stat("intelligence", 2)
-	H.change_stat("speed", 2)
-	H.change_stat("perception", 1)
-
-/datum/advclass/pilgrim/weaver/town
-	category_tags = list(CTAG_TOWNER)
-	outfit = /datum/outfit/job/roguetown/adventurer/weaver_towner
-
-/datum/outfit/job/roguetown/adventurer/weaver_towner/pre_equip(mob/living/carbon/human/H)
-	..()
-	H.mind.adjust_skillrank(/datum/skill/misc/sewing, 4, TRUE)
-	H.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE)
-	H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE)
-	H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE)
-	H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 1, TRUE)
-	H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE)
-	H.mind.adjust_skillrank(/datum/skill/labor/farming, 1, TRUE)
-	H.mind.adjust_skillrank(/datum/skill/craft/tanning, 3, TRUE)
-	H.mind.adjust_skillrank(/datum/skill/craft/carpentry, 1, TRUE)
-	H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE)
-	H.mind.teach_crafting_recipe(/datum/crafting_recipe/roguetown/sewing/tunic)
-	belt = /obj/item/storage/belt/rogue/leather/cloth/lady
-	pants = /obj/item/clothing/under/roguetown/tights/random
-	shoes = /obj/item/clothing/shoes/roguetown/shortboots
-	backl = /obj/item/storage/backpack/rogue/satchel
-	neck = /obj/item/storage/belt/rogue/pouch/coins/mid
-	shirt = /obj/item/clothing/suit/roguetown/shirt/tunic/random
-	beltr = /obj/item/rogueweapon/knife/villager
+	beltr = /obj/item/rogueweapon/knife/hunting
 	cloak = /obj/item/clothing/cloak/raincloak/furcloak
-	beltl = /obj/item/needle
-	backpack_contents = list(/obj/item/natural/cloth = 1, /obj/item/natural/cloth = 1, /obj/item/natural/bundle/fibers = 1, /obj/item/needle = 1)
+	beltl = /obj/item/reagent_containers/glass/bottle/waterskin/half
+	backpack_contents = list(/obj/item/natural/bundle/cloth/partial = 1, /obj/item/cheap_dyes = 1, /obj/item/natural/bundle/fibers = 1, /obj/item/natural/fur/volf = 1)
 	H.change_stat("intelligence", 2)
 	H.change_stat("speed", 2)
 	H.change_stat("perception", 1)