From 63644de3d1586cf1c58b2e4422d6f3847e611d8e Mon Sep 17 00:00:00 2001 From: KT Date: Tue, 28 Mar 2023 23:34:01 -0400 Subject: [PATCH 01/33] Boop --- citadel.dme | 3 +++ code/game/turfs/simulated.dm | 2 -- .../turfs/simulated/flooring/flooring_premade.dm | 6 ++++++ .../templates/submaps/generic/generic_areas.dm | 15 +++++++++++++++ .../submaps/generic/generic_templates.dm | 11 +++++++++++ 5 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 code/modules/maps/templates/submaps/generic/generic_areas.dm create mode 100644 code/modules/maps/templates/submaps/generic/generic_templates.dm diff --git a/citadel.dme b/citadel.dme index a1da89008631..ff47315e168e 100644 --- a/citadel.dme +++ b/citadel.dme @@ -2821,6 +2821,8 @@ #include "code\modules\maps\templates\submaps\class_p\class_p.dm" #include "code\modules\maps\templates\submaps\debrisfield\debrisfield_old.dm" #include "code\modules\maps\templates\submaps\debrisfield\debrisfield_submaptemplate.dm" +#include "code\modules\maps\templates\submaps\generic\generic_areas.dm" +#include "code\modules\maps\templates\submaps\generic\generic_templates.dm" #include "code\modules\maps\templates\submaps\lavaland\lavaland.dm" #include "code\modules\maps\templates\submaps\lythios_rift\lyhtios.dm" #include "code\modules\maps\templates\submaps\lythios_rift\lythios_areas.dm" @@ -2837,6 +2839,7 @@ #include "code\modules\maps\tg\map_template.dm" #include "code\modules\maps\tg\map_template_vr.dm" #include "code\modules\maps\tg\reader.dm" +#include "code\modules\maps\turf_makers\generic_turfs.dm" #include "code\modules\maps\turf_makers\planetary_turfs.dm" #include "code\modules\maps\turf_makers\planet_station_turfs\_lythios43c.dm" #include "code\modules\maps\turf_makers\planet_station_turfs\_triumph.dm" diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index 948f06dc7a0f..35e75d7e2a7d 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -181,5 +181,3 @@ else if(ishuman(M)) add_blood(M) -/turf/simulated/floor/plating - can_start_dirty = TRUE // But let maints and decrepit areas have some randomness diff --git a/code/game/turfs/simulated/flooring/flooring_premade.dm b/code/game/turfs/simulated/flooring/flooring_premade.dm index c299bb79002d..3c8c8cdbdb1d 100644 --- a/code/game/turfs/simulated/flooring/flooring_premade.dm +++ b/code/game/turfs/simulated/flooring/flooring_premade.dm @@ -102,12 +102,14 @@ icon = 'icons/turf/flooring/grass.dmi' icon_state = "grass0" initial_flooring = /singleton/flooring/grass +CREATE_STANDARD_TURFS(/turf/simulated/floor/grass) /turf/simulated/floor/tiled name = "floor" icon = 'icons/turf/flooring/tiles.dmi' icon_state = "tiled" initial_flooring = /singleton/flooring/tiling +CREATE_STANDARD_TURFS(/turf/simulated/floor/tiled) /turf/simulated/floor/tiled/techmaint name = "floor" @@ -477,8 +479,12 @@ /turf/simulated/floor/beach/water /turf/simulated/floor/beach/water/ocean */ +/**This literally does nothing, need to axe or make it do something */ /turf/simulated/floor/airless/ceiling + /turf/simulated/floor/plating + can_start_dirty = TRUE // But let maints and decrepit areas have some randomness +CREATE_STANDARD_TURFS(/turf/simulated/floor/plating) /turf/simulated/floor/plating/external outdoors = TRUE diff --git a/code/modules/maps/templates/submaps/generic/generic_areas.dm b/code/modules/maps/templates/submaps/generic/generic_areas.dm new file mode 100644 index 000000000000..c8f9cf0c2c07 --- /dev/null +++ b/code/modules/maps/templates/submaps/generic/generic_areas.dm @@ -0,0 +1,15 @@ +/area/submap/generic + name = "Generic Submap Area" + icon_state = "submap" + ambience = AMBIENCE_RUINS + unique = FALSE + +/area/submap/generic/outside_open_air + is_outside = OUTSIDE_YES + initial_gas_mix = ATMOSPHERE_USE_OUTDOORS + +/area/submap/generic/outside_roofed + is_outside = OUTSIDE_NO + initial_gas_mix = ATMOSPHERE_USE_OUTDOORS + + diff --git a/code/modules/maps/templates/submaps/generic/generic_templates.dm b/code/modules/maps/templates/submaps/generic/generic_templates.dm new file mode 100644 index 000000000000..660f7d4b9bf5 --- /dev/null +++ b/code/modules/maps/templates/submaps/generic/generic_templates.dm @@ -0,0 +1,11 @@ +/datum/map_template/submap/level_specific/generic + name = "Generic POIs" + desc = "Generic " + allow_duplicates = FALSE // TRUE means the same submap can spawn twice + prefix = "_maps/submaps/level_specific/generic/" + +/datum/map_template/submap/level_specific/generic/test_1 + name = "Generic Room 1" + suffix = "test_template_001.dmm" // map is in root folder, so just the name.dmm is fine + cost = 5 // budget cost for this submap. total budget is set in _triumph_submaps.dm where the seed_submaps proc is called + discard_prob = 0 // set probability of not spawning. 0 ensures always spawn. removing this line will leave it default which is shit From d7b664f453977f7e76a88cf556a0454071963f60 Mon Sep 17 00:00:00 2001 From: KT Date: Wed, 5 Apr 2023 22:40:58 -0400 Subject: [PATCH 02/33] Boop --- citadel.dme | 1 - code/modules/maps/templates/submaps/generic/generic_areas.dm | 4 +++- .../maps/templates/submaps/generic/generic_templates.dm | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/citadel.dme b/citadel.dme index ff47315e168e..36046e5724c7 100644 --- a/citadel.dme +++ b/citadel.dme @@ -2839,7 +2839,6 @@ #include "code\modules\maps\tg\map_template.dm" #include "code\modules\maps\tg\map_template_vr.dm" #include "code\modules\maps\tg\reader.dm" -#include "code\modules\maps\turf_makers\generic_turfs.dm" #include "code\modules\maps\turf_makers\planetary_turfs.dm" #include "code\modules\maps\turf_makers\planet_station_turfs\_lythios43c.dm" #include "code\modules\maps\turf_makers\planet_station_turfs\_triumph.dm" diff --git a/code/modules/maps/templates/submaps/generic/generic_areas.dm b/code/modules/maps/templates/submaps/generic/generic_areas.dm index c8f9cf0c2c07..21d39d5fad18 100644 --- a/code/modules/maps/templates/submaps/generic/generic_areas.dm +++ b/code/modules/maps/templates/submaps/generic/generic_areas.dm @@ -12,4 +12,6 @@ is_outside = OUTSIDE_NO initial_gas_mix = ATMOSPHERE_USE_OUTDOORS - +/area/submap/generic/inside_breath_mix + is_outside = OUTSIDE_NO + initial_gas_mix = GAS_STRING_STP diff --git a/code/modules/maps/templates/submaps/generic/generic_templates.dm b/code/modules/maps/templates/submaps/generic/generic_templates.dm index 660f7d4b9bf5..8bd919c50c89 100644 --- a/code/modules/maps/templates/submaps/generic/generic_templates.dm +++ b/code/modules/maps/templates/submaps/generic/generic_templates.dm @@ -8,4 +8,4 @@ name = "Generic Room 1" suffix = "test_template_001.dmm" // map is in root folder, so just the name.dmm is fine cost = 5 // budget cost for this submap. total budget is set in _triumph_submaps.dm where the seed_submaps proc is called - discard_prob = 0 // set probability of not spawning. 0 ensures always spawn. removing this line will leave it default which is shit + discard_prob = 0 // set probability of not spawning. 0 ensures always spawn. From eca30e9ccd359350467438550f8bab79aa1b8e2a Mon Sep 17 00:00:00 2001 From: KT Date: Thu, 6 Apr 2023 01:50:17 -0400 Subject: [PATCH 03/33] Doing some repathing --- code/game/turfs/simulated.dm | 3 - code/game/turfs/simulated/floor.dm | 2 + .../simulated/flooring/flooring_premade.dm | 7 +- .../submaps/generic/generic_templates.dm | 3 +- maps/away_missions/140x140/snow_outpost.dmm | 18 +- maps/map_levels/140x140/virgo4_desert.dmm | 14 +- maps/map_levels/192x192/miaphus_desert.dmm | 14 +- maps/submaps/generic/crashed_ship_01.dmm | 897 ++++++++++++++++++ maps/submaps/generic/test_template_001.dmm | 603 ++++++++++++ .../level_specific/class_h/landing_padH.dmm | 18 +- .../level_specific/class_h/solar_farmH.dmm | 44 +- .../level_specific/debrisfield/derelict.dmm | 113 +-- maps/submaps/mountains/digsite.dmm | 16 +- maps/submaps/plains/construction1.dmm | 46 +- .../shuttles/overmaps/generic/mercship.dmm | 16 +- 15 files changed, 1639 insertions(+), 175 deletions(-) create mode 100644 maps/submaps/generic/crashed_ship_01.dmm create mode 100644 maps/submaps/generic/test_template_001.dmm diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index e03a72139a57..183aea0414dd 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -186,9 +186,6 @@ else if(ishuman(M)) add_blood(M) -/turf/simulated/floor/plating - can_start_dirty = TRUE // But let maints and decrepit areas have some randomness - //? Radiation /turf/simulated/update_rad_insulation() diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 373d44bd7056..fd7d2e92aded 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -216,3 +216,5 @@ to_chat(user, SPAN_NOTICE("You deconstruct \the [src].")) ScrapeAway(flags = CHANGETURF_INHERIT_AIR|CHANGETURF_PRESERVE_OUTDOORS) return TRUE + +CREATE_STANDARD_TURFS(/turf/simulated/floor) diff --git a/code/game/turfs/simulated/flooring/flooring_premade.dm b/code/game/turfs/simulated/flooring/flooring_premade.dm index 3c8c8cdbdb1d..83f846ce6f1a 100644 --- a/code/game/turfs/simulated/flooring/flooring_premade.dm +++ b/code/game/turfs/simulated/flooring/flooring_premade.dm @@ -134,6 +134,7 @@ CREATE_STANDARD_TURFS(/turf/simulated/floor/tiled) name = "floor" icon_state = "monotile" initial_flooring = /singleton/flooring/tiling/new_tile/monotile +CREATE_STANDARD_TURFS(/turf/simulated/floor/tiled/monotile) /turf/simulated/floor/tiled/monowhite name = "floor" @@ -486,12 +487,6 @@ CREATE_STANDARD_TURFS(/turf/simulated/floor/tiled) can_start_dirty = TRUE // But let maints and decrepit areas have some randomness CREATE_STANDARD_TURFS(/turf/simulated/floor/plating) -/turf/simulated/floor/plating/external - outdoors = TRUE - -/turf/simulated/floor/tiled/external - outdoors = TRUE - //**** Here lives snow **** /turf/simulated/floor/snow name = "snow" diff --git a/code/modules/maps/templates/submaps/generic/generic_templates.dm b/code/modules/maps/templates/submaps/generic/generic_templates.dm index 8bd919c50c89..240413e7ddb5 100644 --- a/code/modules/maps/templates/submaps/generic/generic_templates.dm +++ b/code/modules/maps/templates/submaps/generic/generic_templates.dm @@ -2,10 +2,11 @@ name = "Generic POIs" desc = "Generic " allow_duplicates = FALSE // TRUE means the same submap can spawn twice - prefix = "_maps/submaps/level_specific/generic/" + prefix = "maps/submaps/generic/" /datum/map_template/submap/level_specific/generic/test_1 name = "Generic Room 1" suffix = "test_template_001.dmm" // map is in root folder, so just the name.dmm is fine cost = 5 // budget cost for this submap. total budget is set in _triumph_submaps.dm where the seed_submaps proc is called discard_prob = 0 // set probability of not spawning. 0 ensures always spawn. + allow_duplicates = TRUE diff --git a/maps/away_missions/140x140/snow_outpost.dmm b/maps/away_missions/140x140/snow_outpost.dmm index 664cf72a2aa9..24c3102c0737 100644 --- a/maps/away_missions/140x140/snow_outpost.dmm +++ b/maps/away_missions/140x140/snow_outpost.dmm @@ -324,7 +324,7 @@ /area/awaymission/snow_outpost/powered) "bh" = ( /obj/structure/ghost_pod/manual/lost_drone/dogborg, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/awaymission/snow_outpost/dark) "bi" = ( /obj/machinery/power/apc{ @@ -634,17 +634,17 @@ /area/awaymission/snow_outpost/dark) "cg" = ( /obj/structure/boulder, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/awaymission/snow_outpost/dark) "ch" = ( /turf/simulated/floor/tiled/kafel_full/yellow, /area/awaymission/snow_outpost/dark) "ci" = ( -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/awaymission/snow_outpost/dark) "cj" = ( /obj/item/ore, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/awaymission/snow_outpost/dark) "ck" = ( /obj/structure/bed/alien, @@ -696,7 +696,7 @@ "cw" = ( /obj/item/frame/apc, /obj/item/module/power_control, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/awaymission/snow_outpost/dark) "cx" = ( /obj/structure/table/steel, @@ -715,13 +715,13 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/awaymission/snow_outpost/dark) "cA" = ( /obj/structure/cable/yellow{ icon_state = "0-8" }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/awaymission/snow_outpost/dark) "cB" = ( /obj/structure/bed/chair{ @@ -745,7 +745,7 @@ /area/awaymission/snow_outpost/dark) "cF" = ( /obj/structure/loot_pile/maint/technical, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/awaymission/snow_outpost/dark) "cG" = ( /obj/structure/table/steel, @@ -768,7 +768,7 @@ /area/awaymission/snow_outpost/dark) "cK" = ( /obj/structure/loot_pile/maint/junk, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/awaymission/snow_outpost/dark) "cL" = ( /obj/structure/table/steel, diff --git a/maps/map_levels/140x140/virgo4_desert.dmm b/maps/map_levels/140x140/virgo4_desert.dmm index 9d0f5cf3bf2f..425076af40b1 100644 --- a/maps/map_levels/140x140/virgo4_desert.dmm +++ b/maps/map_levels/140x140/virgo4_desert.dmm @@ -74,7 +74,7 @@ }, /area/tether_away/beach/desert/explored) "qu" = ( -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/tether_away/beach/desert/explored) "se" = ( /turf/simulated/floor/water/shoreline/corner{ @@ -98,7 +98,7 @@ "vr" = ( /obj/random/humanoidremains, /obj/effect/debris/cleanable/blood, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/tether_away/beach/desert/explored) "wb" = ( /obj/item/pickaxe, @@ -153,7 +153,7 @@ /area/tether_away/beach/desert/explored) "zQ" = ( /obj/item/bone/skull/tajaran, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/tether_away/beach/desert/explored) "BS" = ( /turf/simulated/floor/water/shoreline, @@ -233,7 +233,7 @@ /obj/machinery/light/small/flicker{ dir = 4 }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/tether_away/beach/desert/explored) "LF" = ( /turf/simulated/floor/water/shoreline/classh{ @@ -248,7 +248,7 @@ }, /area/tether_away/beach/desert/explored) "Ms" = ( -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/tether_away/beach/desert/explored) "Mv" = ( /turf/simulated/floor/water/shoreline{ @@ -271,12 +271,12 @@ /area/tether_away/beach/desert/explored) "Ov" = ( /obj/random/trash, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/tether_away/beach/desert/explored) "OI" = ( /obj/random/humanoidremains, /obj/effect/debris/cleanable/blood, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/tether_away/beach/desert/explored) "OO" = ( /obj/structure/sign/securearea{ diff --git a/maps/map_levels/192x192/miaphus_desert.dmm b/maps/map_levels/192x192/miaphus_desert.dmm index 6194b8456f77..47a3c60bf400 100644 --- a/maps/map_levels/192x192/miaphus_desert.dmm +++ b/maps/map_levels/192x192/miaphus_desert.dmm @@ -231,10 +231,10 @@ /area/tether_away/beach/desert/unexplored) "Kt" = ( /obj/item/bone/skull/tajaran, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/tether_away/beach/desert/explored) "LF" = ( -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/tether_away/beach/desert/explored) "Mc" = ( /obj/machinery/light/small/flicker{ @@ -252,12 +252,12 @@ /area/tether_away/beach/desert/explored) "Mv" = ( /obj/random/trash, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/tether_away/beach/desert/explored) "Nx" = ( /obj/random/humanoidremains, /obj/effect/debris/cleanable/blood, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/tether_away/beach/desert/explored) "NW" = ( /obj/machinery/light/small, @@ -274,12 +274,12 @@ /turf/simulated/floor/outdoors/beach/sand/lowdesert, /area/tether_away/beach/desert/explored) "OI" = ( -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/tether_away/beach/desert/explored) "OO" = ( /obj/random/humanoidremains, /obj/effect/debris/cleanable/blood, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/tether_away/beach/desert/explored) "Rb" = ( /obj/item/ammo_casing/spent{ @@ -300,7 +300,7 @@ /obj/machinery/light/small/flicker{ dir = 4 }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/tether_away/beach/desert/explored) "ST" = ( /obj/effect/map_effect/portal/master/side_b{ diff --git a/maps/submaps/generic/crashed_ship_01.dmm b/maps/submaps/generic/crashed_ship_01.dmm new file mode 100644 index 000000000000..6e85eae2293f --- /dev/null +++ b/maps/submaps/generic/crashed_ship_01.dmm @@ -0,0 +1,897 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/floor/tiled/default, +/area/space) +"F" = ( +/turf/template_noop, +/area/space) +"L" = ( +/obj/machinery/atmospherics/component/unary/engine/bigger{ + dir = 8 + }, +/turf/template_noop, +/area/space) +"T" = ( +/turf/simulated/wall/rshull, +/area/space) + +(1,1,1) = {" +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +"} +(2,1,1) = {" +F +F +F +F +F +F +F +F +T +T +T +T +F +F +F +F +F +F +F +F +"} +(3,1,1) = {" +F +F +F +F +F +F +F +T +T +a +a +T +T +F +F +F +F +F +F +F +"} +(4,1,1) = {" +F +F +F +F +F +F +F +T +a +a +a +a +T +F +F +F +F +F +F +F +"} +(5,1,1) = {" +F +F +F +F +F +F +F +T +a +a +a +a +T +F +F +F +F +F +F +F +"} +(6,1,1) = {" +F +F +F +F +T +T +T +T +a +a +a +a +T +T +T +T +F +F +F +F +"} +(7,1,1) = {" +F +F +F +F +T +a +a +a +a +a +a +a +a +a +a +T +F +F +F +F +"} +(8,1,1) = {" +F +F +F +T +T +a +a +a +a +a +a +a +a +a +a +T +T +F +F +F +"} +(9,1,1) = {" +F +F +F +T +a +a +a +a +a +a +a +a +a +a +a +a +T +F +F +F +"} +(10,1,1) = {" +F +F +F +T +a +a +a +a +a +a +a +a +a +a +a +a +T +F +F +F +"} +(11,1,1) = {" +F +F +F +T +a +a +a +a +a +a +a +a +a +a +a +a +T +F +F +F +"} +(12,1,1) = {" +F +F +T +T +a +a +a +a +a +a +a +a +a +a +a +a +T +T +F +F +"} +(13,1,1) = {" +F +T +T +a +a +a +a +a +a +a +a +a +a +a +a +a +a +T +T +F +"} +(14,1,1) = {" +T +T +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +T +T +"} +(15,1,1) = {" +T +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +T +"} +(16,1,1) = {" +T +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +T +"} +(17,1,1) = {" +T +T +T +T +T +a +a +a +a +a +a +a +a +a +a +T +T +T +T +T +"} +(18,1,1) = {" +F +L +F +L +T +a +a +a +a +a +a +a +a +a +a +T +F +L +F +L +"} +(19,1,1) = {" +F +F +F +F +T +a +a +a +a +a +a +a +a +a +a +T +F +F +F +F +"} +(20,1,1) = {" +F +F +F +F +T +T +T +a +a +a +a +a +a +T +T +T +F +F +F +F +"} +(21,1,1) = {" +F +F +F +F +F +L +T +a +a +a +a +a +a +T +F +L +F +F +F +F +"} +(22,1,1) = {" +F +F +F +F +F +F +T +a +a +a +a +a +a +T +F +F +F +F +F +F +"} +(23,1,1) = {" +F +F +F +F +F +F +T +T +T +a +a +T +T +T +F +F +F +F +F +F +"} +(24,1,1) = {" +F +F +F +F +F +F +F +L +T +a +a +T +F +L +F +F +F +F +F +F +"} +(25,1,1) = {" +F +F +F +F +F +F +F +F +T +a +a +T +F +F +F +F +F +F +F +F +"} +(26,1,1) = {" +F +F +F +F +F +F +F +F +T +a +a +T +F +F +F +F +F +F +F +F +"} +(27,1,1) = {" +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +"} +(28,1,1) = {" +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +"} +(29,1,1) = {" +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +"} +(30,1,1) = {" +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +"} +(31,1,1) = {" +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +"} +(32,1,1) = {" +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +"} +(33,1,1) = {" +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +"} +(34,1,1) = {" +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +"} +(35,1,1) = {" +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +"} +(36,1,1) = {" +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +"} +(37,1,1) = {" +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +"} +(38,1,1) = {" +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +"} +(39,1,1) = {" +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +"} +(40,1,1) = {" +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +F +"} diff --git a/maps/submaps/generic/test_template_001.dmm b/maps/submaps/generic/test_template_001.dmm new file mode 100644 index 000000000000..67fe55c5bef9 --- /dev/null +++ b/maps/submaps/generic/test_template_001.dmm @@ -0,0 +1,603 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/floor/grass/default, +/area/submap/generic/outside_open_air) +"b" = ( +/turf/simulated/floor/plating/indoors, +/area/submap/generic/inside_breath_mix) +"c" = ( +/turf/simulated/floor/tiled/indoors, +/area/submap/generic/outside_roofed) +"d" = ( +/turf/template_noop, +/area/submap/generic/outside_open_air) +"e" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plating/indoors, +/area/submap/generic/inside_breath_mix) +"f" = ( +/turf/simulated/wall, +/area/submap/generic/outside_open_air) +"g" = ( +/turf/simulated/floor/grass/outdoors, +/area/submap/generic/outside_roofed) +"h" = ( +/turf/simulated/floor/plating/outdoors, +/area/submap/generic/outside_roofed) +"k" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating/indoors, +/area/submap/generic/inside_breath_mix) +"o" = ( +/obj/machinery/light, +/turf/simulated/floor/plating/overhang, +/area/submap/generic/inside_breath_mix) +"q" = ( +/obj/machinery/light, +/turf/simulated/floor/plating/outdoors, +/area/submap/generic/inside_breath_mix) +"s" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/alarm/alarms_hidden{ + pixel_y = 24 + }, +/turf/simulated/floor/plating/indoors, +/area/submap/generic/inside_breath_mix) +"t" = ( +/turf/simulated/floor/tiled/indoors, +/area/submap/generic/outside_open_air) +"u" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled/default, +/area/submap/generic/inside_breath_mix) +"v" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating/indoors, +/area/submap/generic/inside_breath_mix) +"w" = ( +/obj/structure/fans/tiny, +/turf/simulated/floor/plating/outdoors, +/area/submap/generic/inside_breath_mix) +"x" = ( +/turf/simulated/floor/plating/overhang, +/area/submap/generic/inside_breath_mix) +"y" = ( +/turf/simulated/wall, +/area/submap/generic/inside_breath_mix) +"z" = ( +/turf/simulated/wall, +/area/submap/generic/outside_roofed) +"A" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/default, +/area/submap/generic/inside_breath_mix) +"C" = ( +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/machinery/power/smes/magical, +/turf/simulated/floor/plating/indoors, +/area/submap/generic/inside_breath_mix) +"E" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating/indoors, +/area/submap/generic/outside_open_air) +"F" = ( +/obj/structure/fans/tiny, +/turf/simulated/floor/tiled/indoors, +/area/submap/generic/outside_open_air) +"G" = ( +/obj/structure/fans/tiny, +/turf/simulated/floor/plating/indoors, +/area/submap/generic/inside_breath_mix) +"H" = ( +/turf/simulated/floor/plating/default, +/area/submap/generic/outside_roofed) +"I" = ( +/obj/structure/fans/tiny, +/turf/simulated/floor/plating/overhang, +/area/submap/generic/inside_breath_mix) +"J" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/default, +/area/submap/generic/inside_breath_mix) +"K" = ( +/obj/structure/fans/tiny, +/turf/simulated/floor/tiled/indoors, +/area/submap/generic/outside_roofed) +"L" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating/indoors, +/area/submap/generic/outside_roofed) +"M" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/default, +/area/submap/generic/inside_breath_mix) +"N" = ( +/obj/machinery/light, +/turf/simulated/floor/tiled/default, +/area/submap/generic/inside_breath_mix) +"P" = ( +/obj/structure/fans/tiny, +/turf/simulated/floor/tiled/default, +/area/submap/generic/inside_breath_mix) +"Q" = ( +/turf/simulated/floor/plating/outdoors, +/area/submap/generic/inside_breath_mix) +"S" = ( +/mob/living/simple_mob/animal/passive/crab{ + real_name = "Mr. Crabs" + }, +/turf/simulated/floor/tiled/default, +/area/submap/generic/inside_breath_mix) +"T" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/default, +/area/submap/generic/inside_breath_mix) +"U" = ( +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/alarms_hidden/north_bump, +/turf/simulated/floor/plating/indoors, +/area/submap/generic/inside_breath_mix) +"W" = ( +/obj/effect/floor_decal/sign/ex, +/turf/simulated/floor/grass/outdoors, +/area/submap/generic/outside_roofed) +"X" = ( +/turf/simulated/floor/tiled/default, +/area/submap/generic/inside_breath_mix) + +(1,1,1) = {" +z +h +h +h +h +z +z +z +z +z +y +y +y +y +y +y +y +y +y +y +"} +(2,1,1) = {" +z +h +h +h +h +z +c +c +c +c +G +X +X +M +X +b +X +X +X +y +"} +(3,1,1) = {" +z +h +h +h +h +K +c +c +c +c +G +X +X +X +X +b +X +X +X +y +"} +(4,1,1) = {" +z +h +h +h +h +z +c +c +c +c +G +X +X +X +X +b +X +X +X +y +"} +(5,1,1) = {" +z +z +h +h +z +z +z +L +L +z +y +J +X +X +X +y +X +X +X +y +"} +(6,1,1) = {" +z +g +g +g +g +z +H +H +H +H +y +U +u +S +X +k +X +X +N +y +"} +(7,1,1) = {" +z +g +g +g +g +H +H +H +H +H +y +s +X +X +X +k +X +X +X +y +"} +(8,1,1) = {" +z +g +g +W +g +H +H +H +H +H +k +v +A +X +N +y +X +X +X +y +"} +(9,1,1) = {" +z +g +g +g +g +z +H +H +H +H +y +C +X +X +X +y +X +X +X +y +"} +(10,1,1) = {" +z +g +g +g +g +z +z +L +L +z +y +e +X +X +X +k +X +X +N +y +"} +(11,1,1) = {" +a +a +d +d +a +f +t +t +t +t +G +X +X +X +X +k +X +X +X +y +"} +(12,1,1) = {" +a +a +d +d +a +f +t +t +t +t +G +X +X +X +X +y +X +X +X +y +"} +(13,1,1) = {" +a +a +d +d +a +F +t +t +t +t +G +X +X +X +X +y +y +P +y +y +"} +(14,1,1) = {" +a +a +d +d +a +f +t +t +t +t +G +X +X +T +X +y +x +x +x +y +"} +(15,1,1) = {" +a +d +d +d +d +f +f +E +E +f +y +y +y +y +y +y +x +x +x +y +"} +(16,1,1) = {" +a +d +d +d +d +a +a +a +a +a +y +Q +Q +Q +q +y +x +x +o +y +"} +(17,1,1) = {" +a +d +d +d +d +d +d +d +d +a +w +Q +Q +Q +Q +I +x +x +x +y +"} +(18,1,1) = {" +a +d +d +d +d +d +d +d +d +a +w +Q +Q +Q +Q +I +x +x +o +y +"} +(19,1,1) = {" +a +a +a +a +a +a +a +a +a +a +y +Q +Q +Q +q +y +x +x +x +y +"} +(20,1,1) = {" +a +a +a +a +a +a +a +a +a +a +y +y +y +y +y +y +y +y +y +y +"} diff --git a/maps/submaps/level_specific/class_h/landing_padH.dmm b/maps/submaps/level_specific/class_h/landing_padH.dmm index 72f72f89120f..7890268cf450 100644 --- a/maps/submaps/level_specific/class_h/landing_padH.dmm +++ b/maps/submaps/level_specific/class_h/landing_padH.dmm @@ -14,7 +14,7 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 5 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/class_h/POIs/landing_pad) "d" = ( /obj/machinery/atmospherics/pipe/simple/hidden, @@ -55,7 +55,7 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 6 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/class_h/POIs/landing_pad) "k" = ( /obj/effect/floor_decal/rust, @@ -66,7 +66,7 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 9 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/class_h/POIs/landing_pad) "m" = ( /obj/effect/wingrille_spawn/reinforced, @@ -84,10 +84,10 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 8 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/class_h/POIs/landing_pad) "r" = ( -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/class_h/POIs/landing_pad) "s" = ( /obj/effect/debris/cleanable/dirt, @@ -169,7 +169,7 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 4 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/class_h/POIs/landing_pad) "F" = ( /obj/effect/wingrille_spawn/reinforced, @@ -224,7 +224,7 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 10 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/class_h/POIs/landing_pad) "N" = ( /obj/machinery/door/airlock/glass_external/public, @@ -240,7 +240,7 @@ /area/class_h/POIs/landing_pad) "R" = ( /obj/effect/floor_decal/techfloor/orange, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/class_h/POIs/landing_pad) "S" = ( /obj/effect/floor_decal/rust, @@ -259,7 +259,7 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 1 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/class_h/POIs/landing_pad) "V" = ( /obj/machinery/light/spot{ diff --git a/maps/submaps/level_specific/class_h/solar_farmH.dmm b/maps/submaps/level_specific/class_h/solar_farmH.dmm index adf91b6d152f..339957f5bd46 100644 --- a/maps/submaps/level_specific/class_h/solar_farmH.dmm +++ b/maps/submaps/level_specific/class_h/solar_farmH.dmm @@ -6,7 +6,7 @@ /obj/structure/fence{ dir = 4 }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/class_h/POIs/solar_farm) "c" = ( /obj/structure/fence{ @@ -16,7 +16,7 @@ /area/class_h/POIs/solar_farm) "e" = ( /obj/structure/fence/door, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/class_h/POIs/solar_farm) "h" = ( /obj/structure/cable{ @@ -28,7 +28,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/class_h/POIs/solar_farm) "j" = ( /obj/machinery/power/solar_control, @@ -41,13 +41,13 @@ /obj/structure/cable{ icon_state = "1-4" }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/class_h/POIs/solar_farm) "l" = ( /obj/structure/fence/door/opened{ dir = 8 }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/class_h/POIs/solar_farm) "m" = ( /obj/machinery/power/smes/buildable, @@ -60,13 +60,13 @@ /obj/structure/cable{ dir = 8 }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/class_h/POIs/solar_farm) "o" = ( /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/class_h/POIs/solar_farm) "p" = ( /obj/structure/cable{ @@ -79,7 +79,7 @@ icon_state = "1-2" }, /mob/living/simple_mob/mechanical/corrupt_maint_drone, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/class_h/POIs/solar_farm) "q" = ( /obj/machinery/power/terminal{ @@ -101,7 +101,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/class_h/POIs/solar_farm) "u" = ( /turf/template_noop, @@ -125,14 +125,14 @@ /obj/structure/cable{ icon_state = "2-8" }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/class_h/POIs/solar_farm) "z" = ( /obj/machinery/power/solar, /obj/structure/cable{ dir = 8 }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/class_h/POIs/solar_farm) "B" = ( /turf/simulated/wall, @@ -141,7 +141,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/class_h/POIs/solar_farm) "E" = ( /obj/structure/closet/secure_closet/engineering_electrical{ @@ -159,26 +159,26 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/class_h/POIs/solar_farm) "G" = ( /obj/structure/fence{ dir = 1 }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/class_h/POIs/solar_farm) "H" = ( -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/class_h/POIs/solar_farm) "I" = ( /mob/living/simple_mob/mechanical/corrupt_maint_drone, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/class_h/POIs/solar_farm) "L" = ( /obj/structure/fence/door/opened{ dir = 4 }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/class_h/POIs/solar_farm) "N" = ( /obj/structure/cable{ @@ -187,7 +187,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/class_h/POIs/solar_farm) "O" = ( /obj/structure/cable{ @@ -213,14 +213,14 @@ /obj/structure/cable{ dir = 4 }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/class_h/POIs/solar_farm) "T" = ( /obj/machinery/power/tracker, /obj/structure/cable{ dir = 8 }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/class_h/POIs/solar_farm) "U" = ( /obj/structure/cable{ @@ -238,7 +238,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/class_h/POIs/solar_farm) "W" = ( /obj/structure/cable{ @@ -256,7 +256,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/class_h/POIs/solar_farm) (1,1,1) = {" diff --git a/maps/submaps/level_specific/debrisfield/derelict.dmm b/maps/submaps/level_specific/debrisfield/derelict.dmm index f6e452d14bf7..62277e8ccfce 100644 --- a/maps/submaps/level_specific/debrisfield/derelict.dmm +++ b/maps/submaps/level_specific/debrisfield/derelict.dmm @@ -4,11 +4,11 @@ /area/space/debrisfield/explored) "af" = ( /obj/structure/door_assembly/door_assembly_alien, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/debrisfield/derelict) "ag" = ( /obj/machinery/door/airlock/alien, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/debrisfield/derelict) "al" = ( /obj/structure/shuttle/engine/propulsion{ @@ -111,7 +111,7 @@ faction = "derelict"; use_power = 0 }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/debrisfield/derelict) "aH" = ( /obj/structure/cable{ @@ -140,7 +140,7 @@ /area/debrisfield/derelict) "aM" = ( /obj/structure/catwalk, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/debrisfield/derelict) "aN" = ( /obj/machinery/transhuman/synthprinter, @@ -352,13 +352,6 @@ }, /turf/simulated/floor/reinforced/airless, /area/debrisfield/derelict) -"bE" = ( -/obj/machinery/door/airlock/alien, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/reinforced/airless, -/area/debrisfield/derelict) "bF" = ( /obj/random/humanoidremains, /turf/simulated/floor/tiled/white/airless, @@ -389,24 +382,12 @@ }, /turf/simulated/floor/tiled/asteroid_steel/airless, /area/debrisfield/derelict) -"bK" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel/airless, -/area/debrisfield/derelict) "bL" = ( /obj/structure/cable{ icon_state = "1-8" }, /turf/simulated/floor/tiled/asteroid_steel/airless, /area/debrisfield/derelict) -"bM" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/reinforced/airless, -/area/debrisfield/derelict) "bN" = ( /obj/machinery/replicator, /turf/simulated/floor/tiled/white/airless, @@ -491,7 +472,7 @@ /area/debrisfield/derelict) "cg" = ( /obj/item/gun/energy/ionrifle, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/debrisfield/derelict) "ch" = ( /obj/structure/cable{ @@ -525,25 +506,19 @@ /obj/item/grenade/empgrenade, /obj/item/grenade/empgrenade, /obj/item/grenade/empgrenade, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/debrisfield/derelict) "co" = ( /obj/random/humanoidremains, /turf/simulated/floor/tiled/asteroid_steel/airless, /area/debrisfield/derelict) -"cp" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/asteroid_steel/airless, -/area/debrisfield/derelict) "cq" = ( /obj/structure/ghost_pod/manual/lost_drone/dogborg, /turf/simulated/floor/tiled/asteroid_steel/airless, /area/debrisfield/derelict) "cr" = ( /obj/machinery/door/airlock/alien/locked, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/debrisfield/derelict) "ct" = ( /obj/random/humanoidremains, @@ -568,7 +543,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/debrisfield/derelict) "cz" = ( /obj/structure/cable{ @@ -592,13 +567,13 @@ /obj/structure/cable{ icon_state = "1-4" }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/debrisfield/derelict) "cC" = ( /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/debrisfield/derelict) "cE" = ( /obj/mob_spawner/derelict/corrupt_maint_swarm, @@ -606,7 +581,7 @@ /area/debrisfield/derelict) "cF" = ( /obj/structure/ghost_pod/manual/lost_drone/dogborg, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/debrisfield/derelict) "cG" = ( /obj/machinery/door/airlock/hatch{ @@ -616,7 +591,7 @@ name = "AI Core"; req_access = list(16) }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/debrisfield/derelict) "cH" = ( /obj/machinery/door/airlock/hatch{ @@ -629,7 +604,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/debrisfield/derelict) "cI" = ( /obj/structure/shuttle/engine/propulsion, @@ -655,11 +630,11 @@ alpha = 0; invisibility = 101 }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/debrisfield/derelict) "cL" = ( /obj/mob_spawner/derelict/mech_wizard, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/debrisfield/derelict) "cM" = ( /obj/structure/prop/alien/computer, @@ -675,7 +650,7 @@ name = "east bump"; pixel_x = 28 }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/debrisfield/derelict) "cO" = ( /obj/structure/prop/fake_ai, @@ -687,22 +662,16 @@ faction = "derelict"; use_power = 0 }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/debrisfield/derelict) "cV" = ( /turf/simulated/floor/greengrid/airless, /area/debrisfield/derelict) -"cW" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating/external, -/area/debrisfield/derelict) "cX" = ( /obj/structure/cable{ icon_state = "1-8" }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/debrisfield/derelict) "cZ" = ( /obj/structure/cable{ @@ -727,7 +696,7 @@ /area/debrisfield/derelict) "dZ" = ( /obj/effect/decal/mecha_wreckage/gygax/adv, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/debrisfield/derelict) "fl" = ( /obj/machinery/door/airlock/alien, @@ -750,7 +719,7 @@ /turf/simulated/floor/tiled/white/airless, /area/debrisfield/derelict) "JC" = ( -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/debrisfield/derelict) "LM" = ( /obj/structure/shuttle/engine/heater, @@ -1106,7 +1075,7 @@ ao ao ao ao -bE +bn bQ ao ao @@ -1268,7 +1237,7 @@ ao ao ao ao -bE +bn bQ ao ao @@ -1816,7 +1785,7 @@ aq aq aq aq -cp +bZ bT ao aM @@ -1979,7 +1948,7 @@ aq aq aq co -cp +bZ ao aM JC @@ -2024,7 +1993,7 @@ aR cA cA aq -bK +bG au aq bX @@ -2078,11 +2047,11 @@ aS cA cA aq -bK +bG au aq bT -cp +bZ bT bT bT @@ -2132,7 +2101,7 @@ cA aR aR aq -bK +bG au aq fl @@ -2186,7 +2155,7 @@ aq aq aq aq -bK +bG au aq bY @@ -2240,7 +2209,7 @@ bT bT bT aq -bK +bG au aq bY @@ -2317,7 +2286,7 @@ aq aq aq ao -cW +cC JC ao ao @@ -2348,7 +2317,7 @@ aq bT aq aq -bK +bG au aq bY @@ -2402,7 +2371,7 @@ aq cA cA aq -bK +bG au aq bY @@ -2456,7 +2425,7 @@ aq cA ba aq -bK +bG au aq br @@ -2564,7 +2533,7 @@ aa ao ao ao -bM +bD bB ao ao @@ -2618,7 +2587,7 @@ aa aa ao ao -bM +bD bB ao ao @@ -2771,14 +2740,14 @@ ao ao aw bB -bM +bD bB bB aq bB -bM +bD aq -bM +bD aq bB bB @@ -2830,9 +2799,9 @@ aq bB aq bB -bM +bD aq -bM +bD aq bB bB diff --git a/maps/submaps/mountains/digsite.dmm b/maps/submaps/mountains/digsite.dmm index f87ed85eb20d..feedfa8faaf3 100644 --- a/maps/submaps/mountains/digsite.dmm +++ b/maps/submaps/mountains/digsite.dmm @@ -10,7 +10,7 @@ /area/submap/cave/digsite) "d" = ( /obj/structure/boulder, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/submap/cave/digsite) "e" = ( /turf/simulated/mineral/floor/ignore_mapgen, @@ -19,11 +19,11 @@ /turf/simulated/floor/tiled/kafel_full/yellow, /area/submap/cave/digsite) "g" = ( -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/submap/cave/digsite) "h" = ( /obj/item/ore, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/submap/cave/digsite) "i" = ( /obj/structure/bed/alien, @@ -72,7 +72,7 @@ "t" = ( /obj/item/frame/apc, /obj/item/module/power_control, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/submap/cave/digsite) "u" = ( /obj/structure/table/steel, @@ -91,13 +91,13 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/submap/cave/digsite) "x" = ( /obj/structure/cable/yellow{ icon_state = "0-8" }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/submap/cave/digsite) "y" = ( /obj/structure/bed/chair{ @@ -121,7 +121,7 @@ /area/submap/cave/digsite) "C" = ( /obj/structure/loot_pile/maint/technical, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/submap/cave/digsite) "D" = ( /obj/structure/table/steel, @@ -144,7 +144,7 @@ /area/submap/cave/digsite) "H" = ( /obj/structure/loot_pile/maint/junk, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/submap/cave/digsite) "I" = ( /obj/structure/table/steel, diff --git a/maps/submaps/plains/construction1.dmm b/maps/submaps/plains/construction1.dmm index 985984648007..2ff2cd3ff9bd 100644 --- a/maps/submaps/plains/construction1.dmm +++ b/maps/submaps/plains/construction1.dmm @@ -11,41 +11,41 @@ /area/template_noop) "d" = ( /obj/structure/grille, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/submap/construction1) "e" = ( /obj/structure/firedoor_assembly, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/submap/construction1) "f" = ( /obj/structure/lattice, /turf/simulated/floor/outdoors/rocks, /area/template_noop) "g" = ( -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/submap/construction1) "h" = ( /obj/structure/firedoor_assembly, /obj/structure/grille, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/submap/construction1) "i" = ( /obj/item/clothing/gloves/black, /turf/simulated/floor/outdoors/rocks, /area/template_noop) "j" = ( -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/submap/construction1) "k" = ( /obj/item/tool/wrench, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/submap/construction1) "l" = ( /turf/simulated/wall, /area/submap/construction1) "m" = ( /obj/structure/loot_pile/maint/technical, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/submap/construction1) "n" = ( /obj/item/pickaxe/drill, @@ -53,15 +53,15 @@ /area/template_noop) "o" = ( /obj/structure/girder, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/submap/construction1) "p" = ( /obj/item/clothing/head/hardhat, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/submap/construction1) "q" = ( /obj/item/frame, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/submap/construction1) "r" = ( /obj/item/clothing/head/orangebandana, @@ -69,19 +69,19 @@ /area/template_noop) "s" = ( /obj/item/clothing/head/welding/engie, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/submap/construction1) "t" = ( /obj/structure/door_assembly/door_assembly_mai, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/submap/construction1) "u" = ( /obj/item/storage/toolbox/electrical, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/submap/construction1) "v" = ( /obj/item/airlock_electronics, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/submap/construction1) "w" = ( /obj/item/clothing/suit/storage/hazardvest, @@ -89,39 +89,39 @@ /area/template_noop) "x" = ( /obj/structure/windoor_assembly, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/submap/construction1) "y" = ( /obj/item/storage/toolbox/mechanical, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/submap/construction1) "z" = ( /obj/structure/loot_pile/maint/technical, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/submap/construction1) "A" = ( /obj/item/shovel, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/submap/construction1) "B" = ( /obj/item/airlock_electronics, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/submap/construction1) "C" = ( /obj/item/weldingtool/largetank, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/submap/construction1) "D" = ( /obj/item/tool/crowbar, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/submap/construction1) "E" = ( /obj/item/clothing/glasses/welding, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/submap/construction1) "F" = ( /obj/item/clothing/suit/storage/hazardvest, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/submap/construction1) (1,1,1) = {" diff --git a/maps/templates/shuttles/overmaps/generic/mercship.dmm b/maps/templates/shuttles/overmaps/generic/mercship.dmm index 5dbfbb6c262d..b34f6db28532 100644 --- a/maps/templates/shuttles/overmaps/generic/mercship.dmm +++ b/maps/templates/shuttles/overmaps/generic/mercship.dmm @@ -168,7 +168,7 @@ /obj/machinery/shipsensors{ dir = 1 }, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/ship/mercenary/bridge) "au" = ( /obj/structure/cable{ @@ -2203,7 +2203,7 @@ /area/ship/mercenary/hall1) "dY" = ( /obj/effect/decal/warning_stripes, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/ship/mercenary/med) "dZ" = ( /obj/machinery/atmospherics/component/binary/pump{ @@ -2820,7 +2820,7 @@ /area/ship/mercenary/engine) "fj" = ( /obj/effect/decal/warning_stripes, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/ship/mercenary/barracks) "fk" = ( /obj/structure/cable{ @@ -2941,7 +2941,7 @@ /turf/simulated/floor, /area/ship/mercenary/southairlock) "fu" = ( -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/ship/mercenary/engineeringcntrl) "fv" = ( /obj/structure/closet/crate, @@ -3428,19 +3428,19 @@ /area/ship/mercenary/engineering) "gk" = ( /obj/effect/decal/warning_stripes, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/ship/mercenary/bridge) "gl" = ( /obj/effect/decal/warning_stripes, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/ship/mercenary/engineeringcntrl) "gm" = ( /obj/effect/decal/warning_stripes, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/ship/mercenary/armoury) "gn" = ( /obj/effect/decal/warning_stripes, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/ship/mercenary/engineering) "go" = ( /obj/effect/floor_decal/borderfloorblack{ From 2bf76cdc2e52e08fd3cb9514e478d96d7fd2056f Mon Sep 17 00:00:00 2001 From: KT Date: Sat, 8 Apr 2023 22:13:51 -0400 Subject: [PATCH 04/33] Touching stuff --- maps/submaps/generic/alien_ship_001.dmm | 1011 ++++++++++++++++++++++ maps/submaps/generic/crashed_ship_01.dmm | 22 +- 2 files changed, 1025 insertions(+), 8 deletions(-) create mode 100644 maps/submaps/generic/alien_ship_001.dmm diff --git a/maps/submaps/generic/alien_ship_001.dmm b/maps/submaps/generic/alien_ship_001.dmm new file mode 100644 index 000000000000..f6ec9e7f5acc --- /dev/null +++ b/maps/submaps/generic/alien_ship_001.dmm @@ -0,0 +1,1011 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/space/basic, +/area/space) +"d" = ( +/obj/machinery/porta_turret/alien, +/turf/space/basic, +/area/space) +"f" = ( +/turf/simulated/shuttle/floor/alienplating, +/area/space) +"g" = ( +/obj/structure/prop/alien, +/turf/space/basic, +/area/space) +"n" = ( +/obj/structure/loot_pile/surface/alien, +/turf/space/basic, +/area/space) +"s" = ( +/obj/structure/bed/alien, +/turf/space/basic, +/area/space) +"x" = ( +/obj/machinery/door/airlock/alien, +/turf/space/basic, +/area/space) +"y" = ( +/turf/simulated/shuttle/wall/alien, +/area/space) +"D" = ( +/obj/structure/closet/alien, +/turf/space/basic, +/area/space) +"H" = ( +/turf/simulated/shuttle/wall/alien/no_join, +/area/space) +"L" = ( +/turf/simulated/shuttle/wall/alien/hard_corner, +/area/space) +"N" = ( +/turf/simulated/shuttle/floor/alien, +/area/space) +"P" = ( +/turf/simulated/shuttle/floor/alienplating/external, +/area/space) +"V" = ( +/obj/machinery/porta_turret/alien/destroyed, +/turf/space/basic, +/area/space) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +y +a +L +a +H +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +a +a +a +a +a +a +a +a +P +a +a +y +a +L +a +H +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(4,1,1) = {" +a +a +a +a +a +a +a +P +P +a +a +y +a +L +a +H +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(5,1,1) = {" +a +a +a +a +a +a +a +P +P +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(6,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(7,1,1) = {" +a +a +a +a +a +a +a +f +f +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(8,1,1) = {" +a +a +a +a +a +a +a +f +f +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(9,1,1) = {" +a +a +a +a +a +a +a +N +N +a +s +D +a +n +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(10,1,1) = {" +a +a +a +a +a +a +a +N +N +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(11,1,1) = {" +a +a +a +a +a +a +a +N +a +a +a +d +g +a +V +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(12,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(13,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +x +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(14,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(15,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(16,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(17,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(18,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(19,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(20,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(21,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(22,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(23,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(24,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(25,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(26,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(27,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(28,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(29,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(30,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/submaps/generic/crashed_ship_01.dmm b/maps/submaps/generic/crashed_ship_01.dmm index 6e85eae2293f..239a086afa5c 100644 --- a/maps/submaps/generic/crashed_ship_01.dmm +++ b/maps/submaps/generic/crashed_ship_01.dmm @@ -11,9 +11,15 @@ }, /turf/template_noop, /area/space) +"P" = ( +/turf/simulated/floor/tiled/outdoors, +/area/space) "T" = ( /turf/simulated/wall/rshull, /area/space) +"Y" = ( +/turf/simulated/floor/plating/outdoors, +/area/space) (1,1,1) = {" F @@ -177,12 +183,12 @@ T T a a -a -a -a -a -a -a +T +T +T +T +T +T a a T @@ -289,7 +295,7 @@ a a a a -a +Y a a a @@ -567,7 +573,7 @@ F "} (26,1,1) = {" F -F +P F F F From 4549d2bfe55aba231a8afa5ab2908c819ec57a1c Mon Sep 17 00:00:00 2001 From: KT Date: Sat, 15 Apr 2023 12:50:39 -0400 Subject: [PATCH 05/33] Create abandoned_shelter_001.dmm --- .../submaps/generic/abandoned_shelter_001.dmm | 179 ++++++++++++++++++ 1 file changed, 179 insertions(+) create mode 100644 maps/submaps/generic/abandoned_shelter_001.dmm diff --git a/maps/submaps/generic/abandoned_shelter_001.dmm b/maps/submaps/generic/abandoned_shelter_001.dmm new file mode 100644 index 000000000000..95ad096a2192 --- /dev/null +++ b/maps/submaps/generic/abandoned_shelter_001.dmm @@ -0,0 +1,179 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/space/basic, +/area/space) +"g" = ( +/turf/simulated/shuttle/wall/voidcraft/survival, +/area/space) +"L" = ( +/turf/simulated/shuttle/floor/voidcraft/dark, +/area/space) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +g +g +g +g +g +g +g +g +a +"} +(3,1,1) = {" +a +a +a +g +L +L +L +L +L +L +g +a +"} +(4,1,1) = {" +a +a +a +g +L +L +L +L +L +L +g +a +"} +(5,1,1) = {" +a +a +a +g +L +L +L +L +L +L +g +a +"} +(6,1,1) = {" +a +a +a +g +L +L +L +L +L +L +g +a +"} +(7,1,1) = {" +a +a +a +g +L +L +L +L +L +L +g +a +"} +(8,1,1) = {" +a +a +a +g +L +L +L +L +L +L +g +a +"} +(9,1,1) = {" +a +a +a +g +g +g +g +g +g +g +g +a +"} +(10,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +"} +(11,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +"} +(12,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +"} From 2018f80a947d1017a5c69e7009283a100e5a335f Mon Sep 17 00:00:00 2001 From: KT Date: Sat, 22 Apr 2023 12:36:24 -0400 Subject: [PATCH 06/33] Paperclipper shuttle --- .../overmap_ship_paperclipper.dmm | 2229 +++++++++++++++++ 1 file changed, 2229 insertions(+) create mode 100644 maps/templates/shuttles/overmaps/ships_and_shuttles/overmap_ship_paperclipper.dmm diff --git a/maps/templates/shuttles/overmaps/ships_and_shuttles/overmap_ship_paperclipper.dmm b/maps/templates/shuttles/overmaps/ships_and_shuttles/overmap_ship_paperclipper.dmm new file mode 100644 index 000000000000..d6fd846c65a1 --- /dev/null +++ b/maps/templates/shuttles/overmaps/ships_and_shuttles/overmap_ship_paperclipper.dmm @@ -0,0 +1,2229 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"at" = ( +/obj/machinery/power/terminal, +/obj/structure/cable/yellow, +/turf/simulated/floor/plating, +/area/space) +"bw" = ( +/obj/machinery/computer/shuttle_control/explore/gecko_cr, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"cL" = ( +/obj/machinery/door/airlock/hatch{ + req_one_access = list() + }, +/turf/simulated/floor/tiled/techmaint, +/area/space) +"dv" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/space) +"dZ" = ( +/obj/machinery/atmospherics/component/unary/engine/biggest{ + dir = 1 + }, +/turf/simulated/floor/airless, +/area/space) +"eF" = ( +/obj/machinery/light, +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"eX" = ( +/obj/machinery/door/airlock/hatch{ + req_one_access = list() + }, +/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ + dir = 10; + pixel_x = -8; + pixel_y = 26 + }, +/obj/map_helper/airlock/door/ext_door, +/obj/map_helper/airlock/sensor/ext_sensor, +/turf/simulated/floor/tiled/techmaint, +/area/space) +"fr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/techmaint, +/area/space) +"fX" = ( +/obj/structure/table/rack/shelf/steel, +/turf/simulated/floor/plating, +/area/space) +"id" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel, +/turf/simulated/floor/plating, +/area/space) +"ij" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/alarms_hidden/south_bump, +/turf/simulated/floor/tiled/techmaint, +/area/space) +"iI" = ( +/turf/simulated/floor/tiled/techmaint, +/area/space) +"jS" = ( +/turf/simulated/shuttle/wall/dark/hard_corner, +/area/space) +"kZ" = ( +/turf/simulated/floor/tiled/techfloor, +/area/space) +"lq" = ( +/obj/machinery/mech_recharger, +/turf/simulated/floor/reinforced, +/area/space) +"ls" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techmaint, +/area/space) +"lt" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/space) +"mq" = ( +/obj/machinery/atmospherics/portables_connector/fuel, +/obj/machinery/portable_atmospherics/canister/phoron{ + start_pressure = 8000.25 + }, +/turf/simulated/floor/plating, +/area/space) +"ni" = ( +/obj/machinery/atmospherics/component/unary/vent_pump{ + dir = 8 + }, +/obj/map_helper/airlock/atmos/chamber_pump, +/turf/simulated/floor/plating, +/area/space) +"nw" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/space) +"qk" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/space) +"qH" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/space) +"qP" = ( +/obj/effect/decal/mecha_wreckage/gunpod, +/turf/simulated/floor/reinforced, +/area/space) +"rC" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/space) +"sq" = ( +/obj/machinery/door/airlock/hatch{ + req_one_access = list() + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/space) +"su" = ( +/obj/machinery/power/port_gen/pacman/mrs{ + anchored = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/space) +"sN" = ( +/obj/machinery/airlock_sensor{ + pixel_x = 25; + dir = 8 + }, +/obj/map_helper/airlock/sensor/chamber_sensor, +/turf/simulated/floor/tiled/techmaint, +/area/space) +"sQ" = ( +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "paperclipper_hanger_hatch"; + name = "Starbard Hanger Hatch"; + pixel_x = -24 + }, +/turf/simulated/floor/reinforced, +/area/space) +"tn" = ( +/obj/mecha/combat/fighter/gunpod/recon{ + dir = 4 + }, +/obj/machinery/mech_recharger, +/turf/simulated/floor/reinforced, +/area/space) +"uX" = ( +/obj/machinery/shipsensors, +/turf/simulated/floor/reinforced/airless, +/area/space) +"we" = ( +/turf/space/basic, +/area/space) +"wp" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/space) +"wK" = ( +/obj/machinery/atmospherics/component/unary/vent_pump, +/obj/map_helper/airlock/atmos/chamber_pump, +/turf/simulated/floor/plating, +/area/space) +"yd" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/space) +"yF" = ( +/turf/simulated/floor/reinforced/airless, +/area/space) +"yX" = ( +/obj/random/crate{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/space) +"Al" = ( +/turf/simulated/shuttle/wall/dark, +/area/space) +"Aq" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/space) +"Bl" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel, +/turf/simulated/floor/plating, +/area/space) +"BP" = ( +/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/space) +"DJ" = ( +/turf/simulated/floor/plating, +/area/space) +"Id" = ( +/turf/simulated/floor/reinforced, +/area/space) +"Kr" = ( +/turf/simulated/floor/airless, +/area/space) +"KI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/space) +"Lq" = ( +/obj/structure/table/steel, +/obj/item/tool/wrench, +/obj/item/stack/material/tritium{ + amount = 25 + }, +/turf/simulated/floor/plating, +/area/space) +"Lt" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/space) +"Lv" = ( +/obj/structure/bed/chair/bay/comfy{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/space) +"Ly" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/space) +"Ms" = ( +/obj/structure/cable, +/obj/machinery/power/apc/alarms_hidden/west_bump, +/turf/simulated/floor/plating, +/area/space) +"Ne" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/space) +"OS" = ( +/obj/machinery/door/blast/regular{ + id = "paperclipper_hanger_hatch"; + name = "Starbard Hanger Hatch"; + dir = 4 + }, +/obj/machinery/atmospheric_field_generator/perma, +/turf/simulated/floor/plating, +/area/space) +"OZ" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/space) +"Ql" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/space) +"Rn" = ( +/obj/structure/fuel_port/heavy{ + pixel_x = 28 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/space) +"SW" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/space) +"Ub" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/space) +"Uh" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/space) +"Uq" = ( +/obj/machinery/computer/ship/sensors, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"VA" = ( +/obj/machinery/power/smes/buildable, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/simulated/floor/plating, +/area/space) +"Wx" = ( +/obj/machinery/light, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"Xg" = ( +/obj/machinery/door/airlock/hatch{ + req_one_access = list() + }, +/obj/map_helper/airlock/door/int_door, +/obj/machinery/airlock_sensor{ + pixel_x = 25; + dir = 8 + }, +/obj/map_helper/airlock/sensor/int_sensor, +/turf/simulated/floor/tiled/techmaint, +/area/space) +"XI" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/space) +"XU" = ( +/obj/machinery/computer/ship/helm{ + req_one_access = list() + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"Yp" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/alarms_hidden/north_bump, +/turf/simulated/floor/tiled/techmaint, +/area/space) +"YI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/space) +"YJ" = ( +/obj/machinery/door/airlock/hatch{ + req_one_access = list() + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/space) +"Zh" = ( +/obj/machinery/holopad/ship/starts_inactive, +/turf/simulated/floor/tiled/techmaint, +/area/space) + +(1,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(2,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +Al +Al +Al +jS +Al +Al +Al +Al +Al +Al +Al +Al +Al +Al +jS +Al +Al +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(3,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +Al +Al +Al +Al +DJ +DJ +Al +DJ +DJ +DJ +DJ +DJ +DJ +DJ +jS +mq +Ql +YI +Kr +Kr +dZ +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(4,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +Al +Al +Al +Al +DJ +DJ +DJ +DJ +DJ +jS +DJ +DJ +DJ +DJ +DJ +DJ +DJ +jS +mq +id +jS +Kr +Kr +Kr +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(5,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +Al +Al +Al +jS +DJ +DJ +DJ +DJ +DJ +iI +iI +iI +cL +iI +iI +iI +iI +iI +iI +iI +cL +DJ +Ne +Lt +Kr +Kr +Kr +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(6,1,1) = {" +we +we +we +we +we +we +we +we +we +we +Al +Al +Al +Al +DJ +DJ +jS +DJ +DJ +DJ +DJ +DJ +iI +DJ +DJ +jS +DJ +DJ +Aq +SW +OZ +at +VA +jS +mq +Bl +YI +Kr +Kr +dZ +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(7,1,1) = {" +we +we +we +we +we +we +we +Al +Al +Al +Al +DJ +DJ +DJ +DJ +DJ +cL +iI +iI +iI +iI +iI +iI +DJ +DJ +Al +DJ +DJ +Uh +DJ +iI +DJ +yd +jS +mq +id +jS +Kr +Kr +Kr +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(8,1,1) = {" +we +we +we +we +Al +Al +Al +Al +DJ +DJ +DJ +DJ +DJ +DJ +DJ +DJ +jS +DJ +DJ +DJ +DJ +DJ +DJ +DJ +DJ +Al +Lq +qH +su +qH +nw +BP +Rn +jS +mq +KI +Lt +Kr +Kr +Kr +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(9,1,1) = {" +we +Al +Al +Al +Al +Al +Al +Al +Al +Al +Al +Al +Al +Al +Al +Al +jS +Al +Al +Al +Al +Al +Al +Al +Al +jS +Al +Al +Al +jS +sq +jS +Al +Al +Al +Al +jS +Al +Al +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(10,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +yF +Lt +kZ +kZ +qk +kZ +Al +Al +Al +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(11,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +yF +Lt +kZ +kZ +qk +kZ +Al +Al +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(12,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +Al +jS +kZ +kZ +qk +kZ +Al +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(13,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +Al +Al +Al +Al +jS +Yp +kZ +Al +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(14,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +Lt +XU +Zh +eF +Al +qk +kZ +Al +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(15,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +Lt +bw +Lv +ls +cL +qk +kZ +Al +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(16,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +Lt +Uq +iI +Wx +Al +qk +kZ +Al +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(17,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +Al +Al +Al +Al +jS +qk +kZ +Al +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(18,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +Al +jS +kZ +kZ +qk +kZ +Al +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(19,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +yF +Lt +kZ +kZ +qk +kZ +Al +Al +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(20,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +uX +Lt +kZ +kZ +qk +kZ +Al +Al +Al +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(21,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +Al +Al +Al +Al +jS +Al +Al +jS +sq +jS +Al +Al +Al +Al +Al +Al +Al +jS +Al +Al +Al +Al +Al +Al +Al +Al +jS +eX +jS +Al +Al +Al +Al +Al +Al +Al +Al +Al +we +"} +(22,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +Al +Al +lq +tn +Id +iI +Al +DJ +lt +wp +Ms +DJ +DJ +DJ +DJ +DJ +DJ +DJ +Al +yX +yX +yX +yX +fX +fX +fX +Lt +wK +fr +Ly +Ub +XI +Al +Al +Al +Al +we +we +we +we +"} +(23,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +OS +sQ +Id +Id +Id +iI +jS +DJ +DJ +qk +DJ +DJ +DJ +DJ +DJ +DJ +DJ +DJ +jS +DJ +DJ +DJ +DJ +DJ +DJ +iI +Xg +iI +sN +ni +Al +Al +Al +we +we +we +we +we +we +we +"} +(24,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +OS +Id +Id +Id +Id +nw +YJ +rC +rC +dv +iI +iI +iI +iI +iI +iI +iI +iI +cL +iI +iI +iI +iI +iI +iI +iI +jS +Al +Al +Al +Al +we +we +we +we +we +we +we +we +we +"} +(25,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +OS +Id +Id +Id +Id +ij +jS +DJ +DJ +DJ +DJ +DJ +DJ +DJ +DJ +DJ +DJ +DJ +jS +DJ +DJ +DJ +DJ +DJ +Al +Al +Al +Al +we +we +we +we +we +we +we +we +we +we +we +we +"} +(26,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +OS +Id +Id +qP +Id +iI +Al +DJ +DJ +DJ +DJ +DJ +DJ +DJ +DJ +DJ +DJ +DJ +Al +DJ +DJ +Al +Al +Al +Al +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(27,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +Al +Al +lq +lq +Id +iI +Al +DJ +DJ +DJ +DJ +DJ +DJ +DJ +DJ +DJ +DJ +DJ +jS +Al +Al +Al +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(28,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +Al +Al +Al +Al +jS +Al +Al +Al +Al +Al +Al +Al +Al +Al +Al +Al +Al +Al +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(29,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} From e917d4cb129af488ce366877d199fa458e937480 Mon Sep 17 00:00:00 2001 From: KT Date: Sat, 22 Apr 2023 13:22:32 -0400 Subject: [PATCH 07/33] biolab --- code/__DEFINES/access.dm | 6 ++++++ code/game/objects/items/id_cards/station_ids.dm | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 41c880fd6c60..aebf47384643 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -413,6 +413,12 @@ STANDARD_ACCESS_DATUM(ACCESS_FACTION_ALIEN, faction/alien, "Alien") #define ACCESS_FACTION_TALON 301 STANDARD_ACCESS_DATUM(ACCESS_FACTION_TALON, faction/talon, "Talon") +//? Biolab + +#define ACCESS_FACTION_BIOLAB 250 +STANDARD_ACCESS_DATUM(ACCESS_FACTION_TALON, faction/biolab, "Biolab") + + //? Misc #define ACCESS_MISC_CASHCRATE 200 diff --git a/code/game/objects/items/id_cards/station_ids.dm b/code/game/objects/items/id_cards/station_ids.dm index 28042fbad820..24556310cf24 100644 --- a/code/game/objects/items/id_cards/station_ids.dm +++ b/code/game/objects/items/id_cards/station_ids.dm @@ -593,3 +593,11 @@ assignment = "Pathfinder" rank = "Pathfinder" job_access_type = /datum/role/job/station/pathfinder + +/obj/item/card/id/external/biolab // For the Biolab on the rift, will be used to get into the facility and to navigate it + name = "external identification card" + desc = "An identification card of some sort. It does not look like it is issued by NT." + icon_state = "generic" + primary_color = rgb(66, 2, 2) + secondary_color = rgb(0, 0, 0) + access = list(250, 13) From 052027ae95e85d2792e13aed36caf6628d23d176 Mon Sep 17 00:00:00 2001 From: KT Date: Mon, 24 Apr 2023 11:31:15 -0400 Subject: [PATCH 08/33] Update pamphlet.dm --- code/modules/awaymissions/pamphlet.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/awaymissions/pamphlet.dm b/code/modules/awaymissions/pamphlet.dm index 5386a9ce72ea..3170b322f928 100644 --- a/code/modules/awaymissions/pamphlet.dm +++ b/code/modules/awaymissions/pamphlet.dm @@ -41,3 +41,8 @@ name = "pamphlet - \'Violent Video Games and You\'" desc = "A pamphlet encouraging the reader to maintain a balanced lifestyle and take care of their mental health, while still enjoying video games in a healthy way. You probably don't need this..." info = "They don't make you kill people. There, we said it. Now get back to work!" + +/obj/item/paper/pamphlet/vacation + name = "pamphlet - \'Five Planets You MUST Visit\'" + desc = "A pamphlet showing of various resorts in exotic systems with exorbident prices." + info = " Most of this is just advertisements and pictures of resorts with little actual substanence " From b7b1a8bd04c840bd63f9cc8d648c964f529c5aa9 Mon Sep 17 00:00:00 2001 From: KT Date: Mon, 24 Apr 2023 12:06:23 -0400 Subject: [PATCH 09/33] Im a dumby --- code/__DEFINES/access.dm | 2 +- code/modules/unit_tests/datum/access.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index aebf47384643..3b9c78d243dc 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -416,7 +416,7 @@ STANDARD_ACCESS_DATUM(ACCESS_FACTION_TALON, faction/talon, "Talon") //? Biolab #define ACCESS_FACTION_BIOLAB 250 -STANDARD_ACCESS_DATUM(ACCESS_FACTION_TALON, faction/biolab, "Biolab") +STANDARD_ACCESS_DATUM(ACCESS_FACTION_BIOLAB, faction/biolab, "Biolab") //? Misc diff --git a/code/modules/unit_tests/datum/access.dm b/code/modules/unit_tests/datum/access.dm index b1d8d90a5edf..9ab7ab5da0af 100644 --- a/code/modules/unit_tests/datum/access.dm +++ b/code/modules/unit_tests/datum/access.dm @@ -6,6 +6,6 @@ continue var/id = num2text(initial(A.access_value)) if(lookup_ids[id]) - Fail("Collission on access value [id]") + Fail("Collision on [A] and [lookup_ids[id]]") continue lookup_ids[id] = A From b71e703a631458bedc23b1448d4d5f5cf2f5b193 Mon Sep 17 00:00:00 2001 From: KT Date: Mon, 24 Apr 2023 12:38:48 -0400 Subject: [PATCH 10/33] Create dojo_001.dmm --- maps/templates/admin/dojo_001.dmm | 2155 +++++++++++++++++++++++++++++ 1 file changed, 2155 insertions(+) create mode 100644 maps/templates/admin/dojo_001.dmm diff --git a/maps/templates/admin/dojo_001.dmm b/maps/templates/admin/dojo_001.dmm new file mode 100644 index 000000000000..c3c311d7e1b7 --- /dev/null +++ b/maps/templates/admin/dojo_001.dmm @@ -0,0 +1,2155 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/space/basic, +/area/space) +"e" = ( +/obj/structure/simple_door/wood, +/turf/simulated/floor/wood, +/area/space) +"g" = ( +/turf/template_noop, +/area/template_noop) +"i" = ( +/obj/structure/table/wooden_reinforced, +/obj/item/flame/candle/everburn/white, +/turf/simulated/floor/wood, +/area/space) +"k" = ( +/obj/structure/table/wooden_reinforced, +/obj/item/material/sword/katana, +/turf/simulated/floor/wood, +/area/space) +"s" = ( +/turf/simulated/floor/wood, +/area/space) +"C" = ( +/obj/item/flame/candle/candelabra/everburn, +/turf/simulated/floor/wood, +/area/space) +"K" = ( +/turf/simulated/floor/carpet, +/area/space) +"T" = ( +/turf/simulated/wall/log, +/area/space) +"V" = ( +/obj/structure/table/wooden_reinforced, +/obj/item/flame/candle/everburn/black, +/turf/simulated/floor/wood, +/area/space) + +(1,1,1) = {" +g +g +g +g +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +g +g +g +g +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +g +g +g +g +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(4,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(5,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(6,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(7,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +T +T +T +T +T +T +T +T +T +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(8,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +T +C +s +s +s +s +s +C +T +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(9,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +T +s +K +K +K +K +K +s +T +T +T +T +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(10,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +T +i +K +K +K +K +K +s +T +s +s +s +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(11,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +T +k +K +K +K +K +K +s +e +s +s +s +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(12,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +T +V +K +K +K +K +K +s +T +s +s +s +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(13,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +T +s +K +K +K +K +K +s +T +T +T +T +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(14,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +T +C +s +s +s +s +s +C +T +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(15,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +T +T +T +T +T +T +T +T +T +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(16,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(17,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(18,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(19,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(20,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(21,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(22,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(23,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(24,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(25,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(26,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(27,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(28,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(29,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(30,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(31,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(32,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(33,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(34,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(35,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(36,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(37,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(38,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(39,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(40,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(41,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(42,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(43,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(44,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(45,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} From 03616f9f04b352e18256cf6bcfed9faa4a2d86a9 Mon Sep 17 00:00:00 2001 From: KT Date: Sat, 29 Apr 2023 14:44:29 -0400 Subject: [PATCH 11/33] Working on holodecks --- .../10x10/standard_station/courtroom10x10.dmm | 440 ++++++++++++++++++ .../10x10/standard_station/desert10x10.dmm | 133 ++++++ .../10x10/standard_station/picnic10x10.dmm | 250 ++++++++++ .../10x10/standard_station/theatre10x10.dmm | 284 +++++++++++ 4 files changed, 1107 insertions(+) create mode 100644 maps/templates/holodeck/10x10/standard_station/courtroom10x10.dmm create mode 100644 maps/templates/holodeck/10x10/standard_station/desert10x10.dmm create mode 100644 maps/templates/holodeck/10x10/standard_station/picnic10x10.dmm create mode 100644 maps/templates/holodeck/10x10/standard_station/theatre10x10.dmm diff --git a/maps/templates/holodeck/10x10/standard_station/courtroom10x10.dmm b/maps/templates/holodeck/10x10/standard_station/courtroom10x10.dmm new file mode 100644 index 000000000000..f47390b516fd --- /dev/null +++ b/maps/templates/holodeck/10x10/standard_station/courtroom10x10.dmm @@ -0,0 +1,440 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/bed/chair/holochair{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"b" = ( +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"c" = ( +/obj/structure/bed/chair/holochair{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/obj/effect/floor_decal/carpet/corners{ + dir = 9 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"e" = ( +/obj/structure/window/reinforced/holowindow{ + dir = 4 + }, +/obj/structure/flora/pottedplant{ + icon_state = "plant-10" + }, +/turf/simulated/floor/holofloor/tiled, +/area/template_noop) +"f" = ( +/obj/structure/window/reinforced/holowindow, +/obj/machinery/door/window/holowindoor{ + dir = 1; + name = "Court Reporter's Box" + }, +/obj/structure/bed/chair/holochair, +/turf/simulated/floor/holofloor/wood, +/area/template_noop) +"g" = ( +/obj/structure/bed/chair/holochair, +/turf/simulated/floor/holofloor/wood, +/area/template_noop) +"h" = ( +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"i" = ( +/obj/structure/table/woodentable/holotable, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"j" = ( +/obj/structure/bed/chair/holochair{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"m" = ( +/obj/structure/bed/chair/holochair{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/obj/effect/floor_decal/carpet, +/obj/effect/floor_decal/carpet{ + dir = 6 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"n" = ( +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"q" = ( +/obj/structure/table/woodentable/holotable, +/obj/structure/window/reinforced/holowindow, +/obj/structure/window/reinforced/holowindow{ + dir = 8 + }, +/turf/simulated/floor/holofloor/wood, +/area/template_noop) +"r" = ( +/obj/machinery/door/window/holowindoor{ + base_state = "right"; + icon_state = "right" + }, +/turf/simulated/floor/holofloor/tiled, +/area/template_noop) +"s" = ( +/turf/simulated/floor/holofloor/tiled, +/area/template_noop) +"t" = ( +/obj/structure/window/reinforced/holowindow{ + dir = 1 + }, +/obj/structure/window/reinforced/holowindow{ + dir = 8 + }, +/obj/structure/table/woodentable/holotable, +/turf/simulated/floor/holofloor/wood, +/area/template_noop) +"u" = ( +/obj/structure/table/woodentable/holotable, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"v" = ( +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 5 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"w" = ( +/obj/structure/bed/chair/holochair{ + dir = 1 + }, +/obj/effect/floor_decal/carpet, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"x" = ( +/obj/structure/window/reinforced/holowindow, +/obj/machinery/door/window/holowindoor{ + base_state = "right"; + dir = 1; + icon_state = "right"; + name = "Witness Box" + }, +/obj/structure/bed/chair/holochair, +/turf/simulated/floor/holofloor/wood, +/area/template_noop) +"y" = ( +/obj/structure/window/reinforced/holowindow{ + dir = 1 + }, +/obj/structure/table/woodentable/holotable, +/turf/simulated/floor/holofloor/wood, +/area/template_noop) +"z" = ( +/obj/structure/bed/chair/holochair{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 9 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"A" = ( +/obj/structure/table/woodentable/holotable, +/obj/structure/window/reinforced/holowindow, +/obj/structure/window/reinforced/holowindow{ + dir = 4 + }, +/turf/simulated/floor/holofloor/wood, +/area/template_noop) +"B" = ( +/obj/machinery/door/window/holowindoor{ + dir = 1; + name = "Jury Box" + }, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 9 + }, +/obj/effect/floor_decal/carpet{ + dir = 5 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"C" = ( +/obj/structure/bed/chair/holochair{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"H" = ( +/obj/structure/window/reinforced/holowindow{ + dir = 8 + }, +/obj/structure/table/woodentable/holotable, +/turf/simulated/floor/holofloor/wood, +/area/template_noop) +"J" = ( +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"K" = ( +/obj/structure/table/woodentable/holotable, +/turf/simulated/floor/holofloor/wood, +/area/template_noop) +"L" = ( +/obj/structure/bed/chair/holochair{ + dir = 1 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"M" = ( +/obj/structure/bed/chair/holochair{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet, +/obj/effect/floor_decal/carpet{ + dir = 10 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"N" = ( +/obj/structure/table/woodentable/holotable, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"O" = ( +/obj/structure/bed/chair/holochair{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"Q" = ( +/obj/structure/table/woodentable/holotable, +/obj/structure/window/reinforced/holowindow, +/turf/simulated/floor/holofloor/wood, +/area/template_noop) +"S" = ( +/obj/structure/bed/chair/holochair{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/obj/effect/floor_decal/carpet, +/obj/effect/floor_decal/carpet{ + dir = 6 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"T" = ( +/obj/structure/bed/chair/holochair{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet, +/obj/effect/floor_decal/carpet{ + dir = 10 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"U" = ( +/obj/structure/window/reinforced/holowindow{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled, +/area/template_noop) +"V" = ( +/obj/machinery/door/window/holowindoor, +/turf/simulated/floor/holofloor/tiled, +/area/template_noop) +"W" = ( +/turf/simulated/floor/holofloor/wood, +/area/template_noop) +"Y" = ( +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 9 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) + +(1,1,1) = {" +s +s +s +s +s +s +s +s +s +s +"} +(2,1,1) = {" +e +V +U +U +U +U +U +r +U +e +"} +(3,1,1) = {" +K +W +W +f +Y +u +C +b +C +M +"} +(4,1,1) = {" +K +W +K +q +h +i +L +J +L +w +"} +(5,1,1) = {" +K +W +g +Q +h +J +J +J +L +w +"} +(6,1,1) = {" +K +W +K +A +h +i +L +J +L +w +"} +(7,1,1) = {" +K +W +W +x +v +N +j +n +j +m +"} +(8,1,1) = {" +K +W +t +H +H +H +H +H +H +H +"} +(9,1,1) = {" +K +W +y +z +a +a +a +a +T +K +"} +(10,1,1) = {" +K +W +B +c +O +O +O +O +S +K +"} diff --git a/maps/templates/holodeck/10x10/standard_station/desert10x10.dmm b/maps/templates/holodeck/10x10/standard_station/desert10x10.dmm new file mode 100644 index 000000000000..07442a736c66 --- /dev/null +++ b/maps/templates/holodeck/10x10/standard_station/desert10x10.dmm @@ -0,0 +1,133 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/floor/holofloor/desert, +/area/template_noop) +"k" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/holofloor/desert, +/area/template_noop) +"W" = ( +/obj/structure/flora/ausbushes/fullgrass, +/turf/simulated/floor/holofloor/desert, +/area/template_noop) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +k +"} +(2,1,1) = {" +a +a +W +a +a +a +a +a +a +a +"} +(3,1,1) = {" +a +a +a +a +k +a +a +W +a +a +"} +(4,1,1) = {" +k +a +a +a +a +a +a +a +a +a +"} +(5,1,1) = {" +a +a +a +a +a +a +a +a +a +W +"} +(6,1,1) = {" +a +a +a +k +a +a +W +a +a +a +"} +(7,1,1) = {" +a +a +a +a +k +a +a +a +a +a +"} +(8,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} +(9,1,1) = {" +a +W +a +a +a +a +a +a +a +a +"} +(10,1,1) = {" +a +a +a +a +a +a +k +a +a +W +"} diff --git a/maps/templates/holodeck/10x10/standard_station/picnic10x10.dmm b/maps/templates/holodeck/10x10/standard_station/picnic10x10.dmm new file mode 100644 index 000000000000..4ea48362dcbf --- /dev/null +++ b/maps/templates/holodeck/10x10/standard_station/picnic10x10.dmm @@ -0,0 +1,250 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/flora/ausbushes/ywflowers, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/turf/simulated/floor/holofloor/grass, +/area/template_noop) +"d" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/holofloor/grass, +/area/template_noop) +"e" = ( +/obj/structure/flora/ausbushes/ywflowers, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 + }, +/turf/simulated/floor/holofloor/grass, +/area/template_noop) +"h" = ( +/obj/structure/flora/ausbushes/ywflowers, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/turf/simulated/floor/holofloor/grass, +/area/template_noop) +"o" = ( +/turf/simulated/floor/holofloor/desert, +/area/template_noop) +"q" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/holofloor/grass, +/area/template_noop) +"r" = ( +/obj/structure/table/woodentable/holotable, +/turf/simulated/floor/holofloor/desert, +/area/template_noop) +"w" = ( +/obj/effect/debris/cleanable/dirt, +/obj/structure/holostool, +/turf/simulated/floor/holofloor/desert, +/area/template_noop) +"x" = ( +/obj/structure/flora/ausbushes/ywflowers, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/simulated/floor/holofloor/grass, +/area/template_noop) +"y" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/holofloor/grass, +/area/template_noop) +"A" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/simulated/floor/holofloor/grass, +/area/template_noop) +"B" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 1 + }, +/turf/simulated/floor/holofloor/grass, +/area/template_noop) +"D" = ( +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/holofloor/desert, +/area/template_noop) +"I" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/effect/floor_decal/spline/fancy/wood/corner, +/turf/simulated/floor/holofloor/grass, +/area/template_noop) +"L" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/holofloor/grass, +/area/template_noop) +"N" = ( +/obj/structure/flora/ausbushes/ywflowers, +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 4 + }, +/turf/simulated/floor/holofloor/grass, +/area/template_noop) +"Q" = ( +/obj/structure/flora/ausbushes/fullgrass, +/turf/simulated/floor/holofloor/grass, +/area/template_noop) +"T" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/turf/simulated/floor/holofloor/grass, +/area/template_noop) +"U" = ( +/obj/structure/flora/ausbushes/ywflowers, +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/holofloor/grass, +/area/template_noop) +"W" = ( +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/holofloor/grass, +/area/template_noop) +"Y" = ( +/obj/structure/flora/ausbushes/ywflowers, +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 8 + }, +/turf/simulated/floor/holofloor/grass, +/area/template_noop) +"Z" = ( +/obj/structure/flora/ausbushes/ywflowers, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/holofloor/grass, +/area/template_noop) + +(1,1,1) = {" +Q +y +W +U +D +D +a +W +y +Q +"} +(2,1,1) = {" +q +W +y +L +D +D +T +y +W +q +"} +(3,1,1) = {" +Q +y +I +e +D +D +h +B +y +Q +"} +(4,1,1) = {" +q +W +U +o +D +D +o +a +W +q +"} +(5,1,1) = {" +Q +y +L +w +r +r +w +T +y +Q +"} +(6,1,1) = {" +Q +W +U +w +r +r +w +a +W +Q +"} +(7,1,1) = {" +q +y +L +D +D +D +D +T +y +q +"} +(8,1,1) = {" +Q +W +Y +d +Z +Z +d +N +W +Q +"} +(9,1,1) = {" +q +y +W +y +W +W +y +W +W +q +"} +(10,1,1) = {" +Q +W +y +A +x +x +A +y +y +Q +"} diff --git a/maps/templates/holodeck/10x10/standard_station/theatre10x10.dmm b/maps/templates/holodeck/10x10/standard_station/theatre10x10.dmm new file mode 100644 index 000000000000..53420bc5397d --- /dev/null +++ b/maps/templates/holodeck/10x10/standard_station/theatre10x10.dmm @@ -0,0 +1,284 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/floor/holofloor/tiled, +/area/template_noop) +"g" = ( +/obj/effect/floor_decal/carpet{ + dir = 5 + }, +/obj/effect/floor_decal/carpet{ + dir = 6 + }, +/obj/effect/floor_decal/carpet{ + dir = 10 + }, +/obj/effect/floor_decal/carpet{ + dir = 9 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"j" = ( +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"l" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/holofloor/tiled, +/area/template_noop) +"n" = ( +/obj/landmark/costume, +/obj/structure/table/rack/holorack, +/turf/simulated/floor/holofloor/tiled/dark, +/area/template_noop) +"o" = ( +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 9 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"q" = ( +/obj/structure/holostool, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"u" = ( +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"v" = ( +/obj/structure/holostool, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"w" = ( +/obj/structure/holostool, +/obj/effect/floor_decal/carpet, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"x" = ( +/obj/structure/table/rack/holorack, +/obj/item/clothing/under/dress/dress_saloon, +/obj/item/clothing/head/pin/flower, +/turf/simulated/floor/holofloor/tiled/dark, +/area/template_noop) +"B" = ( +/obj/structure/holostool, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/obj/effect/floor_decal/carpet, +/obj/effect/floor_decal/carpet{ + dir = 6 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"F" = ( +/obj/structure/holostool, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet, +/obj/effect/floor_decal/carpet{ + dir = 10 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"H" = ( +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/obj/effect/floor_decal/carpet, +/obj/effect/floor_decal/carpet{ + dir = 6 + }, +/obj/effect/floor_decal/carpet{ + dir = 10 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"J" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/template_noop) +"N" = ( +/obj/structure/holostool, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"O" = ( +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 5 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) +"X" = ( +/obj/structure/flora/pottedplant{ + icon_state = "plant-06" + }, +/turf/simulated/floor/holofloor/tiled, +/area/template_noop) +"Y" = ( +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 5 + }, +/obj/effect/floor_decal/carpet{ + dir = 9 + }, +/turf/simulated/floor/holofloor/carpet, +/area/template_noop) + +(1,1,1) = {" +x +J +J +l +a +a +a +a +a +X +"} +(2,1,1) = {" +n +J +J +l +a +a +a +a +a +a +"} +(3,1,1) = {" +n +J +J +l +o +N +N +N +F +a +"} +(4,1,1) = {" +n +J +J +l +u +q +q +q +w +a +"} +(5,1,1) = {" +n +J +J +l +u +q +q +q +w +a +"} +(6,1,1) = {" +n +J +J +l +u +q +q +q +w +a +"} +(7,1,1) = {" +n +J +J +l +u +q +q +q +w +a +"} +(8,1,1) = {" +n +J +J +l +O +v +v +v +B +a +"} +(9,1,1) = {" +n +J +J +l +a +a +a +a +a +a +"} +(10,1,1) = {" +n +J +J +Y +j +j +j +j +H +g +"} From 423b694c43d9e28fe1c0505b1cefc90b81188843 Mon Sep 17 00:00:00 2001 From: KT Date: Sun, 30 Apr 2023 23:34:43 -0400 Subject: [PATCH 12/33] Create overmap_ship_superjank.dmm --- .../overmap_ship_superjank.dmm | 451 ++++++++++++++++++ 1 file changed, 451 insertions(+) create mode 100644 maps/templates/shuttles/overmaps/ships_and_shuttles/overmap_ship_superjank.dmm diff --git a/maps/templates/shuttles/overmaps/ships_and_shuttles/overmap_ship_superjank.dmm b/maps/templates/shuttles/overmaps/ships_and_shuttles/overmap_ship_superjank.dmm new file mode 100644 index 000000000000..c04eb6df6eda --- /dev/null +++ b/maps/templates/shuttles/overmaps/ships_and_shuttles/overmap_ship_superjank.dmm @@ -0,0 +1,451 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/floor/plating/outdoors, +/area/space) +"b" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/turf/simulated/floor/plating/outdoors, +/area/space) +"f" = ( +/obj/structure/girder, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/space) +"g" = ( +/turf/simulated/floor/plating, +/area/space) +"i" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/structure/inflatable, +/turf/simulated/floor/plating, +/area/space) +"j" = ( +/obj/machinery/computer/ship/helm{ + req_one_access = list() + }, +/turf/simulated/floor/plating, +/area/space) +"k" = ( +/obj/structure/girder, +/turf/simulated/floor/plating/outdoors, +/area/space) +"m" = ( +/obj/item/storage/toolbox/electrical, +/turf/simulated/floor/plating, +/area/space) +"n" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 10 + }, +/turf/simulated/floor/plating/outdoors, +/area/space) +"o" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/turf/simulated/wall, +/area/space) +"q" = ( +/obj/machinery/atmospherics/portables_connector/fuel{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/phoron, +/turf/simulated/floor/plating, +/area/space) +"r" = ( +/obj/structure/table/rack/steel, +/obj/item/storage/toolbox/mechanical, +/obj/item/stack/material/tritium{ + amount = 25 + }, +/turf/simulated/floor/plating, +/area/space) +"s" = ( +/obj/structure/girder, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/space) +"t" = ( +/obj/machinery/computer/ship/sensors, +/turf/simulated/floor/plating, +/area/space) +"u" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/space) +"v" = ( +/obj/machinery/atmospherics/component/unary/engine/bigger{ + dir = 1 + }, +/turf/simulated/floor/plating/outdoors, +/area/space) +"w" = ( +/obj/item/tank/oxygen, +/obj/structure/table/rack/steel, +/obj/item/clothing/suit/space/emergency/russian, +/obj/item/clothing/head/helmet/space/emergency/russian{ + pixel_y = -12 + }, +/turf/simulated/floor/plating, +/area/space) +"y" = ( +/obj/structure/cable/pink, +/obj/machinery/power/apc/alarms_hidden/west_bump, +/turf/simulated/floor/plating, +/area/space) +"z" = ( +/obj/structure/inflatable, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/space) +"A" = ( +/obj/structure/girder, +/turf/simulated/floor/plating, +/area/space) +"B" = ( +/turf/simulated/wall, +/area/space) +"C" = ( +/obj/structure/inflatable/door, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/space) +"D" = ( +/obj/item/inflatable/torn, +/obj/machinery/portable_atmospherics/canister/phoron, +/turf/simulated/floor/plating, +/area/space) +"G" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/space) +"H" = ( +/obj/structure/inflatable/door, +/turf/simulated/floor/plating, +/area/space) +"I" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/item/inflatable/door, +/turf/simulated/floor/plating, +/area/space) +"K" = ( +/obj/structure/lattice, +/turf/simulated/shuttle/plating/airless/carry, +/area/space) +"L" = ( +/obj/machinery/computer/shuttle_control/explore/gecko_cr, +/turf/simulated/floor/plating, +/area/space) +"M" = ( +/obj/item/inflatable/torn, +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/space) +"N" = ( +/obj/item/storage/briefcase/inflatable, +/turf/simulated/floor/plating, +/area/space) +"P" = ( +/obj/item/inflatable/door/torn, +/turf/simulated/floor/plating, +/area/space) +"Q" = ( +/obj/machinery/power/port_gen/pacman/mrs{ + anchored = 1 + }, +/obj/structure/cable/pink{ + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/space) +"S" = ( +/obj/machinery/space_heater, +/turf/simulated/floor/plating, +/area/space) +"T" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/plating, +/area/space) +"V" = ( +/obj/structure/inflatable, +/turf/simulated/floor/plating, +/area/space) +"Y" = ( +/obj/structure/inflatable, +/turf/simulated/floor/plating/outdoors, +/area/space) +"Z" = ( +/turf/space, +/area/space) + +(1,1,1) = {" +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +"} +(2,1,1) = {" +Z +Z +Z +Z +Z +Z +Z +f +o +a +v +Z +Z +Z +Z +"} +(3,1,1) = {" +Z +Z +Z +Z +Z +Z +A +s +B +a +a +Z +Z +Z +Z +"} +(4,1,1) = {" +Z +Z +Z +Z +Z +Z +K +C +B +k +k +Z +Z +Z +Z +"} +(5,1,1) = {" +Z +Z +Z +k +k +K +V +i +V +V +k +k +Z +Z +Z +"} +(6,1,1) = {" +Z +Z +K +k +Y +Y +B +I +V +D +V +k +k +Z +Z +"} +(7,1,1) = {" +Z +K +K +V +V +Q +y +G +w +S +V +V +V +V +Z +"} +(8,1,1) = {" +Z +k +a +V +j +g +g +G +g +g +P +H +g +H +Z +"} +(9,1,1) = {" +Z +k +k +V +L +u +g +G +m +T +V +V +V +V +Z +"} +(10,1,1) = {" +Z +Z +k +V +t +r +N +M +q +V +V +K +K +Z +Z +"} +(11,1,1) = {" +Z +Z +Z +V +V +V +V +z +V +V +K +K +Z +Z +Z +"} +(12,1,1) = {" +Z +Z +Z +Z +Z +K +K +z +B +B +B +Z +Z +Z +Z +"} +(13,1,1) = {" +Z +Z +Z +Z +Z +Z +K +n +b +a +v +Z +Z +Z +Z +"} +(14,1,1) = {" +Z +Z +Z +Z +Z +Z +Z +K +K +a +a +Z +Z +Z +Z +"} +(15,1,1) = {" +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +"} From 70d37105c858f5732433abe91c783a3422ba1250 Mon Sep 17 00:00:00 2001 From: KT Date: Fri, 19 May 2023 19:26:56 -0400 Subject: [PATCH 13/33] Thingy --- code/game/turfs/simulated/floors/concrete.dm | 4 + .../generic/abandoned_facility_001.dmm | 2011 +++++++++++++++++ 2 files changed, 2015 insertions(+) create mode 100644 maps/submaps/generic/abandoned_facility_001.dmm diff --git a/code/game/turfs/simulated/floors/concrete.dm b/code/game/turfs/simulated/floors/concrete.dm index ce084ba37a8b..0d3031a12024 100644 --- a/code/game/turfs/simulated/floors/concrete.dm +++ b/code/game/turfs/simulated/floors/concrete.dm @@ -8,6 +8,8 @@ edge_blending_priority = 0 smoothing_flags = NONE +CREATE_STANDARD_TURFS(/turf/simulated/floor/concrete) + /turf/simulated/floor/concrete/tile name = "concrete tile" desc = "That's concrete baby!" @@ -16,6 +18,8 @@ initial_flooring = /singleton/flooring/concrete/tile baseturfs = /turf/simulated/floor/outdoors/dirt +CREATE_STANDARD_TURFS(/turf/simulated/floor/concrete/tile) + /turf/simulated/floor/concrete/rng/Initialize(mapload) . = ..() if(prob(5)) diff --git a/maps/submaps/generic/abandoned_facility_001.dmm b/maps/submaps/generic/abandoned_facility_001.dmm new file mode 100644 index 000000000000..8573d57a8d66 --- /dev/null +++ b/maps/submaps/generic/abandoned_facility_001.dmm @@ -0,0 +1,2011 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"au" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/suit/storage/hazardvest, +/obj/item/clothing/suit/storage/hazardvest, +/obj/item/clothing/head/hardhat/orange, +/obj/item/clothing/head/hardhat/orange, +/turf/simulated/floor/tiled/monotile/indoors, +/area/submap/generic/inside_breath_mix) +"ca" = ( +/obj/structure/fence/corner{ + dir = 9 + }, +/turf/simulated/floor/concrete/tile/outdoors, +/area/submap/generic/outside_open_air) +"cX" = ( +/obj/effect/floor_decal/industrial/danger/corner, +/turf/simulated/floor/concrete/tile/outdoors, +/area/submap/generic/outside_open_air) +"dl" = ( +/obj/structure/urinal, +/turf/simulated/floor/plating/indoors, +/area/submap/generic/inside_breath_mix) +"ey" = ( +/turf/simulated/wall, +/area/submap/generic/inside_breath_mix) +"eV" = ( +/obj/machinery/door/blast/shutters{ + dir = 2 + }, +/obj/effect/catwalk_plated/dark, +/obj/structure/fans/tiny, +/turf/simulated/floor/concrete/indoors, +/area/submap/generic/inside_breath_mix) +"fi" = ( +/obj/structure/fence/end{ + dir = 4 + }, +/turf/simulated/floor/concrete/tile/outdoors, +/area/submap/generic/outside_open_air) +"fm" = ( +/turf/simulated/floor/concrete/tile/outdoors, +/area/submap/generic/outside_open_air) +"fY" = ( +/obj/structure/largecrate, +/turf/simulated/floor/concrete/indoors, +/area/submap/generic/inside_breath_mix) +"go" = ( +/obj/structure/fans/tiny, +/turf/simulated/floor/tiled/monotile/indoors, +/area/submap/generic/inside_breath_mix) +"gG" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/concrete/tile/outdoors, +/area/submap/generic/outside_open_air) +"gT" = ( +/obj/effect/floor_decal/industrial/danger, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/concrete/tile/outdoors, +/area/submap/generic/outside_open_air) +"gZ" = ( +/obj/structure/table/steel_reinforced, +/obj/item/paper_bin, +/turf/simulated/floor/tiled/monotile/indoors, +/area/submap/generic/inside_breath_mix) +"hO" = ( +/obj/machinery/papershredder, +/turf/simulated/floor/tiled/monotile/indoors, +/area/submap/generic/inside_breath_mix) +"iz" = ( +/obj/structure/railing, +/obj/structure/table/rack/shelf/steel, +/turf/simulated/floor/concrete/indoors, +/area/submap/generic/inside_breath_mix) +"ku" = ( +/obj/effect/debris/cleanable/blood/oil, +/turf/simulated/floor/concrete/outdoors, +/area/submap/generic/outside_open_air) +"lg" = ( +/turf/simulated/floor/concrete/outdoors, +/area/submap/generic/inside_breath_mix) +"lx" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 4 + }, +/turf/simulated/floor/concrete/indoors, +/area/submap/generic/inside_breath_mix) +"ml" = ( +/turf/simulated/floor/tiled/monotile/indoors, +/area/submap/generic/inside_breath_mix) +"mp" = ( +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 4 + }, +/turf/simulated/floor/concrete/tile/outdoors, +/area/submap/generic/outside_open_air) +"mP" = ( +/turf/simulated/wall, +/area/submap/generic/outside_open_air) +"mY" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 4 + }, +/turf/simulated/floor/concrete/outdoors, +/area/submap/generic/outside_open_air) +"nD" = ( +/obj/effect/floor_decal/industrial/halfstair{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/turf/simulated/floor/plating/indoors, +/area/submap/generic/inside_breath_mix) +"oX" = ( +/obj/effect/catwalk_plated/dark, +/turf/simulated/floor/plating/indoors, +/area/submap/generic/inside_breath_mix) +"pM" = ( +/obj/item/paper/pamphlet/violent_video_games, +/obj/item/paper/pamphlet/vacation, +/obj/structure/noticeboard{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/monotile/indoors, +/area/submap/generic/inside_breath_mix) +"pQ" = ( +/obj/structure/fence/door/locked{ + dir = 8 + }, +/turf/simulated/floor/concrete/outdoors, +/area/submap/generic/outside_open_air) +"pW" = ( +/obj/machinery/door/airlock, +/obj/effect/catwalk_plated/dark, +/obj/structure/fans/tiny, +/turf/simulated/floor/plating/indoors, +/area/submap/generic/inside_breath_mix) +"qg" = ( +/obj/structure/ore_box, +/turf/simulated/floor/concrete/indoors, +/area/submap/generic/inside_breath_mix) +"qI" = ( +/obj/structure/toilet, +/turf/simulated/floor/plating/indoors, +/area/submap/generic/inside_breath_mix) +"qW" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/turf/simulated/floor/tiled/monotile/indoors, +/area/submap/generic/inside_breath_mix) +"rI" = ( +/obj/random/crate, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/concrete/indoors, +/area/submap/generic/inside_breath_mix) +"sM" = ( +/obj/structure/fence, +/turf/simulated/floor/concrete/tile/outdoors, +/area/submap/generic/outside_open_air) +"sN" = ( +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 8 + }, +/turf/simulated/floor/concrete/tile/outdoors, +/area/submap/generic/outside_open_air) +"tb" = ( +/obj/structure/fence/corner{ + dir = 1 + }, +/turf/simulated/floor/concrete/tile/outdoors, +/area/submap/generic/outside_open_air) +"va" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 4 + }, +/turf/simulated/floor/concrete/tile/outdoors, +/area/submap/generic/outside_open_air) +"vS" = ( +/obj/spawner/window/reinforced/full, +/turf/simulated/floor/plating/indoors, +/area/submap/generic/inside_breath_mix) +"wq" = ( +/obj/structure/table/rack/shelf/steel, +/turf/simulated/floor/concrete/indoors, +/area/submap/generic/inside_breath_mix) +"wT" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/turf/simulated/floor/concrete/tile/outdoors, +/area/submap/generic/outside_open_air) +"xx" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating/indoors, +/area/submap/generic/inside_breath_mix) +"zT" = ( +/obj/structure/railing, +/turf/simulated/floor/concrete/indoors, +/area/submap/generic/inside_breath_mix) +"AU" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 5 + }, +/turf/simulated/floor/concrete/indoors, +/area/submap/generic/inside_breath_mix) +"CG" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/concrete/indoors, +/area/submap/generic/inside_breath_mix) +"Ec" = ( +/turf/simulated/floor/concrete/indoors, +/area/submap/generic/inside_breath_mix) +"EF" = ( +/obj/structure/table/steel_reinforced, +/obj/item/hand_labeler, +/obj/item/hand_labeler, +/obj/item/hand_labeler, +/obj/item/wrapping_paper, +/obj/item/wrapping_paper, +/turf/simulated/floor/tiled/monotile/indoors, +/area/submap/generic/inside_breath_mix) +"Fp" = ( +/obj/structure/fence/corner{ + dir = 6 + }, +/turf/simulated/floor/concrete/tile/outdoors, +/area/submap/generic/outside_open_air) +"GA" = ( +/obj/structure/sign/poi/engineleft, +/turf/simulated/floor/concrete/outdoors, +/area/submap/generic/outside_open_air) +"GH" = ( +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 1 + }, +/turf/simulated/floor/concrete/tile/outdoors, +/area/submap/generic/outside_open_air) +"Ib" = ( +/obj/structure/fence/corner{ + dir = 4 + }, +/turf/simulated/floor/concrete/tile/outdoors, +/area/submap/generic/outside_open_air) +"IU" = ( +/obj/machinery/door/airlock, +/turf/simulated/floor/tiled/monotile/indoors, +/area/submap/generic/inside_breath_mix) +"Ki" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/turf/simulated/floor/plating/indoors, +/area/submap/generic/inside_breath_mix) +"Kq" = ( +/obj/effect/catwalk_plated/dark, +/obj/structure/fans/tiny, +/obj/machinery/door/airlock, +/turf/simulated/floor/plating/indoors, +/area/submap/generic/inside_breath_mix) +"KL" = ( +/obj/structure/grille/rustic, +/turf/simulated/floor/concrete/outdoors, +/area/submap/generic/outside_open_air) +"Li" = ( +/obj/structure/fence/end{ + dir = 8 + }, +/turf/simulated/floor/concrete/tile/outdoors, +/area/submap/generic/outside_open_air) +"Nj" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 4 + }, +/obj/structure/ore_box, +/turf/simulated/floor/concrete/indoors, +/area/submap/generic/inside_breath_mix) +"Po" = ( +/obj/effect/floor_decal/industrial/danger, +/turf/simulated/floor/concrete/tile/outdoors, +/area/submap/generic/outside_open_air) +"Qf" = ( +/obj/structure/safe, +/turf/simulated/floor/plating/indoors, +/area/submap/generic/inside_breath_mix) +"Rc" = ( +/turf/simulated/floor/concrete/tile/outdoors, +/area/submap/generic/inside_breath_mix) +"Sz" = ( +/obj/structure/fence{ + dir = 4 + }, +/turf/simulated/floor/concrete/tile/outdoors, +/area/submap/generic/outside_open_air) +"SW" = ( +/obj/random/crate, +/obj/effect/floor_decal/industrial/danger{ + dir = 4 + }, +/turf/simulated/floor/concrete/indoors, +/area/submap/generic/inside_breath_mix) +"Tu" = ( +/turf/simulated/floor/plating/indoors, +/area/submap/generic/inside_breath_mix) +"VH" = ( +/obj/effect/floor_decal/industrial/halfstair, +/turf/simulated/floor/plating/indoors, +/area/submap/generic/inside_breath_mix) +"Xz" = ( +/turf/simulated/floor/concrete/outdoors, +/area/submap/generic/outside_open_air) +"XU" = ( +/turf/simulated/floor/carpet, +/area/submap/generic/inside_breath_mix) +"Yc" = ( +/obj/structure/largecrate, +/obj/effect/floor_decal/industrial/danger{ + dir = 4 + }, +/turf/simulated/floor/concrete/indoors, +/area/submap/generic/inside_breath_mix) +"ZE" = ( +/obj/random/crate, +/turf/simulated/floor/concrete/indoors, +/area/submap/generic/inside_breath_mix) + +(1,1,1) = {" +ca +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +tb +"} +(2,1,1) = {" +Sz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +KL +KL +KL +KL +Xz +Xz +Xz +Xz +Xz +Xz +Sz +"} +(3,1,1) = {" +Sz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Sz +"} +(4,1,1) = {" +Sz +Xz +Xz +ey +ey +ey +ey +ey +ey +ey +ey +ey +ey +ey +ey +ey +ey +ey +ey +ey +mP +mP +mP +mP +mP +mP +mP +mP +mP +fm +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Sz +"} +(5,1,1) = {" +Sz +Xz +Xz +ey +wq +wq +wq +wq +wq +wq +iz +rI +ZE +ZE +fY +ZE +fY +fY +fY +ey +Po +Xz +ku +gT +Xz +Xz +gG +fm +mP +fm +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Sz +"} +(6,1,1) = {" +Sz +Xz +Xz +ey +Ec +Ec +Ec +Ec +Ec +Ec +zT +CG +qg +Ec +qg +ZE +fY +ZE +fY +ey +Po +Xz +GA +gT +Xz +Xz +gG +fm +Li +fm +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Li +"} +(7,1,1) = {" +Sz +Xz +Xz +ey +Ec +wq +wq +wq +wq +Ec +zT +AU +lx +lx +lx +lx +Nj +SW +Yc +ey +fm +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +"} +(8,1,1) = {" +Sz +Xz +Xz +ey +Ec +Ec +Ec +Ec +Ec +Ec +Ec +Ec +Ec +Ec +Ec +Ec +Ec +Ec +Ec +eV +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +"} +(9,1,1) = {" +Sz +Xz +Xz +ey +Ec +Ec +Ec +Ec +Ec +Ec +Ec +Ec +Ec +Ec +Ec +Ec +Ec +Ec +Ec +eV +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +"} +(10,1,1) = {" +Sz +Xz +Xz +ey +Ec +wq +wq +wq +wq +Ec +Ec +ey +nD +ey +ey +ey +vS +vS +ey +ey +fm +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +"} +(11,1,1) = {" +Sz +Xz +Xz +ey +Ec +Ec +Ec +Ec +Ec +Ec +Ec +ey +IU +ey +au +au +ml +ml +Kq +VH +Po +Xz +Xz +gT +Xz +Xz +gG +fm +fi +fm +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +fi +"} +(12,1,1) = {" +Sz +Xz +Xz +ey +wq +wq +wq +Ec +wq +wq +wq +ey +ml +ml +ml +ml +ml +ml +ey +ey +Po +Xz +Xz +gT +Xz +ku +gG +fm +mP +fm +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Sz +"} +(13,1,1) = {" +Sz +Xz +Xz +ey +ey +ey +ey +Ki +ey +ey +ey +ey +pM +ml +ml +ml +ml +ml +EF +ey +ey +ey +ey +ey +ey +ey +ey +ey +ey +fm +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Sz +"} +(14,1,1) = {" +Sz +Xz +Xz +ey +oX +oX +oX +oX +oX +oX +oX +ey +ml +ml +ml +ml +ml +go +gZ +ey +qI +Tu +Tu +Tu +Tu +Tu +Tu +Tu +ey +fm +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Sz +"} +(15,1,1) = {" +Sz +Xz +Xz +ey +oX +ey +ey +ey +ey +ey +oX +ey +ml +ml +ml +ml +ml +ml +hO +ey +dl +Tu +Tu +Tu +Tu +Tu +Tu +Tu +ey +fm +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Sz +"} +(16,1,1) = {" +Sz +Xz +Xz +ey +oX +ey +Tu +Tu +Tu +ey +oX +ey +ey +ey +qW +qW +ey +ey +ey +ey +oX +oX +Tu +Tu +Tu +Tu +Tu +Tu +ey +fm +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Sz +"} +(17,1,1) = {" +Sz +Xz +Xz +ey +oX +ey +Tu +Tu +Tu +xx +oX +oX +oX +oX +oX +oX +oX +oX +oX +oX +oX +oX +Tu +Tu +Tu +Tu +Tu +Tu +ey +fm +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Sz +"} +(18,1,1) = {" +Sz +Xz +Xz +ey +oX +ey +Tu +Tu +Tu +ey +ey +ey +ey +ey +oX +oX +ey +ey +ey +ey +oX +oX +Tu +Tu +Tu +Tu +Tu +Tu +ey +fm +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Sz +"} +(19,1,1) = {" +Sz +Xz +Xz +ey +oX +ey +Tu +Tu +Tu +Tu +Tu +Tu +Tu +ey +qW +qW +ey +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +ey +fm +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Sz +"} +(20,1,1) = {" +Sz +Xz +Xz +ey +oX +ey +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +ey +sM +sM +sM +pQ +pQ +sM +sM +tb +Xz +Xz +Sz +"} +(21,1,1) = {" +Sz +Xz +Xz +ey +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +ey +cX +va +va +mY +mY +va +mp +Sz +Xz +Xz +Sz +"} +(22,1,1) = {" +Sz +Xz +Xz +ey +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +ey +Po +Xz +Xz +Xz +Xz +Xz +gG +Sz +Xz +Xz +Sz +"} +(23,1,1) = {" +Sz +Xz +Xz +ey +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +ey +Po +Xz +Xz +Xz +Xz +Xz +gG +Sz +Xz +Xz +Sz +"} +(24,1,1) = {" +Sz +Xz +Xz +ey +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +ey +Po +Xz +Xz +Xz +Xz +Xz +gG +Sz +Xz +Xz +Sz +"} +(25,1,1) = {" +Sz +Xz +Xz +ey +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +ml +ml +ml +ml +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +ey +ey +ey +ey +Po +Xz +Xz +Xz +Xz +Xz +gG +Sz +Xz +Xz +Sz +"} +(26,1,1) = {" +Sz +Xz +Xz +ey +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +ml +XU +XU +ml +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +ey +Rc +Rc +Rc +Po +Xz +Xz +Xz +Xz +Xz +gG +Sz +Xz +Xz +Sz +"} +(27,1,1) = {" +Sz +Xz +Xz +ey +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +ml +XU +XU +ml +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +ey +lg +lg +Rc +Po +Xz +Xz +Xz +Xz +Xz +gG +Sz +Xz +Xz +Sz +"} +(28,1,1) = {" +Sz +Xz +Xz +ey +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +ml +XU +XU +ml +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +pW +lg +lg +lg +Po +Xz +Xz +Xz +Xz +Xz +gG +Sz +Xz +Xz +Sz +"} +(29,1,1) = {" +Sz +Xz +Xz +ey +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +ml +XU +XU +ml +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +ey +lg +lg +lg +Po +Xz +Xz +Xz +Xz +Xz +gG +Sz +Xz +Xz +Sz +"} +(30,1,1) = {" +Sz +Xz +Xz +ey +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +ml +XU +XU +ml +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +pW +lg +lg +lg +Po +Xz +Xz +Xz +Xz +Xz +gG +Sz +Xz +Xz +Sz +"} +(31,1,1) = {" +Sz +Xz +Xz +ey +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +ml +XU +XU +ml +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +ey +lg +lg +Rc +Po +Xz +Xz +Xz +Xz +Xz +gG +Sz +Xz +Xz +Sz +"} +(32,1,1) = {" +Sz +Xz +Xz +ey +Qf +Qf +Qf +Qf +Qf +Tu +Tu +Tu +Tu +ml +XU +XU +ml +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +ey +Rc +Rc +Rc +Po +Xz +Xz +Xz +Xz +Xz +gG +Sz +Xz +Xz +Sz +"} +(33,1,1) = {" +Sz +Xz +Xz +ey +Qf +Qf +Qf +Qf +Qf +Tu +Tu +Tu +Tu +ml +XU +XU +ml +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +ey +ey +ey +ey +Po +Xz +Xz +Xz +Xz +Xz +gG +Sz +Xz +Xz +Sz +"} +(34,1,1) = {" +Sz +Xz +Xz +ey +Qf +Qf +Qf +Qf +Qf +Tu +Tu +Tu +Tu +ml +XU +XU +ml +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +ey +Po +Xz +Xz +Xz +Xz +Xz +gG +Sz +Xz +Xz +Sz +"} +(35,1,1) = {" +Sz +Xz +Xz +ey +Qf +Qf +Qf +Qf +Qf +Tu +Tu +Tu +Tu +ml +XU +XU +ml +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +ey +Po +Xz +Xz +Xz +Xz +Xz +gG +Sz +Xz +Xz +Sz +"} +(36,1,1) = {" +Sz +Xz +Xz +ey +Qf +Qf +Qf +Qf +Qf +Tu +Tu +Tu +Tu +ml +ml +ml +ml +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +ey +GH +wT +wT +wT +wT +wT +sN +Sz +Xz +Xz +Sz +"} +(37,1,1) = {" +Sz +Xz +Xz +ey +ey +ey +ey +ey +ey +ey +ey +ey +ey +ey +ey +ey +ey +ey +ey +ey +ey +ey +ey +ey +ey +ey +ey +ey +ey +sM +sM +sM +sM +sM +sM +sM +Fp +Xz +Xz +Sz +"} +(38,1,1) = {" +Sz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Sz +"} +(39,1,1) = {" +Sz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Xz +Sz +"} +(40,1,1) = {" +Ib +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +sM +Fp +"} From 9ea076c87c92856176bac6efbb6de8ae17f19b48 Mon Sep 17 00:00:00 2001 From: KT Date: Tue, 6 Jun 2023 22:46:25 -0400 Subject: [PATCH 14/33] More floor types --- code/game/turfs/simulated/floor_types_eris.dm | 2 + .../simulated/flooring/flooring_premade.dm | 8 + code/game/turfs/simulated/floors/dirt.dm | 4 + code/game/turfs/simulated/floors/glass.dm | 4 + code/game/turfs/simulated/floors/outdoors.dm | 2 + code/game/turfs/simulated/floors/snow.dm | 6 + code/modules/mining/mine_turfs.dm | 7 +- maps/away_missions/192x192/jungle_temple.dmm | 37259 ++++++++++++++++ 8 files changed, 37291 insertions(+), 1 deletion(-) create mode 100644 maps/away_missions/192x192/jungle_temple.dmm diff --git a/code/game/turfs/simulated/floor_types_eris.dm b/code/game/turfs/simulated/floor_types_eris.dm index 01cd46b6a040..34050e4970a4 100644 --- a/code/game/turfs/simulated/floor_types_eris.dm +++ b/code/game/turfs/simulated/floor_types_eris.dm @@ -883,6 +883,8 @@ /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/fullgrass ) + +CREATE_STANDARD_TURFS(/turf/simulated/floor/outdoors/grass/heavy) /turf/simulated/floor/outdoors/grass/heavy/interior name = "heavy grass" desc = "A dense sheet of harvested turf used in interior decoration." diff --git a/code/game/turfs/simulated/flooring/flooring_premade.dm b/code/game/turfs/simulated/flooring/flooring_premade.dm index 5fe2a3cc768a..86f4c368ab52 100644 --- a/code/game/turfs/simulated/flooring/flooring_premade.dm +++ b/code/game/turfs/simulated/flooring/flooring_premade.dm @@ -77,6 +77,8 @@ icon_state = "wood" initial_flooring = /singleton/flooring/wood +CREATE_STANDARD_TURFS(/turf/simulated/floor/wood) + /turf/simulated/floor/wood/broken icon_state = "broken0" // This gets changed when spawned. @@ -90,6 +92,8 @@ icon_state = "sifwood" initial_flooring = /singleton/flooring/wood/sif +CREATE_STANDARD_TURFS(/turf/simulated/floor/wood/sif) + /turf/simulated/floor/wood/sif/broken icon_state = "sifwood_broken0" // This gets changed when spawned. @@ -395,6 +399,8 @@ CREATE_STANDARD_TURFS(/turf/simulated/floor/tiled/monotile) icon_state = "plasteel" initial_flooring = /singleton/flooring/plasteel +CREATE_STANDARD_TURFS(/turf/simulated/floor/plasteel) + /turf/simulated/floor/durasteel name = "durasteel" icon = 'icons/turf/flooring/misc.dmi' @@ -419,6 +425,8 @@ CREATE_STANDARD_TURFS(/turf/simulated/floor/tiled/monotile) icon_state = "phoron" initial_flooring = /singleton/flooring/phoron +CREATE_STANDARD_TURFS(/turf/simulated/floor/phoron) + /turf/simulated/floor/uranium name = "uranium" icon = 'icons/turf/flooring/misc.dmi' diff --git a/code/game/turfs/simulated/floors/dirt.dm b/code/game/turfs/simulated/floors/dirt.dm index 22fd31e31809..2785c88cf849 100644 --- a/code/game/turfs/simulated/floors/dirt.dm +++ b/code/game/turfs/simulated/floors/dirt.dm @@ -6,6 +6,8 @@ initial_flooring = /singleton/flooring/outdoors/dirt baseturfs = /turf/baseturf_bottom +CREATE_STANDARD_TURFS(/turf/simulated/floor/outdoors/dirt) + /turf/simulated/floor/outdoors/dirt outdoors = FALSE @@ -17,5 +19,7 @@ initial_flooring = /singleton/flooring/outdoors/dirt baseturfs = /turf/baseturf_bottom +CREATE_STANDARD_TURFS(/turf/simulated/floor/outdoors/dirtlight) + /turf/simulated/floor/outdoors/dirtlight outdoors = FALSE diff --git a/code/game/turfs/simulated/floors/glass.dm b/code/game/turfs/simulated/floors/glass.dm index 1002a88ff7e5..49b59058f3e8 100644 --- a/code/game/turfs/simulated/floors/glass.dm +++ b/code/game/turfs/simulated/floors/glass.dm @@ -16,6 +16,8 @@ mz_flags = MZ_MIMIC_DEFAULTS +CREATE_STANDARD_TURFS(/turf/simulated/floor/glass) + /turf/simulated/floor/glass/Initialize() . = ..() return INITIALIZE_HINT_LATELOAD @@ -35,3 +37,5 @@ // Currently if flooring is set, it breaks the layering of the glass floor. // initial_flooring = /singleton/flooring/glass/reinforced + +CREATE_STANDARD_TURFS(/turf/simulated/floor/glass/reinforced) diff --git a/code/game/turfs/simulated/floors/outdoors.dm b/code/game/turfs/simulated/floors/outdoors.dm index febd7eb096cd..fcbe5304c02f 100644 --- a/code/game/turfs/simulated/floors/outdoors.dm +++ b/code/game/turfs/simulated/floors/outdoors.dm @@ -13,12 +13,14 @@ name = "mud" icon_state = "mud_dark" +CREATE_STANDARD_TURFS(/turf/simulated/floor/outdoors/mud) /turf/simulated/floor/outdoors/rocks name = "rocks" desc = "Hard as a rock." icon_state = "rock" baseturfs = /turf/baseturf_bottom +CREATE_STANDARD_TURFS(/turf/simulated/floor/outdoors/rocks) /turf/simulated/floor/outdoors/rocks/caves outdoors = FALSE diff --git a/code/game/turfs/simulated/floors/snow.dm b/code/game/turfs/simulated/floors/snow.dm index 6f3227957ac3..8bd13fa911d9 100644 --- a/code/game/turfs/simulated/floors/snow.dm +++ b/code/game/turfs/simulated/floors/snow.dm @@ -12,6 +12,8 @@ var/crossed_dirs = NONE +CREATE_STANDARD_TURFS(/turf/simulated/floor/outdoors/snow) + /turf/simulated/floor/outdoors/snow/Entered(atom/movable/AM) if(AM.hovering || AM.is_incorporeal()) // Flying things shouldn't make footprints. return ..() @@ -58,6 +60,8 @@ desc = "Looks slippery." edge_blending_priority = 0 +CREATE_STANDARD_TURFS(/turf/simulated/floor/outdoors/ice) + /turf/simulated/floor/outdoors/ice/Entered(var/mob/living/M) . = ..() if(istype(M, /mob/living)) @@ -74,6 +78,8 @@ slowdown = 4 edge_blending_priority = 0 +CREATE_STANDARD_TURFS(/turf/simulated/floor/outdoors/shelfice) + // Ice that is safe to walk on. /turf/simulated/floor/outdoors/safeice name = "ice" diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 24cefbae5edf..81f6a2bff4f8 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -47,22 +47,27 @@ var/ignore_oregen = FALSE var/ignore_cavegen = FALSE +CREATE_STANDARD_TURFS(/turf/simulated/mineral) + /turf/simulated/mineral/rich //Placeholder, go to the oregen stuff at the bottom to see the oregen weight - +CREATE_STANDARD_TURFS(/turf/simulated/mineral/rich) // Alternatives that ignore ore_gen and cavegen /turf/simulated/mineral/ignore_oregen ignore_oregen = TRUE +CREATE_STANDARD_TURFS(/turf/simulated/mineral/ignore_oregen) /turf/simulated/mineral/floor/ignore_oregen ignore_oregen = TRUE /turf/simulated/mineral/ignore_cavegen ignore_cavegen = TRUE +CREATE_STANDARD_TURFS(/turf/simulated/mineral/ignore_cavegen) /turf/simulated/mineral/floor/ignore_cavegen ignore_cavegen = TRUE +CREATE_STANDARD_TURFS(/turf/simulated/mineral/floor/ignore_cavegen) /turf/simulated/mineral/floor/ignore_cavegen/has_air initial_gas_mix = GAS_STRING_STP diff --git a/maps/away_missions/192x192/jungle_temple.dmm b/maps/away_missions/192x192/jungle_temple.dmm new file mode 100644 index 000000000000..bd0668e70b0c --- /dev/null +++ b/maps/away_missions/192x192/jungle_temple.dmm @@ -0,0 +1,37259 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/floor/outdoors/grass/heavy/outdoors, +/area/space) +"o" = ( +/turf/simulated/mineral/floor/ignore_cavegen/outdoors, +/area/space) +"y" = ( +/turf/simulated/mineral/ignore_cavegen/overhang, +/area/space) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(4,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(5,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(6,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(7,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(8,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(9,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(10,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(11,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(12,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(13,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(14,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(15,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(16,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(17,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(18,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(19,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(20,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(21,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(22,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(23,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(24,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(25,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(26,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(27,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(28,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(29,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(30,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(31,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(32,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(33,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(34,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(35,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(36,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(37,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(38,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(39,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(40,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(41,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(42,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(43,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(44,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(45,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(46,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(47,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(48,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(49,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(50,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(51,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(52,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(53,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(54,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(55,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(56,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(57,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(58,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(59,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(60,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(61,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(62,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(63,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(64,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(65,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(66,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(67,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(68,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(69,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(70,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(71,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(72,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(73,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(74,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(75,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(76,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(77,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(78,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(79,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(80,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(81,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(82,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(83,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(84,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(85,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(86,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(87,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(88,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(89,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(90,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(91,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(92,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(93,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(94,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(95,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(96,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(97,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(98,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(99,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(100,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(101,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(102,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(103,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(104,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(105,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(106,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(107,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(108,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(109,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(110,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(111,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(112,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(113,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(114,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(115,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(116,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(117,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(118,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(119,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(120,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(121,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(122,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(123,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(124,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(125,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(126,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(127,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(128,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(129,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(130,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(131,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(132,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(133,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(134,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(135,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(136,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(137,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(138,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(139,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(140,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(141,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(142,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(143,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(144,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(145,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(146,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(147,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(148,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(149,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(150,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(151,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(152,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(153,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(154,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(155,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(156,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(157,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(158,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(159,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(160,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(161,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(162,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(163,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(164,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(165,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(166,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(167,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(168,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(169,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(170,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(171,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(172,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(173,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(174,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(175,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(176,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(177,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(178,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(179,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(180,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(181,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(182,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(183,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(184,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(185,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(186,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(187,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(188,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(189,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(190,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(191,1,1) = {" +a +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(192,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} From e3f9016adf643bdbe91acb709771a35a6ca67513 Mon Sep 17 00:00:00 2001 From: KT Date: Sat, 26 Aug 2023 01:26:07 -0400 Subject: [PATCH 15/33] Update test_template_001.dmm --- maps/submaps/generic/test_template_001.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/submaps/generic/test_template_001.dmm b/maps/submaps/generic/test_template_001.dmm index 67fe55c5bef9..3e287e1cc591 100644 --- a/maps/submaps/generic/test_template_001.dmm +++ b/maps/submaps/generic/test_template_001.dmm @@ -42,7 +42,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/alarm/alarms_hidden{ +/obj/machinery/air_alarm/alarms_hidden{ pixel_y = 24 }, /turf/simulated/floor/plating/indoors, From de658c2502d83b434630dc5f37c141400bb923b1 Mon Sep 17 00:00:00 2001 From: KT Date: Fri, 5 Jan 2024 02:43:46 -0500 Subject: [PATCH 16/33] Update floor.dm --- code/game/turfs/simulated/floor/floor.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/turfs/simulated/floor/floor.dm b/code/game/turfs/simulated/floor/floor.dm index 49495574537c..eaae06a2212b 100644 --- a/code/game/turfs/simulated/floor/floor.dm +++ b/code/game/turfs/simulated/floor/floor.dm @@ -229,3 +229,5 @@ add_overlay(GLOB.no_ceiling_image, TRUE) else cut_overlay(GLOB.no_ceiling_image, TRUE) + +CREATE_STANDARD_TURFS(/turf/simulated/floor) From dc8ed4cddea0d9315a17253d646cedad5a27c83b Mon Sep 17 00:00:00 2001 From: KT Date: Fri, 5 Jan 2024 03:16:50 -0500 Subject: [PATCH 17/33] Dumb mistake --- code/game/turfs/simulated/floor/floor.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/turfs/simulated/floor/floor.dm b/code/game/turfs/simulated/floor/floor.dm index eaae06a2212b..afa391877891 100644 --- a/code/game/turfs/simulated/floor/floor.dm +++ b/code/game/turfs/simulated/floor/floor.dm @@ -231,3 +231,4 @@ cut_overlay(GLOB.no_ceiling_image, TRUE) CREATE_STANDARD_TURFS(/turf/simulated/floor) + \ No newline at end of file From a552e63b29a9d1f8902a02eaee000d523b88f0bc Mon Sep 17 00:00:00 2001 From: KT Date: Fri, 5 Jan 2024 03:20:27 -0500 Subject: [PATCH 18/33] ok im just gonna put it higher cause wtf --- code/game/turfs/simulated/floor/floor.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/turfs/simulated/floor/floor.dm b/code/game/turfs/simulated/floor/floor.dm index afa391877891..b6a533ae5997 100644 --- a/code/game/turfs/simulated/floor/floor.dm +++ b/code/game/turfs/simulated/floor/floor.dm @@ -40,6 +40,8 @@ var/singleton/flooring/flooring var/mineral = MAT_STEEL +CREATE_STANDARD_TURFS(/turf/simulated/floor) + /turf/simulated/floor/is_plating() return !flooring @@ -230,5 +232,4 @@ else cut_overlay(GLOB.no_ceiling_image, TRUE) -CREATE_STANDARD_TURFS(/turf/simulated/floor) - \ No newline at end of file + From a4ce2262b0a05ac600da63828d092e66d332d9eb Mon Sep 17 00:00:00 2001 From: KT Date: Fri, 5 Jan 2024 03:37:38 -0500 Subject: [PATCH 19/33] Random fixes --- maps/away_missions/140x140/snow_outpost.dmm | 74 +++---------------- .../level_specific/class_h/landing_padH.dmm | 65 ---------------- maps/submaps/mountains/digsite.dmm | 16 +--- maps/submaps/plains/construction1.dmm | 6 +- .../10x10/standard_station/theatre10x10.dmm | 3 +- 5 files changed, 18 insertions(+), 146 deletions(-) diff --git a/maps/away_missions/140x140/snow_outpost.dmm b/maps/away_missions/140x140/snow_outpost.dmm index fcf22d8e13d4..3514fe3a71ec 100644 --- a/maps/away_missions/140x140/snow_outpost.dmm +++ b/maps/away_missions/140x140/snow_outpost.dmm @@ -587,10 +587,6 @@ "ce" = ( /turf/simulated/wall/sandstone, /area/awaymission/snow_outpost/dark) -"cf" = ( -/obj/item/ore/diamond, -/turf/simulated/floor/snow/snow2, -/area/awaymission/snow_outpost/dark) "ch" = ( /turf/simulated/floor/tiled/kafel_full/yellow, /area/awaymission/snow_outpost/dark) @@ -626,10 +622,6 @@ "cr" = ( /turf/simulated/mineral/floor/ignore_mapgen, /area/awaymission/snow_outpost/outside) -"cs" = ( -/obj/item/ore, -/turf/simulated/floor/snow/snow2, -/area/awaymission/snow_outpost/dark) "ct" = ( /obj/effect/floor_decal/asteroid, /turf/simulated/floor/snow/snow2, @@ -764,29 +756,6 @@ /obj/structure/old_roboprinter, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/dark) -"db" = ( -/obj/item/ore/gold, -/obj/item/ore/gold, -/obj/item/ore/gold, -/obj/item/ore/gold, -/obj/item/ore/gold, -/obj/item/ore/gold, -/obj/item/ore/gold, -/obj/item/ore/gold, -/obj/item/ore/gold, -/obj/item/ore/gold, -/obj/item/ore/gold, -/obj/item/ore/gold, -/turf/simulated/floor/snow/snow2, -/area/awaymission/snow_outpost/dark) -"dc" = ( -/obj/item/ore/gold, -/obj/item/ore/gold, -/obj/item/ore/gold, -/obj/item/ore/gold, -/obj/item/ore/gold, -/turf/simulated/floor/snow/snow2, -/area/awaymission/snow_outpost/dark) "dd" = ( /obj/structure/table/standard, /obj/item/flashlight/lamp, @@ -1709,11 +1678,6 @@ /obj/tether_away_spawner/aerostat_inside, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/dark) -"fW" = ( -/obj/item/ore/gold, -/obj/tether_away_spawner/aerostat_inside, -/turf/simulated/floor/snow/snow2, -/area/awaymission/snow_outpost/dark) "fX" = ( /obj/structure/flora/tree/pine, /turf/simulated/floor/snow/snow2, @@ -2184,10 +2148,6 @@ }, /turf/simulated/floor/carpet, /area/awaymission/snow_outpost/dark) -"hH" = ( -/mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong/guard, -/turf/simulated/floor, -/area/awaymission/snow_outpost/dark) "hI" = ( /obj/structure/girder, /turf/simulated/floor, @@ -2357,12 +2317,6 @@ /obj/structure/shuttle/engine/propulsion/burst, /turf/simulated/shuttle/wall, /area/awaymission/snow_outpost/outside) -"im" = ( -/obj/structure/door_assembly/door_assembly_ext{ - anchored = 1 - }, -/turf/simulated/floor/water, -/area/awaymission/snow_outpost/outside) "in" = ( /turf/unsimulated/mineral, /area/awaymission/snow_outpost/outside) @@ -2706,10 +2660,6 @@ outdoors = 0 }, /area/awaymission/snow_outpost/dark) -"CY" = ( -/obj/item/ore, -/turf/simulated/floor/plating/outdoors, -/area/awaymission/snow_outpost/dark) "Dp" = ( /obj/structure/ghost_pod/manual/lost_drone/dogborg, /turf/simulated/floor/plating/outdoors, @@ -3453,7 +3403,7 @@ ig ii ij ik -im +id ar ar id @@ -3823,7 +3773,7 @@ Lh Lh Lh Lh -fW +fV fV fV fV @@ -3965,7 +3915,7 @@ Lh Lh Lh Lh -db +Lq Lq Lq Lq @@ -4107,7 +4057,7 @@ Lh Lh Lh Lh -dc +Lq Lq Lq Lq @@ -4987,7 +4937,7 @@ ch ce jo Lq -cs +Lq Lq Lq Lq @@ -5547,7 +5497,7 @@ Lh Lh Lh IK -CY +wV wV ch ch @@ -5694,7 +5644,7 @@ ch ch ch ch -CY +wV Lq Lq Lq @@ -5837,7 +5787,7 @@ ch wV wV ce -cs +Lq Lq ct Lq @@ -9942,7 +9892,7 @@ ab ab cd VF -cf +Lq VF VF Lq @@ -10368,7 +10318,7 @@ cd ab cd VF -cf +Lq Lq Lq Lq @@ -10511,7 +10461,7 @@ ab cd Lh VF -cf +Lq Lq Lq VF @@ -20619,7 +20569,7 @@ cv ht hB ki -hH +ki ki cv Lh diff --git a/maps/submaps/level_specific/class_h/landing_padH.dmm b/maps/submaps/level_specific/class_h/landing_padH.dmm index 5c3c047297a1..9162a54ea7e6 100644 --- a/maps/submaps/level_specific/class_h/landing_padH.dmm +++ b/maps/submaps/level_specific/class_h/landing_padH.dmm @@ -10,12 +10,6 @@ }, /turf/simulated/floor/tiled, /area/class_h/POIs/landing_pad) -"ac" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 5 - }, -/turf/simulated/floor/tiled/external, -/area/class_h/POIs/landing_pad) "ad" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/door/airlock/glass_external/public, @@ -61,23 +55,11 @@ }, /turf/simulated/floor/tiled/kafel_full, /area/class_h/POIs/landing_pad) -"aj" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 6 - }, -/turf/simulated/floor/tiled/external, -/area/class_h/POIs/landing_pad) "ak" = ( /obj/effect/floor_decal/rust, /obj/structure/closet/toolcloset, /turf/simulated/floor/plating, /area/class_h/POIs/landing_pad) -"al" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 9 - }, -/turf/simulated/floor/tiled/external, -/area/class_h/POIs/landing_pad) "am" = ( /obj/effect/wingrille_spawn/reinforced, /turf/simulated/floor/tiled, @@ -96,20 +78,6 @@ }, /turf/simulated/floor/tiled/outdoors, /area/class_h/POIs/landing_pad) -"aq" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 8 - }, -/turf/simulated/floor/tiled/external, -/area/class_h/POIs/landing_pad) -"ar" = ( -/turf/simulated/floor/tiled/external, -/area/class_h/POIs/landing_pad) -"as" = ( -/obj/effect/debris/cleanable/dirt, -/obj/machinery/door/airlock/multi_tile, -/turf/simulated/floor/wood, -/area/class_h/POIs/landing_pad) "at" = ( /obj/effect/debris/cleanable/dirt, /obj/structure/table/rack, @@ -134,11 +102,6 @@ /obj/item/ammo_magazine/clip/c762, /turf/simulated/floor/wood, /area/class_h/POIs/landing_pad) -"av" = ( -/obj/effect/debris/cleanable/dirt, -/obj/machinery/door/airlock/multi_tile, -/turf/simulated/floor/tiled/kafel_full, -/area/class_h/POIs/landing_pad) "aw" = ( /turf/simulated/floor/outdoors/beach/sand/lowdesert, /area/class_h/POIs/landing_pad) @@ -184,12 +147,6 @@ }, /turf/simulated/floor/tiled, /area/class_h/POIs/landing_pad) -"aE" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 4 - }, -/turf/simulated/floor/tiled/external, -/area/class_h/POIs/landing_pad) "aF" = ( /obj/effect/wingrille_spawn/reinforced, /turf/simulated/wall, @@ -205,12 +162,6 @@ /obj/item/storage/box/donkpockets, /obj/item/storage/box/donkpockets, /obj/item/storage/box/donkpockets, -/obj/item/reagent_containers/food/snacks/liquidvitamin, -/obj/item/reagent_containers/food/snacks/liquidvitamin, -/obj/item/reagent_containers/food/snacks/liquidvitamin, -/obj/item/reagent_containers/food/snacks/liquidprotein, -/obj/item/reagent_containers/food/snacks/liquidprotein, -/obj/item/reagent_containers/food/snacks/liquidprotein, /obj/item/reagent_containers/food/snacks/liquidfood, /obj/item/reagent_containers/food/snacks/liquidfood, /obj/item/reagent_containers/food/snacks/liquidfood, @@ -244,12 +195,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/class_h/POIs/landing_pad) -"aM" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 10 - }, -/turf/simulated/floor/tiled/external, -/area/class_h/POIs/landing_pad) "aN" = ( /obj/machinery/door/airlock/glass_external/public, /turf/simulated/floor/tiled, @@ -268,10 +213,6 @@ /obj/effect/debris/cleanable/dirt, /turf/simulated/floor/tiled, /area/class_h/POIs/landing_pad) -"aR" = ( -/obj/effect/floor_decal/techfloor/orange, -/turf/simulated/floor/tiled/external, -/area/class_h/POIs/landing_pad) "aS" = ( /obj/effect/floor_decal/rust, /obj/machinery/atmospherics/pipe/simple/hidden, @@ -285,12 +226,6 @@ }, /turf/simulated/floor/tiled, /area/class_h/POIs/landing_pad) -"aU" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 1 - }, -/turf/simulated/floor/tiled/external, -/area/class_h/POIs/landing_pad) "aV" = ( /obj/machinery/light/spot{ dir = 8 diff --git a/maps/submaps/mountains/digsite.dmm b/maps/submaps/mountains/digsite.dmm index feedfa8faaf3..c3ca8a8feabc 100644 --- a/maps/submaps/mountains/digsite.dmm +++ b/maps/submaps/mountains/digsite.dmm @@ -21,10 +21,6 @@ "g" = ( /turf/simulated/floor/plating/outdoors, /area/submap/cave/digsite) -"h" = ( -/obj/item/ore, -/turf/simulated/floor/plating/outdoors, -/area/submap/cave/digsite) "i" = ( /obj/structure/bed/alien, /turf/simulated/floor/tiled/kafel_full/yellow, @@ -54,10 +50,6 @@ /obj/structure/closet/crate/secure/loot, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/cave/digsite) -"p" = ( -/obj/item/ore, -/turf/simulated/mineral/floor/ignore_mapgen, -/area/submap/cave/digsite) "q" = ( /obj/effect/floor_decal/asteroid, /turf/simulated/mineral/floor/ignore_mapgen, @@ -340,7 +332,7 @@ f c e e -p +e e e e @@ -420,7 +412,7 @@ a a b d -h +g g f f @@ -447,7 +439,7 @@ f f f f -h +g e e e @@ -470,7 +462,7 @@ f g g c -p +e e q e diff --git a/maps/submaps/plains/construction1.dmm b/maps/submaps/plains/construction1.dmm index 2ff2cd3ff9bd..247493b36a29 100644 --- a/maps/submaps/plains/construction1.dmm +++ b/maps/submaps/plains/construction1.dmm @@ -71,10 +71,6 @@ /obj/item/clothing/head/welding/engie, /turf/simulated/floor/plating/outdoors, /area/submap/construction1) -"t" = ( -/obj/structure/door_assembly/door_assembly_mai, -/turf/simulated/floor/plating/outdoors, -/area/submap/construction1) "u" = ( /obj/item/storage/toolbox/electrical, /turf/simulated/floor/plating/outdoors, @@ -223,7 +219,7 @@ h l o l -t +g l l z diff --git a/maps/templates/holodeck/10x10/standard_station/theatre10x10.dmm b/maps/templates/holodeck/10x10/standard_station/theatre10x10.dmm index 53420bc5397d..f63d4feb88ba 100644 --- a/maps/templates/holodeck/10x10/standard_station/theatre10x10.dmm +++ b/maps/templates/holodeck/10x10/standard_station/theatre10x10.dmm @@ -34,7 +34,7 @@ /area/template_noop) "n" = ( /obj/landmark/costume, -/obj/structure/table/rack/holorack, +/obj/structure/table/rack, /turf/simulated/floor/holofloor/tiled/dark, /area/template_noop) "o" = ( @@ -72,7 +72,6 @@ /turf/simulated/floor/holofloor/carpet, /area/template_noop) "x" = ( -/obj/structure/table/rack/holorack, /obj/item/clothing/under/dress/dress_saloon, /obj/item/clothing/head/pin/flower, /turf/simulated/floor/holofloor/tiled/dark, From 3988896d11b8ed10b64329484ab1907b78a1fb4e Mon Sep 17 00:00:00 2001 From: KT Date: Fri, 5 Jan 2024 03:45:29 -0500 Subject: [PATCH 20/33] reee --- maps/submaps/level_specific/debrisfield/derelict.dmm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/maps/submaps/level_specific/debrisfield/derelict.dmm b/maps/submaps/level_specific/debrisfield/derelict.dmm index f9ee0412d1dd..8ca4ebe7f651 100644 --- a/maps/submaps/level_specific/debrisfield/derelict.dmm +++ b/maps/submaps/level_specific/debrisfield/derelict.dmm @@ -448,11 +448,6 @@ }, /turf/simulated/floor/tiled/white/airless, /area/debrisfield/derelict) -"ce" = ( -/obj/effect/alien/egg, -/obj/effect/alien/weeds, -/turf/simulated/floor/tiled/asteroid_steel/airless, -/area/debrisfield/derelict) "cf" = ( /obj/machinery/dna_scannernew, /turf/simulated/floor/tiled/white/airless, @@ -2169,7 +2164,7 @@ bw bw ch bv -ce +bT aq bT bT From f6f141065d3317a75040563e67c02cf7b722b263 Mon Sep 17 00:00:00 2001 From: KT Date: Fri, 5 Jan 2024 03:59:21 -0500 Subject: [PATCH 21/33] Pain --- .../virgo4_140/levels/virgo4_140_desert.dmm | 64 ++++--------------- 1 file changed, 12 insertions(+), 52 deletions(-) diff --git a/maps/sectors/virgo4_140/levels/virgo4_140_desert.dmm b/maps/sectors/virgo4_140/levels/virgo4_140_desert.dmm index 425076af40b1..31d900d0efde 100644 --- a/maps/sectors/virgo4_140/levels/virgo4_140_desert.dmm +++ b/maps/sectors/virgo4_140/levels/virgo4_140_desert.dmm @@ -87,14 +87,6 @@ "vd" = ( /turf/simulated/wall/sandstone/classh, /area/tether_away/beach/desert/explored) -"vn" = ( -/obj/effect/map_effect/portal/master/side_b{ - dir = 1; - name = "V4_desert_to_beach"; - portal_id = "V4_desert_step" - }, -/turf/simulated/floor/outdoors/beach/sand/lowdesert, -/area/tether_away/beach/desert/explored) "vr" = ( /obj/random/humanoidremains, /obj/effect/debris/cleanable/blood, @@ -113,32 +105,6 @@ }, /turf/simulated/floor/outdoors/beach/sand/lowdesert, /area/tether_away/beach/desert/explored) -"xw" = ( -/obj/effect/map_effect/portal/master/side_a{ - dir = 8; - name = "desert to caves"; - portal_id = "V4_cave_desert_step" - }, -/turf/simulated/mineral/floor/cave{ - name = "dirt"; - outdoors = 1 - }, -/area/tether_away/beach/desert/explored) -"yc" = ( -/obj/effect/map_effect/portal/line/side_a{ - dir = 8 - }, -/turf/simulated/mineral/floor/cave{ - name = "dirt"; - outdoors = 1 - }, -/area/tether_away/beach/desert/explored) -"yj" = ( -/obj/effect/map_effect/portal/line/side_b{ - dir = 1 - }, -/turf/simulated/floor/outdoors/beach/sand/lowdesert, -/area/tether_away/beach/desert/explored) "yo" = ( /obj/random/humanoidremains, /turf/simulated/mineral/floor/cave{ @@ -169,12 +135,6 @@ outdoors = 1 }, /area/tether_away/beach/desert/explored) -"Df" = ( -/obj/effect/map_effect/portal/line/side_b{ - dir = 1 - }, -/turf/simulated/floor/outdoors/beach/sand/desert, -/area/tether_away/beach/desert/explored) "Eh" = ( /obj/structure/simple_door/wood, /turf/simulated/floor/wood/classh, @@ -18780,7 +18740,7 @@ FM kK kK kK -vn +kK wg "} (131,1,1) = {" @@ -18922,7 +18882,7 @@ kK kK kK kK -yj +kK wg "} (132,1,1) = {" @@ -19064,7 +19024,7 @@ kK kK FM kK -yj +kK wg "} (133,1,1) = {" @@ -19206,7 +19166,7 @@ kK kK FM FM -yj +kK wg "} (134,1,1) = {" @@ -19348,7 +19308,7 @@ kK kK kK kK -yj +kK wg "} (135,1,1) = {" @@ -19490,7 +19450,7 @@ kK kK kK kK -Df +FM wg "} (136,1,1) = {" @@ -19632,7 +19592,7 @@ XZ XZ XZ kK -yj +kK wg "} (137,1,1) = {" @@ -19924,11 +19884,11 @@ gz XZ XZ gz -yc -yc -yc -yc -xw +Js +Js +Js +Js +Js gz XZ XZ From f3d8feb01cc072d4b8491ad2ca221f7139025034 Mon Sep 17 00:00:00 2001 From: KT Date: Sat, 6 Jan 2024 00:04:18 -0500 Subject: [PATCH 22/33] Actually making this a shuttle Also making spawners be anchored so in fringe cases they cant get spaced when being loaded in --- citadel.dme | 1 + code/modules/mapping/spawner/_spawner.dm | 1 + .../shuttles/admin_spawn/OM_paperclipper.dm | 59 + .../generic/overmap_ship_paperclipper.dmm | 3070 +++++++++++++++++ .../overmap_ship_superjank.dmm | 0 .../overmap_ship_paperclipper.dmm | 2229 ------------ 6 files changed, 3131 insertions(+), 2229 deletions(-) create mode 100644 code/modules/maps/templates/shuttles/admin_spawn/OM_paperclipper.dm create mode 100644 maps/templates/shuttles/overmaps/generic/overmap_ship_paperclipper.dmm rename maps/templates/shuttles/overmaps/{ships_and_shuttles => generic}/overmap_ship_superjank.dmm (100%) delete mode 100644 maps/templates/shuttles/overmaps/ships_and_shuttles/overmap_ship_paperclipper.dmm diff --git a/citadel.dme b/citadel.dme index db4b870944e3..7c20ca2cf357 100644 --- a/citadel.dme +++ b/citadel.dme @@ -3178,6 +3178,7 @@ #include "code\modules\maps\templates\shuttles\admin_spawn\manta_mercship.dm" #include "code\modules\maps\templates\shuttles\admin_spawn\mercenarybase.dm" #include "code\modules\maps\templates\shuttles\admin_spawn\mercship.dm" +#include "code\modules\maps\templates\shuttles\admin_spawn\OM_paperclipper.dm" #include "code\modules\maps\templates\shuttles\admin_spawn\salamander.dm" #include "code\modules\maps\templates\shuttles\admin_spawn\screebarge.dm" #include "code\modules\maps\templates\shuttles\admin_spawn\shelter_5.dm" diff --git a/code/modules/mapping/spawner/_spawner.dm b/code/modules/mapping/spawner/_spawner.dm index 5bf7e5608ba1..771186933d58 100644 --- a/code/modules/mapping/spawner/_spawner.dm +++ b/code/modules/mapping/spawner/_spawner.dm @@ -6,6 +6,7 @@ icon = 'icons/mapping/spawners/spawners.dmi' icon_state = "" layer = MID_LANDMARK_LAYER + anchored = TRUE /// lateload? var/late = FALSE diff --git a/code/modules/maps/templates/shuttles/admin_spawn/OM_paperclipper.dm b/code/modules/maps/templates/shuttles/admin_spawn/OM_paperclipper.dm new file mode 100644 index 000000000000..5f58bbd6c455 --- /dev/null +++ b/code/modules/maps/templates/shuttles/admin_spawn/OM_paperclipper.dm @@ -0,0 +1,59 @@ +// -- Datums -- // +/datum/map_template/shuttle/overmap/generic/paper_clipper + name = "OM Ship - Paper Clipper (Cylon) (New Z)" + desc = "An old salvage ship, abandoned but seemingly intact." + suffix = "overmap_ship_paperclipper.dmm" + +// The 'shuttle' +/datum/shuttle/autodock/overmap/paper_clipper + name = "Cylon" + current_location = "omship_spawn_paper_clipper" + docking_controller_tag = "paperclipper_airlock" + shuttle_area = list(/area/shuttle/paper_clipper, + /area/shuttle/paper_clipper/left_wing, + /area/shuttle/paper_clipper/right_wing, + /area/shuttle/paper_clipper/right_wing/shuttle_hanger + ) + defer_initialisation = TRUE //We're not loaded until an admin does it + move_direction = NORTH + ceiling_type = /turf/simulated/floor/reinforced/airless + +// A shuttle lateloader landmark +/obj/effect/shuttle_landmark/shuttle_initializer/paper_clipper + name = "Cylon" + base_area = /area/space + base_turf = /turf/space + landmark_tag = "omship_spawn_paper_clipper" + shuttle_type = /datum/shuttle/autodock/overmap/paper_clipper + +/obj/overmap/entity/visitable/ship/landable/paper_clipper + scanner_name = "Cylon-class Vessel" + scanner_desc = @{"[i]Registration[/i]: Unknown +[i]Class[/i]: Small Shuttle +[i]Transponder[/i]: Transmitting (CIV), non-hostile +[b]Notice[/b]: Small private vessel"} + color = "#292636" + vessel_mass = 1000 + known = FALSE + vessel_size = SHIP_SIZE_SMALL + shuttle = "Cylon" + +// The shuttle's 'shuttle' computer +/obj/machinery/computer/shuttle_control/explore/paper_clipper + name = "short jump console" + shuttle_tag = "Cylon" + req_one_access = list() + +/area/shuttle/paper_clipper + name = "\improper Central Section" + icon_state = "shuttle" + requires_power = 1 + +/area/shuttle/paper_clipper/left_wing + name = "\improper Left Wing" + +/area/shuttle/paper_clipper/right_wing + name = "\improper Right Wing" + +/area/shuttle/paper_clipper/right_wing/shuttle_hanger + name = "\improper Right Wing Shuttle Hanger" diff --git a/maps/templates/shuttles/overmaps/generic/overmap_ship_paperclipper.dmm b/maps/templates/shuttles/overmaps/generic/overmap_ship_paperclipper.dmm new file mode 100644 index 000000000000..4aaca625dda7 --- /dev/null +++ b/maps/templates/shuttles/overmaps/generic/overmap_ship_paperclipper.dmm @@ -0,0 +1,3070 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"aj" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"at" = ( +/obj/machinery/power/terminal, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"bw" = ( +/obj/machinery/computer/ship/helm, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"bD" = ( +/obj/machinery/shower{ + dir = 8 + }, +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, +/obj/structure/curtain/open/shower, +/obj/item/soap, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"bG" = ( +/obj/structure/bed/chair/bay/comfy{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"bZ" = ( +/obj/structure/table/steel, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"dh" = ( +/obj/machinery/light/poi{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"dv" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"dE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"dZ" = ( +/obj/machinery/atmospherics/component/unary/engine/biggest{ + dir = 1 + }, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/paper_clipper) +"ei" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"eF" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/obj/machinery/light/poi, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"eX" = ( +/obj/machinery/door/airlock/hatch{ + req_one_access = list() + }, +/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ + dir = 10; + pixel_x = -8; + pixel_y = 26 + }, +/obj/map_helper/airlock/door/ext_door, +/obj/map_helper/airlock/sensor/ext_sensor, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"fr" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"fU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/shuttle/paper_clipper) +"fX" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/pickaxe/drill, +/obj/item/pickaxe/drill, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"fZ" = ( +/obj/machinery/door/airlock/hatch{ + req_one_access = list() + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"gD" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"gE" = ( +/turf/simulated/shuttle/wall/dark/hard_corner, +/area/shuttle/paper_clipper) +"hj" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"hL" = ( +/turf/simulated/shuttle/wall/dark, +/area/shuttle/paper_clipper) +"ib" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/turf/simulated/shuttle/wall/dark, +/area/shuttle/paper_clipper) +"id" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"ij" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/light/poi, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"ir" = ( +/obj/machinery/shield_gen, +/obj/structure/cable, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"iz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"iI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"je" = ( +/obj/machinery/air_alarm/alarms_hidden{ + dir = 8; + pixel_x = 26 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"jA" = ( +/obj/structure/table/steel, +/obj/item/storage/toolbox/electrical, +/obj/machinery/light/poi{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"jD" = ( +/obj/machinery/shield_capacitor{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"jF" = ( +/obj/machinery/door/airlock/hatch{ + req_one_access = list() + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"jK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/shuttle/paper_clipper) +"jZ" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/table/steel, +/obj/item/gun/energy/retro, +/obj/item/gun/energy/retro, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"kn" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"ky" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"kW" = ( +/obj/structure/closet/secure_closet/freezer/meat, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/paper_clipper) +"kZ" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/tank/vox, +/obj/item/tank/vox, +/obj/item/tank/vox, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"ld" = ( +/turf/simulated/floor/tiled, +/area/shuttle/paper_clipper) +"lh" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/table/rack/shelf/steel, +/obj/item/tank/nitrogen, +/obj/item/tank/nitrogen, +/obj/item/tank/nitrogen, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"lk" = ( +/obj/structure/table/rack/shelf/steel, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"lq" = ( +/obj/machinery/mech_recharger, +/turf/simulated/floor/reinforced, +/area/shuttle/paper_clipper) +"ls" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/effect/shuttle_landmark/shuttle_initializer/paper_clipper, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/overmap/entity/visitable/ship/landable/paper_clipper, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"lt" = ( +/obj/machinery/light/poi, +/turf/simulated/floor/tiled, +/area/shuttle/paper_clipper) +"lU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/air_alarm/alarms_hidden{ + dir = 4; + pixel_x = -26 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"mq" = ( +/obj/machinery/atmospherics/portables_connector/fuel, +/obj/machinery/portable_atmospherics/canister/phoron{ + start_pressure = 8000.25 + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"my" = ( +/obj/machinery/light/poi, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"nd" = ( +/obj/machinery/atmospherics/component/binary/passive_gate/on{ + pressure_resistance = 750; + target_pressure = 750 + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"ni" = ( +/obj/machinery/atmospherics/component/unary/vent_pump{ + dir = 8 + }, +/obj/map_helper/airlock/atmos/chamber_pump, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"nw" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"oE" = ( +/obj/structure/closet/secure_closet/freezer/kitchen, +/turf/simulated/floor/tiled, +/area/shuttle/paper_clipper) +"oU" = ( +/obj/machinery/door/window/northleft, +/turf/simulated/floor/tiled/freezer, +/area/shuttle/paper_clipper) +"ps" = ( +/obj/machinery/light/poi{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/freezer, +/area/shuttle/paper_clipper) +"pv" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/panic_button{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"pz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"pA" = ( +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/debris/cleanable/cobweb2, +/turf/simulated/floor/tiled, +/area/shuttle/paper_clipper) +"pS" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"qk" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"qm" = ( +/obj/machinery/sleeper/survival_pod, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/paper_clipper) +"qw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"qH" = ( +/obj/spawner/window/full/firelocks, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"qP" = ( +/obj/effect/decal/mecha_wreckage/gunpod, +/turf/simulated/floor/reinforced, +/area/shuttle/paper_clipper) +"rf" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"rC" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"rT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/seed_extractor, +/turf/simulated/floor/tiled, +/area/shuttle/paper_clipper) +"sq" = ( +/obj/machinery/door/airlock/hatch{ + req_one_access = list() + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"su" = ( +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/power/rtg/advanced, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"sx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/obj/machinery/light/poi{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"sN" = ( +/obj/machinery/airlock_sensor{ + pixel_x = 25; + dir = 8 + }, +/obj/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"sQ" = ( +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "paperclipper_hanger_hatch"; + name = "Starbard Hanger Hatch"; + pixel_x = -24 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/paper_clipper) +"sS" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/dispenser/oxygen, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"tn" = ( +/obj/mecha/combat/fighter/gunpod/recon{ + dir = 4 + }, +/obj/machinery/mech_recharger, +/turf/simulated/floor/reinforced, +/area/shuttle/paper_clipper) +"tw" = ( +/obj/structure/closet/secure_closet/freezer, +/turf/simulated/floor/tiled/freezer, +/area/shuttle/paper_clipper) +"up" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/light/poi{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"uv" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"uX" = ( +/obj/machinery/shipsensors, +/turf/simulated/floor/reinforced/airless, +/area/shuttle/paper_clipper) +"vo" = ( +/obj/structure/table/standard, +/obj/item/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, +/turf/simulated/floor/tiled, +/area/shuttle/paper_clipper) +"we" = ( +/turf/template_noop, +/area/template_noop) +"wg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"wt" = ( +/obj/machinery/shield_capacitor{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"wK" = ( +/obj/machinery/atmospherics/component/unary/vent_pump, +/obj/map_helper/airlock/atmos/chamber_pump, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"xE" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"xN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/biogenerator, +/turf/simulated/floor/tiled, +/area/shuttle/paper_clipper) +"yd" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/light/poi, +/obj/machinery/computer/ship/engines{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"yF" = ( +/obj/machinery/atmospherics/pipe/vent/high_volume, +/turf/simulated/floor/reinforced/airless, +/area/shuttle/paper_clipper) +"yL" = ( +/obj/machinery/light/poi{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"yP" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"yX" = ( +/obj/random/crate{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"zp" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"zY" = ( +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"Aq" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/hatch{ + req_one_access = list() + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"AN" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/paper_clipper) +"AY" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"Bl" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"Br" = ( +/obj/machinery/media/jukebox, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"BP" = ( +/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"CS" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"CW" = ( +/obj/machinery/atmospherics/pipe/tank/air, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"Do" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/paper_clipper) +"DG" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"DH" = ( +/obj/machinery/light/poi, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"DJ" = ( +/obj/structure/ore_box, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"Eh" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"Em" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"EZ" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/menu11, +/obj/item/storage/single_use/mre/menu11, +/obj/item/storage/single_use/mre/menu13, +/obj/item/fbp_backup_cell, +/obj/item/fbp_backup_cell, +/obj/item/fbp_backup_cell, +/obj/item/fbp_backup_cell, +/obj/item/fbp_backup_cell, +/obj/item/storage/pill_bottle/dice, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/item/storage/box/survival/space, +/obj/item/storage/box/survival/space, +/obj/item/storage/box/survival/space, +/obj/item/storage/box/survival/space, +/obj/item/gps, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/storage/toolbox/emergency, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/paper_clipper) +"Ft" = ( +/obj/structure/table/steel, +/obj/fiftyspawner/steel, +/obj/fiftyspawner/glass, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"Gm" = ( +/obj/structure/mirror{ + pixel_y = 29 + }, +/obj/structure/sink{ + pixel_y = 18 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"GQ" = ( +/obj/structure/toilet{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"Hm" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"Hx" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/window/northleft, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"HF" = ( +/obj/machinery/door/blast/regular/open{ + id = "paper_clipper_safety_doors"; + dir = 8 + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"HI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"Id" = ( +/turf/simulated/floor/reinforced, +/area/shuttle/paper_clipper) +"IG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/shuttle/paper_clipper) +"Jg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/closet/crate/hydroponics/prespawned, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/turf/simulated/floor/tiled, +/area/shuttle/paper_clipper) +"JY" = ( +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"Kr" = ( +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/paper_clipper) +"Ky" = ( +/obj/machinery/suit_cycler/vintage/omni, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"KI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/obj/machinery/light/poi{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"KX" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/tank/carbon_dioxide, +/obj/item/tank/carbon_dioxide, +/obj/item/tank/carbon_dioxide, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"Lq" = ( +/obj/structure/table/steel, +/obj/item/storage/toolbox/syndicate, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"Lv" = ( +/obj/structure/bed/chair/bay/comfy{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"Ly" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{ + id_tag = "paperclipper_airlock"; + name = "Airlock Control"; + pixel_x = -26; + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"LJ" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"LM" = ( +/obj/machinery/air_alarm/alarms_hidden{ + dir = 8; + pixel_x = 26 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"LW" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/table/steel, +/obj/machinery/recharger, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"Md" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"Mf" = ( +/obj/machinery/portable_atmospherics/canister/phoron, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"Mn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"Mv" = ( +/obj/machinery/air_alarm/alarms_hidden{ + dir = 1; + pixel_y = -26 + }, +/obj/structure/table/steel, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"MZ" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"Ne" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"NE" = ( +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/light/poi{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/paper_clipper) +"NR" = ( +/obj/machinery/door/window/westleft, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"Od" = ( +/obj/structure/table/marble, +/turf/simulated/floor/tiled, +/area/shuttle/paper_clipper) +"Of" = ( +/obj/structure/fans, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"Ou" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"OD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"OS" = ( +/obj/machinery/atmospheric_field_generator/perma, +/obj/machinery/door/blast/regular{ + id = "paperclipper_hanger_hatch"; + name = "Starbard Hanger Hatch" + }, +/turf/simulated/floor/reinforced, +/area/shuttle/paper_clipper) +"OZ" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"Po" = ( +/obj/structure/table/marble, +/obj/machinery/microwave, +/turf/simulated/floor/tiled, +/area/shuttle/paper_clipper) +"Ql" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"Qn" = ( +/obj/item/storage/toolbox/mechanical, +/obj/structure/table/steel, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"QY" = ( +/obj/machinery/washing_machine, +/turf/simulated/floor/tiled, +/area/shuttle/paper_clipper) +"Rj" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/storage/toolbox/mechanical, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"Rn" = ( +/obj/structure/fuel_port/heavy{ + pixel_x = 28 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/random/crate{ + dir = 1 + }, +/obj/item/tank/phoron, +/obj/item/tank/phoron, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"Rt" = ( +/obj/machinery/air_alarm/alarms_hidden{ + dir = 8; + pixel_x = 26 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"Rz" = ( +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"RC" = ( +/obj/random/crate{ + dir = 1 + }, +/obj/machinery/light/poi{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"RO" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"SW" = ( +/obj/machinery/portable_atmospherics/canister/nitrogen, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"Tc" = ( +/obj/machinery/air_alarm/alarms_hidden{ + dir = 8; + pixel_x = 26 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/paper_clipper) +"To" = ( +/obj/structure/table/standard, +/turf/simulated/floor/tiled, +/area/shuttle/paper_clipper) +"Ts" = ( +/obj/structure/bed/chair/bay/comfy{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"TR" = ( +/obj/machinery/vending/hydroseeds{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/paper_clipper) +"Ub" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"Uh" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"Uk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"Uq" = ( +/obj/machinery/computer/shuttle_control/explore/paper_clipper, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"Uz" = ( +/obj/machinery/sleeper/survival_pod, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"UI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/sink/kitchen{ + pixel_y = 28 + }, +/turf/simulated/floor/tiled, +/area/shuttle/paper_clipper) +"Vk" = ( +/obj/machinery/air_alarm/alarms_hidden{ + dir = 8; + pixel_x = 26 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"VA" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/smes/buildable/offmap_spawn{ + cur_coils = 3 + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"Wx" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/machinery/light/poi, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"WZ" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"Xd" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"Xf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/shuttle/paper_clipper) +"Xg" = ( +/obj/machinery/door/airlock/hatch{ + req_one_access = list() + }, +/obj/map_helper/airlock/door/int_door, +/obj/machinery/airlock_sensor{ + pixel_x = 25; + dir = 8 + }, +/obj/map_helper/airlock/sensor/int_sensor, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"Xw" = ( +/obj/machinery/shower{ + dir = 4 + }, +/obj/item/soap, +/obj/structure/window/reinforced/tinted{ + dir = 4 + }, +/obj/structure/curtain/open/shower, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"XU" = ( +/obj/machinery/computer/ship/sensors, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"Ya" = ( +/obj/machinery/door/airlock/hatch{ + req_one_access = list() + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"Yp" = ( +/obj/machinery/door/blast/regular/open{ + id = "paper_clipper_safety_doors" + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"YI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"YJ" = ( +/obj/machinery/door/airlock/hatch{ + req_one_access = list() + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"YR" = ( +/obj/structure/closet, +/obj/item/clothing/suit/space/void/refurb, +/obj/item/clothing/head/helmet/space/void/refurb, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"Ze" = ( +/obj/machinery/air_alarm/alarms_hidden{ + dir = 4; + pixel_x = -26 + }, +/obj/structure/table/standard, +/turf/simulated/floor/tiled, +/area/shuttle/paper_clipper) +"Zh" = ( +/obj/machinery/holopad/ship/starts_inactive, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "paper_clipper_safety_doors"; + name = "Safety Blast Doors"; + pixel_x = -24 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"Zj" = ( +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"Zl" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/paper_clipper) +"Zu" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"Zz" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/shuttle/paper_clipper) +"ZB" = ( +/obj/machinery/light/poi{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"ZK" = ( +/obj/machinery/door/window/westright, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/paper_clipper) +"ZZ" = ( +/obj/structure/closet/secure_closet/freezer/meat, +/turf/simulated/floor/tiled/freezer, +/area/shuttle/paper_clipper) + +(1,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(2,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +hL +hL +hL +gE +hL +hL +hL +hL +hL +hL +hL +hL +hL +hL +gE +hL +hL +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(3,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +hL +hL +hL +hL +vo +QY +hL +CW +OD +sx +lU +pS +zY +zY +gE +mq +Ql +YI +Kr +Kr +dZ +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(4,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +hL +hL +hL +hL +kW +Ze +To +AN +lt +gE +Zj +Zu +Zj +iz +Zj +CS +DH +gE +mq +id +gE +Kr +Kr +Kr +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(5,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +hL +hL +hL +gE +xN +rT +Jg +Do +jK +jK +fU +Xf +Ya +iI +AY +Eh +Zl +OZ +WZ +pz +fZ +zp +Ne +DG +Kr +Kr +Kr +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(6,1,1) = {" +we +we +we +we +we +we +we +we +we +we +hL +hL +hL +gE +Gm +GQ +gE +UI +ld +ld +ld +ld +ld +gE +gE +gE +qH +qH +Aq +gE +Md +at +VA +gE +mq +Bl +YI +Kr +Kr +dZ +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(7,1,1) = {" +we +we +we +we +we +we +we +hL +hL +hL +hL +hL +gE +Xw +JY +gD +jF +IG +ld +ld +ld +ld +ld +oU +tw +hL +Zj +Zj +Uh +qH +Md +Zj +yd +gE +mq +id +gE +Kr +Kr +Kr +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(8,1,1) = {" +we +we +we +we +hL +hL +hL +hL +hL +hL +hL +hL +gE +bD +Vk +my +gE +pA +NE +TR +oE +Po +Od +ps +ZZ +hL +Lq +jA +su +qH +nw +BP +Rn +gE +mq +KI +DG +Kr +Kr +Kr +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(9,1,1) = {" +we +hL +hL +hL +hL +hL +hL +hL +hL +hL +hL +hL +hL +hL +hL +hL +gE +hL +hL +HF +HF +HF +HF +hL +hL +gE +hL +gE +hL +gE +sq +gE +hL +hL +hL +hL +gE +hL +hL +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(10,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +yF +ib +EZ +yL +aa +JY +JY +bG +hL +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(11,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +gE +hL +qm +LJ +aa +JY +JY +bZ +hL +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(12,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +hL +hL +gE +qm +JY +ei +JY +JY +Ts +hL +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(13,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +gE +gE +gE +hL +gE +ei +JY +gE +hL +hL +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(14,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +Yp +XU +Zh +eF +hL +pv +JY +rf +jD +hL +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(15,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +Yp +bw +Lv +ls +fZ +qk +aj +Hx +ir +hL +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(16,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +Yp +Uq +LM +Wx +hL +yP +JY +rf +wt +hL +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(17,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +gE +gE +gE +hL +gE +ei +JY +gE +hL +hL +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(18,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +hL +hL +gE +Uz +JY +ei +JY +JY +bG +hL +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(19,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +gE +hL +Uz +gD +ky +JY +JY +Mv +hL +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(20,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +uX +hL +Of +dh +ei +JY +JY +Ts +hL +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(21,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +hL +hL +hL +hL +gE +hL +hL +gE +sq +gE +hL +hL +hL +hL +hL +hL +hL +gE +hL +hL +hL +hL +hL +hL +hL +hL +gE +eX +gE +hL +hL +hL +hL +hL +hL +hL +hL +hL +we +"} +(22,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +hL +hL +lq +tn +Id +Rz +hL +Br +ZB +ei +JY +JY +JY +JY +JY +ZB +JY +JY +hL +yX +yX +RC +yX +fX +Rj +lk +DG +wK +fr +Ly +Ub +pS +hL +hL +hL +hL +we +we +we +we +"} +(23,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +OS +sQ +Id +Id +Id +RO +gE +JY +JY +ei +JY +MZ +JY +JY +JY +JY +Xd +JY +gE +Zj +dE +wg +Mn +nd +Em +Uk +Xg +up +sN +ni +hL +hL +hL +we +we +we +we +we +we +we +"} +(24,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +OS +Id +Id +Id +Id +kn +YJ +rC +rC +dv +iI +AY +je +iI +iI +iI +qw +iI +Ya +iI +xE +HI +Ou +Rz +Rz +Rz +gE +hL +hL +hL +hL +we +we +we +we +we +we +we +we +we +"} +(25,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +OS +Id +Id +Id +Id +ij +gE +lh +Hm +ZK +NR +sS +gE +LW +LW +ZK +NR +jZ +gE +Zj +Zz +Zj +Rt +Zj +hL +hL +hL +hL +we +we +we +we +we +we +we +we +we +we +we +we +"} +(26,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +OS +Id +Id +qP +Id +Qn +hL +kZ +JY +JY +JY +JY +gE +JY +JY +JY +JY +JY +hL +DJ +DJ +hL +hL +hL +hL +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(27,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +hL +hL +lq +lq +Tc +Ft +hL +KX +hj +Mf +uv +SW +gE +YR +YR +YR +YR +Ky +gE +hL +hL +hL +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(28,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +hL +hL +hL +hL +gE +hL +hL +hL +hL +hL +hL +hL +hL +hL +hL +hL +hL +hL +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} +(29,1,1) = {" +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +we +"} diff --git a/maps/templates/shuttles/overmaps/ships_and_shuttles/overmap_ship_superjank.dmm b/maps/templates/shuttles/overmaps/generic/overmap_ship_superjank.dmm similarity index 100% rename from maps/templates/shuttles/overmaps/ships_and_shuttles/overmap_ship_superjank.dmm rename to maps/templates/shuttles/overmaps/generic/overmap_ship_superjank.dmm diff --git a/maps/templates/shuttles/overmaps/ships_and_shuttles/overmap_ship_paperclipper.dmm b/maps/templates/shuttles/overmaps/ships_and_shuttles/overmap_ship_paperclipper.dmm deleted file mode 100644 index d6fd846c65a1..000000000000 --- a/maps/templates/shuttles/overmaps/ships_and_shuttles/overmap_ship_paperclipper.dmm +++ /dev/null @@ -1,2229 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"at" = ( -/obj/machinery/power/terminal, -/obj/structure/cable/yellow, -/turf/simulated/floor/plating, -/area/space) -"bw" = ( -/obj/machinery/computer/shuttle_control/explore/gecko_cr, -/turf/simulated/floor/tiled/techfloor, -/area/space) -"cL" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list() - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"dv" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"dZ" = ( -/obj/machinery/atmospherics/component/unary/engine/biggest{ - dir = 1 - }, -/turf/simulated/floor/airless, -/area/space) -"eF" = ( -/obj/machinery/light, -/obj/effect/floor_decal/industrial/warning/corner, -/turf/simulated/floor/tiled/techfloor, -/area/space) -"eX" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list() - }, -/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ - dir = 10; - pixel_x = -8; - pixel_y = 26 - }, -/obj/map_helper/airlock/door/ext_door, -/obj/map_helper/airlock/sensor/ext_sensor, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"fr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"fX" = ( -/obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/plating, -/area/space) -"id" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/fuel, -/turf/simulated/floor/plating, -/area/space) -"ij" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/apc/alarms_hidden/south_bump, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"iI" = ( -/turf/simulated/floor/tiled/techmaint, -/area/space) -"jS" = ( -/turf/simulated/shuttle/wall/dark/hard_corner, -/area/space) -"kZ" = ( -/turf/simulated/floor/tiled/techfloor, -/area/space) -"lq" = ( -/obj/machinery/mech_recharger, -/turf/simulated/floor/reinforced, -/area/space) -"ls" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"lt" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/space) -"mq" = ( -/obj/machinery/atmospherics/portables_connector/fuel, -/obj/machinery/portable_atmospherics/canister/phoron{ - start_pressure = 8000.25 - }, -/turf/simulated/floor/plating, -/area/space) -"ni" = ( -/obj/machinery/atmospherics/component/unary/vent_pump{ - dir = 8 - }, -/obj/map_helper/airlock/atmos/chamber_pump, -/turf/simulated/floor/plating, -/area/space) -"nw" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"qk" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"qH" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/space) -"qP" = ( -/obj/effect/decal/mecha_wreckage/gunpod, -/turf/simulated/floor/reinforced, -/area/space) -"rC" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"sq" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list() - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"su" = ( -/obj/machinery/power/port_gen/pacman/mrs{ - anchored = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/simulated/floor/plating, -/area/space) -"sN" = ( -/obj/machinery/airlock_sensor{ - pixel_x = 25; - dir = 8 - }, -/obj/map_helper/airlock/sensor/chamber_sensor, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"sQ" = ( -/obj/machinery/button/remote/blast_door{ - dir = 4; - id = "paperclipper_hanger_hatch"; - name = "Starbard Hanger Hatch"; - pixel_x = -24 - }, -/turf/simulated/floor/reinforced, -/area/space) -"tn" = ( -/obj/mecha/combat/fighter/gunpod/recon{ - dir = 4 - }, -/obj/machinery/mech_recharger, -/turf/simulated/floor/reinforced, -/area/space) -"uX" = ( -/obj/machinery/shipsensors, -/turf/simulated/floor/reinforced/airless, -/area/space) -"we" = ( -/turf/space/basic, -/area/space) -"wp" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"wK" = ( -/obj/machinery/atmospherics/component/unary/vent_pump, -/obj/map_helper/airlock/atmos/chamber_pump, -/turf/simulated/floor/plating, -/area/space) -"yd" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/space) -"yF" = ( -/turf/simulated/floor/reinforced/airless, -/area/space) -"yX" = ( -/obj/random/crate{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/space) -"Al" = ( -/turf/simulated/shuttle/wall/dark, -/area/space) -"Aq" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/simulated/floor/plating, -/area/space) -"Bl" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel, -/turf/simulated/floor/plating, -/area/space) -"BP" = ( -/obj/machinery/power/apc/alarms_hidden/east_bump, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/simulated/floor/plating, -/area/space) -"DJ" = ( -/turf/simulated/floor/plating, -/area/space) -"Id" = ( -/turf/simulated/floor/reinforced, -/area/space) -"Kr" = ( -/turf/simulated/floor/airless, -/area/space) -"KI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/space) -"Lq" = ( -/obj/structure/table/steel, -/obj/item/tool/wrench, -/obj/item/stack/material/tritium{ - amount = 25 - }, -/turf/simulated/floor/plating, -/area/space) -"Lt" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/space) -"Lv" = ( -/obj/structure/bed/chair/bay/comfy{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"Ly" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/space) -"Ms" = ( -/obj/structure/cable, -/obj/machinery/power/apc/alarms_hidden/west_bump, -/turf/simulated/floor/plating, -/area/space) -"Ne" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/space) -"OS" = ( -/obj/machinery/door/blast/regular{ - id = "paperclipper_hanger_hatch"; - name = "Starbard Hanger Hatch"; - dir = 4 - }, -/obj/machinery/atmospheric_field_generator/perma, -/turf/simulated/floor/plating, -/area/space) -"OZ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"Ql" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/space) -"Rn" = ( -/obj/structure/fuel_port/heavy{ - pixel_x = 28 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/simulated/floor/plating, -/area/space) -"SW" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/space) -"Ub" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/space) -"Uh" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/space) -"Uq" = ( -/obj/machinery/computer/ship/sensors, -/turf/simulated/floor/tiled/techfloor, -/area/space) -"VA" = ( -/obj/machinery/power/smes/buildable, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/simulated/floor/plating, -/area/space) -"Wx" = ( -/obj/machinery/light, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/space) -"Xg" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list() - }, -/obj/map_helper/airlock/door/int_door, -/obj/machinery/airlock_sensor{ - pixel_x = 25; - dir = 8 - }, -/obj/map_helper/airlock/sensor/int_sensor, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"XI" = ( -/obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/atmospherics/portables_connector{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/space) -"XU" = ( -/obj/machinery/computer/ship/helm{ - req_one_access = list() - }, -/turf/simulated/floor/tiled/techfloor, -/area/space) -"Yp" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/apc/alarms_hidden/north_bump, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"YI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/space) -"YJ" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list() - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"Zh" = ( -/obj/machinery/holopad/ship/starts_inactive, -/turf/simulated/floor/tiled/techmaint, -/area/space) - -(1,1,1) = {" -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -"} -(2,1,1) = {" -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -Al -Al -Al -jS -Al -Al -Al -Al -Al -Al -Al -Al -Al -Al -jS -Al -Al -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -"} -(3,1,1) = {" -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -Al -Al -Al -Al -DJ -DJ -Al -DJ -DJ -DJ -DJ -DJ -DJ -DJ -jS -mq -Ql -YI -Kr -Kr -dZ -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -"} -(4,1,1) = {" -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -Al -Al -Al -Al -DJ -DJ -DJ -DJ -DJ -jS -DJ -DJ -DJ -DJ -DJ -DJ -DJ -jS -mq -id -jS -Kr -Kr -Kr -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -"} -(5,1,1) = {" -we -we -we -we -we -we -we -we -we -we -we -we -we -Al -Al -Al -jS -DJ -DJ -DJ -DJ -DJ -iI -iI -iI -cL -iI -iI -iI -iI -iI -iI -iI -cL -DJ -Ne -Lt -Kr -Kr -Kr -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -"} -(6,1,1) = {" -we -we -we -we -we -we -we -we -we -we -Al -Al -Al -Al -DJ -DJ -jS -DJ -DJ -DJ -DJ -DJ -iI -DJ -DJ -jS -DJ -DJ -Aq -SW -OZ -at -VA -jS -mq -Bl -YI -Kr -Kr -dZ -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -"} -(7,1,1) = {" -we -we -we -we -we -we -we -Al -Al -Al -Al -DJ -DJ -DJ -DJ -DJ -cL -iI -iI -iI -iI -iI -iI -DJ -DJ -Al -DJ -DJ -Uh -DJ -iI -DJ -yd -jS -mq -id -jS -Kr -Kr -Kr -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -"} -(8,1,1) = {" -we -we -we -we -Al -Al -Al -Al -DJ -DJ -DJ -DJ -DJ -DJ -DJ -DJ -jS -DJ -DJ -DJ -DJ -DJ -DJ -DJ -DJ -Al -Lq -qH -su -qH -nw -BP -Rn -jS -mq -KI -Lt -Kr -Kr -Kr -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -"} -(9,1,1) = {" -we -Al -Al -Al -Al -Al -Al -Al -Al -Al -Al -Al -Al -Al -Al -Al -jS -Al -Al -Al -Al -Al -Al -Al -Al -jS -Al -Al -Al -jS -sq -jS -Al -Al -Al -Al -jS -Al -Al -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -"} -(10,1,1) = {" -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -yF -Lt -kZ -kZ -qk -kZ -Al -Al -Al -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -"} -(11,1,1) = {" -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -yF -Lt -kZ -kZ -qk -kZ -Al -Al -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -"} -(12,1,1) = {" -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -Al -jS -kZ -kZ -qk -kZ -Al -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -"} -(13,1,1) = {" -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -Al -Al -Al -Al -jS -Yp -kZ -Al -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -"} -(14,1,1) = {" -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -Lt -XU -Zh -eF -Al -qk -kZ -Al -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -"} -(15,1,1) = {" -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -Lt -bw -Lv -ls -cL -qk -kZ -Al -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -"} -(16,1,1) = {" -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -Lt -Uq -iI -Wx -Al -qk -kZ -Al -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -"} -(17,1,1) = {" -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -Al -Al -Al -Al -jS -qk -kZ -Al -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -"} -(18,1,1) = {" -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -Al -jS -kZ -kZ -qk -kZ -Al -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -"} -(19,1,1) = {" -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -yF -Lt -kZ -kZ -qk -kZ -Al -Al -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -"} -(20,1,1) = {" -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -uX -Lt -kZ -kZ -qk -kZ -Al -Al -Al -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -"} -(21,1,1) = {" -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -Al -Al -Al -Al -jS -Al -Al -jS -sq -jS -Al -Al -Al -Al -Al -Al -Al -jS -Al -Al -Al -Al -Al -Al -Al -Al -jS -eX -jS -Al -Al -Al -Al -Al -Al -Al -Al -Al -we -"} -(22,1,1) = {" -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -Al -Al -lq -tn -Id -iI -Al -DJ -lt -wp -Ms -DJ -DJ -DJ -DJ -DJ -DJ -DJ -Al -yX -yX -yX -yX -fX -fX -fX -Lt -wK -fr -Ly -Ub -XI -Al -Al -Al -Al -we -we -we -we -"} -(23,1,1) = {" -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -OS -sQ -Id -Id -Id -iI -jS -DJ -DJ -qk -DJ -DJ -DJ -DJ -DJ -DJ -DJ -DJ -jS -DJ -DJ -DJ -DJ -DJ -DJ -iI -Xg -iI -sN -ni -Al -Al -Al -we -we -we -we -we -we -we -"} -(24,1,1) = {" -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -OS -Id -Id -Id -Id -nw -YJ -rC -rC -dv -iI -iI -iI -iI -iI -iI -iI -iI -cL -iI -iI -iI -iI -iI -iI -iI -jS -Al -Al -Al -Al -we -we -we -we -we -we -we -we -we -"} -(25,1,1) = {" -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -OS -Id -Id -Id -Id -ij -jS -DJ -DJ -DJ -DJ -DJ -DJ -DJ -DJ -DJ -DJ -DJ -jS -DJ -DJ -DJ -DJ -DJ -Al -Al -Al -Al -we -we -we -we -we -we -we -we -we -we -we -we -"} -(26,1,1) = {" -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -OS -Id -Id -qP -Id -iI -Al -DJ -DJ -DJ -DJ -DJ -DJ -DJ -DJ -DJ -DJ -DJ -Al -DJ -DJ -Al -Al -Al -Al -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -"} -(27,1,1) = {" -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -Al -Al -lq -lq -Id -iI -Al -DJ -DJ -DJ -DJ -DJ -DJ -DJ -DJ -DJ -DJ -DJ -jS -Al -Al -Al -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -"} -(28,1,1) = {" -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -Al -Al -Al -Al -jS -Al -Al -Al -Al -Al -Al -Al -Al -Al -Al -Al -Al -Al -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -"} -(29,1,1) = {" -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -we -"} From cccdffe82faad6d4d0006484f8c6213e992728f7 Mon Sep 17 00:00:00 2001 From: KT Date: Sat, 6 Jan 2024 00:24:16 -0500 Subject: [PATCH 23/33] Didnt see this --- .../miaphus_192/levels/miaphus_192_desert.dmm | 862 +++++++++--------- 1 file changed, 411 insertions(+), 451 deletions(-) diff --git a/maps/sectors/miaphus_192/levels/miaphus_192_desert.dmm b/maps/sectors/miaphus_192/levels/miaphus_192_desert.dmm index 47a3c60bf400..569e2f1804ab 100644 --- a/maps/sectors/miaphus_192/levels/miaphus_192_desert.dmm +++ b/maps/sectors/miaphus_192/levels/miaphus_192_desert.dmm @@ -12,7 +12,7 @@ /turf/simulated/floor/water, /area/tether_away/beach/desert/explored) "gz" = ( -/turf/unsimulated/mineral, +/turf/unsimulated/mineral/outdoors, /area/tether_away/beach/desert/explored) "hw" = ( /turf/simulated/floor/water/shoreline/corner, @@ -42,15 +42,6 @@ outdoors = 1 }, /area/tether_away/beach/desert/explored) -"mV" = ( -/obj/effect/map_effect/portal/line/side_a{ - dir = 8 - }, -/turf/simulated/mineral/floor/cave{ - name = "dirt"; - outdoors = 1 - }, -/area/tether_away/beach/desert/explored) "no" = ( /turf/simulated/floor/water/shoreline{ dir = 4 @@ -119,9 +110,6 @@ outdoors = 1 }, /area/tether_away/beach/desert/explored) -"wg" = ( -/turf/unsimulated/wall/planetary/desert/standard_temp, -/area/tether_away/beach/desert/explored) "wH" = ( /obj/item/pickaxe, /turf/simulated/floor/outdoors/beach/sand/lowdesert, @@ -164,17 +152,6 @@ outdoors = 1 }, /area/tether_away/beach/desert/explored) -"zQ" = ( -/obj/effect/map_effect/portal/master/side_a{ - dir = 8; - name = "desert to caves"; - portal_id = "V4_cave_desert_step" - }, -/turf/simulated/mineral/floor/cave{ - name = "dirt"; - outdoors = 1 - }, -/area/tether_away/beach/desert/explored) "BS" = ( /obj/effect/debris/cleanable/blood, /turf/simulated/mineral/floor/classh, @@ -231,10 +208,10 @@ /area/tether_away/beach/desert/unexplored) "Kt" = ( /obj/item/bone/skull/tajaran, -/turf/simulated/floor/plating/outdoors, +/turf/simulated/floor/plating/external, /area/tether_away/beach/desert/explored) "LF" = ( -/turf/simulated/floor/plating/outdoors, +/turf/simulated/floor/plating/external, /area/tether_away/beach/desert/explored) "Mc" = ( /obj/machinery/light/small/flicker{ @@ -252,12 +229,12 @@ /area/tether_away/beach/desert/explored) "Mv" = ( /obj/random/trash, -/turf/simulated/floor/plating/outdoors, +/turf/simulated/floor/plating/external, /area/tether_away/beach/desert/explored) "Nx" = ( /obj/random/humanoidremains, /obj/effect/debris/cleanable/blood, -/turf/simulated/floor/tiled/outdoors, +/turf/simulated/floor/tiled/external, /area/tether_away/beach/desert/explored) "NW" = ( /obj/machinery/light/small, @@ -274,12 +251,12 @@ /turf/simulated/floor/outdoors/beach/sand/lowdesert, /area/tether_away/beach/desert/explored) "OI" = ( -/turf/simulated/floor/tiled/outdoors, +/turf/simulated/floor/tiled/external, /area/tether_away/beach/desert/explored) "OO" = ( /obj/random/humanoidremains, /obj/effect/debris/cleanable/blood, -/turf/simulated/floor/plating/outdoors, +/turf/simulated/floor/plating/external, /area/tether_away/beach/desert/explored) "Rb" = ( /obj/item/ammo_casing/spent{ @@ -300,210 +277,193 @@ /obj/machinery/light/small/flicker{ dir = 4 }, -/turf/simulated/floor/plating/outdoors, -/area/tether_away/beach/desert/explored) -"ST" = ( -/obj/effect/map_effect/portal/master/side_b{ - dir = 1; - name = "V4_desert_to_beach"; - portal_id = "V4_desert_step" - }, -/turf/simulated/floor/outdoors/beach/sand/lowdesert, -/area/tether_away/beach/desert/explored) -"UP" = ( -/obj/effect/map_effect/portal/line/side_b{ - dir = 1 - }, -/turf/simulated/floor/outdoors/beach/sand/lowdesert, -/area/tether_away/beach/desert/explored) -"WT" = ( -/obj/effect/map_effect/portal/line/side_b{ - dir = 1 - }, -/turf/simulated/floor/outdoors/beach/sand/desert, +/turf/simulated/floor/plating/external, /area/tether_away/beach/desert/explored) "XZ" = ( /turf/simulated/mineral/ignore_mapgen/classh, /area/tether_away/beach/desert/explored) +"Zs" = ( +/turf/level_border, +/area/tether_away/beach/desert/explored) (1,1,1) = {" -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg -wg +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz gz gz gz @@ -521,7 +481,7 @@ gz gz "} (2,1,1) = {" -wg +gz kK kK kK @@ -715,7 +675,7 @@ XZ gz "} (3,1,1) = {" -wg +gz kK JW JW @@ -909,7 +869,7 @@ XZ gz "} (4,1,1) = {" -wg +gz kK JW JW @@ -1103,7 +1063,7 @@ XZ gz "} (5,1,1) = {" -wg +gz kK JW JW @@ -1297,7 +1257,7 @@ XZ gz "} (6,1,1) = {" -wg +gz kK JW JW @@ -1491,7 +1451,7 @@ XZ gz "} (7,1,1) = {" -wg +gz kK JW JW @@ -1685,7 +1645,7 @@ XZ gz "} (8,1,1) = {" -wg +gz kK JW JW @@ -1879,7 +1839,7 @@ XZ gz "} (9,1,1) = {" -wg +gz kK JW JW @@ -2073,7 +2033,7 @@ XZ gz "} (10,1,1) = {" -wg +gz kK JW JW @@ -2267,7 +2227,7 @@ XZ gz "} (11,1,1) = {" -wg +gz kK JW JW @@ -2461,7 +2421,7 @@ XZ gz "} (12,1,1) = {" -wg +gz kK JW JW @@ -2655,7 +2615,7 @@ XZ gz "} (13,1,1) = {" -wg +gz kK JW JW @@ -2849,7 +2809,7 @@ XZ gz "} (14,1,1) = {" -wg +gz kK JW JW @@ -3043,7 +3003,7 @@ XZ gz "} (15,1,1) = {" -wg +gz kK JW JW @@ -3237,7 +3197,7 @@ XZ gz "} (16,1,1) = {" -wg +gz kK JW JW @@ -3431,7 +3391,7 @@ XZ gz "} (17,1,1) = {" -wg +gz kK JW JW @@ -3625,7 +3585,7 @@ XZ gz "} (18,1,1) = {" -wg +gz kK JW JW @@ -3819,7 +3779,7 @@ XZ gz "} (19,1,1) = {" -wg +gz kK JW JW @@ -4013,7 +3973,7 @@ XZ gz "} (20,1,1) = {" -wg +gz kK JW JW @@ -4207,7 +4167,7 @@ XZ gz "} (21,1,1) = {" -wg +gz kK JW JW @@ -4401,7 +4361,7 @@ XZ gz "} (22,1,1) = {" -wg +gz kK JW JW @@ -4595,7 +4555,7 @@ XZ gz "} (23,1,1) = {" -wg +gz kK JW JW @@ -4789,7 +4749,7 @@ XZ gz "} (24,1,1) = {" -wg +gz kK JW JW @@ -4983,7 +4943,7 @@ XZ gz "} (25,1,1) = {" -wg +gz kK JW JW @@ -5177,7 +5137,7 @@ XZ gz "} (26,1,1) = {" -wg +gz kK JW JW @@ -5371,7 +5331,7 @@ XZ gz "} (27,1,1) = {" -wg +gz kK JW JW @@ -5565,7 +5525,7 @@ XZ gz "} (28,1,1) = {" -wg +gz kK JW JW @@ -5759,7 +5719,7 @@ XZ gz "} (29,1,1) = {" -wg +gz kK JW JW @@ -5953,7 +5913,7 @@ XZ gz "} (30,1,1) = {" -wg +gz kK JW JW @@ -6147,7 +6107,7 @@ XZ gz "} (31,1,1) = {" -wg +gz kK JW JW @@ -6341,7 +6301,7 @@ XZ gz "} (32,1,1) = {" -wg +gz kK JW JW @@ -6535,7 +6495,7 @@ XZ gz "} (33,1,1) = {" -wg +gz kK JW JW @@ -6729,7 +6689,7 @@ XZ gz "} (34,1,1) = {" -wg +gz kK JW JW @@ -6923,7 +6883,7 @@ XZ gz "} (35,1,1) = {" -wg +gz kK JW JW @@ -7117,7 +7077,7 @@ XZ gz "} (36,1,1) = {" -wg +gz kK JW JW @@ -7311,7 +7271,7 @@ XZ gz "} (37,1,1) = {" -wg +gz kK JW JW @@ -7505,7 +7465,7 @@ XZ gz "} (38,1,1) = {" -wg +gz kK JW JW @@ -7699,7 +7659,7 @@ XZ gz "} (39,1,1) = {" -wg +gz kK JW JW @@ -7893,7 +7853,7 @@ XZ gz "} (40,1,1) = {" -wg +gz kK JW JW @@ -8087,7 +8047,7 @@ XZ gz "} (41,1,1) = {" -wg +gz kK JW JW @@ -8281,7 +8241,7 @@ XZ gz "} (42,1,1) = {" -wg +gz kK JW JW @@ -8475,7 +8435,7 @@ XZ gz "} (43,1,1) = {" -wg +gz kK JW JW @@ -8669,7 +8629,7 @@ XZ gz "} (44,1,1) = {" -wg +gz kK JW JW @@ -8863,7 +8823,7 @@ XZ gz "} (45,1,1) = {" -wg +gz kK JW JW @@ -9057,7 +9017,7 @@ XZ gz "} (46,1,1) = {" -wg +gz kK JW JW @@ -9251,7 +9211,7 @@ XZ gz "} (47,1,1) = {" -wg +gz kK JW JW @@ -9445,7 +9405,7 @@ XZ gz "} (48,1,1) = {" -wg +gz kK JW JW @@ -9639,7 +9599,7 @@ XZ gz "} (49,1,1) = {" -wg +gz kK JW JW @@ -9833,7 +9793,7 @@ XZ gz "} (50,1,1) = {" -wg +gz kK JW JW @@ -10027,7 +9987,7 @@ XZ gz "} (51,1,1) = {" -wg +gz kK JW JW @@ -10221,7 +10181,7 @@ XZ gz "} (52,1,1) = {" -wg +gz kK JW JW @@ -10415,7 +10375,7 @@ XZ gz "} (53,1,1) = {" -wg +gz kK JW JW @@ -10609,7 +10569,7 @@ XZ gz "} (54,1,1) = {" -wg +gz kK JW JW @@ -10803,7 +10763,7 @@ XZ gz "} (55,1,1) = {" -wg +gz kK JW JW @@ -10997,7 +10957,7 @@ XZ gz "} (56,1,1) = {" -wg +gz kK JW JW @@ -11191,7 +11151,7 @@ XZ gz "} (57,1,1) = {" -wg +gz kK JW JW @@ -11385,7 +11345,7 @@ XZ gz "} (58,1,1) = {" -wg +gz kK JW JW @@ -11579,7 +11539,7 @@ XZ gz "} (59,1,1) = {" -wg +gz kK JW JW @@ -11773,7 +11733,7 @@ XZ gz "} (60,1,1) = {" -wg +gz kK JW JW @@ -11967,7 +11927,7 @@ XZ gz "} (61,1,1) = {" -wg +gz kK JW JW @@ -12161,7 +12121,7 @@ XZ gz "} (62,1,1) = {" -wg +gz kK JW JW @@ -12355,7 +12315,7 @@ XZ gz "} (63,1,1) = {" -wg +gz kK JW JW @@ -12549,7 +12509,7 @@ XZ gz "} (64,1,1) = {" -wg +gz kK JW JW @@ -12743,7 +12703,7 @@ XZ gz "} (65,1,1) = {" -wg +gz kK JW JW @@ -12937,7 +12897,7 @@ XZ gz "} (66,1,1) = {" -wg +gz kK JW JW @@ -13131,7 +13091,7 @@ XZ gz "} (67,1,1) = {" -wg +gz kK JW JW @@ -13325,7 +13285,7 @@ XZ gz "} (68,1,1) = {" -wg +gz kK JW JW @@ -13519,7 +13479,7 @@ XZ gz "} (69,1,1) = {" -wg +gz kK JW JW @@ -13713,7 +13673,7 @@ XZ gz "} (70,1,1) = {" -wg +gz kK JW JW @@ -13907,7 +13867,7 @@ XZ gz "} (71,1,1) = {" -wg +gz kK JW JW @@ -14101,7 +14061,7 @@ XZ gz "} (72,1,1) = {" -wg +gz kK JW JW @@ -14295,7 +14255,7 @@ XZ gz "} (73,1,1) = {" -wg +gz kK JW JW @@ -14489,7 +14449,7 @@ XZ gz "} (74,1,1) = {" -wg +gz kK JW JW @@ -14683,7 +14643,7 @@ XZ gz "} (75,1,1) = {" -wg +gz kK JW JW @@ -14877,7 +14837,7 @@ XZ gz "} (76,1,1) = {" -wg +gz kK JW JW @@ -15071,7 +15031,7 @@ XZ gz "} (77,1,1) = {" -wg +gz kK JW JW @@ -15265,7 +15225,7 @@ XZ gz "} (78,1,1) = {" -wg +gz kK JW JW @@ -15459,7 +15419,7 @@ XZ gz "} (79,1,1) = {" -wg +gz kK JW JW @@ -15653,7 +15613,7 @@ XZ gz "} (80,1,1) = {" -wg +gz kK JW JW @@ -15847,7 +15807,7 @@ XZ gz "} (81,1,1) = {" -wg +gz kK JW JW @@ -16041,7 +16001,7 @@ XZ gz "} (82,1,1) = {" -wg +gz kK JW JW @@ -16235,7 +16195,7 @@ XZ gz "} (83,1,1) = {" -wg +gz kK JW JW @@ -16429,7 +16389,7 @@ XZ gz "} (84,1,1) = {" -wg +gz kK JW JW @@ -16623,7 +16583,7 @@ XZ gz "} (85,1,1) = {" -wg +gz kK JW JW @@ -16817,7 +16777,7 @@ XZ gz "} (86,1,1) = {" -wg +gz kK JW JW @@ -17011,7 +16971,7 @@ XZ gz "} (87,1,1) = {" -wg +gz kK JW JW @@ -17205,7 +17165,7 @@ XZ gz "} (88,1,1) = {" -wg +gz kK JW JW @@ -17399,7 +17359,7 @@ XZ gz "} (89,1,1) = {" -wg +gz kK JW JW @@ -17593,7 +17553,7 @@ XZ gz "} (90,1,1) = {" -wg +gz kK JW JW @@ -17787,7 +17747,7 @@ XZ gz "} (91,1,1) = {" -wg +gz kK JW JW @@ -17981,7 +17941,7 @@ XZ gz "} (92,1,1) = {" -wg +gz kK JW JW @@ -18175,7 +18135,7 @@ XZ gz "} (93,1,1) = {" -wg +gz kK JW JW @@ -18369,7 +18329,7 @@ XZ gz "} (94,1,1) = {" -wg +gz kK JW JW @@ -18563,7 +18523,7 @@ XZ gz "} (95,1,1) = {" -wg +gz kK JW JW @@ -18757,7 +18717,7 @@ XZ gz "} (96,1,1) = {" -wg +gz kK JW JW @@ -18951,7 +18911,7 @@ XZ gz "} (97,1,1) = {" -wg +gz kK JW JW @@ -19145,7 +19105,7 @@ XZ gz "} (98,1,1) = {" -wg +gz kK JW JW @@ -19339,7 +19299,7 @@ XZ gz "} (99,1,1) = {" -wg +gz kK JW JW @@ -19533,7 +19493,7 @@ XZ gz "} (100,1,1) = {" -wg +gz kK JW JW @@ -19727,7 +19687,7 @@ XZ gz "} (101,1,1) = {" -wg +gz kK JW JW @@ -19921,7 +19881,7 @@ XZ gz "} (102,1,1) = {" -wg +gz kK JW JW @@ -20115,7 +20075,7 @@ XZ gz "} (103,1,1) = {" -wg +gz kK JW JW @@ -20309,7 +20269,7 @@ XZ gz "} (104,1,1) = {" -wg +gz kK JW JW @@ -20503,7 +20463,7 @@ XZ gz "} (105,1,1) = {" -wg +gz kK JW JW @@ -20697,7 +20657,7 @@ XZ gz "} (106,1,1) = {" -wg +gz kK JW JW @@ -20891,7 +20851,7 @@ XZ gz "} (107,1,1) = {" -wg +gz kK JW JW @@ -21085,7 +21045,7 @@ XZ gz "} (108,1,1) = {" -wg +gz kK JW JW @@ -21279,7 +21239,7 @@ XZ gz "} (109,1,1) = {" -wg +gz kK JW JW @@ -21473,7 +21433,7 @@ XZ gz "} (110,1,1) = {" -wg +gz kK JW JW @@ -21667,7 +21627,7 @@ XZ gz "} (111,1,1) = {" -wg +gz kK JW JW @@ -21861,7 +21821,7 @@ XZ gz "} (112,1,1) = {" -wg +gz kK JW JW @@ -22055,7 +22015,7 @@ XZ gz "} (113,1,1) = {" -wg +gz kK JW JW @@ -22249,7 +22209,7 @@ XZ gz "} (114,1,1) = {" -wg +gz kK JW JW @@ -22443,7 +22403,7 @@ XZ gz "} (115,1,1) = {" -wg +gz kK JW JW @@ -22637,7 +22597,7 @@ XZ gz "} (116,1,1) = {" -wg +gz kK JW JW @@ -22831,7 +22791,7 @@ XZ gz "} (117,1,1) = {" -wg +gz kK JW JW @@ -23025,7 +22985,7 @@ XZ gz "} (118,1,1) = {" -wg +gz kK JW JW @@ -23219,7 +23179,7 @@ XZ gz "} (119,1,1) = {" -wg +gz kK JW JW @@ -23413,7 +23373,7 @@ XZ gz "} (120,1,1) = {" -wg +gz kK JW JW @@ -23607,7 +23567,7 @@ XZ gz "} (121,1,1) = {" -wg +gz kK JW JW @@ -23801,7 +23761,7 @@ XZ gz "} (122,1,1) = {" -wg +gz kK JW JW @@ -23995,7 +23955,7 @@ XZ gz "} (123,1,1) = {" -wg +gz kK JW JW @@ -24189,7 +24149,7 @@ XZ gz "} (124,1,1) = {" -wg +gz kK JW JW @@ -24383,7 +24343,7 @@ XZ gz "} (125,1,1) = {" -wg +gz kK JW JW @@ -24577,7 +24537,7 @@ XZ gz "} (126,1,1) = {" -wg +gz kK JW JW @@ -24771,7 +24731,7 @@ XZ gz "} (127,1,1) = {" -wg +gz kK JW JW @@ -24965,7 +24925,7 @@ XZ gz "} (128,1,1) = {" -wg +gz kK JW JW @@ -25159,7 +25119,7 @@ XZ gz "} (129,1,1) = {" -wg +gz kK JW JW @@ -25353,7 +25313,7 @@ XZ gz "} (130,1,1) = {" -wg +gz kK JW JW @@ -25547,7 +25507,7 @@ XZ gz "} (131,1,1) = {" -wg +gz kK JW JW @@ -25741,7 +25701,7 @@ XZ gz "} (132,1,1) = {" -wg +gz kK JW JW @@ -25935,7 +25895,7 @@ XZ gz "} (133,1,1) = {" -wg +gz kK JW JW @@ -26129,7 +26089,7 @@ XZ gz "} (134,1,1) = {" -wg +gz kK JW JW @@ -26323,7 +26283,7 @@ XZ gz "} (135,1,1) = {" -wg +gz kK JW JW @@ -26517,7 +26477,7 @@ XZ gz "} (136,1,1) = {" -wg +gz kK JW JW @@ -26711,7 +26671,7 @@ XZ gz "} (137,1,1) = {" -wg +gz kK JW JW @@ -26905,7 +26865,7 @@ XZ gz "} (138,1,1) = {" -wg +gz kK JW JW @@ -27099,7 +27059,7 @@ XZ gz "} (139,1,1) = {" -wg +gz kK JW JW @@ -27293,7 +27253,7 @@ XZ gz "} (140,1,1) = {" -wg +gz kK JW JW @@ -27487,7 +27447,7 @@ XZ gz "} (141,1,1) = {" -wg +gz kK JW JW @@ -27681,7 +27641,7 @@ XZ gz "} (142,1,1) = {" -wg +gz kK JW JW @@ -27875,7 +27835,7 @@ XZ gz "} (143,1,1) = {" -wg +gz kK JW JW @@ -28069,7 +28029,7 @@ XZ gz "} (144,1,1) = {" -wg +gz kK JW JW @@ -28263,7 +28223,7 @@ XZ gz "} (145,1,1) = {" -wg +gz kK JW JW @@ -28457,7 +28417,7 @@ XZ gz "} (146,1,1) = {" -wg +gz kK JW JW @@ -28651,7 +28611,7 @@ XZ gz "} (147,1,1) = {" -wg +gz kK JW JW @@ -28845,7 +28805,7 @@ XZ gz "} (148,1,1) = {" -wg +gz kK JW JW @@ -29039,7 +28999,7 @@ XZ gz "} (149,1,1) = {" -wg +gz kK JW JW @@ -29233,7 +29193,7 @@ XZ gz "} (150,1,1) = {" -wg +gz kK JW JW @@ -29427,7 +29387,7 @@ XZ gz "} (151,1,1) = {" -wg +gz kK JW JW @@ -29621,7 +29581,7 @@ XZ gz "} (152,1,1) = {" -wg +gz kK JW JW @@ -29815,7 +29775,7 @@ XZ gz "} (153,1,1) = {" -wg +gz kK JW JW @@ -30009,7 +29969,7 @@ XZ gz "} (154,1,1) = {" -wg +gz kK JW JW @@ -30203,7 +30163,7 @@ XZ gz "} (155,1,1) = {" -wg +gz kK JW JW @@ -30397,7 +30357,7 @@ XZ gz "} (156,1,1) = {" -wg +gz kK JW JW @@ -30591,7 +30551,7 @@ XZ gz "} (157,1,1) = {" -wg +gz kK JW JW @@ -30785,7 +30745,7 @@ XZ gz "} (158,1,1) = {" -wg +gz kK JW JW @@ -30979,7 +30939,7 @@ XZ gz "} (159,1,1) = {" -wg +gz kK JW JW @@ -31173,7 +31133,7 @@ XZ gz "} (160,1,1) = {" -wg +gz kK JW JW @@ -31367,7 +31327,7 @@ XZ gz "} (161,1,1) = {" -wg +gz kK JW JW @@ -31561,7 +31521,7 @@ XZ gz "} (162,1,1) = {" -wg +gz kK JW JW @@ -31755,7 +31715,7 @@ XZ gz "} (163,1,1) = {" -wg +gz kK JW JW @@ -31949,7 +31909,7 @@ XZ gz "} (164,1,1) = {" -wg +gz kK JW JW @@ -32143,7 +32103,7 @@ XZ gz "} (165,1,1) = {" -wg +gz kK JW JW @@ -35437,7 +35397,7 @@ Js kK lf lf -gz +XZ gz "} (182,1,1) = {" @@ -35631,8 +35591,8 @@ CM kK kK kK -ST -wg +XZ +gz "} (183,1,1) = {" gz @@ -35825,8 +35785,8 @@ kK kK kK kK -UP -wg +XZ +gz "} (184,1,1) = {" gz @@ -36019,8 +35979,8 @@ kK kK CM kK -UP -wg +XZ +gz "} (185,1,1) = {" gz @@ -36213,8 +36173,8 @@ kK kK CM CM -UP -wg +XZ +gz "} (186,1,1) = {" gz @@ -36395,8 +36355,8 @@ Dc Dc Dc Dc -XZ -XZ +kK +kK Dc Dc Dc @@ -36407,8 +36367,8 @@ kK kK kK kK -UP -wg +XZ +gz "} (187,1,1) = {" gz @@ -36588,10 +36548,10 @@ XZ XZ XZ XZ -XZ -XZ -XZ -XZ +kK +kK +kK +kK XZ XZ XZ @@ -36601,8 +36561,8 @@ kK kK kK kK -WT -wg +XZ +gz "} (188,1,1) = {" XZ @@ -36781,11 +36741,11 @@ XZ XZ XZ XZ -XZ -XZ -XZ -XZ -XZ +kK +kK +kK +kK +kK XZ XZ XZ @@ -36795,8 +36755,8 @@ XZ kK kK kK -UP -wg +XZ +gz "} (189,1,1) = {" gz @@ -36855,7 +36815,7 @@ gz XZ XZ XZ -lX +XZ lX lX vr @@ -36975,10 +36935,11 @@ XZ XZ XZ XZ -XZ -XZ -XZ -XZ +kK +kK +kK +kK +kK XZ XZ XZ @@ -36990,7 +36951,6 @@ XZ XZ XZ gz -gz "} (190,1,1) = {" gz @@ -37049,11 +37009,12 @@ gz XZ XZ XZ -lX +XZ of lX lX wb +lX XZ XZ XZ @@ -37168,12 +37129,11 @@ XZ XZ XZ XZ -XZ -XZ -XZ -XZ -XZ -XZ +kK +kK +kK +kK +kK XZ XZ XZ @@ -37243,18 +37203,13 @@ gz XZ XZ gz -mV -mV -mV -mV -zQ -gz -XZ -XZ -XZ -XZ XZ XZ +lX +lX +lX +lX +lX XZ XZ XZ @@ -37368,6 +37323,11 @@ XZ XZ XZ XZ +kK +kK +kK +kK +kK XZ XZ XZ @@ -37439,6 +37399,11 @@ gz gz gz gz +Zs +Zs +Zs +Zs +Zs gz gz gz @@ -37552,16 +37517,11 @@ gz gz gz gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +Zs +Zs +Zs +Zs +Zs gz gz gz From 91019a16f7d089b8a88b83551c237afbaaf30501 Mon Sep 17 00:00:00 2001 From: KT Date: Sat, 6 Jan 2024 00:27:07 -0500 Subject: [PATCH 24/33] Update miaphus_192_desert.dmm --- .../miaphus_192/levels/miaphus_192_desert.dmm | 147 +++++++++--------- 1 file changed, 70 insertions(+), 77 deletions(-) diff --git a/maps/sectors/miaphus_192/levels/miaphus_192_desert.dmm b/maps/sectors/miaphus_192/levels/miaphus_192_desert.dmm index 569e2f1804ab..1aefafb2e9d9 100644 --- a/maps/sectors/miaphus_192/levels/miaphus_192_desert.dmm +++ b/maps/sectors/miaphus_192/levels/miaphus_192_desert.dmm @@ -3,6 +3,16 @@ /obj/random/outcrop, /turf/simulated/floor/outdoors/beach/sand/lowdesert, /area/tether_away/beach/desert/explored) +"dd" = ( +/obj/machinery/light/small/flicker{ + dir = 4 + }, +/turf/simulated/floor/outdoors/beach/sand/desert, +/area/tether_away/beach/desert/explored) +"ej" = ( +/obj/random/trash, +/turf/simulated/floor/outdoors/beach/sand/desert, +/area/tether_away/beach/desert/explored) "eI" = ( /turf/simulated/floor/water/shoreline{ dir = 8 @@ -208,10 +218,7 @@ /area/tether_away/beach/desert/unexplored) "Kt" = ( /obj/item/bone/skull/tajaran, -/turf/simulated/floor/plating/external, -/area/tether_away/beach/desert/explored) -"LF" = ( -/turf/simulated/floor/plating/external, +/turf/simulated/floor/outdoors/beach/sand/lowdesert, /area/tether_away/beach/desert/explored) "Mc" = ( /obj/machinery/light/small/flicker{ @@ -229,12 +236,12 @@ /area/tether_away/beach/desert/explored) "Mv" = ( /obj/random/trash, -/turf/simulated/floor/plating/external, +/turf/simulated/mineral/ignore_mapgen, /area/tether_away/beach/desert/explored) "Nx" = ( /obj/random/humanoidremains, /obj/effect/debris/cleanable/blood, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/outdoors/beach/sand/lowdesert, /area/tether_away/beach/desert/explored) "NW" = ( /obj/machinery/light/small, @@ -248,15 +255,7 @@ pixel_x = 5; pixel_y = 7 }, -/turf/simulated/floor/outdoors/beach/sand/lowdesert, -/area/tether_away/beach/desert/explored) -"OI" = ( -/turf/simulated/floor/tiled/external, -/area/tether_away/beach/desert/explored) -"OO" = ( -/obj/random/humanoidremains, -/obj/effect/debris/cleanable/blood, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/outdoors/beach/sand/desert, /area/tether_away/beach/desert/explored) "Rb" = ( /obj/item/ammo_casing/spent{ @@ -273,12 +272,6 @@ /obj/structure/sign/graffiti/pisoff, /turf/simulated/wall/sandstone/classh, /area/tether_away/beach/desert/explored) -"SE" = ( -/obj/machinery/light/small/flicker{ - dir = 4 - }, -/turf/simulated/floor/plating/external, -/area/tether_away/beach/desert/explored) "XZ" = ( /turf/simulated/mineral/ignore_mapgen/classh, /area/tether_away/beach/desert/explored) @@ -35389,12 +35382,12 @@ XZ XZ Dc kK -kK +CM CM CM kK Js -kK +lf lf lf XZ @@ -35587,10 +35580,10 @@ Ov Rb Rm CM -CM -kK -kK kK +lf +lf +lf XZ gz "} @@ -35777,14 +35770,14 @@ kK kK Kt kK -LF -kK -kK -kK +CM kK kK kK kK +lf +lf +lf XZ gz "} @@ -35969,16 +35962,16 @@ Ev Dc kK kK -LF -Mv -OI -LF -kK +CM +ej +CM kK kK kK -CM kK +lf +lf +lf XZ gz "} @@ -36163,16 +36156,16 @@ II Dc kK kK -Mc +dd Nx -OO Nx -SE +Nx +Mc Mv -kK -kK -CM -CM +lf +lf +lf +lf XZ gz "} @@ -36347,7 +36340,7 @@ XZ XZ XZ XZ -XZ +kK kK Dc Dc @@ -36357,16 +36350,16 @@ Dc Dc kK kK +CM +kK Dc Dc Dc -Dc -Dc -kK -kK -kK -kK -kK +lf +lf +lf +lf +lf XZ gz "} @@ -36541,26 +36534,26 @@ XZ XZ XZ XZ -XZ -XZ -XZ -XZ -XZ -XZ -XZ kK kK kK kK -XZ -XZ -XZ -XZ -XZ kK kK kK kK +CM +CM +kK +kK +XZ +XZ +XZ +lf +lf +lf +lf +lf XZ gz "} @@ -36736,25 +36729,25 @@ XZ XZ XZ XZ -XZ -XZ -XZ -XZ -XZ kK kK kK kK kK +kK +kK +CM +kK +kK XZ XZ XZ XZ XZ -XZ -kK -kK -kK +lf +lf +lf +lf XZ gz "} @@ -36931,15 +36924,15 @@ XZ XZ XZ XZ -XZ -XZ -XZ -XZ kK kK kK kK kK +kK +CM +kK +kK XZ XZ XZ @@ -37128,10 +37121,10 @@ XZ XZ XZ XZ -XZ kK kK kK +CM kK kK XZ From 2fe9dfe11bd0eadf22af8f061c6fdb7cb68dbe09 Mon Sep 17 00:00:00 2001 From: KT Date: Sat, 6 Jan 2024 00:32:01 -0500 Subject: [PATCH 25/33] Accidentally left a floating light --- maps/sectors/miaphus_192/levels/miaphus_192_desert.dmm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/maps/sectors/miaphus_192/levels/miaphus_192_desert.dmm b/maps/sectors/miaphus_192/levels/miaphus_192_desert.dmm index 1aefafb2e9d9..73b5e230f3a9 100644 --- a/maps/sectors/miaphus_192/levels/miaphus_192_desert.dmm +++ b/maps/sectors/miaphus_192/levels/miaphus_192_desert.dmm @@ -3,12 +3,6 @@ /obj/random/outcrop, /turf/simulated/floor/outdoors/beach/sand/lowdesert, /area/tether_away/beach/desert/explored) -"dd" = ( -/obj/machinery/light/small/flicker{ - dir = 4 - }, -/turf/simulated/floor/outdoors/beach/sand/desert, -/area/tether_away/beach/desert/explored) "ej" = ( /obj/random/trash, /turf/simulated/floor/outdoors/beach/sand/desert, @@ -36156,7 +36150,7 @@ II Dc kK kK -dd +CM Nx Nx Nx From 3304a4f31063dff6e0882b5fac074d16ba175e33 Mon Sep 17 00:00:00 2001 From: KT Date: Sun, 4 Aug 2024 13:44:32 -0400 Subject: [PATCH 26/33] Wolololo fixy wixy --- maps/sectors/admin_planets_192/croatoan.dmm | 24 ++-- .../miaphus_192/levels/miaphus_192_desert.dmm | 4 +- maps/submaps/generic/test_template_001.dmm | 2 +- .../shuttles/overmaps/generic/mercship.dmm | 130 ++---------------- 4 files changed, 23 insertions(+), 137 deletions(-) diff --git a/maps/sectors/admin_planets_192/croatoan.dmm b/maps/sectors/admin_planets_192/croatoan.dmm index e8e1e426aaa6..fe255d5722e5 100644 --- a/maps/sectors/admin_planets_192/croatoan.dmm +++ b/maps/sectors/admin_planets_192/croatoan.dmm @@ -331,7 +331,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 8 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/plating/outdoors, /area/admin_planet/croatoan/civilian/dorms) "ba" = ( /obj/effect/floor_decal/corner_oldtile/red/diagonal, @@ -1811,7 +1811,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/plating/outdoors, /area/admin_planet/croatoan/civilian/dorms) "fB" = ( /obj/effect/floormimic/plating/guaranteed, @@ -2622,7 +2622,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/plating/outdoors, /area/admin_planet/croatoan/civilian/dorms) "iJ" = ( /obj/machinery/light{ @@ -5057,7 +5057,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/plating/outdoors, /area/admin_planet/croatoan/civilian/dorms) "rJ" = ( /turf/simulated/wall/r_wall/prepainted/security, @@ -8528,7 +8528,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/plating/outdoors, /area/admin_planet/croatoan/civilian/dorms) "Ez" = ( /obj/machinery/light{ @@ -8949,7 +8949,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 8 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/plating/outdoors, /area/admin_planet/croatoan/civilian/dorms) "FJ" = ( /obj/machinery/porta_turret{ @@ -9470,7 +9470,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/plating/outdoors, /area/admin_planet/croatoan/civilian/dorms) "HO" = ( /obj/structure/cable{ @@ -10291,7 +10291,7 @@ /obj/effect/floor_decal/industrial/halfstair{ dir = 1 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/plating/outdoors, /area/admin_planet/croatoan/civilian/dorms) "KB" = ( /obj/effect/floor_decal/corner/red/border{ @@ -10306,7 +10306,7 @@ /obj/machinery/holoposter{ pixel_y = -32 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/plating/outdoors, /area/admin_planet/croatoan/civilian/dorms) "KD" = ( /obj/effect/floor_decal/corner/lightorange/border{ @@ -13342,7 +13342,7 @@ /turf/simulated/wall/dungeon, /area/admin_planet/croatoan/mountain) "Us" = ( -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/plating/outdoors, /area/admin_planet/croatoan/civilian/dorms) "Uu" = ( /obj/structure/table/reinforced, @@ -13810,7 +13810,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/plating/outdoors, /area/admin_planet/croatoan/civilian/dorms) "VW" = ( /obj/structure/table/rack/shelf/steel, @@ -14056,7 +14056,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/plating/outdoors, /area/admin_planet/croatoan/civilian/dorms) "WS" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ diff --git a/maps/sectors/miaphus_192/levels/miaphus_192_desert.dmm b/maps/sectors/miaphus_192/levels/miaphus_192_desert.dmm index b73e657b392c..a8e14444d80e 100644 --- a/maps/sectors/miaphus_192/levels/miaphus_192_desert.dmm +++ b/maps/sectors/miaphus_192/levels/miaphus_192_desert.dmm @@ -320,7 +320,7 @@ /obj/structure/fence{ dir = 4 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/plating/outdoors, /area/tether_away/beach/desert/explored) "NU" = ( /obj/structure/table/rack/steel, @@ -339,7 +339,7 @@ /turf/simulated/floor/outdoors/beach/sand/desert, /area/tether_away/beach/desert/explored) "OI" = ( -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/plating/outdoors, /area/tether_away/beach/desert/explored) "QY" = ( /obj/random/trash, diff --git a/maps/submaps/generic/test_template_001.dmm b/maps/submaps/generic/test_template_001.dmm index 3e287e1cc591..807681ff63d6 100644 --- a/maps/submaps/generic/test_template_001.dmm +++ b/maps/submaps/generic/test_template_001.dmm @@ -150,7 +150,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/plating/indoors, /area/submap/generic/inside_breath_mix) "W" = ( diff --git a/maps/templates/shuttles/overmaps/generic/mercship.dmm b/maps/templates/shuttles/overmaps/generic/mercship.dmm index 257f369e4f2a..8a7baa5bf378 100644 --- a/maps/templates/shuttles/overmaps/generic/mercship.dmm +++ b/maps/templates/shuttles/overmaps/generic/mercship.dmm @@ -3436,13 +3436,6 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -3459,13 +3452,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 }, @@ -3499,13 +3485,6 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8 }, @@ -3541,17 +3520,8 @@ /area/ship/mercenary/air) "sM" = ( /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/fire_alarm/alarms_hidden/south_mount{ - pixel_y = -26 - }, +/obj/machinery/fire_alarm/alarms_hidden/south_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/hangar) "tv" = ( @@ -3565,13 +3535,6 @@ /obj/machinery/button/remote/blast_door{ id = "mercblast" }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/structure/table/reinforced, /obj/machinery/light{ dir = 4 @@ -3646,13 +3609,6 @@ dir = 8 }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -3663,9 +3619,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/fire_alarm/alarms_hidden/south_mount{ - pixel_y = -26 - }, +/obj/machinery/fire_alarm/alarms_hidden/south_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/hall1) "Gh" = ( @@ -3673,20 +3627,11 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/fire_alarm/alarms_hidden/south_mount{ - pixel_y = -26 - }, +/obj/machinery/fire_alarm/alarms_hidden/south_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/med) "Go" = ( @@ -3721,33 +3666,17 @@ dir = 4 }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/fire_alarm/alarms_hidden/south_mount{ - pixel_y = -26 - }, +/obj/machinery/fire_alarm/alarms_hidden/south_mount, /turf/simulated/floor/tiled/white, /area/ship/mercenary/fighter) "Kj" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -3791,15 +3720,8 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 9 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, /obj/fiftyspawner/uranium, /obj/fiftyspawner/uranium, -/obj{ - name = "---Merge conflict marker---" - }, /obj/structure/closet/crate, /obj/machinery/light{ dir = 8 @@ -3844,20 +3766,11 @@ dir = 9 }, /obj/machinery/meter, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /obj/machinery/meter, -/obj/machinery/fire_alarm/alarms_hidden/south_mount{ - pixel_y = -26 - }, +/obj/machinery/fire_alarm/alarms_hidden/south_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/atmos) "PR" = ( @@ -3882,13 +3795,6 @@ dir = 5 }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -3896,9 +3802,7 @@ dir = 5 }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/fire_alarm/alarms_hidden/south_mount{ - pixel_y = -26 - }, +/obj/machinery/fire_alarm/alarms_hidden/south_mount, /turf/simulated/floor/tiled/white, /area/ship/mercenary/armoury) "Uh" = ( @@ -3911,13 +3815,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 }, @@ -3927,9 +3824,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/fire_alarm/alarms_hidden/south_mount{ - pixel_y = -26 - }, +/obj/machinery/fire_alarm/alarms_hidden/south_mount, /turf/simulated/floor/plating, /area/ship/mercenary/engine) "UJ" = ( @@ -3954,17 +3849,8 @@ /area/ship/mercenary/hall1) "Vf" = ( /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/fire_alarm/alarms_hidden/south_mount{ - pixel_y = -26 - }, +/obj/machinery/fire_alarm/alarms_hidden/south_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/med1) "VC" = ( From f8ed9234e3e3f92dfcedcf99ad89b2550b1b81d3 Mon Sep 17 00:00:00 2001 From: KT Date: Sun, 4 Aug 2024 13:49:22 -0400 Subject: [PATCH 27/33] Revert "Wolololo fixy wixy" This reverts commit 3304a4f31063dff6e0882b5fac074d16ba175e33. --- maps/sectors/admin_planets_192/croatoan.dmm | 24 ++-- .../miaphus_192/levels/miaphus_192_desert.dmm | 4 +- maps/submaps/generic/test_template_001.dmm | 2 +- .../shuttles/overmaps/generic/mercship.dmm | 130 ++++++++++++++++-- 4 files changed, 137 insertions(+), 23 deletions(-) diff --git a/maps/sectors/admin_planets_192/croatoan.dmm b/maps/sectors/admin_planets_192/croatoan.dmm index fe255d5722e5..e8e1e426aaa6 100644 --- a/maps/sectors/admin_planets_192/croatoan.dmm +++ b/maps/sectors/admin_planets_192/croatoan.dmm @@ -331,7 +331,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 8 }, -/turf/simulated/floor/plating/outdoors, +/turf/simulated/floor/tiled/external, /area/admin_planet/croatoan/civilian/dorms) "ba" = ( /obj/effect/floor_decal/corner_oldtile/red/diagonal, @@ -1811,7 +1811,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/turf/simulated/floor/plating/outdoors, +/turf/simulated/floor/tiled/external, /area/admin_planet/croatoan/civilian/dorms) "fB" = ( /obj/effect/floormimic/plating/guaranteed, @@ -2622,7 +2622,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plating/outdoors, +/turf/simulated/floor/tiled/external, /area/admin_planet/croatoan/civilian/dorms) "iJ" = ( /obj/machinery/light{ @@ -5057,7 +5057,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plating/outdoors, +/turf/simulated/floor/tiled/external, /area/admin_planet/croatoan/civilian/dorms) "rJ" = ( /turf/simulated/wall/r_wall/prepainted/security, @@ -8528,7 +8528,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/turf/simulated/floor/plating/outdoors, +/turf/simulated/floor/tiled/external, /area/admin_planet/croatoan/civilian/dorms) "Ez" = ( /obj/machinery/light{ @@ -8949,7 +8949,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 8 }, -/turf/simulated/floor/plating/outdoors, +/turf/simulated/floor/tiled/external, /area/admin_planet/croatoan/civilian/dorms) "FJ" = ( /obj/machinery/porta_turret{ @@ -9470,7 +9470,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/turf/simulated/floor/plating/outdoors, +/turf/simulated/floor/tiled/external, /area/admin_planet/croatoan/civilian/dorms) "HO" = ( /obj/structure/cable{ @@ -10291,7 +10291,7 @@ /obj/effect/floor_decal/industrial/halfstair{ dir = 1 }, -/turf/simulated/floor/plating/outdoors, +/turf/simulated/floor/tiled/external, /area/admin_planet/croatoan/civilian/dorms) "KB" = ( /obj/effect/floor_decal/corner/red/border{ @@ -10306,7 +10306,7 @@ /obj/machinery/holoposter{ pixel_y = -32 }, -/turf/simulated/floor/plating/outdoors, +/turf/simulated/floor/tiled/external, /area/admin_planet/croatoan/civilian/dorms) "KD" = ( /obj/effect/floor_decal/corner/lightorange/border{ @@ -13342,7 +13342,7 @@ /turf/simulated/wall/dungeon, /area/admin_planet/croatoan/mountain) "Us" = ( -/turf/simulated/floor/plating/outdoors, +/turf/simulated/floor/tiled/external, /area/admin_planet/croatoan/civilian/dorms) "Uu" = ( /obj/structure/table/reinforced, @@ -13810,7 +13810,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/turf/simulated/floor/plating/outdoors, +/turf/simulated/floor/tiled/external, /area/admin_planet/croatoan/civilian/dorms) "VW" = ( /obj/structure/table/rack/shelf/steel, @@ -14056,7 +14056,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/turf/simulated/floor/plating/outdoors, +/turf/simulated/floor/tiled/external, /area/admin_planet/croatoan/civilian/dorms) "WS" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ diff --git a/maps/sectors/miaphus_192/levels/miaphus_192_desert.dmm b/maps/sectors/miaphus_192/levels/miaphus_192_desert.dmm index a8e14444d80e..b73e657b392c 100644 --- a/maps/sectors/miaphus_192/levels/miaphus_192_desert.dmm +++ b/maps/sectors/miaphus_192/levels/miaphus_192_desert.dmm @@ -320,7 +320,7 @@ /obj/structure/fence{ dir = 4 }, -/turf/simulated/floor/plating/outdoors, +/turf/simulated/floor/tiled/external, /area/tether_away/beach/desert/explored) "NU" = ( /obj/structure/table/rack/steel, @@ -339,7 +339,7 @@ /turf/simulated/floor/outdoors/beach/sand/desert, /area/tether_away/beach/desert/explored) "OI" = ( -/turf/simulated/floor/plating/outdoors, +/turf/simulated/floor/tiled/external, /area/tether_away/beach/desert/explored) "QY" = ( /obj/random/trash, diff --git a/maps/submaps/generic/test_template_001.dmm b/maps/submaps/generic/test_template_001.dmm index 807681ff63d6..3e287e1cc591 100644 --- a/maps/submaps/generic/test_template_001.dmm +++ b/maps/submaps/generic/test_template_001.dmm @@ -150,7 +150,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/north_mount, +/obj/machinery/power/apc/alarms_hidden/north_bump, /turf/simulated/floor/plating/indoors, /area/submap/generic/inside_breath_mix) "W" = ( diff --git a/maps/templates/shuttles/overmaps/generic/mercship.dmm b/maps/templates/shuttles/overmaps/generic/mercship.dmm index 8a7baa5bf378..257f369e4f2a 100644 --- a/maps/templates/shuttles/overmaps/generic/mercship.dmm +++ b/maps/templates/shuttles/overmaps/generic/mercship.dmm @@ -3436,6 +3436,13 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, +/obj/machinery/firealarm{ + layer = 3.3; + pixel_y = 26 + }, +/obj{ + name = "---Merge conflict marker---" + }, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -3452,6 +3459,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/machinery/firealarm{ + layer = 3.3; + pixel_y = 26 + }, +/obj{ + name = "---Merge conflict marker---" + }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 }, @@ -3485,6 +3499,13 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, +/obj/machinery/firealarm{ + layer = 3.3; + pixel_y = 26 + }, +/obj{ + name = "---Merge conflict marker---" + }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8 }, @@ -3520,8 +3541,17 @@ /area/ship/mercenary/air) "sM" = ( /obj/effect/floor_decal/borderfloorblack, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj{ + name = "---Merge conflict marker---" + }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/fire_alarm/alarms_hidden/south_mount, +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ + pixel_y = -26 + }, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/hangar) "tv" = ( @@ -3535,6 +3565,13 @@ /obj/machinery/button/remote/blast_door{ id = "mercblast" }, +/obj/machinery/firealarm{ + layer = 3.3; + pixel_y = 26 + }, +/obj{ + name = "---Merge conflict marker---" + }, /obj/structure/table/reinforced, /obj/machinery/light{ dir = 4 @@ -3609,6 +3646,13 @@ dir = 8 }, /obj/effect/floor_decal/borderfloorblack, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj{ + name = "---Merge conflict marker---" + }, /obj/structure/cable{ icon_state = "4-8" }, @@ -3619,7 +3663,9 @@ dir = 8 }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/fire_alarm/alarms_hidden/south_mount, +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ + pixel_y = -26 + }, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/hall1) "Gh" = ( @@ -3627,11 +3673,20 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloorblack, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj{ + name = "---Merge conflict marker---" + }, /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/fire_alarm/alarms_hidden/south_mount, +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ + pixel_y = -26 + }, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/med) "Go" = ( @@ -3666,17 +3721,33 @@ dir = 4 }, /obj/effect/floor_decal/borderfloorblack, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj{ + name = "---Merge conflict marker---" + }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/fire_alarm/alarms_hidden/south_mount, +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ + pixel_y = -26 + }, /turf/simulated/floor/tiled/white, /area/ship/mercenary/fighter) "Kj" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, +/obj/machinery/firealarm{ + layer = 3.3; + pixel_y = 26 + }, +/obj{ + name = "---Merge conflict marker---" + }, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -3720,8 +3791,15 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 9 }, +/obj/machinery/firealarm{ + layer = 3.3; + pixel_y = 26 + }, /obj/fiftyspawner/uranium, /obj/fiftyspawner/uranium, +/obj{ + name = "---Merge conflict marker---" + }, /obj/structure/closet/crate, /obj/machinery/light{ dir = 8 @@ -3766,11 +3844,20 @@ dir = 9 }, /obj/machinery/meter, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj{ + name = "---Merge conflict marker---" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /obj/machinery/meter, -/obj/machinery/fire_alarm/alarms_hidden/south_mount, +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ + pixel_y = -26 + }, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/atmos) "PR" = ( @@ -3795,6 +3882,13 @@ dir = 5 }, /obj/effect/floor_decal/borderfloorblack, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj{ + name = "---Merge conflict marker---" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -3802,7 +3896,9 @@ dir = 5 }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/fire_alarm/alarms_hidden/south_mount, +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ + pixel_y = -26 + }, /turf/simulated/floor/tiled/white, /area/ship/mercenary/armoury) "Uh" = ( @@ -3815,6 +3911,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj{ + name = "---Merge conflict marker---" + }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 }, @@ -3824,7 +3927,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/fire_alarm/alarms_hidden/south_mount, +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ + pixel_y = -26 + }, /turf/simulated/floor/plating, /area/ship/mercenary/engine) "UJ" = ( @@ -3849,8 +3954,17 @@ /area/ship/mercenary/hall1) "Vf" = ( /obj/effect/floor_decal/borderfloorblack, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj{ + name = "---Merge conflict marker---" + }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/fire_alarm/alarms_hidden/south_mount, +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ + pixel_y = -26 + }, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/med1) "VC" = ( From 922c710d8dadfded2c61ad41cfc418acd39209f5 Mon Sep 17 00:00:00 2001 From: KT Date: Sun, 4 Aug 2024 13:58:00 -0400 Subject: [PATCH 28/33] Oop, accidentally regedited into plating not tiles --- maps/sectors/admin_planets_192/croatoan.dmm | 24 ++-- .../miaphus_192/levels/miaphus_192_desert.dmm | 6 +- maps/submaps/generic/test_template_001.dmm | 2 +- .../level_specific/class_h/landing_padH.dmm | 3 - .../shuttles/overmaps/generic/mercship.dmm | 130 ++---------------- 5 files changed, 24 insertions(+), 141 deletions(-) diff --git a/maps/sectors/admin_planets_192/croatoan.dmm b/maps/sectors/admin_planets_192/croatoan.dmm index e8e1e426aaa6..69de5c3fcc47 100644 --- a/maps/sectors/admin_planets_192/croatoan.dmm +++ b/maps/sectors/admin_planets_192/croatoan.dmm @@ -331,7 +331,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 8 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/admin_planet/croatoan/civilian/dorms) "ba" = ( /obj/effect/floor_decal/corner_oldtile/red/diagonal, @@ -1811,7 +1811,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/admin_planet/croatoan/civilian/dorms) "fB" = ( /obj/effect/floormimic/plating/guaranteed, @@ -2622,7 +2622,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/admin_planet/croatoan/civilian/dorms) "iJ" = ( /obj/machinery/light{ @@ -5057,7 +5057,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/admin_planet/croatoan/civilian/dorms) "rJ" = ( /turf/simulated/wall/r_wall/prepainted/security, @@ -8528,7 +8528,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/admin_planet/croatoan/civilian/dorms) "Ez" = ( /obj/machinery/light{ @@ -8949,7 +8949,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 8 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/admin_planet/croatoan/civilian/dorms) "FJ" = ( /obj/machinery/porta_turret{ @@ -9470,7 +9470,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/admin_planet/croatoan/civilian/dorms) "HO" = ( /obj/structure/cable{ @@ -10291,7 +10291,7 @@ /obj/effect/floor_decal/industrial/halfstair{ dir = 1 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/admin_planet/croatoan/civilian/dorms) "KB" = ( /obj/effect/floor_decal/corner/red/border{ @@ -10306,7 +10306,7 @@ /obj/machinery/holoposter{ pixel_y = -32 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/admin_planet/croatoan/civilian/dorms) "KD" = ( /obj/effect/floor_decal/corner/lightorange/border{ @@ -13342,7 +13342,7 @@ /turf/simulated/wall/dungeon, /area/admin_planet/croatoan/mountain) "Us" = ( -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/admin_planet/croatoan/civilian/dorms) "Uu" = ( /obj/structure/table/reinforced, @@ -13810,7 +13810,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/admin_planet/croatoan/civilian/dorms) "VW" = ( /obj/structure/table/rack/shelf/steel, @@ -14056,7 +14056,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/admin_planet/croatoan/civilian/dorms) "WS" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ diff --git a/maps/sectors/miaphus_192/levels/miaphus_192_desert.dmm b/maps/sectors/miaphus_192/levels/miaphus_192_desert.dmm index b73e657b392c..e30e9277106b 100644 --- a/maps/sectors/miaphus_192/levels/miaphus_192_desert.dmm +++ b/maps/sectors/miaphus_192/levels/miaphus_192_desert.dmm @@ -308,7 +308,7 @@ /turf/simulated/floor/outdoors/beach/sand/lowdesert, /area/tether_away/beach/desert/explored) "LF" = ( -/turf/simulated/floor/plating/external, +/turf/simulated/floor/plating/outdoors, /area/tether_away/beach/desert/explored) "Mc" = ( /obj/machinery/light/small/flicker{ @@ -320,7 +320,7 @@ /obj/structure/fence{ dir = 4 }, -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/tether_away/beach/desert/explored) "NU" = ( /obj/structure/table/rack/steel, @@ -339,7 +339,7 @@ /turf/simulated/floor/outdoors/beach/sand/desert, /area/tether_away/beach/desert/explored) "OI" = ( -/turf/simulated/floor/tiled/external, +/turf/simulated/floor/tiled/outdoors, /area/tether_away/beach/desert/explored) "QY" = ( /obj/random/trash, diff --git a/maps/submaps/generic/test_template_001.dmm b/maps/submaps/generic/test_template_001.dmm index 3e287e1cc591..6ddbb36823a3 100644 --- a/maps/submaps/generic/test_template_001.dmm +++ b/maps/submaps/generic/test_template_001.dmm @@ -150,7 +150,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/plating/indoors, /area/submap/generic/inside_breath_mix) "W" = ( diff --git a/maps/submaps/level_specific/class_h/landing_padH.dmm b/maps/submaps/level_specific/class_h/landing_padH.dmm index 9162a54ea7e6..f15aca6be726 100644 --- a/maps/submaps/level_specific/class_h/landing_padH.dmm +++ b/maps/submaps/level_specific/class_h/landing_padH.dmm @@ -162,9 +162,6 @@ /obj/item/storage/box/donkpockets, /obj/item/storage/box/donkpockets, /obj/item/storage/box/donkpockets, -/obj/item/reagent_containers/food/snacks/liquidfood, -/obj/item/reagent_containers/food/snacks/liquidfood, -/obj/item/reagent_containers/food/snacks/liquidfood, /turf/simulated/floor/tiled, /area/class_h/POIs/landing_pad) "aI" = ( diff --git a/maps/templates/shuttles/overmaps/generic/mercship.dmm b/maps/templates/shuttles/overmaps/generic/mercship.dmm index 257f369e4f2a..8a7baa5bf378 100644 --- a/maps/templates/shuttles/overmaps/generic/mercship.dmm +++ b/maps/templates/shuttles/overmaps/generic/mercship.dmm @@ -3436,13 +3436,6 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -3459,13 +3452,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 }, @@ -3499,13 +3485,6 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8 }, @@ -3541,17 +3520,8 @@ /area/ship/mercenary/air) "sM" = ( /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/fire_alarm/alarms_hidden/south_mount{ - pixel_y = -26 - }, +/obj/machinery/fire_alarm/alarms_hidden/south_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/hangar) "tv" = ( @@ -3565,13 +3535,6 @@ /obj/machinery/button/remote/blast_door{ id = "mercblast" }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/structure/table/reinforced, /obj/machinery/light{ dir = 4 @@ -3646,13 +3609,6 @@ dir = 8 }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -3663,9 +3619,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/fire_alarm/alarms_hidden/south_mount{ - pixel_y = -26 - }, +/obj/machinery/fire_alarm/alarms_hidden/south_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/hall1) "Gh" = ( @@ -3673,20 +3627,11 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/fire_alarm/alarms_hidden/south_mount{ - pixel_y = -26 - }, +/obj/machinery/fire_alarm/alarms_hidden/south_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/med) "Go" = ( @@ -3721,33 +3666,17 @@ dir = 4 }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/fire_alarm/alarms_hidden/south_mount{ - pixel_y = -26 - }, +/obj/machinery/fire_alarm/alarms_hidden/south_mount, /turf/simulated/floor/tiled/white, /area/ship/mercenary/fighter) "Kj" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -3791,15 +3720,8 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 9 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, /obj/fiftyspawner/uranium, /obj/fiftyspawner/uranium, -/obj{ - name = "---Merge conflict marker---" - }, /obj/structure/closet/crate, /obj/machinery/light{ dir = 8 @@ -3844,20 +3766,11 @@ dir = 9 }, /obj/machinery/meter, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /obj/machinery/meter, -/obj/machinery/fire_alarm/alarms_hidden/south_mount{ - pixel_y = -26 - }, +/obj/machinery/fire_alarm/alarms_hidden/south_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/atmos) "PR" = ( @@ -3882,13 +3795,6 @@ dir = 5 }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -3896,9 +3802,7 @@ dir = 5 }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/fire_alarm/alarms_hidden/south_mount{ - pixel_y = -26 - }, +/obj/machinery/fire_alarm/alarms_hidden/south_mount, /turf/simulated/floor/tiled/white, /area/ship/mercenary/armoury) "Uh" = ( @@ -3911,13 +3815,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 }, @@ -3927,9 +3824,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/fire_alarm/alarms_hidden/south_mount{ - pixel_y = -26 - }, +/obj/machinery/fire_alarm/alarms_hidden/south_mount, /turf/simulated/floor/plating, /area/ship/mercenary/engine) "UJ" = ( @@ -3954,17 +3849,8 @@ /area/ship/mercenary/hall1) "Vf" = ( /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/fire_alarm/alarms_hidden/south_mount{ - pixel_y = -26 - }, +/obj/machinery/fire_alarm/alarms_hidden/south_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/med1) "VC" = ( From 693424a5e2c48e15537739db9189ecec0d8cf58a Mon Sep 17 00:00:00 2001 From: KT Date: Sun, 4 Aug 2024 14:41:17 -0400 Subject: [PATCH 29/33] Oh yeah typeppath for mechs changed --- .../overmaps/generic/overmap_ship_paperclipper.dmm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/maps/templates/shuttles/overmaps/generic/overmap_ship_paperclipper.dmm b/maps/templates/shuttles/overmaps/generic/overmap_ship_paperclipper.dmm index 4aaca625dda7..faa824a293f2 100644 --- a/maps/templates/shuttles/overmaps/generic/overmap_ship_paperclipper.dmm +++ b/maps/templates/shuttles/overmaps/generic/overmap_ship_paperclipper.dmm @@ -160,7 +160,6 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/light/poi, /turf/simulated/floor/tiled/techmaint, /area/shuttle/paper_clipper) "ir" = ( @@ -498,13 +497,6 @@ /obj/structure/dispenser/oxygen, /turf/simulated/floor/tiled/techfloor, /area/shuttle/paper_clipper) -"tn" = ( -/obj/mecha/combat/fighter/gunpod/recon{ - dir = 4 - }, -/obj/machinery/mech_recharger, -/turf/simulated/floor/reinforced, -/area/shuttle/paper_clipper) "tw" = ( /obj/structure/closet/secure_closet/freezer, /turf/simulated/floor/tiled/freezer, @@ -644,13 +636,13 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/paper_clipper) "BP" = ( -/obj/machinery/power/apc/alarms_hidden/east_bump, /obj/structure/cable{ icon_state = "1-2" }, /obj/structure/cable{ icon_state = "0-2" }, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/plating, /area/shuttle/paper_clipper) "CS" = ( @@ -1007,6 +999,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, +/obj/machinery/light/poi, /turf/simulated/floor/tiled/techmaint, /area/shuttle/paper_clipper) "SW" = ( @@ -2589,7 +2582,7 @@ we hL hL lq -tn +lq Id Rz hL From d0df313c4ed21de7de81651523dbca2c7fc98535 Mon Sep 17 00:00:00 2001 From: KT Date: Sun, 4 Aug 2024 15:17:44 -0400 Subject: [PATCH 30/33] A fix and finishing making templates for holodecks --- .../standard_station/basketballcourt10x10.dmm | 270 +++++++++++++++++ .../10x10/standard_station/beach10x10.dmm | 154 ++++++++++ .../10x10/standard_station/blank10x10.dmm | 125 ++++++++ .../standard_station/boxingcourt10x10.dmm | 240 +++++++++++++++ .../10x10/standard_station/chess10x10.dmm | 235 +++++++++++++++ .../10x10/standard_station/courtroom10x10.dmm | 76 ++--- .../10x10/standard_station/desert10x10.dmm | 6 +- .../standard_station/emptycourt10x10.dmm | 213 +++++++++++++ .../standard_station/meetingroom10x10.dmm | 282 ++++++++++++++++++ .../10x10/standard_station/picnic10x10.dmm | 44 +-- .../standard_station/rhoombacheckers10x10.dmm | 193 ++++++++++++ .../10x10/standard_station/snowy10x10.dmm | 145 +++++++++ .../standard_station/space_dangerous10x10.dmm | 131 ++++++++ .../10x10/standard_station/theatre10x10.dmm | 38 +-- .../thunderdomecourt10x10.dmm | 275 +++++++++++++++++ .../wildlifesimulation10x10.dmm | 131 ++++++++ maps/templates/holodeck/6x3/basic6x3.dmm | 55 ++++ maps/templates/holodeck/6x3/beach6x3.dmm | 59 ++++ maps/templates/holodeck/6x3/boxing6x3.dmm | 60 ++++ maps/templates/holodeck/6x3/desert6x3.dmm | 43 +++ maps/templates/holodeck/6x3/garden6x3.dmm | 47 +++ maps/templates/holodeck/6x3/seating6x3.dmm | 115 +++++++ maps/templates/holodeck/6x3/snow6x3.dmm | 63 ++++ maps/templates/holodeck/6x3/sourceoff6x3.dmm | 35 +++ maps/templates/holodeck/6x3/space6x3.dmm | 35 +++ .../generic/overmap_ship_superjank.dmm | 6 +- 26 files changed, 2991 insertions(+), 85 deletions(-) create mode 100644 maps/templates/holodeck/10x10/standard_station/basketballcourt10x10.dmm create mode 100644 maps/templates/holodeck/10x10/standard_station/beach10x10.dmm create mode 100644 maps/templates/holodeck/10x10/standard_station/blank10x10.dmm create mode 100644 maps/templates/holodeck/10x10/standard_station/boxingcourt10x10.dmm create mode 100644 maps/templates/holodeck/10x10/standard_station/chess10x10.dmm create mode 100644 maps/templates/holodeck/10x10/standard_station/emptycourt10x10.dmm create mode 100644 maps/templates/holodeck/10x10/standard_station/meetingroom10x10.dmm create mode 100644 maps/templates/holodeck/10x10/standard_station/rhoombacheckers10x10.dmm create mode 100644 maps/templates/holodeck/10x10/standard_station/snowy10x10.dmm create mode 100644 maps/templates/holodeck/10x10/standard_station/space_dangerous10x10.dmm create mode 100644 maps/templates/holodeck/10x10/standard_station/thunderdomecourt10x10.dmm create mode 100644 maps/templates/holodeck/10x10/standard_station/wildlifesimulation10x10.dmm create mode 100644 maps/templates/holodeck/6x3/basic6x3.dmm create mode 100644 maps/templates/holodeck/6x3/beach6x3.dmm create mode 100644 maps/templates/holodeck/6x3/boxing6x3.dmm create mode 100644 maps/templates/holodeck/6x3/desert6x3.dmm create mode 100644 maps/templates/holodeck/6x3/garden6x3.dmm create mode 100644 maps/templates/holodeck/6x3/seating6x3.dmm create mode 100644 maps/templates/holodeck/6x3/snow6x3.dmm create mode 100644 maps/templates/holodeck/6x3/sourceoff6x3.dmm create mode 100644 maps/templates/holodeck/6x3/space6x3.dmm diff --git a/maps/templates/holodeck/10x10/standard_station/basketballcourt10x10.dmm b/maps/templates/holodeck/10x10/standard_station/basketballcourt10x10.dmm new file mode 100644 index 000000000000..8c1bcc8729a6 --- /dev/null +++ b/maps/templates/holodeck/10x10/standard_station/basketballcourt10x10.dmm @@ -0,0 +1,270 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"b" = ( +/obj/effect/floor_decal/corner/green{ + dir = 5 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"g" = ( +/obj/effect/floor_decal/corner/green/full{ + dir = 1 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"k" = ( +/obj/effect/floor_decal/corner/red/full, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"q" = ( +/obj/machinery/door/window/holowindoor{ + base_state = "right"; + dir = 4; + icon_state = "right"; + name = "Green Team" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_basketball) +"r" = ( +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"s" = ( +/obj/structure/holostool, +/obj/structure/window/reinforced/holowindow{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"t" = ( +/obj/effect/floor_decal/corner/red/full{ + dir = 1 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"v" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"w" = ( +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"y" = ( +/obj/structure/holostool, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"A" = ( +/obj/effect/floor_decal/corner/red{ + dir = 10 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"C" = ( +/obj/item/beach_ball/holoball, +/obj/effect/floor_decal/corner/red{ + dir = 10 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"F" = ( +/obj/effect/floor_decal/corner/red/full{ + dir = 8 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"G" = ( +/obj/effect/floor_decal/corner/green/full, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"I" = ( +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"K" = ( +/obj/structure/holohoop, +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"L" = ( +/obj/effect/floor_decal/corner/green/full{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"M" = ( +/obj/machinery/door/window/holowindoor{ + dir = 4; + name = "Red Team" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_basketball) +"P" = ( +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"S" = ( +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"U" = ( +/obj/structure/holohoop{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"V" = ( +/obj/effect/floor_decal/corner/green/full{ + dir = 8 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"Y" = ( +/obj/effect/floor_decal/corner/red/full{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"Z" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_basketball) + +(1,1,1) = {" +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +"} +(2,1,1) = {" +y +y +Z +y +y +y +y +Z +y +y +"} +(3,1,1) = {" +s +s +M +s +s +s +s +q +s +s +"} +(4,1,1) = {" +F +v +v +v +k +V +P +P +P +G +"} +(5,1,1) = {" +w +a +a +a +A +b +a +a +a +S +"} +(6,1,1) = {" +F +v +w +a +A +b +a +S +P +G +"} +(7,1,1) = {" +K +a +w +a +C +b +a +S +a +U +"} +(8,1,1) = {" +t +I +w +a +A +b +a +S +r +L +"} +(9,1,1) = {" +w +a +a +a +A +b +a +a +a +S +"} +(10,1,1) = {" +t +I +I +I +Y +g +r +r +r +L +"} diff --git a/maps/templates/holodeck/10x10/standard_station/beach10x10.dmm b/maps/templates/holodeck/10x10/standard_station/beach10x10.dmm new file mode 100644 index 000000000000..75202409b903 --- /dev/null +++ b/maps/templates/holodeck/10x10/standard_station/beach10x10.dmm @@ -0,0 +1,154 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/floor/holofloor/beach/sand, +/area/holodeck/source_beach) +"b" = ( +/turf/simulated/floor/holofloor/beach/water, +/area/holodeck/source_beach) +"h" = ( +/turf/unsimulated/beach/sand{ + icon_state = "beach" + }, +/area/holodeck/source_beach) +"m" = ( +/obj/item/clothing/glasses/sunglasses, +/turf/simulated/floor/holofloor/beach/sand, +/area/holodeck/source_beach) +"p" = ( +/obj/item/inflatable_duck, +/turf/simulated/floor/holofloor/beach/sand, +/area/holodeck/source_beach) +"v" = ( +/obj/effect/overlay/palmtree_l, +/obj/effect/overlay/coconut, +/turf/simulated/floor/holofloor/beach/sand, +/area/holodeck/source_beach) +"z" = ( +/obj/item/beach_ball, +/turf/simulated/floor/holofloor/beach/sand, +/area/holodeck/source_beach) +"Y" = ( +/obj/effect/overlay/palmtree_r, +/turf/simulated/floor/holofloor/beach/sand, +/area/holodeck/source_beach) + +(1,1,1) = {" +a +a +a +a +a +a +a +h +b +b +"} +(2,1,1) = {" +a +a +a +a +a +a +a +h +b +b +"} +(3,1,1) = {" +a +Y +a +a +a +a +a +h +b +b +"} +(4,1,1) = {" +a +a +a +a +a +a +a +h +b +b +"} +(5,1,1) = {" +a +a +a +z +a +a +a +h +b +b +"} +(6,1,1) = {" +a +a +a +a +a +a +a +h +b +b +"} +(7,1,1) = {" +a +a +m +a +a +a +a +h +b +b +"} +(8,1,1) = {" +a +a +v +a +p +a +a +h +b +b +"} +(9,1,1) = {" +a +a +a +a +a +a +a +h +b +b +"} +(10,1,1) = {" +a +a +a +a +a +a +a +h +b +b +"} diff --git a/maps/templates/holodeck/10x10/standard_station/blank10x10.dmm b/maps/templates/holodeck/10x10/standard_station/blank10x10.dmm new file mode 100644 index 000000000000..060017be7f7b --- /dev/null +++ b/maps/templates/holodeck/10x10/standard_station/blank10x10.dmm @@ -0,0 +1,125 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/floor/holofloor/reinforced, +/area/holodeck/source_plating) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} +(4,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} +(5,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} +(6,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} +(7,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} +(8,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} +(9,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} +(10,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/templates/holodeck/10x10/standard_station/boxingcourt10x10.dmm b/maps/templates/holodeck/10x10/standard_station/boxingcourt10x10.dmm new file mode 100644 index 000000000000..92386c1f35f4 --- /dev/null +++ b/maps/templates/holodeck/10x10/standard_station/boxingcourt10x10.dmm @@ -0,0 +1,240 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/window/reinforced/holowindow{ + dir = 8 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_boxingcourt) +"d" = ( +/obj/structure/table/holotable, +/obj/item/clothing/gloves/boxing/hologlove, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_boxingcourt) +"e" = ( +/obj/effect/floor_decal/corner/red/full{ + dir = 8 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_boxingcourt) +"h" = ( +/obj/structure/table/holotable, +/obj/item/clothing/gloves/boxing/hologlove{ + icon_state = "boxinggreen"; + item_state = "boxinggreen" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_boxingcourt) +"j" = ( +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_boxingcourt) +"m" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_boxingcourt) +"p" = ( +/obj/effect/floor_decal/corner/blue/full, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_boxingcourt) +"q" = ( +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_boxingcourt) +"r" = ( +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_boxingcourt) +"s" = ( +/obj/effect/floor_decal/corner/blue/full{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_boxingcourt) +"t" = ( +/obj/structure/holostool, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_boxingcourt) +"u" = ( +/obj/structure/window/reinforced/holowindow{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_boxingcourt) +"x" = ( +/obj/machinery/door/window/holowindoor{ + dir = 1; + name = "Green Corner" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_boxingcourt) +"y" = ( +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_boxingcourt) +"A" = ( +/obj/structure/window/reinforced/holowindow, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_boxingcourt) +"B" = ( +/obj/effect/floor_decal/corner/blue/full{ + dir = 8 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_boxingcourt) +"G" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_boxingcourt) +"H" = ( +/obj/machinery/door/window/holowindoor{ + base_state = "right"; + icon_state = "right"; + name = "Red Corner" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_boxingcourt) +"S" = ( +/obj/effect/floor_decal/corner/green/full{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_boxingcourt) +"T" = ( +/obj/effect/floor_decal/corner/blue/full{ + dir = 1 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_boxingcourt) +"V" = ( +/obj/structure/window/reinforced/holowindow{ + dir = 1 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_boxingcourt) + +(1,1,1) = {" +d +G +G +G +G +G +G +G +G +G +"} +(2,1,1) = {" +d +G +G +t +t +t +t +G +G +G +"} +(3,1,1) = {" +G +G +G +u +u +u +u +G +G +G +"} +(4,1,1) = {" +G +G +H +e +m +m +q +V +t +G +"} +(5,1,1) = {" +G +t +A +j +B +p +y +V +t +G +"} +(6,1,1) = {" +G +t +A +j +T +s +y +V +t +G +"} +(7,1,1) = {" +G +t +A +q +r +r +S +x +G +G +"} +(8,1,1) = {" +G +G +G +a +a +a +a +G +G +G +"} +(9,1,1) = {" +G +G +G +t +t +t +t +G +G +h +"} +(10,1,1) = {" +G +G +G +G +G +G +G +G +G +h +"} diff --git a/maps/templates/holodeck/10x10/standard_station/chess10x10.dmm b/maps/templates/holodeck/10x10/standard_station/chess10x10.dmm new file mode 100644 index 000000000000..0cfb62ec8a44 --- /dev/null +++ b/maps/templates/holodeck/10x10/standard_station/chess10x10.dmm @@ -0,0 +1,235 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/floor/tiled/white, +/area/holodeck/source_chess) +"b" = ( +/obj/item/chess/wrook, +/turf/simulated/floor/tiled/white, +/area/holodeck/source_chess) +"g" = ( +/obj/item/chess/bpawn, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_chess) +"j" = ( +/obj/item/chess/wpawn, +/turf/simulated/floor/tiled/white, +/area/holodeck/source_chess) +"k" = ( +/obj/effect/floor_decal/sign/a, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_chess) +"m" = ( +/obj/item/chess/bknight, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_chess) +"n" = ( +/obj/item/chess/wrook, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_chess) +"o" = ( +/obj/item/chess/bbishop, +/turf/simulated/floor/tiled/white, +/area/holodeck/source_chess) +"p" = ( +/obj/item/chess/wking, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_chess) +"t" = ( +/obj/effect/floor_decal/sign/dock/three, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_chess) +"v" = ( +/obj/item/chess/brook, +/turf/simulated/floor/tiled/white, +/area/holodeck/source_chess) +"y" = ( +/obj/item/chess/wpawn, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_chess) +"z" = ( +/obj/item/chess/wqueen, +/turf/simulated/floor/tiled/white, +/area/holodeck/source_chess) +"A" = ( +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_chess) +"B" = ( +/obj/effect/floor_decal/sign/b, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_chess) +"E" = ( +/obj/item/chess/bpawn, +/turf/simulated/floor/tiled/white, +/area/holodeck/source_chess) +"G" = ( +/obj/item/chess/brook, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_chess) +"H" = ( +/obj/effect/floor_decal/sign/dock/two, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_chess) +"I" = ( +/obj/item/chess/bqueen, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_chess) +"K" = ( +/obj/item/chess/wknight, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_chess) +"M" = ( +/obj/item/chess/bknight, +/turf/simulated/floor/tiled/white, +/area/holodeck/source_chess) +"N" = ( +/obj/item/chess/bbishop, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_chess) +"P" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_chess) +"R" = ( +/obj/item/chess/wbishop, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_chess) +"S" = ( +/obj/item/chess/wbishop, +/turf/simulated/floor/tiled/white, +/area/holodeck/source_chess) +"T" = ( +/obj/effect/floor_decal/sign/dock/one, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_chess) +"V" = ( +/obj/effect/floor_decal/sign/c, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_chess) +"W" = ( +/obj/item/chess/bking, +/turf/simulated/floor/tiled/white, +/area/holodeck/source_chess) +"Z" = ( +/obj/item/chess/wknight, +/turf/simulated/floor/tiled/white, +/area/holodeck/source_chess) + +(1,1,1) = {" +A +A +A +A +A +A +t +H +T +A +"} +(2,1,1) = {" +A +G +E +P +a +P +a +y +b +k +"} +(3,1,1) = {" +A +M +g +a +P +a +P +j +K +B +"} +(4,1,1) = {" +A +N +E +P +a +P +a +y +S +V +"} +(5,1,1) = {" +A +W +g +a +P +a +P +j +p +A +"} +(6,1,1) = {" +A +I +E +P +a +P +a +y +z +A +"} +(7,1,1) = {" +A +o +g +a +P +a +P +j +R +A +"} +(8,1,1) = {" +A +m +E +P +a +P +a +y +Z +A +"} +(9,1,1) = {" +A +v +g +a +P +a +P +j +n +A +"} +(10,1,1) = {" +A +A +A +A +A +A +A +A +A +A +"} diff --git a/maps/templates/holodeck/10x10/standard_station/courtroom10x10.dmm b/maps/templates/holodeck/10x10/standard_station/courtroom10x10.dmm index f47390b516fd..05321fe14fb0 100644 --- a/maps/templates/holodeck/10x10/standard_station/courtroom10x10.dmm +++ b/maps/templates/holodeck/10x10/standard_station/courtroom10x10.dmm @@ -7,13 +7,13 @@ dir = 8 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_courtroom) "b" = ( /obj/effect/floor_decal/carpet{ dir = 8 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_courtroom) "c" = ( /obj/structure/bed/chair/holochair{ dir = 8 @@ -25,7 +25,7 @@ dir = 9 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_courtroom) "e" = ( /obj/structure/window/reinforced/holowindow{ dir = 4 @@ -34,7 +34,7 @@ icon_state = "plant-10" }, /turf/simulated/floor/holofloor/tiled, -/area/template_noop) +/area/holodeck/source_courtroom) "f" = ( /obj/structure/window/reinforced/holowindow, /obj/machinery/door/window/holowindoor{ @@ -43,21 +43,21 @@ }, /obj/structure/bed/chair/holochair, /turf/simulated/floor/holofloor/wood, -/area/template_noop) +/area/holodeck/source_courtroom) "g" = ( /obj/structure/bed/chair/holochair, /turf/simulated/floor/holofloor/wood, -/area/template_noop) +/area/holodeck/source_courtroom) "h" = ( /obj/effect/floor_decal/carpet{ dir = 1 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_courtroom) "i" = ( /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_courtroom) "j" = ( /obj/structure/bed/chair/holochair{ dir = 1 @@ -66,7 +66,7 @@ dir = 4 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_courtroom) "m" = ( /obj/structure/bed/chair/holochair{ dir = 1 @@ -79,13 +79,13 @@ dir = 6 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_courtroom) "n" = ( /obj/effect/floor_decal/carpet{ dir = 4 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_courtroom) "q" = ( /obj/structure/table/woodentable/holotable, /obj/structure/window/reinforced/holowindow, @@ -93,17 +93,17 @@ dir = 8 }, /turf/simulated/floor/holofloor/wood, -/area/template_noop) +/area/holodeck/source_courtroom) "r" = ( /obj/machinery/door/window/holowindoor{ base_state = "right"; icon_state = "right" }, /turf/simulated/floor/holofloor/tiled, -/area/template_noop) +/area/holodeck/source_courtroom) "s" = ( /turf/simulated/floor/holofloor/tiled, -/area/template_noop) +/area/holodeck/source_courtroom) "t" = ( /obj/structure/window/reinforced/holowindow{ dir = 1 @@ -113,14 +113,14 @@ }, /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/wood, -/area/template_noop) +/area/holodeck/source_courtroom) "u" = ( /obj/structure/table/woodentable/holotable, /obj/effect/floor_decal/carpet{ dir = 8 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_courtroom) "v" = ( /obj/effect/floor_decal/carpet{ dir = 4 @@ -132,14 +132,14 @@ dir = 5 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_courtroom) "w" = ( /obj/structure/bed/chair/holochair{ dir = 1 }, /obj/effect/floor_decal/carpet, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_courtroom) "x" = ( /obj/structure/window/reinforced/holowindow, /obj/machinery/door/window/holowindoor{ @@ -150,14 +150,14 @@ }, /obj/structure/bed/chair/holochair, /turf/simulated/floor/holofloor/wood, -/area/template_noop) +/area/holodeck/source_courtroom) "y" = ( /obj/structure/window/reinforced/holowindow{ dir = 1 }, /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/wood, -/area/template_noop) +/area/holodeck/source_courtroom) "z" = ( /obj/structure/bed/chair/holochair{ dir = 8 @@ -172,7 +172,7 @@ dir = 9 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_courtroom) "A" = ( /obj/structure/table/woodentable/holotable, /obj/structure/window/reinforced/holowindow, @@ -180,7 +180,7 @@ dir = 4 }, /turf/simulated/floor/holofloor/wood, -/area/template_noop) +/area/holodeck/source_courtroom) "B" = ( /obj/machinery/door/window/holowindoor{ dir = 1; @@ -202,7 +202,7 @@ dir = 5 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_courtroom) "C" = ( /obj/structure/bed/chair/holochair{ dir = 1 @@ -211,27 +211,27 @@ dir = 8 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_courtroom) "H" = ( /obj/structure/window/reinforced/holowindow{ dir = 8 }, /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/wood, -/area/template_noop) +/area/holodeck/source_courtroom) "J" = ( /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_courtroom) "K" = ( /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/wood, -/area/template_noop) +/area/holodeck/source_courtroom) "L" = ( /obj/structure/bed/chair/holochair{ dir = 1 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_courtroom) "M" = ( /obj/structure/bed/chair/holochair{ dir = 1 @@ -244,14 +244,14 @@ dir = 10 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_courtroom) "N" = ( /obj/structure/table/woodentable/holotable, /obj/effect/floor_decal/carpet{ dir = 4 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_courtroom) "O" = ( /obj/structure/bed/chair/holochair{ dir = 8 @@ -260,12 +260,12 @@ dir = 4 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_courtroom) "Q" = ( /obj/structure/table/woodentable/holotable, /obj/structure/window/reinforced/holowindow, /turf/simulated/floor/holofloor/wood, -/area/template_noop) +/area/holodeck/source_courtroom) "S" = ( /obj/structure/bed/chair/holochair{ dir = 8 @@ -278,7 +278,7 @@ dir = 6 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_courtroom) "T" = ( /obj/structure/bed/chair/holochair{ dir = 8 @@ -291,20 +291,20 @@ dir = 10 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_courtroom) "U" = ( /obj/structure/window/reinforced/holowindow{ dir = 4 }, /turf/simulated/floor/holofloor/tiled, -/area/template_noop) +/area/holodeck/source_courtroom) "V" = ( /obj/machinery/door/window/holowindoor, /turf/simulated/floor/holofloor/tiled, -/area/template_noop) +/area/holodeck/source_courtroom) "W" = ( /turf/simulated/floor/holofloor/wood, -/area/template_noop) +/area/holodeck/source_courtroom) "Y" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -316,7 +316,7 @@ dir = 9 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_courtroom) (1,1,1) = {" s diff --git a/maps/templates/holodeck/10x10/standard_station/desert10x10.dmm b/maps/templates/holodeck/10x10/standard_station/desert10x10.dmm index 07442a736c66..5a66fc0cff4a 100644 --- a/maps/templates/holodeck/10x10/standard_station/desert10x10.dmm +++ b/maps/templates/holodeck/10x10/standard_station/desert10x10.dmm @@ -1,15 +1,15 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/simulated/floor/holofloor/desert, -/area/template_noop) +/area/holodeck/source_desert) "k" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/holofloor/desert, -/area/template_noop) +/area/holodeck/source_desert) "W" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/holofloor/desert, -/area/template_noop) +/area/holodeck/source_desert) (1,1,1) = {" a diff --git a/maps/templates/holodeck/10x10/standard_station/emptycourt10x10.dmm b/maps/templates/holodeck/10x10/standard_station/emptycourt10x10.dmm new file mode 100644 index 000000000000..862a2caee129 --- /dev/null +++ b/maps/templates/holodeck/10x10/standard_station/emptycourt10x10.dmm @@ -0,0 +1,213 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/holostool, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) +"d" = ( +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) +"e" = ( +/obj/effect/floor_decal/corner/green/full, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) +"g" = ( +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) +"p" = ( +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) +"r" = ( +/obj/structure/holostool, +/obj/structure/window/reinforced/holowindow{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) +"z" = ( +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) +"A" = ( +/obj/machinery/door/window/holowindoor{ + dir = 4; + name = "Red Team" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_emptycourt) +"D" = ( +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) +"E" = ( +/obj/machinery/door/window/holowindoor{ + base_state = "right"; + dir = 4; + icon_state = "right"; + name = "Green Team" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_emptycourt) +"F" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_emptycourt) +"H" = ( +/obj/effect/floor_decal/corner/green/full{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) +"O" = ( +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) +"P" = ( +/obj/effect/floor_decal/corner/red/full{ + dir = 8 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) +"V" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) +"Y" = ( +/obj/effect/floor_decal/corner/red/full{ + dir = 1 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) + +(1,1,1) = {" +F +F +F +F +F +F +F +F +F +F +"} +(2,1,1) = {" +a +a +F +a +a +a +a +F +a +a +"} +(3,1,1) = {" +r +r +A +r +r +r +r +E +r +r +"} +(4,1,1) = {" +P +V +V +V +V +p +p +p +p +e +"} +(5,1,1) = {" +D +z +z +z +z +z +z +z +z +O +"} +(6,1,1) = {" +D +z +z +z +z +z +z +z +z +O +"} +(7,1,1) = {" +D +z +z +z +z +z +z +z +z +O +"} +(8,1,1) = {" +D +z +z +z +z +z +z +z +z +O +"} +(9,1,1) = {" +D +z +z +z +z +z +z +z +z +O +"} +(10,1,1) = {" +Y +g +g +g +g +d +d +d +d +H +"} diff --git a/maps/templates/holodeck/10x10/standard_station/meetingroom10x10.dmm b/maps/templates/holodeck/10x10/standard_station/meetingroom10x10.dmm new file mode 100644 index 000000000000..c5b5949ca4eb --- /dev/null +++ b/maps/templates/holodeck/10x10/standard_station/meetingroom10x10.dmm @@ -0,0 +1,282 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/floor/holofloor/lino, +/area/holodeck/source_meetinghall) +"d" = ( +/obj/structure/holostool, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 5 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_meetinghall) +"h" = ( +/obj/structure/table/woodentable/holotable, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_meetinghall) +"m" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_meetinghall) +"n" = ( +/obj/structure/holostool, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_meetinghall) +"v" = ( +/obj/effect/floor_decal/carpet, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_meetinghall) +"w" = ( +/obj/structure/holostool, +/obj/effect/floor_decal/carpet, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 6 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_meetinghall) +"x" = ( +/obj/structure/holostool, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 9 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_meetinghall) +"z" = ( +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/obj/effect/floor_decal/carpet, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 5 + }, +/obj/effect/floor_decal/carpet{ + dir = 6 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_meetinghall) +"A" = ( +/obj/structure/holostool, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_meetinghall) +"E" = ( +/obj/structure/holostool, +/obj/effect/floor_decal/carpet, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_meetinghall) +"F" = ( +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 9 + }, +/obj/effect/floor_decal/carpet{ + dir = 10 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_meetinghall) +"M" = ( +/obj/structure/holostool, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/turf/simulated/floor/holofloor/carpet{ + dir = 8 + }, +/area/holodeck/source_meetinghall) +"N" = ( +/obj/structure/holostool, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_meetinghall) +"O" = ( +/obj/structure/flora/pottedplant{ + icon_state = "plant-06" + }, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_meetinghall) +"P" = ( +/obj/structure/holostool, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_meetinghall) +"Q" = ( +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_meetinghall) +"U" = ( +/obj/effect/floor_decal/carpet{ + dir = 5 + }, +/obj/effect/floor_decal/carpet{ + dir = 6 + }, +/obj/effect/floor_decal/carpet{ + dir = 9 + }, +/obj/effect/floor_decal/carpet{ + dir = 10 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_meetinghall) +"Y" = ( +/obj/structure/holostool, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet, +/obj/effect/floor_decal/carpet{ + dir = 10 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_meetinghall) + +(1,1,1) = {" +Q +Q +Q +a +U +U +a +a +a +a +"} +(2,1,1) = {" +Q +Q +Q +a +x +P +P +P +Y +a +"} +(3,1,1) = {" +Q +F +h +a +n +N +N +N +E +a +"} +(4,1,1) = {" +Q +v +h +a +n +N +N +N +E +a +"} +(5,1,1) = {" +Q +v +h +a +n +N +N +N +E +a +"} +(6,1,1) = {" +Q +v +h +a +n +N +N +N +E +a +"} +(7,1,1) = {" +Q +z +h +a +n +N +N +N +E +a +"} +(8,1,1) = {" +Q +Q +Q +a +d +A +A +M +w +a +"} +(9,1,1) = {" +Q +Q +Q +a +a +a +a +a +a +a +"} +(10,1,1) = {" +O +Q +Q +m +m +m +m +m +m +m +"} diff --git a/maps/templates/holodeck/10x10/standard_station/picnic10x10.dmm b/maps/templates/holodeck/10x10/standard_station/picnic10x10.dmm index 4ea48362dcbf..5f0e600fa29e 100644 --- a/maps/templates/holodeck/10x10/standard_station/picnic10x10.dmm +++ b/maps/templates/holodeck/10x10/standard_station/picnic10x10.dmm @@ -5,14 +5,14 @@ dir = 1 }, /turf/simulated/floor/holofloor/grass, -/area/template_noop) +/area/holodeck/source_picnicarea) "d" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, /turf/simulated/floor/holofloor/grass, -/area/template_noop) +/area/holodeck/source_picnicarea) "e" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood, @@ -20,7 +20,7 @@ dir = 6 }, /turf/simulated/floor/holofloor/grass, -/area/template_noop) +/area/holodeck/source_picnicarea) "h" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood{ @@ -30,103 +30,103 @@ dir = 5 }, /turf/simulated/floor/holofloor/grass, -/area/template_noop) +/area/holodeck/source_picnicarea) "o" = ( /turf/simulated/floor/holofloor/desert, -/area/template_noop) +/area/holodeck/source_picnicarea) "q" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/holofloor/grass, -/area/template_noop) +/area/holodeck/source_picnicarea) "r" = ( /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/desert, -/area/template_noop) +/area/holodeck/source_picnicarea) "w" = ( /obj/effect/debris/cleanable/dirt, /obj/structure/holostool, /turf/simulated/floor/holofloor/desert, -/area/template_noop) +/area/holodeck/source_picnicarea) "x" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, /turf/simulated/floor/holofloor/grass, -/area/template_noop) +/area/holodeck/source_picnicarea) "y" = ( /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/holofloor/grass, -/area/template_noop) +/area/holodeck/source_picnicarea) "A" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, /turf/simulated/floor/holofloor/grass, -/area/template_noop) +/area/holodeck/source_picnicarea) "B" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 1 }, /turf/simulated/floor/holofloor/grass, -/area/template_noop) +/area/holodeck/source_picnicarea) "D" = ( /obj/effect/debris/cleanable/dirt, /turf/simulated/floor/holofloor/desert, -/area/template_noop) +/area/holodeck/source_picnicarea) "I" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood/corner, /turf/simulated/floor/holofloor/grass, -/area/template_noop) +/area/holodeck/source_picnicarea) "L" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/holofloor/grass, -/area/template_noop) +/area/holodeck/source_picnicarea) "N" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 4 }, /turf/simulated/floor/holofloor/grass, -/area/template_noop) +/area/holodeck/source_picnicarea) "Q" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/holofloor/grass, -/area/template_noop) +/area/holodeck/source_picnicarea) "T" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, /turf/simulated/floor/holofloor/grass, -/area/template_noop) +/area/holodeck/source_picnicarea) "U" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/holofloor/grass, -/area/template_noop) +/area/holodeck/source_picnicarea) "W" = ( /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/holofloor/grass, -/area/template_noop) +/area/holodeck/source_picnicarea) "Y" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 8 }, /turf/simulated/floor/holofloor/grass, -/area/template_noop) +/area/holodeck/source_picnicarea) "Z" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, /turf/simulated/floor/holofloor/grass, -/area/template_noop) +/area/holodeck/source_picnicarea) (1,1,1) = {" Q diff --git a/maps/templates/holodeck/10x10/standard_station/rhoombacheckers10x10.dmm b/maps/templates/holodeck/10x10/standard_station/rhoombacheckers10x10.dmm new file mode 100644 index 000000000000..0050fad06fad --- /dev/null +++ b/maps/templates/holodeck/10x10/standard_station/rhoombacheckers10x10.dmm @@ -0,0 +1,193 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_checker) +"b" = ( +/obj/effect/floor_decal/sign/dock/two, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_checker) +"i" = ( +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_checker) +"m" = ( +/obj/item/checker/black, +/turf/simulated/floor/tiled/white, +/area/holodeck/source_checker) +"n" = ( +/obj/effect/floor_decal/sign/a, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_checker) +"s" = ( +/obj/item/checker/red, +/turf/simulated/floor/tiled/white, +/area/holodeck/source_checker) +"w" = ( +/obj/item/checker/redking, +/obj/item/checker/redking, +/obj/item/checker/redking, +/obj/item/checker/redking, +/obj/item/checker/redking, +/obj/item/checker/redking, +/obj/item/checker/redking, +/obj/item/checker/redking, +/obj/item/checker/redking, +/obj/item/checker/redking, +/obj/item/checker/redking, +/obj/item/checker/redking, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_checker) +"K" = ( +/obj/item/checker/blackking, +/obj/item/checker/blackking, +/obj/item/checker/blackking, +/obj/item/checker/blackking, +/obj/item/checker/blackking, +/obj/item/checker/blackking, +/obj/item/checker/blackking, +/obj/item/checker/blackking, +/obj/item/checker/blackking, +/obj/item/checker/blackking, +/obj/item/checker/blackking, +/obj/item/checker/blackking, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_checker) +"L" = ( +/turf/simulated/floor/tiled/white, +/area/holodeck/source_checker) +"P" = ( +/obj/effect/floor_decal/sign/c, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_checker) +"S" = ( +/obj/effect/floor_decal/sign/dock/three, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_checker) +"V" = ( +/obj/effect/floor_decal/sign/dock/one, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_checker) +"Z" = ( +/obj/effect/floor_decal/sign/b, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_checker) + +(1,1,1) = {" +i +i +i +i +i +i +S +b +V +i +"} +(2,1,1) = {" +i +a +s +a +L +a +m +a +m +n +"} +(3,1,1) = {" +i +s +a +s +a +L +a +m +a +Z +"} +(4,1,1) = {" +i +a +s +a +L +a +m +a +m +P +"} +(5,1,1) = {" +i +s +a +s +a +L +a +m +a +i +"} +(6,1,1) = {" +i +a +s +a +L +a +m +a +m +i +"} +(7,1,1) = {" +i +s +a +s +a +L +a +m +a +i +"} +(8,1,1) = {" +i +a +s +a +L +a +m +a +m +i +"} +(9,1,1) = {" +i +s +a +s +a +L +a +m +a +i +"} +(10,1,1) = {" +w +i +i +i +i +i +i +i +i +K +"} diff --git a/maps/templates/holodeck/10x10/standard_station/snowy10x10.dmm b/maps/templates/holodeck/10x10/standard_station/snowy10x10.dmm new file mode 100644 index 000000000000..149b6d6974d9 --- /dev/null +++ b/maps/templates/holodeck/10x10/standard_station/snowy10x10.dmm @@ -0,0 +1,145 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/floor/holofloor/snow, +/area/holodeck/source_snowfield) +"g" = ( +/obj/structure/flora/grass/brown, +/turf/simulated/floor/holofloor/snow, +/area/holodeck/source_snowfield) +"p" = ( +/obj/structure/flora/tree/pine, +/turf/simulated/floor/holofloor/snow, +/area/holodeck/source_snowfield) +"y" = ( +/obj/structure/flora/tree/dead, +/turf/simulated/floor/holofloor/snow, +/area/holodeck/source_snowfield) +"z" = ( +/obj/structure/flora/grass/green, +/turf/simulated/floor/holofloor/snow, +/area/holodeck/source_snowfield) +"B" = ( +/obj/structure/flora/grass/both, +/turf/simulated/floor/holofloor/snow, +/area/holodeck/source_snowfield) + +(1,1,1) = {" +a +a +a +a +a +a +a +g +a +a +"} +(2,1,1) = {" +a +B +a +a +a +a +a +a +z +a +"} +(3,1,1) = {" +a +a +a +y +a +a +a +a +a +a +"} +(4,1,1) = {" +a +a +a +a +z +a +a +a +y +a +"} +(5,1,1) = {" +a +a +a +p +a +a +B +a +a +g +"} +(6,1,1) = {" +a +a +a +a +a +a +a +g +a +a +"} +(7,1,1) = {" +a +B +a +a +a +a +y +a +z +a +"} +(8,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} +(9,1,1) = {" +a +a +p +a +z +a +a +a +y +a +"} +(10,1,1) = {" +a +a +a +a +a +a +B +a +a +g +"} diff --git a/maps/templates/holodeck/10x10/standard_station/space_dangerous10x10.dmm b/maps/templates/holodeck/10x10/standard_station/space_dangerous10x10.dmm new file mode 100644 index 000000000000..c37aa23b91da --- /dev/null +++ b/maps/templates/holodeck/10x10/standard_station/space_dangerous10x10.dmm @@ -0,0 +1,131 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/floor/holofloor/space, +/area/holodeck/source_space) +"m" = ( +/obj/landmark{ + name = "Holocarp Spawn Random" + }, +/turf/simulated/floor/holofloor/space, +/area/holodeck/source_space) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +m +a +a +a +a +m +a +"} +(3,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} +(4,1,1) = {" +a +m +a +a +a +a +m +a +a +a +"} +(5,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} +(6,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} +(7,1,1) = {" +a +a +a +m +a +a +a +a +m +a +"} +(8,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} +(9,1,1) = {" +a +m +a +a +a +a +m +a +a +a +"} +(10,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/templates/holodeck/10x10/standard_station/theatre10x10.dmm b/maps/templates/holodeck/10x10/standard_station/theatre10x10.dmm index f63d4feb88ba..5acf1d36e369 100644 --- a/maps/templates/holodeck/10x10/standard_station/theatre10x10.dmm +++ b/maps/templates/holodeck/10x10/standard_station/theatre10x10.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/simulated/floor/holofloor/tiled, -/area/template_noop) +/area/holodeck/source_theatre) "g" = ( /obj/effect/floor_decal/carpet{ dir = 5 @@ -16,7 +16,7 @@ dir = 9 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_theatre) "j" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -25,18 +25,18 @@ dir = 4 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_theatre) "l" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 }, /turf/simulated/floor/holofloor/tiled, -/area/template_noop) +/area/holodeck/source_theatre) "n" = ( /obj/landmark/costume, /obj/structure/table/rack, /turf/simulated/floor/holofloor/tiled/dark, -/area/template_noop) +/area/holodeck/source_theatre) "o" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -48,34 +48,34 @@ dir = 9 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_theatre) "q" = ( /obj/structure/holostool, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_theatre) "u" = ( /obj/effect/floor_decal/carpet{ dir = 1 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_theatre) "v" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ dir = 4 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_theatre) "w" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_theatre) "x" = ( /obj/item/clothing/under/dress/dress_saloon, /obj/item/clothing/head/pin/flower, /turf/simulated/floor/holofloor/tiled/dark, -/area/template_noop) +/area/holodeck/source_theatre) "B" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -86,7 +86,7 @@ dir = 6 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_theatre) "F" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -97,7 +97,7 @@ dir = 10 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_theatre) "H" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -113,17 +113,17 @@ dir = 10 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_theatre) "J" = ( /turf/simulated/floor/holofloor/tiled/dark, -/area/template_noop) +/area/holodeck/source_theatre) "N" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ dir = 8 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_theatre) "O" = ( /obj/effect/floor_decal/carpet{ dir = 4 @@ -135,13 +135,13 @@ dir = 5 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_theatre) "X" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-06" }, /turf/simulated/floor/holofloor/tiled, -/area/template_noop) +/area/holodeck/source_theatre) "Y" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -159,7 +159,7 @@ dir = 9 }, /turf/simulated/floor/holofloor/carpet, -/area/template_noop) +/area/holodeck/source_theatre) (1,1,1) = {" x diff --git a/maps/templates/holodeck/10x10/standard_station/thunderdomecourt10x10.dmm b/maps/templates/holodeck/10x10/standard_station/thunderdomecourt10x10.dmm new file mode 100644 index 000000000000..7cf992ca9181 --- /dev/null +++ b/maps/templates/holodeck/10x10/standard_station/thunderdomecourt10x10.dmm @@ -0,0 +1,275 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) +"c" = ( +/obj/structure/window/reinforced/holowindow/disappearing, +/obj/effect/floor_decal/corner/red/full, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) +"d" = ( +/obj/machinery/door/window/holowindoor{ + base_state = "right"; + dir = 4; + icon_state = "right"; + name = "Green Team" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_thunderdomecourt) +"f" = ( +/obj/structure/table/holotable, +/obj/effect/floor_decal/corner/red/full{ + dir = 1 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) +"g" = ( +/obj/structure/table/holotable, +/obj/machinery/readybutton, +/obj/effect/floor_decal/corner/green/full{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) +"h" = ( +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) +"i" = ( +/obj/structure/window/reinforced/holowindow/disappearing{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/full{ + dir = 8 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) +"j" = ( +/obj/structure/table/holotable, +/obj/effect/floor_decal/corner/green/full, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) +"o" = ( +/obj/structure/window/reinforced/holowindow/disappearing, +/obj/effect/floor_decal/corner/red/full{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) +"p" = ( +/obj/structure/window/reinforced/holowindow/disappearing{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green{ + dir = 5 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) +"q" = ( +/obj/structure/table/holotable, +/obj/item/clothing/head/helmet/thunderdome, +/obj/item/clothing/suit/armor/tdome/green, +/obj/item/clothing/under/color/green, +/obj/item/holo/esword/green, +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) +"x" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) +"D" = ( +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) +"F" = ( +/obj/structure/window/reinforced/holowindow/disappearing{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/full{ + dir = 1 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) +"H" = ( +/obj/structure/table/holotable, +/obj/item/clothing/head/helmet/thunderdome, +/obj/item/clothing/suit/armor/tdome/red, +/obj/item/clothing/under/color/red, +/obj/item/holo/esword/red, +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) +"K" = ( +/obj/structure/window/reinforced/holowindow/disappearing, +/obj/effect/floor_decal/corner/red{ + dir = 10 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) +"L" = ( +/obj/structure/holostool, +/obj/structure/window/reinforced/holowindow{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) +"N" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_thunderdomecourt) +"Q" = ( +/obj/structure/holostool, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) +"S" = ( +/obj/structure/table/holotable, +/obj/machinery/readybutton, +/obj/effect/floor_decal/corner/red/full{ + dir = 8 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) +"V" = ( +/obj/machinery/door/window/holowindoor{ + dir = 4; + name = "Red Team" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_thunderdomecourt) +"W" = ( +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) + +(1,1,1) = {" +N +N +N +N +N +N +N +N +N +N +"} +(2,1,1) = {" +Q +Q +N +Q +Q +Q +Q +N +Q +Q +"} +(3,1,1) = {" +L +L +V +L +L +L +L +d +L +L +"} +(4,1,1) = {" +S +x +x +x +c +i +h +h +h +j +"} +(5,1,1) = {" +H +W +W +W +K +p +W +W +W +q +"} +(6,1,1) = {" +H +W +W +W +K +p +W +W +W +q +"} +(7,1,1) = {" +H +W +W +W +K +p +W +W +W +q +"} +(8,1,1) = {" +H +W +W +W +K +p +W +W +W +q +"} +(9,1,1) = {" +H +W +W +W +K +p +W +W +W +q +"} +(10,1,1) = {" +f +D +D +D +o +F +a +a +a +g +"} diff --git a/maps/templates/holodeck/10x10/standard_station/wildlifesimulation10x10.dmm b/maps/templates/holodeck/10x10/standard_station/wildlifesimulation10x10.dmm new file mode 100644 index 000000000000..b8ccb7714351 --- /dev/null +++ b/maps/templates/holodeck/10x10/standard_station/wildlifesimulation10x10.dmm @@ -0,0 +1,131 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/floor/holofloor/reinforced, +/area/holodeck/source_wildlife) +"S" = ( +/obj/landmark{ + name = "Holocarp Spawn" + }, +/turf/simulated/floor/holofloor/reinforced, +/area/holodeck/source_wildlife) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +S +a +a +a +a +a +a +S +a +"} +(3,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} +(4,1,1) = {" +a +a +a +S +a +a +S +a +a +a +"} +(5,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} +(6,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} +(7,1,1) = {" +a +a +a +S +a +a +S +a +a +a +"} +(8,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} +(9,1,1) = {" +a +S +a +a +a +a +a +a +S +a +"} +(10,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/templates/holodeck/6x3/basic6x3.dmm b/maps/templates/holodeck/6x3/basic6x3.dmm new file mode 100644 index 000000000000..da10cf354975 --- /dev/null +++ b/maps/templates/holodeck/6x3/basic6x3.dmm @@ -0,0 +1,55 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/table/woodentable/holotable, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/holodorm/source_basic) +"w" = ( +/obj/structure/bed/chair/holochair{ + dir = 4 + }, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/holodorm/source_basic) +"G" = ( +/obj/structure/bed/chair/holochair{ + dir = 8 + }, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/holodorm/source_basic) +"U" = ( +/obj/structure/bed/holobed, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/holodorm/source_basic) +"Z" = ( +/turf/simulated/floor/holofloor/wood, +/area/holodeck/holodorm/source_basic) + +(1,1,1) = {" +Z +Z +Z +"} +(2,1,1) = {" +w +Z +U +"} +(3,1,1) = {" +a +Z +a +"} +(4,1,1) = {" +G +Z +Z +"} +(5,1,1) = {" +a +Z +U +"} +(6,1,1) = {" +a +Z +a +"} diff --git a/maps/templates/holodeck/6x3/beach6x3.dmm b/maps/templates/holodeck/6x3/beach6x3.dmm new file mode 100644 index 000000000000..e6dc98f37ae1 --- /dev/null +++ b/maps/templates/holodeck/6x3/beach6x3.dmm @@ -0,0 +1,59 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/unsimulated/beach/sand{ + icon_state = "beach" + }, +/area/holodeck/holodorm/source_beach) +"d" = ( +/obj/effect/overlay/palmtree_r, +/turf/simulated/floor/holofloor/beach/sand, +/area/holodeck/holodorm/source_beach) +"h" = ( +/obj/item/clothing/glasses/sunglasses, +/turf/simulated/floor/holofloor/beach/sand, +/area/holodeck/holodorm/source_beach) +"k" = ( +/obj/effect/overlay/palmtree_l, +/turf/simulated/floor/holofloor/beach/sand, +/area/holodeck/holodorm/source_beach) +"E" = ( +/turf/simulated/floor/holofloor/beach/sand, +/area/holodeck/holodorm/source_beach) +"T" = ( +/obj/effect/overlay/coconut, +/turf/simulated/floor/holofloor/beach/sand, +/area/holodeck/holodorm/source_beach) +"Y" = ( +/turf/simulated/floor/holofloor/beach/water, +/area/holodeck/holodorm/source_beach) + +(1,1,1) = {" +d +a +Y +"} +(2,1,1) = {" +E +a +Y +"} +(3,1,1) = {" +T +a +Y +"} +(4,1,1) = {" +h +a +Y +"} +(5,1,1) = {" +k +a +Y +"} +(6,1,1) = {" +E +a +Y +"} diff --git a/maps/templates/holodeck/6x3/boxing6x3.dmm b/maps/templates/holodeck/6x3/boxing6x3.dmm new file mode 100644 index 000000000000..dbe4c16c5039 --- /dev/null +++ b/maps/templates/holodeck/6x3/boxing6x3.dmm @@ -0,0 +1,60 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/holodorm/source_boxing) +"j" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/holodorm/source_boxing) +"k" = ( +/obj/structure/table/holotable, +/obj/item/clothing/gloves/boxing/hologlove, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/holodorm/source_boxing) +"m" = ( +/obj/structure/table/holotable, +/obj/item/clothing/gloves/boxing/hologlove{ + icon_state = "boxinggreen"; + item_state = "boxinggreen" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/holodorm/source_boxing) +"Z" = ( +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/holodorm/source_boxing) + +(1,1,1) = {" +k +a +a +"} +(2,1,1) = {" +j +j +j +"} +(3,1,1) = {" +a +a +a +"} +(4,1,1) = {" +a +a +a +"} +(5,1,1) = {" +Z +Z +Z +"} +(6,1,1) = {" +a +a +m +"} diff --git a/maps/templates/holodeck/6x3/desert6x3.dmm b/maps/templates/holodeck/6x3/desert6x3.dmm new file mode 100644 index 000000000000..0fb4bcd130fc --- /dev/null +++ b/maps/templates/holodeck/6x3/desert6x3.dmm @@ -0,0 +1,43 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/floor/holofloor/desert, +/area/holodeck/holodorm/source_desert) +"q" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/holofloor/desert, +/area/holodeck/holodorm/source_desert) +"M" = ( +/obj/structure/flora/ausbushes/fullgrass, +/turf/simulated/floor/holofloor/desert, +/area/holodeck/holodorm/source_desert) + +(1,1,1) = {" +M +a +a +"} +(2,1,1) = {" +a +a +q +"} +(3,1,1) = {" +a +a +a +"} +(4,1,1) = {" +a +M +a +"} +(5,1,1) = {" +a +a +a +"} +(6,1,1) = {" +q +a +a +"} diff --git a/maps/templates/holodeck/6x3/garden6x3.dmm b/maps/templates/holodeck/6x3/garden6x3.dmm new file mode 100644 index 000000000000..211b96ffe7a4 --- /dev/null +++ b/maps/templates/holodeck/6x3/garden6x3.dmm @@ -0,0 +1,47 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/holofloor/grass, +/area/holodeck/holodorm/source_garden) +"D" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/holofloor/grass, +/area/holodeck/holodorm/source_garden) +"X" = ( +/obj/structure/flora/ausbushes/ywflowers, +/obj/landmark{ + name = "Catgirl Spawn" + }, +/turf/simulated/floor/holofloor/grass, +/area/holodeck/holodorm/source_garden) + +(1,1,1) = {" +a +D +a +"} +(2,1,1) = {" +D +a +D +"} +(3,1,1) = {" +a +X +a +"} +(4,1,1) = {" +D +a +D +"} +(5,1,1) = {" +a +D +a +"} +(6,1,1) = {" +D +a +D +"} diff --git a/maps/templates/holodeck/6x3/seating6x3.dmm b/maps/templates/holodeck/6x3/seating6x3.dmm new file mode 100644 index 000000000000..79a8b56d529e --- /dev/null +++ b/maps/templates/holodeck/6x3/seating6x3.dmm @@ -0,0 +1,115 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/floor/holofloor/wood, +/area/holodeck/holodorm/source_seating) +"f" = ( +/obj/structure/bed/chair/holochair{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/holodorm/source_seating) +"h" = ( +/obj/structure/bed/chair/holochair{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/holodorm/source_seating) +"j" = ( +/obj/structure/table/woodentable/holotable, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/holodorm/source_seating) +"m" = ( +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 5 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/holodorm/source_seating) +"x" = ( +/obj/structure/bed/chair/holochair{ + dir = 1 + }, +/obj/effect/floor_decal/carpet, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/holodorm/source_seating) +"B" = ( +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet, +/obj/effect/floor_decal/carpet{ + dir = 10 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/holodorm/source_seating) +"D" = ( +/obj/structure/bed/chair/holochair, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/holodorm/source_seating) +"K" = ( +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/obj/effect/floor_decal/carpet, +/obj/effect/floor_decal/carpet{ + dir = 6 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/holodorm/source_seating) +"Q" = ( +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 9 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/holodorm/source_seating) + +(1,1,1) = {" +a +a +a +"} +(2,1,1) = {" +Q +h +B +"} +(3,1,1) = {" +D +j +x +"} +(4,1,1) = {" +D +j +x +"} +(5,1,1) = {" +m +f +K +"} +(6,1,1) = {" +a +a +a +"} diff --git a/maps/templates/holodeck/6x3/snow6x3.dmm b/maps/templates/holodeck/6x3/snow6x3.dmm new file mode 100644 index 000000000000..a2135d1d3c97 --- /dev/null +++ b/maps/templates/holodeck/6x3/snow6x3.dmm @@ -0,0 +1,63 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/floor/holofloor/snow, +/area/holodeck/holodorm/source_snow) +"b" = ( +/obj/structure/flora/grass/green, +/turf/simulated/floor/holofloor/snow, +/area/holodeck/holodorm/source_snow) +"h" = ( +/obj/structure/flora/grass/brown, +/turf/simulated/floor/holofloor/snow, +/area/holodeck/holodorm/source_snow) +"j" = ( +/obj/structure/flora/grass/both, +/turf/simulated/floor/holofloor/snow, +/area/holodeck/holodorm/source_snow) +"n" = ( +/obj/structure/flora/grass/green, +/obj/structure/flora/tree/pine, +/turf/simulated/floor/holofloor/snow, +/area/holodeck/holodorm/source_snow) +"F" = ( +/obj/landmark{ + name = "Wolfgirl Spawn" + }, +/turf/simulated/floor/holofloor/snow, +/area/holodeck/holodorm/source_snow) +"W" = ( +/obj/structure/flora/grass/brown, +/obj/structure/flora/tree/dead, +/turf/simulated/floor/holofloor/snow, +/area/holodeck/holodorm/source_snow) + +(1,1,1) = {" +W +a +b +"} +(2,1,1) = {" +a +F +a +"} +(3,1,1) = {" +a +h +a +"} +(4,1,1) = {" +a +n +a +"} +(5,1,1) = {" +a +a +a +"} +(6,1,1) = {" +a +a +j +"} diff --git a/maps/templates/holodeck/6x3/sourceoff6x3.dmm b/maps/templates/holodeck/6x3/sourceoff6x3.dmm new file mode 100644 index 000000000000..86d1d238fff4 --- /dev/null +++ b/maps/templates/holodeck/6x3/sourceoff6x3.dmm @@ -0,0 +1,35 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/floor/holofloor/reinforced, +/area/holodeck/holodorm/source_off) + +(1,1,1) = {" +a +a +a +"} +(2,1,1) = {" +a +a +a +"} +(3,1,1) = {" +a +a +a +"} +(4,1,1) = {" +a +a +a +"} +(5,1,1) = {" +a +a +a +"} +(6,1,1) = {" +a +a +a +"} diff --git a/maps/templates/holodeck/6x3/space6x3.dmm b/maps/templates/holodeck/6x3/space6x3.dmm new file mode 100644 index 000000000000..5ee05c178724 --- /dev/null +++ b/maps/templates/holodeck/6x3/space6x3.dmm @@ -0,0 +1,35 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/floor/holofloor/space, +/area/holodeck/holodorm/source_space) + +(1,1,1) = {" +a +a +a +"} +(2,1,1) = {" +a +a +a +"} +(3,1,1) = {" +a +a +a +"} +(4,1,1) = {" +a +a +a +"} +(5,1,1) = {" +a +a +a +"} +(6,1,1) = {" +a +a +a +"} diff --git a/maps/templates/shuttles/overmaps/generic/overmap_ship_superjank.dmm b/maps/templates/shuttles/overmaps/generic/overmap_ship_superjank.dmm index c04eb6df6eda..893e33b5c82c 100644 --- a/maps/templates/shuttles/overmaps/generic/overmap_ship_superjank.dmm +++ b/maps/templates/shuttles/overmaps/generic/overmap_ship_superjank.dmm @@ -96,7 +96,7 @@ /area/space) "y" = ( /obj/structure/cable/pink, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/plating, /area/space) "z" = ( @@ -191,8 +191,8 @@ /turf/simulated/floor/plating/outdoors, /area/space) "Z" = ( -/turf/space, -/area/space) +/turf/template_noop, +/area/template_noop) (1,1,1) = {" Z From b29c5c64a395906e15a1a45e51ac7d5c88e361a2 Mon Sep 17 00:00:00 2001 From: KT Date: Sun, 4 Aug 2024 15:41:24 -0400 Subject: [PATCH 31/33] Update access.dm --- code/__DEFINES/access.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index bcb30abcae01..111ed7fe421d 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -434,10 +434,10 @@ STANDARD_ACCESS_DATUM(ACCESS_FACTION_ALIEN, faction/alien, "Alien") STANDARD_ACCESS_DATUM(ACCESS_FACTION_TALON, faction/talon, "Talon") //? Biolab - +/* #define ACCESS_FACTION_BIOLAB 250 STANDARD_ACCESS_DATUM(ACCESS_FACTION_BIOLAB, faction/biolab, "Biolab") - +*/ //? Misc From e11f7cbfef41c5f260b2fa19d8326dd58340515c Mon Sep 17 00:00:00 2001 From: KT Date: Sun, 4 Aug 2024 16:31:00 -0400 Subject: [PATCH 32/33] Fixies from ammo pr --- .../level_specific/class_h/landing_padH.dmm | 81 ------------------- 1 file changed, 81 deletions(-) diff --git a/maps/submaps/level_specific/class_h/landing_padH.dmm b/maps/submaps/level_specific/class_h/landing_padH.dmm index c96d0eb7b4f0..03245cfd1f52 100644 --- a/maps/submaps/level_specific/class_h/landing_padH.dmm +++ b/maps/submaps/level_specific/class_h/landing_padH.dmm @@ -10,12 +10,6 @@ }, /turf/simulated/floor/tiled, /area/class_h/POIs/landing_pad) -"ac" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 5 - }, -/turf/simulated/floor/tiled/external, -/area/class_h/POIs/landing_pad) "ad" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/door/airlock/glass_external/public, @@ -60,23 +54,11 @@ }, /turf/simulated/floor/tiled/kafel_full, /area/class_h/POIs/landing_pad) -"aj" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 6 - }, -/turf/simulated/floor/tiled/external, -/area/class_h/POIs/landing_pad) "ak" = ( /obj/effect/floor_decal/rust, /obj/structure/closet/toolcloset, /turf/simulated/floor/plating, /area/class_h/POIs/landing_pad) -"al" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 9 - }, -/turf/simulated/floor/tiled/external, -/area/class_h/POIs/landing_pad) "am" = ( /obj/effect/wingrille_spawn/reinforced, /turf/simulated/floor/tiled, @@ -93,15 +75,6 @@ /obj/effect/floor_decal/techfloor/orange, /turf/simulated/floor/tiled/outdoors, /area/class_h/POIs/landing_pad) -"aq" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 8 - }, -/turf/simulated/floor/tiled/external, -/area/class_h/POIs/landing_pad) -"ar" = ( -/turf/simulated/floor/tiled/external, -/area/class_h/POIs/landing_pad) "as" = ( /obj/effect/debris/cleanable/dirt, /obj/machinery/door/airlock, @@ -116,21 +89,6 @@ /obj/item/tank/oxygen, /turf/simulated/floor/tiled, /area/class_h/POIs/landing_pad) -"au" = ( -/obj/effect/debris/cleanable/dirt, -/obj/structure/closet/cabinet, -/obj/item/clothing/under/color/grey, -/obj/item/clothing/under/color/grey, -/obj/item/clothing/under/color/grey, -/obj/item/clothing/shoes/black, -/obj/item/clothing/shoes/black, -/obj/item/clothing/shoes/black, -/obj/item/gun/ballistic/shotgun/pump/rifle, -/obj/item/ammo_magazine/clip/c762, -/obj/item/ammo_magazine/clip/c762, -/obj/item/ammo_magazine/clip/c762, -/turf/simulated/floor/wood, -/area/class_h/POIs/landing_pad) "av" = ( /obj/effect/debris/cleanable/dirt, /obj/machinery/door/airlock, @@ -184,12 +142,6 @@ }, /turf/simulated/floor/tiled, /area/class_h/POIs/landing_pad) -"aE" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 4 - }, -/turf/simulated/floor/tiled/external, -/area/class_h/POIs/landing_pad) "aF" = ( /obj/effect/wingrille_spawn/reinforced, /turf/simulated/wall, @@ -209,23 +161,6 @@ /obj/item/ammo_magazine/a7_62mm/clip, /turf/simulated/floor/wood, /area/class_h/POIs/landing_pad) -"aH" = ( -/obj/effect/debris/cleanable/dirt, -/obj/structure/closet/crate/freezer/rations, -/obj/item/storage/box/donkpockets, -/obj/item/storage/box/donkpockets, -/obj/item/storage/box/donkpockets, -/obj/item/reagent_containers/food/snacks/liquid/vitamin, -/obj/item/reagent_containers/food/snacks/liquid/vitamin, -/obj/item/reagent_containers/food/snacks/liquid/vitamin, -/obj/item/reagent_containers/food/snacks/liquid/protein, -/obj/item/reagent_containers/food/snacks/liquid/protein, -/obj/item/reagent_containers/food/snacks/liquid/protein, -/obj/item/reagent_containers/food/snacks/liquid, -/obj/item/reagent_containers/food/snacks/liquid, -/obj/item/reagent_containers/food/snacks/liquid, -/turf/simulated/floor/tiled, -/area/class_h/POIs/landing_pad) "aI" = ( /obj/effect/debris/cleanable/dirt, /obj/machinery/suit_cycler/vintage, @@ -254,12 +189,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/class_h/POIs/landing_pad) -"aM" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 10 - }, -/turf/simulated/floor/tiled/external, -/area/class_h/POIs/landing_pad) "aN" = ( /obj/machinery/door/airlock/glass_external/public, /turf/simulated/floor/tiled, @@ -278,10 +207,6 @@ /obj/effect/debris/cleanable/dirt, /turf/simulated/floor/tiled, /area/class_h/POIs/landing_pad) -"aR" = ( -/obj/effect/floor_decal/techfloor/orange, -/turf/simulated/floor/tiled/external, -/area/class_h/POIs/landing_pad) "aS" = ( /obj/effect/floor_decal/rust, /obj/machinery/atmospherics/pipe/simple/hidden, @@ -295,12 +220,6 @@ }, /turf/simulated/floor/tiled, /area/class_h/POIs/landing_pad) -"aU" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 1 - }, -/turf/simulated/floor/tiled/external, -/area/class_h/POIs/landing_pad) "aV" = ( /obj/machinery/light/spot{ dir = 8 From a64e16e3aa7074ad8987e58c81ebc71cc5dbdff1 Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Wed, 7 Aug 2024 21:29:17 +0200 Subject: [PATCH 33/33] Discard changes to code/__DEFINES/access.dm --- code/__DEFINES/access.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 111ed7fe421d..16b87969854f 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -433,12 +433,6 @@ STANDARD_ACCESS_DATUM(ACCESS_FACTION_ALIEN, faction/alien, "Alien") #define ACCESS_FACTION_TALON 301 STANDARD_ACCESS_DATUM(ACCESS_FACTION_TALON, faction/talon, "Talon") -//? Biolab -/* -#define ACCESS_FACTION_BIOLAB 250 -STANDARD_ACCESS_DATUM(ACCESS_FACTION_BIOLAB, faction/biolab, "Biolab") -*/ - //? Misc #define ACCESS_MISC_CASHCRATE 200