dyeee

_maps/map_files/stonehamlet/stonehamlet.dmm

@@ -3628,9 +3628,6 @@
 /turf/open/floor/rogue/sandstone,
 /area/rogue/indoors/town/church/chapel)
 "dOs" = (
-/obj/machinery/light/rogue/torchholder{
-	pixel_y = 32
-	},
 /obj/item/roguebin/water/gross,
 /turf/open/floor/rogue/twig,
 /area/rogue/indoors/town/shop)
@@ -4628,13 +4625,6 @@
 "eDh" = (
 /turf/open/floor/rogue/ruinedwood/turned,
 /area/rogue/outdoors)
-"eDs" = (
-/obj/structure/chair/wood/rogue/fancy{
-	dir = 8;
-	icon_state = "chair1"
-	},
-/turf/open/floor/rogue/ruinedwood/spiralfade,
-/area/rogue/indoors/town/shop)
 "eDG" = (
 /obj/effect/decal/turfedge_neu{
 	dir = 6
@@ -5569,7 +5559,7 @@
 "fsl" = (
 /obj/item/rogueweapon/knife/dagger/steel/special,
 /obj/structure/closet/crate/chest/neu_iron,
-/obj/item/rogueweapon/knife/dagger,
+/obj/item/rogueweapon/mace/cudgel,
 /obj/machinery/light/rogue/torchholder/c{
 	pixel_y = -32
 	},
@@ -13920,10 +13910,7 @@
 /turf/open/floor/rogue/dirt,
 /area/rogue/outdoors/exposed/under/basement)
 "nSX" = (
-/obj/structure/chair/wood/rogue/fancy{
-	dir = 4;
-	icon_state = "chair1"
-	},
+/obj/structure/chair/wood/rogue/fancy,
 /turf/open/floor/rogue/ruinedwood/spiralfade,
 /area/rogue/indoors/town/shop)
 "nTd" = (
@@ -18090,6 +18077,9 @@
 /obj/item/reagent_containers/food/snacks/rogue/crackerscooked{
 	pixel_y = 3
 	},
+/obj/machinery/light/rogue/torchholder{
+	pixel_y = 32
+	},
 /turf/open/floor/rogue/twig,
 /area/rogue/indoors/town/shop)
 "rHl" = (
@@ -18523,7 +18513,12 @@
 /obj/structure/table/wood{
 	icon_state = "tablewood1"
 	},
-/obj/item/clothing/mask/cigarette/rollie/nicotine,
+/obj/item/clothing/mask/cigarette/rollie/nicotine{
+	pixel_x = 8
+	},
+/obj/item/candle/yellow/lit/infinite{
+	pixel_x = -9
+	},
 /turf/open/floor/rogue/twig,
 /area/rogue/indoors/town/shop)
 "sjL" = (
@@ -86179,7 +86174,7 @@ cGL
 pBo
 pwX
 wnB
-eDs
+nSX
 jDn
 mqm
 mqm

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/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/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",
 		)
 
 

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,6 +141,8 @@
 
 /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"

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

@@ -20,18 +20,17 @@
 	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/dagger
+	beltr = /obj/item/rogueweapon/knife/hunting
 	cloak = /obj/item/clothing/cloak/raincloak/furcloak
 	beltl = /obj/item/reagent_containers/glass/bottle/waterskin/half
-	backpack_contents = list(/obj/item/natural/bundle/cloth/partial = 1, /obj/item/needle = 1, /obj/item/natural/bundle/fibers = 1, /obj/item/natural/fur/volf = 1)
+	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)

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

@@ -61,3 +61,9 @@
 	desc = "Adding these to a dye bin will let you use even the rarest, most expensive dyes."
 	icon = 'icons/roguetown/items/misc.dmi'
 	icon_state = "luxury_dyes"
+
+/obj/item/cheap_dyes
+	name = "cheap dyes"
+	desc = "Adding these to a wooden bin will let you use it to dye clothing."
+	icon = 'icons/roguetown/items/misc.dmi'
+	icon_state = "cheap_dyes"

code/modules/jobs/jobs.dm

@@ -103,6 +103,8 @@ GLOBAL_LIST_INIT(towner_positions, list(
 	"Feldsher",
 	"Innkeep",
 	"Tailor",
+	"Niteman",
+	"Nitemaiden",
 	"Alchemist",
 	"Scribe",
 	))
@@ -116,8 +118,6 @@ GLOBAL_LIST_INIT(peasant_positions, list(
 	"Hunter",
 	"Fisher",
 	"Towner",
-	"Niteman",
-	"Nitemaiden",
 	"Prisoner",
 	"Beggar",
 

code/modules/roguetown/roguecrafting/items.dm

@@ -123,6 +123,29 @@
 	verbage = "braid"
 	verbage_tp = "braids"
 
+/datum/crafting_recipe/roguetown/cheapdyes
+	name = "cheap dyes"
+	result = /obj/item/cheap_dyes
+	reqs = list(
+	/obj/item/reagent_containers/food/snacks/produce/jacksberry = 1,
+	/obj/item/natural/dirtclod = 1)
+	subtype_reqs = TRUE // so you can use any subtype of the berries and swampweed
+
+/datum/crafting_recipe/roguetown/cheapdyes/alt
+	reqs = list(
+	/obj/item/reagent_containers/food/snacks/produce/swampweed = 1,
+	/obj/item/natural/dirtclod = 1)
+
+/datum/crafting_recipe/roguetown/cheapdyes/alto
+	reqs = list(
+	/obj/item/reagent_containers/food/snacks/produce/swampweed = 1,
+	/obj/item/ash = 1)
+
+/datum/crafting_recipe/roguetown/cheapdyes/altest
+	reqs = list(
+	/obj/item/reagent_containers/food/snacks/produce/jacksberry = 1,
+	/obj/item/ash = 1)
+
 /*
 /datum/crafting_recipe/roguetown/net
 	name = "net"
@@ -255,48 +278,9 @@
 				/obj/item/grown/log/tree/stick = 3,
 				/obj/item/natural/fibers = 2)
 	craftdiff = 1
-/*
-/datum/crafting_recipe/roguetown/plankaxe
-	name = "crude wooden plank"
-	result = list(/obj/item/natural/plank)
-	reqs = list(/obj/item/grown/log/tree/small = 1)
-	tools = list(/obj/item/rogueweapon/axe)
-	skillcraft = /datum/skill/craft/carpentry
-	craftdiff = 1
-	verbage = "cut"
-	verbage_tp = "cuts"
 
-/datum/crafting_recipe/roguetown/plank
-	name = "wooden plank"
-	result = list(/obj/item/natural/plank,/obj/item/natural/plank)
-	reqs = list(/obj/item/grown/log/tree/small = 1)
-	tools = list(/obj/item/rogueweapon/handsaw)
-	skillcraft = /datum/skill/craft/carpentry
-	craftdiff = 1
-	verbage = "saw"
-	verbage_tp = "saws"
-
-/datum/crafting_recipe/roguetown/plankshort
-	name = "short wooden plank"
-	result = list(/obj/item/natural/plankshort, /obj/item/natural/plankshort)
-	reqs = list(/obj/item/natural/plank = 1)
-	tools = list(/obj/item/rogueweapon/handsaw)
-	skillcraft = /datum/skill/craft/carpentry
-	craftdiff = 1
-	verbage = "saw"
-	verbage_tp = "saws"
 
-/datum/crafting_recipe/roguetown/stoneblock
-	name = "stone block"
-	result = list(/obj/item/natural/stoneblock)
-	reqs = list(/obj/item/natural/stone = 1)
-	tools = list(/obj/item/rogueweapon/chisel)
-	skillcraft = /datum/skill/craft/masonry
-	craftdiff = 1
-	verbage = "chisel"
-	verbage_tp = "chisels"
-*/
-/datum/crafting_recipe/roguetown/stoneblocprimitive
+/datum/crafting_recipe/roguetown/stoneblocprimitive	// replace with intent coded strike at some point TO DO
 	name = "crude stone block"
 	result = list(/obj/item/natural/stoneblock)
 	reqs = list(/obj/item/natural/stone = 1)

code/modules/roguetown/roguecrafting/structure.dm

@@ -22,18 +22,6 @@
 /obj/item/chair/stool/bar/rogue/crafted
 	sellprice = 6
 
-/datum/crafting_recipe/roguetown/structure/dye_bin
-	name = "dye bin"
-	result = /obj/machinery/simple_dye_bin
-	reqs = list(/obj/item/grown/log/tree/small = 1,
-	/obj/item/reagent_containers/food/snacks/produce/jacksberry = 1,
-	/obj/item/natural/dirtclod = 1)
-	verbage = "construct"
-	verbage_tp = "carpents"
-	craftsound = 'sound/foley/Building-01.ogg'
-	skillcraft = /datum/skill/craft/carpentry
-	subtype_reqs = TRUE // so you can use any subtype of the berries and swampweed
-
 /* === SKILL LEVEL 1 === */
 
 /datum/crafting_recipe/roguetown/structure/chair