From d1d3620a12c2a4f4d64a2ba298b23da65f1cc50a Mon Sep 17 00:00:00 2001 From: Mloc-Hibernia Date: Sun, 11 May 2014 13:56:17 +0000 Subject: [PATCH] fix another merge issue Signed-off-by: Mloc-Hibernia --- code/game/objects/effects/spawners/bombspawner.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm index 2ef8a9660d8..6540b5f3bb5 100644 --- a/code/game/objects/effects/spawners/bombspawner.dm +++ b/code/game/objects/effects/spawners/bombspawner.dm @@ -136,8 +136,8 @@ PT.master = V OT.master = V - PT.air_contents.temperature = PLASMA_FLASHPOINT - PT.air_contents.toxins = 12 + PT.air_contents.temperature = PHORON_FLASHPOINT + PT.air_contents.phoron = 12 PT.air_contents.carbon_dioxide = 8 PT.air_contents.update_values()