cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 21:12:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Square Shield (#9094)

Browse Source
This commit is contained in:
Geeves
2020-06-14 14:18:48 -03:00
committed by GitHub
parent 29986f05e1
commit 192df65db6
4 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/improvised_components.dm
+5 -5
View File
@@ -118,8 +118,8 @@
/obj/item/material/woodenshield
name = "shield donut"
desc = "A wooden disc. Unusable as a shield without metal. Don't eat this."
icon = 'icons/obj/weapons.dmi'
icon_state = "buckler2"
icon = 'icons/obj/square_shield.dmi'
icon_state = "shield_fitting_inner"
force_divisor = 0.1
thrown_force_divisor = 0.1
default_material = "wood"
@@ -130,7 +130,7 @@
if(istype(I, /obj/item/material/shieldbits))
var/obj/item/material/woodenshield/donut = I
finished = new /obj/item/shield/buckler(get_turf(user), donut.material.name)
to_chat(user, "<span class='notice'>You attach \the [I] to \the [src].</span>")
to_chat(user, SPAN_NOTICE("You attach \the [I] to \the [src]."))
if(finished)
user.drop_from_inventory(src)
user.drop_from_inventory(I)
@@ -142,8 +142,8 @@
/obj/item/material/shieldbits
name = "shield fittings"
desc = "A metal ring and boss, fitting for a buckler."
icon = 'icons/obj/weapons.dmi'
icon_state = "buckler1"
icon = 'icons/obj/square_shield.dmi'
icon_state = "shield_fitting_outer"
force_divisor = 0.1
thrown_force_divisor = 0.1
default_material = "steel"
code/game/objects/items/weapons/shields.dm
+8 -5
View File
@@ -92,18 +92,21 @@
..()
/obj/item/shield/buckler
name = "buckler"
desc = "A wooden buckler used to block sharp things from entering your body back in the day."
icon_state = "buckler"
name = "selfmade shield"
desc = "A sturdy buckler used to block sharp things from entering your body back in the day."
icon = 'icons/obj/square_shield.dmi'
icon_state = "square_buckler"
item_state = "square_buckler"
contained_sprite = TRUE
slot_flags = SLOT_BACK
force = 8
throwforce = 8
base_block_chance = 60
throw_speed = 10
throw_range = 20
w_class = 4.0
w_class = ITEMSIZE_LARGE
origin_tech = list(TECH_MATERIAL = 1)
matter = list(DEFAULT_WALL_MATERIAL = 1000, "Wood" = 1000)
matter = list(DEFAULT_WALL_MATERIAL = 1000, MATERIAL_WOOD = 1000)
attack_verb = list("shoved", "bashed")
/obj/item/shield/buckler/handle_shield(mob/user)