From 326238e59fe029f8e4ebdd276c49ba7f2ceeeb31 Mon Sep 17 00:00:00 2001 From: TehZombehz Date: Tue, 13 Feb 2018 19:34:46 -0600 Subject: [PATCH] Gives eggbox an inhand image, cleans up heartbox inhands --- code/game/objects/items/storage/fancy.dm | 6 ++++-- icons/mob/inhands/misc/food_lefthand.dmi | Bin 3355 -> 3483 bytes icons/mob/inhands/misc/food_righthand.dmi | Bin 3278 -> 3398 bytes icons/obj/food/containers.dmi | Bin 10799 -> 10806 bytes 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 1cf5162bbe..80fb27a2fc 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -80,6 +80,7 @@ /obj/item/storage/fancy/egg_box icon = 'icons/obj/food/containers.dmi' + item_state = "eggbox" icon_state = "eggbox" icon_type = "egg" lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' @@ -290,8 +291,9 @@ name = "heart-shaped box" desc = "A heart-shaped box for holding tiny chocolates." icon = 'icons/obj/food/containers.dmi' - icon_state = "heartbox" - icon_type = "heart" + item_state = "chocolatebox" + icon_state = "chocolatebox" + icon_type = "chocolate" lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' storage_slots = 8 diff --git a/icons/mob/inhands/misc/food_lefthand.dmi b/icons/mob/inhands/misc/food_lefthand.dmi index 1cb5b00418e6c46bf7128675a978471d267177c7..325b18d95e274d86d620fbb1c7e3cdecf304c29c 100644 GIT binary patch delta 3064 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 Y9AUxMwR`Hyi0=s#Lvw>tJ?Dr21yY@uP5=M^ diff --git a/icons/mob/inhands/misc/food_righthand.dmi b/icons/mob/inhands/misc/food_righthand.dmi index 96957de999d2eb6e18f28685a3fc3698f74495fb..ddc91fd6ed37f22bdee9158a3b2f0e145e799d35 100644 GIT binary patch delta 2809 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 NBRx~y8klqB{{YQk8TJ4G diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi index dd251810915403f9bc76ff604ee86bcaddda6e12..c348fb4f8f0e4ceb4eb1558a168154b809458491 100644 GIT binary patch delta 486 zcmVfFDZ*Bkpc$}Tq!EW0y3;@ux{S`ucErzD) zw(j7|kfO+;{e?iW7+Z)W3KE@0`T89^2Rf`EvzrY((Gn$!zE{6r-?krW^S*6Qkg~;~ zI`#bRv28xBp;2{e{nR!i*kPpkC6gvlox1bZ9q-!4*pyYLR)1}CNZP~vd_@_H$Q>L` ziH|l7npZFkdpv&^x|Ps93Ef)go~84XPVk4&{S>+vq5CCW$fFcWQ!Ne1vS=?CeGA-? z9$0KJOeETvMe=8Mk^JddB!3yp*|$cB3Vf~$eE9M>YK7b{t}jRB{N>eTvS_3)3Yj{hRW2wKTo=d#yMuu0lc9`zBD%!7|q z<^g<}=z<|=n+2skVvkM}NY+?m{s*Gg{BKFE`JP&9zOUAr@2$1w`)jQQZL89JpRM(m cz4l(cer(j{ecS#4I!1*{-l%%Sv-ANwC~J89y#N3J delta 479 zcmV<50U-XiRIgN!B!9fFDZ*Bkpc$}Tqv2NQi5C-5`dI}<0gCdU8 zHXXDS4gwF!D;TtRmI#wPf}|YFPv1eMrv~@Cn*@A3k;fxX_v-iS+xA0k-nZ?EQnnma zr=Gt(w#}zCWmKJ7Kef$Bb{Na@l8Y{+I(6r*JKnX8u_>!gt$*6)khG`e`HC{nkUKb@ zk{oRsw5(_t_I&;hx)tc2K(_|nGde$Xf%>y$U zT)To&=;~T*q<}DO_eRGdN{`lf_QX0h(8K_C(0;!l$AnEg#Edfk@Y@(^JlJ%q!r-6z+5wxSUCE<9Qo=m>SmtGb zd`$GrA!wU{f+n4y^;IbUI8-VBic~50&?@B~TBY1WtCV|am2z9EQtqKue%V9s)$7Mb VZQi%-A658uA1c&B#