From caabcf0820e3e8685c219c56815bc48528597a47 Mon Sep 17 00:00:00 2001 From: "polyxenitopalidou@gmail.com" Date: Fri, 8 Apr 2011 23:39:22 +0000 Subject: [PATCH] =?UTF-8?q?=E2=80=A2Voidpacks=20now=20work,=20and=20have?= =?UTF-8?q?=20sprites=20for=20every=20itemstate.=20Simple=20"if"=20structu?= =?UTF-8?q?re=20added=20in=20the=20toggle-jetpack=20verb=20to=20check=20th?= =?UTF-8?q?e=20type=20of=20the=20suit.=20It's=20friendly=20to=20any=20addi?= =?UTF-8?q?tion=20of=20new=20jetpack=20types.=20I'll=20be=20including=20th?= =?UTF-8?q?ose=20re-sprited=20suits=20soon.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1423 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/weapon.dm | 2 +- code/game/objects/closets/malfunction.dm | 2 +- code/game/objects/tank.dm | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 6c350126677..e561250efe9 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -1295,7 +1295,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov distribute_pressure = ONE_ATMOSPHERE*O2STANDARD //volume = 140 //jetpack sould be larger, but then it will never deplete -rastaf0 -/obj/item/weapon/tank/jetpack/void +/obj/item/weapon/tank/jetpack/voidpack name = "Void Jetpack (oxygen)" icon_state = "voidjetpack0" item_state = "voidjetpack0" diff --git a/code/game/objects/closets/malfunction.dm b/code/game/objects/closets/malfunction.dm index a647887c884..16bde812ed6 100644 --- a/code/game/objects/closets/malfunction.dm +++ b/code/game/objects/closets/malfunction.dm @@ -1,7 +1,7 @@ /obj/closet/malf/suits/New() ..() sleep(2) - new /obj/item/weapon/tank/jetpack(src) + new /obj/item/weapon/tank/jetpack/voidpack(src) new /obj/item/clothing/mask/breath(src) new /obj/item/clothing/head/helmet/space/nasavoid(src) new /obj/item/clothing/suit/space/nasavoid(src) diff --git a/code/game/objects/tank.dm b/code/game/objects/tank.dm index 2bbfe62da36..16030516bf1 100644 --- a/code/game/objects/tank.dm +++ b/code/game/objects/tank.dm @@ -285,7 +285,10 @@ set name = "Toggle Jetpack" set category = "Object" src.on = !( src.on ) - src.icon_state = text("jetpack[]", src.on) + if(src.name == "Void Jetpack (oxygen)") //Slight change added by me. i didn't make it an if-elseif because some of you might want to add other types of resprited packs :3 -Agouri + src.icon_state = text("voidjetpack[]", src.on) + else + src.icon_state = text("jetpack[]", src.on) if(src.on) src.ion_trail.start() else