From 1e10a042bed78ea46026f1e456252bbdb51af829 Mon Sep 17 00:00:00 2001 From: Hatterhat <31829017+Hatterhat@users.noreply.github.com> Date: Wed, 18 Mar 2020 13:34:14 -0500 Subject: [PATCH] arrow craft nitpicking (alt title: "why are subtypes like this") (#11516) * subtypes (tm) * ok fine jeez Co-authored-by: Hatterhat --- .../crafting/recipes/recipes_weapon_and_ammo.dm | 8 ++++---- code/modules/cargo/exports/weapons.dm | 2 +- .../modules/projectiles/ammunition/caseless/arrow.dm | 12 ++++++++---- .../modules/projectiles/projectile/reusable/arrow.dm | 6 +++--- 4 files changed, 16 insertions(+), 12 deletions(-) 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 0c41fb3e52..aa3f2d3969 100644 --- a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm +++ b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm @@ -278,7 +278,7 @@ /datum/crafting_recipe/arrow name = "Arrow" - result = /obj/item/ammo_casing/caseless/arrow + result = /obj/item/ammo_casing/caseless/arrow/wood time = 30 reqs = list(/obj/item/stack/sheet/mineral/wood = 1, /obj/item/stack/sheet/silk = 1, @@ -293,17 +293,17 @@ always_availible = FALSE reqs = list(/obj/item/stack/sheet/bone = 1, /obj/item/stack/sheet/sinew = 1, - /obj/item/ammo_casing/caseless/arrow/ashen = 1) + /obj/item/ammo_casing/caseless/arrow/ash = 1) category = CAT_WEAPONRY subcategory = CAT_AMMO /datum/crafting_recipe/ashen_arrow name = "Fire Hardened Arrow" - result = /obj/item/ammo_casing/caseless/arrow/ashen + result = /obj/item/ammo_casing/caseless/arrow/ash tools = list(TOOL_WELDER) time = 30 always_availible = FALSE - reqs = list(/obj/item/ammo_casing/caseless/arrow = 1) + reqs = list(/obj/item/ammo_casing/caseless/arrow/wood = 1) category = CAT_WEAPONRY subcategory = CAT_AMMO diff --git a/code/modules/cargo/exports/weapons.dm b/code/modules/cargo/exports/weapons.dm index c75a1c0bff..836dc044b7 100644 --- a/code/modules/cargo/exports/weapons.dm +++ b/code/modules/cargo/exports/weapons.dm @@ -211,7 +211,7 @@ /datum/export/weapon/arrows cost = 150 unit_name = "arrow" - export_types = list(/obj/item/ammo_casing/caseless/arrow, /obj/item/ammo_casing/caseless/arrow/bone, /obj/item/ammo_casing/caseless/arrow/ashen) + export_types = list(/obj/item/ammo_casing/caseless/arrow, /obj/item/ammo_casing/caseless/arrow/bone, /obj/item/ammo_casing/caseless/arrow/ash) /datum/export/weapon/bow_teaching cost = 500 diff --git a/code/modules/projectiles/ammunition/caseless/arrow.dm b/code/modules/projectiles/ammunition/caseless/arrow.dm index 0543e48f96..08f6ba8c70 100644 --- a/code/modules/projectiles/ammunition/caseless/arrow.dm +++ b/code/modules/projectiles/ammunition/caseless/arrow.dm @@ -1,17 +1,21 @@ /obj/item/ammo_casing/caseless/arrow - name = "wooden arrow" - desc = "An arrow made of wood, typically fired from a bow." + name = "arrow of questionable material" + desc = "You shouldn't be seeing this arrow." projectile_type = /obj/item/projectile/bullet/reusable/arrow caliber = "arrow" icon_state = "arrow" throwforce = 3 //good luck hitting someone with the pointy end of the arrow throw_speed = 3 -/obj/item/ammo_casing/caseless/arrow/ashen +/obj/item/ammo_casing/caseless/arrow/wood + name = "wooden arrow" + desc = "An arrow made of wood, typically fired from a bow." + +/obj/item/ammo_casing/caseless/arrow/ash name = "ashen arrow" desc = "An arrow made of wood, hardened by fire." icon_state = "ashenarrow" - projectile_type = /obj/item/projectile/bullet/reusable/arrow/ashen + projectile_type = /obj/item/projectile/bullet/reusable/arrow/ash /obj/item/ammo_casing/caseless/arrow/bone name = "bone arrow" diff --git a/code/modules/projectiles/projectile/reusable/arrow.dm b/code/modules/projectiles/projectile/reusable/arrow.dm index d00de79eb1..7c1a06f72c 100644 --- a/code/modules/projectiles/projectile/reusable/arrow.dm +++ b/code/modules/projectiles/projectile/reusable/arrow.dm @@ -3,13 +3,13 @@ desc = "Woosh!" damage = 15 icon_state = "arrow" - ammo_type = /obj/item/ammo_casing/caseless/arrow + ammo_type = /obj/item/ammo_casing/caseless/arrow/wood -/obj/item/projectile/bullet/reusable/arrow/ashen +/obj/item/projectile/bullet/reusable/arrow/ash name = "ashen arrow" desc = "Fire harderned arrow." damage = 25 - ammo_type = /obj/item/ammo_casing/caseless/arrow/ashen + ammo_type = /obj/item/ammo_casing/caseless/arrow/ash /obj/item/projectile/bullet/reusable/arrow/bone //AP for ashwalkers name = "bone arrow"