From a2d6624a5f3e3e9e4feea92634e815c779d95c2b Mon Sep 17 00:00:00 2001 From: "baloh.matevz@gmail.com" Date: Sat, 15 Oct 2011 23:52:47 +0000 Subject: [PATCH] Well... You know it was the next logical step... Sunglasses on a corgi. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2371 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/mob/simple_animal/life.dm | 20 +++++++++++++++++++- icons/mob/corgi_head.dmi | Bin 2673 -> 995 bytes 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/code/defines/mob/simple_animal/life.dm b/code/defines/mob/simple_animal/life.dm index 5f9e840344f..cc6eaa0e6fe 100644 --- a/code/defines/mob/simple_animal/life.dm +++ b/code/defines/mob/simple_animal/life.dm @@ -132,6 +132,23 @@ onclose(user, "mob[name]") return +/mob/living/simple_animal/corgi/attackby(var/obj/item/O as obj, var/mob/user as mob) + if(inventory_head && inventory_back) + //helmet and armor = 100% protection + if( istype(inventory_head,/obj/item/clothing/head/helmet) && istype(inventory_back,/obj/item/clothing/suit/armor) ) + if( O.force ) + usr << "\red This animal is wearing too much armor. You can't cause it any damage." + for (var/mob/M in viewers(src, null)) + M.show_message("\red \b [user] hits [src] with the [O], however [src] is too armored.") + else + usr << "\red This animal is wearing too much armor. You can't reach it's skin." + for (var/mob/M in viewers(src, null)) + M.show_message("\red [user] gently taps [src] with the [O]. ") + if(prob(15)) + emote("looks at [user] with [pick("an amused","an annoyed","a confused","a resentful", "a happy", "an excited")] expression on it's face") + return + ..() + /mob/living/simple_animal/corgi/Topic(href, href_list) //Removing from inventory if(href_list["remove_inv"]) @@ -178,7 +195,8 @@ //to be compatible with them. The objects are below. var/list/allowed_types = list( - /obj/item/clothing/head/helmet + /obj/item/clothing/head/helmet, + /obj/item/clothing/glasses/sunglasses ) if( ! ( item_to_add.type in allowed_types ) ) diff --git a/icons/mob/corgi_head.dmi b/icons/mob/corgi_head.dmi index 0617b7cab1909d0a6502f1ca3bf1ee3321493f68..5097495d368dcb3999a93d1a0c7a08fd0c5cfe7b 100644 GIT binary patch literal 995 zcmV<9104K`P))V`N1nPc<5vnwoBIZgFmI85tR^t*t^r zLI3~&GBGhKDJfJ`RL`FenRX5_F)>F+M^#f(AS*!s%rpO)06jfDNHzd!PyxhS4l61u zd|m_qX8!;)X3S=0J32ZV!Z0d!JMQvg8b*k%9#0DO8>Sad{Xb7OL8aCB*J zZU6vyoKseCa&`CgQ*iP1GC)ttc@!6~s0~S7wAzXNX;0acLewvw&)F8lgNLX2mqJ4Ir*{b0{V+6CVwiF(C&P7J&sz8k3<^tyKAT}7e>T(m^H6RUJoqsgNYk^& z01fH@E&3`UdLa)jh-@_kUgUxs z32+ZX59>b31xS}4KALsOX%Z{{^_vsGIR*xG4e!yV^gQ|A^Ol!3Iuf6G&ENLDLtK55 zHCI(ttvqySu+^POlO&P#*Xz&K7ui%_FPBSO-IZb^1YYc`8{q4$Y`gCD&!oEtxDuk4 z2H#-n4D5Ahf3Xqi-HyQk-PwPGd-(1<8vKB1*TAH^`wQ{2xzVm}e!+A*Odrv|HMk$7 zj}f4&-<;)718DVe1Hg5@mUkL^ebfNnJu*zULVK$=ebtZgQ^4uViXfghzX8jbQ7k|m RYZL$g002ovPDHLkV1mSJy-5H7 literal 2673 zcmV-%3Xb)OP)V=-0C=2T%DW1LFc1aMI`b75?ZsC+jYK4c{)6CX0zM!a^!F{cSa!<;Cr8&0 zZh{>h-4au{PB7Y{B=dwtJs3?*#!J||evoul0VDIWAEFtVCBy_qOJ}cOT9vH~#J23~*!K^YbA9eP_t?+>c{|U&*CHN| zS2!%p4H8o}XMn*=6$K$Ia1id~$Q&SToBO?H-w*ErMR}5HKITlTT zUZ6P;z~ypf1(3;PxSB|;xF$xUQDe`ZJpi~|u55oMlL6q;rAxMvU{y@56dJ{pW6?3d z>vnUXtBb3N1eb@0Io03K<>6tjCK4Rz>LQ>0Qo~1?#`w*f`0MLebp2w` zikZn|<_RC5y}g}iG-~AcFF6Jr=;~VP)RG|i(MPtfpAV~70J0uI?}TP|UJd2aQo+PqhK{bJC>TVr9qa-KSMYF-RjQWo^? z@gv5|UH$WJR;<6&uzUSt&`RKSyZOSV6k~U5vdKXq;lnZr0I>eCh59x!9#t8Zv=c6N zV@LQVUhe7_S}7O8k}N=DY;4T9cI_IwcI~2}p}`S;0gR1}84Jl~$!RE{g}&ed8yydm z&9aMej_{WUry6QA90F{HLx9b22(TFr0XD-Sz-BlE*bIjNo8b^(GaLeJhC_hOSXMD^ zJ)rH#VdGfKcB(dcxILA|<9(8Q(;w5^xQ(l$xA1tMd;i9~}oIm~iFu(rYZ#h3Q%TqO<@r`;90CzlJXY1CjoH%iU=B8%O{_&hxRyle- zpdl1u8?XgRO`R-K^gV?o*Rew=YeYAKCnr(dR|-r2KZG=>Vq=B zukHC1$%{VAybW&wd%yHWBs%xq_zQ2L3+v>P|>r;AT!~FZ!CVm3U&Sj{qa4|cV z;pu(fIa z@RJ-1c)g{T(2w7zuC5Nii2)k=9n+A20Yhr_0H%hPiR8rx26*!3Y0b``r!8WWAb#Hf zFERw^P>{7G0o}$jp9!xgym(;0p|yQ#aw^-etpes-#+^GKXJbP#R93hOTG7fW`+4r)~(Tk>`i+#`iaYg9q2W8andv1py{vShTJbEushN;;}R89~0 zF)gBABro1rc%JYJn3}wcA4p#Rb6Kc96xu0>UoRE|tRFyV=y%@N!bcFL#CN_Ga&J5B zN&nP%-ZOFj3axMc%ZLc@0byjDQ0D;wDFb?i?6Z#Xsq4BgrH(KVQ0EaLe@+0Ms&5_v z(P-3YZ*MR7j{9nTgt40N-{0#F2q`41uzkqBuo8Moori&t0TaR$d~Tr%%84?sBiHV5CGQ3M-ZjLpcf{97GzqeH8bB;_<^9ht~I+6Dda&U5u=7I!f9XM zfoWN-NHjwqz9zSCIsO!yjBXlcTwn%LcA_X&uc^*S* zz8@(_-5L7pGPQ1+x^waO5>zg(5U=*Bc|ZO zNDZzjje0p1Jrs=-yXos z<&P?D)fvoD%;2hHK+uo@Tw6{p=6OKCpds4;Cc!>r9C&C9*eGay=~=fHtkv%afFb3} zJB7KaYP9SDVwfAMNS?3Hl4ZG`Lb@aC*bV-9Bl0bqV@xKbnxG-U`2>B~XYZ-nVWVwPZR&Er855J8n0 z3^*gqy+KSbpa{WGDJkZWU=3TqYHb8t-{0-_A^rQP$PJt^BoPU61F3@Gitq?!2ZZg&_dz#c;iSZ666N~`m=Uk7HLIq6+( zAy-w%g#{nLOj(g)oZa}@h0|H#0~~w%ot$D|CX*@Yzr=}q5N>*YAy)r{dAyY`5rRZ}l z)NUjhy5OcYKLwn$xSg01b`nWYQr*isNAIB5qy%%pp;Dp6Q`p7m^A5Ec3#u_g zs7I2(QOme0q{R%Wc2L!Sd_umq;zyF8OBfLzu@jtjQn@tM^hs?Di;344u+YbbP&ne^_00000NkvXXu0mjfoU#hN