cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix another merge issue

Browse Source 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
This commit is contained in:
Mloc-Hibernia
2014-05-11 13:56:17 +00:00
parent f2924c9f57
commit d1d3620a12
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/effects/spawners/bombspawner.dm
View File

@@ -136,8 +136,8 @@
PT.master = V PT.master = V
OT.master = V OT.master = V
PT.air_contents.temperature = PLASMA_FLASHPOINT PT.air_contents.temperature = PHORON_FLASHPOINT
PT.air_contents.toxins = 12 PT.air_contents.phoron = 12
PT.air_contents.carbon_dioxide = 8 PT.air_contents.carbon_dioxide = 8
PT.air_contents.update_values() PT.air_contents.update_values()