From e466429b67b966ce8b8d1f967073d6138d0c1d4d Mon Sep 17 00:00:00 2001 From: "polyxenitopalidou@gmail.com" Date: Mon, 17 Jan 2011 21:30:06 +0000 Subject: [PATCH] =?UTF-8?q?=E2=80=A2New=20matchbox=20and=20match=20sprites?= =?UTF-8?q?,=20so=20they=20don't=20look=20fucking=20awkward=20anymore.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Project shrink silly sprites is only just starting. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@887 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/weapon.dm | 4 ++-- .../objects/items/weapons/cigs_lighters.dm | 12 +++++------- icons/obj/cigarettes.dmi | Bin 1449 -> 1993 bytes 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index b85cf244f18..a185fd7f1cc 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -29,10 +29,10 @@ /obj/item/weapon/matchbox name = "Matchbox" - desc = "A box of matches" + desc = "A small box of Almost But Not Quite Plasma Premium Matches." icon = 'cigarettes.dmi' icon_state = "matchbox" - var/matchcount = 20 + var/matchcount = 10 /obj/item/weapon/rcd name = "rapid-construction-device (RCD)" diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 39e85ffbd7a..e948d4b6cff 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -49,13 +49,11 @@ ZIPPO else return ..() if(src.matchcount <= 0) - src.icon_state = "matchbox_e" - else if(src.matchcount <= 5) - src.icon_state = "matchbox_1q" - else if(src.matchcount <= 10) - src.icon_state = "matchbox_h" - else if(src.matchcount <= 15) - src.icon_state = "matchbox_3q" + src.icon_state = "matchbox_empty" + else if(src.matchcount <= 3) + src.icon_state = "matchbox_almostempty" + else if(src.matchcount <= 6) + src.icon_state = "matchbox_almostfull" else src.icon_state = "matchbox" src.update_icon() diff --git a/icons/obj/cigarettes.dmi b/icons/obj/cigarettes.dmi index bdc762803b9ab3906cb43445d5f14307e9547336..bae1b0d36429a3c277efc3e05934ca91e1edd383 100644 GIT binary patch delta 1835 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 M07*qoM6N<$g8mAT6951J