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 610dfa56bc1..6f769ce6a9e 100644 Binary files a/icons/obj/clothing/material_armor.dmi and b/icons/obj/clothing/material_armor.dmi differ