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

Merge remote-tracking branch 'Ketrai/fisherdomer' into fisherdomer

Browse Source
This commit is contained in:
Ketrai
2019-06-02 16:28:51 +02:00
parent 360688e0dd 386005599e
commit 6d2a2a9001
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/simulated/water_vr.dm
+4
View File
@@ -1,4 +1,8 @@
<<<<<<< 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
maps/tether/tether-03-surface3.dmm
+1 -1
View File
@@ -20845,8 +20845,8 @@
/turf/simulated/floor/water/deep/indoors,
/area/tether/surfacebase/fish_farm)
"Ir" = (
/turf/simulated/floor/reinforced,
/obj/structure/shuttle/engine/propulsion,
/turf/simulated/floor/reinforced,
/turf/simulated/shuttle/plating/carry,
/area/shuttle/tether/surface)
"IR" = (