cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Screm

Browse Source
This commit is contained in:
Ketrai
2019-06-02 16:35:21 +02:00
parent 6d2a2a9001
commit 227c061a7c
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/turfs/simulated/water_vr.dm
View File

@@ -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. /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 outdoors = FALSE
/turf/simulated/floor/water/deep/indoors /turf/simulated/floor/water/deep/indoors