From a1f1a01a814b6c0c4af8c02cb9dd0e4a81694540 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Sat, 15 Feb 2020 00:52:19 -0500 Subject: [PATCH] grammer and quiver --- code/datums/components/crafting/guncrafting.dm | 2 +- .../datums/components/crafting/recipes/recipes_primal.dm | 9 +++++++++ .../crafting/recipes/recipes_weapon_and_ammo.dm | 4 ++-- code/game/objects/items/granters.dm | 6 +++--- code/game/objects/items/stacks/sheets/sheet_types.dm | 2 +- code/game/objects/structures/ghost_role_spawners.dm | 1 + code/modules/cargo/exports/weapons.dm | 9 +++++++-- 7 files changed, 24 insertions(+), 9 deletions(-) diff --git a/code/datums/components/crafting/guncrafting.dm b/code/datums/components/crafting/guncrafting.dm index eeaa75ba6b..d421a6e42a 100644 --- a/code/datums/components/crafting/guncrafting.dm +++ b/code/datums/components/crafting/guncrafting.dm @@ -14,7 +14,7 @@ icon = 'icons/obj/improvised.dmi' icon_state = "riflestock" -/obj/item/weaponcrafting/silkstrink +/obj/item/weaponcrafting/silkstring name = "silkstring" desc = "A long pice of silk looks like cable coil." icon = 'icons/obj/improvised.dmi' diff --git a/code/datums/components/crafting/recipes/recipes_primal.dm b/code/datums/components/crafting/recipes/recipes_primal.dm index 696df5cf76..ae611e5855 100644 --- a/code/datums/components/crafting/recipes/recipes_primal.dm +++ b/code/datums/components/crafting/recipes/recipes_primal.dm @@ -91,6 +91,15 @@ result = /obj/structure/headpike/bone category = CAT_PRIMAL +/datum/crafting_recipe/quiver + name = "Quiver" + always_availible = FALSE + result = /obj/item/storage/belt/quiver + time = 80 + reqs = list(/obj/item/stack/sheet/leather = 3, + /obj/item/stack/sheet/sinew = 4) + category = CAT_PRIMAL + /datum/crafting_recipe/bone_bow name = "Bone Bow" result = /obj/item/gun/ballistic/bow/ashen 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 c03f69e16a..76f8f119e0 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/silkstrink = 10) + /obj/item/weaponcrafting/silkstring = 10) time = 450 category = CAT_WEAPONRY subcategory = CAT_WEAPON @@ -293,7 +293,7 @@ result = /obj/item/ammo_casing/caseless/arrow time = 40 reqs = list(/obj/item/stack/sheet/mineral/wood = 1, - /obj/item/weaponcrafting/silkstrink = 1, + /obj/item/weaponcrafting/silkstring = 1, /obj/item/stack/rods = 3) // 1 metal sheet is worth 1.5 arrows category = CAT_WEAPONRY subcategory = CAT_AMMO diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm index 20982893d2..986090212e 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 = "Standstone manual on bows" + 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." - crafting_recipe_types = list(/datum/crafting_recipe/bone_arrow, /datum/crafting_recipe/bone_bow, /datum/crafting_recipe/ashen_arrow, /datum/crafting_recipe/bow_tablet) + 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?", "Braking 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 dedc6cd2e2..64875a4cc3 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -381,7 +381,7 @@ 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/silkstrink, 2, time = 40), \ + new/datum/stack_recipe("silk string", /obj/item/weaponcrafting/silkstring, 2, time = 40), \ )) /obj/item/stack/sheet/silk diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index c11d5f4e97..79afd7695a 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -69,6 +69,7 @@ new_spawn.mind.teach_crafting_recipe(/datum/crafting_recipe/bone_arrow) new_spawn.mind.teach_crafting_recipe(/datum/crafting_recipe/bone_bow) new_spawn.mind.teach_crafting_recipe(/datum/crafting_recipe/ashen_arrow) + new_spawn.mind.teach_crafting_recipe(/datum/crafting_recipe/quiver) new_spawn.mind.teach_crafting_recipe(/datum/crafting_recipe/bow_tablet) if(ishuman(new_spawn)) diff --git a/code/modules/cargo/exports/weapons.dm b/code/modules/cargo/exports/weapons.dm index 9e2bd16e65..c75a1c0bff 100644 --- a/code/modules/cargo/exports/weapons.dm +++ b/code/modules/cargo/exports/weapons.dm @@ -203,12 +203,12 @@ //Bow and Arrows///////// ///////////////////////// -/datum/export/weapon/techslug +/datum/export/weapon/bows cost = 450 unit_name = "bow" export_types = list(/obj/item/gun/ballistic/bow) -/datum/export/weapon/techslug +/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) @@ -218,6 +218,11 @@ unit_name = "stone tablets" export_types = list(/obj/item/book/granter/crafting_recipe/bone_bow) +/datum/export/weapon/quiver + cost = 100 + unit_name = "quiver" + export_types = list(/obj/item/storage/belt/quiver) + ///////////////////////// //The Traitor Sell Outs//