From 227c061a7ca1b64f6abe2a460b35f8079d79b34d Mon Sep 17 00:00:00 2001 From: Ketrai Date: Sun, 2 Jun 2019 16:35:21 +0200 Subject: [PATCH] Screm --- code/game/turfs/simulated/water_vr.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/game/turfs/simulated/water_vr.dm b/code/game/turfs/simulated/water_vr.dm index c98f10fe194..ea16037cf73 100644 --- a/code/game/turfs/simulated/water_vr.dm +++ b/code/game/turfs/simulated/water_vr.dm @@ -1,8 +1,4 @@ -<<<<<<< HEAD -/turf/simulated/floor/water/indoors //because it's nice to be able to use these indoors without having a blizzard ignore walls and areas and such. -======= /turf/simulated/floor/water/indoors //because it's nice to be able to use these indoors without having a blizzard ignore walls and areas. ->>>>>>> fisherdomer outdoors = FALSE /turf/simulated/floor/water/deep/indoors