diff --git a/maps/groundbase/groundbase_defines.dm b/maps/groundbase/groundbase_defines.dm index 5575bf38845..f823841515f 100644 --- a/maps/groundbase/groundbase_defines.dm +++ b/maps/groundbase/groundbase_defines.dm @@ -211,19 +211,19 @@ ) lateload_redgate = list( - list("Redgate - Teppi Ranch"), - list("Redgate - Innland"), +// list("Redgate - Teppi Ranch"), +// list("Redgate - Innland"), // list("Redgate - Abandoned Island"), //This will come back later - list("Redgate - Dark Adventure"), - list("Redgate - Eggnog Town Underground","Redgate - Eggnog Town"), - list("Redgate - Star Dog"), - list("Redgate - Hotsprings"), - list("Redgate - Rain City"), - list("Redgate - Islands Underwater","Redgate - Islands"), - list("Redgate - Moving Train", "Redgate - Moving Train Upper Level"), - list("Redgate - Fantasy Dungeon", "Redgate - Fantasy Town"), - list("Redgate - Snowglobe"), - list("Redgate - Pet Island") +// list("Redgate - Dark Adventure"), +// list("Redgate - Eggnog Town Underground","Redgate - Eggnog Town"), +// list("Redgate - Star Dog"), +// list("Redgate - Hotsprings"), +// list("Redgate - Rain City"), +// list("Redgate - Islands Underwater","Redgate - Islands"), +// list("Redgate - Moving Train", "Redgate - Moving Train Upper Level"), + list("Redgate - Fantasy Dungeon", "Redgate - Fantasy Town") +// list("Redgate - Snowglobe"), +// list("Redgate - Pet Island") ) lateload_gb_north = list( diff --git a/maps/groundbase/rp-z2.dmm b/maps/groundbase/rp-z2.dmm index d43eaa6c0d1..48daaed2f95 100644 --- a/maps/groundbase/rp-z2.dmm +++ b/maps/groundbase/rp-z2.dmm @@ -3860,9 +3860,6 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/triage) "nu" = ( -/obj/structure/cable/green{ - dir = 1 - }, /obj/machinery/door/blast/regular{ closed_layer = 10; density = 0; @@ -3875,6 +3872,9 @@ open_layer = 1 }, /obj/structure/grille, +/obj/structure/cable/green{ + icon_state = "0-2" + }, /obj/structure/window/reinforced/full, /obj/structure/window/reinforced{ dir = 1 @@ -4147,7 +4147,7 @@ open_layer = 1 }, /obj/structure/cable/green{ - dir = 1 + icon_state = "0-2" }, /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -4610,15 +4610,13 @@ open_layer = 1 }, /obj/structure/cable/green{ - dir = 4; - icon_state = "1-8" + icon_state = "2-8" }, /obj/structure/cable/green{ - dir = 4 + icon_state = "1-8" }, /obj/structure/cable/green{ - dir = 4; - icon_state = "1-4" + icon_state = "0-8" }, /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -5736,9 +5734,6 @@ opacity = 0; open_layer = 1 }, -/obj/structure/cable/green{ - dir = 1 - }, /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/structure/window/reinforced{ @@ -5747,6 +5742,9 @@ /obj/structure/window/reinforced{ dir = 1 }, +/obj/structure/cable/green{ + icon_state = "0-2" + }, /turf/simulated/floor/plating, /area/groundbase/command/bridge) "tw" = ( @@ -9171,14 +9169,13 @@ open_layer = 1 }, /obj/structure/cable/green{ - dir = 8; icon_state = "1-4" }, /obj/structure/cable/green{ - dir = 8 + icon_state = "2-4" }, /obj/structure/cable/green{ - icon_state = "1-4" + icon_state = "0-4" }, /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -10227,6 +10224,28 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/dorms) +"IW" = ( +/obj/machinery/door/blast/regular{ + closed_layer = 10; + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "bridge blast"; + layer = 1; + name = "Bridge Blast Doors"; + opacity = 0; + open_layer = 1 + }, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/groundbase/command/bridge) "IX" = ( /obj/machinery/button/remote/airlock{ id = "dorm7"; @@ -13192,9 +13211,6 @@ layer = 3.1; name = "HoP's Shutters" }, -/obj/structure/cable/green{ - dir = 1 - }, /turf/simulated/floor/plating, /area/groundbase/command/hop) "Sq" = ( @@ -14066,9 +14082,6 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/triage) "UZ" = ( -/obj/effect/landmark{ - name = "lightsout" - }, /obj/effect/floor_decal/emblem/nt2, /obj/structure/cable/yellow{ icon_state = "2-4" @@ -28151,7 +28164,7 @@ Ng Ng Vf Ng -nu +IW Hf xU dO @@ -28293,7 +28306,7 @@ Ng Ng Vf Ng -nu +IW nj LB At @@ -28435,7 +28448,7 @@ Ng Tb Vf Ng -nu +IW yu Tu UZ @@ -28577,7 +28590,7 @@ fm fm eZ Ng -nu +IW Vg LB zt @@ -28719,7 +28732,7 @@ Ng Tb Vf Ng -nu +IW Ww xU Nr @@ -28861,7 +28874,7 @@ Ng Ng Vf Ng -nu +IW Np sM fs diff --git a/vorestation.dme b/vorestation.dme index 4059e1d51f3..8b29516ace3 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4290,6 +4290,7 @@ #include "maps\expedition_vr\beach\submaps\mountains.dm" #include "maps\expedition_vr\beach\submaps\mountains_areas.dm" #include "maps\gateway_archive_vr\blackmarketpackers.dm" +#include "maps\groundbase\groundbase.dm" #include "maps\redgate\fantasy_items.dm" #include "maps\redgate\code\snowglobe_rs.dm" #include "maps\southern_cross\items\clothing\sc_accessory.dm" @@ -4298,7 +4299,6 @@ #include "maps\southern_cross\loadout\loadout_suit.dm" #include "maps\southern_cross\loadout\loadout_uniform.dm" #include "maps\southern_cross\loadout\loadout_vr.dm" -#include "maps\stellar_delight\stellar_delight.dm" #include "maps\submaps\_helpers.dm" #include "maps\submaps\_readme.dm" #include "maps\submaps\admin_use_vr\event_autonomous_drone.dm"