From eb954b3c1130e2e3d21a52b51cbdf3f92ef5302d Mon Sep 17 00:00:00 2001 From: La Villa Strangiato Date: Sat, 16 Nov 2024 19:51:10 -0700 Subject: [PATCH 1/3] big reorganizing and a carpentry file --- .../roguetown/roguecrafting/carpentry.dm | 212 ++++++ .../roguetown/roguecrafting/cooking.dm | 1 + code/modules/roguetown/roguecrafting/items.dm | 468 ++++-------- .../modules/roguetown/roguecrafting/sewing.dm | 9 + .../roguetown/roguecrafting/structure.dm | 697 ++++++++++-------- code/modules/roguetown/roguecrafting/turfs.dm | 30 +- modular/Neu_Farming/code/crafting_recipes.dm | 71 -- stonekeep.dme | 1 + 8 files changed, 766 insertions(+), 723 deletions(-) create mode 100644 code/modules/roguetown/roguecrafting/carpentry.dm delete mode 100644 modular/Neu_Farming/code/crafting_recipes.dm diff --git a/code/modules/roguetown/roguecrafting/carpentry.dm b/code/modules/roguetown/roguecrafting/carpentry.dm new file mode 100644 index 0000000000..bffb97881c --- /dev/null +++ b/code/modules/roguetown/roguecrafting/carpentry.dm @@ -0,0 +1,212 @@ +/* CARPENTRY is for pretty much any object made of wood. To see some wooden structures that also use carpentry, go to structure.dm. +==========================================================*/ + +/datum/crafting_recipe/roguetown/carpentry + skillcraft = /datum/skill/craft/carpentry + subtype_reqs = TRUE + craftdiff = 0 + +/*========= NO SKILL LEVEL REQUIRED ==========*/ + +/datum/crafting_recipe/roguetown/carpentry/woodbucket + name = "wooden bucket" + result = /obj/item/reagent_containers/glass/bucket/wooden + reqs = list(/obj/item/grown/log/tree/small = 1) + +/datum/crafting_recipe/roguetown/carpentry/spoon + name = "wooden spoon" + result = list(/obj/item/kitchen/spoon, + /obj/item/kitchen/spoon) + reqs = list(/obj/item/grown/log/tree/small = 1) + +/datum/crafting_recipe/roguetown/carpentry/rollingpin + name = "wooden rollingpin" + result = /obj/item/rogueweapon/mace/woodclub/rollingpin + reqs = list(/obj/item/grown/log/tree/small = 1) + +/datum/crafting_recipe/roguetown/carpentry/woodbowl + name = "wooden bowl" + result = list(/obj/item/reagent_containers/glass/bowl, + /obj/item/reagent_containers/glass/bowl) + reqs = list(/obj/item/grown/log/tree/small = 1) + +/datum/crafting_recipe/roguetown/carpentry/woodcup + name = "wooden cups" + result = list(/obj/item/reagent_containers/glass/cup/wooden/crafted, + /obj/item/reagent_containers/glass/cup/wooden/crafted, + /obj/item/reagent_containers/glass/cup/wooden/crafted) + reqs = list(/obj/item/grown/log/tree/small = 1) + +/obj/item/reagent_containers/glass/cup/wooden/crafted + sellprice = 3 + +/datum/crafting_recipe/roguetown/carpentry/woodplatter + name = "wood platters (x2)" + result = list(/obj/item/cooking/platter, + /obj/item/cooking/platter) + reqs = list(/obj/item/grown/log/tree/small = 1) + +/*========= SKILL LEVEL: 1 REQUIRED ==========*/ + +/datum/crafting_recipe/roguetown/carpentry/woodsword + name = "wood sword" + result = list(/obj/item/rogueweapon/mace/woodclub/train_sword, + /obj/item/rogueweapon/mace/woodclub/train_sword) + reqs = list(/obj/item/grown/log/tree/small = 1, + /obj/item/natural/fibers = 1) + craftdiff = 1 + +/datum/crafting_recipe/roguetown/carpentry/woodstaff + name = "wood staff" + result = list(/obj/item/rogueweapon/polearm/woodstaff, + /obj/item/rogueweapon/polearm/woodstaff, + /obj/item/rogueweapon/polearm/woodstaff) + reqs = list(/obj/item/grown/log/tree = 1) + craftdiff = 1 + +/datum/crafting_recipe/roguetown/quarterstaff + name = "wooden quarterstaff" + result = list(/obj/item/rogueweapon/polearm/woodstaff/quarterstaff, + /obj/item/rogueweapon/polearm/woodstaff/quarterstaff) + reqs = list(/obj/item/grown/log/tree = 1) + req_table = TRUE + tools = list(/obj/item/rogueweapon/knife/hunting) + craftdiff = 1 + +/datum/crafting_recipe/roguetown/carpentry/rod + name = "fishing rod" + result = /obj/item/fishingrod/crafted + reqs = list(/obj/item/grown/log/tree/small = 1, + /obj/item/natural/fibers = 2) + craftdiff = 1 + +/obj/item/fishingrod/crafted + sellprice = 8 + +/datum/crafting_recipe/roguetown/woodspade + name = "wood spade" + result = /obj/item/rogueweapon/shovel/small + reqs = list(/obj/item/grown/log/tree/small = 1, + /obj/item/grown/log/tree/stick = 1) + craftdiff = 1 + +/obj/item/rogueweapon/shovel/small/crafted + sellprice = 5 + +/*========= SKILL LEVEL: 2 REQUIRED ==========*/ + +/datum/crafting_recipe/roguetown/carpentry/woodshield + name = "wooden shield" + result = /obj/item/rogueweapon/shield/wood/crafted + reqs = list(/obj/item/grown/log/tree/small = 1, + /obj/item/natural/hide = 1) + skillcraft = /datum/skill/craft/carpentry + craftdiff = 2 + +/obj/item/rogueweapon/shield/wood/crafted + sellprice = 6 + +/datum/crafting_recipe/roguetown/carpentry/handmadebow + name = "wooden bow" + result = list(/obj/item/gun/ballistic/revolver/grenadelauncher/bow) + reqs = list(/obj/item/grown/log/tree/small = 1, + /obj/item/natural/fibers = 6) + craftdiff = 2 + +/datum/crafting_recipe/roguetown/structure/plough + name = "plough" + result = /obj/structure/plough + reqs = list(/obj/item/grown/log/tree/small = 2, /obj/item/ingot/iron = 1) + skillcraft = /datum/skill/craft/carpentry + time = 4 SECONDS + craftdiff = 2 + +/*========= SKILL LEVEL: 3 REQUIRED ==========*/ + +/datum/crafting_recipe/roguetown/carpentry/rproesthetic + name = "wood arm (L)" + result = list(/obj/item/bodypart/l_arm/rproesthetic) + reqs = list(/obj/item/grown/log/tree/small = 1, + /obj/item/roguegear = 1) + craftdiff = 3 + +/datum/crafting_recipe/roguetown/carpentry/rproesthetic + name = "wood arm (R)" + result = list(/obj/item/bodypart/r_arm/rproesthetic) + reqs = list(/obj/item/grown/log/tree/small = 1, + /obj/item/roguegear = 1) + craftdiff = 3 + +/datum/crafting_recipe/roguetown/carpentry/recurve + name = "recurve bow" + result = list(/obj/item/gun/ballistic/revolver/grenadelauncher/bow/recurve) + reqs = list(/obj/item/grown/log/tree/small = 1, + /obj/item/natural/fibers = 4) + craftdiff = 3 + +/datum/crafting_recipe/roguetown/carpentry/longbow + name = "longbow" + result = list(/obj/item/gun/ballistic/revolver/grenadelauncher/bow/long) + reqs = list(/obj/item/grown/log/tree/small = 1, + /obj/item/natural/fibers = 8, + /obj/item/reagent_containers/food/snacks/fat) + structurecraft = /obj/machinery/light/rogue/campfire + craftdiff = 3 + +/datum/crafting_recipe/roguetown/carpentry/woodflail + name = "wooden flail x2" + reqs = list(/obj/item/rope/chain = 1, + /obj/item/grown/log/tree/stick = 1, /obj/item/grown/log/tree/small = 1) + tools = list(/obj/item/rogueweapon/hammer) + req_table = TRUE + result = list(/obj/item/rogueweapon/flail/towner, /obj/item/rogueweapon/flail/towner) + craftdiff = 3 + +/datum/crafting_recipe/roguetown/carpentry/woodengreatflail + name = "great wooden flail" + reqs = list(/obj/item/rope = 1, + /obj/item/grown/log/tree/stick = 1, /obj/item/grown/log/tree/small = 1) + tools = list(/obj/item/rogueweapon/hammer) + req_table = TRUE + result = list(/obj/item/rogueweapon/thresher) + craftdiff = 3 + +// Admittedly not too sure why some of these recipes require carpentry skill for steel stuff. You'd have to ask Dromkii. + +/datum/crafting_recipe/roguetown/carpentry/steelstaff + name = "steel quarterstaff" + reqs = list(/obj/item/rogueweapon/polearm/woodstaff/quarterstaff = 1, /obj/item/ingot/steel = 2) + result = list(/obj/item/rogueweapon/polearm/woodstaff/quarterstaff/steel) + craftdiff = 3 + +/datum/crafting_recipe/roguetown/carpentry/ironstaff + name = "iron quarterstaff" + reqs = list(/obj/item/rogueweapon/polearm/woodstaff/quarterstaff = 1, /obj/item/ingot/iron = 1) + tools = list(/obj/item/rogueweapon/hammer) + result = list(/obj/item/rogueweapon/polearm/woodstaff/quarterstaff/iron) + craftdiff = 3 + +/datum/crafting_recipe/roguetown/carpentry/militia_flail + name = "militia flail" + reqs = list(/obj/item/rogueweapon/flail/towner = 1, /obj/item/ingot/iron = 1) + tools = list(/obj/item/rogueweapon/hammer) + req_table = TRUE + result = list(/obj/item/rogueweapon/flail/militia) + craftdiff = 3 + +/datum/crafting_recipe/roguetown/carpentry/bigflail + name = "great militia flail" + reqs = list(/obj/item/rope/chain = 1, + /obj/item/rogueweapon/thresher = 1, /obj/item/ingot/iron = 1) + tools = list(/obj/item/rogueweapon/hammer) + req_table = TRUE + result = list(/obj/item/rogueweapon/thresher/military) + craftdiff = 3 + +/datum/crafting_recipe/roguetown/carpentry/ironcudgel + name = "peasant cudgels x2" + reqs = list(/obj/item/grown/log/tree/small = 1, /obj/item/ingot/iron = 1) + tools = list(/obj/item/rogueweapon/hammer) + req_table = TRUE + result = list(/obj/item/rogueweapon/mace/cudgel/carpenter, /obj/item/rogueweapon/mace/cudgel/carpenter) + craftdiff = 3 diff --git a/code/modules/roguetown/roguecrafting/cooking.dm b/code/modules/roguetown/roguecrafting/cooking.dm index 17af70b516..26f2d7614a 100644 --- a/code/modules/roguetown/roguecrafting/cooking.dm +++ b/code/modules/roguetown/roguecrafting/cooking.dm @@ -1,3 +1,4 @@ +// NPC1314, you oat-thieving ungulate, return to me my neatly-organized code. See NeuFood.dm for the recipes until I properly sort this... or I don't. /datum/crafting_recipe/roguetown/cooking req_table = TRUE diff --git a/code/modules/roguetown/roguecrafting/items.dm b/code/modules/roguetown/roguecrafting/items.dm index 8d65318c53..81ed7775f9 100644 --- a/code/modules/roguetown/roguecrafting/items.dm +++ b/code/modules/roguetown/roguecrafting/items.dm @@ -1,14 +1,24 @@ +/* CRAFTING uses the Crafting skill, natch. Pretty much every recipe that doesn't fit somewhere else. +==========================================================*/ + /datum/crafting_recipe/roguetown always_availible = TRUE skillcraft = /datum/skill/craft/crafting + craftdiff = 0 +/*========= NO SKILL LEVEL REQUIRED ==========*/ + +/datum/crafting_recipe/roguetown/torch + name = "torch" + result = /obj/item/flashlight/flare/torch + reqs = list(/obj/item/grown/log/tree/stick = 1, + /obj/item/natural/fibers = 1) /datum/crafting_recipe/roguetown/tneedle name = "sewing needle" result = /obj/item/needle/thorn reqs = list(/obj/item/natural/thorn = 1, /obj/item/natural/fibers = 1) - craftdiff = 0 /datum/crafting_recipe/roguetown/cloth name = "cloth" @@ -16,28 +26,72 @@ reqs = list(/obj/item/natural/fibers = 2) tools = list(/obj/item/needle) skillcraft = /datum/skill/misc/sewing - craftdiff = 0 verbage = "sew" verbage_tp = "sews" +/datum/crafting_recipe/roguetown/pipe + name = "wood pipe" + result = /obj/item/clothing/mask/cigarette/pipe/crafted + reqs = list(/obj/item/grown/log/tree/stick = 2) + +/obj/item/clothing/mask/cigarette/pipe/crafted + sellprice = 6 + +/datum/crafting_recipe/roguetown/dryweed + name = "dry westleach leaf" + result = /obj/item/reagent_containers/food/snacks/produce/dry_westleach + reqs = list(/obj/item/reagent_containers/food/snacks/produce/westleach = 1) + structurecraft = /obj/structure/fluff/dryingrack + time = 2 SECONDS + verbage = "dry" + verbage_tp = "dries" + craftsound = null + skillcraft = null + +/datum/crafting_recipe/roguetown/sigdry + name = "westleach zig" + result = /obj/item/clothing/mask/cigarette/rollie/nicotine + reqs = list(/obj/item/reagent_containers/food/snacks/produce/dry_westleach = 1, + /obj/item/paper = 1) + time = 10 SECONDS + verbage = "roll" + verbage_tp = "rolls" + +/datum/crafting_recipe/roguetown/dryleaf + name = "dry swampweed" + result = /obj/item/reagent_containers/food/snacks/produce/swampweed_dried + reqs = list(/obj/item/reagent_containers/food/snacks/produce/swampweed = 1) + structurecraft = /obj/structure/fluff/dryingrack + time = 2 SECONDS + verbage = "dry" + verbage_tp = "dries" + craftsound = null + skillcraft = null + +/datum/crafting_recipe/roguetown/sigsweet + name = "swampweed zig" + result = /obj/item/clothing/mask/cigarette/rollie/cannabis + reqs = list(/obj/item/reagent_containers/food/snacks/produce/swampweed_dried = 1, + /obj/item/paper = 1) + time = 10 SECONDS + verbage = "roll" + verbage_tp = "rolls" + /datum/crafting_recipe/roguetown/dart name = "dart" result = /obj/item/ammo_casing/caseless/rogue/dart reqs = list(/obj/item/natural/thorn = 1, /obj/item/grown/log/tree/stick = 1) - craftdiff = 0 /datum/crafting_recipe/roguetown/blowgun name = "blowgun" result = /obj/item/gun/ballistic/revolver/grenadelauncher/blowgun reqs = list(/obj/item/grown/log/tree/stick = 1) - craftdiff = 0 /datum/crafting_recipe/roguetown/clothsash name = "cloth sash" result = /obj/item/storage/belt/rogue/leather/cloth reqs = list(/obj/item/natural/cloth = 1) - craftdiff = 0 verbage = "tie" verbage_tp = "ties" @@ -45,7 +99,6 @@ name = "untie cloth sash" result = /obj/item/natural/cloth reqs = list(/obj/item/storage/belt/rogue/leather/cloth = 1) - craftdiff = 0 verbage = "untie" verbage_tp = "unties" @@ -53,7 +106,6 @@ name = "rope belt" result = /obj/item/storage/belt/rogue/leather/rope reqs = list(/obj/item/rope = 1) - craftdiff = 0 verbage = "untie" verbage_tp = "unties" @@ -61,7 +113,6 @@ name = "untie rope belt" result = /obj/item/rope reqs = list(/obj/item/storage/belt/rogue/leather/rope = 1) - craftdiff = 0 verbage = "untie" verbage_tp = "unties" @@ -83,31 +134,17 @@ verbage_tp = "braids" */ -/datum/crafting_recipe/roguetown/torch - name = "torch" - result = /obj/item/flashlight/flare/torch - reqs = list(/obj/item/grown/log/tree/stick = 1, - /obj/item/natural/fibers = 1) - craftdiff = 0 - -/datum/crafting_recipe/roguetown/candle - name = "candle" - result = /obj/item/candle/yellow - reqs = list(/obj/item/reagent_containers/food/snacks/fat = 1) - /datum/crafting_recipe/roguetown/stoneaxe name = "stone axe" result = /obj/item/rogueweapon/axe/stone reqs = list(/obj/item/grown/log/tree/small = 1, /obj/item/natural/stone = 1) - /datum/crafting_recipe/roguetown/stoneknife name = "stone knife" result = /obj/item/rogueweapon/knife/stone reqs = list(/obj/item/grown/log/tree/stick = 1, /obj/item/natural/stone = 1) - craftdiff = 0 /datum/crafting_recipe/roguetown/stonespear name = "stone spear" @@ -119,127 +156,15 @@ name = "wood club" result = /obj/item/rogueweapon/mace/woodclub/crafted reqs = list(/obj/item/grown/log/tree/small = 1) - craftdiff = 0 - - -/datum/crafting_recipe/roguetown/rproesthetic - name = "wood arm (L)" - result = list(/obj/item/bodypart/l_arm/rproesthetic) - reqs = list(/obj/item/grown/log/tree/small = 1, - /obj/item/roguegear = 1) - skillcraft = /datum/skill/craft/carpentry - craftdiff = 3 - -/datum/crafting_recipe/roguetown/rproesthetic - name = "wood arm (R)" - result = list(/obj/item/bodypart/r_arm/rproesthetic) - reqs = list(/obj/item/grown/log/tree/small = 1, - /obj/item/roguegear = 1) - skillcraft = /datum/skill/craft/carpentry - craftdiff = 3 /obj/item/rogueweapon/mace/woodclub/crafted sellprice = 8 -/datum/crafting_recipe/roguetown/woodstaff - name = "wood staff" - result = list(/obj/item/rogueweapon/polearm/woodstaff, - /obj/item/rogueweapon/polearm/woodstaff, - /obj/item/rogueweapon/polearm/woodstaff) - reqs = list(/obj/item/grown/log/tree = 1) - -/datum/crafting_recipe/roguetown/woodsword - name = "wood sword" - result = list(/obj/item/rogueweapon/mace/woodclub/train_sword, - /obj/item/rogueweapon/mace/woodclub/train_sword) - reqs = list(/obj/item/grown/log/tree/small = 1, - /obj/item/natural/fibers = 1) - craftdiff = 1 - -/datum/crafting_recipe/roguetown/woodshield - name = "wooden shield" - result = /obj/item/rogueweapon/shield/wood/crafted - reqs = list(/obj/item/grown/log/tree/small = 1, - /obj/item/natural/hide = 1) - skillcraft = /datum/skill/craft/carpentry - -/obj/item/rogueweapon/shield/wood/crafted - sellprice = 6 - -/datum/crafting_recipe/roguetown/spoon - name = "wooden spoon" - result = list(/obj/item/kitchen/spoon, - /obj/item/kitchen/spoon) - reqs = list(/obj/item/grown/log/tree/small = 1) - -/datum/crafting_recipe/roguetown/rollingpin - name = "wooden rollingpin" - result = /obj/item/rogueweapon/mace/woodclub/rollingpin - reqs = list(/obj/item/grown/log/tree/small = 1) - -/datum/crafting_recipe/roguetown/woodbucket - name = "wooden bucket" - result = /obj/item/reagent_containers/glass/bucket/wooden - reqs = list(/obj/item/grown/log/tree/small = 1) - -/datum/crafting_recipe/roguetown/woodbowl - name = "wooden bowl" - result = list(/obj/item/reagent_containers/glass/bowl, - /obj/item/reagent_containers/glass/bowl) - reqs = list(/obj/item/grown/log/tree/small = 1) - - -/datum/crafting_recipe/roguetown/woodcup - name = "wooden cups" - result = list(/obj/item/reagent_containers/glass/cup/wooden/crafted, - /obj/item/reagent_containers/glass/cup/wooden/crafted, - /obj/item/reagent_containers/glass/cup/wooden/crafted) - reqs = list(/obj/item/grown/log/tree/small = 1) - -/obj/item/reagent_containers/glass/cup/wooden/crafted - sellprice = 3 - -/datum/crafting_recipe/roguetown/mortar - name = "stone mortar" - result = /obj/item/reagent_containers/glass/mortar - reqs = list(/obj/item/natural/stone = 1) - tools = list(/obj/item/rogueweapon/knife/hunting) - craftdiff = 3 - subtype_reqs = TRUE - -/datum/crafting_recipe/roguetown/alchmortar - name = "alchemical mortar" - result = /obj/item/mortar - reqs = list(/obj/item/natural/stone = 3) - tools = list(/obj/item/rogueweapon/knife/hunting) - verbage = "crafts" - skillcraft = /datum/skill/craft/masonry - -/datum/crafting_recipe/roguetown/pestle - name = "pestle" - result = /obj/item/pestle - reqs = list(/obj/item/natural/stone = 2) - tools = list(/obj/item/rogueweapon/knife/hunting) - verbage = "crafts" - skillcraft = /datum/skill/craft/masonry - -/datum/crafting_recipe/roguetown/bag - name = "bag" - result = /obj/item/storage/roguebag/crafted - reqs = list(/obj/item/natural/fibers = 1, - /obj/item/natural/cloth = 1) - tools = list(/obj/item/needle) - skillcraft = /datum/skill/misc/sewing - -/obj/item/storage/roguebag/crafted - sellprice = 4 - /datum/crafting_recipe/roguetown/bait name = "bait" result = /obj/item/bait reqs = list(/obj/item/storage/roguebag = 1, /obj/item/reagent_containers/food/snacks/produce/wheat = 2) - req_table = FALSE subtype_reqs = TRUE /datum/crafting_recipe/roguetown/sbaita @@ -247,7 +172,6 @@ result = /obj/item/bait/sweet reqs = list(/obj/item/storage/roguebag = 1, /obj/item/reagent_containers/food/snacks/produce/apple = 2) - req_table = FALSE subtype_reqs = TRUE /datum/crafting_recipe/roguetown/sbait @@ -255,7 +179,6 @@ result = /obj/item/bait/sweet reqs = list(/obj/item/storage/roguebag = 1, /obj/item/reagent_containers/food/snacks/produce/jacksberry = 2) - req_table = FALSE subtype_reqs = TRUE /datum/crafting_recipe/roguetown/bloodbait @@ -263,37 +186,33 @@ result = /obj/item/bait/bloody reqs = list(/obj/item/storage/roguebag = 1, /obj/item/reagent_containers/food/snacks/rogue/meat = 2) - req_table = FALSE subtype_reqs = TRUE -/datum/crafting_recipe/roguetown/woodplatter - name = "wood platters (x2)" - result = list(/obj/item/cooking/platter, - /obj/item/cooking/platter) - reqs = list(/obj/item/grown/log/tree/small = 1) - -/datum/crafting_recipe/roguetown/pipe - name = "wood pipe" - result = /obj/item/clothing/mask/cigarette/pipe/crafted - reqs = list(/obj/item/grown/log/tree/stick = 2) +/datum/crafting_recipe/roguetown/earnecklace + name = "ear necklace" + result = /obj/item/clothing/neck/roguetown/menears + reqs = list(/obj/item/organ/ears = 4, + /obj/item/rope = 1) -/obj/item/clothing/mask/cigarette/pipe/crafted - sellprice = 6 +/datum/crafting_recipe/roguetown/elfearnecklace + name = "elf ear necklace" + result = /obj/item/clothing/neck/roguetown/elfears + reqs = list(/obj/item/organ/ears = 4, + /obj/item/rope = 1) -/datum/crafting_recipe/roguetown/rod - name = "fishing rod" - result = /obj/item/fishingrod/crafted - reqs = list(/obj/item/grown/log/tree/small = 1, - /obj/item/natural/fibers = 2) +/*========= SKILL LEVEL: 1 REQUIRED ==========*/ -/obj/item/fishingrod/crafted - sellprice = 8 +/datum/crafting_recipe/roguetown/candle + name = "candle" + result = /obj/item/candle/yellow + reqs = list(/obj/item/reagent_containers/food/snacks/fat = 1) + craftdiff = 1 -/datum/crafting_recipe/roguetown/woodspade - name = "wood spade" - result = /obj/item/rogueweapon/shovel/small - reqs = list(/obj/item/grown/log/tree/small = 1, - /obj/item/grown/log/tree/stick = 1) +/datum/crafting_recipe/roguetown/basket_wicker + name = "basket (wicker)" + result = /obj/structure/closet/crate/chest/wicker + reqs = list(/obj/item/natural/fibers = 4) + craftdiff = 1 /datum/crafting_recipe/roguetown/broom name = "broom" @@ -302,14 +221,48 @@ /obj/item/grown/log/tree/stick = 4) craftdiff = 1 -/obj/item/rogueweapon/shovel/small/crafted - sellprice = 5 +/datum/crafting_recipe/roguetown/wickercloak + name = "wickercloak" + result = /obj/item/clothing/cloak/wickercloak + reqs = list(/obj/item/natural/dirtclod = 1, + /obj/item/grown/log/tree/stick = 5, + /obj/item/natural/fibers = 3) + craftdiff = 1 -/datum/crafting_recipe/roguetown/basket_wicker - name = "basket (wicker)" - result = /obj/structure/closet/crate/chest/wicker - reqs = list(/obj/item/natural/fibers = 4) +/datum/crafting_recipe/roguetown/bogcowl + name = "bogcowl" + result = /obj/item/clothing/neck/roguetown/bogcowl + reqs = list(/obj/item/natural/dirtclod = 1, + /obj/item/grown/log/tree/stick = 3, + /obj/item/natural/fibers = 2) + craftdiff = 1 + +/datum/crafting_recipe/roguetown/pestle + name = "pestle" + result = /obj/item/pestle + reqs = list(/obj/item/natural/stone = 2) + tools = list(/obj/item/rogueweapon/knife/hunting) + verbage = "crafts" + skillcraft = /datum/skill/craft/masonry + +/*========= MISCELLANY ==========*/ + +/datum/crafting_recipe/roguetown/mortar + name = "stone mortar" + result = /obj/item/reagent_containers/glass/mortar + reqs = list(/obj/item/natural/stone = 1) + tools = list(/obj/item/rogueweapon/knife/hunting) craftdiff = 1 + subtype_reqs = TRUE + skillcraft = /datum/skill/craft/masonry + +/datum/crafting_recipe/roguetown/alchmortar + name = "alchemical mortar" + result = /obj/item/mortar + reqs = list(/obj/item/natural/stone = 3) + tools = list(/obj/item/rogueweapon/knife/hunting) + verbage = "crafts" + skillcraft = /datum/skill/craft/masonry /datum/crafting_recipe/roguetown/mantrap name = "mantrap" @@ -324,6 +277,8 @@ verbage = "put together" verbage_tp = "puts together" +/*========= AMMO CRAFTING ==========*/ + /datum/crafting_recipe/roguetown/stonearrow name = "stone arrow" result = /obj/item/ammo_casing/caseless/rogue/arrow/stone @@ -336,7 +291,7 @@ result = /obj/item/ammo_casing/caseless/rogue/arrow/poison reqs = list(/obj/item/ammo_casing/caseless/rogue/arrow = 1, /obj/item/reagent_containers/food/snacks/produce/jacksberry/poison = 1) - craftdiff = 0 + craftdiff = 1 /datum/crafting_recipe/roguetown/poisonarrow/alt reqs = list(/obj/item/ammo_casing/caseless/rogue/arrow = 1, @@ -348,20 +303,12 @@ reqs = list(/obj/item/ammo_casing/caseless/rogue/arrow = 1, /datum/reagent/strongpoison = 5) -/datum/crafting_recipe/roguetown/pyroarrow - name = "pyroclastic arrow" - result = /obj/item/ammo_casing/caseless/rogue/arrow/pyro - reqs = list(/obj/item/ammo_casing/caseless/rogue/arrow = 1, - /obj/item/reagent_containers/food/snacks/produce/fyritius = 1) - craftdiff = 1 - skillcraft = /datum/skill/craft/engineering - /datum/crafting_recipe/roguetown/poisonbolt name = "poison bolt" result = /obj/item/ammo_casing/caseless/rogue/bolt/poison reqs = list(/obj/item/ammo_casing/caseless/rogue/bolt = 1, /obj/item/reagent_containers/food/snacks/produce/jacksberry/poison = 1) - craftdiff = 0 + craftdiff = 1 /datum/crafting_recipe/roguetown/poisonbolt/alt reqs = list(/obj/item/ammo_casing/caseless/rogue/bolt = 1, @@ -373,13 +320,23 @@ reqs = list(/obj/item/ammo_casing/caseless/rogue/bolt = 1, /datum/reagent/strongpoison = 5) -/datum/crafting_recipe/roguetown/bomb - name = "bomb" - result = /obj/item/bomb/homemade - reqs = list(/obj/item/natural/cloth = 1, - /obj/item/reagent_containers/food/snacks/produce/fyritius = 1, - /obj/item/reagent_containers/glass/bottle = 1) - craftdiff = 2 +/*========= ENGINEEERING CRAFTING ==========*/ + +/datum/crafting_recipe/roguetown/flint + name = "flint" + result = /obj/item/flint + reqs = list( + /obj/item/natural/stone = 1, + /obj/item/ingot/iron = 1) + skillcraft = /datum/skill/craft/engineering + craftdiff = 0 // Something to practice engineering with. + +/datum/crafting_recipe/roguetown/pyroarrow + name = "pyroclastic arrow" + result = /obj/item/ammo_casing/caseless/rogue/arrow/pyro + reqs = list(/obj/item/ammo_casing/caseless/rogue/arrow = 1, + /obj/item/reagent_containers/food/snacks/produce/fyritius = 1) + craftdiff = 1 skillcraft = /datum/skill/craft/engineering /datum/crafting_recipe/roguetown/pyrobolt @@ -390,40 +347,16 @@ craftdiff = 1 skillcraft = /datum/skill/craft/engineering -/datum/crafting_recipe/roguetown/recurve - name = "recurve bow" - result = list(/obj/item/gun/ballistic/revolver/grenadelauncher/bow/recurve) - reqs = list(/obj/item/grown/log/tree/small = 1, - /obj/item/natural/fibers = 4) - craftdiff = 1 - skillcraft = /datum/skill/craft/carpentry - -/datum/crafting_recipe/roguetown/handmadebow - name = "wooden bow" - result = list(/obj/item/gun/ballistic/revolver/grenadelauncher/bow) - reqs = list(/obj/item/grown/log/tree/small = 1, - /obj/item/natural/fibers = 6) +/datum/crafting_recipe/roguetown/bomb + name = "bomb" + result = /obj/item/bomb/homemade + reqs = list(/obj/item/natural/cloth = 1, + /obj/item/reagent_containers/food/snacks/produce/fyritius = 1, + /obj/item/reagent_containers/glass/bottle = 1) craftdiff = 2 - skillcraft = /datum/skill/craft/carpentry - -/datum/crafting_recipe/roguetown/longbow - name = "longbow" - result = list(/obj/item/gun/ballistic/revolver/grenadelauncher/bow/long) - reqs = list(/obj/item/grown/log/tree/small = 1, - /obj/item/natural/fibers = 8, - /obj/item/reagent_containers/food/snacks/fat) - skillcraft = /datum/skill/craft/carpentry - structurecraft = /obj/machinery/light/rogue/campfire - craftdiff = 3 - -/datum/crafting_recipe/roguetown/flint - name = "flint" - result = /obj/item/flint - reqs = list( - /obj/item/natural/stone = 1, - /obj/item/ingot/iron = 1) skillcraft = /datum/skill/craft/engineering - craftdiff = 0 // Something to practice engineering with. + +/*========= LITERATURE CRAFTING ==========*/ /datum/crafting_recipe/roguetown/paperscroll name = "parchment scroll x5" @@ -468,106 +401,3 @@ name = "master's guide to literature" result = list(/obj/item/literary/master) craftdiff = 6 - -/datum/crafting_recipe/roguetown/quarterstaff - name = "wooden quarterstaff" - result = list(/obj/item/rogueweapon/polearm/woodstaff/quarterstaff, - /obj/item/rogueweapon/polearm/woodstaff/quarterstaff) - reqs = list(/obj/item/grown/log/tree = 1) - req_table = TRUE - tools = list(/obj/item/rogueweapon/knife/hunting) - skillcraft = /datum/skill/craft/carpentry - -/datum/crafting_recipe/roguetown/steelstaff - name = "steel quarterstaff" - skillcraft = /datum/skill/craft/carpentry - reqs = list(/obj/item/rogueweapon/polearm/woodstaff/quarterstaff = 1, /obj/item/ingot/steel = 2) - result = list(/obj/item/rogueweapon/polearm/woodstaff/quarterstaff/steel) - craftdiff = 3 - -/datum/crafting_recipe/roguetown/ironstaff - name = "iron quarterstaff" - skillcraft = /datum/skill/craft/carpentry - reqs = list(/obj/item/rogueweapon/polearm/woodstaff/quarterstaff = 1, /obj/item/ingot/iron = 1) - tools = list(/obj/item/rogueweapon/hammer) - result = list(/obj/item/rogueweapon/polearm/woodstaff/quarterstaff/iron) - craftdiff = 2 - -/datum/crafting_recipe/roguetown/woodflail - name = "wooden flail x2" - skillcraft = /datum/skill/craft/carpentry - reqs = list(/obj/item/rope/chain = 1, - /obj/item/grown/log/tree/stick = 1, /obj/item/grown/log/tree/small = 1) - tools = list(/obj/item/rogueweapon/hammer) - req_table = TRUE - result = list(/obj/item/rogueweapon/flail/towner, /obj/item/rogueweapon/flail/towner) - craftdiff = 2 - -/datum/crafting_recipe/roguetown/militia_flail - name = "militia flail" - skillcraft = /datum/skill/craft/carpentry - reqs = list(/obj/item/rogueweapon/flail/towner = 1, /obj/item/ingot/iron = 1) - tools = list(/obj/item/rogueweapon/hammer) - req_table = TRUE - result = list(/obj/item/rogueweapon/flail/militia) - craftdiff = 3 - -/datum/crafting_recipe/roguetown/woodengreatflail - name = "great wooden flail" - skillcraft = /datum/skill/craft/carpentry - reqs = list(/obj/item/rope = 1, - /obj/item/grown/log/tree/stick = 1, /obj/item/grown/log/tree/small = 1) - tools = list(/obj/item/rogueweapon/hammer) - req_table = TRUE - result = list(/obj/item/rogueweapon/thresher) - craftdiff = 2 - -/datum/crafting_recipe/roguetown/bigflail - name = "great militia flail" - skillcraft = /datum/skill/craft/carpentry - reqs = list(/obj/item/rope/chain = 1, - /obj/item/rogueweapon/thresher = 1, /obj/item/ingot/iron = 1) - tools = list(/obj/item/rogueweapon/hammer) - req_table = TRUE - result = list(/obj/item/rogueweapon/thresher/military) - craftdiff = 3 - - -/datum/crafting_recipe/roguetown/ironcudgel - name = "peasant cudgels x2" - skillcraft = /datum/skill/craft/carpentry - reqs = list(/obj/item/grown/log/tree/small = 1, /obj/item/ingot/iron = 1) - tools = list(/obj/item/rogueweapon/hammer) - req_table = TRUE - result = list(/obj/item/rogueweapon/mace/cudgel/carpenter, /obj/item/rogueweapon/mace/cudgel/carpenter) - craftdiff = 3 - -/datum/crafting_recipe/roguetown/wickercloak - name = "wickercloak" - result = /obj/item/clothing/cloak/wickercloak - reqs = list(/obj/item/natural/dirtclod = 1, - /obj/item/grown/log/tree/stick = 5, - /obj/item/natural/fibers = 3) - craftdiff = 0 - -/datum/crafting_recipe/roguetown/earnecklace - name = "ear necklace" - result = /obj/item/clothing/neck/roguetown/menears - reqs = list(/obj/item/organ/ears = 4, - /obj/item/rope = 1) - craftdiff = 0 - -/datum/crafting_recipe/roguetown/elfearnecklace - name = "elf ear necklace" - result = /obj/item/clothing/neck/roguetown/elfears - reqs = list(/obj/item/organ/ears = 4, - /obj/item/rope = 1) - craftdiff = 0 - -/datum/crafting_recipe/roguetown/bogcowl - name = "bogcowl" - result = /obj/item/clothing/neck/roguetown/bogcowl - reqs = list(/obj/item/natural/dirtclod = 1, - /obj/item/grown/log/tree/stick = 3, - /obj/item/natural/fibers = 2) - craftdiff = 0 diff --git a/code/modules/roguetown/roguecrafting/sewing.dm b/code/modules/roguetown/roguecrafting/sewing.dm index b28ef59978..3507fa37f3 100644 --- a/code/modules/roguetown/roguecrafting/sewing.dm +++ b/code/modules/roguetown/roguecrafting/sewing.dm @@ -13,6 +13,15 @@ /*========= NO SKILL LEVEL REQUIRED ==========*/ +/datum/crafting_recipe/roguetown/sewing/bag + name = "bag" + result = /obj/item/storage/roguebag/crafted + reqs = list(/obj/item/natural/fibers = 1, + /obj/item/natural/cloth = 1) + +/obj/item/storage/roguebag/crafted + sellprice = 4 + /datum/crafting_recipe/roguetown/sewing/rags name = "rags" result = list(/obj/item/clothing/suit/roguetown/shirt/rags) diff --git a/code/modules/roguetown/roguecrafting/structure.dm b/code/modules/roguetown/roguecrafting/structure.dm index 87bcf4b638..ba36a95788 100644 --- a/code/modules/roguetown/roguecrafting/structure.dm +++ b/code/modules/roguetown/roguecrafting/structure.dm @@ -1,81 +1,51 @@ /datum/crafting_recipe/roguetown/structure req_table = FALSE + craftdiff = 0 /datum/crafting_recipe/roguetown/structure/TurfCheck(mob/user, turf/T) if(istype(T,/turf/open/transparent/openspace)) return FALSE return ..() -/datum/crafting_recipe/roguetown/structure/handcart - name = "handcart" - result = /obj/structure/handcart - reqs = list(/obj/item/grown/log/tree/small = 3, - /obj/item/rope = 1) - verbage = "carpent" - verbage_tp = "carpents" - craftsound = 'sound/foley/Building-01.ogg' - -/datum/crafting_recipe/roguetown/structure/noose - name = "noose" - result = /obj/structure/noose - reqs = list(/obj/item/rope = 1) - verbage = "tie" - verbage_tp = "ties" - craftsound = 'sound/foley/noose_idle.ogg' - ontile = TRUE - -/datum/crafting_recipe/roguetown/structure/noose/TurfCheck(mob/user, turf/T) - var/turf/checking = get_step_multiz(T, UP) - if(!checking) - return FALSE - if(!isopenturf(checking)) - return FALSE - if(istype(checking,/turf/open/transparent/openspace)) - return FALSE - return TRUE +/*========= CARPENTRY SKILL ==========*/ -/datum/crafting_recipe/roguetown/structure/psycrss - name = "wooden cross" - result = /obj/structure/fluff/psycross/crafted - reqs = list(/obj/item/grown/log/tree/small = 1, - /obj/item/grown/log/tree/stake = 3) +/datum/crafting_recipe/roguetown/structure/stool + name = "wooden stool" + result = /obj/item/chair/stool/bar/rogue/crafted + reqs = list(/obj/item/grown/log/tree/small = 1) + skillcraft = /datum/skill/craft/carpentry verbage = "carpent" verbage_tp = "carpents" craftsound = 'sound/foley/Building-01.ogg' +/obj/item/chair/stool/bar/rogue/crafted + sellprice = 6 -/datum/crafting_recipe/roguetown/structure/pyre - name = "wooden pyre" - result = /obj/machinery/light/rogue/campfire/pyre - reqs = list(/obj/item/grown/log/tree/small = 2, - /obj/item/grown/log/tree/stake = 3) - verbage = "carpent" - verbage_tp = "carpents" - craftsound = 'sound/foley/Building-01.ogg' +/* === SKILL LEVEL 1 === */ -/datum/crafting_recipe/roguetown/structure/door - name = "wooden door" - result = /obj/structure/mineral_door/wood/deadbolt - reqs = list(/obj/item/grown/log/tree/small = 2) +/datum/crafting_recipe/roguetown/structure/chair + name = "wooden chair" + result = /obj/item/chair/rogue/crafted + reqs = list(/obj/item/grown/log/tree/small = 1) verbage = "carpent" verbage_tp = "carpents" craftsound = 'sound/foley/Building-01.ogg' skillcraft = /datum/skill/craft/carpentry + craftdiff = 1 -/datum/crafting_recipe/roguetown/structure/barrel - name = "wooden barrel" - result = /obj/structure/fermenting_barrel/crafted - reqs = list(/obj/item/grown/log/tree/small = 1) - verbage = "construct" - verbage_tp = "makes" - craftsound = 'sound/foley/Building-01.ogg' - skillcraft = /datum/skill/craft/carpentry - -/obj/structure/fermenting_barrel/crafted +/obj/item/chair/rogue/crafted sellprice = 6 -/datum/crafting_recipe/roguetown/roguebin +/datum/crafting_recipe/roguetown/structure/composter + name = "composter" + result = /obj/structure/composter + reqs = list(/obj/item/grown/log/tree/small = 1) + craftdiff = 0 + time = 2 SECONDS + craftdiff = 1 + +/datum/crafting_recipe/roguetown/roguebin // Bins are easier to craft than barrels for pure convenience. name = "wooden bin" result = /obj/item/roguebin reqs = list(/obj/item/grown/log/tree/small = 2) @@ -83,7 +53,7 @@ verbage_tp = "makes" craftsound = 'sound/foley/Building-01.ogg' skillcraft = /datum/skill/craft/carpentry - craftdiff = 0 + craftdiff = 1 /datum/crafting_recipe/roguetown/structure/dye_bin name = "dye bin" @@ -95,7 +65,7 @@ verbage_tp = "carpents" craftsound = 'sound/foley/Building-01.ogg' skillcraft = /datum/skill/craft/carpentry - craftdiff = 0 + craftdiff = 1 subtype_reqs = TRUE // so you can use any subtype of the berries and swampweed /datum/crafting_recipe/roguetown/structure/dye_bin_luxury @@ -109,80 +79,88 @@ verbage_tp = "carpents" craftsound = 'sound/foley/Building-01.ogg' skillcraft = /datum/skill/craft/carpentry - craftdiff = 0 + craftdiff = 1 subtype_reqs = TRUE // so you can use any subtype of the berries and swampweed -/datum/crafting_recipe/roguetown/structure/chair - name = "wooden chair" - result = /obj/item/chair/rogue/crafted +/datum/crafting_recipe/roguetown/structure/table + name = "wooden table" + result = /obj/structure/table/wood/crafted reqs = list(/obj/item/grown/log/tree/small = 1) verbage = "carpent" verbage_tp = "carpents" craftsound = 'sound/foley/Building-01.ogg' skillcraft = /datum/skill/craft/carpentry + craftdiff = 1 -/obj/item/chair/rogue/crafted - sellprice = 6 - -/datum/crafting_recipe/roguetown/structure/stool - name = "wooden stool" - result = /obj/item/chair/stool/bar/rogue/crafted +/datum/crafting_recipe/roguetown/structure/wallladder + name = "wall ladder" + result = /obj/structure/wallladder reqs = list(/obj/item/grown/log/tree/small = 1) - skillcraft = /datum/skill/craft/carpentry verbage = "carpent" verbage_tp = "carpents" craftsound = 'sound/foley/Building-01.ogg' + skillcraft = /datum/skill/craft/carpentry + wallcraft = TRUE + craftdiff = 1 -/obj/item/chair/stool/bar/rogue/crafted - sellprice = 6 - -/datum/crafting_recipe/roguetown/structure/anvil - name = "anvil" - result = /obj/machinery/anvil - reqs = list(/obj/item/ingot/iron = 1) - - verbage = "build" - verbage_tp = "builds" +/datum/crafting_recipe/roguetown/structure/sign + name = "custom sign" + result = /obj/structure/fluff/customsign + reqs = list(/obj/item/grown/log/tree/small = 1) + verbage = "construct" + verbage_tp = "constructs" craftsound = 'sound/foley/Building-01.ogg' + skillcraft = /datum/skill/craft/carpentry + craftdiff = 1 -/datum/crafting_recipe/roguetown/structure/smelter - name = "ore furnace" - result = /obj/machinery/light/rogue/smelter - reqs = list(/obj/item/natural/stone = 4, - /obj/item/rogueore/coal = 1) - verbage = "build" - verbage_tp = "builds" - craftsound = null - -/datum/crafting_recipe/roguetown/structure/greatsmelter - name = "great furnace" - result = /obj/machinery/light/rogue/smelter/great - reqs = list(/obj/item/ingot/iron = 2, - /obj/item/riddleofsteel = 1, - /obj/item/rogueore/coal = 1) - verbage = "build" - verbage_tp = "builds" - craftsound = null +/datum/crafting_recipe/roguetown/structure/chest + name = "chest" + result = /obj/structure/closet/crate/chest/crafted + reqs = list(/obj/item/grown/log/tree/small = 1) + verbage = "construct" + verbage_tp = "constructs" + craftsound = 'sound/foley/Building-01.ogg' + skillcraft = /datum/skill/craft/carpentry + craftdiff = 1 -/datum/crafting_recipe/roguetown/structure/forge - name = "forge" - result = /obj/machinery/light/rogue/forge - reqs = list(/obj/item/natural/stone = 4, - /obj/item/rogueore/coal = 1) +/obj/structure/closet/crate/chest/crafted + name = "sturdy chest" + icon_state = "chest_neu" + base_icon_state = "chest_neu" + keylock = FALSE + sellprice = 6 - verbage = "build" - verbage_tp = "builds" - craftsound = null +/datum/crafting_recipe/roguetown/structure/closet + name = "closet" + result = /obj/structure/closet/crate/roguecloset/crafted + reqs = list(/obj/item/grown/log/tree/small = 2) + verbage = "construct" + verbage_tp = "constructs" + craftsound = 'sound/foley/Building-01.ogg' + skillcraft = /datum/skill/craft/carpentry + craftdiff = 1 -/datum/crafting_recipe/roguetown/structure/sharpwheel - name = "sharpening wheel" - result = /obj/structure/fluff/grindwheel - reqs = list(/obj/item/ingot/iron = 1, - /obj/item/natural/stone = 1) +/obj/structure/closet/crate/roguecloset/crafted + sellprice = 6 +/datum/crafting_recipe/roguetown/structure/coffin + name = "wooden coffin" + result = /obj/structure/closet/crate/coffin + reqs = list(/obj/item/grown/log/tree/small = 2) verbage = "construct" verbage_tp = "constructs" - craftsound = null + skillcraft = /datum/skill/craft/carpentry + craftdiff = 1 + +/datum/crafting_recipe/roguetown/structure/psycrss + name = "wooden cross" + result = /obj/structure/fluff/psycross/crafted + reqs = list(/obj/item/grown/log/tree/small = 1, + /obj/item/grown/log/tree/stake = 3) + verbage = "carpent" + verbage_tp = "carpents" + craftsound = 'sound/foley/Building-01.ogg' + craftdiff = 1 /datum/crafting_recipe/roguetown/structure/loom name = "loom" @@ -194,37 +172,78 @@ verbage = "constructs" craftsound = 'sound/foley/Building-01.ogg' skillcraft = /datum/skill/craft/carpentry + craftdiff = 1 -/* -/datum/crafting_recipe/roguetown/structure/stairs - name = "stairs (up)" - result = /obj/structure/stairs +/datum/crafting_recipe/roguetown/structure/dummy // Easier to craft than display dummies for convenience, and also because a training dummy isn't actually fitting any measurements. You're just smacking it. + name = "training dummy" + result = /obj/structure/fluff/statue/tdummy reqs = list(/obj/item/grown/log/tree/small = 1) + verbage = "construct" + verbage_tp = "constructs" + craftsound = 'sound/foley/Building-01.ogg' + skillcraft = /datum/skill/craft/carpentry + craftdiff = 1 - verbage = "carpents" +/* === SKILL LEVEL 2 === */ + +/datum/crafting_recipe/roguetown/structure/display_stand + name = "display stand" + result = /obj/structure/mannequin + reqs = list(/obj/item/grown/log/tree/small = 1, + /obj/item/grown/log/tree/stick = 3) + verbage = "construct" + verbage_tp = "constructs" craftsound = 'sound/foley/Building-01.ogg' - ontile = TRUE + skillcraft = /datum/skill/craft/carpentry + craftdiff = 2 + +/datum/crafting_recipe/roguetown/structure/mannequin + name = "masculine mannequin" + result = /obj/structure/mannequin/male + reqs = list(/obj/item/grown/log/tree/small = 1, + /obj/item/natural/cloth = 1, + /obj/item/ingot/iron = 1) + verbage = "construct" + verbage_tp = "constructs" + craftsound = 'sound/foley/Building-01.ogg' + skillcraft = /datum/skill/craft/carpentry + craftdiff = 2 + +/datum/crafting_recipe/roguetown/structure/mannequin_f + name = "feminine mannequin" + result = /obj/structure/mannequin/male/female + reqs = list(/obj/item/grown/log/tree/small = 1, + /obj/item/natural/cloth = 1, + /obj/item/ingot/iron = 1) + verbage = "construct" + verbage_tp = "constructs" + craftsound = 'sound/foley/Building-01.ogg' + skillcraft = /datum/skill/craft/carpentry + craftdiff = 2 + +/datum/crafting_recipe/roguetown/structure/handcart + name = "handcart" + result = /obj/structure/handcart + reqs = list(/obj/item/grown/log/tree/small = 3, + /obj/item/rope = 1) + verbage = "carpent" + verbage_tp = "carpents" + craftsound = 'sound/foley/Building-01.ogg' + craftdiff = 2 + +/datum/crafting_recipe/roguetown/structure/barrel + name = "wooden barrel" + result = /obj/structure/fermenting_barrel/crafted + reqs = list(/obj/item/grown/log/tree/small = 1) + verbage = "construct" + verbage_tp = "makes" + craftsound = 'sound/foley/Building-01.ogg' + skillcraft = /datum/skill/craft/carpentry + craftdiff = 2 + +/obj/structure/fermenting_barrel/crafted + sellprice = 6 -/datum/crafting_recipe/roguetown/structure/stairs/TurfCheck(mob/user, turf/T) - var/turf/checking = get_step_multiz(T, UP) - if(!checking) - return FALSE - if(!istype(checking,/turf/open/transparent/openspace)) - return FALSE - checking = get_step(checking, user.dir) - if(!checking) - return FALSE - if(!isopenturf(checking)) - return FALSE - if(istype(checking,/turf/open/transparent/openspace)) - return FALSE - for(var/obj/structure/S in checking) - if(istype(S, /obj/structure/stairs)) - return FALSE - if(S.density) - return FALSE - return TRUE -*/ /datum/crafting_recipe/roguetown/structure/stairsd name = "stairs" result = /obj/structure/stairs/d @@ -255,6 +274,115 @@ return FALSE return TRUE +/datum/crafting_recipe/roguetown/structure/nicebed + name = "nice bed" + result = /obj/structure/bed/rogue + reqs = list(/obj/item/grown/log/tree/small = 1, + /obj/item/natural/cloth = 1) + tools = list(/obj/item/needle) + verbage = "carpent" + verbage_tp = "carpents" + craftsound = 'sound/foley/Building-01.ogg' + skillcraft = /datum/skill/craft/carpentry + craftdiff = 2 + +/datum/crafting_recipe/roguetown/structure/door + name = "wooden door" + result = /obj/structure/mineral_door/wood/deadbolt + reqs = list(/obj/item/grown/log/tree/small = 2) + verbage = "carpent" + verbage_tp = "carpents" + craftsound = 'sound/foley/Building-01.ogg' + skillcraft = /datum/skill/craft/carpentry + craftdiff = 2 + +/*========= MASONRY SKILL ==========*/ + +/datum/crafting_recipe/roguetown/structure/millstone + name = "millstone" + result = /obj/structure/fluff/millstone + reqs = list(/obj/item/natural/stone = 3) + verbage = "mason" + verbage_tp = "masons" + craftsound = null + skillcraft = /datum/skill/craft/masonry + craftdiff = 1 + +/datum/crafting_recipe/roguetown/structure/cauldron + name = "cauldron" + result = /obj/machinery/light/rogue/cauldron + reqs = list(/obj/item/ingot/iron = 2, + /obj/item/natural/stone = 4, + /obj/item/grown/log/tree/small = 1) + verbage = "craft" + verbage_tp = "crafts" + craftsound = 'sound/foley/Building-01.ogg' + skillcraft = /datum/skill/craft/masonry + craftdiff = 1 + +/datum/crafting_recipe/roguetown/structure/oven + name = "oven" + result = /obj/machinery/light/rogue/oven + reqs = list(/obj/item/grown/log/tree/small = 1, + /obj/item/natural/stone = 3) + verbage = "mason" + verbage_tp = "masons" + craftsound = 'sound/foley/Building-01.ogg' + skillcraft = /datum/skill/craft/masonry + wallcraft = TRUE + craftdiff = 1 + +/datum/crafting_recipe/roguetown/structure/window + name = "solid window" + result = /obj/structure/roguewindow/solid + reqs = list(/obj/item/grown/log/tree/small = 1, + /obj/item/natural/glass = 1) + craftsound = 'sound/foley/Building-01.ogg' + skillcraft = /datum/skill/craft/masonry + craftdiff = 1 + +/datum/crafting_recipe/roguetown/structure/windowopen + name = "openable window" + result = /obj/structure/roguewindow/openclose + reqs = list(/obj/item/grown/log/tree/small = 1, + /obj/item/natural/glass = 1, + /obj/item/ingot/iron = 1) + craftsound = 'sound/foley/Building-01.ogg' + skillcraft = /datum/skill/craft/masonry + craftdiff = 1 + +/datum/crafting_recipe/roguetown/structure/windowstained + name = "stained glass window (silver)" + result = /obj/structure/roguewindow/stained + reqs = list(/obj/item/natural/stone = 3, + /obj/item/natural/glass = 2, + /obj/item/ingot/silver = 1) + skillcraft = /datum/skill/craft/masonry + craftdiff = 2 + +/*========= MISCELLANY/CRAFTING SKILL ==========*/ + +/* === NO SKILL NEEDED === */ + +/datum/crafting_recipe/roguetown/structure/noose + name = "noose" + result = /obj/structure/noose + reqs = list(/obj/item/rope = 1) + verbage = "tie" + verbage_tp = "ties" + craftsound = 'sound/foley/noose_idle.ogg' + ontile = TRUE + +/datum/crafting_recipe/roguetown/structure/noose/TurfCheck(mob/user, turf/T) + var/turf/checking = get_step_multiz(T, UP) + if(!checking) + return FALSE + if(!isopenturf(checking)) + return FALSE + if(istype(checking,/turf/open/transparent/openspace)) + return FALSE + return TRUE + /datum/crafting_recipe/roguetown/structure/fence name = "palisade (s x2)" result = /obj/structure/fluff/railing/fence @@ -275,43 +403,14 @@ craftsound = 'sound/foley/Building-01.ogg' buildsame = TRUE -/datum/crafting_recipe/roguetown/structure/chest - name = "chest" - result = /obj/structure/closet/crate/chest/crafted - reqs = list(/obj/item/grown/log/tree/small = 1) - verbage = "construct" - verbage_tp = "constructs" - craftsound = 'sound/foley/Building-01.ogg' - skillcraft = /datum/skill/craft/carpentry - craftdiff = 0 - -/obj/structure/closet/crate/chest/crafted - name = "sturdy chest" - icon_state = "chest_neu" - base_icon_state = "chest_neu" - keylock = FALSE - sellprice = 6 - -/datum/crafting_recipe/roguetown/structure/closet - name = "closet" - result = /obj/structure/closet/crate/roguecloset/crafted - reqs = list(/obj/item/grown/log/tree/small = 2) - verbage = "construct" - verbage_tp = "constructs" +/datum/crafting_recipe/roguetown/structure/bed // This one's not in carpentry because it's just a shitty pile of sticks and cloth. + name = "bed" + result = /obj/structure/bed/rogue/shit + reqs = list(/obj/item/grown/log/tree/small = 1, + /obj/item/natural/fibers = 1) + verbage = "carpent" + verbage_tp = "carpents" craftsound = 'sound/foley/Building-01.ogg' - skillcraft = /datum/skill/craft/carpentry - -/obj/structure/closet/crate/roguecloset/crafted - sellprice = 6 - -/datum/crafting_recipe/roguetown/structure/coffin - name = "wooden coffin" - result = /obj/structure/closet/crate/coffin - reqs = list(/obj/item/grown/log/tree/small = 2) - verbage = "construct" - verbage_tp = "constructs" - skillcraft = /datum/skill/craft/carpentry - craftdiff = 1 /datum/crafting_recipe/roguetown/structure/campfire name = "campfire" @@ -319,7 +418,6 @@ reqs = list(/obj/item/grown/log/tree/stick = 2) verbage = "build" verbage_tp = "builds" - craftdiff = 0 /datum/crafting_recipe/roguetown/structure/densefire name = "greater campfire" @@ -329,6 +427,17 @@ verbage = "build" verbage_tp = "builds" +/datum/crafting_recipe/roguetown/structure/pyre + name = "wooden pyre" + result = /obj/machinery/light/rogue/campfire/pyre + reqs = list(/obj/item/grown/log/tree/small = 2, + /obj/item/grown/log/tree/stake = 3) + verbage = "carpent" + verbage_tp = "carpents" + craftsound = 'sound/foley/Building-01.ogg' + +/* === SKILL LEVEL 1 === */ + /datum/crafting_recipe/roguetown/structure/cookpit name = "cookpit" result = /obj/machinery/light/rogue/hearth @@ -336,7 +445,7 @@ /obj/item/natural/stone = 3) verbage = "build" verbage_tp = "builds" - craftdiff = 0 + craftdiff = 1 /datum/crafting_recipe/roguetown/structure/brazier name = "brazier" @@ -345,17 +454,7 @@ /obj/item/rogueore/coal = 1) verbage = "build" verbage_tp = "builds" - -/datum/crafting_recipe/roguetown/structure/oven - name = "oven" - result = /obj/machinery/light/rogue/oven - reqs = list(/obj/item/grown/log/tree/small = 1, - /obj/item/natural/stone = 3) - verbage = "mason" - verbage_tp = "masons" - craftsound = 'sound/foley/Building-01.ogg' - skillcraft = /datum/skill/craft/masonry - wallcraft = TRUE + craftdiff = 1 /datum/crafting_recipe/roguetown/structure/dryingrack name = "drying rack" @@ -364,46 +463,97 @@ verbage = "construct" verbage_tp = "constructs" craftsound = 'sound/foley/Building-01.ogg' + craftdiff = 1 -/datum/crafting_recipe/roguetown/structure/bed - name = "bed" - result = /obj/structure/bed/rogue/shit - reqs = list(/obj/item/grown/log/tree/small = 1, - /obj/item/natural/fibers = 1) - verbage = "carpent" - verbage_tp = "carpents" - craftsound = 'sound/foley/Building-01.ogg' - craftdiff = 0 +/* === SKILL LEVEL 2 === */ -/datum/crafting_recipe/roguetown/structure/nicebed - name = "nice bed" - result = /obj/structure/bed/rogue - reqs = list(/obj/item/grown/log/tree/small = 1, - /obj/item/natural/cloth = 1) - tools = list(/obj/item/needle) - verbage = "carpent" - verbage_tp = "carpents" +/datum/crafting_recipe/roguetown/structure/anvil // Call me crazy, but I think there should be some difficulty involved in making these huge structures. + name = "anvil" + result = /obj/machinery/anvil + reqs = list(/obj/item/ingot/iron = 1) + + verbage = "build" + verbage_tp = "builds" craftsound = 'sound/foley/Building-01.ogg' - skillcraft = /datum/skill/craft/carpentry craftdiff = 2 -/datum/crafting_recipe/roguetown/structure/table - name = "wooden table" - result = /obj/structure/table/wood/crafted +/datum/crafting_recipe/roguetown/structure/smelter + name = "ore furnace" + result = /obj/machinery/light/rogue/smelter + reqs = list(/obj/item/natural/stone = 4, + /obj/item/rogueore/coal = 1) + verbage = "build" + verbage_tp = "builds" + craftsound = null + craftdiff = 2 + +/datum/crafting_recipe/roguetown/structure/forge + name = "forge" + result = /obj/machinery/light/rogue/forge + reqs = list(/obj/item/natural/stone = 4, + /obj/item/rogueore/coal = 1) + + verbage = "build" + verbage_tp = "builds" + craftsound = null + craftdiff = 2 + +/* === SKILL LEVEL 3 === */ + +/datum/crafting_recipe/roguetown/structure/sharpwheel + name = "sharpening wheel" + result = /obj/structure/fluff/grindwheel + reqs = list(/obj/item/ingot/iron = 1, + /obj/item/natural/stone = 1) + + verbage = "construct" + verbage_tp = "constructs" + craftsound = null + craftdiff = 3 + +/datum/crafting_recipe/roguetown/structure/greatsmelter // I figure if you've already got a riddle of steel you're a mason making this anyway. + name = "great furnace" + result = /obj/machinery/light/rogue/smelter/great + reqs = list(/obj/item/ingot/iron = 2, + /obj/item/riddleofsteel = 1, + /obj/item/rogueore/coal = 1) + verbage = "build" + verbage_tp = "builds" + craftsound = null + craftdiff = 3 + +/* +/datum/crafting_recipe/roguetown/structure/stairs + name = "stairs (up)" + result = /obj/structure/stairs reqs = list(/obj/item/grown/log/tree/small = 1) - verbage = "carpent" - verbage_tp = "carpents" + + verbage = "carpents" craftsound = 'sound/foley/Building-01.ogg' - skillcraft = /datum/skill/craft/carpentry + ontile = TRUE -/datum/crafting_recipe/roguetown/structure/millstone - name = "millstone" - result = /obj/structure/fluff/millstone - reqs = list(/obj/item/natural/stone = 3) - verbage = "mason" - verbage_tp = "masons" - craftsound = null - skillcraft = /datum/skill/craft/masonry +/datum/crafting_recipe/roguetown/structure/stairs/TurfCheck(mob/user, turf/T) + var/turf/checking = get_step_multiz(T, UP) + if(!checking) + return FALSE + if(!istype(checking,/turf/open/transparent/openspace)) + return FALSE + checking = get_step(checking, user.dir) + if(!checking) + return FALSE + if(!isopenturf(checking)) + return FALSE + if(istype(checking,/turf/open/transparent/openspace)) + return FALSE + for(var/obj/structure/S in checking) + if(istype(S, /obj/structure/stairs)) + return FALSE + if(S.density) + return FALSE + return TRUE +*/ + +/*========= ENGINEERING SKILL ==========*/ /datum/crafting_recipe/roguetown/structure/lever name = "lever" @@ -413,6 +563,7 @@ verbage_tp = "constructs" craftsound = 'sound/foley/Building-01.ogg' skillcraft = /datum/skill/craft/engineering + craftdiff = 1 /datum/crafting_recipe/roguetown/structure/trapdoor name = "floorhatch" @@ -423,6 +574,7 @@ verbage_tp = "constructs" craftsound = 'sound/foley/Building-01.ogg' skillcraft = /datum/skill/craft/engineering + craftdiff = 1 /datum/crafting_recipe/roguetown/structure/pressureplate name = "pressure plate" @@ -433,6 +585,7 @@ verbage_tp = "constructs" craftsound = 'sound/foley/Building-01.ogg' skillcraft = /datum/skill/craft/engineering + craftdiff = 1 /datum/crafting_recipe/roguetown/structure/repeater name = "repeater" @@ -444,6 +597,7 @@ verbage_tp = "constructs" craftsound = 'sound/foley/Building-01.ogg' skillcraft = /datum/skill/craft/engineering + craftdiff = 1 /datum/crafting_recipe/roguetown/structure/activator name = "activator" @@ -455,6 +609,7 @@ verbage_tp = "constructs" craftsound = 'sound/foley/Building-01.ogg' skillcraft = /datum/skill/craft/engineering + craftdiff = 1 /datum/crafting_recipe/roguetown/structure/trapdoor/TurfCheck(mob/user, turf/T) if(istype(T,/turf/open/transparent/openspace)) @@ -463,61 +618,6 @@ return TRUE // its just too hilarious not to allow this return ..() -/datum/crafting_recipe/roguetown/structure/sign - name = "custom sign" - result = /obj/structure/fluff/customsign - reqs = list(/obj/item/grown/log/tree/small = 1) - verbage = "construct" - verbage_tp = "constructs" - craftsound = 'sound/foley/Building-01.ogg' - skillcraft = /datum/skill/craft/carpentry - craftdiff = 1 - -/datum/crafting_recipe/roguetown/structure/dummy - name = "training dummy" - result = /obj/structure/fluff/statue/tdummy - reqs = list(/obj/item/grown/log/tree/small = 1) - verbage = "construct" - verbage_tp = "constructs" - craftsound = 'sound/foley/Building-01.ogg' - skillcraft = /datum/skill/craft/carpentry - craftdiff = 1 - -/datum/crafting_recipe/roguetown/structure/display_stand - name = "display stand" - result = /obj/structure/mannequin - reqs = list(/obj/item/grown/log/tree/small = 1, - /obj/item/grown/log/tree/stick = 3) - verbage = "construct" - verbage_tp = "constructs" - craftsound = 'sound/foley/Building-01.ogg' - skillcraft = /datum/skill/craft/carpentry - craftdiff = 2 - -/datum/crafting_recipe/roguetown/structure/mannequin - name = "mannequin" - result = /obj/structure/mannequin/male - reqs = list(/obj/item/grown/log/tree/small = 1, - /obj/item/natural/cloth = 1, - /obj/item/ingot/iron = 1) - verbage = "construct" - verbage_tp = "constructs" - craftsound = 'sound/foley/Building-01.ogg' - skillcraft = /datum/skill/craft/carpentry - craftdiff = 2 - -/datum/crafting_recipe/roguetown/structure/mannequin_f - name = "feminine mannequin" - result = /obj/structure/mannequin/male/female - reqs = list(/obj/item/grown/log/tree/small = 1, - /obj/item/natural/cloth = 1, - /obj/item/ingot/iron = 1) - verbage = "construct" - verbage_tp = "constructs" - craftsound = 'sound/foley/Building-01.ogg' - skillcraft = /datum/skill/craft/carpentry - craftdiff = 2 - /datum/crafting_recipe/roguetown/structure/passage name = "passage" result = /obj/structure/bars/passage @@ -527,6 +627,7 @@ verbage_tp = "builds" craftsound = 'sound/foley/Building-01.ogg' skillcraft = /datum/skill/craft/engineering + craftdiff = 1 /datum/crafting_recipe/roguetown/structure/passage/TurfCheck(mob/user, turf/T) if(istype(T,/turf/open/transparent/openspace)) @@ -536,55 +637,3 @@ if(istype(T,/turf/open/water)) return FALSE return ..() - -/datum/crafting_recipe/roguetown/structure/wallladder - name = "wall ladder" - result = /obj/structure/wallladder - reqs = list(/obj/item/grown/log/tree/small = 1) - verbage = "carpent" - verbage_tp = "carpents" - craftsound = 'sound/foley/Building-01.ogg' - skillcraft = /datum/skill/craft/carpentry - wallcraft = TRUE - craftdiff = 0 - -/datum/crafting_recipe/roguetown/structure/cauldron - name = "cauldron" - result = /obj/machinery/light/rogue/cauldron - reqs = list(/obj/item/ingot/iron = 2, - /obj/item/natural/stone = 4, - /obj/item/grown/log/tree/small = 1) - verbage = "craft" - verbage_tp = "crafts" - craftsound = 'sound/foley/Building-01.ogg' - skillcraft = /datum/skill/craft/masonry - -// Windows - -/datum/crafting_recipe/roguetown/structure/window - name = "solid window" - result = /obj/structure/roguewindow/solid - reqs = list(/obj/item/grown/log/tree/small = 1, - /obj/item/natural/glass = 1) - craftsound = 'sound/foley/Building-01.ogg' - skillcraft = /datum/skill/craft/masonry - craftdiff = 0 - -/datum/crafting_recipe/roguetown/structure/windowopen - name = "openable window" - result = /obj/structure/roguewindow/openclose - reqs = list(/obj/item/grown/log/tree/small = 1, - /obj/item/natural/glass = 1, - /obj/item/ingot/iron = 1) - craftsound = 'sound/foley/Building-01.ogg' - skillcraft = /datum/skill/craft/masonry - craftdiff = 1 - -/datum/crafting_recipe/roguetown/structure/windowstained - name = "stained glass window (silver)" - result = /obj/structure/roguewindow/stained - reqs = list(/obj/item/natural/stone = 3, - /obj/item/natural/glass = 2, - /obj/item/ingot/silver = 1) - skillcraft = /datum/skill/craft/masonry - craftdiff = 2 diff --git a/code/modules/roguetown/roguecrafting/turfs.dm b/code/modules/roguetown/roguecrafting/turfs.dm index 26e34145fe..d14bc8f639 100644 --- a/code/modules/roguetown/roguecrafting/turfs.dm +++ b/code/modules/roguetown/roguecrafting/turfs.dm @@ -1,11 +1,14 @@ +/datum/crafting_recipe/roguetown/turfs + craftdiff = 0 +/*========= CARPENTRY SKILL ==========*/ /datum/crafting_recipe/roguetown/turfs/woodfloor name = "wooden floor" result = /turf/open/floor/rogue/ruinedwood reqs = list(/obj/item/grown/log/tree/small = 1) skillcraft = /datum/skill/craft/carpentry - craftdiff = 0 + craftdiff = 1 /datum/crafting_recipe/roguetown/turfs/woodfloor/TurfCheck(mob/user, turf/T) if(isclosedturf(T)) @@ -16,12 +19,6 @@ return return TRUE -/datum/crafting_recipe/roguetown/turfs/woodwall - name = "wooden wall" - result = /turf/closed/wall/mineral/rogue/wood - reqs = list(/obj/item/grown/log/tree/small = 2) - skillcraft = /datum/skill/craft/carpentry - /datum/crafting_recipe/roguetown/turfs/daubwall name = "daub wall" result = /turf/closed/wall/mineral/rogue/decowood @@ -29,6 +26,14 @@ skillcraft = /datum/skill/craft/crafting verbage = "build" verbage_tp = "builds" + craftdiff = 1 + +/datum/crafting_recipe/roguetown/turfs/woodwall + name = "wooden wall" + result = /turf/closed/wall/mineral/rogue/wood + reqs = list(/obj/item/grown/log/tree/small = 2) + skillcraft = /datum/skill/craft/carpentry + craftdiff = 2 /datum/crafting_recipe/roguetown/turfs/woodwall/TurfCheck(mob/user, turf/T) if(isclosedturf(T)) @@ -42,6 +47,7 @@ result = /turf/closed/wall/mineral/rogue/wood/window reqs = list(/obj/item/grown/log/tree/small = 2) skillcraft = /datum/skill/craft/carpentry + craftdiff = 2 /datum/crafting_recipe/roguetown/turfs/woodwindow/TurfCheck(mob/user, turf/T) if(isclosedturf(T)) @@ -50,12 +56,14 @@ return return TRUE +/*========= MASONRY SKILL ==========*/ + /datum/crafting_recipe/roguetown/turfs/stonefloor name = "stone floor" result = /turf/open/floor/rogue/blocks reqs = list(/obj/item/natural/stone = 1) skillcraft = /datum/skill/craft/masonry - craftdiff = 0 + craftdiff = 1 /datum/crafting_recipe/roguetown/turfs/stonefloor/TurfCheck(mob/user, turf/T) if(isclosedturf(T)) @@ -71,6 +79,7 @@ result = /turf/closed/wall/mineral/rogue/stone reqs = list(/obj/item/natural/stone = 2) skillcraft = /datum/skill/craft/masonry + craftdiff = 2 /datum/crafting_recipe/roguetown/turfs/stonewall/TurfCheck(mob/user, turf/T) if(isclosedturf(T)) @@ -84,6 +93,7 @@ result = /turf/closed/wall/mineral/rogue/stone/window reqs = list(/obj/item/natural/stone = 2) skillcraft = /datum/skill/craft/masonry + craftdiff = 2 /datum/crafting_recipe/roguetown/turfs/stonewindow/TurfCheck(mob/user, turf/T) if(isclosedturf(T)) @@ -92,7 +102,9 @@ return return TRUE -/// TWIG AND TENT +/*========= CRAFTING SKILL ==========*/ + +// Twig floors and tent walls are easier to make than wood and stone walls/floors. /datum/crafting_recipe/roguetown/turfs/twig name = "twig floor" diff --git a/modular/Neu_Farming/code/crafting_recipes.dm b/modular/Neu_Farming/code/crafting_recipes.dm deleted file mode 100644 index eafeee3f39..0000000000 --- a/modular/Neu_Farming/code/crafting_recipes.dm +++ /dev/null @@ -1,71 +0,0 @@ -/datum/crafting_recipe/roguetown/structure/composter - name = "composter" - result = /obj/structure/composter - reqs = list(/obj/item/grown/log/tree/small = 1) - craftdiff = 0 - time = 2 SECONDS - -/datum/crafting_recipe/roguetown/structure/plough - name = "plough" - result = /obj/structure/plough - reqs = list(/obj/item/grown/log/tree/small = 2, /obj/item/ingot/iron = 1) - skillcraft = /datum/skill/craft/carpentry - time = 4 SECONDS - -/datum/crafting_recipe/roguetown/woodthresher - name = "thresher" - result = list(/obj/item/rogueweapon/thresher) - reqs = list(/obj/item/grown/log/tree/small = 1, - /obj/item/rope = 1) - -/datum/crafting_recipe/roguetown/militarythresher - name = "military flail" - result = list(/obj/item/rogueweapon/thresher/military) - reqs = list(/obj/item/rogueweapon/thresher = 1, - /obj/item/ingot/iron = 1) - - - -/datum/crafting_recipe/roguetown/dryweed - name = "dry westleach leaf" - result = /obj/item/reagent_containers/food/snacks/produce/dry_westleach - reqs = list(/obj/item/reagent_containers/food/snacks/produce/westleach = 1) - structurecraft = /obj/structure/fluff/dryingrack - time = 2 SECONDS - verbage = "dry" - verbage_tp = "dries" - craftsound = null - skillcraft = null - -/datum/crafting_recipe/roguetown/sigdry - name = "westleach zig" - result = /obj/item/clothing/mask/cigarette/rollie/nicotine - reqs = list(/obj/item/reagent_containers/food/snacks/produce/dry_westleach = 1, - /obj/item/paper = 1) - time = 10 SECONDS - verbage = "roll" - verbage_tp = "rolls" - craftdiff = 0 - - -//crafting recipes -/datum/crafting_recipe/roguetown/dryleaf - name = "dry swampweed" - result = /obj/item/reagent_containers/food/snacks/produce/swampweed_dried - reqs = list(/obj/item/reagent_containers/food/snacks/produce/swampweed = 1) - structurecraft = /obj/structure/fluff/dryingrack - time = 2 SECONDS - verbage = "dry" - verbage_tp = "dries" - craftsound = null - skillcraft = null - -/datum/crafting_recipe/roguetown/sigsweet - name = "swampweed zig" - result = /obj/item/clothing/mask/cigarette/rollie/cannabis - reqs = list(/obj/item/reagent_containers/food/snacks/produce/swampweed_dried = 1, - /obj/item/paper = 1) - time = 10 SECONDS - verbage = "roll" - verbage_tp = "rolls" - craftdiff = 0 diff --git a/stonekeep.dme b/stonekeep.dme index f41ca1104f..f911af97a5 100644 --- a/stonekeep.dme +++ b/stonekeep.dme @@ -3147,6 +3147,7 @@ #include "code\modules\roguetown\mapgen\forest.dm" #include "code\modules\roguetown\mapgen\mountains.dm" #include "code\modules\roguetown\mapgen\rogueoutdoors.dm" +#include "code\modules\roguetown\roguecrafting\carpentry.dm" #include "code\modules\roguetown\roguecrafting\cooking.dm" #include "code\modules\roguetown\roguecrafting\items.dm" #include "code\modules\roguetown\roguecrafting\leather.dm" From b58423121dc74d044945fc1ab455825fc7ae049a Mon Sep 17 00:00:00 2001 From: La Villa Strangiato Date: Sun, 17 Nov 2024 01:35:30 -0700 Subject: [PATCH 2/3] yammer yammer --- .../roguetown/roguecrafting/carpentry.dm | 36 +++++++++---------- code/modules/roguetown/roguecrafting/turfs.dm | 14 ++++---- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/code/modules/roguetown/roguecrafting/carpentry.dm b/code/modules/roguetown/roguecrafting/carpentry.dm index bffb97881c..edcecac2e2 100644 --- a/code/modules/roguetown/roguecrafting/carpentry.dm +++ b/code/modules/roguetown/roguecrafting/carpentry.dm @@ -46,6 +46,16 @@ /obj/item/cooking/platter) reqs = list(/obj/item/grown/log/tree/small = 1) +/datum/crafting_recipe/roguetown/carpentry/rod + name = "fishing rod" + result = /obj/item/fishingrod/crafted + reqs = list(/obj/item/grown/log/tree/small = 1, + /obj/item/natural/fibers = 2) + craftdiff = 0 + +/obj/item/fishingrod/crafted + sellprice = 8 + /*========= SKILL LEVEL: 1 REQUIRED ==========*/ /datum/crafting_recipe/roguetown/carpentry/woodsword @@ -73,16 +83,6 @@ tools = list(/obj/item/rogueweapon/knife/hunting) craftdiff = 1 -/datum/crafting_recipe/roguetown/carpentry/rod - name = "fishing rod" - result = /obj/item/fishingrod/crafted - reqs = list(/obj/item/grown/log/tree/small = 1, - /obj/item/natural/fibers = 2) - craftdiff = 1 - -/obj/item/fishingrod/crafted - sellprice = 8 - /datum/crafting_recipe/roguetown/woodspade name = "wood spade" result = /obj/item/rogueweapon/shovel/small @@ -93,6 +93,13 @@ /obj/item/rogueweapon/shovel/small/crafted sellprice = 5 +/datum/crafting_recipe/roguetown/carpentry/recurve + name = "recurve bow" + result = list(/obj/item/gun/ballistic/revolver/grenadelauncher/bow/recurve) + reqs = list(/obj/item/grown/log/tree/small = 1, + /obj/item/natural/fibers = 4) + craftdiff = 1 + /*========= SKILL LEVEL: 2 REQUIRED ==========*/ /datum/crafting_recipe/roguetown/carpentry/woodshield @@ -137,13 +144,6 @@ /obj/item/roguegear = 1) craftdiff = 3 -/datum/crafting_recipe/roguetown/carpentry/recurve - name = "recurve bow" - result = list(/obj/item/gun/ballistic/revolver/grenadelauncher/bow/recurve) - reqs = list(/obj/item/grown/log/tree/small = 1, - /obj/item/natural/fibers = 4) - craftdiff = 3 - /datum/crafting_recipe/roguetown/carpentry/longbow name = "longbow" result = list(/obj/item/gun/ballistic/revolver/grenadelauncher/bow/long) @@ -171,7 +171,7 @@ result = list(/obj/item/rogueweapon/thresher) craftdiff = 3 -// Admittedly not too sure why some of these recipes require carpentry skill for steel stuff. You'd have to ask Dromkii. +// These are so these items don't receive the smithing modifiers. /datum/crafting_recipe/roguetown/carpentry/steelstaff name = "steel quarterstaff" diff --git a/code/modules/roguetown/roguecrafting/turfs.dm b/code/modules/roguetown/roguecrafting/turfs.dm index d14bc8f639..9916298dde 100644 --- a/code/modules/roguetown/roguecrafting/turfs.dm +++ b/code/modules/roguetown/roguecrafting/turfs.dm @@ -8,7 +8,7 @@ result = /turf/open/floor/rogue/ruinedwood reqs = list(/obj/item/grown/log/tree/small = 1) skillcraft = /datum/skill/craft/carpentry - craftdiff = 1 + craftdiff = 0 /datum/crafting_recipe/roguetown/turfs/woodfloor/TurfCheck(mob/user, turf/T) if(isclosedturf(T)) @@ -33,7 +33,7 @@ result = /turf/closed/wall/mineral/rogue/wood reqs = list(/obj/item/grown/log/tree/small = 2) skillcraft = /datum/skill/craft/carpentry - craftdiff = 2 + craftdiff = 1 /datum/crafting_recipe/roguetown/turfs/woodwall/TurfCheck(mob/user, turf/T) if(isclosedturf(T)) @@ -47,7 +47,7 @@ result = /turf/closed/wall/mineral/rogue/wood/window reqs = list(/obj/item/grown/log/tree/small = 2) skillcraft = /datum/skill/craft/carpentry - craftdiff = 2 + craftdiff = 1 /datum/crafting_recipe/roguetown/turfs/woodwindow/TurfCheck(mob/user, turf/T) if(isclosedturf(T)) @@ -63,7 +63,7 @@ result = /turf/open/floor/rogue/blocks reqs = list(/obj/item/natural/stone = 1) skillcraft = /datum/skill/craft/masonry - craftdiff = 1 + craftdiff = 0 /datum/crafting_recipe/roguetown/turfs/stonefloor/TurfCheck(mob/user, turf/T) if(isclosedturf(T)) @@ -79,7 +79,7 @@ result = /turf/closed/wall/mineral/rogue/stone reqs = list(/obj/item/natural/stone = 2) skillcraft = /datum/skill/craft/masonry - craftdiff = 2 + craftdiff = 1 /datum/crafting_recipe/roguetown/turfs/stonewall/TurfCheck(mob/user, turf/T) if(isclosedturf(T)) @@ -93,7 +93,7 @@ result = /turf/closed/wall/mineral/rogue/stone/window reqs = list(/obj/item/natural/stone = 2) skillcraft = /datum/skill/craft/masonry - craftdiff = 2 + craftdiff = 1 /datum/crafting_recipe/roguetown/turfs/stonewindow/TurfCheck(mob/user, turf/T) if(isclosedturf(T)) @@ -104,8 +104,6 @@ /*========= CRAFTING SKILL ==========*/ -// Twig floors and tent walls are easier to make than wood and stone walls/floors. - /datum/crafting_recipe/roguetown/turfs/twig name = "twig floor" result = /turf/open/floor/rogue/twig From 87a1b38aaa5b47093c3d5589c9d5bb94a25f848e Mon Sep 17 00:00:00 2001 From: La Villa Strangiato Date: Sun, 17 Nov 2024 02:29:26 -0700 Subject: [PATCH 3/3] unincludes a crafting recipe thing --- stonekeep.dme | 1 - 1 file changed, 1 deletion(-) diff --git a/stonekeep.dme b/stonekeep.dme index f911af97a5..e9791440d1 100644 --- a/stonekeep.dme +++ b/stonekeep.dme @@ -3444,7 +3444,6 @@ #include "modular\Neu_Farming\code\bin.dm" #include "modular\Neu_Farming\code\chaff.dm" #include "modular\Neu_Farming\code\composter.dm" -#include "modular\Neu_Farming\code\crafting_recipes.dm" #include "modular\Neu_Farming\code\fermenting_barrel.dm" #include "modular\Neu_Farming\code\helpers.dm" #include "modular\Neu_Farming\code\plant_def.dm"