From c67bd0a8e839112d2958a4e674dcc41da10399e9 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sat, 21 Jun 2014 20:41:29 -0400 Subject: [PATCH] Less terrible sprite for suit cooling device Also adds a few of them to EVA storage. Conflicts: icons/obj/device.dmi maps/tgstation2.dmm --- .../objects/items/devices/suit_cooling.dm | 16 +++++++++++++--- icons/obj/device.dmi | Bin 22594 -> 23837 bytes 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index 4035ab3c0c3..2fcf545d9b4 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -2,8 +2,8 @@ name = "portable suit cooling unit" desc = "A portable heat sink and liquid cooled radiator that can be hooked up to a space suit's existing temperature controls to provide industrial levels of cooling." w_class = 4 - icon = 'icons/obj/power.dmi' //temporary, I hope - icon_state = "portgen0" + icon = 'icons/obj/device.dmi' //temporary, I hope + icon_state = "suitcooler0" slot_flags = SLOT_BACK //you can carry it on your back if you want, but it won't do anything unless attached to suit storage var/on = 0 //is it turned on? @@ -15,6 +15,10 @@ //TODO: make it heat up the surroundings when not in space +/obj/item/device/suit_cooling_unit/New() + cell = new/obj/item/weapon/cell() //comes with the crappy default power cell - high-capacity ones shouldn't be hard to find + cell.loc = src + /obj/item/device/suit_cooling_unit/proc/cool_mob(mob/M) if (!on || !cell) return @@ -134,7 +138,13 @@ return ..() /obj/item/device/suit_cooling_unit/proc/updateicon() - return 0 //TODO + if (cover_open) + if (cell) + icon_state = "suitcooler1" + else + icon_state = "suitcooler2" + else + icon_state = "suitcooler0" /obj/item/device/suit_cooling_unit/examine() set src in view(1) diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index 854829e3985c644ca113cb4a29491ab8e5772f20..7a4fe676021f95249bb74968094781d1f180519b 100644 GIT binary patch delta 2494 zcmV;v2|@P4umPRA0gxAezz7Ba001>5xN`si0+4!CSad{Xb7OL8aCB*JZU6vyoSj$A zPUA2TJ~vMh!8NR!wxGTAvI4C*z$--4c#>Gy9?PB-WuJZzg_4vQJ5>*DrSE4lo*(Bn z|MT?s`89uhdCrdLyd;zF^WCp?wtAO>yL_K-H`%H~*>-&T;~5x#^L>5;tjXVGD<-9qDI{y97R!zYG4|L{d*qQDDZL5MuG1((FZDvve=GJBTd|2r`{;=-Jy4e;|`rf zCDw_!avpa-jifAp%3^#fU_`~JaGt#TM*gB|Vo4?*-3b?nZZk2sBn6T?A>Ch+w#%Fv za%jA)*LS2uyrMqPWfGe291QUc@tuPqDM9Nm5^5V2Mr|Q50z&Dq^p4I;^A->L3=M?- zFjILGD`}`{;x^KdX&^8YM$fS+HWw_7LiYL!Vy(#I6+9t-9oB)y{*h>UrLLfXLdVPE z^n(!xgqlpeF2SP1nw&rrMl`EmKoQV+n4F5x!u2~68>QdQLso24g zyzt_|oL6HqGEmNw6(dc`E%pOfITV!wzkqR2JualQ4$&;+*xp%{YNW9R+mVS68Ak_V zFrbEiDY_)yWV|f}dafASHbJtr@&3@#1Sj}d%1LW06D$SRq^(pb?^V6znkcE~zOV_6 ze8vV#_%?rfeas(Up0oe)ohmpESsALctpXZA0va&0$wE~Ve?Ku%TyY%0zi$=+3o42= zX#YqBVxm1z)`R8ZqzN0+gGWM4YBr=-BPouA|53Q}OxPALJUc7jLU@+)d0tC!2$ha{E zmAVr|wrhL7o=Q9h)^~?+A^`%x7j1RMvEloPL6@fb#H&X?|NhkVt&qauuxxH_HhNeC z0|OF(>HFZ|ATC|HiM9#~44Disw8uVSg27l8>8Osd~k05yVjO~gsJ`oYQ$ua?| zsw($aSL1m!YV=}eW@ZsQdj_NTCh+Ldq~*m9AATRfvu7|fGi$3-UXM>iMDDX31KeL- zZTzfn1rnW^#pt~W<9JzFsp+E|y*Ghqe=-5&yN!s~;}a2)`|_R!;q&=6E#u}GnAhVI z5s^KX32p3ugn&>_ z4i`>7{ImNQP>^Uo?~FPg->vp@em-iyJ_$kf_04IRu_+G3mS0lFYA!4xxh;x7du(0p}mX`KF zN}#^(h^-evQsZ}A-UX#Z#aFxLvE$>oDL(KvD!=>}l@LnNf ziPF(o0KcH;PV&UNi8md0A_@SIe<1)v0PuIBfZw@F3dILy6cD~Yae1TxaRAChIiT!> zKsCgFcM<#iJ>ZWx6ug2WmVgru#xHXFiHOK~X%pc3p3Bfs;uE?8T<`D4%UkWH^5?Ed z^!H!K%UkUTg*IL**GG}2_;Lk4yvFLvGSFB8;4KK00Ek0bS%9L<0ayXBe*z%@WhB1g zTDIb2t^L_>qWwffpP65EFr>1jGcTNL1l{h|i&^VrY zooua-4=EwAjL7gjnnVd8RsgXG2p>u?1F;-KA_1-fO$s2^a+eeF{Wf}Y`NSt8BKKu{ z1p0XD34Z%=ZAw6QcQ=k5e>;}(g5%@k=sdl4J^;M?&Y`?2r=M?-s}M2{$Ynq%0Aw=P z=?PCJk|O{>I1)d#{rQ}4Cq5AoxhG=+w7U8C_Vxk*IyySg-kx|28VCf8W2q`DDzchV zkV$1l1%T9g$izpknhW}o9D`dcXE(l`UsRIjjU@ zH$D*&xhtz4VCy$)+XKCxo5P;nyDiJTeDw;uDl3iei;GcPOOfflzza93ap6Ycr0mG%=6 zkvlT>0OyV-Zs5hfkryleR%t&G5jijIV%Yl4->badej=hbon->_`pw_#?I$Agf{fcC z5fKr+sh9wXh{%(e0Evjmlb8UBh{%(e0Evjmlb8UBh{%)v2gfvyqv1*s_5c6?07*qo IM6N<$g3VsCBLDyZ delta 1242 zcmV<01SR{Ox&gwl0gxAepa=#4002GFw|K8L43?Uk-Vl2&`kWz}lcL;DJ7f(Ni_d#tfZ#XkKW(x#B&+C&^er0-`K+w=K0 z|MT?s`89uhdCrc=PLj#@`R>;`TfIx+yL_K-H`%H~*>?W)$9eF7nD6r&@S5CBwi1$E zzR$~S)i7v0y`NFeV(pnUdgMjmDxkg1Rst0a`99wjyJDBE7~iE4Qza0`YLWFNA=&<{ z&><+_MUA>aFhx;{YVb5F`}aJqQQ+d9jRMzgq90TiWw9NtMw+<0PQ6j!xez=+DD!g=!U8~KZ>$xAZv>Q1;ob(@L7B`MI{3F-clv|Z-Z z5TkLjUf+=t@g4PnE|bvyj$w#*$loyxNex5Nkyauiy!P$yf&t_K!rXehi;k>H)k*PPk2c0@LzMYO5fG8xN>; z@tsxSQO1vd%sf@2@)#fA*m#?A)dOu6azaj@fPry2Zewp8CPeEAw=h~AsoqO6m1h`| z12108IU19Zf$cnr7->>&u^+gKQB(@t0>(l0xRBB^qFKnXJzJG(q_G9tk%Xc~8kgpgK?gjPb@2be8jEIZjGfITsm&sXs?a7GB`Fur&0-E214 z?RKp&L6HcfV&&;$vPr0vS4Sc2?RJYKNiZ6Xuv)FK-|rE}acu?&loMoJf5f1QoghxF z?fLiD;WDu84pD~z0>It)Oa9p7(;?{c_4bf@^ziey^HxYwN)tsq7ch-@Rb8($`f1#A}&a6fH>h)FUU^7AIi|1F*rH_9~1uM*J}?z$pmd>m|`|)5CrBpwiPtJ76R_g?G)^v0lO2ke?(CPDW%a`JN>L& z=sW8OUkAlSuZj2%^}DTq3DfB`pL4(8Z^b20ix$Gz(q%7E@y82`ZA)Yg(D!|(F+kD` z_83BO2j<%RT