From 7ad39bffcb98429a90c3c5b8ecc7e571044a4c71 Mon Sep 17 00:00:00 2001 From: Casey Date: Fri, 18 Feb 2022 23:02:17 -0500 Subject: [PATCH 1/2] Merge pull request #12262 from TheDavestDave/primative-shield-2 primative-shields --- code/datums/components/crafting/recipes/weapons.dm | 8 ++++++++ code/game/objects/items/weapons/shields_vr.dm | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/code/datums/components/crafting/recipes/weapons.dm b/code/datums/components/crafting/recipes/weapons.dm index 6baa4b5e9b..b8fe974e05 100644 --- a/code/datums/components/crafting/recipes/weapons.dm +++ b/code/datums/components/crafting/recipes/weapons.dm @@ -48,3 +48,11 @@ time = 40 category = CAT_WEAPONRY subcategory = CAT_AMMO + +/datum/crafting_recipe/primitive_shield + name = "Primitive Shield" + result = /obj/item/weapon/shield/primitive + reqs = list(list(/obj/item/stack/material/wood = 2), list(/obj/item/weapon/reagent_containers/glass/bucket/wood =1), list(/obj/item/stack/material/cloth = 5)) + time = 120 + category = CAT_WEAPONRY + subcategory = CAT_WEAPON diff --git a/code/game/objects/items/weapons/shields_vr.dm b/code/game/objects/items/weapons/shields_vr.dm index 514ecd15c9..a311a74089 100644 --- a/code/game/objects/items/weapons/shields_vr.dm +++ b/code/game/objects/items/weapons/shields_vr.dm @@ -92,3 +92,11 @@ icon_state = "explorer_shield_P_lighted" else icon_state = "explorer_shield_P" + +/obj/item/weapon/shield/primitive + name = "primitive shield" + desc = "A defensive object that is little more than planks strapped your arm" + icon = 'icons/obj/weapons.dmi' + icon_state = "buckler" + w_class = ITEMSIZE_LARGE + base_block_chance = 30