Skip to content

Commit

Permalink
[MIRROR] Remove duplicate syndi turret on waystation ruin [MDB IGNORE…
Browse files Browse the repository at this point in the history
…] (#24711) (#394)

* Remove duplicate syndi turret on waystation ruin (#79408)

## About The Pull Request
Remove duplicate syndi turret on waystation ruin

## Why It's Good For The Game
Better mapping consistency.

## Changelog
:cl:
del: Remove duplicate syndi turret on waystation ruin
/:cl:

* Remove duplicate syndi turret on waystation ruin

---------

Co-authored-by: SkyratBot <[email protected]>
Co-authored-by: Tim <[email protected]>
  • Loading branch information
3 people authored Nov 1, 2023
1 parent ee2d5a0 commit afe22a2
Showing 1 changed file with 58 additions and 69 deletions.
127 changes: 58 additions & 69 deletions _maps/RandomRuins/SpaceRuins/waystation.dmm
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"ak" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp{
pixel_x = -5;
pixel_y = 2;
start_on = 0
},
/turf/open/floor/wood,
/area/ruin/space/has_grav/waystation/dorms)
"ar" = (
/obj/machinery/vending/coffee,
/obj/effect/turf_decal/siding/green,
Expand Down Expand Up @@ -35,6 +26,15 @@
},
/turf/open/floor/iron/freezer,
/area/ruin/space/has_grav/waystation/dorms)
"bg" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp{
pixel_x = -5;
pixel_y = 2;
start_on = 0
},
/turf/open/floor/wood,
/area/ruin/space/has_grav/waystation/dorms)
"bt" = (
/obj/effect/turf_decal/bot,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -179,6 +179,17 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/ruin/space/has_grav/waystation/dorms)
"dX" = (
/obj/effect/turf_decal/siding/red,
/obj/structure/table/reinforced,
/obj/structure/window/reinforced/spawner/directional/south,
/obj/item/flashlight/lamp{
pixel_x = -5;
pixel_y = 2;
start_on = 0
},
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/waystation/securestorage)
"dY" = (
/obj/effect/mapping_helpers/burnt_floor,
/obj/item/ammo_casing/c45/spent{
Expand Down Expand Up @@ -1377,17 +1388,6 @@
/obj/structure/broken_flooring/pile/directional/east,
/turf/template_noop,
/area/template_noop)
"xk" = (
/obj/machinery/porta_turret/syndicate/pod{
dir = 1;
max_integrity = 80
},
/obj/machinery/porta_turret/syndicate/pod{
dir = 1;
max_integrity = 80
},
/turf/closed/wall/mineral/plastitanium,
/area/ruin/space/has_grav/powered/waystation/assaultpod)
"xq" = (
/obj/machinery/conveyor{
dir = 1;
Expand Down Expand Up @@ -1791,24 +1791,6 @@
/obj/item/storage/toolbox/mechanical/old,
/turf/open/floor/plating,
/area/ruin/space/has_grav/waystation)
"FK" = (
/obj/structure/table,
/obj/item/folder{
pixel_x = 6;
pixel_y = 3
},
/obj/item/pen,
/obj/item/pen{
pixel_x = 6;
pixel_y = 2
},
/obj/item/flashlight/lamp{
pixel_x = -5;
pixel_y = 2;
start_on = 0
},
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/cargooffice)
"FM" = (
/obj/structure/chair/comfy/shuttle{
dir = 4;
Expand Down Expand Up @@ -1911,6 +1893,24 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/ruin/space/has_grav/waystation/dorms)
"IU" = (
/obj/structure/table,
/obj/item/folder{
pixel_x = 6;
pixel_y = 3
},
/obj/item/pen,
/obj/item/pen{
pixel_x = 6;
pixel_y = 2
},
/obj/item/flashlight/lamp{
pixel_x = -5;
pixel_y = 2;
start_on = 0
},
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/cargooffice)
"IZ" = (
/obj/effect/turf_decal/loading_area/red{
dir = 8
Expand Down Expand Up @@ -2101,6 +2101,16 @@
},
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/cargooffice)
"LL" = (
/obj/structure/table/wood,
/obj/effect/decal/cleanable/dirt,
/obj/item/flashlight/lamp{
pixel_x = -5;
pixel_y = 2;
start_on = 0
},
/turf/open/floor/wood,
/area/ruin/space/has_grav/waystation/dorms)
"LQ" = (
/obj/effect/decal/cleanable/blood/splatter,
/obj/effect/decal/cleanable/blood/tracks{
Expand Down Expand Up @@ -2458,16 +2468,6 @@
},
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/cargooffice)
"RO" = (
/obj/structure/table/wood,
/obj/effect/decal/cleanable/dirt,
/obj/item/flashlight/lamp{
pixel_x = -5;
pixel_y = 2;
start_on = 0
},
/turf/open/floor/wood,
/area/ruin/space/has_grav/waystation/dorms)
"RW" = (
/obj/effect/turf_decal/tile/brown/half/contrasted,
/obj/item/kirbyplants/random,
Expand Down Expand Up @@ -2581,17 +2581,6 @@
},
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/dorms)
"Uc" = (
/obj/effect/turf_decal/siding/red,
/obj/structure/table/reinforced,
/obj/structure/window/reinforced/spawner/directional/south,
/obj/item/flashlight/lamp{
pixel_x = -5;
pixel_y = 2;
start_on = 0
},
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/waystation/securestorage)
"Ud" = (
/obj/machinery/door/airlock,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
Expand Down Expand Up @@ -4007,22 +3996,22 @@ pK
pK
pK
Ls
ak
bg
Of
Ls
RO
LL
Of
lB
ak
bg
dW
Ls
RO
LL
dW
Ls
ak
bg
dW
Ls
ak
bg
TL
QN
Dj
Expand Down Expand Up @@ -4646,7 +4635,7 @@ xw
jV
UG
lx
FK
IU
Dc
fc
zh
Expand Down Expand Up @@ -4714,7 +4703,7 @@ Qx
SL
jG
my
xk
lM
tb
FM
TW
Expand Down Expand Up @@ -4832,7 +4821,7 @@ xw
jV
UG
xv
FK
IU
Dc
Cx
Pd
Expand Down Expand Up @@ -5063,7 +5052,7 @@ pK
yi
vn
LQ
Uc
dX
Oj
WS
yi
Expand Down

0 comments on commit afe22a2

Please sign in to comment.