shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jetpack fixes too & co

Browse Source
This commit is contained in:
Ghommie
2019-10-23 19:31:54 +02:00
parent c882c098cc
commit a95b13c24a
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/tanks/jetpack.dm
+8 -8
View File
@@ -17,7 +17,7 @@
/obj/item/tank/jetpack/New()
..()
if(gas_type)
air_contents.gases[gas_type] = (6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
air_contents.gases[gas_type] = ((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))
ion_trail = new
ion_trail.set_up(src)
@@ -69,18 +69,18 @@
if(!on)
return
if((num < 0.005 || air_contents.total_moles() < num))
turn_off()
turn_off(user)
return
var/datum/gas_mixture/removed = air_contents.remove(num)
if(removed.total_moles() < 0.005)
turn_off()
turn_off(user)
return
var/turf/T = get_turf(user)
T.assume_air(removed)
return 1
return TRUE
/obj/item/tank/jetpack/suicide_act(mob/user)
if (istype(user, /mob/living/carbon/human/))
@@ -104,22 +104,22 @@
if(!on)
return
if((num < 0.005 || air_contents.total_moles() < num))
turn_off()
turn_off(user)
return
if(rand(0,250) == 0)
to_chat(user, "<span class='notice'>You feel your jetpack's engines cut out.</span>")
turn_off()
turn_off(user)
return
var/datum/gas_mixture/removed = air_contents.remove(num)
if(removed.total_moles() < 0.005)
turn_off()
turn_off(user)
return
var/turf/T = get_turf(user)
T.assume_air(removed)
return 1
return TRUE
/obj/item/tank/jetpack/void
name = "void jetpack (oxygen)"