From 692d03e91e3dca6a7d31db4f500ffd743da0bd77 Mon Sep 17 00:00:00 2001 From: "petethegoat@gmail.com" Date: Thu, 26 Jan 2012 16:22:46 +0000 Subject: [PATCH] Exciting new d20 sprites by TedJustice. Dice will now face the side they rolled! git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2986 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/weapon.dm | 12 +++++++----- code/game/objects/items.dm | 1 + icons/obj/dice.dmi | Bin 0 -> 2679 bytes 3 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 icons/obj/dice.dmi diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 7dee8f55dec..a5e037413c2 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -1449,15 +1449,17 @@ name = "d6" desc = "A dice with six sides." var/sides = 6 - icon_state = "dice" - item_state = "dice" + icon = 'dice.dmi' + icon_state = "d66" + +/obj/item/weapon/dice/New() + icon_state = "[name][rand(sides)]" /obj/item/weapon/dice/d20 // -- TLE name = "d20" - desc = "A dice with...hell that is many sides." + desc = "A dice with twenty sides." sides = 20 - icon_state = "d20" - item_state = "dice" + icon_state = "d2020" /obj/item/weapon/pai_cable desc = "A flexible coated cable with a universal jack on one end." diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 01ef9def176..bda3d86715b 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -402,6 +402,7 @@ else if(temp_sides == 20 && result == 1) comment = "Ouch, bad luck." user << text("\red You throw a [src]. It lands on a [result]. [comment]") + icon_state = "[name][result]" for(var/mob/O in viewers(user, null)) if(O == (user)) continue diff --git a/icons/obj/dice.dmi b/icons/obj/dice.dmi new file mode 100644 index 0000000000000000000000000000000000000000..669ad215c5c3ad4df8aea2265eb66f2b31277851 GIT binary patch literal 2679 zcma)8cT^MU7M~Cy7zq&zAR<9z#kByUMzD}j1YG)xpmd(Nm;goysE8zj0wPj0VnkS@ zf>J^Ug9sW6&*&mGASK4oBArkYN^Zydoij7{+_`7&@4LVI`|dYME>5;6 zq!tnY0Mt=C>z^U}8oD1UD?v}sZKr%7Q+vtnM1=Ke@~Lpbxd;O3EC5{0PH8JgzBOL` ze%dVRMh;&%>B&?*sej}^mB{5x)dn}axL2>NG&H7p;ZuIEFa;xD{1TFuOuIbn%*-)^ z`TX*IqUU!qwD%DkwfaMM@oqJEE0`7Db=n?$_nwK_n&1+`tHcR;$F`Qec&Br2^|IG9Sn4cy4o7n^Udj7;#Y+=nl%NiVD2c{-4kx6{5~T~ zbG>i#`We!axLK=_9W*j8-{`+uo)WwTqkM*kF}Jp z;bgUb*qd=Uf1+$sBcxz~OF_z&t6R#=U&vV(HVKQA?l3ZE2XQ!dzoLDe>s9P;_ zQ79=B(wB`44S#DsT>(0lRvmR(L6chf!P|-ZOjF^UuuH6?Lkt{Ml@k^R-%XIpE4JjK zPA+atv1tja1XFC_fQh6b*uR041Evln&@vJc z=W38jeGGh19mf3fDfr6X4Z`_DM)y>o@g~}N0S!jJQJbz^HW%#K^wTP{-cP#MG5AqA zU2W@8u)Y}KO_d@Mxu3PZ#1^^kEeTUlrqYISKbajQP?Amlt zn34{5=JW(cy}rl>AWt4HLJ=MSxnPbovu9ntXK_%;R;K*dP}_AFT%5AK`@fdNhp>j7n!J)FAO$Ei=K z51<4Pf>z}TZyaD>43)(bBx##q-w`30t}edP75|~EaI)AaE1x`2(tn%Jqx++j8y1*p`fgDNV3#D`$ zm4h-dBmVaIk|QOIH#1*bIfu6L0%=oeFO?QVepq=5KeUcAjm+ASX1Py&SoH|FC`XqM z#X>|pg>ZDfF7~sbaPaJ^KF^zzp#{0VfON!}i#v}LOaIO61;1%KB;d)KCT!BOuQt?7 zM{0iXm1m2J<9^u)^6p-#LVX>|6Bh!JcKLBtn={)H>;jgiNfLj}TVAg6l=M=eOwQIo ze9wuIzQoVupVZk4bb9dd^Zi!0>F;HhP)-zBPfFM$NQPRm?fIy0mfwd#lX?hdN{zZk*-jqES)ppw`5L*OHf*UeHu%$%z<2jqqFA~c>&#ErpQN_+nPwe`LwJAGFa z9PjoHSlwX^SnpE-{vY?RIMiGz!0OD~FRuunsw#1IX8VAbPejSf;-4`idyPt24KH@u zAN1l!4m4y;R;=%u{ja=TDQmqbHGkfG1 zra2zeTEvdR&&=6x43RoMEeFd-;bJ4F!q6BguZ7B^&kq}{-v`zfUs6}@zah41I4?~1kmp&PF(71gJA$4X$9{sT^kj|q0ouuqb1 zdaF-u>u2c{b}8^Y)ZEAS3yRU_7DF}xCbP6|eK#O5W{w+v+CRpI93$n1D@xwE_mjz7 zc6lwoQm?Gaf|b{2P-$Nz1@LoYv-TF(T=gdmDjVB75b1F$@*KP;#f0Z@I_3(c)C@V@ zYe0J~g*tzV0sru(8p}3jSt_4+HAx zeD!pPfU49Ieb7zyH)yK8iTL4T_13^X%=$Rd(6Tr}5nSfXgTy7BITHV6^o73Jq2{5n zv9aX=PTI71Hebf%$Tq5B2fp@0f0Dq_BTm*Omi}?S E16^lA)c^nh literal 0 HcmV?d00001