From a7f5702981dafa6c63089c3bb82ade0ce4f0a46f Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 13 Dec 2018 00:05:18 -0500 Subject: [PATCH 1/3] Fixes major merge errors - Readds missing APC to the third floor station - Readds missing syringes.dm to the dme file Considering the nature of these errors, there may be more merge errors hidden. --- maps/tether/tether-07-station3.dmm | 22 +++++++++++++++++++++- vorestation.dme | 1 + 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 4dd2356bd7..170b510e4c 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -17216,6 +17216,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled, /area/hallway/station/upper) "Bm" = ( @@ -27411,6 +27414,23 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/carpet, /area/security/breakroom) +"Uo" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/machinery/power/apc{ + dir = 2; + name = "south bump"; + pixel_y = -28 + }, +/obj/structure/cable, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "Up" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ @@ -33396,7 +33416,7 @@ yk wf Aa Bl -Ca +Uo Da DF EB diff --git a/vorestation.dme b/vorestation.dme index 07d2b1b4ab..0f3338c8ee 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2636,6 +2636,7 @@ #include "code\modules\reagents\reagent_containers\spray.dm" #include "code\modules\reagents\reagent_containers\spray_vr.dm" #include "code\modules\reagents\reagent_containers\syringes.dm" +#include "code\modules\reagents\reagent_containers\syringes_vr.dm" #include "code\modules\recycling\conveyor2.dm" #include "code\modules\recycling\disposal-construction.dm" #include "code\modules\recycling\disposal.dm" From b48efb138fd2915f9e86913a17915a1eb50b2bcb Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 13 Dec 2018 00:33:32 -0500 Subject: [PATCH 2/3] More merge conflict fixes I think I got them all. --- .../{reagents/reagent_containers => food}/glass/bottle_vr.dm | 0 code/{game/machinery => modules/food}/kitchen/smartfridge_vr.dm | 0 vorestation.dme | 2 ++ 3 files changed, 2 insertions(+) rename code/modules/{reagents/reagent_containers => food}/glass/bottle_vr.dm (100%) rename code/{game/machinery => modules/food}/kitchen/smartfridge_vr.dm (100%) diff --git a/code/modules/reagents/reagent_containers/glass/bottle_vr.dm b/code/modules/food/glass/bottle_vr.dm similarity index 100% rename from code/modules/reagents/reagent_containers/glass/bottle_vr.dm rename to code/modules/food/glass/bottle_vr.dm diff --git a/code/game/machinery/kitchen/smartfridge_vr.dm b/code/modules/food/kitchen/smartfridge_vr.dm similarity index 100% rename from code/game/machinery/kitchen/smartfridge_vr.dm rename to code/modules/food/kitchen/smartfridge_vr.dm diff --git a/vorestation.dme b/vorestation.dme index 0f3338c8ee..4544ceecac 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1775,11 +1775,13 @@ #include "code\modules\food\food\drinks\bottle\robot.dm" #include "code\modules\food\food\snacks\meat.dm" #include "code\modules\food\glass\bottle.dm" +#include "code\modules\food\glass\bottle_vr.dm" #include "code\modules\food\glass\bottle\robot.dm" #include "code\modules\food\kitchen\gibber.dm" #include "code\modules\food\kitchen\icecream.dm" #include "code\modules\food\kitchen\microwave.dm" #include "code\modules\food\kitchen\smartfridge.dm" +#include "code\modules\food\kitchen\smartfridge_vr.dm" #include "code\modules\food\kitchen\cooking_machines\_cooker.dm" #include "code\modules\food\kitchen\cooking_machines\_cooker_output.dm" #include "code\modules\food\kitchen\cooking_machines\candy.dm" From 5eac21477db0032fcb21bf4b34c6ad0c74a936bf Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 13 Dec 2018 00:44:34 -0500 Subject: [PATCH 3/3] This is probably a better spot --- maps/tether/tether-07-station3.dmm | 83 +++++++++++++++++++++--------- 1 file changed, 60 insertions(+), 23 deletions(-) diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 170b510e4c..e0cc536a33 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -15395,6 +15395,16 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 10 }, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_x = 0; + pixel_y = 28 + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, /turf/simulated/floor/tiled, /area/hallway/station/upper) "yF" = ( @@ -16035,6 +16045,12 @@ /obj/effect/floor_decal/corner/lightgrey{ dir = 9 }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, /turf/simulated/floor/tiled, /area/hallway/station/upper) "zz" = ( @@ -17216,9 +17232,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "2-4" - }, /turf/simulated/floor/tiled, /area/hallway/station/upper) "Bm" = ( @@ -27354,6 +27367,25 @@ /obj/machinery/meter, /turf/simulated/floor/tiled, /area/security/eva) +"Rn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "Rs" = ( /obj/machinery/button/windowtint{ id = "sec_processing"; @@ -27414,23 +27446,6 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/carpet, /area/security/breakroom) -"Uo" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/machinery/power/apc{ - dir = 2; - name = "south bump"; - pixel_y = -28 - }, -/obj/structure/cable, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "Up" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ @@ -27515,6 +27530,28 @@ }, /turf/simulated/floor/bluegrid, /area/ai/foyer) +"XT" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "ZO" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, @@ -33416,7 +33453,7 @@ yk wf Aa Bl -Uo +Ca Da DF EB @@ -36964,8 +37001,8 @@ tn sp yE zy -As -Bz +XT +Rn Cn Dr DZ