From 9bdd1c81b72237a88dccabff215ca2c483539e08 Mon Sep 17 00:00:00 2001
From: Alberyk <Alberyk@users.noreply.github.com>
Date: Sun, 14 May 2017 14:39:30 -0300
Subject: [PATCH] Custom Items 14/05 (#2266)

Adds the following items:

-Null Staff - Kesaos Azaroz - paradoxspace
---
 code/modules/customitems/item_defines.dm |  13 ++++++++++++-
 icons/obj/custom_items/azaroz_staff.dmi  | Bin 0 -> 1069 bytes
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 icons/obj/custom_items/azaroz_staff.dmi

diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 222a4d7f77e..6f96654a789 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -850,7 +850,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 
 
 /obj/item/clothing/head/beret/engineering/fluff/ikrad_beret //LR-31MTA Beret - Ikrad Yam'hir - houseofsynth
-	name = "LR-31MTA beret"
+	name = "\improper LR-31MTA beret"
 	desc = "A silver beret with an insignia on the front, it looks like an old Tajaran cannon with a ring around it. \
 	Along the top half of the ring \"LR-31MTA\" is engraved. The word \"Yam'hir\" is engraved along the bottom half of the ring. \
 	The beret looks old and is worn in some places around the edges. It appears to have a flap inside, \
@@ -1027,3 +1027,14 @@ All custom items with worn sprites must follow the contained sprite system: http
 	icon_state = "leo_coat"
 	item_state = "leo_coat"
 	contained_sprite = 1
+
+
+/obj/item/weapon/nullrod/fluff/azaroz_staff //Null Staff - Kesaos Azaroz - paradoxspace
+	name = "null staff"
+	desc = "A long, heavy staff seemingly hand-crafted of obsidian and steel. Pure volcanic crystals lie at its end, giving it an appearance similar to a mace."
+	icon = 'icons/obj/custom_items/azaroz_staff.dmi'
+	icon_state = "azaroz_staff"
+	item_state = "azaroz_staff"
+	contained_sprite = 1
+	slot_flags = SLOT_BACK
+	w_class = 4
diff --git a/icons/obj/custom_items/azaroz_staff.dmi b/icons/obj/custom_items/azaroz_staff.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..525a92af09512daae4dfab2a980a8e2e85eae3ed
GIT binary patch
literal 1069
zcmV+|1k(G7P)<h;3K|Lk000e1NJLTq004jh004jl0{{R3F%W$C0000OP)t-s|A7C0
zD=Q`@CXPfbIXO8mFE1h@BL9H@`O$Mh00001bW%=J06^y0W&i*HfqGO}bVOxyV{&P5
zbZKvH004NLQ&w<tb@%jBaPjrzDoZUY&dkqKuvIY8GvMMZ&rB)F0CJ3txHvOXGt)Cl
zAe`co#FA7XQz@}3u_(VP9>`BiQ{v)G$t)@c3LA29rWGaTrb5_Q702gfAk>=>p}vSj
z^+}1i)GI5v`niC83jh`ANu)0fb?pEE12#!SK~!jg?N~jJ+b|4uR6BEEIGt@@vKJjX
zD+b#6VxW5txb*-3gf`d2dZb8EX9o>X+?!~bex#m0D61$QicOA7!l`S`?_FCwsa~t$
znYDa=;Vy^gVmzqqHP7z+BXVhruGa|4Jxgxge2ZMZ6x&A4V8<HPKbuYLQmPp^F2U>Z
zm*g^P1e|$&UW+b&MncA(CvcKoDutkA?d$KF3)kujPW;LxnOu0PR}3tHv+Ckx0w%7Y
zz|BP=XlVkm0+C8d0zm;#NqEU1DF7-d<A4dAgvOwfG7gY{pa8;oD*>aE(X!zQND7dN
zVu&CrKqg9B1X%$x3!G0TAoh@~m81x=0&D^^5lBMkQw9MOfg~g+!0AX#x=J$Y6Bj|-
zq*5Rv44PL0z50-e6+UG3`riUlTIpWwE!urxQ0vg!%dhY~DmjL6sd#}!G%z7|I61p6
z1nCkf^mVXnu#0V&CZ9&H6C94g9>6Y2=-ZIW0LY(6AlQ9U^L($^RC|4%q8A%246B|<
z$dcrH6f8F9HG)C0FMuBD``@V8Jgiy-+F(YN8^fwa06vPx3K}pQ4e_A^31ktfGyy^u
z;T;>HEP_5i@?e~pY?!s61X~h;NZ<treWm@ys6Jfbylh`VBoOsTEwzG4AnSo0j~xc}
zVFGqMCNL#1mVhmRaSqCmAbl9jkRV<4vyKO;y1G#x?tpYbm%#sTYuRmbj3RU`d8~Fy
zpKdn?cq(`UyAfD1!m0gszYs;JY0ge5=+jBza*IH)XER1A=;ijN!I4GaHv-Dc4EGB>
zLRB(Xd1i&R!6QTw<<;4X<^^$K^b!H=4=h5({jI+`9w8RZ`n6>dVgmEmmPUvP(zW&y
zfqW8gX(oa5=?rX;PDZ1UfgZn^lK~lrIRs=JW)YwWv(6gMFU$Z%m@^7QgjpG&2r>cR
zWjLG<t|CDtH6lR}LDm2wh=(u`LGA*|EN(DC1VzLUL6*Z!c`3taT?)W&mYjiEr8k0g
zU%daIK%t)#GSQfOvjMmRn1^BMKTYo!5_tRaHx0AIngo6!LHYPDJf6TmI)jf<_!x!z
n5cq`z|A7X}yRh*4nZ@}xwI)p^Rlkq~00000NkvXXu0mjfUVO?$

literal 0
HcmV?d00001