Merge branch 'main' of https://github.com/Rotwood-Vale/Ratwood-Keep

_maps/map_files/rockhill/rockhill.dmm

@@ -505,8 +505,8 @@
 /obj/structure/lever/red{
 	dir = 6;
 	name = "BURN";
-	redstone_id = "lava_bastioncell";
-	pixel_x = -10
+	pixel_x = -10;
+	redstone_id = "lava_bastioncell"
 	},
 /turf/open/floor/rogue/tile,
 /area/rogue/indoors)
@@ -1146,7 +1146,7 @@
 	lockid = "blacksmith"
 	},
 /obj/item/rogueweapon/tongs,
-/obj/item/rogueweapon/hammer,
+/obj/item/rogueweapon/hammer/iron,
 /obj/item/key/blacksmith,
 /turf/open/floor/rogue/ruinedwood{
 	icon_state = "weird1"
@@ -7509,10 +7509,10 @@
 "ezy" = (
 /obj/structure/mineral_door/wood/donjon{
 	dir = 8;
+	lockdiff = 2;
 	locked = 1;
 	lockid = "bog_gatehouse";
-	name = "Acid Cell";
-	lockdiff = 2
+	name = "Acid Cell"
 	},
 /turf/open/floor/rogue/blocks/green,
 /area/rogue/under/town/basement)
@@ -7913,10 +7913,10 @@
 "eKm" = (
 /obj/structure/mineral_door/wood/donjon{
 	dir = 8;
+	lockdiff = 2;
 	locked = 1;
 	lockid = "bog_gatehouse";
-	name = "Armory";
-	lockdiff = 2
+	name = "Armory"
 	},
 /turf/open/floor/rogue/blocks/green,
 /area/rogue/under/town/basement)
@@ -16064,7 +16064,7 @@
 /area/rogue/indoors/town/bath)
 "jEp" = (
 /obj/machinery/anvil/crafted,
-/obj/item/rogueweapon/hammer,
+/obj/item/rogueweapon/hammer/iron,
 /turf/open/floor/rogue/hexstone,
 /area/rogue/indoors)
 "jEq" = (
@@ -16466,7 +16466,7 @@
 	},
 /obj/item/rogueweapon/tongs,
 /obj/item/key/blacksmith,
-/obj/item/rogueweapon/hammer,
+/obj/item/rogueweapon/hammer/iron,
 /turf/open/floor/rogue/ruinedwood{
 	icon_state = "weird1"
 	},
@@ -17784,7 +17784,7 @@
 	locked = 1;
 	lockid = "blacksmith"
 	},
-/obj/item/rogueweapon/hammer,
+/obj/item/rogueweapon/hammer/iron,
 /obj/item/rogueweapon/tongs,
 /obj/item/key/blacksmith,
 /turf/open/floor/rogue/ruinedwood{
@@ -18213,11 +18213,11 @@
 	redstone_id = "lava_bastion"
 	},
 /obj/structure/kybraxor{
+	desc = "Hungry for the poor.";
+	name = "Balar";
 	pixel_x = -32;
 	pixel_y = -32;
-	redstone_id = "lava_bastion";
-	desc = "Hungry for the poor.";
-	name = "Balar"
+	redstone_id = "lava_bastion"
 	},
 /turf/open/transparent/openspace,
 /area/rogue/indoors)
@@ -22094,7 +22094,7 @@
 	},
 /obj/item/key/blacksmith,
 /obj/item/rogueweapon/tongs,
-/obj/item/rogueweapon/hammer,
+/obj/item/rogueweapon/hammer/iron,
 /turf/open/floor/rogue/ruinedwood{
 	icon_state = "weird1"
 	},

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

@@ -25,7 +25,7 @@
 	user.changeNext_move(CLICK_CD_MELEE)
 	var/skill_level = user.mind.get_skill_level(/datum/skill/labor/lumberjacking)
 	var/planking_time = (40 - (skill_level * 5))
-	if(istype(I, /obj/item/rogueweapon/handsaw))
+	if(lumber_amount && I.tool_behaviour == TOOL_SAW || I.tool_behaviour == TOOL_IMPROVSAW)
 		playsound(get_turf(src.loc), 'sound/foley/sawing.ogg', 100)
 		user.visible_message("<span class='notice'>[user] starts sawing [src] to smaller pieces.</span>")
 		if(do_after(user, planking_time))
@@ -80,13 +80,15 @@
 	smeltresult = /obj/item/rogueore/coal
 	lumber_amount = 0
 	metalizer_result = /obj/item/rogueore/copper
+
+
 /obj/item/grown/log/tree/small/attackby(obj/item/I, mob/living/user, params)
 	if(item_flags & IN_STORAGE)
 		return
 	user.changeNext_move(CLICK_CD_MELEE)
-	var/skill_level = user.mind.get_skill_level(/datum/skill/labor/lumberjacking)
+	var/skill_level = user.mind.get_skill_level(/datum/skill/craft/carpentry)
 	var/planking_time = (45 - (skill_level * 5))
-	if(istype(I, /obj/item/rogueweapon/handsaw))
+	if(I.tool_behaviour == TOOL_SAW || I.tool_behaviour == TOOL_IMPROVSAW)
 		playsound(get_turf(src.loc), 'sound/foley/sawing.ogg', 100)
 		user.visible_message("<span class='notice'>[user] starts sawing planks from [src].</span>")
 		if(do_after(user, planking_time))

code/game/objects/structures/roguetown/rogueflora.dm

@@ -425,6 +425,26 @@
 	icon_state = "tallbush[pick(1,2)]"
 
 
+/*	..................   Wild Swampweed   ................... */
+/obj/structure/wild_swampweed
+	name = "swampweed"
+	desc = ""
+	icon = 'icons/roguetown/misc/crops.dmi'
+	icon_state = "weed2"
+	color = "#d2d1ce"
+	layer = BELOW_MOB_LAYER
+	max_integrity = 60
+	density = FALSE
+	debris = list(/obj/item/natural/fibers = 1, /obj/item/reagent_containers/food/snacks/grown/rogue/sweetleaf = 1)
+/obj/structure/wild_swampweed/attack_hand(mob/living/carbon/human/user)
+	playsound(src.loc, "plantcross", 80, FALSE, -1)
+	user.visible_message(span_warning("[user] harvests [src]."))
+	if(do_after(user, 3 SECONDS, target = src))
+		new /obj/item/reagent_containers/food/snacks/grown/rogue/sweetleaf (get_turf(src))
+		qdel(src)
+/obj/structure/wild_swampweed/Crossed(mob/living/carbon/human/H)
+	playsound(src.loc, "plantcross", 80, FALSE, -1)
+
 /obj/structure/flora/rogueshroom
 	name = "mushroom"
 	desc = "Mushrooms are the only happy beings in this island."

code/modules/farming/produce.dm

@@ -210,7 +210,7 @@
 	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/berrypoison = 5)
 	tastes = list("sweet" = 1,"bitterness" = 1)
 	eat_effect = /datum/status_effect/debuff/badmeal
-	rotprocess = 15 MINUTES
+	rotprocess = 60 MINUTES
 
 /obj/item/reagent_containers/food/snacks/grown/rogue/pipeweed
 	seed = /obj/item/seeds/pipeweed
@@ -224,7 +224,7 @@
 	list_reagents = list(/datum/reagent/drug/nicotine = 2, /datum/reagent/consumable/nutriment = 1, /datum/reagent/berrypoison = 5)
 	grind_results = list(/datum/reagent/drug/nicotine = 5)
 	eat_effect = /datum/status_effect/debuff/badmeal
-	rotprocess = 15 MINUTES
+	rotprocess = 60 MINUTES
 
 /obj/item/reagent_containers/food/snacks/grown/rogue/pipeweeddry
 	seed = null

code/modules/mob/living/carbon/human/species_types/roguetown/elf/elfd.dm

@@ -102,9 +102,11 @@
 		/datum/customizer/organ/vagina/human,
 		)
 	body_markings = list(
+		/datum/body_marking/flushed_cheeks,
+		/datum/body_marking/eyeliner,
+		/datum/body_marking/tonage,
 	)
 
-
 	gender_swapping = TRUE
 	stress_examine = TRUE
 	stress_desc = span_red("A loathesome dark elf.")

code/modules/roguetown/mapgen/bog.dm

@@ -26,7 +26,7 @@
 							/obj/structure/flora/roguetree/stump = 4,
 							/obj/effect/mob_spawner =5,
 							/obj/structure/closet/dirthole/closed/loot=3,
-							/obj/item/reagent_containers/food/snacks/grown/rogue/sweetleaf = 4,
+							/obj/structure/wild_swampweed = 5,
 							/obj/structure/flora/roguegrass/maneater/real=3)
 	spawnableTurfs = list(/turf/open/floor/rogue/dirt/road=2,
 						/turf/open/water/swamp=1)

code/modules/roguetown/roguecrafting/turfs.dm

@@ -24,7 +24,7 @@
 	reqs = list(/obj/item/natural/wood/plank = 1)
 	skill_level = 2
 
-/datum/crafting_recipe/roguetown/turfs/woodplatform
+/datum/crafting_recipe/roguetown/turfs/wood/woodplatform
 	name = "platform (wood)"
 	result = /turf/open/floor/rogue/ruinedwood/platform
 	reqs = list(/obj/item/natural/wood/plank = 2)

code/modules/roguetown/roguejobs/artificer/handsaw_chisel.dm

@@ -2,7 +2,7 @@
 //................	Handsaw	............... //
 /obj/item/rogueweapon/handsaw
 	force = 5
-	possible_item_intents = list(/datum/intent/mace/strike/shovel)
+	possible_item_intents = list(/datum/intent/dagger/cut, /datum/intent/dagger/chop/cleaver)
 	gripped_intents = null
 	name = "handsaw"
 	desc = "Iron tool for woodworking."
@@ -21,10 +21,11 @@
 	wlength = WLENGTH_LONG
 	w_class = WEIGHT_CLASS_NORMAL
 	slot_flags = ITEM_SLOT_HIP
+	tool_behaviour = TOOL_IMPROVSAW
 	swingsound = list('sound/combat/wooshes/blunt/shovel_swing.ogg','sound/combat/wooshes/blunt/shovel_swing2.ogg')
 	drop_sound = 'sound/foley/dropsound/shovel_drop.ogg'
 	smeltresult = /obj/item/ingot/iron
-	associated_skill = /datum/skill/combat/maces
+	associated_skill = /datum/skill/combat/knives
 	max_blade_int = 50
 
 //................	Chisel	............... //
@@ -51,7 +52,7 @@
 	slot_flags = ITEM_SLOT_HIP
 	swingsound = list('sound/combat/wooshes/blunt/shovel_swing.ogg','sound/combat/wooshes/blunt/shovel_swing2.ogg')
 	drop_sound = 'sound/foley/dropsound/shovel_drop.ogg'
-	associated_skill = /datum/skill/combat/maces
+	associated_skill = /datum/skill/combat/knives
 	max_blade_int = 50
 	dropshrink = 0.9
 

code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/cutlery.dm

@@ -100,7 +100,7 @@
 
 // Gold
 
-/datum/anvil_recipe/general/cupsgold
+/datum/anvil_recipe/cutlery/cupsgold
 	name = "Gold Goblets 3x"
 	req_bar = /obj/item/ingot/gold
-	created_item = list(/obj/item/reagent_containers/glass/cup/golden, /obj/item/reagent_containers/glass/cup/golden, /obj/item/reagent_containers/glass/cup/golden)
+	created_item = list(/obj/item/reagent_containers/glass/cup/golden, /obj/item/reagent_containers/glass/cup/golden, /obj/item/reagent_containers/glass/cup/golden)

code/modules/roguetown/roguejobs/blacksmith/grindwheel.dm

@@ -15,16 +15,16 @@
 			I.add_bintegrity(999)
 		return
 	if(istype(I, /obj/item/grown/log/tree/small))
-		var/skill_level = user.mind.get_skill_level(/datum/skill/labor/lumberjacking)
+		var/skill_level = user.mind.get_skill_level(/datum/skill/craft/carpentry)
 		var/wood_time = (40 - (skill_level * 5))
 		playsound(src, pick('sound/misc/slide_wood (2).ogg', 'sound/misc/slide_wood (1).ogg'), 100, FALSE)
 		if(do_after(user, wood_time, target = src))
-			if(prob(max(40 - (skill_level * 10), 0)) || !skill_level) //Chance maxes at level 4 (standard woodcutter)
+			if(prob(max(40 - (skill_level * 10), 0)) || !skill_level) //Chance maxes at level 4
 				to_chat(user, span_info("Curses! I ruined this piece of wood..."))
 				playsound(src,'sound/combat/hits/onwood/destroyfurniture.ogg', 100, FALSE)
 			else
 				new /obj/item/natural/wood/plank(get_turf(src))
-			user.mind.add_sleep_experience(/datum/skill/labor/lumberjacking, (user.STAINT*0.5))
+			user.mind.add_sleep_experience(/datum/skill/craft/carpentry, (user.STAINT*0.5))
 			qdel(I)
 			return
 	. = ..()

code/modules/roguetown/roguestock/stockpile.dm

@@ -127,6 +127,17 @@
 	importexport_amt = 10
 	passive_generation = 4
 
+/datum/roguestock/stockpile/cured
+	name = "Cured Leather"
+	desc = "Cured Leather ready to be worked."
+	item_type = /obj/item/natural/hide/cured
+	held_items = list(2, 0)
+	payout_price = 5
+	withdraw_price = 7
+	transport_fee = 1
+	export_price = 7
+	importexport_amt = 10
+
 /datum/roguestock/stockpile/hide
 	name = "Hide"
 	desc = "Stripped hide from animals."
@@ -139,17 +150,6 @@
 	importexport_amt = 5
 	passive_generation = 2
 
-/datum/roguestock/stockpile/cured
-	name = "Cured Leather"
-	desc = "Cured Leather ready to be worked."
-	item_type = /obj/item/natural/hide/cured
-	held_items = list(2, 0)
-	payout_price = 5
-	withdraw_price = 7
-	transport_fee = 1
-	export_price = 7
-	importexport_amt = 10
-
 /datum/roguestock/stockpile/fur
 	name = "Fur"
 	desc = "Hide with a long winter coat from animals."

code/modules/spells/roguetown/acolyte/sawbones.dm

@@ -1358,7 +1358,7 @@ end recipe count: 8 ash, 8 minced meat, 4 swampweed, 2 poisonberry to make 1 bot
 		grinding_started = TRUE // Mark grinding as started
 		to_chat(user, "I start grinding...")
 		if((do_after(user, 25, target = src)) && grinded)
-			if(grinded.mill_result) // This goes first.
+			if(grinded.mill_result && !istype(user.rmb_intent, /datum/rmb_intent/strong)) // This goes first. Strong intent to bypass.
 				new grinded.mill_result(get_turf(src))
 				QDEL_NULL(grinded)
 				icon_state = reagents.total_volume > 0 ? "mortar_full" : "mortar_empty"
@@ -1368,17 +1368,21 @@ end recipe count: 8 ash, 8 minced meat, 4 swampweed, 2 poisonberry to make 1 bot
 				grinded.on_juice()
 				reagents.add_reagent_list(grinded.juice_results)
 				to_chat(user, "I juice [grinded] into a fine liquid.")
-			if(grinded.reagents) // Food and pills.
-				grinded.reagents.trans_to(src, grinded.reagents.total_volume, transfered_by = user)
+			if(grinded.grind_results && !isemptylist(grinded.grind_results))
+				grinded.on_grind()
+				reagents.add_reagent_list(grinded.grind_results)
+				to_chat(user, "I break [grinded] into powder.")
 				QDEL_NULL(grinded)
 				icon_state = reagents.total_volume > 0 ? "mortar_full" : "mortar_empty"
 				grinding_started = FALSE // Reset grinding status
 				return
-			grinded.on_grind()
-			reagents.add_reagent_list(grinded.grind_results)
-			to_chat(user, "I break [grinded] into powder.")
-			QDEL_NULL(grinded)
-			icon_state = reagents.total_volume > 0 ? "mortar_full" : "mortar_empty"
+			if(grinded.reagents) // Other stuff that might have reagents in them, let's not cause a runtime shall we?
+				grinded.reagents.trans_to(src, grinded.reagents.total_volume, transfered_by = user)
+				icon_state = reagents.total_volume > 0 ? "mortar_full" : "mortar_empty"
+				to_chat(user, "I pound [grinded] into mush.")
+				QDEL_NULL(grinded)
+				grinding_started = FALSE // Reset grinding status
+				return
 			grinding_started = FALSE // Reset grinding status
 			return
 		else