cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 07:33:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

resolve mapping conflicts

Browse Source
This commit is contained in:
Migratingcocofruit
2025-09-22 12:25:22 +03:00
parent 2594ac8928
commit 129db52501
2 changed files with 1 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/stations/cerestation.dmm
-38
View File
@@ -68629,9 +68629,6 @@
/turf/simulated/floor/plating/airless,
/area/station/maintenance/fsmaint)
"nhl" = (
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: <<<"
},
/obj/structure/table/wood,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -68639,29 +68636,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
/obj/structure/cable/orange{
icon_state = "1-8"
},
/obj/machinery/phone{
pixel_y = 2
},
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: ---"
},
/obj/structure/table/wood,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
/obj/item/paper/ntrep,
/obj/structure/cable{
icon_state = "1-8"
},
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: >>>"
},
/turf/simulated/floor/carpet/royalblack,
/area/station/command/office/ntrep)
"nhu" = (
@@ -96145,7 +96125,6 @@
"sZY" = (
/obj/structure/table/reinforced,
/obj/item/ashtray/bronze{
pixel_y = 0;
pixel_x = 7
},
/obj/item/reagent_containers/drinks/mug/qm{
@@ -109169,35 +109148,18 @@
},
/area/station/public/locker)
"vKl" = (
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: <<<"
},
/obj/structure/table/wood,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/item/paper_bin/nanotrasen,
/obj/structure/cable/orange{
icon_state = "1-2"
},
/obj/item/paper/ntrep{
pixel_x = 2;
pixel_y = 2
},
/obj/item/pen/multi/fountain,
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: ---"
},
/obj/structure/table/wood,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/item/paper_bin/nanotrasen,
/obj/item/pen/multi/fountain,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: >>>"
},
/turf/simulated/floor/carpet/royalblack,
/area/station/command/office/ntrep)
"vKp" = (
_maps/map_files/stations/deltastation.dmm
+1 -231
View File
@@ -53482,45 +53482,21 @@
},
/area/station/hallway/primary/central/se)
"fci" = (
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: <<<"
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable{
icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
/obj/machinery/light{
dir = 1
},
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: ---"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable{
icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: >>>"
},
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -57886,32 +57862,13 @@
},
/area/station/public/sleep)
"gUs" = (
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: <<<"
},
/obj/machinery/power/smes,
/obj/structure/cable{
icon_state = "0-8"
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: ---"
},
/obj/machinery/power/smes,
/obj/machinery/light/small{
dir = 1
},
/obj/structure/cable/extra_insulated{
icon_state = "0-8"
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: >>>"
},
/turf/simulated/floor/plating,
/area/station/maintenance/solar_maintenance/fore_starboard)
"gVj" = (
@@ -61129,21 +61086,11 @@
},
/area/station/public/fitness)
"irp" = (
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: <<<"
},
/obj/effect/turf_decal/stripes/line,
/obj/machinery/light,
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: ---"
},
/obj/effect/turf_decal/stripes/line,
/obj/structure/cable{
icon_state = "4-8"
},
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: >>>"
},
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
"irt" = (
@@ -62253,36 +62200,17 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/distribution)
"iQn" = (
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: <<<"
},
/obj/structure/cable{
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/light/small,
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: ---"
},
/obj/structure/cable/extra_insulated{
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/structure/cable/extra_insulated{
icon_state = "4-8"
},
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: >>>"
},
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"iQz" = (
@@ -67984,28 +67912,6 @@
/obj/effect/spawner/random/fungus/frequent,
/turf/simulated/wall,
/area/station/maintenance/fsmaint)
"loF" = (
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: <<<"
},
/obj/effect/turf_decal/stripes/line,
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: ---"
},
/obj/machinery/light,
/obj/machinery/camera{
c_tag = "Cargo Dock South";
dir = 1
},
/obj/effect/turf_decal/stripes/line,
/obj/structure/cable{
icon_state = "4-8"
},
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: >>>"
},
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
"loM" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/navbeacon{
@@ -69124,9 +69030,6 @@
/turf/simulated/floor/plating,
/area/station/science/rnd)
"lPw" = (
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: <<<"
},
/obj/effect/turf_decal/stripes/line{
dir = 6
},
@@ -69134,18 +69037,9 @@
c_tag = "Cargo Dock South";
dir = 1
},
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: ---"
},
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: >>>"
},
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
"lPJ" = (
@@ -73044,25 +72938,11 @@
/turf/simulated/floor/grass,
/area/station/science/genetics)
"nxH" = (
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: <<<"
},
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/light/small{
dir = 4
},
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: ---"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: >>>"
},
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -77800,21 +77680,9 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"pya" = (
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: <<<"
},
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: ---"
},
/obj/machinery/light{
dir = 8
},
/obj/structure/cable/extra_insulated{
icon_state = "4-8"
},
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: >>>"
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
@@ -80591,25 +80459,8 @@
},
/area/station/engineering/atmos)
"qIT" = (
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: <<<"
},
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: ---"
},
/obj/machinery/light/small{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: >>>"
},
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"qIZ" = (
@@ -85182,25 +85033,13 @@
/turf/simulated/floor/plating,
/area/station/command/office/hos)
"stS" = (
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: <<<"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/light,
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: ---"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable/extra_insulated{
icon_state = "1-4"
},
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: >>>"
},
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -87260,31 +87099,14 @@
},
/area/station/medical/morgue)
"tkQ" = (
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: <<<"
},
/obj/machinery/power/apc/directional/south,
/obj/structure/cable{
icon_state = "0-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: ---"
},
/obj/machinery/power/apc/reinforced/directional/south,
/obj/machinery/light/small{
dir = 4
},
/obj/structure/cable/extra_insulated{
icon_state = "0-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/extra_insulated{
icon_state = "1-8"
},
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: >>>"
},
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "brown"
@@ -89726,19 +89548,10 @@
},
/area/station/security/checkpoint)
"ueX" = (
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: <<<"
},
/obj/machinery/light,
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: ---"
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: >>>"
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
@@ -90658,27 +90471,10 @@
},
/area/station/engineering/transmission_laser)
"uCg" = (
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: <<<"
},
/obj/machinery/status_display{
pixel_y = -32
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/line,
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: ---"
},
/obj/machinery/light,
/obj/machinery/status_display{
pixel_y = -32
},
/obj/effect/turf_decal/stripes/line,
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: >>>"
},
/turf/simulated/floor/engine,
/area/station/engineering/controlroom)
"uCp" = (
@@ -95967,21 +95763,8 @@
},
/area/station/science/storage)
"wHg" = (
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: <<<"
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/line,
/obj/machinery/light,
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: ---"
},
/obj/effect/turf_decal/stripes/line,
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: >>>"
},
/turf/simulated/floor/engine,
/area/station/engineering/controlroom)
"wHo" = (
@@ -97506,23 +97289,10 @@
},
/area/station/security/brig)
"xkD" = (
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: <<<"
},
/obj/effect/decal/cleanable/dirt,
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: ---"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
dir = 8
},
/obj/structure/cable{
icon_state = "1-2"
},
/obj/merge_conflict_marker{
name = "Merge Conflict Marker: >>>"
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutral"
@@ -145337,7 +145107,7 @@ aNw
aBS
aEZ
aBS
loF
aKK
jkW
aTA
aVf