From a97cf8ab50361eb669d7a0d8a66a07f62bb78568 Mon Sep 17 00:00:00 2001 From: Ezuo Date: Sat, 3 Mar 2018 08:38:17 +1000 Subject: [PATCH] Adds in Ned Kelly armor (again) (#4330) Exactly like the last PR regarding this shit, but this time it isn't broken after path changes and failed rebases. --- .../items/weapons/material/material_armor.dm | 22 ++++++++++- html/changelogs/ezuo-NK armor.yml | 37 ++++++++++++++++++ icons/obj/clothing/material_armor.dmi | Bin 1538 -> 2673 bytes 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/ezuo-NK armor.yml diff --git a/code/game/objects/items/weapons/material/material_armor.dm b/code/game/objects/items/weapons/material/material_armor.dm index 96110f8e645..427df6b9aad 100644 --- a/code/game/objects/items/weapons/material/material_armor.dm +++ b/code/game/objects/items/weapons/material/material_armor.dm @@ -130,4 +130,24 @@ Protectiveness | Armor % contained_sprite = 1 /obj/item/clothing/head/helmet/material/makeshift/plasteel - default_material = "plasteel" \ No newline at end of file + default_material = "plasteel" + +/obj/item/clothing/suit/armor/material/makeshift/trenchcoat + name = "armored trenchcoat" + desc = "A trenchcoat that has had some armor plating hastily attached to it." + applies_material_color = FALSE + pocket_slots = 2 + icon_state = "material_kelly" + item_state = "material_kelly" + +/obj/item/clothing/suit/armor/material/makeshift/attackby(var/obj/O, mob/user) + if(istype(O, /obj/item/clothing/suit/storage/toggle/trench)) + var/obj/item/clothing/suit/storage/toggle/trench/kelly = O + user.drop_from_inventory(src) + user.drop_from_inventory(kelly) + var/obj/item/clothing/suit/armor/material/makeshift/trenchcoat/new_armor = new(null, src.material.name) + user.put_in_hands(new_armor) + qdel(src) + qdel(kelly) + else + ..() \ No newline at end of file diff --git a/html/changelogs/ezuo-NK armor.yml b/html/changelogs/ezuo-NK armor.yml new file mode 100644 index 00000000000..768ed650813 --- /dev/null +++ b/html/changelogs/ezuo-NK armor.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: Ezuo + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "You can now make Ned Kelly style armor by using an ordinary trenchcoat on makeshift armor. Be protected and stylish at the same time!" \ No newline at end of file diff --git a/icons/obj/clothing/material_armor.dmi b/icons/obj/clothing/material_armor.dmi index 610dfa56bc1ee035eaf6bb254ed2a009ec0b10cf..6f769ce6a9e4e60559a8c3a3ee959b24841f43b4 100644 GIT binary patch delta 2493 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 delta 1336 zcmV-81;_gF6oL#piBL{Q4GJ0x0000DNk~Le0001>0001h2m=5B0K2`CDF6Tfa!^cE zMZmzonE(J$QBhj}09#vIydfcxN*fO;DJe`$Oj%i3W@ct`a&nPnHWeoBB(MMg00DGT zPE!Ct=GbNc005tp3IUXV#bdCtf~%hkIC=n^Q+}3v`iyJ<00fgsL_t(|ob8v3cAGE^ zh6yWdGuh}RO?nBwB<}ma;v@q}mRK^yXTv?m|4vEQUx*J`GNdT7vXart^IJ+$Jn*>~=7(mu<&S4awxC;F|AXJD2ZXDo z!qfq)N;m*PYy=^HUyLI_Pw^?@Hu(*p=OVEc6vJ&W73}X#+*a`a0Zv(B4jsxry zuj2p-x`8nO*rI5_tIt`0EZ;y#0=D-L506hIp;-5dtRT0`*+0cS+ zis>eFr^oSs1Spc@zifIAd_4S4lA3y|d-2uZ-*X1jfPCJ8s& zUXc~#mYA>LZsPz+!p$(HBtXcI9TF%YtT0`|*I}P~o#_wT9KF#6{M~M|d)aPx&r}<} zUVVPn4|$;g`*+0cS+is>eFr^oRH&S%YjMqZdHDT=qZx0zfQ5M+us z{^lotRB&101iKz&_Ua{trE`E-$faStO1*-``{`NyzBCG<_p8tJ^uC9~K3zW0e!pKD zAuB5@D=RCDR)>o9nShWVQYV#Cl1|WpsTAW&DLbvn0Q4|qHlLE(Xh{-u20TTV04}bK zG$aA|U@M03a5zAEI8uN|YweK+gxr#;0KhAMqs`GC{XQ6A<2{me%B`U!7`s04k**Ln z08?SOw$cRMz^D}kcz^=yVGZFjorkcy`n>TqWKeVyc0ey#J|Kkh_?O^-4Wc?@O^0nJ zeSo;au*S?1Yt2j%Tp8{kl8{Smj}SlsVuKhfm9z$j(Fch6wW5arrch(`=^HSxK;#&I z!|AYs#@{0c*C19)By_{*?ZUWyuJK-I#3(N%Xu-~Cdz8Ru-7uyF zh5_iC(l{o1i^20j9rJ*i`vupbY75pldHK_rb z9#26V;y-Ou1H=smi>LbvYHd>kH29E5aurm#*~4bIG}GU5gsy_hjqyiX1uSq(U`q5* uL70)$_&_it1|TicC5V@mm6es1rv3nAMV!g9T8eW30000