diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index 13dd939ad7..dcfdc3408c 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -2034,6 +2034,13 @@ /obj/structure/stone_tile, /turf/open/indestructible/boss, /area/ruin/unpowered/ash_walkers) +"DQ" = ( +/obj/structure/stone_tile{ + dir = 4 + }, +/obj/item/book/granter/crafting_recipe/bone_bow, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "Ef" = ( /obj/structure/stone_tile/block/cracked, /turf/open/lava/smooth{ @@ -2401,6 +2408,7 @@ }, /obj/structure/table/wood, /obj/item/kitchen/knife/combat/bone, +/obj/item/book/granter/crafting_recipe/bone_bow, /turf/open/indestructible/boss, /area/ruin/unpowered/ash_walkers) "TN" = ( @@ -2507,6 +2515,11 @@ /obj/structure/stone_tile/surrounding_tile/cracked, /turf/closed/mineral/volcanic/lava_land_surface, /area/ruin/unpowered/ash_walkers) +"WA" = ( +/obj/structure/stone_tile/block/cracked, +/obj/item/book/granter/crafting_recipe/bone_bow, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "WL" = ( /obj/structure/stone_tile{ dir = 4 @@ -57415,7 +57428,7 @@ Ds Ds KV nI -Ad +DQ Si aa ab @@ -57915,7 +57928,7 @@ aa aa Rk Si -sR +WA rz qh pq diff --git a/code/datums/components/crafting/guncrafting.dm b/code/datums/components/crafting/guncrafting.dm index d421a6e42a..89868c2332 100644 --- a/code/datums/components/crafting/guncrafting.dm +++ b/code/datums/components/crafting/guncrafting.dm @@ -16,6 +16,6 @@ /obj/item/weaponcrafting/silkstring name = "silkstring" - desc = "A long pice of silk looks like cable coil." + desc = "A long piece of silk with some resemblance to cable coil." icon = 'icons/obj/improvised.dmi' - icon_state = "silkstring" \ No newline at end of file + icon_state = "silkstring" diff --git a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm index 76f8f119e0..c132d8106d 100644 --- a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm +++ b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm @@ -204,7 +204,7 @@ result = /obj/item/gun/ballistic/bow/pipe reqs = list(/obj/item/pipe = 5, /obj/item/stack/sheet/plastic = 15, - /obj/item/weaponcrafting/silkstring = 10) + /obj/item/weaponcrafting/silkstring = 5) time = 450 category = CAT_WEAPONRY subcategory = CAT_WEAPON @@ -291,17 +291,17 @@ /datum/crafting_recipe/arrow name = "Arrow" result = /obj/item/ammo_casing/caseless/arrow - time = 40 + time = 30 reqs = list(/obj/item/stack/sheet/mineral/wood = 1, - /obj/item/weaponcrafting/silkstring = 1, - /obj/item/stack/rods = 3) // 1 metal sheet is worth 1.5 arrows + /obj/item/stack/sheet/silk = 1, + /obj/item/stack/rods = 1) // 1 metal sheet = 2 rods = 2 arrows category = CAT_WEAPONRY subcategory = CAT_AMMO /datum/crafting_recipe/bone_arrow name = "Bone Arrow" result = /obj/item/ammo_casing/caseless/arrow/bone - time = 40 + time = 30 always_availible = FALSE reqs = list(/obj/item/stack/sheet/bone = 1, /obj/item/stack/sheet/sinew = 1, @@ -310,15 +310,19 @@ subcategory = CAT_AMMO /datum/crafting_recipe/ashen_arrow - name = "Harden Arrow" + name = "Bonfire-Hardened Arrow" result = /obj/item/ammo_casing/caseless/arrow/ashen tools = list(/obj/structure/bonfire) - time = 20 + time = 30 always_availible = FALSE reqs = list(/obj/item/ammo_casing/caseless/arrow = 1) category = CAT_WEAPONRY subcategory = CAT_AMMO +/datum/crafting_recipe/ashen_arrow/welder + name = "Welder-Hardened Arrow" + tools = list(TOOL_WELDER) + /datum/crafting_recipe/smartdart name = "Medical smartdart" result = /obj/item/reagent_containers/syringe/dart diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm index 986090212e..24fc1043d8 100644 --- a/code/game/objects/items/granters.dm +++ b/code/game/objects/items/granters.dm @@ -491,12 +491,12 @@ remarks = list("Looks like these would sell much better in a plasma fire...", "Using glass bowls rather then cones?", "Mixing soda and ice-cream?", "Tall glasses with of liquids and solids...", "Just add a bit of icecream and cherry on top?") /obj/item/book/granter/crafting_recipe/bone_bow //Bow crafting for non-ashwalkers - name = "Sandstone manual on bows" - desc = "A standstone slab with everything you need to know for making bows and arrows just like an ashwalker would." + name = "bowyery sandstone slab" // this is an actual word + desc = "A sandstone slab with inscriptions describing the Ash Walkers of Lavaland's bowyery." crafting_recipe_types = list(/datum/crafting_recipe/bone_arrow, /datum/crafting_recipe/bone_bow, /datum/crafting_recipe/ashen_arrow, /datum/crafting_recipe/quiver, /datum/crafting_recipe/bow_tablet) icon_state = "stone_tablet" oneuse = FALSE - remarks = list("Sticking burning arrows into the sand makes them stronger?", "Breaking the bone apart to get shards, not sharpening the bone.", "Sinew is just like rope?") + remarks = list("Sticking burning arrows into the sand makes them stronger...", "Breaking the bone apart to get shards, not sharpening the bone...", "Sinew is just like rope...") /obj/item/book/granter/crafting_recipe/under_the_oven //Illegal cook book name = "Under The Oven" diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 0e50ef2fb9..0eefb88417 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -381,12 +381,12 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ new/datum/stack_recipe("white jumpsuit", /obj/item/clothing/under/color/white, 4, time = 40), \ new/datum/stack_recipe("white gloves", /obj/item/clothing/gloves/color/white, 2, time = 40), \ null, \ - new/datum/stack_recipe("silk string", /obj/item/weaponcrafting/silkstring, 2, time = 40), \ + new/datum/stack_recipe("silk string", /obj/item/weaponcrafting/silkstring, 1, time = 40), \ )) /obj/item/stack/sheet/silk name = "silk" - desc = "A long soft material. This one is just made out of cotton rather then any spiders or wyrms" + desc = "A long, soft material. Made out of refined cotton, instead of relying on the habits of spiders or silkworms." singular_name = "silk sheet" icon_state = "sheet-silk" item_state = "sheet-cloth" diff --git a/code/modules/projectiles/ammunition/caseless/arrow.dm b/code/modules/projectiles/ammunition/caseless/arrow.dm index df4941aa6a..0543e48f96 100644 --- a/code/modules/projectiles/ammunition/caseless/arrow.dm +++ b/code/modules/projectiles/ammunition/caseless/arrow.dm @@ -9,18 +9,18 @@ /obj/item/ammo_casing/caseless/arrow/ashen name = "ashen arrow" - desc = "Fire harderned wooden arrow." + desc = "An arrow made of wood, hardened by fire." icon_state = "ashenarrow" projectile_type = /obj/item/projectile/bullet/reusable/arrow/ashen /obj/item/ammo_casing/caseless/arrow/bone name = "bone arrow" - desc = "Arrow made of bone and sinew. The tip is sharp enough to pierce into a goliath plate." + desc = "An arrow made of bone and sinew. The tip is sharp enough to pierce through a goliath plate." icon_state = "bonearrow" projectile_type = /obj/item/projectile/bullet/reusable/arrow/bone /obj/item/ammo_casing/caseless/arrow/bronze name = "bronze arrow" - desc = "Bronze tipped arrow." + desc = "An arrow made of wood, tipped with bronze. The tip is dense enough to provide some armor penetration." icon_state = "bronzearrow" projectile_type = /obj/item/projectile/bullet/reusable/arrow/bronze diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index 58e427a3fb..f859e8b1e7 100644 Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ