From 1615a170779d1e658713af88bdc3eee1cba8e329 Mon Sep 17 00:00:00 2001 From: Rob Nelson Date: Wed, 14 May 2014 15:48:53 -0700 Subject: [PATCH] Add horribly-sprited Vox clown, mime, owl and gag masks. Conflicts: code/modules/clothing/masks/gasmask.dm code/modules/mob/living/carbon/species.dm --- code/modules/clothing/masks/gasmask.dm | 4 ++++ code/modules/mob/living/carbon/species.dm | 2 +- icons/mob/species/vox/mask.dmi | Bin 700 -> 0 bytes icons/mob/species/vox/masks.dmi | Bin 0 -> 5659 bytes 4 files changed, 5 insertions(+), 1 deletion(-) delete mode 100644 icons/mob/species/vox/mask.dmi create mode 100644 icons/mob/species/vox/masks.dmi diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index ecfa04fe2ab..47362ed8a2e 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -86,6 +86,7 @@ desc = "A true prankster's facial attire. A clown is incomplete without his wig and mask." icon_state = "clown" item_state = "clown_hat" + species_fit = list("Vox") flags = FPRINT | TABLEPASS | MASKCOVERSMOUTH | MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS | BLOCKHAIR /obj/item/clothing/mask/gas/clown_hat/attack_self(mob/user) @@ -115,6 +116,7 @@ desc = "The traditional mime's mask. It has an eerie facial posture." icon_state = "mime" item_state = "mime" + species_fit = list("Vox") /obj/item/clothing/mask/gas/monkeymask name = "monkey mask" @@ -143,6 +145,7 @@ name = "owl mask" desc = "Twoooo!" icon_state = "owl" + species_fit = list("Vox") // ******************************************************************** @@ -273,3 +276,4 @@ // ******************************************************************** + diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm index 930115dc694..b8bc3adc851 100644 --- a/code/modules/mob/living/carbon/species.dm +++ b/code/modules/mob/living/carbon/species.dm @@ -209,7 +209,7 @@ uniform_icons = 'icons/mob/species/vox/uniform.dmi' shoes_icons = 'icons/mob/species/vox/shoes.dmi' - wear_mask_icons = 'icons/mob/species/vox/mask.dmi' + wear_mask_icons = 'icons/mob/species/vox/masks.dmi' flags = NO_SCAN | IS_WHITELISTED | NO_BLOOD diff --git a/icons/mob/species/vox/mask.dmi b/icons/mob/species/vox/mask.dmi deleted file mode 100644 index 93a7f858961024269c3f9e8143f142cc12469d5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 700 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=`BfniB`&GO$wiq3C7Jno3=9=> zRF7M8H5dr69nNGo1sL7Zsg#tycu2r=s+sGn z5;kei#I4uUbW*16;IP^(ZGWU%;cA+3x}TYS!Syp~#(&bk-C)WwVTf+%WlP}RaFM~+ zFD_+fzITgjNJC*@h%}J1|IJrB*Bf^Gxc626o$~d2@;n_S3Gr6@-MbDQh+;T!AnMNg z>;Do>nmUfGlW*-vu$%w;WXh!L{a=6o%{=uhkg@ID%6xcW1<|A91nMP>Ephl0nRA87w`AnM9{#UGjv|1~#m zz54U`tf7lpUC!@e`OF89ZJ6T-G@yGywqMZ8bdr diff --git a/icons/mob/species/vox/masks.dmi b/icons/mob/species/vox/masks.dmi new file mode 100644 index 0000000000000000000000000000000000000000..33a84118e2612485bf9a3a393d0a7208ca59ed2b GIT binary patch literal 5659 zcmcIo_d8tQ)<0te8AS5ciIzkV5fMGY=p=+7dJUqNiC)5_=rux!I)os4??xvgdN(?W zG6ti^7~Yfn-1jfI_x`Zf-fKT+ud|-DKdbB={!BxK8pZ+x0D$_js-iYHF8(D7GLW+f zI4prfr{8k}55<@6R&MqP4|`V^0PsnR9%_cQ-@i(}E9o22QKB?fXA>9UF{Dpn>pmkp z^2CkhV1w=Y^RiC-qW1+M-=cD^n%wTFxJgUh<+^N#ANs=$sXl4DXZ(DAZfhClN|x3n z)Rl;UN00h*%I@7BDob3Z6M9BM-6t*_!e{d60kcl$+al}`qp4-YcI*=0%?srxFg5m_ zOu6v_J#EDwE@cZuTXiy`VrM9;yYJdStS@hY)vZq!ll;uxvp;V2#@e2TXX=qe%R1U>>ZiP zBJ%mqG_9ZH&PVm*GXVs~-F5kA>Idye)Q!qG&y<^29;bClK5Bfd7;_28c zp9i*&&L>Xe&)pZ==-VT%em~+!%~|U4m%p&rC1eF8OCjZlDoO@IB}@nrfHH$(#=Dfv zf`TW)WJ2t26KdVNkRgT7GM*+=$-PnFPCBLt9`|l2z@D08I1*@Q{(AuR2HY%1GmQe* zv2xd8P*p9Vke#mSdVoycPL}}eo*cYd-+Ud`lNU>AR5DVW3g3uzZ3%pn(MS^-p!po) zQE#Gf+mCp9n9KfF-Zr7gurlPeX|<1SoAsZcwjSp-6*3G&jSF`3{@8^(hv*IAX!d|x4$L~_3_CyJBu(Oe*XLWKTt@dyKv%JkIm0?IOHPd zX;<2;;fdPQU<352#gsFhE^rKzjCmH@a!xu+@15tWyRX-M#py z`LlY9<$9Sr&@g-L0Wf*hd~K;o6F8C-^UBvr+9=h+u%of za&l8*6)>1$%bbe?K`F2$@%O&Hy$nik^%zUDQeijAj2B)EPl4fQ`Yzsp2wu8SBR|Mmu?qLK^F81-ux65DOH+?n8NbxT{)L;0?za?aHYK9)FnD$f56Y0gp<~bZrAo zaB#4m_+<+Va#Emll7AD6g#gmh(ujH!%fSrk+>lluM}6MgaN9gZw=|0m;*~-@i!!7FO2bg@xFvs;bOidV7Cf+u7N@ zd3E<^O-YuVtE0ch6`O%Hd$~fWgM&j=hejTPDY2`Pn2i=~E+@lmU8YT#wEBLB_o_Ji zqajqPX>LJNlL;WJr4@%R%F2QOi1i_^(Vj2hA{`yw;^`sw^qZ!O%e|D8l)Luu*$s}X zOtBdm?9Jvj)dIF~$=}L)X(6}$2tB5(?LUm1d$k!gTu5*7d!4HWlvUvN_T0EI`+m*s zYx_(4gYZdnabeP|B|!m!;5nB`O}Xd*VVxVb$l1J1Fu*>ir?WjTEVlc6oFi|nkSytb z+s(~w5h3x++&p$-La&ct;knpRjrDja3Oe$Mni_u2dtpO3GZ_YheaOg&Nfx#x3l^+$ zwRy67q^at8i{G)DTg_AgEWO)vjiHa@Z?|nx(tP7QD6lA~5z-EyIsX@KTEcj=!yvc* zXT-Z{JX$F;w_c!`XBV2V|o|oPT+ANs7OP9 z$lVhZWOTF5FDj}k(te6W!rRC5;-NQUzuVY5IE)}^^icz2-Pf2dzyrC~05uSWx)FH1 z2zjqPZ`EImI@~CdAPFhdw512VC667A9{nBclSzeVjsBDT_cYw9BSzQww6_r^N-_15%Vy? zG6nMQs=KP7eUzwc2(|MM?o>+uhI*88X6i{2!p53M4)o;!oorU`wJS!#49jk zP-{))>^CP9BkCnWE-i09CSr5bAfswO>JvVFf&c^QQse+w>sj}?63D+sMN!S} z6KK6GK4P2Kj&I()sjvZYwXN4VV4Hi$>oh(-zAn{3Zxgx*>W?tjN5P~e^AmdL1yB^uMbpD~F)Z z^0v*+#^xvigBmA8lK{8IIm_vam+vPi0cK`qxqz_hXuIeO+7G#=Z+lkSz9>a5;(b7& z?F4Q({(cpKM-FaS%_F3CKUl@*nhtCBVP=d%XT`M4gQmxh=^SduOB9vKjEsx`;GzlF z{-dJe!Ppo3&)z+@F>^6EOf4nwJw=pKc2WLkzj5usWO2od4l<%0)~iv;#^&||Vd3(< z7K}cLEGRsD`0(JWvOh#Aq%=F*YRC_gnVqfB+f~}%(nx|5yiX`LtRyoJIHZ3q!y(pU zIXA`g-Zq1flvysAa*ZjKk^D}m)p&vKXEA4%fwVu`*0yUwb9!2r%D~G-^ z;S2^7mz*4)n8=VO^+YHbk3SY2IhBgUbntNZD;rov0v2M-<~ zz^1frf`38KR&HbDtJ;r}M}0bj5fQMl@$sxLUr5+v$ul$qD7-yI;s!FL`GLhqL9_wO z=?tY{69NWAL`Dj*C5;?6vjnctQP)BTBW*~#*MBApY8li4b8~YFX!s^`S$6i#f?wgc zybppY8L#*i*VO1uYh0!}=&w^ZO9&SYb0eb)Xenq}!-O`?%vd&_{Hlq4mndjdMFECT zE|RS9V$t-h;WRL&ohSd?pZGXD-GfBtJ|Eq~)!z8WqG+kU^yMUsjC^3AOiF4h9%Xz! zS3$`cR}!>+*BeI9_(J(hNr^^6LP8ME*yPef(|buwedC6qH*Gr&I%szY{kIhCUY;o5 z)cek@9d^Nxpvpz|;lDyzp9^mqZX}Ohsm9)#{ojR(72k4=cg+uze_MqeOQnr76$O zMx9$75Q|$xp_s=#H1N+A&JS|chcRM~O+6_u;82zho<2cHo9J-Sh-V(7sW-``C%+}H zpWZyER%Es>yMgnFn@6pmSE0`ghkUHnlW#=52v0IWl}97U+pzww72dX4-n4cx_K{%?GZrQBwr%jJM0bo}J1M9Xe^4 z#`Wy^Nhl1wsi>Jw7B;uMFyuIDwxmfRK3S+m^QtUt&rR)47)xZ@BLI+1agv^T?T}?4 z=MRpAbJedc*-WeU^?QAlL5#)8ZDE>O9U<3;#M&T>d$~`AN{!LSZ*pJYN=(-=)Ms`D!nAYpV5=$9xRD$z2Cl(Tit zs+0ChX}(9(brXU&Yrwe(O_gw+bEFgAr^=aKa|(OquL;Ze&oeyJ=X$YgNO^P2Z+z!i zVCN1bw7@>sNK-$luHJ$EI>pv4LzUPYM0`(tMQQIMA}TMlJkU!7Q?8SzIG`rjJ5BTL zO!EHAzW75A&u||7;`Rk5v``^?##v!BFE_aC6^naGnYMdU+X<&V|gjBilA9sGdUoTW1X*GeJ`^b^x|6gr& zhM0Vs=jFshJs+kw$lJToKQUcP)eyYiy@Vf>dQa>`83#mLR~}mD-V>Ag*1l|7@qItTzD2M<(vDScRD?Q)*w%NQAjF%HZR+h^ zt0E)c!PCP7hjW0XLddmrd)o!?}hr9R@YnLR_ zHTtoKFiDJk3KH4bsH&FY1S#4C566a-Oay*^*(57Vl(>b%n~(OE^Ko+|d#ziPmz zAz@7Yg5}1`$Kb2s-