Merge branch 'main' into hamlet

Darkrp-community · Dec 10, 2024 · c362d1b · c362d1b
2 parents db2c425 + 56e94ff
commit c362d1b
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/code/modules/jobs/job_types/roguetown/nobility/archivist.dm b/code/modules/jobs/job_types/roguetown/nobility/archivist.dm
@@ -46,7 +46,11 @@
 		H.grant_language(/datum/language/oldpsydonic)
 		H.mind.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE)
+		H.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE)
+		H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE)
+		H.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/craft/alchemy, 3, TRUE)
+		H.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/magic/arcane, 3, TRUE)
 		if(H.age == AGE_OLD)
 			H.mind.adjust_skillrank(/datum/skill/magic/arcane, 2, TRUE)

diff --git a/code/modules/roguetown/roguecrafting/items.dm b/code/modules/roguetown/roguecrafting/items.dm
@@ -280,9 +280,10 @@
 	name = "alchemical mortar"
 	result = /obj/item/mortar
 	reqs = list(/obj/item/natural/stone = 3)
-	tools = list(/obj/item/rogueweapon/knife/hunting)
+	tools = list(/obj/item/rogueweapon/knife)
 	verbage = "crafts"
 	skillcraft = /datum/skill/craft/masonry
+	subtype_reqs = TRUE // should allow you to use any kind of knoife
 
 /datum/crafting_recipe/roguetown/mantrap
 	name = "mantrap"

diff --git a/code/modules/roguetown/roguecrafting/weaving.dm b/code/modules/roguetown/roguecrafting/weaving.dm
@@ -69,6 +69,18 @@
 	craftdiff = 2
 	sellprice = 19
 
+/datum/crafting_recipe/roguetown/weaving/mundies
+	name = "masculine smallclothes"
+	result = list(/obj/item/undies)
+	craftdiff = 2
+	sellprice = 20
+
+/datum/crafting_recipe/roguetown/weaving/fundies
+	name = "feminine smallclothes"
+	result = list(/obj/item/undies/f)
+	craftdiff = 2
+	sellprice = 20
+
 /*========= SKILL LEVEL: 3 REQUIRED ==========*/
 
 /datum/crafting_recipe/roguetown/weaving/paddedgambeson

diff --git a/code/modules/roguetown/roguestock/import.dm b/code/modules/roguetown/roguestock/import.dm
@@ -61,12 +61,24 @@
 	for(var/i in 1 to 5)
 		new /obj/item/rogueore/iron(src)
 
+// ---------- Glass ----------------
+/datum/roguestock/import/glasspane
+	name = "Glass panes import"
+	desc = "Helpful for fixing windows."
+	item_type = /obj/structure/closet/crate/chest/crate/steward/glass
+	export_price = 60
+	importexport_amt = 1
+
+/obj/structure/closet/crate/chest/crate/steward/glass/PopulateContents()
+	for(var/i in 2 to 6)
+		new /obj/item/natural/glass(src)
+
 // ---------- Mining Tools ----------------
 /datum/roguestock/import/miningtools
 	name = "Mining equipment"
 	desc = "Made by dwarven craftsmen."
 	item_type = /obj/structure/closet/crate/chest/crate/steward/miningtools
-	export_price = 80
+	export_price = 60
 	importexport_amt = 1
 
 /obj/structure/closet/crate/chest/crate/steward/miningtools/PopulateContents()