From 192df65db6c3cf495096384e70e28a85d707e509 Mon Sep 17 00:00:00 2001 From: Geeves Date: Sun, 14 Jun 2020 19:18:48 +0200 Subject: [PATCH] Square Shield (#9094) --- .../items/weapons/improvised_components.dm | 10 +++++----- code/game/objects/items/weapons/shields.dm | 13 ++++++++----- html/changelogs/geeves-square_shields.yml | 6 ++++++ icons/obj/square_shield.dmi | Bin 0 -> 906 bytes 4 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 html/changelogs/geeves-square_shields.yml create mode 100644 icons/obj/square_shield.dmi diff --git a/code/game/objects/items/weapons/improvised_components.dm b/code/game/objects/items/weapons/improvised_components.dm index 4150d27e5de..d0231294967 100644 --- a/code/game/objects/items/weapons/improvised_components.dm +++ b/code/game/objects/items/weapons/improvised_components.dm @@ -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, "You attach \the [I] to \the [src].") + 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" diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 6f469d319cf..1f5374443bb 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -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) diff --git a/html/changelogs/geeves-square_shields.yml b/html/changelogs/geeves-square_shields.yml new file mode 100644 index 00000000000..458b134f18f --- /dev/null +++ b/html/changelogs/geeves-square_shields.yml @@ -0,0 +1,6 @@ +author: Geeves, Sprites by Kyres + +delete-after: True + +changes: + - imageadd: "Replaced the circular buckler sprite with a more rectangular variant. Also renamed it to selfmade shield." \ No newline at end of file diff --git a/icons/obj/square_shield.dmi b/icons/obj/square_shield.dmi new file mode 100644 index 0000000000000000000000000000000000000000..32727574c5d2b94e7fba8c664d0e6e425849f567 GIT binary patch literal 906 zcmV;519kj~P)fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TB zGg33tGfE(w;*!LYR3KBSxUe*_C^bH*G&wsbwMdDJGbOXA7${-L#hF%=n41b=<4_)7 zl!4G;LX?gil652{64sHCnVORlpO#rtl9`ttpI=%+j8{-KW#;AK)}*Z9>gNIuUjTxD zZoBCG5k&w10&ht~K~!jg?U}KXn=lZD!S=Zh&I{Or2XHLAXMm)>8BWw!1d=k9oif!u zca-CRmHZ2VNQxx-n`3=&JKj3r2R94h z`-Om2%#wni3l^W;<{$w%7bVY@0E7_bGC))JfasUdiy>WS@`eOls@sb=y#aPIo(K3% zi~tfdfEB!8&}+6Io}YBUwFe|z@C*z;24@2JtN@f4B$uW{fJX)Jl&S!-3UT$lKEWxJ z)WHx0JrCmQHU%&|>zQbpLZD7zc$9!vwjizzLDYXtre(~}hGh&R{-!q5Oo=2v#);Gy zltY`Irc{=n;#6K<(!9L9y#6VH8X87j5yhJYbr9$yA?wQc4)=Pcuz$S&_bTZc2}?16 zw3gr#0OXglZDq+(ZViA)bK4*Xc~$p-N9bU1mLUh1uh+Jn$8fm1Lx6xUHo$&(woL(Q zdJwrah?Zq6cxrQCNhG#M0A+^&03?-h-*-MCd3kyL*NP%jRhg(AQ_ef#Y?iF6^u)E< z8{afYo&-yB=G%Z)GhQL(S+u5r=lfUiQMHpiPQQ?IZvh;D)}jDz1h7ef1JK-5z?C=v z0JK9O(qnKx1++t;0BsfS9iSZok)8*$gQ#U9N~CcI+HV1+^0rcqv zH#pxnbfpsBH#E<7z$)zlISq_T3~Fk6c+@AUhI`O@wi gTrBwehQCZd0r3o-F92Em`~Uy|07*qoM6N<$f_;gQrvLx| literal 0 HcmV?d00001