From 3eca9eee8037e73d05ef612f87adda852be577b8 Mon Sep 17 00:00:00 2001 From: Trilby Date: Sun, 24 Nov 2024 19:02:03 -0500 Subject: [PATCH 1/9] Ports RnG-Room framework --- code/__HELPERS/cmp.dm | 3 - code/_global_vars/mapping.dm | 4 +- code/controllers/configuration.dm | 5 ++ code/controllers/subsystems/mapping.dm | 57 ++++++++++++++ code/datums/ruins.dm | 19 +++++ code/datums/ruins/maints.dm | 46 ++++++++++++ code/game/objects/landmarks/maints_ruins.dm | 83 +++++++++++++++++++++ code/modules/maps/tg/map_template.dm | 25 ++++++- sojourn-station.dme | 3 + 9 files changed, 240 insertions(+), 5 deletions(-) create mode 100644 code/datums/ruins.dm create mode 100644 code/datums/ruins/maints.dm create mode 100644 code/game/objects/landmarks/maints_ruins.dm diff --git a/code/__HELPERS/cmp.dm b/code/__HELPERS/cmp.dm index 5fb86f94603..e03f33bb8ec 100644 --- a/code/__HELPERS/cmp.dm +++ b/code/__HELPERS/cmp.dm @@ -55,8 +55,5 @@ if (!.) . = B.qdels - A.qdels -/proc/cmp_ruincost_priority(datum/map_template/ruin/A, datum/map_template/ruin/B) - return initial(A.cost) - initial(B.cost) - /proc/cmp_timer(datum/timedevent/a, datum/timedevent/b) return a.timeToRun - b.timeToRun \ No newline at end of file diff --git a/code/_global_vars/mapping.dm b/code/_global_vars/mapping.dm index 911c465c2bd..675565b6097 100644 --- a/code/_global_vars/mapping.dm +++ b/code/_global_vars/mapping.dm @@ -1,2 +1,4 @@ // AREA LIST // -GLOBAL_LIST_EMPTY(map_areas) \ No newline at end of file +GLOBAL_LIST_EMPTY(map_areas) + +GLOBAL_LIST_EMPTY(stationroom_landmarks) //List of all spawns for maints rooms \ No newline at end of file diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 841e2dbac18..cc5da9bad5b 100755 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -173,6 +173,7 @@ GLOBAL_LIST_EMPTY(storyteller_cache) var/python_path = "" //Path to the python executable. Defaults to "python" on windows and "/usr/bin/env python2" on unix var/use_lib_nudge = 0 //Use the C library nudge instead of the python nudge. var/use_overmap = 0 + var/generate_maint_ruins = 0 // Event settings var/expected_round_length = 3 * 60 * 60 * 10 // 3 hours @@ -238,6 +239,7 @@ GLOBAL_LIST_EMPTY(storyteller_cache) var/cache_assets = FALSE var/smart_cache_assets = FALSE + var/directory = "config" /datum/configuration/New() fill_storyevents_list() @@ -674,6 +676,9 @@ GLOBAL_LIST_EMPTY(storyteller_cache) if("use_overmap") config.use_overmap = 1 + if("generate_maints_ruins") //Soj add + config.generate_maint_ruins = 1 + if("expected_round_length") config.expected_round_length = MinutesToTicks(text2num(value)) diff --git a/code/controllers/subsystems/mapping.dm b/code/controllers/subsystems/mapping.dm index 6ffcdc5da5b..a1ff1fc0c30 100644 --- a/code/controllers/subsystems/mapping.dm +++ b/code/controllers/subsystems/mapping.dm @@ -4,6 +4,7 @@ SUBSYSTEM_DEF(mapping) flags = SS_NO_FIRE var/list/map_templates = list() + var/list/ruins_templates = list() var/dmm_suite/maploader = null var/list/teleportlocs = list() var/list/ghostteleportlocs = list() @@ -36,6 +37,10 @@ SUBSYSTEM_DEF(mapping) maploader = new() load_map_templates() +// Generates the random maint ruin templates. +#ifndef LOWMEMORYMODE + SSmapping.seedStation() +#endif // Generate cache of all areas in world. This cache allows world areas to be looked up on a list instead of being searched for EACH time for(var/area/A in world) GLOB.map_areas += A @@ -91,6 +96,8 @@ SUBSYSTEM_DEF(mapping) return TRUE /datum/controller/subsystem/mapping/proc/load_map_templates() + //Can also add other templates in the future. For now, maint ruins. + preloadTemplates() for(var/T in subtypesof(/datum/map_template)) var/datum/map_template/template = T if(!(initial(template.mappath))) // If it's missing the actual path its probably a base type or being used for inheritence. @@ -98,3 +105,53 @@ SUBSYSTEM_DEF(mapping) template = new T() map_templates[template.name] = template return TRUE + + +/datum/controller/subsystem/mapping/proc/seedStation() + for(var/V in GLOB.stationroom_landmarks) + var/obj/effect/landmark/stationroom/LM = V + LM.load() + if(GLOB.stationroom_landmarks.len) + seedStation() //I'm sure we can trust everyone not to insert a 1x1 rooms which loads a landmark which loads a landmark which loads a la... + + +/proc/cmp_ruincost_priority(datum/map_template/ruin/A, datum/map_template/ruin/B) + return initial(A.cost) - initial(B.cost) + +/datum/controller/subsystem/mapping/proc/preloadRuinTemplates() + // Still supporting bans by filename + var/list/banned = generateMapList("[global.config.directory]/lavaruinblacklist.txt") + banned += generateMapList("[global.config.directory]/spaceruinblacklist.txt") + banned += generateMapList("[global.config.directory]/iceruinblacklist.txt") + banned += generateMapList("[global.config.directory]/stationruinblacklist.txt") + + for(var/item in sort_list(subtypesof(/datum/map_template/ruin), GLOBAL_PROC_REF(cmp_ruincost_priority))) + var/datum/map_template/ruin/ruin_type = item + // screen out the abstract subtypes + if(!initial(ruin_type.id)) + continue + var/datum/map_template/ruin/R = new ruin_type() + + if(banned.Find(R.mappath)) + continue + + map_templates[R.name] = R + ruins_templates[R.name] = R + + //We have to be specific here. + if(istype(R, /datum/map_template/ruin/station)) + station_room_templates[R.name] = R + + +/datum/controller/subsystem/mapping/proc/preloadTemplates(path = "_maps/templates/") //see master controller setup + var/list/filelist = flist(path) + for(var/map in filelist) + var/datum/map_template/T = new(path = "[path][map]", rename = "[map]") + map_templates[T.name] = T + + preloadRuinTemplates() + + + // Station Ruins, Maints Rooms, Random shit! +/datum/controller/subsystem/mapping + var/list/station_room_templates = list() \ No newline at end of file diff --git a/code/datums/ruins.dm b/code/datums/ruins.dm new file mode 100644 index 00000000000..6f3dff6ece7 --- /dev/null +++ b/code/datums/ruins.dm @@ -0,0 +1,19 @@ +/datum/map_template/ruin + name = null + var/description = "Unset Desc" + + var/unpickable = FALSE //If TRUE these won't be placed automatically (can still be forced or loaded with another ruin) + var/always_place = FALSE //Will skip the whole weighting process and just plop this down, ideally you want the ruins of this kind to have no cost. + var/placement_weight = 1 //How often should this ruin appear + var/list/always_spawn_with = null //These ruin types will be spawned along with it (where dependent on the flag) eg list(/datum/map_template/ruin/space/teleporter_space = SPACERUIN_Z) + var/list/never_spawn_with = null //If this ruin is spawned these will not eg list(/datum/map_template/ruin/base_alternate) + + var/prefix = null + var/suffix = null + +/datum/map_template/ruin/New() + if(!name && id) + name = id + + mappath = prefix + suffix + ..(path = mappath) \ No newline at end of file diff --git a/code/datums/ruins/maints.dm b/code/datums/ruins/maints.dm new file mode 100644 index 00000000000..a7192c6ded8 --- /dev/null +++ b/code/datums/ruins/maints.dm @@ -0,0 +1,46 @@ +//YOU MUST UPDATE MAINTS_RUINS.DM! Otherwise, your maps will NOT load! BE SURE you use the NAME variable! +// EXAMPLE: + +// NAME = "Maint Oldstorage" + +// In the list, you use the name VARIABLE Maint Oldstorage, NOT the datum path name, and NOT its ID. + +///Base for all station ruins. +/datum/map_template/ruin/station/maint + prefix = "maps/MaintsRuins/" + +///Base for the 3x3 rooms. +/datum/map_template/ruin/station/maint/threexthree + prefix = "maps/MaintsRuins/3x3/" + +/* Examples / not ported +/datum/map_template/ruin/station/maint/threexthree/oldstorage + id = "OldStorage" + suffix = "3x3_OldStorage.dmm" + name = "Maint OldStorage" + +/datum/map_template/ruin/station/maint/threexthree/oldstorage1 + id = "OldStorage1" + suffix = "3x3_OldStorage1.dmm" + name = "Maint OldStorage1" + +/datum/map_template/ruin/station/maint/threexthree/oldstorage2 + id = "OldStorage2" + suffix = "3x3_OldStorage2.dmm" + name = "Maint OldStorage2" + +/datum/map_template/ruin/station/maint/threexthree/oldstorage3 + id = "OldStorage3" + suffix = "3x3_OldStorage3.dmm" + name = "Maint OldStorage3" + +/datum/map_template/ruin/station/maint/threexthree/oldstorage4 + id = "OldStorage4" + suffix = "3x3_OldStorage4.dmm" + name = "Maint OldStorage4" + +/datum/map_template/ruin/station/maint/threexthree/oldstorage5 + id = "OldStorage5" + suffix = "3x3_OldStorage5.dmm" + name = "Maint OldStorage5" +*/ \ No newline at end of file diff --git a/code/game/objects/landmarks/maints_ruins.dm b/code/game/objects/landmarks/maints_ruins.dm new file mode 100644 index 00000000000..ddabec4da64 --- /dev/null +++ b/code/game/objects/landmarks/maints_ruins.dm @@ -0,0 +1,83 @@ +GLOBAL_LIST_EMPTY(chosen_station_templates) + +/obj/effect/landmark/stationroom + var/list/template_names = list() + /// Whether or not we can choose templates that have already been chosen + var/unique = FALSE + +/obj/effect/landmark/stationroom/New() + ..() + GLOB.stationroom_landmarks += src + +/obj/effect/landmark/stationroom/Destroy() + if(src in GLOB.stationroom_landmarks) + GLOB.stationroom_landmarks -= src + return ..() + +/obj/effect/landmark/stationroom/proc/load(template_name) + var/turf/T = get_turf(src) + if(!T) + return FALSE + if(!template_name) + for(var/t in template_names) + if(!SSmapping.station_room_templates[t]) + stack_trace("Station room spawner placed at ([T.x], [T.y], [T.z]) has invalid ruin name of \"[t]\" in its list") + template_names -= t + template_name = choose() + if(!template_name) + GLOB.stationroom_landmarks -= src + qdel(src) + return FALSE + GLOB.chosen_station_templates += template_name + var/datum/map_template/template = SSmapping.station_room_templates[template_name] + if(!template) + return FALSE + testing("Ruin \"[template_name]\" placed at ([T.x], [T.y], [T.z])") + template.load(T, centered = FALSE) + template.loaded++ + GLOB.stationroom_landmarks -= src + qdel(src) + return TRUE + +// Proc to allow you to add conditions for choosing templates, instead of just randomly picking from the template list. +// Examples where this would be useful, would be choosing certain templates depending on conditions such as holidays, +// Or co-dependent templates, such as having a template for the core and one for the satelite, and swapping AI and comms.git +/obj/effect/landmark/stationroom/proc/choose() + if(unique) + var/list/current_templates = template_names + for(var/i in GLOB.chosen_station_templates) + template_names -= i + if(!template_names.len) + stack_trace("Station room spawner (type: [type]) has run out of ruins, unique will be ignored") + template_names = current_templates + return pickweight(template_names) + +/* Examples +/obj/effect/landmark/stationroom/maint/threexthree + template_names = list("Maint OldStorage", "Maint OldStorage1", "Maint OldStorage2") + +(untested example) - this maybe makes them more or less rare +/obj/effect/landmark/stationroom/maint/threexthree + template_names = list("Common OldStorage" = 12, "Rare OldStorage" = 4, "Super Rare OldStorage" = 2) +*/ + +/obj/effect/landmark/stationroom/maint/ + unique = TRUE + +/obj/effect/landmark/stationroom/maint/threexthree + template_names = list() + +/obj/effect/landmark/stationroom/maint/threexfive + template_names = list() + +/obj/effect/landmark/stationroom/maint/fivexthree + template_names = list() + +/obj/effect/landmark/stationroom/maint/fivexfour + template_names = list() + +/obj/effect/landmark/stationroom/maint/tenxfive + template_names = list() + +/obj/effect/landmark/stationroom/maint/tenxten + template_names = list() \ No newline at end of file diff --git a/code/modules/maps/tg/map_template.dm b/code/modules/maps/tg/map_template.dm index 236f4efc8e1..8b1a29a4fe3 100644 --- a/code/modules/maps/tg/map_template.dm +++ b/code/modules/maps/tg/map_template.dm @@ -307,4 +307,27 @@ admin_notice("Submap loader gave up with [budget] left to spend.", R_DEBUG) else admin_notice("Submaps loaded.", R_DEBUG) - admin_notice("Loaded: [english_list(pretty_submap_list)]", R_DEBUG) */ \ No newline at end of file + admin_notice("Loaded: [english_list(pretty_submap_list)]", R_DEBUG) */ + +/proc/generateMapList(filename) + . = list() + var/list/Lines = world.file2list(filename) + if(!Lines.len) + return + for (var/t in Lines) + if (!t) + continue + t = trim(t) + if (length(t) == 0) + continue + else if (t[1] == "#") + continue + var/pos = findtext(t, " ") + var/name = null + if (pos) + name = lowertext(copytext(t, 1, pos)) + else + name = lowertext(t) + if (!name) + continue + . += t \ No newline at end of file diff --git a/sojourn-station.dme b/sojourn-station.dme index 835cbb8c3d8..8c6c70ae93b 100644 --- a/sojourn-station.dme +++ b/sojourn-station.dme @@ -332,6 +332,7 @@ #include "code\datums\progressbar.dm" #include "code\datums\recipe.dm" #include "code\datums\recoil.dm" +#include "code\datums\ruins.dm" #include "code\datums\security_state.dm" #include "code\datums\sound_player.dm" #include "code\datums\verb_callbacks.dm" @@ -527,6 +528,7 @@ #include "code\datums\repositories\crew\tracking.dm" #include "code\datums\repositories\crew\vital.dm" #include "code\datums\repositories\crew\~defines.dm" +#include "code\datums\ruins\maints.dm" #include "code\datums\setup_option\background.dm" #include "code\datums\setup_option\core_implant.dm" #include "code\datums\setup_option\core_implants.dm" @@ -1365,6 +1367,7 @@ #include "code\game\objects\landmarks\join.dm" #include "code\game\objects\landmarks\landmark.dm" #include "code\game\objects\landmarks\machinery.dm" +#include "code\game\objects\landmarks\maints_ruins.dm" #include "code\game\objects\landmarks\mob.dm" #include "code\game\objects\landmarks\storyevent.dm" #include "code\game\objects\random\ameridian.dm" From 56ca345fc29f738c6be5cfe5b48ae8c082b6a386 Mon Sep 17 00:00:00 2001 From: Trilby Date: Tue, 24 Dec 2024 00:46:58 -0500 Subject: [PATCH 2/9] Maps and working --- code/datums/ruins/maints.dm | 53 ++-- code/game/objects/landmarks/maints_ruins.dm | 3 + maps/MaintsRuins/3x3/3x3_barrels.dmm | 59 ++++ .../MaintsRuins/3x3/3x3_floor_repair_shop.dmm | 77 ++++++ maps/MaintsRuins/3x3/3x3_guntinerk.dmm | 63 +++++ maps/MaintsRuins/3x3/3x3_kcoin.dmm | 56 ++++ maps/MaintsRuins/3x3/3x3_meat.dmm | 86 ++++++ maps/MaintsRuins/3x3/3x3_minihydro.dmm | 61 ++++ maps/MaintsRuins/3x3/3x3_posters.dmm | 90 ++++++ maps/MaintsRuins/4x4/4x4_guntinker.dmm | 150 ++++++++++ maps/MaintsRuins/4x4/4x4_mini_bar.dmm | 129 +++++++++ maps/MaintsRuins/4x4/4x4_pc_place.dmm | 61 ++++ maps/MaintsRuins/4x4/4x4_trash_dump.dmm | 80 ++++++ maps/__Nadezhda/map/_Nadezhda_Colony.dmm | 261 ++++-------------- 14 files changed, 991 insertions(+), 238 deletions(-) create mode 100644 maps/MaintsRuins/3x3/3x3_barrels.dmm create mode 100644 maps/MaintsRuins/3x3/3x3_floor_repair_shop.dmm create mode 100644 maps/MaintsRuins/3x3/3x3_guntinerk.dmm create mode 100644 maps/MaintsRuins/3x3/3x3_kcoin.dmm create mode 100644 maps/MaintsRuins/3x3/3x3_meat.dmm create mode 100644 maps/MaintsRuins/3x3/3x3_minihydro.dmm create mode 100644 maps/MaintsRuins/3x3/3x3_posters.dmm create mode 100644 maps/MaintsRuins/4x4/4x4_guntinker.dmm create mode 100644 maps/MaintsRuins/4x4/4x4_mini_bar.dmm create mode 100644 maps/MaintsRuins/4x4/4x4_pc_place.dmm create mode 100644 maps/MaintsRuins/4x4/4x4_trash_dump.dmm diff --git a/code/datums/ruins/maints.dm b/code/datums/ruins/maints.dm index a7192c6ded8..9ef01a705c4 100644 --- a/code/datums/ruins/maints.dm +++ b/code/datums/ruins/maints.dm @@ -18,29 +18,32 @@ id = "OldStorage" suffix = "3x3_OldStorage.dmm" name = "Maint OldStorage" +*/ -/datum/map_template/ruin/station/maint/threexthree/oldstorage1 - id = "OldStorage1" - suffix = "3x3_OldStorage1.dmm" - name = "Maint OldStorage1" - -/datum/map_template/ruin/station/maint/threexthree/oldstorage2 - id = "OldStorage2" - suffix = "3x3_OldStorage2.dmm" - name = "Maint OldStorage2" - -/datum/map_template/ruin/station/maint/threexthree/oldstorage3 - id = "OldStorage3" - suffix = "3x3_OldStorage3.dmm" - name = "Maint OldStorage3" - -/datum/map_template/ruin/station/maint/threexthree/oldstorage4 - id = "OldStorage4" - suffix = "3x3_OldStorage4.dmm" - name = "Maint OldStorage4" - -/datum/map_template/ruin/station/maint/threexthree/oldstorage5 - id = "OldStorage5" - suffix = "3x3_OldStorage5.dmm" - name = "Maint OldStorage5" -*/ \ No newline at end of file +///Base for the 4x4 rooms. +/datum/map_template/ruin/station/maint/fourxfour + prefix = "maps/MaintsRuins/4x4/" + +/datum/map_template/ruin/station/maint/fourxfour/oldstorage + id = "OldStorage" + prefix = "maps/MaintsRuins/4x4/" + suffix = "4x4_mixed_storage.dmm" + name = "Maint MixedStorage" + +/datum/map_template/ruin/station/maint/fourxfour/trashdump + id = "Trashdump" + prefix = "maps/MaintsRuins/4x4/" + suffix = "4x4_trash_dump.dmm" + name = "Maint Trashdump" + +/datum/map_template/ruin/station/maint/fourxfour/mini_bar + id = "MiniBar" + prefix = "maps/MaintsRuins/4x4/" + suffix = "4x4_mini_bar.dmm" + name = "Maint Mini Bar" + +/datum/map_template/ruin/station/maint/fourxfour/guntinker + id = "Guntinker" + prefix = "maps/MaintsRuins/4x4/" + suffix = "4x4_guntinker.dmm" + name = "Maint Guntinker" \ No newline at end of file diff --git a/code/game/objects/landmarks/maints_ruins.dm b/code/game/objects/landmarks/maints_ruins.dm index ddabec4da64..4425c1b33be 100644 --- a/code/game/objects/landmarks/maints_ruins.dm +++ b/code/game/objects/landmarks/maints_ruins.dm @@ -70,6 +70,9 @@ GLOBAL_LIST_EMPTY(chosen_station_templates) /obj/effect/landmark/stationroom/maint/threexfive template_names = list() +/obj/effect/landmark/stationroom/maint/fourfour + template_names = list("Maint MixedStorage" = 5, "Maint Trashdump" = 3, "Maint Mini Bar" = 1, "Maint Guntinker" = 1) + /obj/effect/landmark/stationroom/maint/fivexthree template_names = list() diff --git a/maps/MaintsRuins/3x3/3x3_barrels.dmm b/maps/MaintsRuins/3x3/3x3_barrels.dmm new file mode 100644 index 00000000000..04c1a90b11a --- /dev/null +++ b/maps/MaintsRuins/3x3/3x3_barrels.dmm @@ -0,0 +1,59 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/reagent_dispensers/fueltank/derelict, +/turf/simulated/floor/industrial/concrete_bricks, +/area/nadezhda/maintenance/undergroundfloor2east) +"t" = ( +/obj/item/tool/crowbar/improvised, +/obj/item/reagent_containers/food/drinks/bottle/small/brewing_bottle, +/turf/simulated/floor/industrial/concrete_bricks, +/area/nadezhda/maintenance/undergroundfloor2east) +"E" = ( +/obj/structure/reagent_dispensers/watertank/derelict, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/industrial/concrete_bricks, +/area/nadezhda/maintenance/undergroundfloor2east) +"F" = ( +/obj/structure/scrap/poor/large, +/obj/item/tool/wirecutters/improvised, +/obj/item/tool/saw/improvised, +/turf/simulated/floor/industrial/concrete_bricks, +/area/nadezhda/maintenance/undergroundfloor2east) +"M" = ( +/obj/structure/fermentation_keg, +/obj/item/bottle_kit, +/turf/simulated/floor/industrial/concrete_bricks, +/area/nadezhda/maintenance/undergroundfloor2east) +"Q" = ( +/obj/structure/scrap/poor/large, +/obj/item/tool/shovel/improvised, +/obj/item/tool/wrench/improvised, +/obj/item/storage/makeshift_grinder, +/turf/simulated/floor/industrial/concrete_bricks, +/area/nadezhda/maintenance/undergroundfloor2east) +"S" = ( +/obj/structure/scrap/poor/large, +/obj/item/tool/weldingtool/improvised, +/turf/simulated/floor/industrial/concrete_bricks, +/area/nadezhda/maintenance/undergroundfloor2east) +"Y" = ( +/turf/simulated/floor/industrial/concrete_bricks, +/area/nadezhda/maintenance/undergroundfloor2east) + +(1,1,1) = {" +F +M +Y +"} +(2,1,1) = {" +E +t +Y +"} +(3,1,1) = {" +a +Q +S +"} diff --git a/maps/MaintsRuins/3x3/3x3_floor_repair_shop.dmm b/maps/MaintsRuins/3x3/3x3_floor_repair_shop.dmm new file mode 100644 index 00000000000..0ffe3ce7831 --- /dev/null +++ b/maps/MaintsRuins/3x3/3x3_floor_repair_shop.dmm @@ -0,0 +1,77 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/table/marble, +/obj/item/stack/ore/glass{ + amount = 60 + }, +/obj/item/stack/ore{ + amount = 120 + }, +/obj/item/stack/ore/glass{ + amount = 60 + }, +/obj/item/stack/rods/random, +/obj/item/stack/rods/random, +/turf/simulated/floor/industrial/bricks_fixed, +/area/nadezhda/maintenance/undergroundfloor2east) +"q" = ( +/obj/structure/reagent_dispensers/watertank/derelict, +/turf/simulated/floor/industrial/bricks_fixed, +/area/nadezhda/maintenance/undergroundfloor2east) +"u" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/random/pouch/hardcase, +/turf/simulated/floor/industrial/bricks_fixed, +/area/nadezhda/maintenance/undergroundfloor2east) +"v" = ( +/obj/structure/table/rack/shelf, +/obj/item/cement_bag, +/obj/item/cement_bag, +/obj/item/cement_bag, +/obj/item/cement_bag, +/obj/item/cement_bag, +/obj/item/cement_bag, +/obj/item/cement_bag, +/obj/item/cement_bag, +/obj/item/cement_bag, +/obj/item/cement_bag, +/obj/item/clothing/gloves/color/brown, +/obj/item/clothing/shoes/workboots, +/obj/item/clothing/head/hardhat/yellow, +/turf/simulated/floor/industrial/bricks_fixed, +/area/nadezhda/maintenance/undergroundfloor2east) +"H" = ( +/obj/structure/table/rack/shelf, +/obj/item/tool/hammer, +/obj/item/tool/crowbar, +/obj/item/stack/rods/random, +/turf/simulated/floor/industrial/bricks_fixed, +/area/nadezhda/maintenance/undergroundfloor2east) +"O" = ( +/turf/simulated/floor/industrial/bricks_fixed, +/area/nadezhda/maintenance/undergroundfloor2east) +"U" = ( +/obj/structure/table/rack/shelf, +/obj/item/reagent_containers/glass/bucket, +/obj/item/stack/rods/random, +/obj/item/stack/rods/random, +/turf/simulated/floor/industrial/bricks_fixed, +/area/nadezhda/maintenance/undergroundfloor2east) + +(1,1,1) = {" +q +a +O +"} +(2,1,1) = {" +u +O +O +"} +(3,1,1) = {" +v +U +H +"} diff --git a/maps/MaintsRuins/3x3/3x3_guntinerk.dmm b/maps/MaintsRuins/3x3/3x3_guntinerk.dmm new file mode 100644 index 00000000000..11014ea3299 --- /dev/null +++ b/maps/MaintsRuins/3x3/3x3_guntinerk.dmm @@ -0,0 +1,63 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/table/woodentable, +/obj/random/gun_parts/low, +/obj/random/ammo, +/obj/random/gun_parts/low, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2east) +"b" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2east) +"c" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/wood{ + dir = 4; + tag = "icon-wooden_chair (EAST)" + }, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2east) +"j" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/woodentable, +/obj/item/tool/hammer, +/obj/item/tool/screwdriver, +/obj/item/tool/wirecutters/pliers, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2east) +"w" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small, +/obj/random/structures, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2east) +"x" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/woodentable, +/obj/random/gun_parts/low, +/obj/random/ammo, +/obj/random/gun_parts/low, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2east) +"y" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2east) + +(1,1,1) = {" +b +y +b +"} +(2,1,1) = {" +j +c +w +"} +(3,1,1) = {" +a +x +a +"} diff --git a/maps/MaintsRuins/3x3/3x3_kcoin.dmm b/maps/MaintsRuins/3x3/3x3_kcoin.dmm new file mode 100644 index 00000000000..fb391978445 --- /dev/null +++ b/maps/MaintsRuins/3x3/3x3_kcoin.dmm @@ -0,0 +1,56 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/salvageable/server, +/turf/simulated/floor/industrial/black_large_slates, +/area/nadezhda/maintenance/undergroundfloor2east) +"o" = ( +/obj/structure/salvageable/computer, +/obj/item/computer_hardware/hard_drive/portable/advanced/coin, +/turf/simulated/floor/industrial/blue_slates_long, +/area/nadezhda/maintenance/undergroundfloor2east) +"B" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 1 + }, +/obj/item/computer_hardware/hard_drive/portable, +/turf/simulated/floor/industrial/black_large_slates, +/area/nadezhda/maintenance/undergroundfloor2east) +"C" = ( +/obj/structure/salvageable/personal, +/turf/simulated/floor/industrial/blue_slates_long, +/area/nadezhda/maintenance/undergroundfloor2east) +"E" = ( +/obj/item/modular_computer/tablet/preset, +/obj/structure/table/steel, +/obj/structure/sign/warning/server_room/small{ + pixel_x = 32 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/industrial/blue_slates_long, +/area/nadezhda/maintenance/undergroundfloor2east) +"N" = ( +/obj/item/modular_computer/console/preset/civilian, +/obj/item/computer_hardware/hard_drive/portable/advanced/coin, +/turf/simulated/floor/industrial/blue_slates_long, +/area/nadezhda/maintenance/undergroundfloor2east) +"V" = ( +/turf/simulated/floor/industrial/black_large_slates, +/area/nadezhda/maintenance/undergroundfloor2east) + +(1,1,1) = {" +o +V +V +"} +(2,1,1) = {" +C +B +a +"} +(3,1,1) = {" +N +E +o +"} diff --git a/maps/MaintsRuins/3x3/3x3_meat.dmm b/maps/MaintsRuins/3x3/3x3_meat.dmm new file mode 100644 index 00000000000..ff93012153e --- /dev/null +++ b/maps/MaintsRuins/3x3/3x3_meat.dmm @@ -0,0 +1,86 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/random/mob/roaches/low_chance, +/turf/simulated/floor/industrial/cafe_large, +/area/nadezhda/maintenance/undergroundfloor2east) +"h" = ( +/obj/item/tool/knife/butch, +/obj/structure/kitchenspike, +/obj/effect/decal/cleanable/blood, +/obj/item/reagent_containers/food/snacks/meat/monkey, +/obj/item/reagent_containers/food/snacks/meat/monkey, +/obj/item/reagent_containers/food/snacks/meat/monkey, +/obj/item/reagent_containers/food/snacks/meat/monkey, +/obj/random/cloth/gloves, +/turf/simulated/floor/industrial/concrete_bricks, +/area/nadezhda/maintenance/undergroundfloor2east) +"i" = ( +/obj/structure/table/rack/shelf, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/tool_upgrade/productivity/whetstone, +/obj/item/mop, +/obj/random/rations/roachcube, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/industrial/concrete_bricks, +/area/nadezhda/maintenance/undergroundfloor2east) +"p" = ( +/obj/effect/decal/cleanable/blood, +/obj/random/mob/roaches/low_chance, +/turf/simulated/floor/industrial/cafe_large, +/area/nadezhda/maintenance/undergroundfloor2east) +"s" = ( +/obj/structure/table/marble, +/obj/item/reagent_containers/food/snacks/meat/chicken/vox, +/obj/item/reagent_containers/food/snacks/meat/bearmeat, +/obj/item/storage/box/monkeycubes, +/obj/item/reagent_containers/food/condiment/saltshaker, +/obj/item/reagent_containers/food/condiment/peppermill, +/turf/simulated/floor/industrial/concrete_bricks, +/area/nadezhda/maintenance/undergroundfloor2east) +"t" = ( +/obj/random/cloth/shoes/low_chance, +/obj/item/reagent_containers/glass/bucket, +/turf/simulated/floor/industrial/cafe_large, +/area/nadezhda/maintenance/undergroundfloor2east) +"K" = ( +/obj/structure/table/marble, +/obj/item/reagent_containers/food/snacks/meat/chicken/vox, +/obj/item/reagent_containers/food/snacks/monkeysdelight, +/obj/structure/sink/kitchen{ + pixel_y = 32 + }, +/obj/random/rations/roachcube, +/turf/simulated/floor/industrial/concrete_bricks, +/area/nadezhda/maintenance/undergroundfloor2east) +"L" = ( +/obj/structure/table/rack/shelf, +/obj/item/reagent_containers/food/snacks/meat/pork, +/obj/item/stack/rods/random, +/obj/item/stack/rods/random, +/obj/random/rations/roachcube, +/turf/simulated/floor/industrial/concrete_bricks, +/area/nadezhda/maintenance/undergroundfloor2east) +"X" = ( +/obj/machinery/microwave/burnbarrel, +/obj/item/stack/material/wood/random, +/obj/random/rations/roachcube, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2east) + +(1,1,1) = {" +h +t +a +"} +(2,1,1) = {" +K +p +X +"} +(3,1,1) = {" +s +i +L +"} diff --git a/maps/MaintsRuins/3x3/3x3_minihydro.dmm b/maps/MaintsRuins/3x3/3x3_minihydro.dmm new file mode 100644 index 00000000000..082c93ceae6 --- /dev/null +++ b/maps/MaintsRuins/3x3/3x3_minihydro.dmm @@ -0,0 +1,61 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/watertank/derelict, +/turf/simulated/floor/industrial/black_large_slates, +/area/nadezhda/maintenance/undergroundfloor2east) +"m" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/marble, +/obj/item/storage/bag/produce, +/turf/simulated/floor/industrial/black_large_slates, +/area/nadezhda/maintenance/undergroundfloor2east) +"n" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/random/spider_trap_burrowing/low_chance, +/turf/simulated/floor/industrial/black_large_slates, +/area/nadezhda/maintenance/undergroundfloor2east) +"u" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/industrial/black_large_slates, +/area/nadezhda/maintenance/undergroundfloor2east) +"N" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/industrial/black_large_slates, +/area/nadezhda/maintenance/undergroundfloor2east) +"T" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/industrial/black_large_slates, +/area/nadezhda/maintenance/undergroundfloor2east) +"U" = ( +/obj/effect/decal/cleanable/dirt, +/obj/random/scrap, +/turf/simulated/floor/industrial/black_large_slates, +/area/nadezhda/maintenance/undergroundfloor2east) +"V" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/industrial/black_large_slates, +/area/nadezhda/maintenance/undergroundfloor2east) + +(1,1,1) = {" +m +U +n +"} +(2,1,1) = {" +a +T +u +"} +(3,1,1) = {" +V +N +V +"} diff --git a/maps/MaintsRuins/3x3/3x3_posters.dmm b/maps/MaintsRuins/3x3/3x3_posters.dmm new file mode 100644 index 00000000000..b77844be1d0 --- /dev/null +++ b/maps/MaintsRuins/3x3/3x3_posters.dmm @@ -0,0 +1,90 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/steel, +/obj/item/contraband/poster, +/obj/item/contraband/poster, +/obj/item/contraband/poster/placed/generic/here_for_your_safety{ + pixel_y = 32 + }, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2east) +"u" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/steel, +/obj/item/contraband/poster, +/obj/item/contraband/poster, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2east) +"v" = ( +/obj/effect/decal/cleanable/dirt, +/obj/random/scrap, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2east) +"x" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/random/scrap, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2east) +"C" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/office/light{ + dir = 1 + }, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2east) +"E" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/steel, +/obj/item/contraband/poster, +/obj/item/contraband/poster, +/obj/item/pen/multi, +/obj/item/contraband/poster/placed/generic/work_for_a_future{ + pixel_y = 32 + }, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2east) +"J" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/steel, +/obj/item/contraband/poster, +/obj/item/contraband/poster, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2east) +"N" = ( +/obj/effect/decal/cleanable/dirt, +/obj/random/cluster/roaches/lower_chance, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2east) +"O" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/steel, +/obj/item/contraband/poster, +/obj/item/contraband/poster, +/obj/item/contraband/poster/placed/generic/do_not_question{ + pixel_y = 32 + }, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2east) + +(1,1,1) = {" +O +x +N +"} +(2,1,1) = {" +E +C +v +"} +(3,1,1) = {" +a +u +J +"} diff --git a/maps/MaintsRuins/4x4/4x4_guntinker.dmm b/maps/MaintsRuins/4x4/4x4_guntinker.dmm new file mode 100644 index 00000000000..949babfc783 --- /dev/null +++ b/maps/MaintsRuins/4x4/4x4_guntinker.dmm @@ -0,0 +1,150 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/steel, +/obj/random/rubber_ammo, +/obj/random/pack/tech_loot/low_chance, +/obj/random/gun_parts/low, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2west) +"b" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/steel, +/obj/random/ammo/low_chance, +/obj/random/gun_parts/frames, +/obj/random/gun_handmade, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2west) +"d" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/steel, +/obj/random/ammo/low_chance, +/obj/random/gun_parts/frames, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2west) +"h" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/office/light{ + dir = 1 + }, +/obj/random/material/low_chance, +/obj/random/junk/cigbutt, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2west) +"w" = ( +/obj/effect/decal/cleanable/dirt, +/obj/random/toolbox, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2west) +"x" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/steel, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/random/tool_upgrade/low_chance, +/obj/random/gun_handmade/willspawn, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2west) +"A" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/steel, +/obj/random/tool_upgrade/rare/low_chance, +/obj/random/gun_parts/low, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2west) +"C" = ( +/obj/effect/decal/cleanable/dirt, +/obj/random/traps/low_chance, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2west) +"D" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/steel, +/obj/item/ammo_kit, +/obj/random/lowkeyrandom, +/obj/random/gun_parts, +/obj/random/dungeon_ammo/really_low_chance, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2west) +"E" = ( +/obj/effect/decal/cleanable/dirt, +/obj/random/material/low_chance, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2west) +"I" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/steel, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/random/boxes/low_chance, +/obj/random/gun_parts, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2west) +"J" = ( +/obj/effect/decal/cleanable/dirt, +/obj/random/junk/cigbutt, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2west) +"T" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/steel, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/item/ammo_kit, +/obj/random/lowkeyrandom, +/obj/random/gun_parts/frames, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2west) +"W" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/steel, +/obj/random/rubber_ammo, +/obj/random/pack/tech_loot/low_chance, +/obj/random/gun_handmade/willspawn, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2west) +"Y" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/office/light, +/obj/random/material/low_chance, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2west) +"Z" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/steel, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/random/powercell/medium_safe_lonestar, +/obj/random/powercell/small_safe_lonestar, +/obj/random/gun_parts/low, +/turf/simulated/floor/industrial/bricks, +/area/nadezhda/maintenance/undergroundfloor2west) + +(1,1,1) = {" +Z +C +J +x +"} +(2,1,1) = {" +D +E +Y +d +"} +(3,1,1) = {" +b +h +w +a +"} +(4,1,1) = {" +I +A +W +T +"} diff --git a/maps/MaintsRuins/4x4/4x4_mini_bar.dmm b/maps/MaintsRuins/4x4/4x4_mini_bar.dmm new file mode 100644 index 00000000000..dc25d0c3981 --- /dev/null +++ b/maps/MaintsRuins/4x4/4x4_mini_bar.dmm @@ -0,0 +1,129 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/machinery/portable_atmospherics/hydroponics/soil/invisible, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/pill/floorpill, +/obj/structure/closet/crate/trashcart, +/turf/simulated/floor/industrial/checker_large, +/area/nadezhda/maintenance/undergroundfloor2west) +"i" = ( +/obj/machinery/portable_atmospherics/hydroponics/soil/invisible, +/obj/random/pouch/hardcase_ammo/low_chance, +/turf/simulated/floor/industrial/checker_large, +/area/nadezhda/maintenance/undergroundfloor2west) +"w" = ( +/obj/machinery/portable_atmospherics/hydroponics/soil/invisible, +/obj/structure/bed/chair/wood{ + dir = 4 + }, +/obj/item/storage/wallet/random, +/turf/simulated/floor/industrial/checker_large, +/area/nadezhda/maintenance/undergroundfloor2west) +"x" = ( +/obj/machinery/portable_atmospherics/hydroponics/soil/invisible, +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/wood{ + dir = 4 + }, +/obj/item/reagent_containers/pill/floorpill, +/obj/item/trash/spitwad, +/obj/random/dungeon_ammo/really_low_chance, +/obj/random/dungeon_ammo/really_low_chance, +/turf/simulated/floor/industrial/checker_large, +/area/nadezhda/maintenance/undergroundfloor2west) +"y" = ( +/obj/machinery/portable_atmospherics/hydroponics/soil/invisible, +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/woodentable, +/obj/random/booze/low_chance, +/obj/item/trash/plate, +/turf/simulated/floor/industrial/fancy_slates, +/area/nadezhda/maintenance/undergroundfloor2west) +"E" = ( +/obj/machinery/portable_atmospherics/hydroponics/soil/invisible, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small, +/turf/simulated/floor/industrial/checker_large, +/area/nadezhda/maintenance/undergroundfloor2west) +"F" = ( +/obj/machinery/portable_atmospherics/hydroponics/soil/invisible, +/obj/structure/bed/chair/wood{ + dir = 8 + }, +/obj/item/trash/icecreambowl, +/turf/simulated/floor/industrial/fancy_slates, +/area/nadezhda/maintenance/undergroundfloor2west) +"H" = ( +/obj/machinery/portable_atmospherics/hydroponics/soil/invisible, +/obj/random/closet_maintloot, +/turf/simulated/floor/industrial/checker_large, +/area/nadezhda/maintenance/undergroundfloor2west) +"L" = ( +/obj/machinery/portable_atmospherics/hydroponics/soil/invisible, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/industrial/checker_large, +/area/nadezhda/maintenance/undergroundfloor2west) +"O" = ( +/obj/machinery/portable_atmospherics/hydroponics/soil/invisible, +/obj/structure/table/woodentable, +/obj/random/booze/low_chance, +/obj/random/junkfood/low_chance, +/obj/item/trash/plate, +/turf/simulated/floor/industrial/fancy_slates, +/area/nadezhda/maintenance/undergroundfloor2west) +"Q" = ( +/obj/machinery/portable_atmospherics/hydroponics/soil/invisible, +/obj/random/booze/low_chance, +/obj/structure/salvageable/personal, +/turf/simulated/floor/industrial/fancy_slates, +/area/nadezhda/maintenance/undergroundfloor2west) +"V" = ( +/obj/machinery/portable_atmospherics/hydroponics/soil/invisible, +/turf/simulated/floor/industrial/checker_large, +/area/nadezhda/maintenance/undergroundfloor2west) +"W" = ( +/obj/machinery/portable_atmospherics/hydroponics/soil/invisible, +/obj/item/trash/semki, +/turf/simulated/floor/industrial/checker_large, +/area/nadezhda/maintenance/undergroundfloor2west) +"X" = ( +/obj/machinery/portable_atmospherics/hydroponics/soil/invisible, +/obj/structure/table/woodentable, +/obj/random/booze/low_chance, +/obj/random/junkfood/low_chance, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/item/trash/semki, +/turf/simulated/floor/industrial/fancy_slates, +/area/nadezhda/maintenance/undergroundfloor2west) +"Y" = ( +/obj/machinery/portable_atmospherics/hydroponics/soil/invisible, +/obj/item/reagent_containers/pill/floorpill, +/turf/simulated/floor/industrial/fancy_slates, +/area/nadezhda/maintenance/undergroundfloor2west) + +(1,1,1) = {" +H +W +V +a +"} +(2,1,1) = {" +w +V +x +i +"} +(3,1,1) = {" +X +O +y +E +"} +(4,1,1) = {" +Q +F +Y +L +"} diff --git a/maps/MaintsRuins/4x4/4x4_pc_place.dmm b/maps/MaintsRuins/4x4/4x4_pc_place.dmm new file mode 100644 index 00000000000..465d80821bb --- /dev/null +++ b/maps/MaintsRuins/4x4/4x4_pc_place.dmm @@ -0,0 +1,61 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/random/scrap/sparse_even/low_chance, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/industrial/grey_slates, +/area/nadezhda/maintenance/undergroundfloor2west) +"m" = ( +/obj/random/closet_maintloot/low_chance, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/industrial/grey_slates, +/area/nadezhda/maintenance/undergroundfloor2west) +"n" = ( +/obj/machinery/light/small, +/obj/random/scrap/sparse_even/low_chance, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/industrial/grey_slates, +/area/nadezhda/maintenance/undergroundfloor2west) +"y" = ( +/obj/random/junk/low_chance, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/industrial/grey_slates, +/area/nadezhda/maintenance/undergroundfloor2west) +"D" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/industrial/grey_slates, +/area/nadezhda/maintenance/undergroundfloor2west) +"O" = ( +/obj/random/closet_tech/low_chance, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/industrial/grey_slates, +/area/nadezhda/maintenance/undergroundfloor2west) +"U" = ( +/obj/random/structures/low_chance, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/industrial/grey_slates, +/area/nadezhda/maintenance/undergroundfloor2west) + +(1,1,1) = {" +U +D +D +a +"} +(2,1,1) = {" +U +D +D +n +"} +(3,1,1) = {" +y +D +D +m +"} +(4,1,1) = {" +a +D +D +O +"} diff --git a/maps/MaintsRuins/4x4/4x4_trash_dump.dmm b/maps/MaintsRuins/4x4/4x4_trash_dump.dmm new file mode 100644 index 00000000000..ef97a9cd07c --- /dev/null +++ b/maps/MaintsRuins/4x4/4x4_trash_dump.dmm @@ -0,0 +1,80 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/effect/decal/cleanable/dirt, +/obj/random/closet_maintloot/low_chance, +/turf/simulated/floor/plating/under, +/area/nadezhda/maintenance/undergroundfloor2west) +"f" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/random/mob/roaches, +/turf/simulated/floor/plating/under, +/area/nadezhda/maintenance/undergroundfloor2west) +"h" = ( +/obj/effect/decal/cleanable/dirt, +/obj/random/scrap/dense_even, +/turf/simulated/floor/plating/under, +/area/nadezhda/maintenance/undergroundfloor2west) +"o" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/random/junk, +/turf/simulated/floor/plating/under, +/area/nadezhda/maintenance/undergroundfloor2west) +"q" = ( +/obj/effect/decal/cleanable/dirt, +/obj/random/junkfood/rotten/low_chance, +/turf/simulated/floor/plating/under, +/area/nadezhda/maintenance/undergroundfloor2west) +"u" = ( +/obj/effect/decal/cleanable/dirt, +/obj/random/junkfood/rotten/low_chance, +/obj/random/pack/junk_machine/low_chance, +/turf/simulated/floor/plating/under, +/area/nadezhda/maintenance/undergroundfloor2west) +"y" = ( +/obj/effect/decal/cleanable/dirt, +/obj/random/scrap/sparse_even/low_chance, +/obj/random/mob/roaches, +/turf/simulated/floor/plating/under, +/area/nadezhda/maintenance/undergroundfloor2west) +"A" = ( +/obj/effect/decal/cleanable/dirt, +/obj/random/scrap/sparse_even/low_chance, +/turf/simulated/floor/plating/under, +/area/nadezhda/maintenance/undergroundfloor2west) +"T" = ( +/obj/effect/decal/cleanable/dirt, +/obj/random/junk, +/obj/random/pack/junk_machine/low_chance, +/turf/simulated/floor/plating/under, +/area/nadezhda/maintenance/undergroundfloor2west) + +(1,1,1) = {" +f +q +o +a +"} +(2,1,1) = {" +A +y +q +a +"} +(3,1,1) = {" +h +A +A +u +"} +(4,1,1) = {" +h +h +A +T +"} diff --git a/maps/__Nadezhda/map/_Nadezhda_Colony.dmm b/maps/__Nadezhda/map/_Nadezhda_Colony.dmm index 75814a28120..d732b19dc51 100644 --- a/maps/__Nadezhda/map/_Nadezhda_Colony.dmm +++ b/maps/__Nadezhda/map/_Nadezhda_Colony.dmm @@ -6973,13 +6973,6 @@ /obj/structure/disposalpipe/junction, /turf/simulated/floor/tiled/steel/cyancorner, /area/nadezhda/hallway/side/f2section1) -"bsf" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/bed/chair/wood{ - dir = 8 - }, -/turf/simulated/floor/industrial/bricks, -/area/nadezhda/maintenance/undergroundfloor2east) "bsq" = ( /obj/structure/sign/department/gene, /turf/simulated/wall/r_wall, @@ -11674,9 +11667,8 @@ /turf/simulated/wall/r_wall, /area/nadezhda/command/armory) "cnF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/cluster/roaches/lower_chance, -/turf/simulated/floor/industrial/bricks, +/obj/effect/landmark/stationroom/maint/threexthree, +/turf/simulated/floor/plating/under, /area/nadezhda/maintenance/undergroundfloor2east) "cnN" = ( /obj/item/spider_shadow_trap{ @@ -18638,14 +18630,6 @@ name = "murky water" }, /area/nadezhda/maintenance/surfaceeast) -"dEa" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/random/scrap, -/turf/simulated/floor/industrial/bricks, -/area/nadezhda/maintenance/undergroundfloor2east) "dEh" = ( /obj/effect/floor_decal/industrial/hatch, /turf/simulated/floor/industrial/ornate, @@ -25828,14 +25812,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark/cyancorner, /area/nadezhda/crew_quarters/sleep/cryo2) -"eVA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/steel, -/obj/item/contraband/poster, -/obj/item/contraband/poster, -/obj/item/pen/multi, -/turf/simulated/floor/industrial/bricks, -/area/nadezhda/maintenance/undergroundfloor2east) "eVG" = ( /obj/structure/bed/chair/comfy/black, /turf/simulated/floor/wood/wild3, @@ -33483,12 +33459,6 @@ /obj/item/storage/bag/trash, /turf/simulated/floor/industrial/fancy_slates, /area/nadezhda/maintenance/undergroundfloor1west) -"gru" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, -/obj/random/structures, -/turf/simulated/floor/industrial/bricks, -/area/nadezhda/maintenance/undergroundfloor2east) "grv" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/window/reinforced/tinted/frosted{ @@ -45147,11 +45117,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel, /area/nadezhda/rnd/xenobiology/xenoflora) -"iBd" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/portable_atmospherics/hydroponics, -/turf/simulated/floor/industrial/black_large_slates, -/area/nadezhda/maintenance/undergroundfloor2east) "iBe" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -48145,11 +48110,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel/gray_perforated, /area/nadezhda/security/prisoncells) -"jgp" = ( -/obj/random/structures/low_chance, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/industrial/grey_slates, -/area/nadezhda/maintenance/undergroundfloor2west) "jgt" = ( /obj/machinery/light, /obj/effect/decal/cleanable/dirt, @@ -50469,11 +50429,6 @@ name = "murky water" }, /area/nadezhda/maintenance/undergroundfloor1north) -"jCS" = ( -/obj/random/closet_tech/low_chance, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/industrial/grey_slates, -/area/nadezhda/maintenance/undergroundfloor2west) "jCT" = ( /obj/machinery/light{ dir = 8 @@ -58747,13 +58702,6 @@ /obj/effect/floor_decal/industrial/box/red/corners, /turf/simulated/floor/tiled/dark/monofloor, /area/nadezhda/security/armory_blackshield) -"ljR" = ( -/obj/structure/table/woodentable, -/obj/random/gun_parts/low, -/obj/random/ammo, -/obj/random/gun_parts/low, -/turf/simulated/floor/industrial/bricks, -/area/nadezhda/maintenance/undergroundfloor2east) "ljU" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -64225,10 +64173,6 @@ }, /turf/simulated/floor/tiled/steel/golden, /area/nadezhda/hallway/main/stairwell) -"mmD" = ( -/obj/item/contraband/poster/placed/generic/do_not_question, -/turf/simulated/wall, -/area/nadezhda/maintenance/undergroundfloor2east) "mmE" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -69344,10 +69288,6 @@ "nkI" = ( /turf/unsimulated/mineral, /area/nadezhda/outside/dcave) -"nkJ" = ( -/obj/item/contraband/poster/placed/generic/work_for_a_future, -/turf/simulated/wall, -/area/nadezhda/maintenance/undergroundfloor2east) "nkL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -74629,11 +74569,6 @@ /obj/structure/flora/ausbushes/genericbush, /turf/simulated/floor/asteroid/grass, /area/nadezhda/crew_quarters/pool) -"ohs" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/watertank/derelict, -/turf/simulated/floor/industrial/black_large_slates, -/area/nadezhda/maintenance/undergroundfloor2east) "ohx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, @@ -78075,11 +78010,6 @@ "oNS" = ( /turf/simulated/wall/r_wall, /area/nadezhda/command/captain) -"oNW" = ( -/obj/random/closet_maintloot/low_chance, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/industrial/grey_slates, -/area/nadezhda/maintenance/undergroundfloor2west) "oOa" = ( /obj/machinery/vending/cigarette, /obj/effect/floor_decal/industrial/outline, @@ -78180,13 +78110,6 @@ /obj/machinery/newscaster/directional/north, /turf/simulated/floor/plating/under, /area/nadezhda/engineering/shield_generator) -"oOM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/steel, -/obj/item/contraband/poster, -/obj/item/contraband/poster, -/turf/simulated/floor/industrial/bricks, -/area/nadezhda/maintenance/undergroundfloor2east) "oON" = ( /obj/structure/window/reinforced{ dir = 1 @@ -81882,12 +81805,6 @@ }, /turf/simulated/floor/wood, /area/nadezhda/command/cro) -"pze" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/random/spider_trap_burrowing/low_chance, -/turf/simulated/floor/industrial/black_large_slates, -/area/nadezhda/maintenance/undergroundfloor2east) "pzf" = ( /obj/machinery/atmospherics/pipe/zpipe/up, /obj/structure/cable/green{ @@ -86699,11 +86616,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/industrial/fancy_slates, /area/nadezhda/maintenance/undergroundfloor2north) -"qsQ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/scrap, -/turf/simulated/floor/industrial/bricks, -/area/nadezhda/maintenance/undergroundfloor2east) "qsS" = ( /obj/structure/cable/green{ d1 = 1; @@ -87450,10 +87362,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating/under, /area/nadezhda/maintenance/undergroundfloor1south) -"qAG" = ( -/obj/item/contraband/poster/placed/generic/here_for_your_safety, -/turf/simulated/wall, -/area/nadezhda/maintenance/undergroundfloor2east) "qAJ" = ( /obj/structure/shuttle_part/escpod{ icon_state = "escpodwall10"; @@ -90841,16 +90749,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark/gray_platform, /area/nadezhda/crew_quarters/hydroponics) -"riF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/steel, -/obj/item/contraband/poster, -/obj/item/contraband/poster, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/industrial/bricks, -/area/nadezhda/maintenance/undergroundfloor2east) "riH" = ( /obj/machinery/light/small, /turf/simulated/floor/tiled/steel/orangecorner, @@ -98234,10 +98132,6 @@ "sCn" = ( /turf/simulated/floor/tiled/white/monofloor, /area/nadezhda/medical/organ_lab) -"sCI" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/industrial/bricks, -/area/nadezhda/maintenance/undergroundfloor2east) "sCN" = ( /obj/effect/window_lwall_spawn/reinforced, /obj/machinery/door/firedoor, @@ -100701,12 +100595,6 @@ }, /turf/simulated/floor/reinforced/airless, /area/nadezhda/engineering/atmos) -"tcG" = ( -/obj/machinery/light/small, -/obj/random/scrap/sparse_even/low_chance, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/industrial/grey_slates, -/area/nadezhda/maintenance/undergroundfloor2west) "tcI" = ( /obj/structure/shuttle_part/science{ icon_state = "4,17" @@ -104416,12 +104304,6 @@ /obj/item/rig/combat/knight/equipped, /turf/simulated/floor/carpet/bcarpet, /area/nadezhda/command/prime) -"tNg" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/marble, -/obj/item/storage/bag/produce, -/turf/simulated/floor/industrial/black_large_slates, -/area/nadezhda/maintenance/undergroundfloor2east) "tNh" = ( /obj/structure/salvageable/computer, /obj/structure/table/steel, @@ -112475,11 +112357,6 @@ /obj/effect/decal/cleanable/rubble, /turf/simulated/floor/industrial/bricks, /area/nadezhda/maintenance/undergroundfloor1east) -"vkU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/scrap, -/turf/simulated/floor/industrial/black_large_slates, -/area/nadezhda/maintenance/undergroundfloor2east) "vkX" = ( /obj/structure/curtain/open/privacy, /obj/machinery/camera/network/medbay{ @@ -123959,13 +123836,6 @@ /obj/item/trash/material/circuit, /turf/simulated/floor/tiled/dark/violetcorener, /area/nadezhda/crew_quarters/techshop) -"xsk" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/bed/chair/office/light{ - dir = 1 - }, -/turf/simulated/floor/industrial/bricks, -/area/nadezhda/maintenance/undergroundfloor2east) "xss" = ( /obj/machinery/light{ dir = 8 @@ -124175,11 +124045,6 @@ }, /turf/simulated/floor/wood, /area/nadezhda/command/swo/quarters) -"xuh" = ( -/obj/random/junk/low_chance, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/industrial/grey_slates, -/area/nadezhda/maintenance/undergroundfloor2west) "xun" = ( /obj/item/grenade/chem_grenade/cleaner, /obj/item/grenade/chem_grenade/cleaner, @@ -124843,14 +124708,6 @@ }, /turf/simulated/floor/tiled/dark/techfloor, /area/nadezhda/absolutism/bioreactor) -"xAR" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/industrial/black_large_slates, -/area/nadezhda/maintenance/undergroundfloor2east) "xAU" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/cyan{ @@ -125000,14 +124857,6 @@ name = "murky water" }, /area/nadezhda/maintenance/undergroundfloor1west) -"xBH" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/woodentable, -/obj/item/tool/hammer, -/obj/item/tool/screwdriver, -/obj/item/tool/wirecutters/pliers, -/turf/simulated/floor/industrial/bricks, -/area/nadezhda/maintenance/undergroundfloor2east) "xBJ" = ( /obj/structure/flora/ausbushes/pointybush, /turf/simulated/floor/asteroid/grass, @@ -126176,11 +126025,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/carpet, /area/nadezhda/crew_quarters/bar) -"xMw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/industrial/bricks, -/area/nadezhda/maintenance/undergroundfloor2east) "xMH" = ( /obj/machinery/door/unpowered/simple/wood, /turf/simulated/floor/wood, @@ -127280,14 +127124,6 @@ }, /turf/simulated/floor/tiled/steel/panels, /area/nadezhda/crew_quarters/dorm1) -"xYr" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/woodentable, -/obj/random/gun_parts/low, -/obj/random/ammo, -/obj/random/gun_parts/low, -/turf/simulated/floor/industrial/bricks, -/area/nadezhda/maintenance/undergroundfloor2east) "xYw" = ( /obj/machinery/portable_atmospherics/hydroponics/soil/invisible, /obj/structure/bed/chair/wood{ @@ -127784,9 +127620,8 @@ /turf/simulated/floor/plating/under, /area/nadezhda/maintenance/undergroundfloor2west) "ydi" = ( -/obj/random/scrap/sparse_even/low_chance, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/industrial/grey_slates, +/obj/effect/landmark/stationroom/maint/fourfour, +/turf/simulated/floor/plating/under, /area/nadezhda/maintenance/undergroundfloor2west) "ydj" = ( /obj/machinery/multistructure/bioreactor_part/bioport, @@ -179780,9 +179615,9 @@ gqf sxB duc tvc -jgp -rFV -rFV +aDK +aDK +aDK ydi tvc kOQ @@ -179982,10 +179817,10 @@ gqf sxB duc tvc -jgp -rFV -rFV -tcG +aDK +aDK +aDK +aDK tvc kOQ jXo @@ -180184,10 +180019,10 @@ sOE oak duc tvc -xuh -rFV -rFV -oNW +aDK +aDK +aDK +aDK tvc kOQ jXo @@ -180386,10 +180221,10 @@ gqf hME nPw tvc -ydi -rFV -rFV -jCS +aDK +aDK +aDK +aDK tvc kyH jXo @@ -203748,18 +203583,18 @@ tad cZb cZb cZb -mmD -oOM -dEa +wEB +dAa +dAa cnF wEB -tNg -vkU -pze +dAa +dAa +cnF wEB -sCI -xMw -bsf +dAa +dAa +cnF wEB bpl wkn @@ -203950,18 +203785,18 @@ tad cZb cZb cZb -nkJ -eVA -xsk -qsQ wEB -ohs -yhm -jWZ +dAa +dAa +dAa +wEB +dAa +dAa +dAa wEB -xBH -sCI -gru +dAa +dAa +dAa wEB iRI uhX @@ -204152,18 +203987,18 @@ tad cZb cZb cZb -qAG -oOM -riF -oOM wEB -iBd -xAR -iBd +dAa +dAa +dAa +wEB +dAa +dAa +dAa shD -ljR -xYr -ljR +dAa +dAa +dAa wEB uhX huB From a8f09c531c642bb11d9eebdf057e93f36f6bf455 Mon Sep 17 00:00:00 2001 From: Trilby Date: Tue, 24 Dec 2024 00:53:31 -0500 Subject: [PATCH 3/9] allows spawns --- code/datums/ruins/maints.dm | 50 +++++++++++++++++++-- code/game/objects/landmarks/maints_ruins.dm | 2 +- 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/code/datums/ruins/maints.dm b/code/datums/ruins/maints.dm index 9ef01a705c4..5bfa833f6f0 100644 --- a/code/datums/ruins/maints.dm +++ b/code/datums/ruins/maints.dm @@ -13,6 +13,48 @@ /datum/map_template/ruin/station/maint/threexthree prefix = "maps/MaintsRuins/3x3/" +//Made assuming door is on the west +/datum/map_template/ruin/station/maint/threexthree/minihydro + id = "MiniHydro" + suffix = "3x3_minihydro.dmm" + name = "Maint MiniHydro" + +//Made assuming door is on the west +/datum/map_template/ruin/station/maint/threexthree/posters + id = "Posters" + suffix = "3x3_posters.dmm" + name = "Maint Posters" + +//Made assuming door is on the west +/datum/map_template/ruin/station/maint/threexthree/guntinerk + id = "Guntinerk" + suffix = "3x3_guntinerk.dmm" + name = "Maint Guntinerk" + +//Made assuming door is on the west +/datum/map_template/ruin/station/maint/threexthree/kcoin + id = "Kcoin" + suffix = "3x3_kcoin.dmm" + name = "Maint Kcoin" + +//Made assuming door is on the west +/datum/map_template/ruin/station/maint/threexthree/meat + id = "Meat" + suffix = "3x3_meat.dmm" + name = "Maint Meat" + +//Made assuming door is on the west +/datum/map_template/ruin/station/maint/threexthree/barrels + id = "Barrels" + suffix = "3x3_barrels.dmm" + name = "Maint Barrels" + +//Made assuming door is on the west +/datum/map_template/ruin/station/maint/threexthree/floor_repair_shop + id = "Floor Repair Shop" + suffix = "3x3_floor_repair_shop.dmm" + name = "Maint Floor Repair Shop" + /* Examples / not ported /datum/map_template/ruin/station/maint/threexthree/oldstorage id = "OldStorage" @@ -24,26 +66,26 @@ /datum/map_template/ruin/station/maint/fourxfour prefix = "maps/MaintsRuins/4x4/" +//Made assuming door is on the west /datum/map_template/ruin/station/maint/fourxfour/oldstorage id = "OldStorage" - prefix = "maps/MaintsRuins/4x4/" suffix = "4x4_mixed_storage.dmm" name = "Maint MixedStorage" +//Made assuming door is on the west /datum/map_template/ruin/station/maint/fourxfour/trashdump id = "Trashdump" - prefix = "maps/MaintsRuins/4x4/" suffix = "4x4_trash_dump.dmm" name = "Maint Trashdump" +//Made assuming door is on the west /datum/map_template/ruin/station/maint/fourxfour/mini_bar id = "MiniBar" - prefix = "maps/MaintsRuins/4x4/" suffix = "4x4_mini_bar.dmm" name = "Maint Mini Bar" +//Made assuming door is on the west /datum/map_template/ruin/station/maint/fourxfour/guntinker id = "Guntinker" - prefix = "maps/MaintsRuins/4x4/" suffix = "4x4_guntinker.dmm" name = "Maint Guntinker" \ No newline at end of file diff --git a/code/game/objects/landmarks/maints_ruins.dm b/code/game/objects/landmarks/maints_ruins.dm index 4425c1b33be..e3430ff579b 100644 --- a/code/game/objects/landmarks/maints_ruins.dm +++ b/code/game/objects/landmarks/maints_ruins.dm @@ -65,7 +65,7 @@ GLOBAL_LIST_EMPTY(chosen_station_templates) unique = TRUE /obj/effect/landmark/stationroom/maint/threexthree - template_names = list() + template_names = list("Maint MiniHydro" = 5, "Maint Posters" = 5, "Maint Guntinerk" = 5, "Maint Kcoin" = 1, "Maint Meat" = 1, "Maint Barrels" = 1, "Maint Floor Repair Shop" = 1) /obj/effect/landmark/stationroom/maint/threexfive template_names = list() From b8db5cc702e3c1c64aaa5db02fe6686d17d80345 Mon Sep 17 00:00:00 2001 From: Trilby Date: Tue, 24 Dec 2024 00:57:16 -0500 Subject: [PATCH 4/9] Update _Nadezhda_Colony.dmm --- maps/__Nadezhda/map/_Nadezhda_Colony.dmm | 261 +++++------------------ 1 file changed, 48 insertions(+), 213 deletions(-) diff --git a/maps/__Nadezhda/map/_Nadezhda_Colony.dmm b/maps/__Nadezhda/map/_Nadezhda_Colony.dmm index 6590572f7ba..6422c278cea 100644 --- a/maps/__Nadezhda/map/_Nadezhda_Colony.dmm +++ b/maps/__Nadezhda/map/_Nadezhda_Colony.dmm @@ -6972,11 +6972,8 @@ }, /area/nadezhda/maintenance/undergroundfloor1north) "bsf" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/bed/chair/wood{ - dir = 8 - }, -/turf/simulated/floor/industrial/bricks, +/obj/effect/landmark/stationroom/maint/threexthree, +/turf/simulated/floor/plating/under, /area/nadezhda/maintenance/undergroundfloor2east) "bsg" = ( /obj/structure/table/rack/shelf, @@ -11676,11 +11673,6 @@ /obj/structure/sign/warning/armory/small, /turf/simulated/wall/r_wall, /area/nadezhda/command/armory) -"cnF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/cluster/roaches/lower_chance, -/turf/simulated/floor/industrial/bricks, -/area/nadezhda/maintenance/undergroundfloor2east) "cnN" = ( /obj/item/spider_shadow_trap{ pixel_x = -26; @@ -18693,14 +18685,6 @@ name = "murky water" }, /area/nadezhda/maintenance/surfaceeast) -"dEa" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/random/scrap, -/turf/simulated/floor/industrial/bricks, -/area/nadezhda/maintenance/undergroundfloor2east) "dEh" = ( /obj/effect/floor_decal/industrial/hatch, /turf/simulated/floor/industrial/ornate, @@ -25898,14 +25882,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark/cyancorner, /area/nadezhda/crew_quarters/sleep/cryo2) -"eVA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/steel, -/obj/item/contraband/poster, -/obj/item/contraband/poster, -/obj/item/pen/multi, -/turf/simulated/floor/industrial/bricks, -/area/nadezhda/maintenance/undergroundfloor2east) "eVG" = ( /obj/structure/bed/chair/comfy/black, /turf/simulated/floor/wood/wild3, @@ -33537,12 +33513,6 @@ /obj/item/storage/bag/trash, /turf/simulated/floor/industrial/fancy_slates, /area/nadezhda/maintenance/undergroundfloor1west) -"gru" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, -/obj/random/structures, -/turf/simulated/floor/industrial/bricks, -/area/nadezhda/maintenance/undergroundfloor2east) "grv" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/window/reinforced/tinted/frosted{ @@ -45160,11 +45130,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel, /area/nadezhda/rnd/xenobiology/xenoflora) -"iBd" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/portable_atmospherics/hydroponics, -/turf/simulated/floor/industrial/black_large_slates, -/area/nadezhda/maintenance/undergroundfloor2east) "iBe" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -48142,11 +48107,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel/gray_perforated, /area/nadezhda/security/prisoncells) -"jgp" = ( -/obj/random/structures/low_chance, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/industrial/grey_slates, -/area/nadezhda/maintenance/undergroundfloor2west) "jgt" = ( /obj/machinery/light, /obj/effect/decal/cleanable/dirt, @@ -50465,11 +50425,6 @@ name = "murky water" }, /area/nadezhda/maintenance/undergroundfloor1north) -"jCS" = ( -/obj/random/closet_tech/low_chance, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/industrial/grey_slates, -/area/nadezhda/maintenance/undergroundfloor2west) "jCT" = ( /obj/machinery/light{ dir = 8 @@ -58745,13 +58700,6 @@ /obj/effect/floor_decal/industrial/box/red/corners, /turf/simulated/floor/tiled/dark/monofloor, /area/nadezhda/security/armory_blackshield) -"ljR" = ( -/obj/structure/table/woodentable, -/obj/random/gun_parts/low, -/obj/random/ammo, -/obj/random/gun_parts/low, -/turf/simulated/floor/industrial/bricks, -/area/nadezhda/maintenance/undergroundfloor2east) "ljU" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -64233,10 +64181,6 @@ }, /turf/simulated/floor/tiled/steel/golden, /area/nadezhda/hallway/main/stairwell) -"mmD" = ( -/obj/item/contraband/poster/placed/generic/do_not_question, -/turf/simulated/wall, -/area/nadezhda/maintenance/undergroundfloor2east) "mmE" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -69369,10 +69313,6 @@ "nkI" = ( /turf/unsimulated/mineral, /area/nadezhda/outside/dcave) -"nkJ" = ( -/obj/item/contraband/poster/placed/generic/work_for_a_future, -/turf/simulated/wall, -/area/nadezhda/maintenance/undergroundfloor2east) "nkL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -74650,11 +74590,6 @@ /obj/structure/flora/ausbushes/genericbush, /turf/simulated/floor/asteroid/grass, /area/nadezhda/crew_quarters/pool) -"ohs" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/watertank/derelict, -/turf/simulated/floor/industrial/black_large_slates, -/area/nadezhda/maintenance/undergroundfloor2east) "ohx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, @@ -78081,11 +78016,6 @@ "oNS" = ( /turf/simulated/wall/r_wall, /area/nadezhda/command/captain) -"oNW" = ( -/obj/random/closet_maintloot/low_chance, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/industrial/grey_slates, -/area/nadezhda/maintenance/undergroundfloor2west) "oOa" = ( /obj/machinery/vending/cigarette, /obj/effect/floor_decal/industrial/outline, @@ -78186,13 +78116,6 @@ /obj/machinery/newscaster/directional/north, /turf/simulated/floor/plating/under, /area/nadezhda/engineering/shield_generator) -"oOM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/steel, -/obj/item/contraband/poster, -/obj/item/contraband/poster, -/turf/simulated/floor/industrial/bricks, -/area/nadezhda/maintenance/undergroundfloor2east) "oON" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed/chair, @@ -81879,12 +81802,6 @@ }, /turf/simulated/floor/wood, /area/nadezhda/command/cro) -"pze" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/random/spider_trap_burrowing/low_chance, -/turf/simulated/floor/industrial/black_large_slates, -/area/nadezhda/maintenance/undergroundfloor2east) "pzf" = ( /obj/machinery/atmospherics/pipe/zpipe/up, /obj/structure/cable/green{ @@ -86715,11 +86632,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/industrial/fancy_slates, /area/nadezhda/maintenance/undergroundfloor2north) -"qsQ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/scrap, -/turf/simulated/floor/industrial/bricks, -/area/nadezhda/maintenance/undergroundfloor2east) "qsS" = ( /obj/structure/cable/green{ d1 = 1; @@ -87458,10 +87370,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating/under, /area/nadezhda/maintenance/undergroundfloor1south) -"qAG" = ( -/obj/item/contraband/poster/placed/generic/here_for_your_safety, -/turf/simulated/wall, -/area/nadezhda/maintenance/undergroundfloor2east) "qAJ" = ( /obj/structure/shuttle_part/escpod{ icon_state = "escpodwall10"; @@ -90848,16 +90756,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark/gray_platform, /area/nadezhda/crew_quarters/hydroponics) -"riF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/steel, -/obj/item/contraband/poster, -/obj/item/contraband/poster, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/industrial/bricks, -/area/nadezhda/maintenance/undergroundfloor2east) "riH" = ( /obj/machinery/light/small, /turf/simulated/floor/tiled/steel/orangecorner, @@ -98217,10 +98115,6 @@ "sCn" = ( /turf/simulated/floor/tiled/white/monofloor, /area/nadezhda/medical/organ_lab) -"sCI" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/industrial/bricks, -/area/nadezhda/maintenance/undergroundfloor2east) "sCN" = ( /obj/effect/window_lwall_spawn/reinforced, /obj/machinery/door/firedoor, @@ -100689,12 +100583,6 @@ }, /turf/simulated/floor/reinforced/airless, /area/nadezhda/engineering/atmos) -"tcG" = ( -/obj/machinery/light/small, -/obj/random/scrap/sparse_even/low_chance, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/industrial/grey_slates, -/area/nadezhda/maintenance/undergroundfloor2west) "tcI" = ( /obj/structure/shuttle_part/science{ icon_state = "4,17" @@ -104387,12 +104275,6 @@ /obj/item/rig/combat/knight/equipped, /turf/simulated/floor/carpet/bcarpet, /area/nadezhda/command/prime) -"tNg" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/marble, -/obj/item/storage/bag/produce, -/turf/simulated/floor/industrial/black_large_slates, -/area/nadezhda/maintenance/undergroundfloor2east) "tNh" = ( /obj/structure/salvageable/computer, /obj/structure/table/steel, @@ -112427,11 +112309,6 @@ /obj/item/storage/box/cups, /turf/simulated/floor/tiled/dark/techfloor, /area/nadezhda/command/hallway) -"vkU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/scrap, -/turf/simulated/floor/industrial/black_large_slates, -/area/nadezhda/maintenance/undergroundfloor2east) "vkX" = ( /obj/structure/curtain/open/privacy, /obj/machinery/camera/network/medbay{ @@ -123939,13 +123816,6 @@ /obj/item/trash/material/circuit, /turf/simulated/floor/tiled/dark/violetcorener, /area/nadezhda/crew_quarters/techshop) -"xsk" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/bed/chair/office/light{ - dir = 1 - }, -/turf/simulated/floor/industrial/bricks, -/area/nadezhda/maintenance/undergroundfloor2east) "xss" = ( /obj/machinery/light{ dir = 8 @@ -124155,11 +124025,6 @@ }, /turf/simulated/floor/wood, /area/nadezhda/command/swo/quarters) -"xuh" = ( -/obj/random/junk/low_chance, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/industrial/grey_slates, -/area/nadezhda/maintenance/undergroundfloor2west) "xun" = ( /obj/item/grenade/chem_grenade/cleaner, /obj/item/grenade/chem_grenade/cleaner, @@ -124817,14 +124682,6 @@ }, /turf/simulated/floor/tiled/dark/techfloor, /area/nadezhda/absolutism/bioreactor) -"xAR" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/industrial/black_large_slates, -/area/nadezhda/maintenance/undergroundfloor2east) "xAU" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/cyan{ @@ -124974,14 +124831,6 @@ name = "murky water" }, /area/nadezhda/maintenance/undergroundfloor1west) -"xBH" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/woodentable, -/obj/item/tool/hammer, -/obj/item/tool/screwdriver, -/obj/item/tool/wirecutters/pliers, -/turf/simulated/floor/industrial/bricks, -/area/nadezhda/maintenance/undergroundfloor2east) "xBJ" = ( /obj/structure/flora/ausbushes/pointybush, /turf/simulated/floor/asteroid/grass, @@ -126143,11 +125992,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/carpet, /area/nadezhda/crew_quarters/bar) -"xMw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/industrial/bricks, -/area/nadezhda/maintenance/undergroundfloor2east) "xMH" = ( /obj/machinery/door/unpowered/simple/wood, /turf/simulated/floor/wood, @@ -127283,14 +127127,6 @@ }, /turf/simulated/floor/tiled/steel/panels, /area/nadezhda/crew_quarters/dorm1) -"xYr" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/woodentable, -/obj/random/gun_parts/low, -/obj/random/ammo, -/obj/random/gun_parts/low, -/turf/simulated/floor/industrial/bricks, -/area/nadezhda/maintenance/undergroundfloor2east) "xYw" = ( /obj/machinery/portable_atmospherics/hydroponics/soil/invisible, /obj/structure/bed/chair/wood{ @@ -127781,9 +127617,8 @@ /turf/simulated/floor/plating/under, /area/nadezhda/maintenance/undergroundfloor2west) "ydi" = ( -/obj/random/scrap/sparse_even/low_chance, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/industrial/grey_slates, +/obj/effect/landmark/stationroom/maint/fourfour, +/turf/simulated/floor/plating/under, /area/nadezhda/maintenance/undergroundfloor2west) "ydj" = ( /obj/machinery/multistructure/bioreactor_part/bioport, @@ -179760,9 +179595,9 @@ gqf sxB duc tvc -jgp -rFV -rFV +aDK +aDK +aDK ydi tvc kOQ @@ -179962,10 +179797,10 @@ gqf sxB duc tvc -jgp -rFV -rFV -tcG +aDK +aDK +aDK +aDK tvc kOQ jXo @@ -180164,10 +179999,10 @@ sOE oak duc tvc -xuh -rFV -rFV -oNW +aDK +aDK +aDK +aDK tvc kOQ jXo @@ -180366,10 +180201,10 @@ gqf hME nPw tvc -ydi -rFV -rFV -jCS +aDK +aDK +aDK +aDK tvc kyH jXo @@ -203728,17 +203563,17 @@ tad cZb cZb cZb -mmD -oOM -dEa -cnF wEB -tNg -vkU -pze +dAa +dAa +bsf wEB -sCI -xMw +dAa +dAa +bsf +wEB +dAa +dAa bsf wEB bpl @@ -203930,18 +203765,18 @@ tad cZb cZb cZb -nkJ -eVA -xsk -qsQ wEB -ohs -yhm -jWZ +dAa +dAa +dAa +wEB +dAa +dAa +dAa wEB -xBH -sCI -gru +dAa +dAa +dAa wEB iRI uhX @@ -204132,18 +203967,18 @@ tad cZb cZb cZb -qAG -oOM -riF -oOM wEB -iBd -xAR -iBd +dAa +dAa +dAa +wEB +dAa +dAa +dAa shD -ljR -xYr -ljR +dAa +dAa +dAa wEB uhX huB From 08538dd546210c1db6dc5ca58782bf19411aec77 Mon Sep 17 00:00:00 2001 From: Trilby Date: Tue, 24 Dec 2024 01:25:25 -0500 Subject: [PATCH 5/9] door correct --- maps/__Nadezhda/map/_Nadezhda_Colony.dmm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/maps/__Nadezhda/map/_Nadezhda_Colony.dmm b/maps/__Nadezhda/map/_Nadezhda_Colony.dmm index 6422c278cea..52b7620b8f2 100644 --- a/maps/__Nadezhda/map/_Nadezhda_Colony.dmm +++ b/maps/__Nadezhda/map/_Nadezhda_Colony.dmm @@ -52290,10 +52290,6 @@ /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/asteroid/grass, /area/nadezhda/crew_quarters/hydroponics) -"jVP" = ( -/obj/effect/window_lwall_spawn/reinforced, -/turf/simulated/floor/tiled/steel/brown_platform, -/area/nadezhda/maintenance/undergroundfloor2east) "jVR" = ( /obj/structure/toilet, /obj/machinery/light/small{ @@ -203370,9 +203366,9 @@ mrN mrN wgL wEB -eDd -jVP +wEB fXg +eDd wEB xJF wkn From 3cf3b7ecc4b6f2848ed31be31635f830465fa1b9 Mon Sep 17 00:00:00 2001 From: Trilby Date: Tue, 24 Dec 2024 19:25:48 -0500 Subject: [PATCH 6/9] name fix --- maps/MaintsRuins/4x4/{4x4_pc_place.dmm => 4x4_mixed_storage.dmm} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename maps/MaintsRuins/4x4/{4x4_pc_place.dmm => 4x4_mixed_storage.dmm} (100%) diff --git a/maps/MaintsRuins/4x4/4x4_pc_place.dmm b/maps/MaintsRuins/4x4/4x4_mixed_storage.dmm similarity index 100% rename from maps/MaintsRuins/4x4/4x4_pc_place.dmm rename to maps/MaintsRuins/4x4/4x4_mixed_storage.dmm From 196f9ab6b403ad722feafaa5e845bc0475bc1316 Mon Sep 17 00:00:00 2001 From: Trilby Date: Tue, 24 Dec 2024 20:51:20 -0500 Subject: [PATCH 7/9] left side vacant office randomization --- code/datums/ruins/hallway.dm | 37 +++ code/game/objects/landmarks/maints_ruins.dm | 10 +- .../left_side_vacant_office/bookcased.dmm | 176 +++++++++++ .../left_side_vacant_office/cleared_out.dmm | 197 +++++++++++++ .../left_side_vacant_office/framed.dmm | 198 +++++++++++++ .../left_side_vacant_office/housing.dmm | 193 ++++++++++++ .../left_side_vacant_office/tabled.dmm | 164 +++++++++++ .../left_side_vacant_office/trashed.dmm | 224 ++++++++++++++ maps/__Nadezhda/map/_Nadezhda_Colony.dmm | 275 +++++------------- sojourn-station.dme | 1 + 10 files changed, 1266 insertions(+), 209 deletions(-) create mode 100644 code/datums/ruins/hallway.dm create mode 100644 maps/MaintsRuins/left_side_vacant_office/bookcased.dmm create mode 100644 maps/MaintsRuins/left_side_vacant_office/cleared_out.dmm create mode 100644 maps/MaintsRuins/left_side_vacant_office/framed.dmm create mode 100644 maps/MaintsRuins/left_side_vacant_office/housing.dmm create mode 100644 maps/MaintsRuins/left_side_vacant_office/tabled.dmm create mode 100644 maps/MaintsRuins/left_side_vacant_office/trashed.dmm diff --git a/code/datums/ruins/hallway.dm b/code/datums/ruins/hallway.dm new file mode 100644 index 00000000000..15e21aa3d00 --- /dev/null +++ b/code/datums/ruins/hallway.dm @@ -0,0 +1,37 @@ + +//Base for the left side vacant office +/datum/map_template/ruin/station/maint/left_side_vacant_office + prefix = "maps/MaintsRuins/left_side_vacant_office/" + +//Assuming window doors are on east and door is northwest +/datum/map_template/ruin/station/maint/left_side_vacant_office/clearedout + id = "Clearedout" + suffix = "cleared_out.dmm" + name = "Vacant Clearedout" + +/datum/map_template/ruin/station/maint/left_side_vacant_office/tabled + id = "Tabled" + suffix = "tabled.dmm" + name = "Vacant Tabled" + +/datum/map_template/ruin/station/maint/left_side_vacant_office/framed + id = "Framed" + suffix = "fabled.dmm" + name = "Vacant Framed" + +/datum/map_template/ruin/station/maint/left_side_vacant_office/bookcased + id = "Bookcased" + suffix = "bookcased.dmm" + name = "Vacant Bookcased" + +/datum/map_template/ruin/station/maint/left_side_vacant_office/trashed + id = "Trashed" + suffix = "trashed.dmm" + name = "Vacant Trashed" + +/datum/map_template/ruin/station/maint/left_side_vacant_office/housing + id = "Housing" + suffix = "housing.dmm" + name = "Vacant Housing" + + diff --git a/code/game/objects/landmarks/maints_ruins.dm b/code/game/objects/landmarks/maints_ruins.dm index e3430ff579b..7cd658e2b97 100644 --- a/code/game/objects/landmarks/maints_ruins.dm +++ b/code/game/objects/landmarks/maints_ruins.dm @@ -83,4 +83,12 @@ GLOBAL_LIST_EMPTY(chosen_station_templates) template_names = list() /obj/effect/landmark/stationroom/maint/tenxten - template_names = list() \ No newline at end of file + template_names = list() + +//Localted in ruins/hallway.dm +/obj/effect/landmark/stationroom/maint/right_side_vacant_office + template_names = list() + +//Located in ruins/hallway.dm +/obj/effect/landmark/stationroom/maint/left_side_vacant_office + template_names = list("Vacant Clearedout" = 5, "Vacant Tabled" = 2, "Vacant Framed" = 2, "Vacant Bookcased" = 2, "Vacant Trashed" = 2, "Vacant Housing" = 2) \ No newline at end of file diff --git a/maps/MaintsRuins/left_side_vacant_office/bookcased.dmm b/maps/MaintsRuins/left_side_vacant_office/bookcased.dmm new file mode 100644 index 00000000000..b2b0cf578e2 --- /dev/null +++ b/maps/MaintsRuins/left_side_vacant_office/bookcased.dmm @@ -0,0 +1,176 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/machinery/alarm{ + dir = 1; + pixel_y = -32 + }, +/obj/structure/bookcase, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"f" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -32 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/filth, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"g" = ( +/obj/machinery/light, +/obj/structure/bookcase, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"j" = ( +/obj/structure/bookcase, +/obj/item/oddity/common/old_newspaper, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"p" = ( +/obj/machinery/camera/network/colony_underground{ + dir = 1 + }, +/obj/structure/bookcase, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"r" = ( +/obj/machinery/atmospherics/unary/vent_pump, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"t" = ( +/obj/machinery/button/remote/airlock{ + id = "FS1"; + name = "Door Bolt Control"; + pixel_y = 24; + specialfunctions = 4 + }, +/obj/structure/table/standard, +/obj/item/newspaper, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"v" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"w" = ( +/obj/structure/bookcase, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"y" = ( +/obj/item/device/lighting/toggleable/lamp, +/obj/structure/table/standard, +/obj/random/lowkeyrandom/low_chance, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"A" = ( +/obj/structure/table/standard, +/obj/item/paper_bin, +/obj/random/lowkeyrandom/low_chance, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"B" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -32 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/unary/vent_scrubber{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"G" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/filth, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"L" = ( +/obj/machinery/disposal, +/obj/effect/floor_decal/industrial/box/red, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = -22 + }, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"R" = ( +/obj/structure/bookcase, +/obj/item/oddity/common/paper_bundle, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"T" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"V" = ( +/obj/structure/bed/chair, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"W" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"Z" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) + +(1,1,1) = {" +B +Z +Z +Z +f +L +"} +(2,1,1) = {" +t +G +W +j +W +p +"} +(3,1,1) = {" +V +W +W +w +W +R +"} +(4,1,1) = {" +V +r +v +w +W +g +"} +(5,1,1) = {" +A +y +T +W +W +a +"} diff --git a/maps/MaintsRuins/left_side_vacant_office/cleared_out.dmm b/maps/MaintsRuins/left_side_vacant_office/cleared_out.dmm new file mode 100644 index 00000000000..a8580b0432d --- /dev/null +++ b/maps/MaintsRuins/left_side_vacant_office/cleared_out.dmm @@ -0,0 +1,197 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/machinery/disposal, +/obj/effect/floor_decal/industrial/box/red, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = -22 + }, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"b" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"d" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/remains/mouse, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"g" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/device/lighting/toggleable/lamp, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"k" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/filth, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"s" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -32 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/unary/vent_scrubber{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"t" = ( +/obj/structure/table/rack/shelf, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -32 + }, +/obj/random/rations/low_chance, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"v" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -32 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/filth, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"x" = ( +/obj/machinery/atmospherics/unary/vent_pump, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"y" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/trash/liquidfood, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"z" = ( +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"A" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/filth, +/obj/item/trash/candy/proteinbar, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"B" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/obj/random/scrap, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"D" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"I" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"J" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"K" = ( +/obj/structure/table/rack, +/obj/random/contraband/low_chance, +/obj/machinery/button/remote/airlock{ + id = "FS1"; + name = "Door Bolt Control"; + pixel_y = 24; + specialfunctions = 4 + }, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"M" = ( +/obj/structure/table/rack/shelf, +/obj/machinery/light, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"N" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/office/dark, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"O" = ( +/obj/structure/table/rack, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"P" = ( +/obj/structure/table/rack/shelf, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"R" = ( +/obj/machinery/camera/network/colony_underground{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"V" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/trash/chips, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"X" = ( +/obj/effect/decal/cleanable/dirt, +/obj/random/lowkeyrandom/low_chance, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) + +(1,1,1) = {" +s +I +I +B +v +a +"} +(2,1,1) = {" +K +A +g +y +D +R +"} +(3,1,1) = {" +O +D +D +N +X +P +"} +(4,1,1) = {" +O +x +J +d +D +M +"} +(5,1,1) = {" +z +X +b +k +V +t +"} diff --git a/maps/MaintsRuins/left_side_vacant_office/framed.dmm b/maps/MaintsRuins/left_side_vacant_office/framed.dmm new file mode 100644 index 00000000000..5e46d87577f --- /dev/null +++ b/maps/MaintsRuins/left_side_vacant_office/framed.dmm @@ -0,0 +1,198 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"e" = ( +/obj/item/device/lighting/toggleable/lamp, +/obj/structure/table/standard, +/obj/item/tool/screwdriver/improvised, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"k" = ( +/obj/structure/table/rack/shelf, +/obj/item/frame/apc, +/obj/item/frame/apc, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"l" = ( +/obj/structure/table/standard, +/obj/item/stock_parts/micro_laser, +/obj/item/tool/wrench/improvised, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"m" = ( +/obj/machinery/constructable_frame/machine_frame, +/obj/item/stack/cable_coil/random, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"o" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -32 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/filth, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"q" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -32 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/unary/vent_scrubber{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"v" = ( +/obj/machinery/alarm{ + dir = 1; + pixel_y = -32 + }, +/obj/machinery/constructable_frame/machine_frame, +/obj/item/stack/cable_coil/random, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"B" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"C" = ( +/obj/structure/table/standard, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/capacitor, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"F" = ( +/obj/machinery/button/remote/airlock{ + id = "FS1"; + name = "Door Bolt Control"; + pixel_y = 24; + specialfunctions = 4 + }, +/obj/structure/computerframe, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"G" = ( +/obj/machinery/disposal, +/obj/effect/floor_decal/industrial/box/red, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = -22 + }, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"I" = ( +/obj/machinery/light, +/obj/structure/table/standard, +/obj/item/stock_parts/matter_bin, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"J" = ( +/obj/machinery/atmospherics/unary/vent_pump, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"N" = ( +/obj/structure/table/rack/shelf, +/obj/item/frame/light, +/obj/item/frame/light, +/obj/item/frame/light, +/obj/item/frame/light/small, +/obj/item/frame/light/small, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"O" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/filth, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"Q" = ( +/obj/machinery/camera/network/colony_underground{ + dir = 1 + }, +/obj/machinery/constructable_frame/machine_frame, +/obj/item/stock_parts/manipulator, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"T" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"V" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"X" = ( +/obj/machinery/constructable_frame/machine_frame, +/obj/item/stock_parts/scanning_module, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"Y" = ( +/obj/structure/computerframe, +/obj/item/stock_parts/console_screen, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) + +(1,1,1) = {" +q +a +a +a +o +G +"} +(2,1,1) = {" +F +O +T +k +T +Q +"} +(3,1,1) = {" +Y +T +T +m +T +l +"} +(4,1,1) = {" +X +J +V +N +T +I +"} +(5,1,1) = {" +C +e +B +T +T +v +"} diff --git a/maps/MaintsRuins/left_side_vacant_office/housing.dmm b/maps/MaintsRuins/left_side_vacant_office/housing.dmm new file mode 100644 index 00000000000..33bf79b1729 --- /dev/null +++ b/maps/MaintsRuins/left_side_vacant_office/housing.dmm @@ -0,0 +1,193 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/filth, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"b" = ( +/obj/machinery/camera/network/colony_underground{ + dir = 1 + }, +/obj/structure/table/rack/shelf, +/obj/random/lowkeyrandom/low_chance, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"c" = ( +/obj/machinery/disposal, +/obj/effect/floor_decal/industrial/box/red, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = -22 + }, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"i" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"j" = ( +/obj/machinery/light, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"l" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"o" = ( +/obj/item/device/lighting/toggleable/lamp, +/obj/structure/table/marble, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"p" = ( +/obj/structure/table/rack/shelf, +/obj/random/lowkeyrandom/low_chance, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"t" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -32 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/filth, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"x" = ( +/obj/machinery/alarm{ + dir = 1; + pixel_y = -32 + }, +/obj/structure/bed/padded, +/obj/random/furniture/bedsheet, +/obj/structure/curtain/red, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"y" = ( +/obj/machinery/button/remote/airlock{ + id = "FS1"; + name = "Door Bolt Control"; + pixel_y = 24; + specialfunctions = 4 + }, +/obj/structure/table/marble, +/obj/item/tool/knife, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"A" = ( +/obj/structure/table/steel_reinforced, +/obj/item/toy/consumer/kit/toaster, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"B" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/item/storage/box/drinkingglasses, +/obj/item/reagent_containers/glass/plastic_jug, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"C" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"D" = ( +/obj/machinery/atmospherics/unary/vent_pump, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"E" = ( +/obj/structure/table/steel_reinforced, +/obj/item/toy/consumer/kit/toaster, +/obj/random/toolbox, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"I" = ( +/obj/machinery/microwave, +/obj/structure/table/marble, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"L" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"O" = ( +/obj/structure/dogbed, +/obj/item/reagent_containers/food/snacks/dogtreats, +/obj/item/toy/plushie, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"V" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -32 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/unary/vent_scrubber{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"X" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) + +(1,1,1) = {" +V +l +l +l +t +c +"} +(2,1,1) = {" +y +a +L +E +L +b +"} +(3,1,1) = {" +I +L +L +A +i +p +"} +(4,1,1) = {" +O +D +C +A +L +j +"} +(5,1,1) = {" +B +o +X +L +L +x +"} diff --git a/maps/MaintsRuins/left_side_vacant_office/tabled.dmm b/maps/MaintsRuins/left_side_vacant_office/tabled.dmm new file mode 100644 index 00000000000..f5a71b42719 --- /dev/null +++ b/maps/MaintsRuins/left_side_vacant_office/tabled.dmm @@ -0,0 +1,164 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"b" = ( +/obj/structure/table/standard, +/obj/random/lowkeyrandom/low_chance, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"d" = ( +/obj/structure/table, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"e" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"m" = ( +/obj/machinery/light, +/obj/structure/table/standard, +/obj/random/lowkeyrandom/low_chance, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"n" = ( +/obj/machinery/button/remote/airlock{ + id = "FS1"; + name = "Door Bolt Control"; + pixel_y = 24; + specialfunctions = 4 + }, +/obj/structure/table/standard, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"t" = ( +/obj/machinery/camera/network/colony_underground{ + dir = 1 + }, +/obj/structure/table/standard, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"v" = ( +/obj/structure/table/standard, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"B" = ( +/obj/machinery/disposal, +/obj/effect/floor_decal/industrial/box/red, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = -22 + }, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"E" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"G" = ( +/obj/structure/table/standard, +/obj/item/device/lighting/toggleable/lamp, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"I" = ( +/obj/machinery/alarm{ + dir = 1; + pixel_y = -32 + }, +/obj/structure/table/standard, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"M" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"N" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -32 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/unary/vent_scrubber{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"O" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/filth, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"P" = ( +/obj/machinery/atmospherics/unary/vent_pump, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"Q" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -32 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/filth, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) + +(1,1,1) = {" +N +a +a +a +Q +B +"} +(2,1,1) = {" +n +O +e +d +e +t +"} +(3,1,1) = {" +d +e +e +b +e +d +"} +(4,1,1) = {" +d +P +E +d +e +m +"} +(5,1,1) = {" +v +G +M +e +e +I +"} diff --git a/maps/MaintsRuins/left_side_vacant_office/trashed.dmm b/maps/MaintsRuins/left_side_vacant_office/trashed.dmm new file mode 100644 index 00000000000..b1ea8b17fa4 --- /dev/null +++ b/maps/MaintsRuins/left_side_vacant_office/trashed.dmm @@ -0,0 +1,224 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -32 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/filth, +/obj/random/junk, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"b" = ( +/obj/random/junk, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"d" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/filth, +/obj/effect/decal/cleanable/filth, +/obj/item/device/assembly/mousetrap/armed, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"e" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/filth, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/structure/cyberplant, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"g" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/filth, +/obj/item/device/assembly/mousetrap/armed, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"h" = ( +/obj/effect/decal/cleanable/dirt, +/obj/random/junk, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"l" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"n" = ( +/obj/machinery/camera/network/colony_underground{ + dir = 1 + }, +/obj/random/scrap/dense_even, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"o" = ( +/obj/machinery/atmospherics/unary/vent_pump, +/obj/effect/decal/cleanable/dirt, +/obj/random/junk, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"r" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/obj/random/junkfood/rotten/low_chance, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"u" = ( +/obj/machinery/button/remote/airlock{ + id = "FS1"; + name = "Door Bolt Control"; + pixel_y = 24; + specialfunctions = 4 + }, +/obj/effect/decal/cleanable/filth, +/obj/random/junkfood/rotten/low_chance, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"v" = ( +/obj/structure/table/rack/shelf, +/obj/random/lowkeyrandom, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"y" = ( +/obj/machinery/light, +/obj/machinery/microwave/burnbarrel, +/obj/item/stack/material/wood/random, +/obj/random/junkfood/rotten/low_chance, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"C" = ( +/obj/item/device/lighting/toggleable/lamp, +/obj/structure/table/reinforced, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"D" = ( +/obj/effect/decal/cleanable/dirt, +/obj/random/lowkeyrandom/low_chance, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"E" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"F" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"H" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/filth, +/obj/structure/scrap/poor, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"I" = ( +/obj/machinery/alarm{ + dir = 1; + pixel_y = -32 + }, +/obj/random/junk, +/obj/random/furniture/bedsheet, +/obj/random/lowkeyrandom/low_chance, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"J" = ( +/obj/random/scrap/dense_even, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"L" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"M" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/trashcart, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"N" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -32 + }, +/obj/effect/decal/cleanable/dirt, +/obj/random/traps/low_chance, +/obj/machinery/atmospherics/unary/vent_scrubber{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"U" = ( +/obj/effect/decal/cleanable/filth, +/obj/structure/scrap/poor, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"Y" = ( +/obj/machinery/disposal, +/obj/effect/floor_decal/industrial/box/red, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = -22 + }, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) +"Z" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/obj/random/junk, +/turf/simulated/floor/tiled/dark/violetcorener, +/area/nadezhda/crew_quarters/techshop) + +(1,1,1) = {" +N +Z +L +r +a +Y +"} +(2,1,1) = {" +u +d +M +U +D +n +"} +(3,1,1) = {" +J +D +F +b +H +J +"} +(4,1,1) = {" +J +o +l +v +g +y +"} +(5,1,1) = {" +b +C +E +h +e +I +"} diff --git a/maps/__Nadezhda/map/_Nadezhda_Colony.dmm b/maps/__Nadezhda/map/_Nadezhda_Colony.dmm index 52b7620b8f2..39c8e8ff2c7 100644 --- a/maps/__Nadezhda/map/_Nadezhda_Colony.dmm +++ b/maps/__Nadezhda/map/_Nadezhda_Colony.dmm @@ -2610,8 +2610,14 @@ /turf/simulated/floor/tiled/dark/danger, /area/nadezhda/medical/sleeper) "aAA" = ( +/obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, -/obj/item/trash/chips, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark/violetcorener, /area/nadezhda/crew_quarters/techshop) "aAH" = ( @@ -3648,6 +3654,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled/dark/violetcorener, /area/nadezhda/crew_quarters/techshop) "aKO" = ( @@ -4812,6 +4821,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel/gray_perforated, /area/nadezhda/crew_quarters/techshop) "aYt" = ( @@ -5881,9 +5891,11 @@ /turf/simulated/floor/wood/wild3, /area/nadezhda/crew_quarters) "bic" = ( -/obj/structure/table/rack/shelf, -/turf/simulated/floor/tiled/dark/violetcorener, -/area/nadezhda/crew_quarters/techshop) +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/steel/cyancorner, +/area/nadezhda/hallway/side/f2section1) "bid" = ( /turf/simulated/wall/r_wall, /area/nadezhda/rnd/server) @@ -8402,11 +8414,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/nadezhda/medical/ward) -"bFZ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/lowkeyrandom/low_chance, -/turf/simulated/floor/tiled/dark/violetcorener, -/area/nadezhda/crew_quarters/techshop) "bGe" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark/danger, @@ -9244,7 +9251,6 @@ /turf/simulated/floor/plating/under, /area/nadezhda/maintenance/undergroundfloor1south) "bNK" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -11365,6 +11371,9 @@ "ckN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/violetcorener, /area/nadezhda/crew_quarters/techshop) "ckO" = ( @@ -12229,9 +12238,6 @@ /turf/simulated/floor/tiled/dark/gray_platform, /area/nadezhda/outside/inside_colony) "cuo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -23857,11 +23863,13 @@ /turf/simulated/floor/tiled/white, /area/nadezhda/medical/sleeper) "eAR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/tiled/white/gray_perforated, /area/nadezhda/crew_quarters/techshop) "eAS" = ( @@ -27696,6 +27704,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark/violetcorener, /area/nadezhda/crew_quarters/techshop) "fma" = ( @@ -29022,9 +29031,7 @@ /turf/simulated/floor/tiled/steel/danger, /area/nadezhda/engineering/atmos) "fzj" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/remains/mouse, -/turf/simulated/floor/tiled/dark/violetcorener, +/turf/simulated/floor/plating/under, /area/nadezhda/crew_quarters/techshop) "fzo" = ( /obj/machinery/door/airlock/maintenance_engineering{ @@ -29258,9 +29265,6 @@ /turf/simulated/mineral, /area/nadezhda/outside/bcave) "fCf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -29772,16 +29776,8 @@ /turf/simulated/floor/wood, /area/nadezhda/absolutism/vectorrooms) "fHr" = ( -/obj/machinery/disposal, -/obj/effect/floor_decal/industrial/box/red, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/item/device/radio/intercom{ - dir = 4; - pixel_x = -22 - }, -/turf/simulated/floor/tiled/dark/violetcorener, +/obj/effect/landmark/stationroom/maint/left_side_vacant_office, +/turf/simulated/floor/plating/under, /area/nadezhda/crew_quarters/techshop) "fHv" = ( /obj/structure/window/reinforced{ @@ -36876,9 +36872,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/barricade, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel/gray_perforated, @@ -44853,11 +44846,6 @@ }, /turf/simulated/floor/tiled/white, /area/nadezhda/medical/cryo) -"iyl" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark/violetcorener, -/area/nadezhda/crew_quarters/techshop) "iym" = ( /obj/structure/railing{ dir = 8; @@ -50518,12 +50506,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating/under, /area/nadezhda/maintenance/undergroundfloor1north) -"jDV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/filth, -/obj/item/trash/candy/proteinbar, -/turf/simulated/floor/tiled/dark/violetcorener, -/area/nadezhda/crew_quarters/techshop) "jEa" = ( /obj/structure/catwalk, /obj/structure/railing{ @@ -62398,6 +62380,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel/cyancorner, /area/nadezhda/hallway/side/f2section1) "lVY" = ( @@ -67393,13 +67376,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel/techfloor_grid, /area/nadezhda/engineering/engine_room) -"mSc" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark/violetcorener, -/area/nadezhda/crew_quarters/techshop) "mSg" = ( /obj/structure/cable/green{ d1 = 2; @@ -67828,16 +67804,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white/gray_perforated, /area/nadezhda/crew_quarters/sleep/cryo2) -"mXl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark/violetcorener, -/area/nadezhda/crew_quarters/techshop) "mXq" = ( /obj/structure/cable/green{ d1 = 1; @@ -69325,18 +69291,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel, /area/nadezhda/quartermaster/office) -"nkP" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -32 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark/violetcorener, -/area/nadezhda/crew_quarters/techshop) "nkQ" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -71220,10 +71174,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel/techfloor, /area/nadezhda/engineering/engine_room) -"nBz" = ( -/obj/structure/table/rack, -/turf/simulated/floor/tiled/dark/violetcorener, -/area/nadezhda/crew_quarters/techshop) "nBA" = ( /obj/effect/overlay/water, /obj/effect/overlay/water/top, @@ -72125,14 +72075,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel/techfloor_grid, /area/nadezhda/crew_quarters/sleep/cryo2) -"nJK" = ( -/obj/random/scrap/sparse_weighted, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/industrial/black_large_slates, -/area/nadezhda/maintenance/undergroundfloor1west) "nJN" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/industrial/navy_large_slates, @@ -75057,17 +74999,6 @@ /obj/machinery/light, /turf/simulated/floor/tiled/steel/cyancorner, /area/nadezhda/hallway/side/f2section1) -"oli" = ( -/obj/structure/table/rack, -/obj/random/contraband/low_chance, -/obj/machinery/button/remote/airlock{ - id = "FS1"; - name = "Door Bolt Control"; - pixel_y = 24; - specialfunctions = 4 - }, -/turf/simulated/floor/tiled/dark/violetcorener, -/area/nadezhda/crew_quarters/techshop) "olk" = ( /obj/structure/table/rack/shelf, /obj/item/clothing/accessory/chameleon, @@ -75548,9 +75479,6 @@ /turf/simulated/floor/tiled/techmaint, /area/nadezhda/medical/sleeper) "oqt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -76832,10 +76760,10 @@ /turf/simulated/floor/tiled/dark/brown_perforated, /area/nadezhda/storage/primary) "oBN" = ( +/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8 + dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark/violetcorener, /area/nadezhda/crew_quarters/techshop) "oBP" = ( @@ -80293,9 +80221,6 @@ /turf/simulated/floor/tiled/steel/gray_perforated, /area/nadezhda/security/barracks) "pkg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -86229,16 +86154,6 @@ /area/nadezhda/maintenance{ name = "Residential District Maintenance" }) -"qpm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark/violetcorener, -/area/nadezhda/crew_quarters/techshop) "qpp" = ( /obj/structure/table/glass, /obj/item/device/radio/intercom{ @@ -93808,12 +93723,6 @@ }, /turf/simulated/floor/tiled/steel/techfloor, /area/nadezhda/engineering/engine_room) -"rOi" = ( -/obj/machinery/camera/network/colony_underground{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark/violetcorener, -/area/nadezhda/crew_quarters/techshop) "rOs" = ( /obj/structure/table/standard, /obj/item/storage/firstaid/regular, @@ -94736,9 +94645,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -94753,6 +94659,9 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/tiled/steel/cyancorner, /area/nadezhda/hallway/side/f2section1) "rXy" = ( @@ -100350,11 +100259,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/industrial/bricks, /area/nadezhda/maintenance/undergroundfloor1north) -"tar" = ( -/obj/machinery/atmospherics/unary/vent_pump, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark/violetcorener, -/area/nadezhda/crew_quarters/techshop) "tas" = ( /obj/structure/closet/wall_mounted/emcloset{ pixel_y = -32 @@ -105452,16 +105356,6 @@ /mob/living/carbon/superior_animal/giant_spider/nurse/recluse, /turf/simulated/floor/plating/under, /area/nadezhda/maintenance/undergroundfloor1south) -"tYn" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -32 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/filth, -/turf/simulated/floor/tiled/dark/violetcorener, -/area/nadezhda/crew_quarters/techshop) "tYr" = ( /obj/effect/decal/cleanable/rubble, /obj/structure/cable/cyan{ @@ -108971,11 +108865,6 @@ /obj/random/flora/small_jungle_tree, /turf/unsimulated/wall/jungle, /area/nadezhda/outside/forest) -"uHk" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/bed/chair/office/dark, -/turf/simulated/floor/tiled/dark/violetcorener, -/area/nadezhda/crew_quarters/techshop) "uHl" = ( /obj/structure/flora/small/bushb2, /obj/structure/flora/small/bushc1, @@ -117904,15 +117793,6 @@ /obj/random/booze, /turf/simulated/floor/industrial/concrete_bricks, /area/nadezhda/maintenance/undergroundfloor1north) -"wlK" = ( -/obj/structure/table/rack/shelf, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -32 - }, -/obj/random/rations/low_chance, -/turf/simulated/floor/tiled/dark/violetcorener, -/area/nadezhda/crew_quarters/techshop) "wlQ" = ( /obj/structure/shuttle_part/escpod{ icon_state = "escpodwall28"; @@ -121995,12 +121875,6 @@ /obj/random/material_resources, /turf/simulated/floor/industrial/white_large_slates, /area/nadezhda/maintenance/undergroundfloor2east) -"wZp" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/obj/random/scrap, -/turf/simulated/floor/tiled/dark/violetcorener, -/area/nadezhda/crew_quarters/techshop) "wZr" = ( /obj/structure/bed/chair{ dir = 4 @@ -122959,11 +122833,6 @@ }, /turf/simulated/floor/tiled/steel/orangecorner, /area/nadezhda/hallway/surface/section1) -"xjS" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/trash/liquidfood, -/turf/simulated/floor/tiled/dark/violetcorener, -/area/nadezhda/crew_quarters/techshop) "xjU" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/industrial/navy_slates, @@ -123881,7 +123750,6 @@ /turf/simulated/floor/tiled/steel/cyancorner, /area/nadezhda/hallway/side/f2section1) "xsU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -126801,9 +126669,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -126813,6 +126678,9 @@ sortType = "Misc - Tech Shop 2" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/tiled/steel/cyancorner, /area/nadezhda/hallway/side/f2section1) "xUV" = ( @@ -127091,11 +126959,6 @@ "xXL" = ( /turf/simulated/floor/carpet/bcarpet, /area/nadezhda/maintenance/undergroundfloor1north) -"xXM" = ( -/obj/structure/table/rack/shelf, -/obj/machinery/light, -/turf/simulated/floor/tiled/dark/violetcorener, -/area/nadezhda/crew_quarters/techshop) "xXO" = ( /obj/structure/catwalk, /obj/effect/floor_decal/spline/plain{ @@ -127875,6 +127738,7 @@ name = "Free Shop 1" }, /obj/structure/barricade, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel/gray_perforated, /area/nadezhda/crew_quarters/techshop) "yfY" = ( @@ -127920,11 +127784,6 @@ }, /turf/simulated/floor/tiled/steel/bar_light, /area/turret_protected/ai) -"ygM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/device/lighting/toggleable/lamp, -/turf/simulated/floor/tiled/dark/violetcorener, -/area/nadezhda/crew_quarters/techshop) "ygR" = ( /obj/random/spider_trap/low_chance, /obj/effect/decal/cleanable/dirt, @@ -134705,7 +134564,7 @@ lMd oQY oQY oQY -nJK +oQY oQY qyc qyc @@ -187858,13 +187717,13 @@ cEj iyQ whU xUT -kgK +bic yfR -nkP -iyl -iyl -wZp -tYn +fzj +fzj +fzj +fzj +fzj fHr nCK tAO @@ -188062,12 +187921,12 @@ whU tnO whU nCK -oli -jDV -ygM -xjS -cxN -rOi +fzj +fzj +fzj +fzj +fzj +fzj nCK tAO gSu @@ -188264,12 +188123,12 @@ nDQ glG tUp cCy -nBz -cxN -mSc -uHk -bFZ -bic +fzj +fzj +fzj +fzj +fzj +fzj nCK qQA gSu @@ -188466,12 +188325,12 @@ whU laf tMb cCy -nBz -tar -mXl fzj -cxN -xXM +fzj +fzj +fzj +fzj +fzj nCK tAO gSu @@ -188668,12 +188527,12 @@ whU due lKz cCy -sMN -bFZ -qpm -fRM -aAA -wlK +fzj +fzj +fzj +fzj +fzj +fzj nCK evY gSu @@ -190689,7 +190548,7 @@ rXw lVX aYq flW -cdF +aAA aKN cdF mDo diff --git a/sojourn-station.dme b/sojourn-station.dme index 6ba82857c0e..103c8e2df21 100644 --- a/sojourn-station.dme +++ b/sojourn-station.dme @@ -529,6 +529,7 @@ #include "code\datums\repositories\crew\tracking.dm" #include "code\datums\repositories\crew\vital.dm" #include "code\datums\repositories\crew\~defines.dm" +#include "code\datums\ruins\hallway.dm" #include "code\datums\ruins\maints.dm" #include "code\datums\setup_option\background.dm" #include "code\datums\setup_option\core_implant.dm" From 4d85ef7bb8b77e4c152ac0eb2b04caaa2b4d92f2 Mon Sep 17 00:00:00 2001 From: Trilby Date: Tue, 24 Dec 2024 20:53:42 -0500 Subject: [PATCH 8/9] rarer vacant housing --- code/game/objects/landmarks/maints_ruins.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/landmarks/maints_ruins.dm b/code/game/objects/landmarks/maints_ruins.dm index 7cd658e2b97..da28c7d0562 100644 --- a/code/game/objects/landmarks/maints_ruins.dm +++ b/code/game/objects/landmarks/maints_ruins.dm @@ -91,4 +91,4 @@ GLOBAL_LIST_EMPTY(chosen_station_templates) //Located in ruins/hallway.dm /obj/effect/landmark/stationroom/maint/left_side_vacant_office - template_names = list("Vacant Clearedout" = 5, "Vacant Tabled" = 2, "Vacant Framed" = 2, "Vacant Bookcased" = 2, "Vacant Trashed" = 2, "Vacant Housing" = 2) \ No newline at end of file + template_names = list("Vacant Clearedout" = 5, "Vacant Tabled" = 2, "Vacant Framed" = 2, "Vacant Bookcased" = 2, "Vacant Trashed" = 2, "Vacant Housing" = 1) \ No newline at end of file From 9ea0a41b7a7c7f721791c8c2df7075f354b2586e Mon Sep 17 00:00:00 2001 From: Trilby Date: Tue, 24 Dec 2024 23:41:13 -0500 Subject: [PATCH 9/9] Update hallway.dm --- code/datums/ruins/hallway.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/ruins/hallway.dm b/code/datums/ruins/hallway.dm index 15e21aa3d00..f01d0220a52 100644 --- a/code/datums/ruins/hallway.dm +++ b/code/datums/ruins/hallway.dm @@ -16,7 +16,7 @@ /datum/map_template/ruin/station/maint/left_side_vacant_office/framed id = "Framed" - suffix = "fabled.dmm" + suffix = "framed.dmm" name = "Vacant Framed" /datum/map_template/ruin/station/maint/left_side_vacant_office/bookcased