From f606f3569068af2aeb2c987f7f790e6510876272 Mon Sep 17 00:00:00 2001 From: Mloc-Hibernia Date: Sun, 11 May 2014 13:26:28 +0000 Subject: [PATCH] fix messy merge resolution Signed-off-by: Mloc-Hibernia --- code/game/objects/effects/spawners/bombspawner.dm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm index 1f63882eeef..2ef8a9660d8 100644 --- a/code/game/objects/effects/spawners/bombspawner.dm +++ b/code/game/objects/effects/spawners/bombspawner.dm @@ -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