From 6dcadd97c030a4141a304bb76ff699512ab4c628 Mon Sep 17 00:00:00 2001 From: TheDavestDave <30513964+TheDavestDave@users.noreply.github.com> Date: Thu, 17 Feb 2022 15:14:18 +0000 Subject: [PATCH 1/5] primative-shields a primitive shield, perfect for the next knights at castle mystic event. it's much less cool, there's no metal ones. but it's literally the only low tech shield in our code right. No really all other shields are made of plastic like the riot shield, or energy like halo jackles. anyway it has 10 lower block chance than the explo shield and 20 less than riot. It's planks off wood and a bucket tied together --- code/datums/components/crafting/recipes/weapons.dm | 8 ++++++++ code/game/objects/items/weapons/shields_vr.dm | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/code/datums/components/crafting/recipes/weapons.dm b/code/datums/components/crafting/recipes/weapons.dm index 6baa4b5e9bf..0470d80a227 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 =1), list(/obj/item/weapon/handcuffs/cable = 2)) + 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 514ecd15c92..d342779e8d5 100644 --- a/code/game/objects/items/weapons/shields_vr.dm +++ b/code/game/objects/items/weapons/shields_vr.dm @@ -92,3 +92,10 @@ 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" + base_block_chance = 30 From 70c93bcaf0f41b59d3309c35e2ca650f7f01c37d Mon Sep 17 00:00:00 2001 From: TheDavestDave <30513964+TheDavestDave@users.noreply.github.com> Date: Thu, 17 Feb 2022 15:28:28 +0000 Subject: [PATCH 2/5] I forgot the lorge again --- code/game/objects/items/weapons/shields_vr.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/weapons/shields_vr.dm b/code/game/objects/items/weapons/shields_vr.dm index d342779e8d5..a311a740891 100644 --- a/code/game/objects/items/weapons/shields_vr.dm +++ b/code/game/objects/items/weapons/shields_vr.dm @@ -98,4 +98,5 @@ 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 From 055f4699d183ef5f9b1f4fed3f69a5cb6e98b4c2 Mon Sep 17 00:00:00 2001 From: TheDavestDave <30513964+TheDavestDave@users.noreply.github.com> Date: Sat, 19 Feb 2022 02:09:06 +0000 Subject: [PATCH 3/5] lower tech shield requested changes by soft. Uses a wooden bucket instead of a metal one, and cloth instead of cable coils. --- code/datums/components/crafting/recipes/weapons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/crafting/recipes/weapons.dm b/code/datums/components/crafting/recipes/weapons.dm index 0470d80a227..402093ca704 100644 --- a/code/datums/components/crafting/recipes/weapons.dm +++ b/code/datums/components/crafting/recipes/weapons.dm @@ -52,7 +52,7 @@ /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 =1), list(/obj/item/weapon/handcuffs/cable = 2)) + 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 From 08d03040392f929e08646de29f179b2eb96bb98a Mon Sep 17 00:00:00 2001 From: TheDavestDave <30513964+TheDavestDave@users.noreply.github.com> Date: Sat, 19 Feb 2022 02:18:35 +0000 Subject: [PATCH 4/5] updoot macth with updoot --- code/datums/components/crafting/recipes/weapons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/crafting/recipes/weapons.dm b/code/datums/components/crafting/recipes/weapons.dm index 402093ca704..2f1cb9dc714 100644 --- a/code/datums/components/crafting/recipes/weapons.dm +++ b/code/datums/components/crafting/recipes/weapons.dm @@ -55,4 +55,4 @@ 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 + subcategory = CAT_WEAPON \ No newline at end of file From c2c4ffb85dd14dea2c59507e4f997bf85512be2a Mon Sep 17 00:00:00 2001 From: TheDavestDave <30513964+TheDavestDave@users.noreply.github.com> Date: Sat, 19 Feb 2022 02:20:52 +0000 Subject: [PATCH 5/5] unwanted ) bannished to the shadow realm --- code/datums/components/crafting/recipes/weapons.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/components/crafting/recipes/weapons.dm b/code/datums/components/crafting/recipes/weapons.dm index 2f1cb9dc714..b8fe974e056 100644 --- a/code/datums/components/crafting/recipes/weapons.dm +++ b/code/datums/components/crafting/recipes/weapons.dm @@ -52,7 +52,7 @@ /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))) + 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 \ No newline at end of file + subcategory = CAT_WEAPON