diff --git a/aurorastation.dme b/aurorastation.dme index 3edd4434ddf..db584ebee6a 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1300,6 +1300,7 @@ #include "code\modules\admin\verbs\diagnostics.dm" #include "code\modules\admin\verbs\dice.dm" #include "code\modules\admin\verbs\getlogs.dm" +#include "code\modules\admin\verbs\map_template_loadverb.dm" #include "code\modules\admin\verbs\mapping.dm" #include "code\modules\admin\verbs\massmodvar.dm" #include "code\modules\admin\verbs\modifyvariables.dm" diff --git a/code/controllers/subsystems/machinery.dm b/code/controllers/subsystems/machinery.dm index 1496585502b..f5160c4e8b6 100644 --- a/code/controllers/subsystems/machinery.dm +++ b/code/controllers/subsystems/machinery.dm @@ -143,7 +143,6 @@ if(Datum.isprocessing) {\ propagate_network(cable, cable.powernet) /datum/controller/subsystem/machinery/proc/setup_atmos_machinery(list/machines) - set background = TRUE var/list/atmos_machines = list() for (var/obj/machinery/atmospherics/machine in machines) atmos_machines += machine diff --git a/code/controllers/subsystems/mapping.dm b/code/controllers/subsystems/mapping.dm index 919dccc00b7..746b6ed87bf 100644 --- a/code/controllers/subsystems/mapping.dm +++ b/code/controllers/subsystems/mapping.dm @@ -35,7 +35,7 @@ var/datum/controller/subsystem/mapping/SSmapping /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]") + var/datum/map_template/T = new(paths = list("[path][map]"), rename = "[map]") map_templates[T.id] = T preloadBlacklistableTemplates() @@ -58,8 +58,12 @@ var/datum/controller/subsystem/mapping/SSmapping var/datum/map_template/MT = new map_template_type() if (banned_maps) - var/mappath = MT.mappath - if(list_find(banned_maps, mappath)) + var/is_banned = FALSE + for (var/mappath in MT.mappaths) + if(banned_maps.Find(mappath)) + is_banned = TRUE + break + if (is_banned) continue map_templates[MT.id] = MT diff --git a/code/datums/ruins.dm b/code/datums/ruins.dm index 68ab08d8c8e..08948ab5867 100644 --- a/code/datums/ruins.dm +++ b/code/datums/ruins.dm @@ -12,7 +12,7 @@ var/list/sectors = list() //This ruin can only spawn in the sectors in this list. var/prefix = null - var/suffix = null + var/list/suffixes = null template_flags = TEMPLATE_FLAG_NO_RUINS // Don't let ruins spawn on top of ruins // !! Currently only implemented for away sites @@ -21,7 +21,9 @@ var/list/ban_ruins // Listed ruins are removed from the set of available spawns. Beats allowed. /datum/map_template/ruin/New() - if (suffix) - mappath += (prefix + suffix) + if (suffixes) + mappaths = list() + for (var/suffix in suffixes) + mappaths += (prefix + suffix) ..() diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 29677120328..45000e8170e 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -219,6 +219,9 @@ var/list/admin_verbs_debug = list( /client/proc/cmd_ss_panic, /client/proc/reset_openturf, /datum/admins/proc/capture_map, + /datum/admins/proc/map_template_load, + /datum/admins/proc/map_template_load_new_z, + /datum/admins/proc/map_template_upload, /client/proc/global_ao_regenerate, /client/proc/add_client_color, /client/proc/connect_ntsl, diff --git a/code/modules/admin/verbs/map_template_loadverb.dm b/code/modules/admin/verbs/map_template_loadverb.dm new file mode 100644 index 00000000000..078c7161bd2 --- /dev/null +++ b/code/modules/admin/verbs/map_template_loadverb.dm @@ -0,0 +1,98 @@ +/datum/admins/proc/map_template_load() + set category = "Fun" + set desc = "Pick a map template to load at your current location. You will be able to confirm bounds before committing." + set name = "Map Template - Place" + + if (!check_rights(R_FUN)) return + + var/map = input(usr, "Choose a Map Template to place at your CURRENT LOCATION","Place Map Template") as null|anything in SSmapping.map_templates + if(!map) + return + + var/datum/map_template/template = SSmapping.map_templates[map] + + var/turf/T = get_turf(usr) + if(!T) + return + var/log_name = "([template.name]) in [get_area(T)]" + + var/list/preview = list() + for(var/S in template.get_affected_turfs(T, TRUE)) + preview += image('icons/effects/landmarks.dmi', S, "x3") + usr.client.images += preview + if(alert(usr,"Confirm location.","Template Confirm","Yes","No") == "Yes") + log_and_message_admins("is attempting to place a map template [log_name].") + to_chat(usr, "Attempting to place map template [log_name].") + if(template.load(T, TRUE)) + log_and_message_admins("has placed a map template [log_name].") + to_chat(usr, "Successfully placed map template [log_name].") + else + log_and_message_admins("has failed to place a map template [log_name].") + to_chat(usr, "Failed to place map template [log_name].") + usr.client.images -= preview + +/datum/admins/proc/map_template_load_new_z() + set category = "Fun" + set desc = "Pick a map template to load as a new zlevel, or a set of new zlevels if multi-z." + set name = "Map Template - Place In New Z" + + if(!check_rights(R_FUN)) + return + if(SSticker.current_state < GAME_STATE_PREGAME) + to_chat(usr, "Please wait for the master controller to initialize before loading maps!") + return + + var/map = input(usr, "Choose a Map Template to place on a new zlevel","Place Map Template") as null|anything in SSmapping.map_templates + if(!map) + return + + var/datum/map_template/template = SSmapping.map_templates[map] + var/log_name = "([template.name]) on a new zlevel" + + if (template.loaded && !(template.template_flags & TEMPLATE_FLAG_ALLOW_DUPLICATES)) + var/jesus_take_the_wheel = alert(usr, "That template has already been loaded and doesn't want to be loaded again. \ + Proceeding may unpredictably break things and cause runtimes.", "Confirm load", "Cancel load", "Do you see any cops around?") == "Do you see any cops around?" + if (!jesus_take_the_wheel) + return + + //Since away sites are procedurally spawned by the map loader, if we don't suspend SSair, they'll get vented. + SSair.suspend() + log_and_message_admins("is attempting to place a map template [log_name].") + to_chat(usr, "Attempting to place map template [log_name].") + var/new_z_centre = template.load_new_z(FALSE) // Don't skip changeturf + if (new_z_centre) + log_and_message_admins("has placed a map template [log_name].") + to_chat(usr, "Successfully place map template [log_name].") + else + log_and_message_admins("has failed to place a map template [log_name].") + to_chat(usr, "Failed to place map template [log_name].") + SSair.wake() + +/datum/admins/proc/map_template_upload() + set category = "Fun" + set desc = "Upload a .dmm file to use as a map template. Any unknown types will be skipped!" + set name = "Map Template - Upload" + + if (!check_rights(R_FUN)) return + + var/map = input(usr, "Choose a Map Template to upload to template storage","Upload Map Template") as null|file + if(!map) + return + if(copytext("[map]",-4) != ".dmm") + to_chat(usr, "Bad map file: [map]") + return + + var/rounded_wtime = round(world.time) + rustg_file_write(file2text(map), "data/logs/[diary_date_string]_[rounded_wtime]_[map]") + + var/datum/map_template/M = new(list(map), "[map]") + + log_and_message_admins("is attempting to upload a map template '[map]''.") + to_chat(usr, "Attempting to upload map template '[map]''.") + if(M.preload_size()) + to_chat(usr, "Map template '[map]' ready to place ([M.width]x[M.height]).") + SSmapping.map_templates[M.name] = M + log_and_message_admins("has uploaded map template '[map]''.") + else + log_and_message_admins("failed to upload map template '[map]''.") + to_chat(usr, "Map template '[map]' failed to load properly") diff --git a/code/modules/atmospherics/atmospherics.dm b/code/modules/atmospherics/atmospherics.dm index 19ff67dfcbf..c0833310d58 100644 --- a/code/modules/atmospherics/atmospherics.dm +++ b/code/modules/atmospherics/atmospherics.dm @@ -28,6 +28,7 @@ Pipelines + Other Objects -> Pipe network var/global/datum/pipe_icon_manager/icon_manager var/obj/machinery/atmospherics/node1 var/obj/machinery/atmospherics/node2 + var/atmos_initialised = FALSE gfi_layer_rotation = GFI_ROTATION_OVERDIR /obj/machinery/atmospherics/Initialize(mapload) @@ -46,6 +47,7 @@ Pipelines + Other Objects -> Pipe network return INITIALIZE_HINT_LATELOAD /obj/machinery/atmospherics/proc/atmos_init() + atmos_initialised = TRUE // atmos_init() and Initialize() must be separate, as atmos_init() can be called multiple times after the machine has been initialized. diff --git a/code/modules/atmospherics/pipes.dm b/code/modules/atmospherics/pipes.dm index 0292afdf0b7..2050f79e046 100644 --- a/code/modules/atmospherics/pipes.dm +++ b/code/modules/atmospherics/pipes.dm @@ -269,6 +269,9 @@ if(!check_icon_cache()) return + if(!atmos_initialised) + return + alpha = 255 cut_overlays() @@ -316,6 +319,7 @@ qdel(src) return + atmos_initialised = TRUE var/turf/T = loc if(level == 1 && !T.is_plating()) hide(1) queue_icon_update() @@ -533,6 +537,9 @@ if(!check_icon_cache()) return + if(!atmos_initialised) + return + alpha = 255 if(!node1 && !node2 && !node3) @@ -613,6 +620,7 @@ qdel(src) return + atmos_initialised = TRUE var/turf/T = get_turf(src) if(level == 1 && !T.is_plating()) hide(1) queue_icon_update() @@ -810,6 +818,9 @@ if(!check_icon_cache()) return + if(!atmos_initialised) + return + alpha = 255 if(!node1 && !node2 && !node3 && !node4) @@ -897,6 +908,7 @@ qdel(src) return + atmos_initialised = TRUE var/turf/T = get_turf(src) if(level == 1 && !T.is_plating()) hide(1) queue_icon_update() @@ -1057,6 +1069,9 @@ if(!check_icon_cache()) return + if(!atmos_initialised) + return + alpha = 255 cut_overlays() @@ -1069,6 +1084,7 @@ node = target break + atmos_initialised = TRUE var/turf/T = src.loc // hide if turf is not intact if(level == 1 && !T.is_plating()) hide(1) queue_icon_update() @@ -1172,6 +1188,7 @@ node1 = target break + atmos_initialised = TRUE update_underlays() /obj/machinery/atmospherics/pipe/tank/disconnect(obj/machinery/atmospherics/reference) diff --git a/code/modules/maps/map_template.dm b/code/modules/maps/map_template.dm index 6e23f0bda6b..90b41f30cd6 100644 --- a/code/modules/maps/map_template.dm +++ b/code/modules/maps/map_template.dm @@ -3,7 +3,7 @@ var/id = null // All maps that should be loadable during runtime need an id var/width = 0 var/height = 0 - var/mappath = null + var/list/mappaths = null var/loaded = 0 // Times loaded this round var/static/dmm_suite/maploader = new var/list/shuttles_to_initialise = list() @@ -12,23 +12,26 @@ var/accessibility_weight = 0 var/template_flags = TEMPLATE_FLAG_ALLOW_DUPLICATES -/datum/map_template/New(path = null, rename = null) - if(path) - mappath = path - if(mappath) - preload_size(mappath) +/datum/map_template/New(var/list/paths = null, rename = null) + if(paths && !islist(paths)) + crash_with("Non-list paths passed into map template constructor.") + if(paths) + mappaths = paths + if(mappaths) + preload_size(mappaths) if(rename) name = rename -/datum/map_template/proc/preload_size(path) +/datum/map_template/proc/preload_size(paths) var/list/bounds = list(1.#INF, 1.#INF, 1.#INF, -1.#INF, -1.#INF, -1.#INF) var/z_offset = 1 // needed to calculate z-bounds correctly - var/datum/map_load_metadata/M = maploader.load_map(file(path), 1, 1, z_offset, cropMap=FALSE, measureOnly=TRUE) - if(M) - bounds = extend_bounds_if_needed(bounds, M.bounds) - z_offset++ - else - return FALSE + for(var/mappath in mappaths) + var/datum/map_load_metadata/M = maploader.load_map(file(mappath), 1, 1, z_offset, cropMap=FALSE, measureOnly=TRUE) + if(M) + bounds = extend_bounds_if_needed(bounds, M.bounds) + z_offset++ + else + return FALSE width = bounds[MAP_MAXX] - bounds[MAP_MINX] + 1 height = bounds[MAP_MAXY] - bounds[MAP_MINX] + 1 return bounds @@ -45,12 +48,15 @@ var/list/atoms_to_initialise = list() var/shuttle_state = pre_init_shuttles() - var/datum/map_load_metadata/M = maploader.load_map(file(mappath), x, y, no_changeturf = no_changeturf) - if (M) - bounds = extend_bounds_if_needed(bounds, M.bounds) - atoms_to_initialise += M.atoms_to_initialise - else - return FALSE + //Since queue_smooth() manually wakes the subsystem, we have to use enable/disable. + SSicon_smooth.disable() + for (var/mappath in mappaths) + var/datum/map_load_metadata/M = maploader.load_map(file(mappath), x, y, no_changeturf = no_changeturf) + if (M) + bounds = extend_bounds_if_needed(bounds, M.bounds) + atoms_to_initialise += M.atoms_to_initialise + else + return FALSE for (var/z_index = bounds[MAP_MINZ]; z_index <= bounds[MAP_MAXZ]; z_index++) if (accessibility_weight) @@ -69,6 +75,8 @@ for(var/light_z = initial_z to world.maxz) create_lighting_overlays_zlevel(light_z) log_game("Z-level [name] loaded at [x], [y], [world.maxz]") + message_admins("Z-level [name] loaded at [x], [y], [world.maxz]") + SSicon_smooth.enable() loaded++ return locate(world.maxx/2, world.maxy/2, world.maxz) @@ -106,6 +114,8 @@ LAZYADD(subtemplates_to_spawn, A) if(istype(A, /obj/machinery/power/apc)) apcs += A + if(isnull(A)) + atoms -= A if(A.initialized) atoms -= A @@ -151,16 +161,21 @@ var/list/atoms_to_initialise = list() var/shuttle_state = pre_init_shuttles() - var/datum/map_load_metadata/M = maploader.load_map(file(mappath), T.x, T.y, T.z, cropMap=TRUE, no_changeturf = FALSE) - if (M) - atoms_to_initialise += M.atoms_to_initialise - else - return FALSE + //Since queue_smooth() manually wakes the subsystem, we have to use enable/disable. + SSicon_smooth.disable() + for (var/mappath in mappaths) + var/datum/map_load_metadata/M = maploader.load_map(file(mappath), T.x, T.y, T.z, cropMap=TRUE) + if (M) + atoms_to_initialise += M.atoms_to_initialise + else + return FALSE //initialize things that are normally initialized after map load init_atoms(atoms_to_initialise) init_shuttles(shuttle_state) + SSicon_smooth.enable() + message_admins("[name] loaded at [T.x], [T.y], [T.z]") log_game("[name] loaded at [T.x], [T.y], [T.z]") return TRUE diff --git a/html/changelogs/mattatlas-destroyerofgods.yml b/html/changelogs/mattatlas-destroyerofgods.yml new file mode 100644 index 00000000000..48d86a3c1d9 --- /dev/null +++ b/html/changelogs/mattatlas-destroyerofgods.yml @@ -0,0 +1,43 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - admin: "Adds admin verbs to load map templates in round." + - bugfix: "Fixes late spawned templates' pipes being bugged and not working." + - backend: "Added support for multi-z away sites." diff --git a/maps/away/away_site/abandoned_mining/cursed.dm b/maps/away/away_site/abandoned_mining/cursed.dm index 5bd2bffbe50..36e1fbb74d4 100644 --- a/maps/away/away_site/abandoned_mining/cursed.dm +++ b/maps/away/away_site/abandoned_mining/cursed.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/cursed name = "lone asteroid" description = "A lone asteroid with a hangar. Latest data from this sector shows it as a Hephaestus mining station, two years ago." - suffix = "away_site/abandoned_mining/cursed.dmm" + suffixes = list("away_site/abandoned_mining/cursed.dmm") sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) spawn_weight = 1 spawn_cost = 1 diff --git a/maps/away/away_site/big_derelict/bigderelict.dm b/maps/away/away_site/big_derelict/bigderelict.dm index f0206faf8b6..79ea252005d 100644 --- a/maps/away/away_site/big_derelict/bigderelict.dm +++ b/maps/away/away_site/big_derelict/bigderelict.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/big_derelict name = "large derelict" description = "A very large derelict station. According to the starmap, it shouldn't exist." - suffix = "away_site/big_derelict/bigderelict.dmm" + suffixes = list("away_site/big_derelict/bigderelict.dmm") sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_NEW_ANKARA, SECTOR_BADLANDS, SECTOR_AEMAQ) spawn_weight = 1 spawn_cost = 2 diff --git a/maps/away/away_site/civ_station/civilian_station.dm b/maps/away/away_site/civ_station/civilian_station.dm index 749236a1ec9..4b797b75db7 100644 --- a/maps/away/away_site/civ_station/civilian_station.dm +++ b/maps/away/away_site/civ_station/civilian_station.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/civilian_station name = "civilian station" description = "A modestly-sized independently-owned civilian space station. Many of these exist all throughout inhabited space, offering a place to rest, food to eat, shopping, and refueling - part mall, part motel. This one appears to have been active in the region long before Biesel took control, and an information lookup indicates that it is operated by a small company that is Solarian in origin. This one's transponder says it's open for business!" - suffix = "away_site/civ_station/civilian_station.dmm" + suffixes = list("away_site/civ_station/civilian_station.dmm") sectors = list(SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE) spawn_weight = 1 ship_cost = 2 diff --git a/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dm b/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dm index c57e60739e9..3a6c3073d26 100644 --- a/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dm +++ b/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dm @@ -3,7 +3,7 @@ /datum/map_template/ruin/away_site/crashed_elyran_tanker name = "Crashed Elyran Tanker" description = "A small tanker, emitting a very faint IFF signal of civilian vessels registered in Elyra. It seems to be partially embedded into a small asteroid, and appears to be completely cold." - suffix = "away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm" + suffixes = list("away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm") sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_NEW_ANKARA, SECTOR_BADLANDS, SECTOR_AEMAQ) spawn_weight = 1 spawn_cost = 1 diff --git a/maps/away/away_site/first_aurora/first_aurora.dm b/maps/away/away_site/first_aurora/first_aurora.dm index 55d22898413..f6fd4b7546b 100644 --- a/maps/away/away_site/first_aurora/first_aurora.dm +++ b/maps/away/away_site/first_aurora/first_aurora.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/first_aurora name = "space station derelict" description = "An abandoned space station." - suffix = "away_site/first_aurora/first_aurora.dmm" + suffixes = list("away_site/first_aurora/first_aurora.dmm") sectors = list(SECTOR_ROMANOVICH) spawn_weight = 1 spawn_cost = 2 diff --git a/maps/away/away_site/hivebot_hub/hivebot_hub.dm b/maps/away/away_site/hivebot_hub/hivebot_hub.dm index 4758a2418ec..91784ebe6fd 100644 --- a/maps/away/away_site/hivebot_hub/hivebot_hub.dm +++ b/maps/away/away_site/hivebot_hub/hivebot_hub.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/hivebot_hub name = "derelict supply hub" description = "An abandoned supply hub. This one's releasing the telltale signals of a potential hivebot infestation." - suffix = "away_site/hivebot_hub/hivebot_hub.dmm" + suffixes = list("away_site/hivebot_hub/hivebot_hub.dmm") sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_NEW_ANKARA, SECTOR_BADLANDS, SECTOR_AEMAQ) spawn_weight = 1 spawn_cost = 1 diff --git a/maps/away/away_site/magshield/magshield.dm b/maps/away/away_site/magshield/magshield.dm index fc995cb26e4..84b1676aa42 100644 --- a/maps/away/away_site/magshield/magshield.dm +++ b/maps/away/away_site/magshield/magshield.dm @@ -3,7 +3,7 @@ id = "magshield" description = "It's an orbital shield station." sectors = list(SECTOR_ROMANOVICH, SECTOR_TAU_CETI, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_AEMAQ, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL, SECTOR_UUEOAESA) - suffix = "away_site/magshield/magshield.dmm" + suffixes = list("away_site/magshield/magshield.dmm") spawn_weight = 1 spawn_cost = 1 diff --git a/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dm b/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dm index c287bc52404..262a72a6157 100644 --- a/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dm +++ b/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/overgrown_mining_station name = "overgrown_mining_station" description = "An abandoned mining station with a dionae growing into it" - suffix = "away_site/overgrown_mining_station/overgrown_mining_station.dmm" + suffixes = list("away_site/overgrown_mining_station/overgrown_mining_station.dmm") sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE) spawn_weight = 1 spawn_cost = 2 diff --git a/maps/away/away_site/racers/racers.dm b/maps/away/away_site/racers/racers.dm index c667cb55224..923d085fb61 100644 --- a/maps/away/away_site/racers/racers.dm +++ b/maps/away/away_site/racers/racers.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/racers name = "unregistered station" description = "A station that doesn't appear to have been legally registered. It has four large hangar bays and a small habitation module - and the signals emittered by its dying equipment seem to identify it as belonging to an underground racing group." - suffix = "away_site/racers/racers.dmm" + suffixes = list("away_site/racers/racers.dmm") sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_NEW_ANKARA, SECTOR_BADLANDS, SECTOR_AEMAQ) spawn_weight = 1 spawn_cost = 2 diff --git a/maps/away/away_site/romanovich/grand_romanovich.dm b/maps/away/away_site/romanovich/grand_romanovich.dm index 4a3b7261f8c..d2143837b8a 100644 --- a/maps/away/away_site/romanovich/grand_romanovich.dm +++ b/maps/away/away_site/romanovich/grand_romanovich.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/grand_romanovich name = "Grand Romanovich Casino" description = "An adhomian style casino in Tau Ceti's space." - suffix = "away_site/romanovich/grand_romanovich.dmm" + suffixes = list("away_site/romanovich/grand_romanovich.dmm") sectors = list(SECTOR_ROMANOVICH) spawn_weight = 1 ship_cost = 2 diff --git a/maps/away/away_site/shady/shady.dm b/maps/away/away_site/shady/shady.dm index a0d3bedc0cd..2eb3f7483cf 100644 --- a/maps/away/away_site/shady/shady.dm +++ b/maps/away/away_site/shady/shady.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/shady name = "shady asteroid" description = "An asteroid with a hangar carved out inside it. Scans detect an unregistered structure within, with multiple lifeforms present." - suffix = "away_site/shady/shady.dmm" + suffixes = list("away_site/shady/shady.dmm") sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) spawn_weight = 1 spawn_cost = 1 diff --git a/maps/away/away_site/sol_bunker/bunker.dm b/maps/away/away_site/sol_bunker/bunker.dm index cb20d6dd73b..84d31f206f6 100644 --- a/maps/away/away_site/sol_bunker/bunker.dm +++ b/maps/away/away_site/sol_bunker/bunker.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/abandoned_bunker name = "lone asteroid" description = "A lone asteroid. Strange signals are coming from this one." - suffix = "away_site/sol_bunker/bunker.dmm" + suffixes = list("away_site/sol_bunker/bunker.dmm") sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE) spawn_weight = 1 spawn_cost = 1 diff --git a/maps/away/away_site/space_bar/space_bar.dm b/maps/away/away_site/space_bar/space_bar.dm index 9fdb1f43fb5..3a593a2d731 100644 --- a/maps/away/away_site/space_bar/space_bar.dm +++ b/maps/away/away_site/space_bar/space_bar.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/space_bar name = "space bar" description = "An abandoned space structure." - suffix = "away_site/space_bar/space_bar.dmm" + suffixes = list("away_site/space_bar/space_bar.dmm") sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE) spawn_weight = 1 ship_cost = 2 diff --git a/maps/away/away_site/tajara/mining_jack/mining_jack.dm b/maps/away/away_site/tajara/mining_jack/mining_jack.dm index 58b6548da5c..cfa3b408717 100644 --- a/maps/away/away_site/tajara/mining_jack/mining_jack.dm +++ b/maps/away/away_site/tajara/mining_jack/mining_jack.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/tajara_mining_jack name = "adhomian mining outpost" description = "An outpost used by the crew of mining jacks." - suffix = "away_site/tajara/mining_jack/mining_jack.dmm" + suffixes = list("away_site/tajara/mining_jack/mining_jack.dmm") sectors = list(SECTOR_BADLANDS, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/away_site/tajara/peoples_station/peoples_station.dm b/maps/away/away_site/tajara/peoples_station/peoples_station.dm index 6f96214540d..51bf278773c 100644 --- a/maps/away/away_site/tajara/peoples_station/peoples_station.dm +++ b/maps/away/away_site/tajara/peoples_station/peoples_station.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/peoples_station name = "People's Space Station" description = "Built in the interwar period, the People's Space Station bears the prestige of being the first space installation designed, constructed, and manned by Tajara." - suffix = "away_site/tajara/peoples_station/peoples_station.dmm" + suffixes = list("away_site/tajara/peoples_station/peoples_station.dmm") sectors = list(SECTOR_SRANDMARR) spawn_weight = 1 spawn_cost = 1 diff --git a/maps/away/away_site/tajara/pra_satellite/pra_satellite.dm b/maps/away/away_site/tajara/pra_satellite/pra_satellite.dm index ccd954059b8..31743daa12a 100644 --- a/maps/away/away_site/tajara/pra_satellite/pra_satellite.dm +++ b/maps/away/away_site/tajara/pra_satellite/pra_satellite.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/pra_satellite name = "hadiist satellite" description = "A People's Republic of Adhomai satellite used to survey the system." - suffix = "away_site/tajara/pra_satellite/pra_satellite.dmm" + suffixes = list("away_site/tajara/pra_satellite/pra_satellite.dmm") sectors = list(SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL) spawn_weight = 1 spawn_cost = 1 diff --git a/maps/away/away_site/tajara/scrapper/scrapper.dm b/maps/away/away_site/tajara/scrapper/scrapper.dm index 287edd210ec..4403e200322 100644 --- a/maps/away/away_site/tajara/scrapper/scrapper.dm +++ b/maps/away/away_site/tajara/scrapper/scrapper.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/tajara_scrapper name = "adhomian scrapper outpost" description = "An outpost used by Tajaran scrappers. It offers repair and scrapping services." - suffix = "away_site/tajara/scrapper/scrapper.dmm" + suffixes = list("away_site/tajara/scrapper/scrapper.dmm") sectors = list(SECTOR_BADLANDS, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dm b/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dm index e841ed23123..0901efde85f 100644 --- a/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dm +++ b/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/tajara_safehouse name = "abandoned outpost" description = "A derelict space outpost." - suffix = "away_site/taj_safehouse/tajara_safehouse.dmm" + suffixes = list("away_site/taj_safehouse/tajara_safehouse.dmm") sectors = list(SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) spawn_weight = 1 ship_cost = 2 diff --git a/maps/away/away_site/unathi_pirate/unathi_pirate_izharshan.dm b/maps/away/away_site/unathi_pirate/unathi_pirate_izharshan.dm index 9c8338c3e7e..25f5873789d 100644 --- a/maps/away/away_site/unathi_pirate/unathi_pirate_izharshan.dm +++ b/maps/away/away_site/unathi_pirate/unathi_pirate_izharshan.dm @@ -2,7 +2,7 @@ name = "empty sector" id = "unathi_pirate" description = "An empty sector." - suffix = "away_site/unathi_pirate/unathi_pirate_izharshan.dmm" + suffixes = list("away_site/unathi_pirate/unathi_pirate_izharshan.dmm") spawn_weight = 1 ship_cost = 1 shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/unathi_pirate_izharshan) diff --git a/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dm b/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dm index 5fb396cf3aa..3d64d788bf7 100644 --- a/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dm +++ b/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/wrecked_nt_ship name = "wrecked NT ship" description = "A wrecked ship once owned by NanoTrasen." - suffix = "awausote/wrecked_nt_ship/wrecked_nt_ship.dmm" + suffixes = list("awausote/wrecked_nt_ship/wrecked_nt_ship.dmm") sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) spawn_weight = 1 spawn_cost = 2 diff --git a/maps/away/ships/casino/casino.dm b/maps/away/ships/casino/casino.dm index 347649c813d..23d53b96ef5 100644 --- a/maps/away/ships/casino/casino.dm +++ b/maps/away/ships/casino/casino.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/casino name = "Casino" description = "A casino ship!" - suffix = "ships/casino/casino.dmm" + suffixes = list("ships/casino/casino.dmm") sectors = list(SECTOR_ROMANOVICH, SECTOR_TAU_CETI, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_AEMAQ, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL, SECTOR_UUEOAESA) spawn_weight = 1 spawn_cost = 1 diff --git a/maps/away/ships/coc_ranger/coc_ship.dm b/maps/away/ships/coc_ranger/coc_ship.dm index 2146cb666c9..26de182e6b6 100644 --- a/maps/away/ships/coc_ranger/coc_ship.dm +++ b/maps/away/ships/coc_ranger/coc_ship.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/ranger_corvette name = "Ranger Gunboat" description = "The Xansan-class is not, in fact, a distinct design in of itself. It is instead Xanu Prime’s variant of the Lagos-class gunboat, a Solarian light attack ship design. While the Lagos-class has been out of service with the Alliance’s navy for centuries, the blueprints were captured during the Interstellar war by Xanu Prime militiamen from a regional naval shipyard during the opening stages of the conflict, and were immediately used to construct ships of the class for use by Xanu Prime’s burgeoning military. While the Xansan-class has been retired from Xanu service, the leftover ships were donated en masse to the Frontier Marshal Bureau, and the Rangers make use of the craft to this day, in spite of their advanced age." - suffix = "ships/coc_ranger/coc_ship.dmm" + suffixes = list("ships/coc_ranger/coc_ship.dmm") sectors = list(SECTOR_BADLANDS) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/einstein/ee_spy_ship.dm b/maps/away/ships/einstein/ee_spy_ship.dm index e37f3b5bb50..f19ccfe46ba 100644 --- a/maps/away/ships/einstein/ee_spy_ship.dm +++ b/maps/away/ships/einstein/ee_spy_ship.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/ee_spy_ship name = "Einstein Engines Research Ship" description = "A research ship belonging to Einstein Engines, the Stellar Corporate Conglomerate's main competitor." - suffix = "ships/einstein/ee_spy_ship.dmm" + suffixes = list("ships/einstein/ee_spy_ship.dmm") sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/elyra/elyra_strike_craft.dm b/maps/away/ships/elyra/elyra_strike_craft.dm index 8f6070acd80..f0a8f117fc7 100644 --- a/maps/away/ships/elyra/elyra_strike_craft.dm +++ b/maps/away/ships/elyra/elyra_strike_craft.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/elyran_strike_craft name = "Elyran Naval Strike Craft" description = "The Aslan-class Strike Craft is among the oldest designs in the Elyran naval arsenal, and is one of the ship classes slated to be retired in the ongoing Elyran military modernization plan. Not an independent vessel in of itself, it is instead an oversized attack craft designed to be launched from the General Abd Al-Hamid-class Carrier, a type of Elyran capital ship, named after the Republic's foremost national hero. As such, it has limited crew facilities and life support capabilities, and is instead reliant on its mothership for long-term operation. This ship is an interdiction variant, with its torpedo bay and railgun hardpoint replaced by a hangar and a boarding pod launch room, respectively." - suffix = "ships/elyra/elyran_strike_craft.dmm" + suffixes = list("ships/elyra/elyran_strike_craft.dmm") sectors = list(SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_AEMAQ) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/iac/iac_rescue_ship.dm b/maps/away/ships/iac/iac_rescue_ship.dm index 7fb4a2ee72e..a47a9f2ff57 100644 --- a/maps/away/ships/iac/iac_rescue_ship.dm +++ b/maps/away/ships/iac/iac_rescue_ship.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/iac_rescue_ship name = "IAC Rescue Ship" description = "The Sanctuary-class rescue ship is a fast response medical vessel, based in large part off of the Asclepius-class medical transport, a much older and more widespread clinic ship, designed to operate mainly between planets rather than in open space. Most Sanctuary-class hulls are heavily refitted to accomodate for the new conditions in the Wildlands, sporting additional thrusters and a hangar bay, created from what was originally a waiting room. However, it is still limited by its origins, having only the bare minimum of crew and atmospherics facilities, as well as being rather obviously unarmed, often needing to return to port for repairs or supplies." - suffix = "ships/iac/iac_rescue_ship.dmm" + suffixes = list("ships/iac/iac_rescue_ship.dmm") sectors = list(SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL) spawn_weight = 1 spawn_cost = 1 diff --git a/maps/away/ships/kataphracts/kataphract_ship.dm b/maps/away/ships/kataphracts/kataphract_ship.dm index c8294440815..5333ccdb34c 100644 --- a/maps/away/ships/kataphracts/kataphract_ship.dm +++ b/maps/away/ships/kataphracts/kataphract_ship.dm @@ -2,7 +2,7 @@ name = "kataphract ship" id = "awaysite_kataphract_ship" description = "Ship with lizard knights." - suffix = "ships/kataphracts/kataphract_ship.dmm" + suffixes = list("ships/kataphracts/kataphract_ship.dmm") ship_cost = 1 spawn_weight = 1 shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/kataphract_transport) diff --git a/maps/away/ships/orion/orion_express_ship.dm b/maps/away/ships/orion/orion_express_ship.dm index fc6d23e4440..12c8f49d696 100644 --- a/maps/away/ships/orion/orion_express_ship.dm +++ b/maps/away/ships/orion/orion_express_ship.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/orion_express_ship name = "Orion Express Mobile Station" description = "The Traveler-class mobile station is a relatively old design, but nonetheless venerable and one of the building blocks of interstellar commerce. While relatively small, is a treasured asset in the Orion Express corporation's fleet, and has been referred to as “the gas station of the stars”, offering food, supplies, and fuel to anyone who may need it." - suffix = "ships/orion/orion_express_ship.dmm" + suffixes = list("ships/orion/orion_express_ship.dmm") sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/pra/database_freighter/database_freighter.dm b/maps/away/ships/pra/database_freighter/database_freighter.dm index 966836c5eec..91202a5eeb8 100644 --- a/maps/away/ships/pra/database_freighter/database_freighter.dm +++ b/maps/away/ships/pra/database_freighter/database_freighter.dm @@ -2,7 +2,7 @@ name = "Database Freighter" id = "database_freighter" description = "Made from adapted designs of the first freighter Tajara ever worked upon, Database freighters are PRA vessels made specially for gathering information on star systems and what passes through them." - suffix = "ships/pra/database_freighter/database_freighter.dmm" + suffixes = list("ships/pra/database_freighter/database_freighter.dmm") ship_cost = 1 spawn_weight = 1 shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/database_freighter_shuttle) diff --git a/maps/away/ships/pra/headmaster/headmaster_ship.dm b/maps/away/ships/pra/headmaster/headmaster_ship.dm index bb9a77dfd9b..fbe2e3d70df 100644 --- a/maps/away/ships/pra/headmaster/headmaster_ship.dm +++ b/maps/away/ships/pra/headmaster/headmaster_ship.dm @@ -2,7 +2,7 @@ name = "Headmaster Ship" id = "headmaster_ship" description = "A People's Republic Orbital Fleet ship." - suffix = "ships/pra/headmaster/headmaster_ship.dmm" + suffixes = list("ships/pra/headmaster/headmaster_ship.dmm") ship_cost = 1 spawn_weight = 1 shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/headmaster_shuttle) diff --git a/maps/away/ships/skrell_smuggler/tirakqi_freighter.dm b/maps/away/ships/skrell_smuggler/tirakqi_freighter.dm index 0709311b1e1..61fd5d240f9 100644 --- a/maps/away/ships/skrell_smuggler/tirakqi_freighter.dm +++ b/maps/away/ships/skrell_smuggler/tirakqi_freighter.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/tirakqi_freighter name = "Ti'Rakqi Freighter" description = "A large skrellian freighter often seen skulking around space near the borders of the Traverse. This model has a large cargo hold, swift engines, and a deceptively large fuel reserve. Perfect for any smuggler on the go. This one's transponder identifies it as belonging to an independent freighter." - suffix = "ships/skrell_smuggler/tirakqi_freighter.dmm" + suffixes = list("ships/skrell_smuggler/tirakqi_freighter.dmm") sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/sol_merc/fsf_patrol_ship.dm b/maps/away/ships/sol_merc/fsf_patrol_ship.dm index a80863166fd..3f24bc251ef 100644 --- a/maps/away/ships/sol_merc/fsf_patrol_ship.dm +++ b/maps/away/ships/sol_merc/fsf_patrol_ship.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/fsf_patrol_ship name = "FSF Corvette" description = "A small corvette manufactured for the Solarian Navy by Hephaestus, the Montevideo-class is an anti-piracy vessel through and through - with a shuttle bay that takes up a third of the ship and only a single weapon hardpoint located in one arm of the ship, the Montevideo is designed for long-term, self-sufficient operations in inhabited space against small-time pirate vessels that would be unable to overcome the ship's lackluster armaments. Generous automation and streamlined equipment allows it to function with a very small crew." - suffix = "ships/sol_merc/fsf_patrol_ship.dmm" + suffixes = list("ships/sol_merc/fsf_patrol_ship.dmm") sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/sol_pirate/sfa_patrol_ship.dm b/maps/away/ships/sol_pirate/sfa_patrol_ship.dm index 1ad1d3c6736..ef62a63af5a 100644 --- a/maps/away/ships/sol_pirate/sfa_patrol_ship.dm +++ b/maps/away/ships/sol_pirate/sfa_patrol_ship.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/sfa_patrol_ship name = "SFA Corvette" description = "A small ship that appears to be, at its core, a Montevideo-class corvette, a Solarian anti-piracy and patrol corvette designed with ample automation and streamlined equipment which allows for it to be manned by a small crew. This one, however, seems to have been host to a myriad of haphazard and radical modifications, and is scarcely identifiable as the original craft. Beyond the changes made to the ship itself, it also appears to have suffered extensive damage and wear, and seems to be near-derelict" - suffix = "ships/sol_pirate/sfa_patrol_ship.dmm" + suffixes = list("ships/sol_pirate/sfa_patrol_ship.dmm") sectors = list(SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/sol_ssmd/ssmd_ship.dm b/maps/away/ships/sol_ssmd/ssmd_ship.dm index 00b84b3cc26..0a15b3c59d6 100644 --- a/maps/away/ships/sol_ssmd/ssmd_ship.dm +++ b/maps/away/ships/sol_ssmd/ssmd_ship.dm @@ -2,7 +2,7 @@ name = "SSMD Corvette" description = "A long-range reconnaissance corvette design in use by the Solarian Navy, the Uhlan-class is a relatively costly and somewhat uncommon ship to be seen in the Alliance's fleets, and is typically reserved for more elite (or at least better equipped and trained) units. Designed to operate alone or as part of a small task force with minimal support in unfriendly space, it is most commonly seen assigned to probing, surveillance, harassment, and strike operations. \ In spite of its small size, the Uhlan has relatively generous crew facilities and it is well-armed relative to its size and role, all made possible by extensive automation." - suffix = "ships/sol_ssmd/ssmd_ship.dmm" + suffixes = list("ships/sol_ssmd/ssmd_ship.dmm") sectors = list(SECTOR_BADLANDS) spawn_weight = 1 spawn_cost = 1 diff --git a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm index dbe0300b02a..09c0e7191d0 100644 --- a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm +++ b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/tajaran_smuggler name = "Adhomian Freighter" description = "Built with reliability in mind, the Zhsram Freighter is one of the most common Adhomian designs. This vessel is cheap and has a sizeable cargo storage. It is frequently used by Tajaran traders and smugglers." - suffix = "ships/tajara/taj_smuggler/tajaran_smuggler.dmm" + suffixes = list("ships/tajara/taj_smuggler/tajaran_smuggler.dmm") sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/tcfl_patrol/tcfl_peacekeeper_ship.dm b/maps/away/ships/tcfl_patrol/tcfl_peacekeeper_ship.dm index 08f8633d3b4..f2f1f43f6ba 100644 --- a/maps/away/ships/tcfl_patrol/tcfl_peacekeeper_ship.dm +++ b/maps/away/ships/tcfl_patrol/tcfl_peacekeeper_ship.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/tcfl_peacekeeper_ship name = "TCFL Corvette" description = "Serving as the very foundation of the SCC's (And more specifically, NanoTrasen's) fleet of asset protection vessels, the Cetus-class is versatile and durable, but also clumsy and somewhat underpowered in regards to its engine and propulsion. It features small weapon hardpoints in its thruster arms, and a massive hangar host to the design's interdiction counterpart - the Hydrus-class shuttle. This one appears to be a Decanus-class, the Tau Ceti Foreign Legion variation of the design." - suffix = "ships/tcfl_patrol/tcfl_peacekeeper_ship.dmm" + suffixes = list("ships/tcfl_patrol/tcfl_peacekeeper_ship.dmm") sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/tramp_freighter/tramp_freighter.dm b/maps/away/ships/tramp_freighter/tramp_freighter.dm index e719f8fbb99..763427187b0 100644 --- a/maps/away/ships/tramp_freighter/tramp_freighter.dm +++ b/maps/away/ships/tramp_freighter/tramp_freighter.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/tramp_freighter name = "Tramp Freighter" description = "A freighter of mixed repute, the Catspaw-class is a rare independent design, and a favorite of small-scale freight businesses. It has a shielded cargo bay and an internal hangar, capable of accommodating a small shuttle. Its other features, however, are lacking - with cramped crew amenities and no defenses to speak of, the Catspaw is risky to operate in unpoliced space." - suffix = "ships/tramp_freighter/tramp_freighter.dmm" + suffixes = list("ships/tramp_freighter/tramp_freighter.dmm") sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_NEW_ANKARA, SECTOR_BADLANDS, SECTOR_AEMAQ) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/wildlands_militia/militia_ship.dm b/maps/away/ships/wildlands_militia/militia_ship.dm index 7aba4ad4086..e4d7979d755 100644 --- a/maps/away/ships/wildlands_militia/militia_ship.dm +++ b/maps/away/ships/wildlands_militia/militia_ship.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/militia_ship name = "Militia Ship" description = "An unarmed and extremely prolific design of large, self-sufficient shuttle, prized for its modularity. Found all throughout the spur, the Yak-class shuttle can be configured to conceivably serve in any role, though it is only rarely armed with ship-to-ship weapons. Manufactured by Hephaestus." - suffix = "ships/wildlands_milita/militia_ship.dmm" + suffixes = list("ships/wildlands_milita/militia_ship.dmm") sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/yacht/yacht.dm b/maps/away/ships/yacht/yacht.dm index c8396a1d867..71b9174000e 100644 --- a/maps/away/ships/yacht/yacht.dm +++ b/maps/away/ships/yacht/yacht.dm @@ -2,7 +2,7 @@ name = "Yacht" id = "awaysite_yacht" description = "Tiny movable ship with spiders." - suffix = "ships/yacht/yacht.dmm" + suffixes = list("ships/yacht/yacht.dmm") spawn_cost = 0.5 spawn_weight = 0.5 sectors = list(SECTOR_ROMANOVICH, SECTOR_TAU_CETI, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_AEMAQ, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL, SECTOR_UUEOAESA) diff --git a/maps/random_ruins/exoplanets/asteroid/asteroid.dm b/maps/random_ruins/exoplanets/asteroid/asteroid.dm index d6a575c6014..4886ff3140c 100644 --- a/maps/random_ruins/exoplanets/asteroid/asteroid.dm +++ b/maps/random_ruins/exoplanets/asteroid/asteroid.dm @@ -6,7 +6,7 @@ spawn_weight = 1 spawn_cost = 2 sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) - suffix = "asteroid/mining_base.dmm" + suffixes = list("asteroid/mining_base.dmm") ruin_tags = RUIN_HUMAN|RUIN_VOID @@ -18,7 +18,7 @@ spawn_weight = 1 spawn_cost = 2 sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) - suffix = "asteroid/carp_nest.dmm" + suffixes = list("asteroid/carp_nest.dmm") ruin_tags = RUIN_ALIEN|RUIN_VOID @@ -30,7 +30,7 @@ spawn_weight = 0.5 spawn_cost = 4 sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) - suffix = "asteroid/hideout.dmm" + suffixes = list("asteroid/hideout.dmm") ruin_tags = RUIN_HUMAN|RUIN_WRECK|RUIN_VOID @@ -42,7 +42,7 @@ spawn_weight = 1 spawn_cost = 2 sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) - suffix = "asteroid/crashed_shuttle_01.dmm" + suffixes = list("asteroid/crashed_shuttle_01.dmm") ruin_tags = RUIN_WRECK|RUIN_VOID diff --git a/maps/random_ruins/exoplanets/crashed_pod/crashed_pod.dm b/maps/random_ruins/exoplanets/crashed_pod/crashed_pod.dm index 615a891404a..f162d954239 100644 --- a/maps/random_ruins/exoplanets/crashed_pod/crashed_pod.dm +++ b/maps/random_ruins/exoplanets/crashed_pod/crashed_pod.dm @@ -2,7 +2,7 @@ name = "crashed survival pod" //This map is not very elaborate and is meant to be an example on how to make a ruin. id = "crashed_pod" description = "A crashed survival pod from a destroyed ship." - suffix = "crashed_pod/crashed_pod.dmm" + suffixes = list("crashed_pod/crashed_pod.dmm") template_flags = TEMPLATE_FLAG_CLEAR_CONTENTS | TEMPLATE_FLAG_NO_RUINS | TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED ruin_tags = RUIN_HUMAN|RUIN_WRECK spawn_weight = 0.33 diff --git a/maps/random_ruins/space_ruins/space_ruins.dm b/maps/random_ruins/space_ruins/space_ruins.dm index 9fbcf9ab800..ab62ef07e90 100644 --- a/maps/random_ruins/space_ruins/space_ruins.dm +++ b/maps/random_ruins/space_ruins/space_ruins.dm @@ -8,5 +8,5 @@ name = "Multi-ZAS Test" id = "multi_zas_test" description = "if this has vacuum in it, that's not good!" - suffix = "multi_zas_test.dmm" + suffixes = list("multi_zas_test.dmm") spawn_cost = 1 \ No newline at end of file diff --git a/maps/templates/distress/distress_equipment.dm b/maps/templates/distress/distress_equipment.dm index f53e72fb39c..9540fbf3d77 100644 --- a/maps/templates/distress/distress_equipment.dm +++ b/maps/templates/distress/distress_equipment.dm @@ -1,11 +1,11 @@ /datum/map_template/distress_iac name = "IAC distress equipment" - mappath = 'maps/templates/distress/iac.dmm' + mappaths = list("maps/templates/distress/iac.dmm") /datum/map_template/distress_kataphract name = "kataphract distress equipment" - mappath = 'maps/templates/distress/kataphracts.dmm' + mappaths = list("maps/templates/distress/kataphracts.dmm") /datum/map_template/distress_freelancers name = "freelancer distress equipment" - mappath = 'maps/templates/distress/freelancers.dmm' \ No newline at end of file + mappaths = list("maps/templates/distress/freelancers.dmm") \ No newline at end of file diff --git a/maps/templates/orbital/orbital_templates.dm b/maps/templates/orbital/orbital_templates.dm index 220e33f7211..0bcae5819c9 100644 --- a/maps/templates/orbital/orbital_templates.dm +++ b/maps/templates/orbital/orbital_templates.dm @@ -1,27 +1,27 @@ /datum/map_template/mecha name = "Light Mecha Drop" - mappath = 'maps/templates/orbital/light-mecha.dmm' + mappaths = list("maps/templates/orbital/light-mecha.dmm") /datum/map_template/mecha/heavy name = "Heavy Mecha Drop" - mappath = 'maps/templates/orbital/heavy-mecha.dmm' + mappaths = list("maps/templates/orbital/heavy-mecha.dmm") /datum/map_template/mecha/combat name = "Combat Mecha Drop" - mappath = 'maps/templates/orbital/combat-mecha.dmm' + mappaths = list("maps/templates/orbital/combat-mecha.dmm") /datum/map_template/mecha/powerloader name = "Powerloader Mecha Drop" - mappath = 'maps/templates/orbital/powerloader-mecha.dmm' + mappaths = list("maps/templates/orbital/powerloader-mecha.dmm") /datum/map_template/armory name = "Armory Drop" - mappath = 'maps/templates/orbital/mini-armory.dmm' + mappaths = list("maps/templates/orbital/mini-armory.dmm") /datum/map_template/drill name = "Drill Drop" - mappath = 'maps/templates/orbital/drill.dmm' + mappaths = list("maps/templates/orbital/drill.dmm") /datum/map_template/minecart name = "Minecart Drop" - mappath = 'maps/templates/orbital/minecart.dmm' + mappaths = list("maps/templates/orbital/minecart.dmm")