From 7cc32db240bb0391a327e2e0fb482b608ecf2296 Mon Sep 17 00:00:00 2001
From: Letter N <24603524+LetterN@users.noreply.github.com>
Date: Fri, 6 Jul 2018 17:12:16 +0800
Subject: [PATCH 1/4] Delete weapons.dmi

---
 modular_citadel/icons/obj/weapons.dmi | Bin 417 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 modular_citadel/icons/obj/weapons.dmi

diff --git a/modular_citadel/icons/obj/weapons.dmi b/modular_citadel/icons/obj/weapons.dmi
deleted file mode 100644
index bf98931e447948293661eac706a16b07fcfca36b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 417
zcmV;S0bc%zP)<h;3K|Lk000e1NJLTq001BW001Ba0{{R3fmCP50000OP)t-sz`(#-
zPC;sFYNL~Zi+N=;Gc&HPu8fR~$U`h200001bW%=J06^y0W&i*HYI;;ybVOxyV{&P5
zbZKvH004NLQ&w<tb@%jBaPjrzDoZUY&dkqKuvIY8GvMMZ&rB)F0CJ3txHvOXGt)Cl
zAe`co#FA7XQ>iGwII*ZwiHkEOv#1y-V93RpR+N~V3SlcNxca$(%>@8mgBq(?+`?J_
z006;BL_t(2k&TZ{4uc>NMuEgVv>pIVu<IsXfW+<%$=H39>fS`>`t^qqaMju1JimDi
zjQv?$YNb<fciagXdu^na#+|(q`ymYpnj<XAFvJ~wkXMCM2y&8)l9b@juta;xXe)rj
z5q^|Ve>S3Yka0hv-PXC0yr`#6Nz=y1^fPaqpv$0JfqB8XjkmBMcpLM>FyJzLBS2gb
zac0R#Kc^$Rloh~|>SvbM`wFg!;xTnO7%>MP(PjXuD!X(gmp-i@!4x8{oLJ<j00000
LNkvXXu0mjfY=5!K


From 15029f803497f96a8557a8fad43425c071645a29 Mon Sep 17 00:00:00 2001
From: Letter N <24603524+LetterN@users.noreply.github.com>
Date: Fri, 6 Jul 2018 17:18:55 +0800
Subject: [PATCH 2/4] Add files via upload

---
 modular_citadel/icons/obj/items_and_weapons.dmi | Bin 0 -> 789 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 modular_citadel/icons/obj/items_and_weapons.dmi

diff --git a/modular_citadel/icons/obj/items_and_weapons.dmi b/modular_citadel/icons/obj/items_and_weapons.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..280b642d4236e467d313b42a9ec97a18ed632ff5
GIT binary patch
literal 789
zcmV+w1M2*VP)<h;3K|Lk000e1NJLTq002M$001Be0{{R3l|zoU00021P)t-sz`(#-
zPC;sFYNL~Zi+N>DO-&pe95XXBjxTeZHGYpUbd@%Gkur9kH-N6LuB$qWk~4R#JB*Mq
zb-F;8*GjM2O|sccv5bt2uRf2~Nv^v=n2IZJtvrpOIf9!seV;gi*h{e0NUgm?n!ZGv
zlQejtI)k}CmZ~|5)JLqYJ&v6=f1^Bw+)uQWHF>;3nYcccmN$E%JA}VQoUlKTjV^Mr
zK#|f#s+ci)sW^$tyb@sm0004WQchC<K<3zH0001adQ@0+L}hbha%pgMX>V=-0C=2J
zR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5
zsVKiVv8Ymsi!&v&s2C_<$i<mfl$e_eVZ)VWB<7_gm!_qqC#K_4tE}Ma=K^*E09PC*
zx5>@#V*mgFlSxEDR7i=<Q|WqwFc3_l5CoJ!QIw+eum|+ew)S}cC+jX$jEnjS{OR(M
zkdPT>CV{d4Rh%;cjcASU^*Q5k3*H7U09Po0zTcdo!0twkMHK3FIZZ{tdID$~CB<VT
zjR@+iDWhSW7C_hY-u{fi%o7xlAq|bB2za;*^Ed&QP}&sTM}(RN7%{DZ?YKkwIVr_x
zB(@ZIocB`kT;=*G#ALyR6OJdYOBetjMUjw|pgsIFn2qDh1RvGh4HxO~%BC)m0q~e6
zoFbBlx}MzJmLE-*&fPtW7on;#j3W7$rXYLrU_GYuEOXEVv(g;er)SMWnH~}d3`5q=
z#LFywWvi)I$X>rC?=1E{GzC&XdNP6#5G^FdGkY?CHur+U!{#%~GvA);;>&^*v8xjV
zUjtC!`&Kb>H;JEEdIS=oQB<}dqed_d!tX`usiYjH%64-7eQ5zRIAVbXR=o1*)@uY+
zh}D2rqSniwWB8qsL(ua}9&+D^prZmQs$ZeCfKDDzKqm=!0E9TWh38Xrg14<-YBv?d
TYknLP00000NkvXXu0mjfj6h_L

literal 0
HcmV?d00001


From bff55cc3625fc17c61e095155946811929121144 Mon Sep 17 00:00:00 2001
From: Letter N <24603524+LetterN@users.noreply.github.com>
Date: Fri, 6 Jul 2018 17:19:56 +0800
Subject: [PATCH 3/4] Update handcuffs.dm

---
 modular_citadel/code/game/objects/items/handcuffs.dm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modular_citadel/code/game/objects/items/handcuffs.dm b/modular_citadel/code/game/objects/items/handcuffs.dm
index 8c5bbdb58d..ed5e8a191e 100644
--- a/modular_citadel/code/game/objects/items/handcuffs.dm
+++ b/modular_citadel/code/game/objects/items/handcuffs.dm
@@ -1,4 +1,5 @@
 /obj/item/restraints/handcuffs/fake/kinky
 	name = "kinky handcuffs"
 	desc = "Fake handcuffs meant for erotic roleplay."
-	icon_state = "handcuffGag"
+	icon = 'modular_citadel/icons/obj/items_and_weapons.dmi'
+	icon_state = "handcuffgag"

From 5c79a794ec0cdee50eed27badf4108474dbb653e Mon Sep 17 00:00:00 2001
From: Letter N <24603524+LetterN@users.noreply.github.com>
Date: Fri, 6 Jul 2018 17:20:30 +0800
Subject: [PATCH 4/4] Update holy_weapons.dm

---
 modular_citadel/code/game/objects/items/holy_weapons.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modular_citadel/code/game/objects/items/holy_weapons.dm b/modular_citadel/code/game/objects/items/holy_weapons.dm
index a6bb5dcbc8..204a27f3fa 100644
--- a/modular_citadel/code/game/objects/items/holy_weapons.dm
+++ b/modular_citadel/code/game/objects/items/holy_weapons.dm
@@ -1,5 +1,5 @@
 /obj/item/nullrod/rosary
-	icon = 'modular_citadel/icons/obj/weapons.dmi'
+	icon = 'modular_citadel/icons/obj/items_and_weapons.dmi'
 	icon_state = "rosary"
 	item_state = null
 	name = "prayer beads"