cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 19:44:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-newpolsync

Browse Source 
# Conflicts:
#	code/game/objects/items/weapons/tanks/tank_types.dm
#	code/modules/events/canister_leak.dm
#	code/modules/gamemaster/actions/canister_leak.dm
This commit is contained in:
Arokha Sieyes
2017-03-13 01:29:01 -04:00
parent 9feec8e4ed e526a4cdc7
commit 6e8667e948
20 changed files with 248 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/tanks/tank_types.dm
+5 -4
View File
@@ -101,9 +101,10 @@
return
/obj/item/weapon/tank/vox //Can't be a child of phoron or the gas amount gets screwey.
name = "phoron tank" //VOREStation edit
desc = "Contains dangerous phoron. Do not inhale. Warning: extremely flammable." //VOREStation Edit
icon_state = "oxygen_fr"
name = "phoron tank"
desc = "Contains dangerous phoron. Do not inhale. Warning: extremely flammable."
icon_state = "phoron_vox"
item_state = "oxygen_fr"
gauge_icon = null
flags = CONDUCT
distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
@@ -112,7 +113,7 @@
/obj/item/weapon/tank/vox/New()
..()
air_contents.adjust_gas("phoron", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) //VOREStation Edit
air_contents.adjust_gas("phoron", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
return
/*