From 1deafc7103acda61ff9afb5d04d98d97345c5188 Mon Sep 17 00:00:00 2001 From: lolman360 Date: Sun, 23 Aug 2020 17:01:32 +1000 Subject: [PATCH] its asking me to commit hold on --- code/datums/components/crafting/recipes/recipes_clothing.dm | 2 +- code/game/objects/items/storage/belt.dm | 4 ++-- code/modules/smithing/finished_items.dm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/datums/components/crafting/recipes/recipes_clothing.dm b/code/datums/components/crafting/recipes/recipes_clothing.dm index 8c02d96dec..31a90362be 100644 --- a/code/datums/components/crafting/recipes/recipes_clothing.dm +++ b/code/datums/components/crafting/recipes/recipes_clothing.dm @@ -266,7 +266,7 @@ /datum/crafting_recipe/twinsheath name = "Twin Sword Sheath" result = /obj/item/storage/belt/sabre/twin - reqs = list(/obj/item/stack/sheet/wood = 3, + reqs = list(/obj/item/stack/sheet/mineral/wood = 3, /obj/item/stack/sheet/leather = 8) tools = list(TOOL_WIRECUTTER) time = 70 diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 76f87adc6a..024e0495a8 100755 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -820,9 +820,9 @@ name = "twin sheath" desc = "Two sheaths. One is capable of holding a katana (or bokken) and the other a wakizashi. You could put two wakizashis in if you really wanted to. Now you can really roleplay as a samurai." icon_state = "twinsheath" - item_state = "quiver" //this'll do. + item_state = "quiver" //this'll do. w_class = WEIGHT_CLASS_BULKY - var/list/fitting_swords = list(/obj/item/melee/smith/wakizashi, /obj/item/melee/smith/twohand/katana, /obj/item/melee/bokken) + fitting_swords = list(/obj/item/melee/smith/wakizashi, /obj/item/melee/smith/twohand/katana, /obj/item/melee/bokken) starting_sword = null /obj/item/storage/belt/sabre/twin/ComponentInitialize() diff --git a/code/modules/smithing/finished_items.dm b/code/modules/smithing/finished_items.dm index 8f0bb99036..0ae833394f 100644 --- a/code/modules/smithing/finished_items.dm +++ b/code/modules/smithing/finished_items.dm @@ -286,7 +286,7 @@ if(!is_servant_of_ratvar(user)) user.DefaultCombatKnockdown(100) user.dropItemToGround(src, TRUE) - user.visible_message("A powerful force shoves [user] away from [target]!", "\""You shouldn't be touching tools that aren't yours.\"") + user.visible_message("A powerful force shoves [user] away from [target]!", "\"You shouldn't be touching tools that aren't yours.\"") if(ishuman(user)) var/mob/living/carbon/human/H = user H.apply_damage(rand(force/2, force), BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))