cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4620 from VOREStation/upstream-merge-5779

Browse Source 
[MIRROR] Emergency tanks start full
This commit is contained in:
Novacat
2019-03-27 03:40:45 -04:00
committed by GitHub
parent 1a9107a037 525579fb73
commit 7a13562736
2 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/items/weapons/tanks/tank_types.dm
View File

@@ -139,7 +139,7 @@
/obj/item/weapon/tank/emergency/oxygen/New() /obj/item/weapon/tank/emergency/oxygen/New()
..() ..()
src.air_contents.adjust_gas("oxygen", (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) src.air_contents.adjust_gas("oxygen", (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
return return
@@ -167,7 +167,7 @@
/obj/item/weapon/tank/emergency/nitrogen/New() /obj/item/weapon/tank/emergency/nitrogen/New()
..() ..()
src.air_contents.adjust_gas("nitrogen", (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) src.air_contents.adjust_gas("nitrogen", (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/weapon/tank/emergency/nitrogen/double /obj/item/weapon/tank/emergency/nitrogen/double
name = "double emergency nitrogen tank" name = "double emergency nitrogen tank"
@@ -183,7 +183,7 @@
/obj/item/weapon/tank/emergency/phoron/New() /obj/item/weapon/tank/emergency/phoron/New()
..() ..()
src.air_contents.adjust_gas("phoron", (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) src.air_contents.adjust_gas("phoron", (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/weapon/tank/emergency/phoron/double /obj/item/weapon/tank/emergency/phoron/double
name = "double emergency phoron tank" name = "double emergency phoron tank"

36
html/changelogs/Novacat-PR-5779.yml Normal file
View File

@@ -0,0 +1,36 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
#################################
# Your name.
author: Novacat
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- tweak: "All emergency tanks now spawn at full capacity."