diff --git a/code/modules/halo/icons/railing.dmi b/code/modules/halo/icons/railing.dmi index 75c74acfe858b..3a4b912cacc35 100644 Binary files a/code/modules/halo/icons/railing.dmi and b/code/modules/halo/icons/railing.dmi differ diff --git a/code/modules/halo/structures/barricade.dm b/code/modules/halo/structures/barricade.dm index 10a319d63d53c..dc10dbaa81cfc 100644 --- a/code/modules/halo/structures/barricade.dm +++ b/code/modules/halo/structures/barricade.dm @@ -157,4 +157,21 @@ /obj/structure/destructible/railing/dark/halfright name = "half-right railing" desc = "Half of a metal railing, connected to the corners." - icon_state = "railing_half_right_dark" \ No newline at end of file + icon_state = "railing_half_right_dark" + +// INDUSTRIAL RAILING // + +/obj/structure/destructible/railing/industrial + desc = "A dark, metal railing." + icon_state = "railing_industrial" + maxHealth = 1500 // High health to accommodate high damage halo weaponry to prevent decor annihilation with just one stray bullet + health = 1500 + +/obj/structure/destructible/railing/industrial/mounted + icon_state = "railing_overlay" + +/obj/structure/destructible/railing/industrial/corner + icon_state = "railing_deco" + flags = ON_BORDER + density = 0 + cover_rating = 0 diff --git a/code/modules/halo/structures/stairs_decorative.dm b/code/modules/halo/structures/stairs_decorative.dm index bb2cc2f2a9a1b..9d4a1cac0cca5 100644 --- a/code/modules/halo/structures/stairs_decorative.dm +++ b/code/modules/halo/structures/stairs_decorative.dm @@ -52,4 +52,9 @@ /obj/structure/stairs_decorative/dark/west dir = WEST - bound_width = 64 \ No newline at end of file + bound_width = 64 + +/obj/structure/stairs_decorative/industrial + name = "industrial stairs" + icon = 'icons/obj/stairs.dmi' + icon_state = "industrialstair" diff --git a/icons/obj/stairs.dmi b/icons/obj/stairs.dmi index b0c14147e5f4f..83312568abdf0 100644 Binary files a/icons/obj/stairs.dmi and b/icons/obj/stairs.dmi differ diff --git a/maps/desert_outpost/turfs_areas.dm b/maps/desert_outpost/areas.dm similarity index 76% rename from maps/desert_outpost/turfs_areas.dm rename to maps/desert_outpost/areas.dm index 410ef83723207..4ef0f3ec9e9bd 100644 --- a/maps/desert_outpost/turfs_areas.dm +++ b/maps/desert_outpost/areas.dm @@ -13,8 +13,5 @@ base_turf = /turf/simulated/floor/asteroid/planet requires_power = 0 -/area/planet/stranded_outpost - name = "Stranded Outpost" +/area/planet/daynight/floor1 icon_state = "security" - base_turf = /turf/simulated/floor/asteroid/planet - requires_power = 0 diff --git a/maps/desert_outpost/desert_outpost1.dmm b/maps/desert_outpost/desert_outpost1.dmm new file mode 100644 index 0000000000000..88b3d5f5f3380 --- /dev/null +++ b/maps/desert_outpost/desert_outpost1.dmm @@ -0,0 +1,164 @@ +"aa" = (/turf/unsimulated/mineral,/area/planet/daynight) +"ab" = (/turf/simulated/floor/asteroid/planet,/area/planet/daynight) +"ac" = (/obj/effect/landmark/spawn_easy,/turf/unsimulated/floor/desert,/area/planet/daynight) +"ad" = (/turf/unsimulated/floor/desert,/area/planet/daynight) +"ae" = (/obj/structure/tree/palm,/turf/unsimulated/floor/desert,/area/planet/daynight) +"af" = (/obj/effect/landmark/resupply,/turf/unsimulated/floor/desert,/area/planet/daynight) +"ag" = (/obj/effect/landmark/spawn_legendary,/turf/unsimulated/floor/desert,/area/planet/daynight) +"ah" = (/obj/structure/tree/palm_giant,/turf/unsimulated/floor/desert,/area/planet/daynight) +"ai" = (/obj/effect/landmark/spawn_medium,/turf/unsimulated/floor/desert,/area/planet/daynight) +"aj" = (/turf/simulated/floor/road/empty,/area/planet/daynight) +"ak" = (/turf/simulated/floor/road/corner{icon_state = "road_corner"; dir = 8},/area/planet/daynight) +"al" = (/turf/simulated/floor/road{icon_state = "road"; dir = 1},/area/planet/daynight) +"am" = (/turf/simulated/floor/road/corner{icon_state = "road_corner"; dir = 1},/area/planet/daynight) +"an" = (/turf/simulated/floor/road/markings{icon_state = "road_marking"; dir = 8},/area/planet/daynight) +"ao" = (/obj/effect/landmark/resupply_skip,/turf/unsimulated/floor/desert,/area/planet/daynight) +"ap" = (/turf/simulated/floor/road{icon_state = "road"; dir = 8},/area/planet/daynight) +"aq" = (/turf/simulated/floor/road/markings,/area/planet/daynight) +"ar" = (/turf/simulated/floor/road{icon_state = "road"; dir = 4},/area/planet/daynight) +"as" = (/obj/structure/destructible/railing/industrial/corner,/turf/unsimulated/floor/desert,/area/planet/daynight) +"at" = (/obj/structure/destructible/railing/industrial,/turf/unsimulated/floor/desert,/area/planet/daynight) +"au" = (/obj/structure/destructible/railing/industrial/corner{icon_state = "railing_deco"; dir = 1},/turf/unsimulated/floor/desert,/area/planet/daynight) +"av" = (/obj/machinery/light/street,/turf/unsimulated/floor/desert,/area/planet/daynight) +"aw" = (/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 4},/turf/unsimulated/floor/desert,/area/planet/daynight) +"ax" = (/obj/structure/destructible/sandbag{dir = 8},/obj/structure/destructible/sandbag{dir = 1},/turf/simulated/floor/tiled/steel_grid,/area/planet/daynight) +"ay" = (/obj/structure/destructible/sandbag{dir = 1},/turf/simulated/floor/tiled/steel_grid,/area/planet/daynight) +"az" = (/obj/structure/destructible/sandbag{dir = 1},/obj/structure/destructible/sandbag{dir = 4},/turf/simulated/floor/tiled/steel_grid,/area/planet/daynight) +"aA" = (/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 8},/turf/unsimulated/floor/desert,/area/planet/daynight) +"aB" = (/obj/machinery/light/street,/turf/simulated/floor/road/empty,/area/planet/daynight) +"aC" = (/obj/structure/destructible/sandbag{dir = 8},/obj/structure/turret/chaingun{dir = 8; icon_state = "chaingunturret"; plane = -14},/turf/simulated/floor/tiled/steel_grid,/area/planet/daynight) +"aD" = (/turf/simulated/floor/tiled/steel_grid,/area/planet/daynight) +"aE" = (/obj/structure/destructible/sandbag{dir = 4},/turf/simulated/floor/tiled/steel_grid,/area/planet/daynight) +"aF" = (/obj/machinery/light/street,/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 8},/turf/unsimulated/floor/desert,/area/planet/daynight) +"aG" = (/turf/unsimulated/wall{icon_state = "0"},/area/planet/daynight) +"aH" = (/turf/simulated/floor/tiled/techfloor,/area/planet/daynight) +"aI" = (/obj/structure/destructible/sandbag,/obj/structure/destructible/sandbag{dir = 8},/turf/simulated/floor/tiled/steel_grid,/area/planet/daynight) +"aJ" = (/obj/structure/destructible/sandbag,/turf/simulated/floor/tiled/steel_grid,/area/planet/daynight) +"aK" = (/obj/structure/stairs_decorative/industrial{icon_state = "industrialstair"; dir = 8},/turf/simulated/floor/tiled/steel_grid,/area/planet/daynight) +"aL" = (/obj/effect/evac_ship,/turf/simulated/floor/road/empty,/area/planet/daynight) +"aM" = (/obj/structure/destructible/railing/industrial/corner{icon_state = "railing_deco"; dir = 8},/turf/unsimulated/floor/desert,/area/planet/daynight) +"aN" = (/obj/structure/destructible/railing/industrial/mounted,/turf/unsimulated/floor/desert,/area/planet/daynight) +"aO" = (/obj/structure/destructible/railing/industrial/corner{icon_state = "railing_deco"; dir = 4},/turf/unsimulated/floor/desert,/area/planet/daynight) +"aP" = (/obj/machinery/light/spot{icon_state = "tube1"; dir = 8},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight) +"aQ" = (/obj/machinery/light/spot{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight) +"aR" = (/obj/vehicles/warthog/turretless,/turf/simulated/floor/road/empty,/area/planet/daynight) +"aS" = (/turf/simulated/floor/road/corner,/area/planet/daynight) +"aT" = (/turf/simulated/floor/road,/area/planet/daynight) +"aU" = (/turf/simulated/floor/road/corner{icon_state = "road_corner"; dir = 4},/area/planet/daynight) +"aV" = (/turf/simulated/floor/decor{icon_state = "asteroidplating"},/area/planet/daynight) +"aW" = (/obj/machinery/light/spot{icon_state = "tube1"; dir = 1},/turf/simulated/floor/decor{icon_state = "asteroidplating"},/area/planet/daynight) +"aX" = (/turf/unsimulated/wall,/area/planet/daynight) +"aY" = (/obj/effect/landmark/spawn_medium,/turf/simulated/floor/road/empty,/area/planet/daynight) +"aZ" = (/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 1},/turf/simulated/floor/tiled/steel_grid,/area/planet/daynight) +"ba" = (/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 4},/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 1},/turf/simulated/floor/tiled/steel_grid,/area/planet/daynight) +"bb" = (/obj/structure/destructible/railing/industrial,/turf/simulated/floor/decor{icon_state = "asteroidplating"},/area/planet/daynight) +"bc" = (/obj/structure/stairs/west{icon_state = "industrialstair"},/turf/simulated/floor/tiled/steel_grid,/area/planet/daynight) +"bd" = (/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 4},/turf/simulated/floor/tiled/steel_grid,/area/planet/daynight) +"be" = (/obj/structure/stairs/west{icon_state = "industrialstair"},/turf/simulated/floor/decor{icon_state = "asteroidplating"},/area/planet/daynight) +"bf" = (/obj/structure/stairs_decorative/industrial{icon_state = "industrialstair"; dir = 8},/turf/simulated/floor/decor{icon_state = "asteroidplating"},/area/planet/daynight) +"bg" = (/obj/effect/landmark/resupply,/turf/simulated/floor/decor{icon_state = "asteroidplating"},/area/planet/daynight) +"bh" = (/obj/effect/landmark/spawn_medium,/turf/simulated/floor/road/markings{icon_state = "road_marking"; dir = 8},/area/planet/daynight) +"bi" = (/obj/structure/destructible/railing/industrial,/turf/simulated/floor/tiled/steel_grid,/area/planet/daynight) +"bj" = (/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 4},/obj/structure/destructible/railing/industrial,/turf/simulated/floor/tiled/steel_grid,/area/planet/daynight) +"bk" = (/obj/structure/destructible/railing/industrial,/obj/structure/destructible/railing/industrial/mounted,/turf/simulated/floor/decor{icon_state = "asteroidplating"},/area/planet/daynight) +"bl" = (/obj/effect/landmark/assault_target,/turf/simulated/floor/decor{icon_state = "asteroidplating"},/area/planet/daynight) +"bm" = (/obj/effect/landmark/assault_target/flood,/turf/simulated/floor/decor{icon_state = "asteroidplating"},/area/planet/daynight) +"bn" = (/obj/machinery/light/spot{icon_state = "tube1"; dir = 1},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight) +"bo" = (/obj/structure/stairs_decorative/industrial{icon_state = "industrialstair"; dir = 1},/turf/unsimulated/floor/desert,/area/planet/daynight) +"bp" = (/turf/simulated/floor/tiled/techmaint,/area/planet/daynight) +"bq" = (/obj/effect/landmark/start/joinlate,/turf/simulated/floor/tiled/techmaint,/area/planet/daynight) +"br" = (/obj/structure/destructible/railing/industrial/mounted,/turf/simulated/floor/decor{icon_state = "asteroidplating"},/area/planet/daynight) +"bs" = (/obj/structure/destructible/railing/industrial/mounted,/obj/machinery/light/spot,/turf/simulated/floor/decor{icon_state = "asteroidplating"},/area/planet/daynight) +"bt" = (/obj/structure/flora/pottedplant/thinbush,/turf/simulated/floor/decor{icon_state = "asteroidplating"},/area/planet/daynight) +"bu" = (/obj/machinery/vending/coffee,/turf/simulated/floor/decor{icon_state = "asteroidplating"},/area/planet/daynight) +"bv" = (/obj/structure/flora/pottedplant/minitree,/turf/simulated/floor/decor{icon_state = "asteroidplating"},/area/planet/daynight) +"bw" = (/obj/machinery/vending/snack,/turf/simulated/floor/decor{icon_state = "asteroidplating"},/area/planet/daynight) +"bx" = (/obj/structure/flora/pottedplant/orientaltree,/obj/machinery/light/spot,/turf/simulated/floor/decor{icon_state = "asteroidplating"},/area/planet/daynight) +"by" = (/obj/machinery/vending/cigarette,/turf/simulated/floor/decor{icon_state = "asteroidplating"},/area/planet/daynight) +"bz" = (/obj/structure/closet/crate/secure/weapon,/turf/simulated/floor/tiled/techmaint,/area/planet/daynight) +"bA" = (/obj/structure/closet/crate/secure/weapon,/obj/machinery/light/spot{icon_state = "tube1"; dir = 1},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight) +"bB" = (/obj/effect/landmark/spawn_legendary,/turf/simulated/floor/asteroid/planet,/area/planet/daynight) +"bC" = (/obj/machinery/light/spot,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight) +"bD" = (/obj/structure/closet/crate/secure/weapon,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight) +"bE" = (/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 1},/obj/structure/stairs_decorative/industrial,/turf/simulated/floor/tiled/steel_grid,/area/planet/daynight) +"bF" = (/obj/machinery/light/spot{icon_state = "tube1"; dir = 8},/turf/unsimulated/floor/desert,/area/planet/daynight) +"bG" = (/obj/structure/closet/crate/secure/weapon,/obj/machinery/light/spot,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight) +"bH" = (/obj/machinery/light/spot{icon_state = "tube1"; dir = 1},/turf/unsimulated/floor/desert,/area/planet/daynight) +"bI" = (/obj/structure/stairs_decorative/industrial{icon_state = "industrialstair"; dir = 4},/turf/unsimulated/floor/desert,/area/planet/daynight) +"bJ" = (/obj/structure/stairs_decorative/industrial{icon_state = "industrialstair"; dir = 8},/turf/unsimulated/floor/desert,/area/planet/daynight) +"bK" = (/obj/structure/destructible/sandbag{dir = 4},/obj/structure/destructible/sandbag,/turf/simulated/floor/tiled/steel_grid,/area/planet/daynight) +"bL" = (/obj/machinery/telecomms/relay/long_range_planetary,/turf/unsimulated/floor/desert,/area/planet/daynight) +"bM" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/floodlight,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight) +"bN" = (/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight) +"bO" = (/obj/structure/closet/crate/secure/weapon,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight) +"bP" = (/obj/effect/landmark/spawn_hard,/turf/unsimulated/floor/desert,/area/planet/daynight) +"bQ" = (/obj/structure/stairs/east{icon_state = "industrialstair"},/turf/unsimulated/floor/desert,/area/planet/daynight) +"bR" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/diesel_generator,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight) +"bS" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/crate/secure/weapon,/obj/machinery/light/spot{icon_state = "tube1"; dir = 8},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight) +"bT" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/crate/secure/weapon,/obj/machinery/light/spot{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight) +"bU" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/crate/secure/weapon,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight) +"bV" = (/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 1},/turf/unsimulated/floor/desert,/area/planet/daynight) +"bW" = (/obj/effect/landmark/test/safe_turf,/turf/unsimulated/floor/desert,/area/planet/daynight) +"bX" = (/obj/effect/landmark/day_night_zcontroller,/turf/unsimulated/floor/desert,/area/planet/daynight) +"bY" = (/obj/effect/landmark/test/space_turf,/turf/space,/area/planet/daynight) +"bZ" = (/obj/effect/landmark/map_data{name = "Desert Outpost"},/turf/unsimulated/mineral,/area/planet/daynight) +"ca" = (/obj/machinery/telecomms/allinone,/turf/unsimulated/floor/desert,/area/planet/daynight) + +(1,1,1) = {" +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababaaaaaaaaaaaaaaaaaaababababababababababaaaaaaaaaaaaaaaaaaacacacacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacacacadadacacacacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaababaaaaabababababaaaaaaabababababababababaaaaababababaaaaaaaaaaacacacadadadadacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacacadadadadadadadadadacacacacacacaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaabababaaaaaaababababababababababababababaaaaaaaaaaaaababaaaaadadadadadadadadadadadacaaaaaaaaaaaaaaacacacacacacacacacacacadadadadadadadadadadadadadadadadadacacacaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaabababaaaaaaaaaaababababababaaababababaaaaaaaaaaaaaaababacacadadadadadadaeadadadadadacaaaaaaaaacacadadadadadadadadadadadadadadadadadafadadacadadadadadadadadadadacaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaabababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaababaaaaaaaaaaaaagagagadadbLadadadadadadadadadadadadacacacacadadadadaeadadadadahadadadadadaeadadadadadadadaeadadadadadaeadadadadacaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaabababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaababaaaaaaagagadadadadaeadadadadadadadadafadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadacaaaaaa +aaaaaaaaaaaaaaaaaaaaababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaababaaagagadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadahadadadadadadadadadacaaaa +aaaaaaaaaaaaaaaaaaabababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagadadadadadadadadadadadadadadadadadadadaeadadadadadadaeadadadadadadadadadadaeadadadadadadadadadadadadadadadadadaeadadafadadadadaiaa +aaaaaaaaaaaaaaaaabababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagadadadadadadadadadadadadadadaeadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadaeadadadadadadadadadadadadadadadadadaiaa +aaaaaaaaaaaaaaaaababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagadadadadaeadadadadadadadadadadadadadadadadadadadadavadadadadadadadavadadadadadadadadadadadadadadadadadadadadadaeadadadadadadadadadadaiaa +aaaaaaaaaaaaaaababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagadadadadadadadadadadadadadadadadadadadadadadadadadadajadajajajajadajajajajajajadajadadajadadadadadadadadadadadadadadadadadadadaeadadadaiaa +abaaaaaaaaaaaaabababaaaaaaaaaaaaaaaaaaababababababababaaaaagadadadadadadadadadadadadadadadadadadadadadadadadadadajajajajajajadajajajajadadajadajajadajadadadadadadadakalalalalalalalalalalalalalalamaiaa +ababaaaaaaaaabababaaaaaaaaaaaaaaaaaaababababaaabababababagadadadadadadadadadadadadadaeadadadadadadadadadadadajadanajananadajananaoajananadajadananajananadajadadadadapajajaqajajaqajajaqajajaqajajaraiaa +ababababaaaaabababaaaaaaaaaaaaaaaaababababaaaaaaaaaaababagadadadadadadadadadadadadadadadadadadadadadadadadadadajajajajajajajajajajajajajajajadadajajajajajadaqadadadapajajaqajajaqajajaqajajaqajajaraiaa +abaaaaabababababaaaaaaaaaaaaaaaaababababababaaaaaaaaaaagadadadadadadadadahadadadadadadadadadadadadadadadadadajajajajadajajajadajajajadajajadadadadadajajadadaqadadadajajajajajajajajajajajajajajajaraiaa +abaaaaaaaaabababaaaaaaaaaaaaaaaaabababaaabababaaaaaaagadadadadadadadadadadadadadadasatatatauadadadadadadadadadadadadadadadadadadadadadadadadadadadadadavadajajajadajajajajajajajajajajajajajajajajaraiaa +ababaaaaababababaaaaaaaaaaaaaaabababaaaaaaabababaaagadadadadadadaeadadadadadadadadawaxayazaAadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadajajajajadadapajajaBajajajajajajajajaBajajaraiaa +aaababababababababaaaaaaaaaaabababaaaaaaaaabababagadadadadadadadadadadadadadadadadawaCaDaEaFadadadadadadadadadaGaGaHaGaGaGaGaGaGaGaGaGaGaGaGaGaGaGaGadadadajadajadajajajajajajajajajajajajajajajajaraiaa +aaaaabababababaaababaaaaaaabababaaaaaaaaaaaaababagadadadadadadadadadadadadadadadadawaIaJaKadadaoadadadadadadadaGaHaHaHaGaGaGaGaGaGaGaGaGaGaGaGaGaGaGadadajajaqadajadajajajajajaLajajajajajajajajajaraiaa +aaaaaaababababaaaaabababaaababaaaaaaaaaaaaaaaaaaagadadadadadadadadadadadadadadadadaMaNaNaNaOadadadadadadadadadaGaPaHaQaGaGaGaGaGaGaGaGaGaGaGaGaGaGaGadadajajadajajadapajajaqajajaqajajaqajajaqajajaraiaa +aaaaabababababababababababababaaaaaaaaaaaaaaaaagadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadaGaHaHaHaGaGaGaGaGaGaGaGaGaGaGaGaGaGaGadadajajajajajadapajajaqajajaqaRajaqajajaqajajaraiaa +aaaaaaabababababababababababaaaaaaaaaaaaaaaaaaagadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadaGaGaHaGaGaGaGaGaGaGaGaGaGaGaGaGaGaGaGadadajajaqajajadaSaTaTaTaTaTaTaTaTaTaTaTaTaTaTaUaiaa +aaaaababababaaaaaaaaabababababaaaaaaaaaaaaaaaaagadadadadaeadadadadadadadadadadadadadadadadadadadadadadadadadadaGaHaHaHaGaVaWaVadaVaVaWaVaVaVaVaWaVaGadadajajaqajajadadadadadadavadadadadadadadavadaiaXaX +aaaaabababaaaaaaaaaaaaababababababaaaaaaaaaaagadadadadadadadadadadahadadadadadadadadadadadadadadadadadadadadadaHaHaHaHaHaVadaVaVaVadaVaVadaVaVaVaVadadadajajaqajajajajajajajajajajajajajajajajajajaYajaX +aaaaababaaaaaaaaaaaaaaababababababaaaaaaaaaaaaagadadadadadadadadadadadadadadadavadadaGaZaZaZaZaZbaadadadadadadaGaHaHaHaGbbatbbbbaVaVaVaVaVaVadaVaVadadadajajajajajajajajajajajajajajajajajajajajajaYajaX +aaaaabaaaaaaaaaaaaaaaaababaaaaabababaaaaaaaaaaagadadadadadadadadadadadadadadadadadadaGbcaDaDaDaDbdadadadadadadaGaGaHaGaGbeaVbfaVaVaVadaVbgaVadadadadadadajajajajanananajanananajanananajanananajanbhanaX +aaaaababaaaaaaaaaaaaaaababaaaaabababababababababagadadadadadadadadadadadadadadaGaGaGaGaGaGaGbiaDbjadadadadadadaGaHaHaHaGbkbkbkbkaVaVblbmaVadadadadadadadajajajajajajajajajajajajajajajajajajajajajaYajaX +aaabababaaaaaaaaaaaaaaabaaaaaaaaaaaaabababababaaaaagadadadadadadadadadadadadadaGaHaHbnaHaHaGboadavadadadadadadaGaPbpaQaGbeaVbfaVadadadaVaVaVaVaVaVaVadadajajaqajajajajajajajajajajajajajajajajajajaYajaX +aaabababaaaaaaaaaaaaababaaaaaaaaaaaaaaaaaaaaaaaaaaaaagadadadadadadadaeadadadadaHaHbqaHbqaHaGadadadadadadadadadaGaHaHaHaGbrbsbraNaVaVaVbtbubvbwbxbyaGadadajajaqajajajadadadadadavadadadadadadadavadaiaXaX +aaaaabababaaaaaaaaaaababaaaaaaaaaaaaaaaaaaaaaaaaaaaaagadadadadadadadadadadadadaGaHaHaHaHaHaHadaoadadadadadadadaGaHaHaHaGaGaGaGaGaGaGaHaGaGaGaGaGaGaGadadajajaqajajajadadadadadadadadadadadadadadadadaiaa +aaaaabababaaaaaaaaaaabababaaaaaaaaaaaaaaaaaaaaaaaaaaagadadadadadadadadadadadadaHaHbqaHbqaHaGadadadadadadadadadaGaHaHaHaGaGaGbzbAaHbpaHbpaHaHbnbzaGaGadadajajajajajajadadadadadadadadadadadadadadadadaiaa +aaaaababaaaaaaaaaaaaaaababaaaaaaaaaaaaababababababbBadadadadadadadadadadadadadaGaHaHbCaHaHaGadadavadadadadadadaGaHaHaHaGaGaGaHaHaHaHaHaHaHbDaHaHaGaGadadajajaqajajajadadadadadaeadadadadadadadaeadadaiaa +aaaaababaaaaaaaaaaaaababababaaaaabababababababababbBadadadadadadadadadadadadadaGaGaGaGaGaGaGbEaDbaadadadadadadaGaPbpaQaGaGaGbDbDaHaHaHaHaHaHaHbDaGaGbFadajajaqajajajadadadadadadadadadaeadadadadadadaiaa +aaaaaaababaaaaaaababababababababababababaaaaaaaaaaagadadadadadadadadadadadadadadadadaGbcaDaDaDaDbdadadadadadadaGaHaHaHaGaGaGbzbGbDbpaHbpaHaHbGbzaGaGadadajajaqajajajadadadadadadadadadadadadadadadaiaaaa +aaaaabababababababababaaaaababababaaaaaaaaaaaaaaaaagadadadadaeadadadadadadadadavadadaGbibibibibibjadadadadadadaGaGaHaGaGaGaGaGaGaGaGaHaGaGaGaGaGaGaGadadajajajajajajavadadadadadahadadadadaeadadadaiaaaa +aaaaaaabababababababaaaaaaaaababaaaaaaaaaaaaaaaaaaagadadadadadadadahadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadbHadadadadajajaqajajajadadadaeadadadadadadadadadadaiaaaaaa +aaaaaaaaabababababababababababababaaaaaaaaaaaaaaaaagadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadajajaqajajajadadadadadadadadafadadadaiaiaaaaaaaa +aaaaaaaaaaaaaaaaaaaaababababababababaaaaaaaaaaaaaaagadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadajaqajajadadadadadadadadadadadaiaiaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababaaaaaaaaaaagadadadadadadadadadadadadaeadadadadadadadadadadadadadadadadadadadadadadadadadadadadaoadadadadadadadadadadadajajajadadadadadadadadadadaiaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababaaaaagadadadadadadadadadadadadadadadadadadasatatatauadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadajadajajadadadadadadadadadaiaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababaaagadadadadaeadadadadadadadadadadadadadawaxayaKadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadaiaaaaaaaaaaaaaaaaaaaa +aacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaababababbBadadadadadadadadadadadadadadadadadadawaCaDaEaFadadadadadadbIadaZaZaZaZaZbJadadadadadadadadadadadahadadadadadajadajadadadadadadadadaiaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababbBadadadadadadadadadadadadadadadadadawaIaJbKaAadadadadadadavaGaGaGaHaGaGaGavadadadadadadadadadadadadadadadadadadajadavadadadadaeadadaiaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagadadadadadadafadadadadadadadadadaMaNaNaNaOadadadadadadadaGbMbNaHbMbMaGadadadadadadadadadadadadadadadadadadadadadadadadadadadadadaiaaaaaaaaaaaaaaaaaa +aabYaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagadadadadadadadadadadadadadadadadadadadadadadadatatatataGbMbNaHbObOaGadadadadadadadaeadadadadadadadadadadadadadadadadadadadadbPaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagadadadadadadadadadadadadadadadadadadadadadadadbIadadbQaGbMbRaHbObOaGadadadadadadadadadafadadadadadadadadadadadadadadadacadadbPaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagadadadadadadadadadadadadadadadadadadadadadadbIadadbQaGbSbNaHbRbTaGadadadadadadadadadadadadadadaeadadadadadadadahadadadadbPaaaaaaaaaaaaaaaaaaaaaa +aaadadadadadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagadadadadadadadaeadadadadadadadadadadadahadbIadadbQaGbUbRaHbObOaGadadadadadadadadadadadadadadadadadaeadadadadadadbPbPbPbPaaaaaaaaaaaaaaaaaaaaaa +aaadadadadadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagadadadadadadadadadadadadadadaeadadadadadadbVbVbVbVaGbObUaHbObOaGadadadadaeadadadadadadadadadadadadadadbPbPbPbPbPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaadadbWadadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabPbPbPbPbPadadadadadadadadadadadadadadadadadadadadadaGbObUaHbObOaGadadadadadbPbPbPbPbPbPbPbPbPadadadbPbPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaadadadadadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabPadadadadadadadadadadadadadadadadadadadadaGaGaGaGaGaGaGadbPbPbPbPaaaaaaaaaaaaaaaaaabPbPbPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aabXadadadadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabPbPbPbPbPbPbPbPbPbPbPbPbPbPbPbPbPbPbPbPaaaaaaaaaaaaaabPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +bZaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +"} diff --git a/maps/desert_outpost/desert_outpost2.dmm b/maps/desert_outpost/desert_outpost2.dmm new file mode 100644 index 0000000000000..c38ff9fec7fb5 --- /dev/null +++ b/maps/desert_outpost/desert_outpost2.dmm @@ -0,0 +1,142 @@ +"aa" = (/turf/unsimulated/mineral,/area/planet/daynight/floor1) +"ab" = (/turf/simulated/open,/area/planet/daynight/floor1) +"ac" = (/turf/simulated/wall/flood_biomass,/area/planet/daynight/floor1) +"ad" = (/turf/simulated/floor/asteroid/planet,/area/planet/daynight/floor1) +"ae" = (/obj/effect/landmark/spawn_easy,/turf/simulated/floor/asteroid/planet,/area/planet/daynight/floor1) +"af" = (/turf/simulated/floor/flood_biomass,/area/planet/daynight/floor1) +"ag" = (/obj/effect/landmark/spawn_medium,/turf/simulated/floor/asteroid/planet,/area/planet/daynight/floor1) +"ah" = (/obj/effect/landmark/spawn_hard,/turf/simulated/floor/asteroid/planet,/area/planet/daynight/floor1) +"ai" = (/obj/effect/landmark/spawn_legendary,/turf/simulated/floor/asteroid/planet,/area/planet/daynight/floor1) +"aj" = (/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 8},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"ak" = (/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"al" = (/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 4},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"am" = (/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 10},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"an" = (/obj/structure/destructible/railing/industrial,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"ao" = (/obj/structure/destructible/railing/industrial/corner{icon_state = "railing_deco"; dir = 1},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"ap" = (/obj/structure/destructible/railing/industrial/corner,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"aq" = (/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 6},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"ar" = (/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 8},/turf/simulated/floor/tiled/doubletiled,/area/planet/daynight/floor1) +"as" = (/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 4},/turf/simulated/floor/tiled/doubletiled,/area/planet/daynight/floor1) +"at" = (/turf/unsimulated/wall{icon_state = "0"},/area/planet/daynight/floor1) +"au" = (/obj/machinery/light/spot{icon_state = "tube1"; dir = 8},/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 1},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"av" = (/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 1},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"aw" = (/obj/structure/destructible/railing/industrial/corner{icon_state = "railing_deco"; dir = 4},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"ax" = (/obj/structure/destructible/railing/industrial/corner{icon_state = "railing_deco"; dir = 8},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"ay" = (/obj/machinery/light/spot{icon_state = "tube1"; dir = 4},/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 1},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"az" = (/obj/structure/destructible/marine_barricade{icon_state = "fullbarricade"; dir = 8},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"aA" = (/obj/effect/landmark/start/joinlate,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"aB" = (/obj/structure/closet/crate/supply_drop/construction,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"aC" = (/obj/structure/closet/crate/supply_drop/construction,/obj/item/device/lightreplacer,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"aD" = (/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 4},/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 4},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"aE" = (/obj/structure/closet/crate/supply_drop,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"aF" = (/obj/structure/closet/crate/supply_drop/mass_ammo/odst,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"aG" = (/obj/machinery/light/spot{icon_state = "tube1"; dir = 8},/obj/structure/destructible/railing/industrial,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"aH" = (/obj/machinery/light/spot{icon_state = "tube1"; dir = 4},/obj/structure/destructible/railing/industrial,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"aI" = (/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 9},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"aJ" = (/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 5},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"aK" = (/obj/structure/destructible/marine_barricade{icon_state = "fullbarricade"; dir = 4},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"aL" = (/obj/effect/landmark/assault_target_firefight,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"aM" = (/obj/structure/destructible/railing/industrial/corner{icon_state = "railing_deco"; dir = 8},/obj/structure/destructible/railing/industrial/corner,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"aN" = (/obj/machinery/light/floor,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"aO" = (/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 1},/turf/simulated/floor/tech/steel,/area/planet/daynight/floor1) +"aP" = (/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 4},/obj/structure/table/rack,/obj/item/ammo_magazine/m6s/m224,/obj/item/ammo_magazine/m6s/m224,/obj/item/ammo_magazine/m6s/m224,/obj/item/ammo_magazine/m6s/m224,/obj/item/ammo_magazine/m6s/m224,/obj/item/ammo_magazine/m6s/m224,/obj/item/weapon/gun/projectile/m6c_magnum_s,/obj/item/weapon/gun/projectile/m6c_magnum_s,/obj/item/weapon/gun/projectile/m6c_magnum_s,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"aQ" = (/obj/structure/destructible/railing/dark/corner_outer,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"aR" = (/obj/structure/destructible/railing/dark,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"aS" = (/obj/structure/destructible/railing/dark/corner_outer{icon_state = "railing_corner_outer_dark"; dir = 4},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"aT" = (/obj/machinery/light/floor,/turf/simulated/floor/tech/steel,/area/planet/daynight/floor1) +"aU" = (/turf/simulated/floor/tiled/steel_ridged,/area/planet/daynight/floor1) +"aV" = (/turf/simulated/floor/tech/steel,/area/planet/daynight/floor1) +"aW" = (/obj/effect/landmark/assault_target/flood,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"aX" = (/obj/structure/destructible/railing/industrial/corner,/obj/structure/destructible/railing/industrial/corner{icon_state = "railing_deco"; dir = 8},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"aY" = (/obj/structure/destructible/railing/dark{icon_state = "railing_dark"; dir = 4},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"aZ" = (/turf/unsimulated/floor/grass5,/area/planet/daynight/floor1) +"ba" = (/obj/structure/destructible/railing/dark{icon_state = "railing_dark"; dir = 8},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"bb" = (/obj/structure/destructible/railing/dark,/turf/simulated/floor/tech/steel,/area/planet/daynight/floor1) +"bc" = (/obj/structure/table/rack,/obj/structure/destructible/railing/dark{icon_state = "railing_dark"; dir = 4},/obj/item/weapon/gun/projectile/m7_smg/silenced,/obj/item/weapon/gun/projectile/m7_smg/silenced,/obj/item/ammo_magazine/m7/m443/rnd48,/obj/item/ammo_magazine/m7/m443/rnd48,/obj/item/ammo_magazine/m7/m443/rnd48,/obj/item/ammo_magazine/m7/m443/rnd48,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"bd" = (/obj/machinery/light/spot{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"be" = (/obj/structure/destructible/railing/dark/corner_outer{icon_state = "railing_corner_outer_dark"; dir = 1},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"bf" = (/obj/structure/destructible/railing/dark{icon_state = "railing_dark"; dir = 1},/turf/simulated/floor/tech/steel,/area/planet/daynight/floor1) +"bg" = (/obj/structure/destructible/railing/dark/corner_outer{icon_state = "railing_corner_outer_dark"; dir = 8},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"bh" = (/obj/item/weapon/storage/belt/marine_ammo,/obj/structure/closet/crate/supply_drop,/obj/item/weapon/storage/belt/marine_ammo,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"bi" = (/obj/item/weapon/gun/projectile/ma37_ar,/obj/item/weapon/gun/projectile/ma37_ar,/obj/structure/closet/crate/supply_drop,/obj/item/ammo_magazine/ma37/m118,/obj/item/ammo_magazine/ma37/m118,/obj/item/ammo_magazine/ma37/m118,/obj/item/ammo_magazine/ma37/m118,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"bj" = (/obj/structure/destructible/railing/dark{icon_state = "railing_dark"; dir = 1},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"bk" = (/obj/structure/closet/crate/supply_drop/medical,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"bl" = (/obj/structure/closet/crate/supply_drop,/obj/item/weapon/storage/firstaid/unsc,/obj/item/weapon/storage/firstaid/unsc,/obj/item/weapon/storage/belt/marine_medic,/obj/item/weapon/storage/belt/marine_medic,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"bm" = (/obj/structure/destructible/railing/industrial,/turf/simulated/floor/tech/steel,/area/planet/daynight/floor1) +"bn" = (/obj/structure/bed/roller,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"bo" = (/obj/structure/closet/crate/supply_drop,/obj/item/weapon/storage/firstaid/combat/unsc,/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid/o2,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/surgery,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"bp" = (/obj/structure/closet/crate/supply_drop,/obj/item/weapon/gun/projectile/m392_dmr,/obj/item/weapon/gun/projectile/m392_dmr,/obj/item/ammo_magazine/m392,/obj/item/ammo_magazine/m392,/obj/item/ammo_magazine/m392,/obj/item/ammo_magazine/m392,/obj/item/ammo_magazine/m392,/obj/item/ammo_magazine/m392,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"bq" = (/obj/structure/closet/crate/supply_drop,/obj/item/weapon/gun/projectile/shotgun/pump/m90_ts,/obj/item/weapon/gun/projectile/shotgun/pump/m90_ts,/obj/item/ammo_box/shotgun,/obj/item/ammo_box/shotgun,/obj/item/ammo_box/shotgun,/obj/item/ammo_box/shotgun,/obj/item/ammo_box/shotgun,/obj/item/ammo_box/shotgun,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"br" = (/obj/structure/closet/crate/supply_drop,/obj/item/weapon/material/machete,/obj/item/weapon/material/machete,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"bs" = (/obj/machinery/light/spot{icon_state = "tube1"; dir = 8},/obj/structure/destructible/railing/industrial/corner{icon_state = "railing_deco"; dir = 1},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"bt" = (/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 8},/turf/simulated/floor/tech/steel,/area/planet/daynight/floor1) +"bu" = (/obj/structure/destructible/railing/industrial{icon_state = "railing_industrial"; dir = 4},/turf/simulated/floor/tech/steel,/area/planet/daynight/floor1) +"bv" = (/obj/machinery/light/spot{icon_state = "tube1"; dir = 8},/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"bw" = (/obj/effect/landmark/spawn_medium,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"bx" = (/obj/effect/landmark/spawn_medium,/turf/simulated/floor/tiled/techfloor/grid,/area/planet/daynight/floor1) +"by" = (/obj/effect/landmark/spawn_legendary,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"bz" = (/obj/effect/landmark/spawn_hard,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"bA" = (/obj/effect/landmark/spawn_hard,/turf/simulated/floor/tiled/techfloor/grid,/area/planet/daynight/floor1) +"bB" = (/obj/effect/landmark/spawn_easy,/turf/simulated/floor/tiled/techfloor,/area/planet/daynight/floor1) +"bC" = (/obj/effect/landmark/spawn_easy,/turf/simulated/floor/tiled/techfloor/grid,/area/planet/daynight/floor1) +"bD" = (/obj/effect/overmap/sector/desert_outpost,/turf/unsimulated/mineral,/area/planet/daynight/floor1) +"bE" = (/obj/effect/landmark/map_data{name = "Desert Outpost"},/turf/unsimulated/mineral,/area/planet/daynight/floor1) + +(1,1,1) = {" +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababab +aaaaaaaaaaaaaaaaaaaaaaaaacacacacacacacacacacacacacadadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaadadadadadadadaaaaaaaaaaaaaaaaaaaaaaaeaeaaaaaaaaaaaaaaaaaaaaaaaaaaababababababababababababababababababababab +aaaaaaaaaaaaaaaaaaacacacacafafafafafafafafafafafadadadadaaaaaaaaaaaaaaaaaaaaaaaaaaadadadadadadaaaaaaaaaaadadadadaaaaagagagagagagaeaeaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababab +aaaaaaaaaaaaaaaaacacafafafafafafafafafafafafacacacacadadadaaaaaaaaaaaaaaaaadadadadadaaaaaaaaaaaaaaaaaaaaaaaaaaadahahaiaiaiaiaiaiaeaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababab +aaaaaaaaaaaaaaacacafafafafafacacacacacacacacacaaaaacadadadadadadadaaaaadadadadadadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahaiaiaiaiaiaiaeaeaaaaaaaaababababababababababababababababababababababababababababababab +aaaaaaaaaaaaacacafafafafafacacaaaaaaaaaaaaaaaaaaaaacacacacadadadadadadadadadadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahaiaiaiaiaeaeaaaaaaaaababababababababababababababababababababababababababababababababab +aaaaaaaaaaacacafafafafacacacaaaaaaaaaaabaaaaaaaaaaaaaaaaacacacaaadadadadadaaaaaaaaaaaaaaaaabababababaaaaaaaaaaaaaaahaiaiaeaaaaaaaaaaabababababababababababababababababababababababababababababababababab +aaaaaaaaaaacafafafafacacaaaaaaaaaaababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababaaaaaaaaahaiaeaaaaaaaaaaababababababababababababababababababababababababababababababababababab +aaaaaaaaacacafafafacacaaaaaaaaaaababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaababababababababababababababababaaaaadadaaaaabababababababababababababababababababababababababababababababababababababab +aaaaaaacacafafafacacaaaaaaaaaaaaababababababababababababaaaaaaaaaaaaaaaaaaabababababababababababababababababababajakakakakalabababababababababababababababababababababababababababababababababababababab +aaaaacacafafafacacaaaaaaaaaaaaabababababababababababababababaaaaaaaaaaabababababababababababababababababababababajakakakakalabababababababababababababababababababababababababababababababababababababab +aaacacafafafacacaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababamanaoapanaqabababababababababababababababababababababababababababababababababababababab +aaacabafafacacaaaaaaaaaaaaaaababababababababababababababababababababababababababababababababababababababababababababarasabababababababababababababababababababababababababababababababababababababababab +aaababafafacaaaaaaaaaaaaaaaaababababababababababababababababababababababababababababababababababababababababababababarasabababababababababababababababababababababababababababababababababababababababab +aaabafafacacaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababarasabababababababababababababababababababababababababababababababababababababababab +aaacafafafacacaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababarasabababababababababababababababababababababababababababababababababababababababab +aaacacafafafacaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababarasabababababababababababababababababababababababababababababababababababababababab +aaaaacacafafacaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababarasabababababababababababababababababababababababababababababababababababababababab +aaaaacacafafacaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababarasabababababababababababababababababababababababababababababababababababababababab +aaaaacafafafacaaaaaaaaaaaaababababababababababababababababababababababababababababababababababababababababababatauavawaxavavavavavavavavavavavavayatabababababababababababababababababababababababababab +aaacacafafafacaaaaaaaaaaaaababababababababababababababababababababababababababababababababababababababababababajakakakakazakakakazakakaAakakaAaBaCaDabababababababababababababababababababababababababab +aaacafafafafacaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababajakakakakakakazakakakazakakakakakaCalabababababababababababababababababababababababababab +aaacafafafacacaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababajakakakakakakazakakakazakakaEaEakakalabababababababababababababababababababababababababab +aaacafafafacaaaaaaaaaaababababababababababababababababababababababababababababababababababababababababababababajakakakakazakakakazakakaAaEaEaAakaFalabababababababababababababababababababababababababab +aaacafafacacaaaaaaaaaaababababababababababababababababababababababababababababababababababababababababababababajakakakataGanananananananananananaHatabababababababababababababababababababababababababab +aaacafafabacacaaaaaaaaababababababababababababababababababababababababababababababababababababababababababababajakakakalabababababababababababababababababababababababababababababababababababababababab +aaacafafababacaaaaaaaaababababababababababababababababababababababababababababababababababababababababababababajakakakalabababababababababababababababababababababababababababababababababababababababab +aaacacafafabacaaaaaaaaababababababababababababababababababababababababababababaIavavaJababababababababababababajakakakalabababababababababababababababababababababababababababababababababababababababab +aaaaacafafabacaaaaaaaaababababababababababababababababababababababababababababajaKakakababababababababababababajaLaKakaMabababababababababababababababababababababababababababababababababababababababab +aaaaacacafafacaaaaaaaaababababababababababababababababababababababababababababajakaNaxavavavaOaOaOaOaOaOaOaOaOawakaKakaPabababababababababababababababababababababababababababababababababababababababab +aaaaaaacafafacaaaaaaabababababababababababababababababababababababababababababajaQaRaSakakakaTaUaVaUaTaUaVaUaTakaWaKakaXabababababababababababababababababababababababababababababababababababababababab +aaaaaaacafafacaaaaaaabababababababababababababababababababababababababababababajaYaZbaakakaQbbbbbbbbbbbbbbbbbbaSakakakalabababababababababababababababababababababababababababababababababababababababab +aaaaacacafafacaaaaababababababababababababababababababababababababababababababajaYaZbaakakbcabababababababababbaakakbdatauavavavavavavavavavavavayatabababababababababababababababababababababababababab +aaaaacafafafacaaaaaaabababababababababababababababababababababababababababababajaYaZbaakakbebfbfbfbfbfbfbfbfbfbgakakakakazakakakazakakakaAakaAbhbialabababababababababababababababababababababababababab +aaacacafafacacaaaaaaabababababababababababababababababababababababababababababajbebjbgakakakaTaUaVaUaTaUaVaUaTakakakakakakakazakakakazbkakblakakakalabababababababababababababababababababababababababab +aaacafafafacaaaaaaaaabababababababababababababababababababababababababababababajakaNapanananbmbmbmbmbmbmbmbmbmaoakakakakakakazakakakazbkbnbobnbpbqalabababababababababababababababababababababababababab +aaacafafacacaaaaaaaaabababababababababababababababababababababababababababababajaKakakababababababababababababajakakakakazakakakazakakakaAakaAbraEalabababababababababababababababababababababababababab +aaacafafafacacaaaaaaaaababababababababababababababababababababababababababababamananaqababababababababababababatbsakapanananananananananananananaHatabababababababababababababababababababababababababab +aaacabafafafacaaaaaaaaaaababababababababababababababababababababababababababababababababababababababababababababbtaVbuababababababababababababababababababababababababababababababababababababababababab +aaacababafafacaaaaaaaaaaababababababababababababababababababababababababababababababababababababababababababababbtaUbuababababababababababababababababababababababababababababababababababababababababab +aaacacabafafacacaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababbtaVbuababababababababababababababababababababababababababababababababababababababababab +aaaaacacafafafacaaaaaaaaaaaaababababaaabababababababababababababababababababababababababababababababababababababbtaUbuababababababababababababababababababababababababababababababababababababababababab +aaaaaaacafafafacaaaaaaaaaaaaaaababaaaaabababababababababababababababababababababababababababababababababababababbtaVbuababababababababababababababababababababababababababababababababababababababababab +aaaaaaacacafafacaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababbtaUbuababababababababababababababababababababababababababababababababababababababababab +aaaaaaaaacafafacacaaaaaaaaaaaaaaaaaaaaaaababababababababababababababababababababababababababababababababababababbtaVbuababababababababababababababababababababababababababababababababababababababababab +aaaaaaaaacacafafacacacaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababatatawakaxatatababababababababababababababababababababababababababababababababababababababab +aaaaaaaaaaacafafababacaaaaaaaaaaaaaaaaaaaaaaababababaaaaababababababababababababababababababababababababababatbvbwbwbwbdatababababababababababababababababababababababababababababababababababababababab +aaaaaaaaaaacafafababacaaaaaaaaaaaaaaaaaaaaaaaaababaaaaaaaaaaababababababababababababababababababababababababajbwbxbybxbwalababababababababababababababababababababababababababababababababababababababab +aaaaaaaaaaacafafabacacaaaaacacacacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaababababababababababababababababababababababawbybzbzbzbyalababababababababababababababababababababababababababababababababababababababab +aaaaaaaaaaacafafafacacaaaaacafafacacacacacacacacaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababakbzbAbybAbzalababababababababababababababababababababababababababababababababababababababab +aaaaaaaaaaacacafafafacacacacafafafafafafafafafacacacacacacacacacaaaaaaaaababababababababababababababababababaobybBbBbBbyalababababababababababababababababababababababababababababababababababababababab +aaaaaaaaaaacacabafafafababacacafafafafafafafafafafafafafafafafacacaaaaaaababababababababababababababababababajbBbCbybCbBalababababababababababababababababababababababababababababababababababababababab +aaaaaaaaaaacababafafababababacafafacafafafafafafafafafafafafafafacaaaaaaaaaaababababababababababababababababatbvakakakbdatababababababababababababababababababababababababababababababababababababababab +aaaaaaaaaaacababacacabacabababafafacafafafafafafafafafafafafafafacaaaaaaaaaaaaababaaababababababababababababatatanananatatababababababababababababababababababababababababababababababababababababababab +aaaaaaaaaaacacacacacacacacacacacacacacacacacacacacacacacacacacacacaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +bDbEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +"} diff --git a/maps/desert_outpost/desert_outpost_map.dm b/maps/desert_outpost/desert_outpost_map.dm new file mode 100644 index 0000000000000..a4187a443267b --- /dev/null +++ b/maps/desert_outpost/desert_outpost_map.dm @@ -0,0 +1,30 @@ +/datum/map/stranded_desert_outpost + name = "Outpost" + full_name = "Desert Outpost" + system_name = "Colonized System" + + path = "desert_outpost" + station_levels = list() + admin_levels = list() + accessible_z_levels = list() + + station_name = "Desert Outpost" + station_short = "Outpost" + dock_name = "Landing Pad" + boss_name = "United Nations Space Command" + boss_short = "UNSC HIGHCOM" + company_name = "United Nations Space Command" + company_short = "UNSC" + overmap_size= 5 + overmap_event_tokens = 50 + + use_overmap = 1 + allowed_gamemodes = list("stranded") + + area_coherency_test_exempt_areas = list( + /area/space, + /area/exoplanet, + /area/exoplanet/desert, + /area/exoplanet/grass, + /area/exoplanet/snow, + ) diff --git a/maps/desert_outpost/desert_outpost.dmm b/maps/desert_outpost/desert_outpost_old.dmm similarity index 100% rename from maps/desert_outpost/desert_outpost.dmm rename to maps/desert_outpost/desert_outpost_old.dmm diff --git a/maps/desert_outpost/desert_outpost_overmap.dm b/maps/desert_outpost/desert_outpost_overmap.dm new file mode 100644 index 0000000000000..92d6dcee6962a --- /dev/null +++ b/maps/desert_outpost/desert_outpost_overmap.dm @@ -0,0 +1,11 @@ +/obj/effect/overmap/sector/desert_outpost + name = "Desert Outpost" + icon = 'maps/Exoplanet Research/exo_research_sector.dmi' + desc = "A generic desert planet." + icon_state = "research" + + map_bounds = list(1,1,1,1) + + parent_area_type = /area/planet/daynight + + occupy_range = 28 diff --git a/maps/firefight/firefight.dm b/maps/firefight/firefight.dm index 2f5904cbbe0a5..7119cd2f099d7 100644 --- a/maps/firefight/firefight.dm +++ b/maps/firefight/firefight.dm @@ -3,10 +3,15 @@ //gamemode #include "../_gamemodes/firefight/_all_includes.dm" + //overmap define + #include "../desert_outpost/desert_outpost_overmap.dm" +// #include "../desert_outpost/desert_outpost_map.dm" + //lobby music #include "../../code/modules/halo/lobby_music/halo_music.dm" //subtype +// #include "../_gamemodes/firefight/subtypes/stranded.dm" #include "../_gamemodes/firefight/subtypes/jobs_colonist.dm" #include "../_gamemodes/firefight/subtypes/jobs_unsc.dm" @@ -14,15 +19,17 @@ #include "map.dm" //map turfs - #include "../desert_outpost/turfs_areas.dm" + #include "../desert_outpost/areas.dm" //map - #include "../desert_outpost/desert_outpost.dmm" +// #include "../desert_outpost/desert_outpost_old.dmm" + #include "../desert_outpost/desert_outpost2.dmm" + #include "../desert_outpost/desert_outpost1.dmm" - #define using_map_DATUM /datum/map/firefight_desert_outpost + #define using_map_DATUM /datum/map/stranded_desert_outpost #elif !defined(MAP_OVERRIDE) - #warn A map has already been included, ignoring Firefight: Desert Outpost + #warn A map has already been included, ignoring Stranded: Desert Outpost #endif diff --git a/maps/firefight/map.dm b/maps/firefight/map.dm index af66b39e7eb37..33db923ca91d7 100644 --- a/maps/firefight/map.dm +++ b/maps/firefight/map.dm @@ -1,14 +1,21 @@ - -/datum/map/firefight_desert_outpost +/datum/map/stranded_desert_outpost name = "Firefight: Desert Outpost" full_name = "Firefight gamemode on Desert Outpost map" - path = "firefight_desert_outpost" - allowed_gamemodes = list("firefight") + lobby_icon = 'code/modules/halo/splashworks/title3.jpg' id_hud_icons = 'maps/firefight/hud_icons.dmi' - boss_name = "UNSC" - company_name = "UNSC" + path = "firefight_desert_outpost" + station_levels = list() + admin_levels = list() + accessible_z_levels = list() + + boss_name = "United Nations Space Command" + company_name = "United Nations Space Command" + overmap_size= 5 + overmap_event_tokens = 0 + + use_overmap = 1 allowed_gamemodes = list("firefight") allowed_jobs = list(\ /datum/job/unsc/marine/firefight,\ diff --git a/maps/stranded/map.dm b/maps/stranded/map.dm index ff457c0d1c163..36bea411b308d 100644 --- a/maps/stranded/map.dm +++ b/maps/stranded/map.dm @@ -1,14 +1,21 @@ - /datum/map/stranded_desert_outpost name = "Stranded: Desert Outpost" full_name = "Stranded gamemode on Desert Outpost map" - path = "stranded_desert_outpost" - allowed_gamemodes = list("stranded") + lobby_icon = 'code/modules/halo/splashworks/title4.jpg' id_hud_icons = 'maps/firefight/hud_icons.dmi' - boss_name = "UNSC" - company_name = "UNSC" + path = "stranded_desert_outpost" + station_levels = list() + admin_levels = list() + accessible_z_levels = list() + + boss_name = "United Nations Space Command" + company_name = "United Nations Space Command" + overmap_size= 5 + overmap_event_tokens = 0 + + use_overmap = 1 allowed_gamemodes = list("stranded") allowed_jobs = list(\ /datum/job/unsc/marine/firefight,\ diff --git a/maps/stranded/stranded.dm b/maps/stranded/stranded.dm index dda4200bb60c7..13d74ced2774a 100644 --- a/maps/stranded/stranded.dm +++ b/maps/stranded/stranded.dm @@ -3,6 +3,10 @@ //gamemode #include "../_gamemodes/firefight/_all_includes.dm" + //overmap define + #include "../desert_outpost/desert_outpost_overmap.dm" + #include "../desert_outpost/desert_outpost_map.dm" + //lobby music #include "../../code/modules/halo/lobby_music/halo_music.dm" @@ -15,10 +19,12 @@ #include "map.dm" //map turfs - #include "../desert_outpost/turfs_areas.dm" + #include "../desert_outpost/areas.dm" //map - #include "../desert_outpost/desert_outpost.dmm" +// #include "../desert_outpost/desert_outpost_old.dmm" + #include "../desert_outpost/desert_outpost2.dmm" + #include "../desert_outpost/desert_outpost1.dmm" #define using_map_DATUM /datum/map/stranded_desert_outpost