cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 15:38:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix messy merge resolution

Browse Source 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
This commit is contained in:
Mloc-Hibernia
2014-05-11 13:26:28 +00:00
parent e3a8d5eb43
commit f606f35690
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spawners/bombspawner.dm
+1 -7
View File
@@ -136,15 +136,9 @@
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.carbon_dioxide = 8␍
PT.air_contents.update_values()
OT.air_contents.temperature = PHORON_FLASHPOINT