From 09cd9189e3e88f2c126226165750f802fcf13000 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Thu, 22 Mar 2018 12:10:08 -0500 Subject: [PATCH 1/2] fixes missing shock collar icon --- icons/obj/clothing/neck.dmi | Bin 2555 -> 2903 bytes .../items/devices/radio/shockcollar.dm | 5 +++-- modular_citadel/icons/mob/citadel/neck.dmi | Bin 182 -> 347 bytes .../icons/obj/clothing/cit_neck.dmi | Bin 0 -> 526 bytes 4 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 modular_citadel/icons/obj/clothing/cit_neck.dmi diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi index 0f3668ce102b10edb3d8771d178df6bcd28f1bf6..e3bdecc4c6e424b8310905e3096794b71d278526 100644 GIT binary patch delta 2604 zcmV+{3e)xb6W11yBmsl5B_{!YLPA2qt2a(gPCGk0baZrQXJWQUH_O7}xOnBFS z9Aj_6VrHf;nIc6|W0sJAmvy#F5JppI0KTkJU)V9&&=8qKClDJh%CulVFyg#v)$xx8C~PeXk)ujfk4Vf_Ep+Bfat_tC!re4gJwWJuiS000P~ zNklz9*=t5>ph}=+bJc1r~R~& zz}w+F8iCudCh&Bs3A_Pc;3x#{How130pMxx>}*#6czuB`8Xy=v1VFdnuLS7n>{J5y z=rstr909<9Zhv=wH`$0_Ku>2+57~&Y03BT&0a+u4*k>mK_o+6&8`^*}!E?I3(*tcl znBeUS1VFvZ*I^?F)?G+_-hpn)0nvdT!T~Q#9vi?bbKo!p*nuE@=DRb5emh(Lv)`YU zsl&{{{w}ZU+z;m@5;Cz7qW+QXJs+}d@yJdH~=tt=zpa=^uI*k=ko;uu=?}6s;8)0t{a<|pz*_)!L*hnYKty36eBl?{pqo7U1ORpPnE+VK0qGfN65z`Bhr@RL zFH?*{^#efA-*317YZffSiR!niRjv9jRU~r4`q4`#OAv{jEI}k1i$zZsARdcJ00vpn z|ITTDe2CRy^keZ@JZ@{m!ONjgB9x#Ml2`irhWmz-zf!N8x;ip4Ix?Da2DlWBMW78V zCJcr`p>#TtND~B3<3nR(W8>o!6XQ-Ehz^Wc9T-d`GJ}I@N+3Br98V^*!&%CL)adAB zDm67a{*h=D;*VPp0g#3mCg_dMX?%KoXkuc5-U#9R69mK=kV%JB+iX1B z2Tee3g4hEi&;;aggvm!QNsj;%AVa^r^Z4}m*tBBUG=RPlVKJj$Af6rWgMEOm$*Iwi zNm`#9Ku%u}I9Q+_7ds&Vz~z;<0GV`uS|t$AW|aQ`t_wHIe^aOZ`@d3mID|}{^reL;T(~3(RK+`nIcwR3pa{yh}CF2F7yutwt!)QjonBxH0iV}c)DbE40 z6(sW-`I3;=b$b&S#!8_qB^0F>O-%WXcSr?-3ro6lhL7Ejopv?n;2%;2V0SH78r2vaSAc80b zKz(*42s91E6+zT>5LX1zFhE=t#C=^k05l*V><4kl8boM7K-drBvNed%fPk~dr0Q2U50IU}+0FVKg zHwR$7XaRr>z`QvC>qSWrS6A0=-(Dm1F#{aHJQC~mF#{aHJQC~mF#{aHJQ8Ix2q61D zW&lH=6?0}1EnNs5hzO;;nM6w$LI)y3xnL%dI1bhbeb5yMGv<+42LQSPVb(kn>i|Gk zAk3LZVq@nKw;m8Qu@P8*0hslGpo@*b3c#!f1Vd~DjRO>ymRJs1GurM6@}<)9GRq-r zM%z6>pY*!VrcOl}75gO-XK^8#2bcSW=LS-1~cF6qn*V6og4%@yY0K4_(E zFfV|m(YvB~*L-d!hoS($)B&kxe8IJlpUtBv05Ekxsu^E&Ef(f~3MdKyOdXIK0k{K? zdGrAnqli~Psu{lvj|KDr7o&t%K&lzP2aiSc0T-i;S3qh6;66O=Fi{ZC;T4e%>H$3N zGEorE;}ww(>LEPtF;NgN;1!V?toyZ}0Kw zZ<^0GWdyywj~)qtM~|9BP`^T=j%_soV0lsxaIo;}Hh`xwaA13To23AMuG;|cv~d9C`}@s(g7w;V z;8l6Hy;VEot*z~6@;Fj&9+@&oyIj=!dmvy4W*X}%7`1)t59yy6&~KkP!NF$&VM8Vl z06W(I%Uylm1i&GR*n?i|JbC%D=Id9lUO#^!{Yljl9Hutp->&RDdGqG&Tj)S2*Urwn zcdwrx&z3BI^WOw`|GrY)-QBHL{`~W}0M@Cq=!F2-{qW)At^jcUle;GLH#aur1TO`^ z$B!Qbz+Ycp9~)qUYJ>1g1larZ`STtEys939KJGpIl?Nuu~$0d&*5IrD@$MD!{UC{$yr8YKzLAn(mf34aij)GQw%k?kJj)^~pAU!bv O0000z1{7Pc5~R9D{`XP z*_B;Rrlz=2Ek29I+!P+E@iK@cAehfl6)q@*BU9AGDSu|BI5D(1+#imy)?hv|Qx#N^ zNl<)DF806KDu6qyLLKnwC-uOJe?f;j&y=Kvq{EXi^;kEI*!|^r74erLH=^Tv6c`R+I$3;Hr|qzZP1Iz#CQ*_}0|~{zxdY2!S^c4hIwf zzToXw60top_M?Jb_-y0g*r-;ea0| zj{)$@9GHdx6A03qKW!5FLAL%|KX1v@Vdh}}hTrq#mnV|(sQ_Z={pKd2@A1Xa`>idT zz8}@GnEsP-{q60k3B2A|OxXawcwD;ne&{`%J1dL%+tH{=-~hnneIcC@BemFo4cKH-J0=g##i4G62-&Nq{%IN$aqe z%hUbO<;fHHAp!s(HGmPI0Sth@nFI(c%Ua#w9ERL7w!_I zv+fe4Gudp$U4UFRD*?!}qW_)K_#Ufi^s~8aE@um3{$(OjNE9fA;;WsV(oU)PC-u4I z*Zcbi`v+xbe}EU6Y#L%f)x*Q1qeCYTL;}-R2l9nNEuXJY z0>x4(S1cZvjwuVu2L~tR^69~;g9VttwB-K>YL!9_F%krU(|G;xsO~`@oGeJ^(0lv; z57Y`M06CBgPzIcq%jMVD2ebh~UTT1+mQSEOwZe|$^}XsFn7(5E(0JJl z63Dl}TE2iEPknx_SlWT<(>-ufKG=up)ALVfGSL3G1rY!hXu|@%(K(IR5BH9aj_8dL z&Obpwf1CleND$@Uqo1& z(I1dIF73cRK-bCX!Tt%Y&kZ1_F9;kgP>+k9kO1KF$}2#vQc(%yj*pcNfCZ-t2XOy) zx`EV`6LcQ0D>9I_9evAM*0PrMKdpwQot-Jhf1A2~ey$jA8OFuM0{SR_d8suT#5l@d zUFppxF^=-r*G8)~uRfF4+U>TSfXnNhPDf6_<&AE)J0F3@s2heq0GTt(}0}fyq#ytA% ze+CD@C`tgDohApsC`tfY-4+MHC@ugXI)MZboj?MJPM8Bg(|V1zkk_<^ZCuy;&5n@Q zb$bX5W6fARs(6;=taBxc=i$I{lR*I4pJNYT6KL&**@>1ELIM$?(=Qx^>Y) zQ2=1-fHVuhM|fSL54ad@d;-$g_$PQ>p%1ti9ee`P*!X97U84`U7+rhykOlgdK4_nh58%56YeK4bBfU|00000 LNkvXXu0mjf1AYi_ diff --git a/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm b/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm index e42bc28a1e..b5789d4e8f 100644 --- a/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm +++ b/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm @@ -1,7 +1,8 @@ /obj/item/device/electropack/shockcollar name = "shock collar" desc = "A reinforced metal collar. It seems to have some form of wiring near the front. Strange.." - icon = 'icons/obj/clothing/neck.dmi' + icon = 'modular_citadel/icons/mob/citadel/neck.dmi' + icon_override = 'modular_citadel/icons/obj/clothing/neck.dmi' icon_state = "shockcollar" item_state = "shockcollar" body_parts_covered = NECK @@ -19,7 +20,7 @@ build_path = /obj/item/device/electropack/shockcollar materials = list(MAT_METAL=5000, MAT_GLASS=2000) category = list("hacked", "Misc") - + /obj/item/device/electropack/shockcollar/attack_hand(mob/user) if(loc == user) if(slot_flags == SLOT_NECK) diff --git a/modular_citadel/icons/mob/citadel/neck.dmi b/modular_citadel/icons/mob/citadel/neck.dmi index cf74d73796c8c6121c0818fdac74e4a7f0ab9a5f..488623b3b9d91412ae46d0a61a674a97ea00f651 100644 GIT binary patch delta 293 zcmdnSc$+D*Gr-TCmrII^fq{Y7)59eQNGAZX0}C^d6qm}k1ya%hJ|V6^x}&2bJw3gk zpuoz?%0G$Y|1pL$n;5LEt-Gx)rURuJOM?7@862M7NCR@pCOSIQ&v`WI$fOX3V9(BO zW7W+oBur@w4MQ#8mw_~V6&vhn+ zf^vlg46++0tf&*|X$o{U;BsSRI}l`M{OIZejSju0DEkB^RY%U0yu}NI6x|Io6+X`r j;aDlpx;R1P0?@yk>{;$dAAipdw3xxu)z4*}Q$iB}VozQ6 delta 127 zcmcc3w2jfRGr-TCmrII^fq{Y7)59eQNGpIaBQucn-11^OkYWz-32_C|%d2c}0V&3k zAirP+hi5m^KuRV?I+)6&vWDA>Z(w8ic$+`hyY`+nP=d$P#W93qW^#hW9UyN31LIR^ R|8+nXgQu&X%Q~loCIC9gAD;jK diff --git a/modular_citadel/icons/obj/clothing/cit_neck.dmi b/modular_citadel/icons/obj/clothing/cit_neck.dmi new file mode 100644 index 0000000000000000000000000000000000000000..ce115c2aa71e4ea76ce14e2da64d07419b0cf76d GIT binary patch literal 526 zcmV+p0`dKcP)fFDZ*Bkpc$`yKaB_9` z^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3KBSI3qtf zJ2^imC$UJ0i!&v&s2C_}$i0MAK8K~y-6 z<(Wqc3v%=|$Jv9&O7VLK3

wDn=$qsWYJy6NCu6OsQY0JvnL8e{T_hv&ABIPi&B?Mp`0hLk+k4FG12h=pp$^mZ& zQadoulLODg)~vQbFYBr;XfWtaUcCY9vKSznaBTAi)LJ9R^YPYZtNDBR0A{TX7AD6u QIsgCw07*qoM6N<$g6 Date: Thu, 22 Mar 2018 22:23:42 -0500 Subject: [PATCH 2/2] wrong location --- .../code/game/objects/items/devices/radio/shockcollar.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm b/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm index b5789d4e8f..23bf4b96c3 100644 --- a/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm +++ b/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm @@ -1,8 +1,8 @@ /obj/item/device/electropack/shockcollar name = "shock collar" desc = "A reinforced metal collar. It seems to have some form of wiring near the front. Strange.." - icon = 'modular_citadel/icons/mob/citadel/neck.dmi' - icon_override = 'modular_citadel/icons/obj/clothing/neck.dmi' + icon = 'modular_citadel/icons/obj/clothing/cit_neck.dmi' + icon_override = 'modular_citadel/icons/mob/citadel/neck.dmi' icon_state = "shockcollar" item_state = "shockcollar" body_parts_covered = NECK