cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-10 01:12:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Baystation12/Baystation12

Browse Source
This commit is contained in:
Erthilo
2012-05-12 16:42:54 +01:00
parent 0850cd8ba4 e7843e6f2f
commit aaa3e11993
60 changed files with 8421 additions and 8556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/devices/PDA/PDA.dm
View File

@@ -331,7 +331,7 @@
var/datum/gas_mixture/environment = T.return_air()
var/pressure = environment.return_pressure()
var/total_moles = environment.total_moles()
var/total_moles = environment.total_moles
dat += "Air Pressure: [round(pressure,0.1)] kPa<br>"

2
code/game/objects/devices/scanners.dm
View File

@@ -369,7 +369,7 @@ MASS SPECTROMETER
var/datum/gas_mixture/environment = location.return_air()
var/pressure = environment.return_pressure()
var/total_moles = environment.total_moles()
var/total_moles = environment.total_moles
user.show_message("\blue <B>Results:</B>", 1)
if(abs(pressure - ONE_ATMOSPHERE) < 10)

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

@@ -133,7 +133,7 @@
for (var/mob/O in viewers(user, null))
O << "\red [user] has used the analyzer on \icon[icon]"
var/pressure = src.ptank.air_contents.return_pressure()
var/total_moles = src.ptank.air_contents.total_moles()
var/total_moles = src.ptank.air_contents.total_moles
user << "\blue Results of analysis of \icon[icon]"
if (total_moles>0)

3
code/game/objects/mineral_doors.dm
View File

@@ -234,6 +234,7 @@
napalm.toxins = toxinsToDeduce
napalm.temperature = 400+T0C
napalm.update_values()
target_tile.assume_air(napalm)
spawn (0) target_tile.hotspot_expose(temperature, 400)
@@ -304,4 +305,4 @@
isSwitchingStates = 0
Dismantle(devastated = 0)
del(src)
del(src)

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

@@ -210,7 +210,7 @@
var/pressure = air_contents.return_pressure()
var/total_moles = air_contents.total_moles()
var/total_moles = air_contents.total_moles
user << "\blue Results of analysis of \icon[icon]"
if (total_moles>0)
@@ -258,6 +258,7 @@
..()
/obj/item/weapon/tank/examine()
set src in oview()
var/obj/icon = src
if (istype(src.loc, /obj/item/assembly))
icon = src.loc
@@ -290,6 +291,7 @@
src.air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD
src.air_contents.nitrogen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
air_contents.update_values()
return
@@ -302,17 +304,19 @@
trace_gas.moles = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
src.air_contents.trace_gases += trace_gas
air_contents.update_values()
return
/obj/item/weapon/tank/plasma/New()
..()
src.air_contents.toxins = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C)
air_contents.update_values()
return
/obj/item/weapon/tank/plasma/proc/release()
var/datum/gas_mixture/removed = air_contents.remove(air_contents.total_moles())
var/datum/gas_mixture/removed = air_contents.remove(air_contents.total_moles)
loc.assume_air(removed)

7
code/game/objects/tanks/emergency.dm
View File

@@ -11,7 +11,7 @@
New()
..()
src.air_contents.oxygen = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
air_contents.adjustGases((3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
return
@@ -41,10 +41,7 @@
New()
..()
src.air_contents.oxygen = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD
var/datum/gas/sleeping_agent/trace_gas = new()
trace_gas.moles = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
src.air_contents.trace_gases += trace_gas
air_contents.adjustGases((3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD, traces = list(trace_gas))
return

8
code/game/objects/tanks/jetpack.dm
View File

@@ -53,7 +53,7 @@
proc/allow_thrust(num, mob/living/user as mob)
if(!(src.on))
return 0
if((num < 0.005 || src.air_contents.total_moles() < num))
if((num < 0.005 || src.air_contents.total_moles < num))
src.ion_trail.stop()
return 0
@@ -75,7 +75,7 @@
New()
..()
src.air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
air_contents.adjustGases((6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
return
/obj/item/weapon/tank/jetpack/oxygen
@@ -86,7 +86,7 @@
New()
..()
src.air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
air_contents.adjustGases((6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
return
/obj/item/weapon/tank/jetpack/carbondioxide
@@ -99,7 +99,7 @@
..()
src.ion_trail = new /datum/effect/effect/system/ion_trail_follow()
src.ion_trail.set_up(src)
src.air_contents.carbon_dioxide = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
air_contents.adjustGases(0,(6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
return
examine()

2
code/game/objects/tanks/oxygen.dm
View File

@@ -8,7 +8,7 @@
New()
..()
src.air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
air_contents.adjustGases((6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
return

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

@@ -38,6 +38,7 @@
trace_gas.moles = 30
payload += trace_gas
payload.update_values()
target.air.merge(payload)
@@ -53,6 +54,7 @@
var/datum/gas_mixture/payload = new
payload.toxins = 30
payload.update_values()
target.air.merge(payload)