Skip to content

Commit

Permalink
•added black syndicate jetpack and made necessary changes for it. Sti…
Browse files Browse the repository at this point in the history
…ll not in-game, but fully coded. I'm preparing to use some of them as standard station suits, adding to the grey models we have.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1730 316c924e-a436-60f5-8080-3fe189b3f50e
  • Loading branch information
polyxenitopalidou@gmail.com committed Jun 25, 2011
1 parent f0155a6 commit f1d75fb
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 11 deletions.
9 changes: 7 additions & 2 deletions code/defines/obj/weapon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1369,10 +1369,15 @@ 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/voidpack
/obj/item/weapon/tank/jetpack/void_jetpack
name = "Void Jetpack (oxygen)"
icon_state = "voidjetpack0"
item_state = "voidjetpack0"
item_state = "jetpack"

/obj/item/weapon/tank/jetpack/black_jetpack
name = "Black Jetpack (oxygen)"
icon_state = "black_jetpack0"
item_state = "black_jetpack"

/obj/item/weapon/tank/oxygen
name = "Gas Tank (Oxygen)"
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/closets/malfunction.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/closet/malf/suits/New()
..()
sleep(2)
new /obj/item/weapon/tank/jetpack/voidpack(src)
new /obj/item/weapon/tank/jetpack/void_jetpack(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)
Expand Down
2 changes: 0 additions & 2 deletions code/game/objects/items/weapons/twohanded.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

///General Offhand object properties///


////////////FIREAXE!//////////////


Expand All @@ -16,7 +15,6 @@
src.wielded = 0
src.name = "Fire Axe (Unwielded)"


/obj/item/weapon/fireaxe/attack_self(mob/user as mob)
if( istype(user,/mob/living/carbon/monkey) )
user << "\red It's too heavy for you to fully wield"
Expand Down
2 changes: 2 additions & 0 deletions code/game/objects/tank.dm
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,8 @@
src.on = !( 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 if(src.name == "Black Jetpack (oxygen)")
src.icon_state = text("black_jetpack[]", src.on)
else
src.icon_state = text("jetpack[]", src.on)
if(src.on)
Expand Down
Binary file modified icons/mob/back.dmi
Binary file not shown.
Binary file modified icons/obj/tank.dmi
Binary file not shown.
10 changes: 4 additions & 6 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#define FILE_DIR "code/game/gamemodes/cult"
#define FILE_DIR "code/game/gamemodes/events"
#define FILE_DIR "code/game/gamemodes/extended"
#define FILE_DIR "code/game/gamemodes/extra"
#define FILE_DIR "code/game/gamemodes/malfunction"
#define FILE_DIR "code/game/gamemodes/meteor"
#define FILE_DIR "code/game/gamemodes/nuclear"
Expand Down Expand Up @@ -327,14 +328,13 @@
#include "code\game\gamemodes\blob\theblob.dm"
#include "code\game\gamemodes\changeling\changeling.dm"
#include "code\game\gamemodes\changeling\changeling_powers.dm"
#include "code\game\gamemodes\changeling\traitor_chan.dm"
#include "code\game\gamemodes\cult\cult.dm"
#include "code\game\gamemodes\events\clang.dm"
#include "code\game\gamemodes\events\dust.dm"
#include "code\game\gamemodes\events\ninja_abilities.dm"
#include "code\game\gamemodes\events\ninja_equipment.dm"
#include "code\game\gamemodes\events\space_ninja.dm"
#include "code\game\gamemodes\extended\extended.dm"
#include "code\game\gamemodes\extra\ninja_abilities.dm"
#include "code\game\gamemodes\extra\ninja_equipment.dm"
#include "code\game\gamemodes\extra\space_ninja.dm"
#include "code\game\gamemodes\malfunction\Malf_Modules.dm"
#include "code\game\gamemodes\malfunction\malfunction.dm"
#include "code\game\gamemodes\meteor\meteor.dm"
Expand Down Expand Up @@ -626,7 +626,6 @@
#include "code\modules\admin\create_mob.dm"
#include "code\modules\admin\create_object.dm"
#include "code\modules\admin\create_turf.dm"
#include "code\modules\admin\newbanjob.dm"
#include "code\modules\admin\verbs\adminhelp.dm"
#include "code\modules\admin\verbs\adminjump.dm"
#include "code\modules\admin\verbs\adminsay.dm"
Expand Down Expand Up @@ -787,7 +786,6 @@
#include "code\modules\power\singularity\particle_accelerator\particle_emitter.dm"
#include "code\modules\power\singularity\particle_accelerator\particle_power.dm"
#include "code\unused\vehicle.dm"
#include "code\unused\gamemodes\monkey.dm"
#include "code\WorkInProgress\BrokenInhands.dm"
#include "code\WorkInProgress\buildmode.dm"
#include "code\WorkInProgress\Cameras.dm"
Expand Down

0 comments on commit f1d75fb

Please sign in to comment.