From accc4ce776941caa247fbfda9734e1279899d862 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Sat, 22 Feb 2020 15:33:07 -0600 Subject: [PATCH] grammar shit, silkstring buff, arrow costs, yikes --- code/datums/components/crafting/guncrafting.dm | 4 ++-- .../crafting/recipes/recipes_weapon_and_ammo.dm | 14 +++++++++----- .../objects/items/stacks/sheets/sheet_types.dm | 4 ++-- .../projectiles/ammunition/caseless/arrow.dm | 6 +++--- 4 files changed, 16 insertions(+), 12 deletions(-) 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..99487b53fd 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,9 +291,9 @@ /datum/crafting_recipe/arrow name = "Arrow" result = /obj/item/ammo_casing/caseless/arrow - time = 40 + time = 20 reqs = list(/obj/item/stack/sheet/mineral/wood = 1, - /obj/item/weaponcrafting/silkstring = 1, + /obj/item/stack/sheet/cloth = 1, /obj/item/stack/rods = 3) // 1 metal sheet is worth 1.5 arrows category = CAT_WEAPONRY subcategory = CAT_AMMO @@ -301,7 +301,7 @@ /datum/crafting_recipe/bone_arrow name = "Bone Arrow" result = /obj/item/ammo_casing/caseless/arrow/bone - time = 40 + time = 20 always_availible = FALSE reqs = list(/obj/item/stack/sheet/bone = 1, /obj/item/stack/sheet/sinew = 1, @@ -310,7 +310,7 @@ 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 @@ -319,6 +319,10 @@ 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/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