cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-23 05:07:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5978 from Heroman3003/decalfix

Browse Source 
Fixes floor decals near fishery
This commit is contained in:
Novacat
2019-09-27 01:15:51 -04:00
committed by GitHub
parent cc286a2709 f61994e355
commit 09f862f448
1 changed files with 43 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maps/tether/tether-02-surface2.dmm
+43 -46
View File
@@ -5361,18 +5361,34 @@
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 1
},
/obj/effect/floor_decal/borderfloor/corner2{
dir = 1
},
/obj/effect/floor_decal/corner/lightgrey/bordercorner2{
dir = 1
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/north_staires_two)
"ly" = (
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals6{
dir = 10
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
/obj/effect/floor_decal/borderfloor/corner2{
dir = 9
},
/obj/effect/floor_decal/corner/lightgrey/bordercorner2{
dir = 9
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/north_staires_two)
@@ -5602,28 +5618,27 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/north_staires_two)
"lQ" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals6{
dir = 5
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
/obj/effect/floor_decal/borderfloor{
dir = 1;
pixel_y = 0
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
/obj/effect/floor_decal/borderfloor/corner2{
dir = 4
},
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
/obj/effect/floor_decal/corner/lightgrey/bordercorner2{
dir = 9
dir = 4
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/north_staires_two)
/area/tether/surfacebase/atrium_two)
"lR" = (
/obj/machinery/alarm{
dir = 4;
@@ -5673,22 +5688,16 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/fish_farm)
"lX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/effect/floor_decal/borderfloor{
dir = 1;
pixel_y = 0
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 1
},
/obj/effect/floor_decal/corner/lightgrey/bordercorner2{
/obj/structure/cable{
icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
/obj/effect/floor_decal/borderfloor/corner2,
/obj/effect/floor_decal/corner/lightgrey/bordercorner2,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/atrium_two)
"lY" = (
@@ -5816,18 +5825,6 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/fish_farm)
"mi" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
/obj/effect/floor_decal/corner/lightgrey/bordercorner2,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/atrium_two)
"mj" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -30963,8 +30960,8 @@ hE
lr
hF
hD
lQ
lX
mi
dY
iO
je
@@ -32665,8 +32662,8 @@ gu
ge
gQ
hf
iA
ly
lQ
md
mn
mz