cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-24 12:36:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev

Browse Source 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm
This commit is contained in:
Mloc-Hibernia
2014-05-11 13:19:09 +00:00
parent 70ac5726dd 29a8059f53
commit e3a8d5eb43
30 changed files with 1576 additions and 1471 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spawners/bombspawner.dm
+6
View File
@@ -136,9 +136,15 @@
PT.master = V
OT.master = V
<<<<<<< HEAD
PT.air_contents.temperature = PHORON_FLASHPOINT
PT.air_contents.phoron = 3
PT.air_contents.carbon_dioxide = 17
=======
PT.air_contents.temperature = PLASMA_FLASHPOINT
PT.air_contents.toxins = 12
PT.air_contents.carbon_dioxide = 8
>>>>>>> upstream/master
PT.air_contents.update_values()
OT.air_contents.temperature = PHORON_FLASHPOINT