cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 01:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

•added black syndicate jetpack and made necessary changes for it. Still 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.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1730 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
polyxenitopalidou@gmail.com
2011-06-25 17:04:38 +00:00
parent f0155a6b2a
commit f1d75fb05b
7 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/defines/obj/weapon.dm
View File

@@ -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)"

2
code/game/objects/closets/malfunction.dm
View File

@@ -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)

2
code/game/objects/items/weapons/twohanded.dm
View File

@@ -4,7 +4,6 @@
///General Offhand object properties///
////////////FIREAXE!//////////////
@@ -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"

2
code/game/objects/tank.dm
View File

@@ -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)