From 2acadeed00e52183b6a5f00f0cbeabdb37c83c3d Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sat, 3 May 2025 15:18:57 -0400 Subject: [PATCH] refactors paint helpers and hopefully fixes them (?) (#7132) --- citadel.dme | 2 + code/__DEFINES/_planes+layers.dm | 1 + code/__DEFINES/admin/admin.dm | 3 +- code/controllers/subsystem/simple_networks.dm | 2 +- code/game/atoms/atom-audit.dm | 26 ++ code/game/objects/structures/low_wall.dm | 3 +- code/modules/logging/README.md | 6 + code/modules/logging/logging.dm | 2 +- .../mapping/map_helpers/_map_helpers.dm | 13 +- code/modules/mapping/map_helpers/paint.dm | 169 +++------ .../mapping/map_helpers/paint_stripe.dm | 72 ++++ code/modules/mapping/spawner/window.dm | 153 +++++--- maps/endeavour/levels/Dropship.dmm | 12 +- maps/endeavour/levels/deck1.dmm | 198 +++++----- maps/endeavour/levels/deck2.dmm | 348 ++++++++--------- maps/endeavour/levels/deck3.dmm | 304 +++++++-------- maps/endeavour/levels/deck4.dmm | 130 +++---- maps/endeavour/levels/flagship.dmm | 52 +-- maps/euthenia/levels/deck0.dmm | 6 +- maps/euthenia/levels/deck1.dmm | 8 +- maps/euthenia/levels/deck2.dmm | 2 +- maps/euthenia/levels/deck3.dmm | 12 +- maps/euthenia/levels/deck4.dmm | 24 +- maps/minitest/levels/minitest.dmm | 50 ++- maps/rift/engines/sme.dmm | 8 +- maps/rift/levels/rift-01-underground3.dmm | 2 +- maps/rift/levels/rift-02-underground2.dmm | 70 ++-- maps/rift/levels/rift-03-underground1.dmm | 120 +++--- maps/rift/levels/rift-04-surface1.dmm | 246 ++++++------ maps/rift/levels/rift-05-surface2.dmm | 301 ++++++++------- maps/rift/levels/rift-06-surface3.dmm | 350 ++++++++---------- maps/rift/levels/rift-11-orbital.dmm | 20 +- maps/sectors/admin_planets_192/andromeda.dmm | 112 +++--- maps/sectors/admin_planets_192/croatoan.dmm | 6 +- maps/sectors/admin_planets_192/fey_map.dmm | 4 +- .../levels/delerict_casino.dmm | 36 +- maps/sectors/gaia_192/levels/gaia_192.dmm | 6 - .../sectors/miaphus/levels/miaphus_desert.dmm | 2 +- .../levels/nebula_tradeport.dmm | 248 +++++-------- .../levels/sky_planet_ground_east.dmm | 4 +- .../sky_planet/levels/sky_planet_sky_east.dmm | 2 +- .../sky_planet/levels/sky_planet_sky_west.dmm | 2 +- .../levels/sky_planet_upper_sky_west.dmm | 39 +- maps/sectors/surt/levels/surt_west.dmm | 6 +- .../nanotrasen/drone_prototype.dmm | 2 +- maps/submaps/sky_planet_ground/biodome.dmm | 18 +- maps/submaps/sky_planet_ground/ruins-g3.dmm | 2 +- .../sky_planet_ground/shuttle_crash1.dmm | 6 +- .../sky_planet_ground/shuttle_crash3.dmm | 4 +- .../sky_planet_ground/shuttle_crash4.dmm | 2 +- .../sky_planet_ground/shuttle_crash5.dmm | 4 +- maps/submaps/sky_planet_rigs/miningdrill.dmm | 4 +- maps/submaps/sky_planet_rigs/ruin3.dmm | 2 +- .../sky_planet_rigs/tajaranrebelbase.dmm | 4 +- maps/templates/admin/shipcave.dmm | 34 +- maps/tether/engines/rust.dmm | 16 +- maps/tether/engines/sme.dmm | 12 +- maps/tether/engines/tesla.dmm | 12 +- maps/tether/levels/mining.dmm | 20 +- maps/tether/levels/station1.dmm | 178 ++++----- maps/tether/levels/station2.dmm | 268 +++++++------- maps/tether/levels/surface1.dmm | 260 ++++++------- maps/tether/levels/surface2.dmm | 290 +++++++-------- maps/tether/levels/surface3.dmm | 344 ++++++++--------- maps/triumph/levels/deck1.dmm | 150 ++++---- maps/triumph/levels/deck2.dmm | 72 ++-- maps/triumph/levels/deck3.dmm | 180 ++++----- maps/triumph/levels/deck4.dmm | 322 ++++++++-------- maps/triumph/levels/flagship.dmm | 52 +-- 69 files changed, 2730 insertions(+), 2710 deletions(-) create mode 100644 code/game/atoms/atom-audit.dm create mode 100644 code/modules/mapping/map_helpers/paint_stripe.dm diff --git a/citadel.dme b/citadel.dme index 187364bf0ce..d9c25979844 100644 --- a/citadel.dme +++ b/citadel.dme @@ -1088,6 +1088,7 @@ #include "code\game\atoms\_atom.dm" #include "code\game\atoms\action_feedback.dm" #include "code\game\atoms\appearance.dm" +#include "code\game\atoms\atom-audit.dm" #include "code\game\atoms\atom-construction.dm" #include "code\game\atoms\atom-damage.dm" #include "code\game\atoms\atom-defense.dm" @@ -3448,6 +3449,7 @@ #include "code\modules\mapping\map_helpers\engine_loader.dm" #include "code\modules\mapping\map_helpers\gear_marker.dm" #include "code\modules\mapping\map_helpers\paint.dm" +#include "code\modules\mapping\map_helpers\paint_stripe.dm" #include "code\modules\mapping\map_helpers\role_marker.dm" #include "code\modules\mapping\map_helpers\access_helper\access_helper.dm" #include "code\modules\mapping\map_helpers\access_helper\airlock.dm" diff --git a/code/__DEFINES/_planes+layers.dm b/code/__DEFINES/_planes+layers.dm index 7d4648775f7..d6912990536 100644 --- a/code/__DEFINES/_planes+layers.dm +++ b/code/__DEFINES/_planes+layers.dm @@ -329,6 +329,7 @@ */ #define DEBUG_PLANE 23 #define DEBUG_LAYER_AREA_OVERLAYS 100 +#define DEBUG_LAYER_MAP_HELPERS 250 #define DEBUG_LAYER_SHUTTLE_MARKERS 500 /** diff --git a/code/__DEFINES/admin/admin.dm b/code/__DEFINES/admin/admin.dm index 81da2c7e90f..ff56430025a 100644 --- a/code/__DEFINES/admin/admin.dm +++ b/code/__DEFINES/admin/admin.dm @@ -61,8 +61,7 @@ #define ADMIN_LOOKUP(user) ("[key_name_admin(user)][ADMIN_QUE(user)]") #define ADMIN_LOOKUPFLW(user) ("[key_name_admin(user)][ADMIN_QUE(user)] [ADMIN_FLW(user)]") #define COORD(src) ("[src ? src.Admin_Coordinates_Readable() : "nonexistent location"]") -// todo: this should be made faster/better, and support stuff like inventory / storage awareness -#define AUDIT_COORD(src) ("[src ? src.Admin_Coordinates_Readable() : "nonexistent location"]") +#define ADMIN_AUDIT_LOC(src) ("[src ? src.audit_loc() : "(bad ref)"]") #define AREACOORD(src) ("[src ? src.Admin_Coordinates_Readable(TRUE) : "nonexistent location"]") #define ADMIN_COORDJMP(src) ("[src ? src.Admin_Coordinates_Readable(FALSE, TRUE) : "nonexistent location"]") #define ADMIN_VERBOSEJMP(src) ("[src ? src.Admin_Coordinates_Readable(TRUE, TRUE) : "nonexistent location"]") diff --git a/code/controllers/subsystem/simple_networks.dm b/code/controllers/subsystem/simple_networks.dm index 5fb36739960..57f483e5bfe 100644 --- a/code/controllers/subsystem/simple_networks.dm +++ b/code/controllers/subsystem/simple_networks.dm @@ -6,7 +6,7 @@ */ SUBSYSTEM_DEF(simple_networks) name = "Simple Networks" - subsystem_flags = SS_NO_FIRE + subsystem_flags = SS_NO_FIRE | SS_NO_INIT // no init order for now // no fire priority for now diff --git a/code/game/atoms/atom-audit.dm b/code/game/atoms/atom-audit.dm new file mode 100644 index 00000000000..8de957c8f97 --- /dev/null +++ b/code/game/atoms/atom-audit.dm @@ -0,0 +1,26 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2025 Citadel Station Developers *// + +/** + * get simple log string of current location with zlevel info + * * shouldn't be player visible + */ +/atom/proc/audit_loc() + // todo: split down the path chain for specific handling on types + if(isarea(src)) + . = "('[src]' / [type] / z-[z])" + else + var/turf/where = get_turf(src) + if(where) + . = "([where.x]-[where.y]-[where.z] - [where.loc ? "'[where.loc]'" : "NULL AREA"] @ '[SSmapping.level_id(where.z)]')" + else + . = "(null)" + +/** + * get simple log string of current location with zlevel info, along with what we're nested in + * * shouldn't be player visible + */ +/atom/proc/audit_nested_loc() + // todo: nesting handling on movables + return audit_loc() + diff --git a/code/game/objects/structures/low_wall.dm b/code/game/objects/structures/low_wall.dm index e3d4b324711..8ba430553bc 100644 --- a/code/game/objects/structures/low_wall.dm +++ b/code/game/objects/structures/low_wall.dm @@ -11,6 +11,7 @@ GLOBAL_LIST_INIT(wallframe_typecache, typecacheof(list( /turf/simulated/wall, ))) +// todo: either this file should be wall_frame or this structure should be /low_wall, not both /obj/structure/wall_frame name = "low wall" desc = "A low wall, with space to mount windows or grilles on top of it." @@ -35,7 +36,6 @@ GLOBAL_LIST_INIT(wallframe_typecache, typecacheof(list( material_primary = MATERIAL_PART_DEFAULT material_costs = SHEET_MATERIAL_AMOUNT * 2 - var/paint_color var/stripe_color var/str var/static/list/airlock_typecache @@ -45,7 +45,6 @@ GLOBAL_LIST_INIT(wallframe_typecache, typecacheof(list( var/material_color = TRUE /obj/structure/wall_frame/prepainted - paint_color = COLOR_WALL_GUNMETAL stripe_color = COLOR_WALL_GUNMETAL /obj/structure/wall_frame/Initialize(mapload, datum/prototype/material/material_like) diff --git a/code/modules/logging/README.md b/code/modules/logging/README.md index d1ab5aa5802..19a7c40f976 100644 --- a/code/modules/logging/README.md +++ b/code/modules/logging/README.md @@ -1,3 +1,9 @@ # Logging Module Contains public API for standardized logging. + +## Event Logger + +event logger is a very low level trace logger + +it doesn't emit very human readable logs (json is not that fun to read) but can be later used in ingest. diff --git a/code/modules/logging/logging.dm b/code/modules/logging/logging.dm index 083b3c6df13..69cd1094791 100644 --- a/code/modules/logging/logging.dm +++ b/code/modules/logging/logging.dm @@ -34,7 +34,7 @@ * log click - context menu */ /proc/log_click_context(datum/event_args/actor/e_args, atom/target, message) - log_click("CONTEXT: [key_name(e_args.initiator)][e_args.performer != e_args.initiator? " via [key_name(e_args.performer)]" : ""] -> [target] [AUDIT_COORD(target)]: [message]") + log_click("CONTEXT: [key_name(e_args.initiator)][e_args.performer != e_args.initiator? " via [key_name(e_args.performer)]" : ""] -> [target] [target.audit_loc()]: [message]") /** * log click - action buttons diff --git a/code/modules/mapping/map_helpers/_map_helpers.dm b/code/modules/mapping/map_helpers/_map_helpers.dm index 65d497dc764..9670967cc48 100644 --- a/code/modules/mapping/map_helpers/_map_helpers.dm +++ b/code/modules/mapping/map_helpers/_map_helpers.dm @@ -12,22 +12,20 @@ /obj/map_helper icon = 'icons/mapping/helpers/mapping_helpers.dmi' icon_state = "" + plane = DEBUG_PLANE + layer = DEBUG_LAYER_MAP_HELPERS /// overrides [late] /// makes us register as a map initialization hook, which fires before atom init. - /// you have to qdel self if you use this! it will not be automatically done if so. + /// * you have to qdel self if you use this! it will not be automatically done if so. var/early = FALSE /// use LateInitialize instead of Initialize - /// this gets rid of the automatic qdel self behavior so you have to do it yourself. + /// * this gets rid of the automatic qdel self behavior so you have to do it yourself. var/late = FALSE /// preloading instance fired var/was_in_mapload = FALSE -/obj/map_helper/New() - pass() - return ..() - /obj/map_helper/preloading_instance(datum/dmm_context/context) . = ..() was_in_mapload = TRUE @@ -35,11 +33,12 @@ hook_map_initializations(context) /obj/map_helper/Initialize(mapload) + SHOULD_CALL_PARENT(FALSE) var/let_me_live = FALSE if(!was_in_mapload) message_admins("a datum with map initializations was created. if this was you, you are in charge of invoking map_initializations() on it. this is not called by default outside of mapload as many things using the hook are highly destructive.") let_me_live = TRUE - . = ..() + atom_flags |= ATOM_INITIALIZED if(late) return INITIALIZE_HINT_LATELOAD // fire LateInitialize() else if(early) diff --git a/code/modules/mapping/map_helpers/paint.dm b/code/modules/mapping/map_helpers/paint.dm index 2523a9bb31a..c1e32bf4bfd 100644 --- a/code/modules/mapping/map_helpers/paint.dm +++ b/code/modules/mapping/map_helpers/paint.dm @@ -1,25 +1,23 @@ -#define CREATE_PAINT(x, c) /obj/effect/paint/x/color=c -#define CREATE_PAINT_STRIPE(x, c) /obj/effect/paint_stripe/x/color=c - -// todo: why tf isn't this a map helper -// TODO: make this a map helper for my sanity. @Zandario - -/obj/effect/paint +/** + * Used to repaint structural tiles (walls, low-walls, etc) fully as needed. + */ +/obj/map_helper/paint name = "coat of paint" + // TODO: resprite this and put it in helper icons folder icon = 'icons/effects/effects.dmi' icon_state = "wall_paint_effect" - layer = ABOVE_TURF_LAYER - blend_mode = BLEND_MULTIPLY + late = TRUE -/obj/effect/paint/Initialize() - . = ..() - return INITIALIZE_HINT_LATELOAD - -/obj/effect/paint/LateInitialize() - for(var/obj/effect/paint/paint in loc) +/obj/map_helper/paint/LateInitialize() + for(var/obj/map_helper/paint/paint in loc) if(paint == src) continue - WARNING("Duplicate paint found at [x], [y], [z]") + stack_trace("Duplicate paint found at [audit_loc()]") + qdel(src) + return + + if(!color) + stack_trace("/paint helper at [audit_loc()] has no color") qdel(src) return @@ -27,120 +25,49 @@ if(istype(loc, /turf/simulated/wall)) var/turf/simulated/wall/target_wall = loc - if(!isnull(color)) - target_wall.paint_wall(color) + target_wall.paint_wall(color) did_anything = TRUE - else var/obj/structure/wall_frame/low_wall = locate() in loc if(low_wall) - if(!isnull(color)) - low_wall.paint_color = color - low_wall.stripe_color = color - low_wall.update_appearance() + low_wall.stripe_color = color + low_wall.update_appearance() did_anything = TRUE if(!did_anything) - WARNING("Redundant paint helper found at [x], [y], [z]") + stack_trace("Redundant paint helper found at [audit_loc()]") qdel(src) -//Stripes the wall it spawns on, then dies -/obj/effect/paint_stripe - name = "stripe of paint" - icon = 'icons/effects/effects.dmi' - icon_state = "paintdot" - layer = ABOVE_TURF_LAYER - blend_mode = BLEND_MULTIPLY +#define CREATE_WALL_PAINT(x, c) /obj/map_helper/paint/x/color=c -/obj/effect/paint_stripe/Initialize() - . = ..() - return INITIALIZE_HINT_LATELOAD +CREATE_WALL_PAINT(beastybrown, COLOR_CARGO_BROWN) +CREATE_WALL_PAINT(pipecyan, COLOR_ATMOSPHERICS_CYAN) +CREATE_WALL_PAINT(sun, COLOR_SUN) +CREATE_WALL_PAINT(red, COLOR_RED) +CREATE_WALL_PAINT(silver, COLOR_SILVER) +CREATE_WALL_PAINT(black, COLOR_GRAY20) +CREATE_WALL_PAINT(green, COLOR_GREEN) +CREATE_WALL_PAINT(navy, COLOR_NAVY) +CREATE_WALL_PAINT(eggshell, COLOR_EGGSHELL) +CREATE_WALL_PAINT(beige, COLOR_BEIGE) +CREATE_WALL_PAINT(darkred, COLOR_SECURITY_RED) +CREATE_WALL_PAINT(maroon, COLOR_MAROON) +CREATE_WALL_PAINT(cyanblue, COLOR_CYAN_BLUE) +CREATE_WALL_PAINT(copper, COLOR_COPPER) +CREATE_WALL_PAINT(amber, COLOR_AMBER) +CREATE_WALL_PAINT(wallgunmetal, COLOR_WALL_GUNMETAL) +CREATE_WALL_PAINT(bottlegreen, COLOR_BOTTLE_GREEN) +CREATE_WALL_PAINT(palebottlegreen, COLOR_PALE_BTL_GREEN) +CREATE_WALL_PAINT(pakistangreen, COLOR_PAKISTAN_GREEN) +CREATE_WALL_PAINT(offwhite, COLOR_OFF_WHITE) +CREATE_WALL_PAINT(violet, COLOR_EXPLO_VIOLET) +CREATE_WALL_PAINT(gunmetal, COLOR_GUNMETAL) +CREATE_WALL_PAINT(paleorange, COLOR_PALE_ORANGE) +CREATE_WALL_PAINT(commandblue, COLOR_COMMAND_BLUE) +CREATE_WALL_PAINT(purple, COLOR_PURPLE) +CREATE_WALL_PAINT(purplegray, COLOR_PURPLE_GRAY) +CREATE_WALL_PAINT(babyblue, COLOR_BABY_BLUE) +CREATE_WALL_PAINT(hardwood, WOOD_COLOR_HARDWOOD) -/obj/effect/paint_stripe/LateInitialize() - for(var/obj/effect/paint_stripe/paint in loc) - if(paint == src) - continue - WARNING("Duplicate paint stripe found at [x], [y], [z]") - qdel(src) - return - - var/did_anything = FALSE - - if(istype(loc, /turf/simulated/wall)) - var/turf/simulated/wall/target_wall = loc - if(!isnull(color)) - target_wall.paint_stripe(color) - did_anything = TRUE - - else - var/obj/structure/wall_frame/low_wall = locate() in loc - if(low_wall) - if(!isnull(color)) - low_wall.stripe_color = color - low_wall.update_appearance() - did_anything = TRUE - - if(!did_anything) - WARNING("Redundant paint helper found at [x], [y], [z]") - - qdel(src) - -//paint defines - -CREATE_PAINT(beastybrown, COLOR_CARGO_BROWN) -CREATE_PAINT(pipecyan, COLOR_ATMOSPHERICS_CYAN) -CREATE_PAINT(sun, COLOR_SUN) -CREATE_PAINT(red, COLOR_RED) -CREATE_PAINT(silver, COLOR_SILVER) -CREATE_PAINT(black, COLOR_GRAY20) -CREATE_PAINT(green, COLOR_GREEN) -CREATE_PAINT(navy, COLOR_NAVY) -CREATE_PAINT(eggshell, COLOR_EGGSHELL) -CREATE_PAINT(beige, COLOR_BEIGE) -CREATE_PAINT(darkred, COLOR_SECURITY_RED) -CREATE_PAINT(maroon, COLOR_MAROON) -CREATE_PAINT(cyanblue, COLOR_CYAN_BLUE) -CREATE_PAINT(copper, COLOR_COPPER) -CREATE_PAINT(amber, COLOR_AMBER) -CREATE_PAINT(wallgunmetal, COLOR_WALL_GUNMETAL) -CREATE_PAINT(bottlegreen, COLOR_BOTTLE_GREEN) -CREATE_PAINT(palebottlegreen, COLOR_PALE_BTL_GREEN) -CREATE_PAINT(pakistangreen, COLOR_PAKISTAN_GREEN) -CREATE_PAINT(offwhite, COLOR_OFF_WHITE) -CREATE_PAINT(violet, COLOR_EXPLO_VIOLET) -CREATE_PAINT(gunmetal, COLOR_GUNMETAL) -CREATE_PAINT(paleorange, COLOR_PALE_ORANGE) -CREATE_PAINT(commandblue, COLOR_COMMAND_BLUE) -CREATE_PAINT(purple, COLOR_PURPLE) -CREATE_PAINT(purplegray, COLOR_PURPLE_GRAY) -CREATE_PAINT(babyblue, COLOR_BABY_BLUE) -CREATE_PAINT(hardwood, WOOD_COLOR_HARDWOOD) - -CREATE_PAINT_STRIPE(beastybrown, COLOR_CARGO_BROWN) -CREATE_PAINT_STRIPE(sun, COLOR_SUN) -CREATE_PAINT_STRIPE(red, COLOR_RED) -CREATE_PAINT_STRIPE(silver, COLOR_SILVER) -CREATE_PAINT_STRIPE(black, COLOR_GRAY20) -CREATE_PAINT_STRIPE(green, COLOR_GREEN) -CREATE_PAINT_STRIPE(navy, COLOR_NAVY) -CREATE_PAINT_STRIPE(eggshell, COLOR_EGGSHELL) -CREATE_PAINT_STRIPE(beige, COLOR_BEIGE) -CREATE_PAINT_STRIPE(darkred, COLOR_SECURITY_RED) -CREATE_PAINT_STRIPE(maroon, COLOR_MAROON) -CREATE_PAINT_STRIPE(cyanblue, COLOR_CYAN_BLUE) -CREATE_PAINT_STRIPE(copper, COLOR_COPPER) -CREATE_PAINT_STRIPE(amber, COLOR_AMBER) -CREATE_PAINT_STRIPE(wallgunmetal, COLOR_WALL_GUNMETAL) -CREATE_PAINT_STRIPE(bottlegreen, COLOR_BOTTLE_GREEN) -CREATE_PAINT_STRIPE(palebottlegreen, COLOR_PALE_BTL_GREEN) -CREATE_PAINT_STRIPE(pakistangreen, COLOR_PAKISTAN_GREEN) -CREATE_PAINT_STRIPE(offwhite, COLOR_OFF_WHITE) -CREATE_PAINT_STRIPE(violet, COLOR_EXPLO_VIOLET) -CREATE_PAINT_STRIPE(gunmetal, COLOR_GUNMETAL) -CREATE_PAINT_STRIPE(paleorange, COLOR_PALE_ORANGE) -CREATE_PAINT_STRIPE(commandblue, COLOR_COMMAND_BLUE) -CREATE_PAINT_STRIPE(purple, COLOR_PURPLE) -CREATE_PAINT_STRIPE(purplegray, COLOR_PURPLE_GRAY) -CREATE_PAINT_STRIPE(babyblue, COLOR_BABY_BLUE) -CREATE_PAINT_STRIPE(pipecyan, COLOR_ATMOSPHERICS_CYAN) +#undef CREATE_WALL_PAINT diff --git a/code/modules/mapping/map_helpers/paint_stripe.dm b/code/modules/mapping/map_helpers/paint_stripe.dm new file mode 100644 index 00000000000..f4fa5f5c308 --- /dev/null +++ b/code/modules/mapping/map_helpers/paint_stripe.dm @@ -0,0 +1,72 @@ +/** + * Used to stripe structural tiles (walls, low-walls, etc) fully as needed. + */ +/obj/map_helper/paint_stripe + name = "stripe of paint" + // TODO: resprite this and put it in helper icons folder + icon = 'icons/effects/effects.dmi' + icon_state = "paintdot" + late = TRUE + +/obj/map_helper/paint_stripe/LateInitialize() + for(var/obj/map_helper/paint_stripe/paint in loc) + if(paint == src) + continue + stack_trace("Duplicate paint stripe found at [audit_loc()]") + qdel(src) + return + + if(!color) + stack_trace("/paint helper at [audit_loc()] has no color") + qdel(src) + return + + var/did_anything = FALSE + + if(istype(loc, /turf/simulated/wall)) + var/turf/simulated/wall/target_wall = loc + target_wall.paint_stripe(color) + did_anything = TRUE + else + var/obj/structure/wall_frame/low_wall = locate() in loc + if(low_wall) + low_wall.stripe_color = color + low_wall.update_appearance() + did_anything = TRUE + + if(!did_anything) + stack_trace("Redundant paint helper found at [audit_loc()]") + + qdel(src) + +#define CREATE_PAINT_STRIPE(x, c) /obj/map_helper/paint_stripe/x/color=c + +CREATE_PAINT_STRIPE(beastybrown, COLOR_CARGO_BROWN) +CREATE_PAINT_STRIPE(sun, COLOR_SUN) +CREATE_PAINT_STRIPE(red, COLOR_RED) +CREATE_PAINT_STRIPE(silver, COLOR_SILVER) +CREATE_PAINT_STRIPE(black, COLOR_GRAY20) +CREATE_PAINT_STRIPE(green, COLOR_GREEN) +CREATE_PAINT_STRIPE(navy, COLOR_NAVY) +CREATE_PAINT_STRIPE(eggshell, COLOR_EGGSHELL) +CREATE_PAINT_STRIPE(beige, COLOR_BEIGE) +CREATE_PAINT_STRIPE(darkred, COLOR_SECURITY_RED) +CREATE_PAINT_STRIPE(maroon, COLOR_MAROON) +CREATE_PAINT_STRIPE(cyanblue, COLOR_CYAN_BLUE) +CREATE_PAINT_STRIPE(copper, COLOR_COPPER) +CREATE_PAINT_STRIPE(amber, COLOR_AMBER) +CREATE_PAINT_STRIPE(wallgunmetal, COLOR_WALL_GUNMETAL) +CREATE_PAINT_STRIPE(bottlegreen, COLOR_BOTTLE_GREEN) +CREATE_PAINT_STRIPE(palebottlegreen, COLOR_PALE_BTL_GREEN) +CREATE_PAINT_STRIPE(pakistangreen, COLOR_PAKISTAN_GREEN) +CREATE_PAINT_STRIPE(offwhite, COLOR_OFF_WHITE) +CREATE_PAINT_STRIPE(violet, COLOR_EXPLO_VIOLET) +CREATE_PAINT_STRIPE(gunmetal, COLOR_GUNMETAL) +CREATE_PAINT_STRIPE(paleorange, COLOR_PALE_ORANGE) +CREATE_PAINT_STRIPE(commandblue, COLOR_COMMAND_BLUE) +CREATE_PAINT_STRIPE(purple, COLOR_PURPLE) +CREATE_PAINT_STRIPE(purplegray, COLOR_PURPLE_GRAY) +CREATE_PAINT_STRIPE(babyblue, COLOR_BABY_BLUE) +CREATE_PAINT_STRIPE(pipecyan, COLOR_ATMOSPHERICS_CYAN) + +#undef CREATE_PAINT_STRIPE diff --git a/code/modules/mapping/spawner/window.dm b/code/modules/mapping/spawner/window.dm index a2b05f3380f..c2bc34ff4b9 100644 --- a/code/modules/mapping/spawner/window.dm +++ b/code/modules/mapping/spawner/window.dm @@ -2,25 +2,36 @@ icon = 'icons/mapping/spawners/windows.dmi' icon_state = "window_grille_pane" layer = WINDOW_LAYER - late = TRUE + + /// found dirs + var/found_dirs = NONE /// spawn full windows or panes on grille? var/full_window = FALSE - /// spawn grille at all? - var/spawn_grille = TRUE - /// spawn low wall? - var/spawn_low_wall = FALSE /// full window path var/window_full_path = /obj/structure/window/basic/full /// pane path var/window_pane_path = /obj/structure/window/basic + + /// spawn grille at all? + var/spawn_grille = TRUE + + /// spawn low wall? + /// * requires full window + var/spawn_low_wall = FALSE /// low wall path var/low_wall_path = /obj/structure/wall_frame/prepainted - /// found dirs - var/found_dirs = NONE + /// low-wall stripe color + /// * if non-null, will override stripe color on the low-wall + var/low_wall_stripe_color + /// spawn firedoors? fulltile and non-hidden only for now var/firelocks = FALSE + /// spawn glass firedoors? + var/firelocks_use_glass = FALSE + /// id tag for electrochromics + /// todo: rename to electrochromatic_id var/id /obj/spawner/window/Initialize(mapload) @@ -35,34 +46,43 @@ found_dirs |= d /obj/spawner/window/Spawn() + // no more mercy, if you fuck up your spawner placement on purpose + // this will just tear a hole in your map so you notice faster + if(locate(/obj/structure/window) in loc) + CRASH("Window spawner at [audit_loc()] on turf with existing window.") if(spawn_grille) if(locate(/obj/structure/grille) in loc) - warning("Window spawner at X [x] Y [y] Z [z] is set to spawn a grille, but found one already in it's loc.") - else - new /obj/structure/grille(loc) + CRASH("Window spawner at [audit_loc()] is set to spawn a grille, but found one already in it's loc.") + new /obj/structure/grille(loc) if(full_window) - var/new_window = new window_full_path(loc) if (spawn_low_wall) - new low_wall_path(loc) + if(locate(/obj/structure/wall_frame) in loc) + CRASH("Window spawner at [audit_loc()] is set to spawn low wall but found one already in turf") + var/obj/structure/wall_frame/low_wall = new low_wall_path(loc) + if(isnull(low_wall_stripe_color)) + low_wall.stripe_color = low_wall_stripe_color + + var/new_window = new window_full_path(loc) if(id && istype(new_window, /obj/structure/window/reinforced/polarized)) var/obj/structure/window/reinforced/polarized/P = new_window P.id = id else // spawn in dirs not in found dirs - var/obj/structure/window/W for(var/d in GLOB.cardinal) if(found_dirs & d) continue - W = new window_pane_path(loc) - W.setDir(d) + new window_pane_path(loc, d) if(firelocks) if(locate(/obj/machinery/door/firedoor) in loc) - warning("Window spawner at X [x] Y [y] Z [z] is set to spawn firelocks, but found one already in it's loc.") - else - new /obj/machinery/door/firedoor(loc) + CRASH("Window spawner at X [audit_loc()] is set to spawn firelocks, but found one already in it's loc.") + new /obj/machinery/door/firedoor(loc) /obj/spawner/window/firelocks icon_state = "window_grille_pane_fire" + firelocks = TRUE + +/obj/spawner/window/firelocks/transparent + firelocks_use_glass = TRUE /obj/spawner/window/full full_window = TRUE @@ -72,6 +92,9 @@ icon_state = "window_grille_full_fire" firelocks = TRUE +/obj/spawner/window/full/firelocks/transparent + firelocks_use_glass = TRUE + /obj/spawner/window/reinforced icon_state = "rwindow_grille_pane" window_pane_path = /obj/structure/window/reinforced @@ -81,6 +104,9 @@ icon_state = "rwindow_grille_pane_fire" firelocks = TRUE +/obj/spawner/window/reinforced/firelocks/transparent + firelocks_use_glass = TRUE + /obj/spawner/window/reinforced/full icon_state = "rwindow_grille_full" full_window = TRUE @@ -89,6 +115,9 @@ icon_state = "rwindow_grille_full_fire" firelocks = TRUE +/obj/spawner/window/reinforced/full/firelocks/transparent + firelocks_use_glass = TRUE + /obj/spawner/window/reinforced/tinted icon_state = "rwindow_grille_pane" window_pane_path = /obj/structure/window/reinforced/tinted @@ -98,6 +127,9 @@ icon_state = "rwindow_grille_pane_fire" firelocks = TRUE +/obj/spawner/window/reinforced/tinted/firelocks/transparent + firelocks_use_glass = TRUE + /obj/spawner/window/reinforced/tinted/full icon_state = "rwindow_grille_full" full_window = TRUE @@ -106,6 +138,8 @@ icon_state = "rwindow_grille_full_fire" firelocks = TRUE +/obj/spawner/window/reinforced/tinted/full/firelocks/transparent + firelocks_use_glass = TRUE /obj/spawner/window/borosillicate icon_state = "phoron_grille_pane" @@ -116,14 +150,19 @@ icon_state = "phoron_grille_pane_fire" firelocks = TRUE +/obj/spawner/window/borosillicate/firelocks/transparent + firelocks_use_glass = TRUE + /obj/spawner/window/borosillicate/full icon_state = "phoron_grille_full" full_window = TRUE /obj/spawner/window/borosillicate/full/firelocks - icon_state = "phoron_grille_full" firelocks = TRUE +/obj/spawner/window/borosillicate/full/firelocks/transparent + firelocks_use_glass = TRUE + /obj/spawner/window/borosillicate/reinforced icon_state = "rphoron_grille_pane" window_pane_path = /obj/structure/window/phoronreinforced @@ -133,6 +172,9 @@ icon_state = "rphoron_grille_pane_fire" firelocks = TRUE +/obj/spawner/window/borosillicate/reinforced/firelocks/transparent + firelocks_use_glass = TRUE + /obj/spawner/window/borosillicate/reinforced/full icon_state = "rphoron_grille_full" full_window = TRUE @@ -141,77 +183,86 @@ icon_state = "rphoron_grille_full_fire" firelocks = TRUE +/obj/spawner/window/borosillicate/reinforced/full/firelocks/transparent + firelocks_use_glass = TRUE + +/** + * * Implicitly full windows + */ /obj/spawner/window/low_wall spawn_low_wall = TRUE - -/obj/spawner/window/low_wall/borosillicate/full - icon_state = "phoron_grille_full" full_window = TRUE - window_pane_path = /obj/structure/window/phoronbasic + +/obj/spawner/window/low_wall/borosillicate + icon_state = "phoron_grille_full" window_full_path = /obj/structure/window/phoronbasic/full -/obj/spawner/window/low_wall/borosillicate/full/firelocks - icon_state = "phoron_grille_full" +/obj/spawner/window/low_wall/borosillicate/firelocks firelocks = TRUE -/obj/spawner/window/low_wall/borosillicate/reinforced/full +/obj/spawner/window/low_wall/borosillicate/firelocks/transparent + firelocks_use_glass = TRUE + +/obj/spawner/window/low_wall/borosillicate/reinforced icon_state = "rphoron_grille_full" - full_window = TRUE - window_pane_path = /obj/structure/window/phoronreinforced window_full_path = /obj/structure/window/phoronreinforced/full -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks icon_state = "rphoron_grille_full_fire" firelocks = TRUE -/obj/spawner/window/low_wall/reinforced/full +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks/transparent + firelocks_use_glass = TRUE + +/obj/spawner/window/low_wall/reinforced icon_state = "rwindow_grille_full" - full_window = TRUE - window_pane_path = /obj/structure/window/reinforced window_full_path = /obj/structure/window/reinforced/full -/obj/spawner/window/low_wall/reinforced/full/firelocks +/obj/spawner/window/low_wall/reinforced/firelocks icon_state = "rwindow_grille_full_fire" firelocks = TRUE -/obj/spawner/window/low_wall/reinforced/tinted/full +/obj/spawner/window/low_wall/reinforced/firelocks/transparent + firelocks_use_glass = TRUE + +/obj/spawner/window/low_wall/reinforced/tinted icon_state = "rwindow_grille_full" full_window = TRUE - window_pane_path = /obj/structure/window/reinforced/tinted window_full_path = /obj/structure/window/reinforced/tinted/full -/obj/spawner/window/low_wall/reinforced/tinted/full/firelocks +/obj/spawner/window/low_wall/reinforced/tinted/firelocks icon_state = "rwindow_grille_full_fire" firelocks = TRUE -/obj/spawner/window/low_wall/reinforced/electrochromic/full +/obj/spawner/window/low_wall/reinforced/tinted/firelocks/transparent + firelocks_use_glass = TRUE + +/obj/spawner/window/low_wall/reinforced/electrochromic icon_state = "rwindow_grille_full" - full_window = TRUE window_pane_path = /obj/structure/window/reinforced/polarized window_full_path = /obj/structure/window/reinforced/polarized/full -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks icon_state = "rwindow_grille_full_fire" firelocks = TRUE -/obj/spawner/window/low_wall/full - full_window = TRUE +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks/transparent + firelocks_use_glass = TRUE + +/obj/spawner/window/low_wall icon_state = "window_grille_full" -/obj/spawner/window/low_wall/full/firelocks +/obj/spawner/window/low_wall/firelocks icon_state = "window_grille_full_fire" firelocks = TRUE -/obj/spawner/window/low_wall/full/nogrille/firelocks - full_window = TRUE +/obj/spawner/window/low_wall/firelocks/transparent + firelocks_use_glass = TRUE + +/obj/spawner/window/low_wall/nogrille/firelocks icon_state = "window_grille_full" spawn_grille = FALSE firelocks = TRUE -/obj/spawner/window/low_wall/full/firelocks/nogrille - icon_state = "window_grille_full" - firelocks = TRUE - spawn_grille = FALSE - - - +/obj/spawner/window/low_wall/nogrille/firelocks/transparent + firelocks_use_glass = TRUE diff --git a/maps/endeavour/levels/Dropship.dmm b/maps/endeavour/levels/Dropship.dmm index 2c30462f426..6384b20e3b2 100644 --- a/maps/endeavour/levels/Dropship.dmm +++ b/maps/endeavour/levels/Dropship.dmm @@ -27,7 +27,7 @@ /turf/simulated/floor/tiled/techmaint, /area/space) "bH" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/space/basic, /area/space) "bJ" = ( @@ -607,7 +607,7 @@ /turf/simulated/floor/reinforced, /area/shuttle/hammerhead/general) "pG" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/hammerhead/cockpit) "pL" = ( @@ -661,7 +661,7 @@ /obj/effect/floor_decal/corner_techfloor_grid{ dir = 1 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/hammerhead/cockpit) "rA" = ( @@ -1357,7 +1357,7 @@ /turf/simulated/floor/tiled/techmaint, /area/space) "Mh" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/porta_turret/crescent{ density = 1; faction = "neutral" @@ -1554,7 +1554,7 @@ /turf/simulated/floor/plating, /area/shuttle/hammerhead/general) "SC" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/hammerhead/general) "SX" = ( @@ -1746,7 +1746,7 @@ /turf/simulated/floor/plating, /area/shuttle/hammerhead/general) "Zc" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/techfloor, /area/shuttle/hammerhead/general) "Zf" = ( diff --git a/maps/endeavour/levels/deck1.dmm b/maps/endeavour/levels/deck1.dmm index e42c2f48561..298ed5559f2 100644 --- a/maps/endeavour/levels/deck1.dmm +++ b/maps/endeavour/levels/deck1.dmm @@ -86,12 +86,12 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/spawner/window/low_wall/borosillicate/full, -/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/borosillicate, +/obj/map_helper/paint_stripe/violet, /turf/simulated/shuttle/floor/voidcraft, /area/shuttle/excursion/general) "acZ" = ( -/obj/spawner/window/low_wall/full/firelocks, +/obj/spawner/window/low_wall/firelocks, /turf/simulated/floor/plating, /area/station/stairs_one) "adf" = ( @@ -1035,8 +1035,8 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "aKv" = ( -/obj/spawner/window/low_wall/full/firelocks/nogrille, -/obj/effect/paint_stripe/palebottlegreen, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/palebottlegreen, /turf/simulated/floor/plating, /area/endeavour/hallway/d1fwdhall) "aKB" = ( @@ -1344,8 +1344,8 @@ /turf/simulated/floor/tiled/dark, /area/exploration/courser_dock) "aXm" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/violet, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/violet, /turf/simulated/floor/plating, /area/exploration/explorer_prep) "aXD" = ( @@ -2050,8 +2050,8 @@ /turf/simulated/floor/tiled/techfloor, /area/endeavour/cryo) "bAu" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/violet, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/violet, /turf/simulated/floor/plating, /area/exploration/pilot_Office) "bAB" = ( @@ -2307,8 +2307,8 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/secondary/docking_hallway) "bOP" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/commandblue, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/commandblue, /turf/simulated/shuttle/floor/voidcraft, /area/bridge/meeting_room) "bPw" = ( @@ -3131,8 +3131,8 @@ /area/endeavour/hallway/d1fwdhall) "cut" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/shuttle/emt/general) "cuy" = ( @@ -4183,7 +4183,7 @@ /turf/simulated/floor/tiled, /area/exploration/pilot_prep) "dhk" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/floor/reinforced, /area/endeavour/hallway/d1fwdmaint) "dih" = ( @@ -4367,7 +4367,7 @@ /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) "dpw" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/cryo/recovery) "dpE" = ( @@ -5338,8 +5338,8 @@ /turf/simulated/floor/lino, /area/crew_quarters/coffee_shop) "dZF" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/palebottlegreen, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/palebottlegreen, /turf/simulated/floor/plating, /area/library) "dZJ" = ( @@ -5935,8 +5935,8 @@ /turf/simulated/floor/plating, /area/shuttle/courser/general) "eyo" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/violet, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/violet, /turf/simulated/floor/plating, /area/exploration/pilot_prep) "eyp" = ( @@ -6017,8 +6017,8 @@ /turf/simulated/floor/tiled, /area/shuttle/excursion/general) "eCj" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/violet, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/violet, /turf/simulated/floor/plating, /area/endeavour/exploration/hallway_aft) "eCo" = ( @@ -6669,8 +6669,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/commandblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/commandblue, /turf/simulated/floor/plating, /area/bridge/hallway) "eYG" = ( @@ -6849,10 +6849,10 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d1fwdmaint) "ffU" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "pathfinder_office" }, -/obj/effect/paint/violet, +/obj/map_helper/paint/violet, /obj/structure/disposalpipe/segment{ dir = 8 }, @@ -6979,8 +6979,8 @@ /turf/simulated/floor/tiled/monodark, /area/bridge) "fkm" = ( -/obj/effect/paint/palebottlegreen, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/map_helper/paint/palebottlegreen, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/structure/curtain/black, /obj/map_helper/electrochromatic_linker{ id = "chapel" @@ -7325,8 +7325,8 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/lounge/kitchen_freezer) "ftn" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/commandblue, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/commandblue, /turf/simulated/shuttle/floor/voidcraft, /area/bridge/office) "ftL" = ( @@ -7433,7 +7433,7 @@ /turf/simulated/floor/tiled/white, /area/endeavour/surfacebase/sauna) "fvL" = ( -/obj/effect/paint/palebottlegreen, +/obj/map_helper/paint/palebottlegreen, /obj/spawner/window/reinforced/full/firelocks, /obj/structure/curtain/open/black, /turf/simulated/floor/plating, @@ -7596,8 +7596,8 @@ /turf/simulated/floor/carpet/tealcarpet, /area/shuttle/civvie/general) "fEG" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/violet, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/violet, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/exploration) @@ -8099,8 +8099,8 @@ /turf/space/basic, /area/space) "fZE" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/hallway/secondary/docking_hallway2) "gag" = ( @@ -8681,8 +8681,8 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/shuttle/emt/general) "gvS" = ( @@ -9779,8 +9779,8 @@ /turf/simulated/floor/wood, /area/library) "hus" = ( -/obj/effect/paint/commandblue, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/map_helper/paint/commandblue, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/bridge/hallway) "hvo" = ( @@ -9791,7 +9791,7 @@ /area/exploration/excursion_dock) "hvp" = ( /obj/machinery/atmospherics/pipe/manifold/visible, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/floor/reinforced/airless, /area/rnd/test_area) "hvu" = ( @@ -11401,8 +11401,8 @@ /turf/simulated/floor/tiled/dark, /area/bridge/hallway) "iLP" = ( -/obj/effect/paint/commandblue, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/map_helper/paint/commandblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "library_study" }, @@ -11505,8 +11505,8 @@ /turf/simulated/floor/tiled/dark, /area/gateway) "iRz" = ( -/obj/effect/paint/palebottlegreen, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/map_helper/paint/palebottlegreen, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "chapelOffice" }, @@ -12071,8 +12071,8 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full, -/obj/effect/paint/commandblue, +/obj/spawner/window/low_wall/borosillicate/reinforced, +/obj/map_helper/paint/commandblue, /turf/simulated/floor/plating, /area/bridge/office) "jqz" = ( @@ -13239,8 +13239,8 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "kaL" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/violet, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/violet, /turf/simulated/floor/plating, /area/exploration/medical) "kaO" = ( @@ -14038,8 +14038,8 @@ /turf/simulated/floor/tiled, /area/exploration) "kEB" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/commandblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/commandblue, /obj/map_helper/electrochromatic_linker{ id = "lawyer_blast" }, @@ -14125,7 +14125,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/floor/reinforced/airless, /area/rnd/test_area) "kJh" = ( @@ -14334,9 +14334,9 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "kNK" = ( -/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/spawner/window/low_wall/nogrille/firelocks, /obj/structure/curtain/black, -/obj/effect/paint_stripe/palebottlegreen, +/obj/map_helper/paint_stripe/palebottlegreen, /turf/simulated/floor/plating, /area/endeavour/hallway/d1starboardamidhall) "kNR" = ( @@ -14615,7 +14615,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/floor/reinforced/airless, /area/rnd/test_area) "laK" = ( @@ -14928,8 +14928,8 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/borosillicate/full, -/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/borosillicate, +/obj/map_helper/paint_stripe/violet, /turf/simulated/floor/plating, /area/endeavour/exploration/aux_hanger) "lnH" = ( @@ -15625,8 +15625,8 @@ /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "lOX" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/violet, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/violet, /turf/simulated/floor/plating, /area/exploration) "lPo" = ( @@ -16101,8 +16101,8 @@ name = "Bridge Lockdown"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/commandblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/commandblue, /turf/simulated/floor/plating, /area/bridge/hallway) "mfu" = ( @@ -16715,8 +16715,8 @@ /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) "mJc" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/violet, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/violet, /turf/simulated/floor/plating, /area/exploration/meeting) "mJy" = ( @@ -18374,9 +18374,9 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "nQk" = ( -/obj/effect/paint/palebottlegreen, +/obj/map_helper/paint/palebottlegreen, /obj/structure/curtain/black, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "chapel" }, @@ -18639,8 +18639,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/violet, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/violet, /turf/simulated/floor/tiled/techfloor/grid, /area/endeavour/exploration/hallway_aft) "obn" = ( @@ -19612,8 +19612,8 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "oRa" = ( -/obj/effect/paint/commandblue, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/map_helper/paint/commandblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "lawyer_blast" }, @@ -19902,8 +19902,8 @@ /area/shuttle/civvie/general) "pcv" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/effect/paint/purplegray, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/map_helper/paint/purplegray, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/floor/plating, /area/rnd/test_area) "pcA" = ( @@ -21110,8 +21110,8 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "pWN" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/commandblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/commandblue, /turf/simulated/floor/plating, /area/bridge/hallway) "pYp" = ( @@ -21454,8 +21454,8 @@ name = "Cockpit Lockdown"; opacity = 0 }, -/obj/spawner/window/low_wall/borosillicate/full, -/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/borosillicate, +/obj/map_helper/paint_stripe/violet, /turf/simulated/shuttle/floor/voidcraft, /area/shuttle/excursion/cockpit) "qmr" = ( @@ -21475,8 +21475,8 @@ name = "Shuttle Lockdown"; opacity = 0 }, -/obj/spawner/window/low_wall/borosillicate/full, -/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/borosillicate, +/obj/map_helper/paint_stripe/violet, /turf/simulated/shuttle/floor/voidcraft, /area/shuttle/excursion/general) "qnv" = ( @@ -21902,7 +21902,7 @@ /turf/simulated/floor/tiled/techfloor, /area/teleporter/departing) "qBy" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/shuttle/floor/voidcraft, /area/bridge) "qBE" = ( @@ -22290,10 +22290,10 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "qQg" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "pathfinder_office" }, -/obj/effect/paint/violet, +/obj/map_helper/paint/violet, /turf/simulated/floor/plating, /area/exploration/pathfinder_office) "qQG" = ( @@ -24131,8 +24131,8 @@ /turf/simulated/wall/r_wall/prepainted/medical, /area/shuttle/emt/general) "smH" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/commandblue, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/commandblue, /turf/simulated/shuttle/floor/voidcraft, /area/bridge/hallway) "smS" = ( @@ -24194,7 +24194,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/excursion_dock) "sqa" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/endeavour/civillian/evastorage) "sqc" = ( @@ -24878,8 +24878,8 @@ /turf/simulated/floor/carpet, /area/bridge/meeting_room) "sQR" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/violet, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/violet, /turf/simulated/floor/plating, /area/endeavour/civillian/evastorage) "sRK" = ( @@ -25457,8 +25457,8 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "tog" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/violet, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/violet, /turf/simulated/floor/plating, /area/endeavour/exploration/hallway_aft) "toF" = ( @@ -25834,7 +25834,7 @@ /turf/simulated/floor/tiled, /area/exploration) "tCG" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/asmaint) "tCP" = ( @@ -27955,8 +27955,8 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/cryo/recovery) "vaR" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/palebottlegreen, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/palebottlegreen, /turf/simulated/floor/plating, /area/chapel/office) "vbb" = ( @@ -28617,8 +28617,8 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "vwY" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/violet, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/violet, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -29822,7 +29822,7 @@ name = "Bridge Lockdown"; opacity = 0 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/shuttle/floor/voidcraft, /area/bridge) "wzQ" = ( @@ -29843,8 +29843,8 @@ /turf/simulated/floor/plating, /area/engineering/substation/deck1forward) "wAt" = ( -/obj/effect/paint/palebottlegreen, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/map_helper/paint/palebottlegreen, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "chapel" }, @@ -30317,8 +30317,8 @@ /area/crew_quarters/cryo/recovery) "wVs" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/cyan, -/obj/spawner/window/low_wall/borosillicate/full, -/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/borosillicate, +/obj/map_helper/paint_stripe/violet, /turf/simulated/shuttle/floor/voidcraft, /area/shuttle/excursion/general) "wVF" = ( @@ -30574,8 +30574,8 @@ layer = 3.1; name = "Colony Director's Shutters" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/commandblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/commandblue, /turf/simulated/floor/plating, /area/bridge) "xfq" = ( @@ -31650,7 +31650,7 @@ /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/emt/general) "xSt" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/hallway/secondary/docking_hallway2) "xSC" = ( @@ -32083,7 +32083,7 @@ /area/exploration/courser_dock) "ygA" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/floor/reinforced/airless, /area/rnd/test_area) "yhF" = ( diff --git a/maps/endeavour/levels/deck2.dmm b/maps/endeavour/levels/deck2.dmm index 91fdce53dc9..f502823e719 100644 --- a/maps/endeavour/levels/deck2.dmm +++ b/maps/endeavour/levels/deck2.dmm @@ -52,9 +52,9 @@ /turf/simulated/floor/plating, /area/rnd/xenobiology) "act" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/item/paper_bin, -/obj/effect/paint/babyblue, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "add" = ( @@ -633,8 +633,8 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "avH" = ( @@ -749,8 +749,8 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "aCi" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/reception) "aCR" = ( @@ -795,8 +795,8 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "aEl" = ( @@ -986,8 +986,8 @@ /turf/simulated/floor/tiled/white, /area/medical/chemistry) "aIK" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 8 }, @@ -1609,8 +1609,8 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "bkF" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/maintenance/research/port) "bkG" = ( @@ -2026,8 +2026,8 @@ /turf/simulated/floor/tiled/white, /area/medical/sleeper) "bAe" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/anomaly_lab) "bAA" = ( @@ -2118,14 +2118,14 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/structure/cable/green{ icon_state = "0-2" }, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/paint/purplegray, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/rdoffice) "bCS" = ( @@ -2442,11 +2442,11 @@ /turf/simulated/floor/tiled, /area/medical/virology) "bMn" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "robotics-inner" }, -/obj/effect/paint/purplegray, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/assembly/robotics) "bMs" = ( @@ -2962,8 +2962,8 @@ /turf/simulated/floor/tiled/monotile, /area/rnd/anomaly_lab) "cat" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/xenobiology) "caz" = ( @@ -3177,7 +3177,7 @@ /turf/simulated/wall/prepainted/medical, /area/endeavour/hallway/d2afthall) "cjl" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/structure/disposalpipe/segment, /obj/machinery/door/blast/regular{ density = 0; @@ -3186,7 +3186,7 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/effect/paint/purplegray, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "cjm" = ( @@ -3430,11 +3430,11 @@ /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "cqX" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "exam_1" }, -/obj/effect/paint/babyblue, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/exam_room/exam_1) "crh" = ( @@ -3468,8 +3468,8 @@ /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) "cst" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/medbay_emt_bay) "csx" = ( @@ -3481,8 +3481,8 @@ /turf/simulated/floor/tiled/white, /area/medical/resleeving) "csA" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" @@ -3931,11 +3931,11 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/effect/paint/purplegray, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/rdoffice) "cGV" = ( @@ -3960,8 +3960,8 @@ /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) "cHC" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/babyblue, /obj/map_helper/electrochromatic_linker{ id = "mh2" }, @@ -4045,8 +4045,8 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "cOc" = ( @@ -5138,8 +5138,8 @@ /turf/simulated/floor/wood, /area/rnd/breakroom) "dAa" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/psych_ward) "dAn" = ( @@ -5494,8 +5494,8 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology) "dKD" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora) "dKE" = ( @@ -5877,8 +5877,8 @@ /turf/simulated/floor/tiled/dark, /area/rnd/anomaly_lab/containment_one) "dYX" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /obj/structure/disposalpipe/segment{ dir = 1 }, @@ -6189,8 +6189,8 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology) "ekq" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -6682,8 +6682,8 @@ id = "test_chamber_blast"; name = "Testing Chamber Blast Door" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/testingroom) "eCJ" = ( @@ -6742,8 +6742,8 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "eEX" = ( @@ -7050,7 +7050,7 @@ /turf/simulated/floor/wood, /area/tether/station/public_meeting_room) "eTf" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/floor/plating, /area/space) "eTk" = ( @@ -7229,11 +7229,11 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/reception_desk) "eYE" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "ward_a" }, -/obj/effect/paint/babyblue, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/patient_a) "eYM" = ( @@ -7653,8 +7653,8 @@ /turf/simulated/floor/tiled, /area/rnd/research_foyer) "fmC" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/virology) "fmI" = ( @@ -7724,8 +7724,8 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "fqm" = ( @@ -7875,8 +7875,8 @@ /turf/simulated/floor/tiled/white, /area/medical/virology_fore_access) "ftJ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/research_foyer) "ftM" = ( @@ -7927,12 +7927,12 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/reception_desk) "fuU" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/machinery/door/blast/shutters{ id = "rndshutters"; name = "Research Shutters" }, -/obj/effect/paint/purplegray, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/reception_desk) "fwk" = ( @@ -8073,8 +8073,8 @@ /area/maintenance/research/port) "fBJ" = ( /obj/machinery/door/firedoor/glass, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/anomaly_lab/containment_one) "fBP" = ( @@ -9047,10 +9047,10 @@ /turf/simulated/floor/tiled, /area/rnd/research_foyer) "gjC" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/firelocks{ id = "or2obs" }, -/obj/effect/paint/babyblue, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/surgeryobs) "gkq" = ( @@ -9356,9 +9356,9 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "gxc" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "gxk" = ( @@ -9784,13 +9784,13 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay4) "gPQ" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/machinery/door/blast/shutters{ dir = 8; id = "rndshutters"; name = "Research Shutters" }, -/obj/effect/paint/purplegray, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/reception_desk) "gPU" = ( @@ -9852,8 +9852,8 @@ /turf/simulated/floor/grass/indoors, /area/tether/station/public_meeting_room) "gQO" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "gRw" = ( @@ -10369,11 +10369,11 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "hnd" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "robotics-outer" }, -/obj/effect/paint/purplegray, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/assembly/robotics) "hnk" = ( @@ -10837,7 +10837,7 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_c) "hDL" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -10845,7 +10845,7 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/effect/paint/purplegray, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "hDT" = ( @@ -11262,9 +11262,9 @@ /turf/simulated/floor/tiled/steel, /area/rnd/chemistry_lab) "hZk" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/bed/chair/office/dark, -/obj/effect/paint/babyblue, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "hZs" = ( @@ -11996,8 +11996,8 @@ /turf/simulated/floor/tiled, /area/rnd/research_foyer) "iyL" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/babyblue, /obj/map_helper/electrochromatic_linker{ id = "cmo_office" }, @@ -12637,8 +12637,8 @@ /area/medical/medbay3) "iWZ" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/anomaly_lab/containment_one) "iXg" = ( @@ -12670,11 +12670,11 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "iYh" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "ward_b" }, -/obj/effect/paint/babyblue, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/patient_b) "iZN" = ( @@ -12844,11 +12844,11 @@ /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/virology) "jeY" = ( -/obj/effect/paint/babyblue, +/obj/map_helper/paint/babyblue, /obj/map_helper/electrochromatic_linker{ id = "mh2" }, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /turf/simulated/floor/plating, /area/medical/medbay4) "jfe" = ( @@ -12903,11 +12903,11 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/effect/paint/purplegray, +/obj/map_helper/paint/purplegray, /obj/structure/cable/green{ icon_state = "1-8" }, @@ -13565,11 +13565,11 @@ /obj/machinery/door/firedoor/glass{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "robotics-inner" }, -/obj/effect/paint/purplegray, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/assembly/robotics) "jHd" = ( @@ -13941,8 +13941,8 @@ /turf/simulated/floor/tiled/white, /area/medical/sleeper) "jWf" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /obj/machinery/door/blast/shutters{ dir = 8; id = "chemshutter"; @@ -14079,13 +14079,13 @@ "keM" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/anomaly_lab/containment_one) "keN" = ( -/obj/spawner/window/low_wall/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/firelocks, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/endeavour/hallway/d2afthall) "kff" = ( @@ -14749,8 +14749,8 @@ /area/medical/exam_room/exam_2) "kGe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora) "kGz" = ( @@ -16538,11 +16538,11 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay3) "lSq" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "oncall" }, -/obj/effect/paint/babyblue, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/oncall_room) "lSJ" = ( @@ -16868,8 +16868,8 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/research/port) "mgH" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /obj/structure/curtain/open/shower/medical{ name = "Privacy curtain" }, @@ -16963,8 +16963,8 @@ "mkl" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/machinery/door/firedoor/glass, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/anomaly_lab/containment_one) "mlj" = ( @@ -17342,8 +17342,8 @@ /turf/simulated/floor/plating, /area/maintenance/research/port) "mwd" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/medbay4) "mwy" = ( @@ -17612,8 +17612,8 @@ /turf/simulated/floor/plating, /area/maintenance/substation/medical_science) "mDj" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "mDp" = ( @@ -17692,8 +17692,8 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "mFC" = ( @@ -17760,8 +17760,8 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "mIe" = ( @@ -18096,11 +18096,11 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay3) "mVR" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "mh1" }, -/obj/effect/paint/babyblue, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/psych/psych_2) "mWV" = ( @@ -18290,8 +18290,8 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "neQ" = ( @@ -18345,11 +18345,11 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "ngP" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "mh2" }, -/obj/effect/paint/babyblue, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/medbay4) "nhd" = ( @@ -19546,8 +19546,8 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/research/port) "ofQ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/medbay_primary_storage) "ogd" = ( @@ -20265,7 +20265,7 @@ /turf/simulated/floor/tiled/white, /area/medical/virology) "oHp" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/medbay/aft) "oIm" = ( @@ -20328,8 +20328,8 @@ /turf/simulated/floor/wood/sif/indoors, /area/medical/reception) "oKF" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /obj/machinery/door/blast/shutters{ id = "chemshutter"; name = "Chemistry Shutters" @@ -20960,11 +20960,11 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/public_meeting_room) "piH" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "ward_a" }, -/obj/effect/paint/babyblue, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/surgeryprep) "piI" = ( @@ -21737,8 +21737,8 @@ /turf/simulated/floor/plating, /area/maintenance/research/port) "pEJ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/breakroom) "pEU" = ( @@ -21982,7 +21982,7 @@ /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "pLA" = ( -/obj/spawner/window/low_wall/full/firelocks, +/obj/spawner/window/low_wall/firelocks, /turf/simulated/floor/plating, /area/station/stairs_two) "pLW" = ( @@ -22587,7 +22587,7 @@ /turf/simulated/wall/prepainted, /area/endeavour/hallway/d2fwdmaint) "qcN" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/holodeck_control) "qea" = ( @@ -24024,10 +24024,10 @@ /turf/simulated/floor/wood, /area/tether/station/public_meeting_room) "rfp" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/firelocks{ id = "or2" }, -/obj/effect/paint/babyblue, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/surgeryobs) "rfs" = ( @@ -24064,8 +24064,8 @@ /turf/simulated/floor/plating, /area/maintenance/fpmaint2) "riZ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/chemistry_lab) "rjg" = ( @@ -24848,7 +24848,7 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "rPS" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/firelocks{ id = "or2obs" }, /turf/simulated/floor/plating, @@ -25410,8 +25410,8 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/xenobiology) "snl" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/virologyisolation) "snE" = ( @@ -25435,11 +25435,11 @@ /turf/simulated/floor/tiled/techfloor, /area/medical/oncall_room) "snW" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "ward_c" }, -/obj/effect/paint/babyblue, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/patient_c) "sof" = ( @@ -26120,8 +26120,8 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "sQP" = ( @@ -26223,8 +26223,8 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "sUD" = ( @@ -26346,7 +26346,7 @@ /turf/simulated/floor/tiled/white, /area/medical/surgery2) "sWV" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -26354,7 +26354,7 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/effect/paint/purplegray, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "sXA" = ( @@ -26374,8 +26374,8 @@ /turf/simulated/floor/tiled/white, /area/medical/morgue) "sYk" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/sleeper) "sYJ" = ( @@ -26510,7 +26510,7 @@ /turf/simulated/floor/tiled/white, /area/medical/sleeper) "tem" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -26518,7 +26518,7 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/effect/paint/purplegray, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "teG" = ( @@ -26966,11 +26966,11 @@ /turf/simulated/floor/tiled, /area/crew_quarters/medical_restroom) "tqI" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "exam_2" }, -/obj/effect/paint/babyblue, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/exam_room/exam_2) "tra" = ( @@ -27515,11 +27515,11 @@ /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2fwdhall) "tKG" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "or1" }, -/obj/effect/paint/babyblue, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/surgery) "tLb" = ( @@ -27625,8 +27625,8 @@ name = "Testing Chamber Blast Door" }, /obj/structure/disposalpipe/segment, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/testingroom) "tOS" = ( @@ -27660,7 +27660,7 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "tPb" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/structure/disposalpipe/segment, /obj/machinery/door/blast/regular{ density = 0; @@ -27669,7 +27669,7 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/effect/paint/purplegray, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "tPs" = ( @@ -28472,8 +28472,8 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "uxB" = ( @@ -28862,8 +28862,8 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "uQE" = ( @@ -29035,8 +29035,8 @@ /turf/simulated/floor/tiled/dark, /area/medical/psych_ward) "uVS" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora) @@ -29480,7 +29480,7 @@ /turf/simulated/floor/grass/indoors, /area/tether/station/public_meeting_room) "vrg" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/structure/disposalpipe/segment, /obj/machinery/door/blast/regular{ density = 0; @@ -29489,7 +29489,7 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/effect/paint/purplegray, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "vrn" = ( @@ -29731,9 +29731,9 @@ /turf/simulated/floor, /area/maintenance/research/port) "vBU" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/breakroom) "vCa" = ( @@ -29801,8 +29801,8 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "vEU" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" @@ -30002,8 +30002,8 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/reception_desk) "vLc" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/rnd/breakroom) @@ -31859,11 +31859,11 @@ /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) "wRU" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "medbreak" }, -/obj/effect/paint/babyblue, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/crew_quarters/medbreak) "wSf" = ( @@ -31906,8 +31906,8 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "wUc" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/workshop) "wUw" = ( @@ -31934,11 +31934,11 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology) "wVd" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "or2" }, -/obj/effect/paint/babyblue, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/surgery2) "wVB" = ( @@ -33379,7 +33379,7 @@ /turf/simulated/floor/tiled/techfloor, /area/assembly/robotics) "xVz" = ( -/obj/spawner/window/low_wall/full/firelocks, +/obj/spawner/window/low_wall/firelocks, /turf/simulated/floor/plating, /area/tether/station/public_meeting_room) "xWG" = ( diff --git a/maps/endeavour/levels/deck3.dmm b/maps/endeavour/levels/deck3.dmm index b140bc8875e..4eb6a08c70e 100644 --- a/maps/endeavour/levels/deck3.dmm +++ b/maps/endeavour/levels/deck3.dmm @@ -33,8 +33,8 @@ /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) "abl" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/belterdock) "abB" = ( @@ -455,16 +455,16 @@ /turf/simulated/floor/plating, /area/engineering/substation/deck3amidships) "aqN" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/wall/r_wall/prepainted/security, /area/security/brig) "arz" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "vicDetOffice" }, -/obj/effect/paint/darkred, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/detectives_office) "asX" = ( @@ -1513,8 +1513,8 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/crew_quarters/heads/hos) "bbp" = ( @@ -1800,8 +1800,8 @@ /turf/simulated/floor/plating, /area/quartermaster/storage) "blM" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/palebottlegreen, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/palebottlegreen, /turf/simulated/floor/plating, /area/hydroponics/garden) "bmB" = ( @@ -1977,11 +1977,11 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3fwdmaint) "brs" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/curtain/open/bed{ name = "curtain" }, -/obj/effect/paint/palebottlegreen, +/obj/map_helper/paint/palebottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/pool) "bsF" = ( @@ -2135,8 +2135,8 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "bvx" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/commandblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/commandblue, /obj/map_helper/electrochromatic_linker{ id = "hop_office2" }, @@ -2654,8 +2654,8 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/crew_quarters/heads/hos) "bTA" = ( @@ -2758,8 +2758,8 @@ /turf/simulated/floor/wood/broken, /area/maintenance/pool) "bXD" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/palebottlegreen, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/palebottlegreen, /obj/structure/curtain/open/black, /turf/simulated/floor/plating, /area/hydroponics/garden) @@ -3413,8 +3413,8 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/borosillicate/reinforced, +/obj/map_helper/paint/darkred, /turf/simulated/floor, /area/security/hanger) "cGh" = ( @@ -4507,8 +4507,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/paint/beastybrown, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/map_helper/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/quartermaster/belterdock) "dqu" = ( @@ -4589,8 +4589,8 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "dxf" = ( -/obj/effect/paint/darkred, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/map_helper/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -5687,8 +5687,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/crew_quarters/heads/hos) "ekc" = ( @@ -5725,8 +5725,8 @@ /turf/simulated/floor/tiled/monodark, /area/quartermaster/delivery) "elT" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/brig) "emn" = ( @@ -6464,8 +6464,8 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/lobby) "eOs" = ( @@ -6621,8 +6621,8 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/security_processing) "eTv" = ( @@ -7133,8 +7133,8 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "flv" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/evidence_storage) "fml" = ( @@ -7143,8 +7143,8 @@ /area/quartermaster/warehouse) "fmB" = ( /obj/structure/cable/green, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/range) "fnF" = ( @@ -8243,11 +8243,11 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "ggB" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/curtain/open/bed{ name = "curtain" }, -/obj/effect/paint/palebottlegreen, +/obj/map_helper/paint/palebottlegreen, /turf/simulated/floor/plating, /area/space) "ggC" = ( @@ -8308,8 +8308,8 @@ /turf/simulated/floor/grass, /area/hydroponics/garden) "glG" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/lobby) "glV" = ( @@ -9261,8 +9261,8 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/lobby) "gVV" = ( @@ -9493,8 +9493,8 @@ /area/endeavour/hallway/d3afthall) "hch" = ( /obj/structure/cable/green, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/security_processing) "hcD" = ( @@ -10542,8 +10542,8 @@ /area/crew_quarters/recreation_area) "hOL" = ( /obj/structure/cable/green, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/prison/cell_block) "hOP" = ( @@ -10938,7 +10938,7 @@ /turf/simulated/floor/tiled, /area/security/range) "iet" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/endeavour/station/stairs_three) "iez" = ( @@ -11012,8 +11012,8 @@ /turf/simulated/floor, /area/maintenance/security/port) "ihQ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /obj/structure/cable/green, /obj/structure/cable/green{ icon_state = "1-8" @@ -11324,11 +11324,11 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/effect/paint/darkred, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/brig) "isD" = ( @@ -11565,11 +11565,11 @@ /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) "izs" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "vicDetOffice" }, -/obj/effect/paint/darkred, +/obj/map_helper/paint/darkred, /turf/simulated/floor/lino, /area/security/detectives_office) "iAh" = ( @@ -11649,14 +11649,14 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full, +/obj/spawner/window/low_wall/borosillicate/reinforced, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/effect/paint/darkred, +/obj/map_helper/paint/darkred, /turf/simulated/floor, /area/security/hallway) "iDb" = ( @@ -12405,12 +12405,12 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full, +/obj/spawner/window/low_wall/borosillicate/reinforced, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/structure/cable/green, -/obj/effect/paint/darkred, +/obj/map_helper/paint/darkred, /turf/simulated/floor, /area/security/hallway) "jkq" = ( @@ -12482,11 +12482,11 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "jmv" = ( -/obj/effect/paint/commandblue, +/obj/map_helper/paint/commandblue, /obj/map_helper/electrochromatic_linker{ id = "hop_office" }, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/heads/hop) "jmL" = ( @@ -13434,8 +13434,8 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "jZL" = ( -/obj/effect/paint/darkred, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/map_helper/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/security/armoury) "kad" = ( @@ -13766,8 +13766,8 @@ /turf/simulated/floor/tiled, /area/security/brig) "kke" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/plating, /area/hydroponics/garden) "kkt" = ( @@ -14340,7 +14340,7 @@ /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_7) "kNh" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, @@ -14418,8 +14418,8 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/effect/paint/darkred, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/map_helper/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/cable/green{ icon_state = "2-4" }, @@ -14459,8 +14459,8 @@ /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) "kTg" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/security_lockerroom) "kTr" = ( @@ -14486,7 +14486,7 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "kTR" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/endeavour/hallway/d3fwdhall) "kUz" = ( @@ -14616,8 +14616,8 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/borosillicate/reinforced, +/obj/map_helper/paint/darkred, /turf/simulated/floor, /area/security/hanger) "lci" = ( @@ -15759,7 +15759,7 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "lYO" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/steel/airless, /area/shuttle/belter) "lZu" = ( @@ -16407,7 +16407,7 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "mzK" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/dormitory) "mzU" = ( @@ -16864,8 +16864,8 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "mVH" = ( -/obj/effect/paint/darkred, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/map_helper/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/security/warden) @@ -17606,8 +17606,8 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -17741,12 +17741,12 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full, +/obj/spawner/window/low_wall/borosillicate/reinforced, /obj/structure/cable/green{ icon_state = "1-4" }, /obj/structure/cable/green, -/obj/effect/paint/darkred, +/obj/map_helper/paint/darkred, /turf/simulated/floor, /area/security/hallway) "nzO" = ( @@ -18584,8 +18584,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/security_processing) "odI" = ( @@ -18676,8 +18676,8 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "ofl" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/warehouse) "ofO" = ( @@ -18767,7 +18767,7 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/starboardsolar) "oiQ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/cargo) "ojx" = ( @@ -19127,8 +19127,8 @@ name = "Cargo Line shutter"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/delivery) "ozk" = ( @@ -19230,11 +19230,11 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "vicDetOffice" }, -/obj/effect/paint/darkred, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/detectives_office) "oDl" = ( @@ -19335,8 +19335,8 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "oFO" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/airless/ceiling, /area/quartermaster/warehouse) "oGe" = ( @@ -20637,11 +20637,11 @@ /area/maintenance/dormitory) "pDX" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/effect/paint/darkred, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/brig) "pEk" = ( @@ -21137,8 +21137,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/brig) "pYU" = ( @@ -21523,8 +21523,8 @@ /turf/simulated/floor/tiled/dark, /area/janitor) "qmQ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/beastybrown, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/quartermaster/warehouse) @@ -21917,8 +21917,8 @@ /turf/simulated/floor, /area/quartermaster/warehouse) "qAq" = ( -/obj/effect/paint/darkred, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/map_helper/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/security/warden) "qAH" = ( @@ -22198,11 +22198,11 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/security/security_processing) "qKQ" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "qm_office" }, -/obj/effect/paint/beastybrown, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/qm) "qMf" = ( @@ -22253,8 +22253,8 @@ /turf/simulated/floor/tiled/dark, /area/security/lobby) "qNM" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/office) "qOr" = ( @@ -22318,8 +22318,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/prison/cell_block) "qQb" = ( @@ -23209,14 +23209,14 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/effect/paint/darkred, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/brig) "rEX" = ( @@ -23473,18 +23473,18 @@ /turf/simulated/floor/tiled/dark, /area/janitor) "rMg" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/palebottlegreen, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/palebottlegreen, /obj/structure/curtain/open/black, /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/plating, /area/hydroponics/garden) "rMh" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/effect/paint/darkred, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/brig) "rMi" = ( @@ -23511,8 +23511,8 @@ /turf/simulated/floor/tiled/dark, /area/janitor) "rMJ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/foyer) "rMY" = ( @@ -23735,7 +23735,7 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full, +/obj/spawner/window/low_wall/borosillicate/reinforced, /obj/structure/cable/green{ icon_state = "2-4" }, @@ -23745,7 +23745,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/paint/darkred, +/obj/map_helper/paint/darkred, /turf/simulated/floor, /area/security/hallway) "rTD" = ( @@ -23793,11 +23793,11 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/effect/paint/darkred, +/obj/map_helper/paint/darkred, /turf/simulated/floor, /area/security/brig) "rUj" = ( @@ -24849,7 +24849,7 @@ /turf/simulated/floor/tiled/dark, /area/security/brig) "sDc" = ( -/obj/spawner/window/low_wall/full/firelocks, +/obj/spawner/window/low_wall/firelocks, /turf/simulated/floor/plating, /area/endeavour/station/stairs_three) "sDq" = ( @@ -25039,8 +25039,8 @@ /turf/simulated/floor/tiled, /area/quartermaster/cargo_shelter_dock) "sKL" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/tiled/steel/airless, /area/shuttle/mining_ship/general) "sKV" = ( @@ -25401,7 +25401,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/prison/cell_block) "sXV" = ( @@ -27155,8 +27155,8 @@ /turf/simulated/floor/crystal, /area/endeavour/hallway/d3fwdhall) "ulx" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -28114,8 +28114,8 @@ layer = 4; name = "EXTERNAL AIRLOCK" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/warehouse) "vbj" = ( @@ -28134,8 +28134,8 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "vbs" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/range) "vca" = ( @@ -28178,8 +28178,8 @@ /turf/simulated/floor/water/deep/indoors, /area/hydroponics/garden) "vdD" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/palebottlegreen, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/palebottlegreen, /obj/structure/disposalpipe/segment, /obj/structure/cable/green{ icon_state = "1-2" @@ -28228,12 +28228,12 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full, +/obj/spawner/window/low_wall/borosillicate/reinforced, /obj/structure/cable/green{ icon_state = "1-8" }, /obj/structure/cable/green, -/obj/effect/paint/darkred, +/obj/map_helper/paint/darkred, /turf/simulated/floor, /area/security/hallway) "vfd" = ( @@ -29336,8 +29336,8 @@ /turf/space, /area/space) "vOF" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/breakroom) "vOR" = ( @@ -29362,8 +29362,8 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/lobby) "vPQ" = ( @@ -29484,11 +29484,11 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full, +/obj/spawner/window/low_wall/borosillicate/reinforced, /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/effect/paint/darkred, +/obj/map_helper/paint/darkred, /turf/simulated/floor, /area/security/hallway) "vUL" = ( @@ -29629,13 +29629,13 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central6{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/airless/ceiling, /area/quartermaster/warehouse) "vZZ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/belterdock/gear) "wal" = ( @@ -30301,7 +30301,7 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "wxp" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/starboardsolar) "wxD" = ( @@ -31370,11 +31370,11 @@ /turf/simulated/floor/plating, /area/maintenance/dormitory) "xkN" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/paint/darkred, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/security_lockerroom) "xlj" = ( @@ -31552,7 +31552,7 @@ /turf/simulated/wall/prepainted, /area/endeavour/hallway/d3afthall) "xsq" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/vacant/vacant_shop) "xtf" = ( @@ -32257,8 +32257,8 @@ /turf/simulated/wall/prepainted/security, /area/security/security_equiptment_storage) "xPT" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "xPU" = ( @@ -32590,8 +32590,8 @@ /turf/simulated/floor/tiled/old_cargo/red, /area/security/security_processing) "ydB" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/palebottlegreen, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/palebottlegreen, /obj/structure/cable{ icon_state = "1-2" }, @@ -32654,8 +32654,8 @@ /turf/simulated/floor/tiled/steel, /area/shuttle/mining_ship/general) "yhi" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/delivery) "yhp" = ( @@ -32736,11 +32736,11 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "vicDetOffice" }, -/obj/effect/paint/darkred, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/detectives_office) "yls" = ( diff --git a/maps/endeavour/levels/deck4.dmm b/maps/endeavour/levels/deck4.dmm index 0279dda6918..417fb62b45a 100644 --- a/maps/endeavour/levels/deck4.dmm +++ b/maps/endeavour/levels/deck4.dmm @@ -327,11 +327,11 @@ /turf/simulated/floor, /area/storage/tech) "anJ" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, -/obj/effect/paint/pipecyan, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "aoU" = ( @@ -1347,8 +1347,8 @@ id = "bar"; name = "Bar Shutters" }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/palebottlegreen, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/palebottlegreen, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "bny" = ( @@ -1616,11 +1616,11 @@ /turf/simulated/floor/tiled/steel, /area/engineering/atmos/eva) "bEa" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/atmospherics/pipe/manifold/visible/red{ dir = 8 }, -/obj/effect/paint/pipecyan, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "bEt" = ( @@ -2089,7 +2089,7 @@ /turf/simulated/floor/wood, /area/endeavour/surfacebase/bar_backroom) "cbL" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/security/lower) "cbR" = ( @@ -2186,8 +2186,8 @@ /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d4portafthall) "cin" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/sun, /turf/simulated/floor/plating, /area/engineering/engineering_monitoring) "ciZ" = ( @@ -2427,8 +2427,8 @@ /turf/simulated/floor/tiled/steel_dirty, /area/engineering/atmos/workshop) "ctk" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "ctN" = ( @@ -2628,11 +2628,11 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d4aftmaint) "cCk" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 10 }, -/obj/effect/paint/pipecyan, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "cCn" = ( @@ -2724,8 +2724,8 @@ /turf/simulated/floor/reinforced, /area/maintenance/security/lower) "cFY" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/sun, /turf/simulated/floor/plating, /area/endeavour/hallway/d4portafthall) "cGc" = ( @@ -2941,8 +2941,8 @@ /turf/simulated/floor/tiled/techmaint, /area/rnd/robotics/smallcraft) "cPu" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/sun, /turf/simulated/floor/plating, /area/engineering/engine_room) "cPB" = ( @@ -3337,13 +3337,13 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /obj/machinery/door/blast/shutters{ dir = 8; id = "bar"; name = "Bar Shutters" }, -/obj/effect/paint/palebottlegreen, +/obj/map_helper/paint/palebottlegreen, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "dlD" = ( @@ -3509,11 +3509,11 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d4starboardhall) "drH" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/atmospherics/pipe/manifold/visible/blue{ dir = 8 }, -/obj/effect/paint/pipecyan, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "drW" = ( @@ -3787,9 +3787,9 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portafthall) "dGJ" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/visible/black, -/obj/effect/paint/pipecyan, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "dHp" = ( @@ -4741,8 +4741,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/sun, /turf/simulated/floor/plating, /area/engineering/engine_room) "eIN" = ( @@ -4970,8 +4970,8 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portafthall) "eQQ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/sun, /turf/simulated/floor/plating, /area/tcommsat/computer) "eRm" = ( @@ -5568,7 +5568,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/starboardnacelle) "fwR" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor, /area/endeavour/hallway/d4fwdmaint) "fwT" = ( @@ -8007,11 +8007,11 @@ /turf/space, /area/space) "hMW" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 10 }, -/obj/effect/paint/pipecyan, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "hNe" = ( @@ -8186,8 +8186,8 @@ /area/endeavour/hallway/d4starboardamidhall) "hXg" = ( /obj/machinery/atmospherics/pipe/simple/visible/black, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/pipecyan, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "hXh" = ( @@ -10277,11 +10277,11 @@ /turf/simulated/wall/prepainted/engineering, /area/engineering/drone_fabrication) "jVb" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 8 }, -/obj/effect/paint/pipecyan, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "jVT" = ( @@ -11276,8 +11276,8 @@ /turf/simulated/floor, /area/endeavour/hallway/d4fwdmaint) "leo" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/sun, /obj/structure/cable, /turf/simulated/floor/plating, /area/engineering/storage) @@ -11603,8 +11603,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/sun, /turf/simulated/floor/plating, /area/engineering/engine_room) "lxE" = ( @@ -11671,8 +11671,8 @@ /turf/simulated/floor/tiled, /area/hydroponics) "lCh" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/bottlegreen, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/bottlegreen, /turf/simulated/floor/plating, /area/hydroponics) "lCS" = ( @@ -11979,8 +11979,8 @@ density = 0; opacity = 0 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/sun, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/sun, /turf/simulated/floor/plating, /area/engineering/engine_monitoring) "lTp" = ( @@ -13476,8 +13476,8 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d4porthall) "nrt" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/sun, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/sun, /obj/map_helper/electrochromatic_linker{ id = "EndeavourCeOfficeChrome" }, @@ -14182,11 +14182,11 @@ /turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/atmos/workshop) "nWb" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/obj/effect/paint/pipecyan, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "nWk" = ( @@ -14876,9 +14876,9 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d4starboardforhall) "oSB" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/visible/green, -/obj/effect/paint/pipecyan, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "oSI" = ( @@ -15525,11 +15525,11 @@ /turf/simulated/floor/plating, /area/engineering/substation/deck4aft) "pGH" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 8 }, -/obj/effect/paint/pipecyan, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "pGV" = ( @@ -15904,11 +15904,11 @@ /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos/eva) "qhi" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/atmospherics/pipe/manifold/visible/purple{ dir = 8 }, -/obj/effect/paint/pipecyan, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "qhx" = ( @@ -16248,8 +16248,8 @@ /turf/simulated/floor/reinforced/airless, /area/engineering/portnacelle) "qwQ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/sun, /turf/simulated/floor/plating, /area/engineering/locker_room) "qxt" = ( @@ -17342,7 +17342,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos/eva) "rHl" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/rnd/robotics/smallcraft) "rIS" = ( @@ -18015,11 +18015,11 @@ /turf/simulated/floor/plating, /area/endeavour/command/turrets) "szp" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/visible/blue{ dir = 10 }, -/obj/effect/paint/pipecyan, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "szz" = ( @@ -19389,9 +19389,9 @@ /turf/simulated/floor/tiled/monotile, /area/hydroponics) "ubP" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/visible/black, -/obj/effect/paint/pipecyan, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "udi" = ( @@ -20052,11 +20052,11 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/starboardnacelle) "uHr" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 10 }, -/obj/effect/paint/pipecyan, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "uHx" = ( @@ -21500,8 +21500,8 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "wcd" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/pipecyan, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "wdS" = ( @@ -21569,7 +21569,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4starboardhall) "wfT" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/endeavour/station/stairs_four) "wgo" = ( @@ -23045,7 +23045,7 @@ /turf/simulated/floor/plating, /area/engineering/substation/deck4aft) "xFU" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/floor/plating, /area/endeavour/hallway/d4fwdmaint) "xGE" = ( diff --git a/maps/endeavour/levels/flagship.dmm b/maps/endeavour/levels/flagship.dmm index 5e847916aed..f84ff808bec 100644 --- a/maps/endeavour/levels/flagship.dmm +++ b/maps/endeavour/levels/flagship.dmm @@ -563,7 +563,7 @@ }, /area/centcom/restaurant) "bO" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/unsimulated/floor{ name = "plating" }, @@ -1042,7 +1042,7 @@ /turf/unsimulated/floor/steel, /area/centcom/command) "dj" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/unsimulated/floor{ name = "plating" }, @@ -2751,7 +2751,7 @@ /area/centcom/security) "iC" = ( /obj/structure/fans/tiny, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "emergency_medical" }, /obj/machinery/door/blast/regular/open{ @@ -3451,7 +3451,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/spawner/window/low_wall/borosillicate/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/firelocks, /turf/simulated/floor/plating, /area/shuttle/specops/engine) "kX" = ( @@ -3781,7 +3781,7 @@ /turf/unsimulated/floor/steel, /area/centcom/security) "lR" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/unsimulated/floor{ name = "plating" }, @@ -3839,7 +3839,7 @@ }, /area/centcom/command) "mb" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "emergency_cockpit" }, /turf/simulated/floor, @@ -4074,7 +4074,7 @@ /area/centcom/specops) "mE" = ( /obj/structure/fans/tiny, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "emergency_medical" }, /turf/unsimulated/floor{ @@ -4836,7 +4836,7 @@ /area/centcom/living) "oL" = ( /obj/structure/fans/tiny, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/door/blast/regular/open{ id = "emergency_shuttle_lockdown"; name = "Emergency Shuttle Blast Door" @@ -5596,7 +5596,7 @@ }, /area/centcom/security) "rp" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/unsimulated/floor{ name = "plating" }, @@ -7042,7 +7042,7 @@ /turf/unsimulated/floor/steel, /area/centcom/command) "vN" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/unsimulated/floor{ name = "plating" }, @@ -7577,7 +7577,7 @@ /area/centcom/control) "xj" = ( /obj/structure/fans/tiny, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "emergency_security" }, /obj/machinery/door/blast/regular/open{ @@ -8210,7 +8210,7 @@ }, /area/centcom/control) "zm" = ( -/obj/spawner/window/low_wall/full/firelocks, +/obj/spawner/window/low_wall/firelocks, /turf/unsimulated/floor{ name = "plating" }, @@ -8606,7 +8606,7 @@ /area/centcom/control) "AA" = ( /obj/structure/fans/tiny, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "emergency_medical" }, /turf/simulated/floor, @@ -8838,7 +8838,7 @@ /turf/unsimulated/floor/wood, /area/centcom/restaurant) "Bj" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/unsimulated/floor{ name = "plating" }, @@ -9590,7 +9590,7 @@ /turf/unsimulated/floor/steel, /area/centcom/main_hall) "DZ" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/unsimulated/floor{ name = "plating" }, @@ -9712,8 +9712,8 @@ }, /area/centcom/command) "Et" = ( -/obj/spawner/window/low_wall/full/firelocks, -/obj/spawner/window/low_wall/full/firelocks, +/obj/spawner/window/low_wall/firelocks, +/obj/spawner/window/low_wall/firelocks, /turf/unsimulated/floor{ name = "plating" }, @@ -9951,7 +9951,7 @@ /area/centcom/evac) "Fl" = ( /obj/structure/fans/tiny, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "emergency_cockpit" }, /obj/machinery/door/blast/regular/open{ @@ -10696,7 +10696,7 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/specops/general) "HN" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/unsimulated/floor{ name = "plating" }, @@ -11986,7 +11986,7 @@ }, /area/centcom/control) "Lw" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/specops/cockpit) "Lx" = ( @@ -12379,7 +12379,7 @@ /turf/unsimulated/floor/steel, /area/centcom/restaurant) "MH" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/unsimulated/floor{ name = "plating" }, @@ -13010,7 +13010,7 @@ /area/shuttle/escape) "Oz" = ( /obj/structure/fans/tiny, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "emergency_security" }, /turf/simulated/floor, @@ -14462,7 +14462,7 @@ }, /area/centcom/security) "SW" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/unsimulated/floor{ name = "plating" }, @@ -15132,7 +15132,7 @@ /turf/unsimulated/floor/steel, /area/centcom/command) "Vu" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/unsimulated/floor{ name = "plating" }, @@ -15430,7 +15430,7 @@ }, /area/centcom/security) "Wt" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/centcom/specops/dock) "Wu" = ( @@ -15481,7 +15481,7 @@ }, /area/centcom/security) "WD" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/unsimulated/floor{ name = "plating" }, diff --git a/maps/euthenia/levels/deck0.dmm b/maps/euthenia/levels/deck0.dmm index 8deb6eb5df4..e649701f6be 100644 --- a/maps/euthenia/levels/deck0.dmm +++ b/maps/euthenia/levels/deck0.dmm @@ -254,7 +254,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/security/hallway) "jR" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/floor/plating, /area/bridge) "jS" = ( @@ -856,7 +856,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/space) "Hb" = ( -/obj/spawner/window/low_wall/borosillicate/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/firelocks, /turf/simulated/floor/plating, /area/main_map/hallway/deck0) "Hj" = ( @@ -1323,7 +1323,7 @@ /turf/simulated/floor/tiled/techfloor, /area/bridge) "WW" = ( -/obj/spawner/window/low_wall/borosillicate/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/firelocks, /turf/simulated/floor/reinforced, /area/bridge) "Xi" = ( diff --git a/maps/euthenia/levels/deck1.dmm b/maps/euthenia/levels/deck1.dmm index ff46ada49f6..6f9d0b471f6 100644 --- a/maps/euthenia/levels/deck1.dmm +++ b/maps/euthenia/levels/deck1.dmm @@ -14602,7 +14602,7 @@ /turf/simulated/floor/tiled, /area/main_map/hallway/deck1) "qPe" = ( -/obj/spawner/window/low_wall/borosillicate/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/bar) "qPq" = ( @@ -16713,7 +16713,7 @@ /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/aft/starboard) "txV" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -18594,7 +18594,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) "vsN" = ( -/obj/spawner/window/low_wall/borosillicate/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/bar_backroom) "vsV" = ( @@ -20661,7 +20661,7 @@ /turf/simulated/open, /area/main_map/maintenance/deck_one) "xHO" = ( -/obj/spawner/window/low_wall/borosillicate/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/kitchen) "xJO" = ( diff --git a/maps/euthenia/levels/deck2.dmm b/maps/euthenia/levels/deck2.dmm index 25720a4c1a5..041009a9530 100644 --- a/maps/euthenia/levels/deck2.dmm +++ b/maps/euthenia/levels/deck2.dmm @@ -11738,7 +11738,7 @@ /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay) "iKu" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/rift/station/fighter_bay) "iKz" = ( diff --git a/maps/euthenia/levels/deck3.dmm b/maps/euthenia/levels/deck3.dmm index 47a3cbba4e8..2c85154fb8b 100644 --- a/maps/euthenia/levels/deck3.dmm +++ b/maps/euthenia/levels/deck3.dmm @@ -64,7 +64,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; dir = 2; @@ -73,7 +73,7 @@ name = "CE Office Blast Doors"; opacity = 0 }, -/obj/effect/paint_stripe/sun, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/plating, /area/crew_quarters/heads/chief) "aeP" = ( @@ -8816,8 +8816,8 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/plating, /area/crew_quarters/heads/chief) "itw" = ( @@ -17962,7 +17962,7 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; dir = 2; @@ -17971,7 +17971,7 @@ name = "CE Office Blast Doors"; opacity = 0 }, -/obj/effect/paint_stripe/sun, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/plating, /area/crew_quarters/heads/chief) "qHJ" = ( diff --git a/maps/euthenia/levels/deck4.dmm b/maps/euthenia/levels/deck4.dmm index 607b5136304..a4333d18a3d 100644 --- a/maps/euthenia/levels/deck4.dmm +++ b/maps/euthenia/levels/deck4.dmm @@ -2349,8 +2349,8 @@ /turf/simulated/floor/tiled, /area/main_map/hallway/deck4/fore) "im" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/telescience_lab/chamber) "in" = ( @@ -2729,7 +2729,7 @@ pressure_resistance = 750; target_pressure = 750 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/floor/plating, /area/rnd/telescience_lab) "jt" = ( @@ -6752,8 +6752,8 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology) "xj" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/telescience_lab) "xk" = ( @@ -7012,8 +7012,8 @@ /turf/simulated/floor/plating, /area/rnd/xenobiology) "yd" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/telescience_lab/foyer) "yg" = ( @@ -7475,8 +7475,8 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology) "zD" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/telescience_lab) "zE" = ( @@ -11051,7 +11051,7 @@ /turf/simulated/floor/wood, /area/library) "LR" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/floor/tiled, /area/rnd/telescience_lab/storage) "LT" = ( @@ -11658,8 +11658,8 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) "NS" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/violet, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/violet, /turf/simulated/floor/plating, /area/exploration/explorer_prep) "NU" = ( diff --git a/maps/minitest/levels/minitest.dmm b/maps/minitest/levels/minitest.dmm index 6a7dd8eb3f2..1c3323961e6 100644 --- a/maps/minitest/levels/minitest.dmm +++ b/maps/minitest/levels/minitest.dmm @@ -3110,6 +3110,10 @@ /obj/structure/shuttle/engine/heater, /turf/simulated/shuttle/plating/carry, /area/shuttle/multidemo) +"tm" = ( +/obj/map_helper/paint_stripe/cyanblue, +/turf/space, +/area/space) "ts" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3313,6 +3317,11 @@ /obj/random/junk, /turf/simulated/floor/tiled, /area/bridge) +"AP" = ( +/obj/spawner/window/low_wall, +/obj/map_helper/paint_stripe/bottlegreen, +/turf/simulated/floor/tiled, +/area/crew_quarters/bar) "AT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 9 @@ -3322,6 +3331,11 @@ "Bg" = ( /turf/simulated/wall, /area/storage/surface_eva/external) +"BB" = ( +/obj/spawner/window/low_wall, +/obj/map_helper/paint_stripe/beige, +/turf/simulated/floor/tiled, +/area/crew_quarters/bar) "BU" = ( /obj/structure/railing, /obj/machinery/embedded_controller/radio/airlock/phoron{ @@ -3400,6 +3414,11 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay) +"DH" = ( +/obj/structure/wall_frame, +/obj/map_helper/paint_stripe/commandblue, +/turf/simulated/floor/tiled, +/area/crew_quarters/bar) "Eh" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3517,7 +3536,7 @@ /turf/simulated/wall, /area/space) "Kz" = ( -/obj/spawner/window/low_wall/full, +/obj/spawner/window/low_wall, /turf/space, /area/bridge) "Li" = ( @@ -3598,6 +3617,11 @@ }, /turf/simulated/floor/tiled, /area/bridge) +"Mq" = ( +/obj/structure/wall_frame/prepainted, +/obj/map_helper/paint_stripe/cyanblue, +/turf/simulated/floor/tiled, +/area/crew_quarters/bar) "Mz" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 6 @@ -3873,6 +3897,11 @@ /obj/machinery/chemical_dispenser/full, /turf/simulated/floor/tiled, /area/bridge) +"XI" = ( +/obj/spawner/window/low_wall, +/obj/map_helper/paint_stripe/black, +/turf/simulated/floor/tiled, +/area/crew_quarters/bar) "XU" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3896,6 +3925,11 @@ }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/storage/surface_eva/external) +"Yx" = ( +/obj/structure/wall_frame, +/obj/map_helper/paint_stripe/copper, +/turf/simulated/floor/tiled, +/area/crew_quarters/bar) "YO" = ( /obj/machinery/atmospherics/pipe/tank{ dir = 1 @@ -11096,7 +11130,7 @@ cR cW cK cK -cK +BB cK cK cK @@ -11198,7 +11232,7 @@ cR cK cK cK -cK +XI cK cK cK @@ -11300,7 +11334,7 @@ cR cR cR cK -cK +AP cK cK cK @@ -11402,7 +11436,7 @@ cK cK cK cK -cK +DH cK cK cK @@ -11504,7 +11538,7 @@ cJ cJ dc cK -cK +Yx cK cK cK @@ -11606,7 +11640,7 @@ aa aa cC cW -cK +Mq cK cK ej @@ -12315,7 +12349,7 @@ aa aa aa aa -aa +tm aa aa aa diff --git a/maps/rift/engines/sme.dmm b/maps/rift/engines/sme.dmm index 26641127574..cd833f5578e 100644 --- a/maps/rift/engines/sme.dmm +++ b/maps/rift/engines/sme.dmm @@ -785,8 +785,8 @@ /turf/simulated/floor, /area/engineering/engine_room) "GN" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/sun, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/sun, /turf/simulated/floor/plating/lythios43c{ outdoors = 0 }, @@ -1232,8 +1232,8 @@ /area/engineering/engine_room) "Zq" = ( /obj/effect/floor_decal/rust, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/sun, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/sun, /turf/simulated/floor/plating/lythios43c{ outdoors = 0 }, diff --git a/maps/rift/levels/rift-01-underground3.dmm b/maps/rift/levels/rift-01-underground3.dmm index 32cd1185ea8..d37981f2e71 100644 --- a/maps/rift/levels/rift-01-underground3.dmm +++ b/maps/rift/levels/rift-01-underground3.dmm @@ -562,7 +562,7 @@ /turf/simulated/floor/plating, /area/quartermaster/mining_airlock) "Hk" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/quartermaster/mining_airlock) "Ho" = ( diff --git a/maps/rift/levels/rift-02-underground2.dmm b/maps/rift/levels/rift-02-underground2.dmm index fe7d0f20e6c..bb0e55ef937 100644 --- a/maps/rift/levels/rift-02-underground2.dmm +++ b/maps/rift/levels/rift-02-underground2.dmm @@ -116,8 +116,8 @@ /turf/simulated/wall/r_wall/prepainted/engineering, /area/crew_quarters/heads/chief) "aE" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/sun, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/sun, /turf/simulated/floor/plating, /area/engineering/engine_airlock) "aF" = ( @@ -3224,8 +3224,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/sun, /turf/simulated/floor/plating, /area/engineering/foyer) "lW" = ( @@ -4311,7 +4311,7 @@ dir = 4; id = "bunker" }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/public_bunker) "oW" = ( @@ -4357,7 +4357,7 @@ dir = 8; id = "bunker" }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/public_bunker) "pb" = ( @@ -4869,7 +4869,7 @@ /turf/simulated/floor/tiled, /area/engineering/engine_eva) "qR" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/quartermaster/miningdock) "qS" = ( @@ -5310,8 +5310,8 @@ /turf/simulated/floor/tiled/steel, /area/engineering/atmos/locker_room) "sz" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/sun, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/sun, /turf/simulated/floor, /area/engineering/engine_airlock) "sA" = ( @@ -5572,8 +5572,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/sun, /turf/simulated/floor, /area/maintenance/substation/engineering) "tB" = ( @@ -6176,7 +6176,7 @@ dir = 2; id = "bunker" }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/public_bunker) "vW" = ( @@ -7881,8 +7881,8 @@ /turf/simulated/floor/tiled, /area/engineering/workshop) "CH" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/sun, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/sun, /obj/map_helper/electrochromatic_linker{ id = "ce_office" }, @@ -8177,8 +8177,8 @@ /turf/simulated/floor/tiled/techfloor, /area/engineering/engine_waste) "DI" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/secure_storage/lower) "DK" = ( @@ -8479,8 +8479,8 @@ /turf/simulated/floor/tiled, /area/engineering/workshop) "ET" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/palebottlegreen, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/palebottlegreen, /obj/map_helper/electrochromatic_linker{ id = "chapel_office" }, @@ -8959,8 +8959,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining) "Ha" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/palebottlegreen, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/palebottlegreen, /obj/map_helper/electrochromatic_linker{ id = "chapel_hall" }, @@ -9181,8 +9181,8 @@ /turf/simulated/floor/tiled, /area/engineering/workshop) "HY" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/sun, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/sun, /turf/simulated/floor/plating, /area/engineering/workshop) "Ia" = ( @@ -10083,8 +10083,8 @@ /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) "LD" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/sun, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/sun, /obj/machinery/door/blast/regular{ dir = 4; id = "engine_monitor_blast"; @@ -10296,8 +10296,8 @@ /turf/simulated/floor/plating, /area/maintenance/atmos) "Mu" = ( -/obj/effect/paint_stripe/sun, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/map_helper/paint_stripe/sun, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/door/blast/regular{ dir = 4; name = "Reactor Blast Door"; @@ -11238,8 +11238,8 @@ /turf/simulated/floor/lino, /area/chapel/office) "PM" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/miningdock) "PN" = ( @@ -11341,7 +11341,7 @@ /turf/simulated/floor/tiled/techmaint, /area/quartermaster/belterdock/gear) "Qr" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "Qt" = ( @@ -12812,8 +12812,8 @@ /turf/simulated/floor/lythios43c/indoors, /area/rift/surfacebase/underground/under2) "VV" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/miningdock) "VW" = ( @@ -13369,8 +13369,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining) "Yl" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/sun, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/sun, /turf/simulated/floor/plating, /area/engineering/engine_monitoring) "Yq" = ( @@ -13491,8 +13491,8 @@ /turf/simulated/floor/tiled/steel, /area/quartermaster/miningdock) "YJ" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/sun, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/sun, /turf/simulated/floor/plating, /area/engineering/engineering_monitoring) "YM" = ( diff --git a/maps/rift/levels/rift-03-underground1.dmm b/maps/rift/levels/rift-03-underground1.dmm index d665bc5bb39..f76539abadf 100644 --- a/maps/rift/levels/rift-03-underground1.dmm +++ b/maps/rift/levels/rift-03-underground1.dmm @@ -1820,8 +1820,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/pipecyan, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "dZ" = ( @@ -2034,7 +2034,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor, /area/storage/tech) "eH" = ( @@ -2086,7 +2086,7 @@ /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) "eS" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/rift/station/fighter_bay) "eT" = ( @@ -2111,8 +2111,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/blue{ dir = 4 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/pipecyan, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "eX" = ( @@ -3009,7 +3009,7 @@ /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/transport_tunnel) "hL" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/pool) "hM" = ( @@ -3025,8 +3025,8 @@ /obj/machinery/meter{ pixel_y = -21 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/pipecyan, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "hP" = ( @@ -3186,8 +3186,8 @@ /obj/machinery/meter{ pixel_y = -21 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/pipecyan, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "iy" = ( @@ -3528,8 +3528,8 @@ /turf/simulated/mineral/ignore_cavegen/geothermal, /area/rift/surfacebase/underground/under1) "jF" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /obj/machinery/door/blast/shutters{ dir = 2; id = "prison_spectators"; @@ -4165,8 +4165,8 @@ /turf/simulated/floor/tiled, /area/maintenance/elevator) "lK" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /obj/machinery/door/blast/shutters{ dir = 2; id = "prison_kitchen"; @@ -4374,7 +4374,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/engineering) "mo" = ( @@ -4974,8 +4974,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/pipecyan, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "ov" = ( @@ -5023,7 +5023,7 @@ /area/hallway/primary/underone) "oB" = ( /obj/structure/cable/green, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor, /area/storage/tech) "oC" = ( @@ -5294,7 +5294,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos) "po" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/engineering) "pp" = ( @@ -5524,8 +5524,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/hallway) "qb" = ( @@ -5581,8 +5581,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/pipecyan, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "ql" = ( @@ -5601,7 +5601,7 @@ /turf/simulated/floor/tiled, /area/rnd/secure_storage/upper) "qo" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/hallway/primary/underone) "qp" = ( @@ -5643,7 +5643,7 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor, /area/storage/tech) "qz" = ( @@ -5695,7 +5695,7 @@ /turf/simulated/floor, /area/security/prison/lower) "qH" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/engineering) "qK" = ( @@ -6489,7 +6489,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 9 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/engineering) "tz" = ( @@ -7001,8 +7001,8 @@ /turf/simulated/floor/outdoors/safeice/lythios43c, /area/rift/surfacebase/underground/under1) "vj" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "vk" = ( @@ -7489,7 +7489,7 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "wQ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/rift/station/adherent_maintenance) "wR" = ( @@ -8170,8 +8170,8 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/pipecyan, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "yH" = ( @@ -9758,8 +9758,8 @@ /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/transport_tunnel) "Et" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/hallway) "Eu" = ( @@ -10021,8 +10021,8 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "Fj" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/commandblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/commandblue, /turf/simulated/floor/plating, /area/tcommsat/computer) "Fk" = ( @@ -10843,7 +10843,7 @@ /area/rift/station/fighter_bay/hangar) "Hy" = ( /obj/structure/cable/green, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/rift/trade_shop) "Hz" = ( @@ -10962,8 +10962,8 @@ /turf/simulated/floor/outdoors/safeice/lythios43c/indoors, /area/maintenance/engineering) "HX" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/pipecyan, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "HY" = ( @@ -12067,7 +12067,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor, /area/storage/tech) "Lr" = ( @@ -12936,7 +12936,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/red{ dir = 8 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/engineering) "NU" = ( @@ -13044,8 +13044,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 8 }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/pipecyan, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "Oj" = ( @@ -13067,7 +13067,7 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/rift/trade_shop) "Ol" = ( @@ -13096,8 +13096,8 @@ /area/rift/station/adherent_maintenance) "Oq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/pipecyan, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "Or" = ( @@ -13469,8 +13469,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/pipecyan, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "PF" = ( @@ -13607,8 +13607,8 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "Qi" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/secure_storage/upper) "Qj" = ( @@ -13724,7 +13724,7 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor, /area/storage/tech) "QM" = ( @@ -13894,8 +13894,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/pipecyan, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "Rq" = ( @@ -14591,7 +14591,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor, /area/storage/tech) "TR" = ( @@ -14724,8 +14724,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/pipecyan, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "Us" = ( @@ -15941,8 +15941,8 @@ /turf/simulated/floor/plating, /area/engineering/atmos) "Yh" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/pipecyan, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "Yi" = ( @@ -16520,7 +16520,7 @@ /turf/simulated/floor/wood, /area/rift/station/fighter_bay) "ZS" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/rift/station/stairs_two) "ZT" = ( diff --git a/maps/rift/levels/rift-04-surface1.dmm b/maps/rift/levels/rift-04-surface1.dmm index 2eb0ccda00d..880d511ef71 100644 --- a/maps/rift/levels/rift-04-surface1.dmm +++ b/maps/rift/levels/rift-04-surface1.dmm @@ -791,8 +791,8 @@ /turf/simulated/floor/tiled/white, /area/rift/trade_shop) "aCD" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/hallway) "aDo" = ( @@ -938,8 +938,8 @@ id = "virolockdown"; name = "Virology Blast Door" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/virology) "aGV" = ( @@ -1380,7 +1380,7 @@ /turf/simulated/floor/wood, /area/maintenance/maint_bar) "baL" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/rift/stairwell/primary/surfaceone) "baN" = ( @@ -1806,8 +1806,8 @@ /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) "bnS" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/plating, /area/rift/surfaceeva/cargodock) "bnY" = ( @@ -2011,8 +2011,8 @@ /turf/simulated/floor/tiled/steel, /area/quartermaster/hallway) "brB" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/virologyisolation) "brW" = ( @@ -2347,8 +2347,8 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "bEY" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_main) "bFm" = ( @@ -2763,8 +2763,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -3398,8 +3398,8 @@ /turf/simulated/floor/tiled/steel_grid, /area/rift/surfaceeva/airlock/main/secondary) "cqs" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/babyblue, /obj/map_helper/electrochromatic_linker{ id = "patient_room_a" }, @@ -3846,8 +3846,8 @@ /turf/simulated/floor/tiled/steel, /area/tether/station/public_meeting_room) "cFz" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_office) "cGn" = ( @@ -4283,7 +4283,7 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) "cUv" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/rift/surfaceeva/airlock/main) "cUI" = ( @@ -6615,7 +6615,7 @@ /turf/simulated/floor/plating, /area/maintenance/substation/research/southwest_wing) "emM" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, @@ -7145,8 +7145,8 @@ /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) "eEx" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/babyblue, /obj/map_helper/electrochromatic_linker{ id = "patient_room_b" }, @@ -7585,8 +7585,8 @@ /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/funny/mimeoffice) "eVW" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/xenoarch_storage) "eWb" = ( @@ -7762,8 +7762,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/foyer) "fcq" = ( @@ -8325,8 +8325,8 @@ id = "warehouse"; name = "Warehouse Shutters" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/warehouse) "fxS" = ( @@ -8417,8 +8417,8 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "fAI" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/hardwood, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/hardwood, /turf/simulated/floor/plating, /area/library) "fBk" = ( @@ -9405,8 +9405,8 @@ /turf/simulated/floor/tiled/steel, /area/quartermaster/delivery) "gmT" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/office) "gmY" = ( @@ -9826,8 +9826,8 @@ /turf/simulated/floor/plating, /area/maintenance/library) "gCZ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/palebottlegreen, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/palebottlegreen, /turf/simulated/floor/plating, /area/tether/station/public_meeting_room) "gDe" = ( @@ -10003,8 +10003,8 @@ name = "Cargo Line shutter"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/delivery) "gJs" = ( @@ -11365,8 +11365,8 @@ /turf/simulated/floor/wood, /area/library) "hrN" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/palebottlegreen, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/palebottlegreen, /turf/simulated/floor/plating, /area/storage/surface_eva) "hsd" = ( @@ -11727,8 +11727,8 @@ name = "Cargo Line shutter"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/office) "hFE" = ( @@ -11997,8 +11997,8 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "hLe" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/babyblue, /obj/map_helper/electrochromatic_linker{ id = "exam_room" }, @@ -12036,7 +12036,7 @@ /turf/simulated/floor/tiled/steel, /area/rnd/tankstorage) "hMq" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/rift/station/public_garden) "hMx" = ( @@ -14282,11 +14282,11 @@ /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) "jaV" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 }, -/obj/effect/paint/babyblue, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/virologymorgue) "jaY" = ( @@ -14891,8 +14891,8 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) "jzo" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_first_aid) "jzK" = ( @@ -14916,8 +14916,8 @@ /area/medical/virologytransiteast) "jAs" = ( /obj/machinery/atmospherics/component/binary/pump/high_power/on, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/virologypurge) "jAJ" = ( @@ -15130,8 +15130,8 @@ name = "Surface Checkpoint Shutter"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -15309,8 +15309,8 @@ /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/virologyisolation) "jLK" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/palebottlegreen, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/palebottlegreen, /turf/simulated/floor/plating, /area/storage/tools) "jLP" = ( @@ -16722,7 +16722,7 @@ /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "kBr" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/rnd/tankstorage) "kBW" = ( @@ -17366,8 +17366,8 @@ name = "Testing Chamber Blast Door" }, /obj/structure/disposalpipe/segment, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/testingroom) "kTI" = ( @@ -19329,8 +19329,8 @@ /area/quartermaster/foyer) "mex" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/virologypurge) "mfm" = ( @@ -19496,8 +19496,8 @@ /turf/simulated/floor/lythios43c, /area/rift/surfacebase/outside/outside1) "mkq" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/virologypurge) "mkE" = ( @@ -20143,8 +20143,8 @@ /turf/simulated/floor/plating, /area/maintenance/cargo) "mBd" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_hallway) "mBo" = ( @@ -20177,8 +20177,8 @@ id = "test_chamber_blast"; name = "Testing Chamber Blast Door" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/testingroom) "mCV" = ( @@ -20423,8 +20423,8 @@ /turf/simulated/floor/plating/lythios43c, /area/rift/surfacebase/outside/outside1) "mLZ" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/darkred, /obj/map_helper/electrochromatic_linker{ id = "det_office" }, @@ -20471,8 +20471,8 @@ /turf/simulated/floor/plating, /area/maintenance/cargo) "mNL" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/psych) "mNV" = ( @@ -20722,7 +20722,7 @@ id = "main_ext_shutter"; name = "Surface External Shutter" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/rift/surfaceeva) "mUb" = ( @@ -21176,7 +21176,7 @@ desc = "Hazardous cryogenic temperatures beyond this point!"; pixel_x = -32 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/rift/surfaceeva/airlock/main) "niT" = ( @@ -21578,8 +21578,8 @@ /turf/simulated/floor/tiled, /area/medical/virology) "num" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_storage) "nwc" = ( @@ -21837,8 +21837,8 @@ /obj/structure/cable/heavyduty{ icon_state = "4-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_hallway) "nCD" = ( @@ -26597,8 +26597,8 @@ /turf/simulated/floor/grass, /area/medical/psych) "qkT" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora/lab_atmos) "qkU" = ( @@ -27392,8 +27392,8 @@ /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/surface_north) "qHF" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/babyblue, /obj/map_helper/electrochromatic_linker{ id = "cmo_office" }, @@ -27492,7 +27492,7 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "qKN" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/substation/research/southwest_wing) "qKO" = ( @@ -27728,8 +27728,8 @@ /turf/simulated/floor/reinforced/lythios43c, /area/rift/surfacebase/outside/outside1) "qRr" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/crew_quarters/medbreak) "qRt" = ( @@ -28361,8 +28361,8 @@ /turf/simulated/floor/tiled/white, /area/medical/psych) "rmE" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/chemistry_lab) "rmO" = ( @@ -29528,7 +29528,7 @@ /turf/simulated/floor/tiled/steel, /area/quartermaster/office) "rQq" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/rift/trade_shop) "rQu" = ( @@ -29978,11 +29978,11 @@ /obj/structure/disposalpipe/down{ dir = 1 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/paint/purplegray, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_stairs) "shL" = ( @@ -30703,8 +30703,8 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) "sxf" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/hardwood, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/hardwood, /turf/simulated/floor/plating, /area/tether/surfacebase/entertainment) "sxj" = ( @@ -30806,7 +30806,7 @@ /area/quartermaster/delivery) "sBt" = ( /obj/structure/disposalpipe/segment, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/cargo) "sBy" = ( @@ -31026,11 +31026,11 @@ id = "warehouse"; name = "Warehouse Shutters" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/paint/beastybrown, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/warehouse) "sHX" = ( @@ -31308,8 +31308,8 @@ /turf/simulated/wall/prepainted/cargo, /area/quartermaster/foyer) "sPu" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/prison/upper) "sPz" = ( @@ -32570,8 +32570,8 @@ /turf/simulated/floor/tiled/steel, /area/rnd/xenobiology/xenoflora/lab_atmos) "tBg" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/prison) "tBl" = ( @@ -34540,8 +34540,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/game_room) "uzL" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/beastybrown, /obj/map_helper/electrochromatic_linker{ id = "QM_office" }, @@ -35477,8 +35477,8 @@ /turf/simulated/floor/tiled/white, /area/medical/psych) "vcO" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/babyblue, /obj/map_helper/electrochromatic_linker{ id = "psych_office" }, @@ -35592,8 +35592,8 @@ /turf/simulated/floor/reinforced/lythios43c, /area/rift/surfacebase/outside/outside1) "vfP" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rift/surfacebase/outside/outside1) "vgd" = ( @@ -35942,8 +35942,8 @@ /turf/simulated/floor/tiled/steel, /area/rift/surfaceeva) "vuL" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/garage) "vvx" = ( @@ -36072,8 +36072,8 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "vAc" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_breakroom) "vAe" = ( @@ -36255,7 +36255,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_main) "vEh" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/research/lower) "vEs" = ( @@ -37448,8 +37448,8 @@ name = "Surface Checkpoint Shutter"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/checkpoint) "wpT" = ( @@ -37865,9 +37865,9 @@ name = "Cargo Line shutter"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/disposalpipe/segment, -/obj/effect/paint/beastybrown, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/delivery) "wAc" = ( @@ -38410,7 +38410,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -38435,8 +38435,8 @@ /turf/simulated/floor/reinforced/lythios43c, /area/rift/surfaceeva/aa/surface_south) "wSq" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/psych) "wSD" = ( @@ -38934,9 +38934,9 @@ /area/quartermaster/garage) "xgG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/hidden/black, -/obj/effect/paint/babyblue, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/virologyisolation) "xgU" = ( @@ -38961,8 +38961,8 @@ opacity = 0 }, /obj/structure/disposalpipe/segment, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/office) "xhl" = ( @@ -39195,7 +39195,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/engineering/engine_eva) "xmm" = ( @@ -39257,8 +39257,8 @@ /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/outside/outside1) "xnJ" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/delivery) "xoa" = ( @@ -39698,8 +39698,8 @@ /turf/simulated/floor/plating, /area/engineering/engine_eva) "xDd" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/medbay_emt_bay) "xDK" = ( @@ -39750,7 +39750,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) "xEp" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_breakroom) "xEs" = ( @@ -40533,7 +40533,7 @@ /turf/simulated/floor/tiled/steel, /area/quartermaster/office) "yfW" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "iaa" }, diff --git a/maps/rift/levels/rift-05-surface2.dmm b/maps/rift/levels/rift-05-surface2.dmm index 940a3510bc1..499468168fe 100644 --- a/maps/rift/levels/rift-05-surface2.dmm +++ b/maps/rift/levels/rift-05-surface2.dmm @@ -46,7 +46,7 @@ /turf/simulated/floor/tiled/dark, /area/security/tactical) "abg" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /turf/simulated/floor/plating, /area/triumph/surfacebase/sauna) "abV" = ( @@ -2201,7 +2201,7 @@ /turf/simulated/floor/plating/lythios43c, /area/rift/surfacebase/outside/outside2) "biy" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/machinery/door/blast/shutters{ density = 0; dir = 2; @@ -2210,7 +2210,7 @@ name = "Robotics shutter"; opacity = 0 }, -/obj/effect/paint/purplegray, +/obj/map_helper/paint/purplegray, /obj/map_helper/electrochromatic_linker{ id = "robotics-inner" }, @@ -2819,8 +2819,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "bBF" = ( @@ -5191,7 +5191,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "djU" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/techfloor, /area/shuttle/hammerhead/cockpit) "dke" = ( @@ -5556,8 +5556,8 @@ /turf/simulated/floor/tiled, /area/rnd/telescience_lab/foyer) "duY" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/surgeryprep) "dvw" = ( @@ -5892,10 +5892,10 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "dDP" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "warden-office" }, -/obj/effect/paint/darkred, +/obj/map_helper/paint/darkred, /obj/map_helper/electrochromatic_linker{ id = "warden-office" }, @@ -6265,8 +6265,8 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/lobby) "dNb" = ( @@ -6364,8 +6364,8 @@ name = "Pen 2 Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "dQE" = ( @@ -6732,8 +6732,8 @@ layer = 3.1; name = "Chemistry Shutters" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/chemistry) "egF" = ( @@ -6829,7 +6829,7 @@ /turf/simulated/floor/tiled/monotechmaint, /area/rift/station/public_garden/stairwell) "eju" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/sleep) "ejz" = ( @@ -6862,8 +6862,8 @@ /turf/simulated/floor/tiled/steel, /area/crew_quarters/sleep) "eke" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/darkred, /obj/map_helper/electrochromatic_linker{ id = "sec-locker" }, @@ -7009,10 +7009,10 @@ name = "Warden's Office Shutters"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "warden-office" }, -/obj/effect/paint/darkred, +/obj/map_helper/paint/darkred, /obj/map_helper/electrochromatic_linker{ id = "warden-office" }, @@ -7307,8 +7307,8 @@ name = "Pen 6 Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "eBG" = ( @@ -7557,8 +7557,8 @@ /turf/simulated/floor/tiled/white, /area/medical/surgery2) "eJW" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/lobby) "eKx" = ( @@ -7881,7 +7881,7 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) "eWD" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -8049,7 +8049,7 @@ /turf/simulated/floor/plating, /area/maintenance/security/upper) "fcv" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/rift/stairwell/primary/surfacetwo) "fcw" = ( @@ -9413,8 +9413,8 @@ /turf/simulated/floor/tiled/monowhite, /area/medical/chemistry) "fZd" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/darkred, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -10379,7 +10379,7 @@ /obj/effect/floor_decal/corner_techfloor_grid/full{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/techfloor, /area/shuttle/hammerhead/cockpit) "gza" = ( @@ -10753,7 +10753,7 @@ /turf/simulated/floor/plating, /area/maintenance/security/upper) "gIN" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /turf/simulated/floor/plating, /area/rift/station/public_garden/stairwell) "gJd" = ( @@ -11619,7 +11619,7 @@ /turf/simulated/floor/tiled/dark, /area/security/warden) "hsv" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/techfloor, /area/shuttle/hammerhead/general) "hsO" = ( @@ -13078,7 +13078,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) "ifW" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /turf/simulated/floor/plating, /area/holodeck_control) "igc" = ( @@ -13285,8 +13285,8 @@ /turf/simulated/floor/tiled/steel, /area/security/hallway) "inb" = ( -/obj/effect/paint/babyblue, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/map_helper/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/medical/resleeving) "inj" = ( @@ -13294,8 +13294,8 @@ pixel_x = -32 }, /obj/structure/disposalpipe/segment, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/babyblue, /obj/map_helper/electrochromatic_linker{ id = "medbay-outer" }, @@ -13616,7 +13616,7 @@ /turf/simulated/floor/tiled, /area/security/briefing_room) "iCM" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/hammerhead/cockpit) "iDO" = ( @@ -13886,8 +13886,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "iMz" = ( @@ -14041,7 +14041,7 @@ /turf/simulated/floor/tiled/steel, /area/crew_quarters/locker) "iQl" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/pool) "iQw" = ( @@ -14230,8 +14230,8 @@ /turf/simulated/floor/tiled/white, /area/medical/surgery) "iWQ" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/darkred, /obj/structure/cable/green, /obj/map_helper/electrochromatic_linker{ id = "Interr" @@ -14525,8 +14525,8 @@ layer = 3.1; name = "Chemistry Shutters" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/chemistry) "jdp" = ( @@ -14574,8 +14574,8 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "jfl" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/tiled, /area/rnd/telescience_lab/storage) "jgg" = ( @@ -14765,7 +14765,7 @@ /turf/simulated/floor/tiled/steel, /area/assembly/robotics) "jmT" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/machinery/door/blast/shutters{ density = 0; dir = 2; @@ -14775,7 +14775,7 @@ name = "Head of Security's Office Shutters"; opacity = 0 }, -/obj/effect/paint/darkred, +/obj/map_helper/paint/darkred, /obj/map_helper/electrochromatic_linker{ id = "hos-office" }, @@ -15027,8 +15027,8 @@ /turf/simulated/floor/tiled/white, /area/medical/sleeper) "juW" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/briefing_room) "juX" = ( @@ -15649,8 +15649,8 @@ name = "Pen 8 Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "jSr" = ( @@ -16080,8 +16080,8 @@ /turf/simulated/floor/tiled/steel, /area/maintenance/medbay) "keC" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/darkred, /obj/map_helper/electrochromatic_linker{ id = "sec-processing-l" }, @@ -16130,8 +16130,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "kgx" = ( @@ -16299,7 +16299,7 @@ /turf/simulated/floor/tiled/dark, /area/security/armory/blue) "kjT" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/rift/stairwell/primary/surfacetwo) "klg" = ( @@ -17150,7 +17150,7 @@ /turf/simulated/floor/tiled/steel, /area/security/lobby) "kMg" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/hallway/primary/surfacetwo) "kMi" = ( @@ -17256,7 +17256,7 @@ /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "kPx" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/machinery/door/blast/shutters{ density = 0; dir = 2; @@ -17265,7 +17265,7 @@ name = "Research Director Office shutter"; opacity = 0 }, -/obj/effect/paint/purplegray, +/obj/map_helper/paint/purplegray, /obj/map_helper/electrochromatic_linker{ id = "rd-office" }, @@ -17374,8 +17374,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "kTd" = ( @@ -17561,8 +17561,8 @@ /obj/structure/disposalpipe/up, /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers, /obj/structure/lattice, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/open, /area/rnd/outpost/xenobiology/outpost_slimepens) "kXq" = ( @@ -17782,7 +17782,7 @@ /turf/simulated/floor/tiled, /area/security/briefing_room) "laa" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/locker) "lac" = ( @@ -17862,8 +17862,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "lcJ" = ( @@ -18406,8 +18406,8 @@ name = "Pen 5 Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "lxP" = ( @@ -18517,7 +18517,7 @@ /turf/simulated/floor/plating, /area/maintenance/security/upper) "lAW" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -18704,8 +18704,8 @@ /turf/simulated/floor/tiled/white, /area/medical/chemistry) "lDW" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_slimepens) "lEq" = ( @@ -18818,8 +18818,8 @@ /turf/simulated/wall/prepainted, /area/maintenance/medbay) "lKj" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/workshop) "lKu" = ( @@ -19202,8 +19202,8 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) "lUI" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/breakroom) "lUK" = ( @@ -19333,8 +19333,8 @@ name = "Pen 7 Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "lYJ" = ( @@ -19652,8 +19652,8 @@ /turf/simulated/floor/tiled/monowhite, /area/medical/sleeper) "miH" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/telescience_lab/foyer) "mjr" = ( @@ -20698,9 +20698,8 @@ /turf/simulated/floor/tiled, /area/rnd/telescience_lab/foyer) "mJx" = ( -/obj/effect/paint/darkred, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/map_helper/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/security/hallway) "mKp" = ( @@ -20965,8 +20964,8 @@ /turf/simulated/floor/tiled/dark, /area/security/tactical) "mQt" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/babyblue, /obj/map_helper/electrochromatic_linker{ id = "medbay-outer" }, @@ -22898,8 +22897,8 @@ name = "Pen 3 Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "obA" = ( @@ -23688,8 +23687,8 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_4) "oFb" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/babyblue, /obj/map_helper/electrochromatic_linker{ id = "resleeving-tint" }, @@ -24724,8 +24723,8 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) "phz" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/babyblue, /obj/map_helper/electrochromatic_linker{ id = "medbay-outer" }, @@ -25449,8 +25448,8 @@ name = "Pen 4 Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "pMR" = ( @@ -25963,8 +25962,8 @@ /turf/simulated/floor/lythios43c/indoors, /area/rift/surfacebase/outside/outside2) "qgn" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/darkred, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -26539,7 +26538,7 @@ /turf/simulated/floor/plating, /area/maintenance/security/upper) "qwz" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/recreation_area) "qwA" = ( @@ -26607,7 +26606,7 @@ /turf/simulated/floor/tiled/monotile, /area/rnd/lockers) "qza" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/rift/trade_shop/loading) "qze" = ( @@ -26942,8 +26941,8 @@ /turf/simulated/open, /area/maintenance/lower/medsec_maintenance) "qJa" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "qJl" = ( @@ -27054,8 +27053,8 @@ name = "Research Director Office shutter"; opacity = 0 }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/lockers) "qLw" = ( @@ -27724,8 +27723,8 @@ name = "Pen 1 Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "rhI" = ( @@ -27764,7 +27763,7 @@ /turf/simulated/floor/wood, /area/rift/station/public_garden/gantry) "rin" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/computer/secure_data, /turf/simulated/floor/plating, /area/shuttle/hammerhead/cockpit) @@ -28458,8 +28457,8 @@ /turf/simulated/open, /area/turbolift/rsurface/level2) "rCu" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "rDz" = ( @@ -28648,7 +28647,7 @@ /turf/simulated/floor/tiled/steel, /area/crew_quarters/pool) "rIt" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/machinery/door/blast/shutters{ density = 0; dir = 2; @@ -28657,7 +28656,7 @@ name = "Robotics shutter"; opacity = 0 }, -/obj/effect/paint/purplegray, +/obj/map_helper/paint/purplegray, /obj/map_helper/electrochromatic_linker{ id = "robotics-outer" }, @@ -28872,10 +28871,10 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "rPd" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full{ +/obj/spawner/window/low_wall/reinforced/electrochromic{ spawn_grille = 0 }, -/obj/effect/paint/babyblue, +/obj/map_helper/paint/babyblue, /obj/map_helper/electrochromatic_linker{ id = "operating_theatre_1" }, @@ -29000,8 +28999,8 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/tiled/monotile, /area/security/hallway) "rTn" = ( @@ -29442,8 +29441,8 @@ /turf/simulated/floor/plating, /area/rift/station/fighter_bay/transport_tunnel_garage_maint) "slq" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_slimepens) "sly" = ( @@ -29499,7 +29498,7 @@ /turf/simulated/floor/tiled/red, /area/security/evastorage) "snv" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -29551,10 +29550,10 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) "soI" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full{ +/obj/spawner/window/low_wall/reinforced/electrochromic{ spawn_grille = 0 }, -/obj/effect/paint/babyblue, +/obj/map_helper/paint/babyblue, /obj/map_helper/electrochromatic_linker{ id = "operating_theatre_2" }, @@ -29926,8 +29925,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "sEs" = ( @@ -30297,7 +30296,7 @@ /turf/simulated/floor/tiled/monotile, /area/hallway/primary/surfacetwo) "sQW" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/asmaint2) "sRF" = ( @@ -30367,7 +30366,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar/lounge) "sVD" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/sleep) "sVH" = ( @@ -30460,7 +30459,7 @@ /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "sZs" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/reading_room) "taa" = ( @@ -30606,7 +30605,7 @@ /turf/simulated/floor/tiled/white, /area/security/security_bathroom) "tdg" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -30657,7 +30656,7 @@ /obj/structure/curtain/open/bed{ name = "brown curtain" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/hallway/primary/surfacetwo) "tfp" = ( @@ -31020,8 +31019,8 @@ name = "Pen 9 Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "tsk" = ( @@ -32730,8 +32729,8 @@ /turf/simulated/floor/tiled/steel, /area/security/hallway) "uDC" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/security_processing) "uEv" = ( @@ -34347,8 +34346,8 @@ /turf/simulated/floor/tiled/steel, /area/holodeck_control) "vvP" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/telescience_lab/foyer) "vwR" = ( @@ -34398,11 +34397,11 @@ /turf/simulated/floor/lythios43c/indoors, /area/rift/surfacebase/outside/outside2) "vxB" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "research-inner" }, -/obj/effect/paint/purplegray, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/research) "vyj" = ( @@ -34441,8 +34440,8 @@ /turf/simulated/floor/plating, /area/maintenance/dormitory) "vzm" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/darkred, /obj/map_helper/electrochromatic_linker{ id = "sec-processing-r" }, @@ -34720,10 +34719,10 @@ name = "Warden's Office Shutters"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "warden-office" }, -/obj/effect/paint/darkred, +/obj/map_helper/paint/darkred, /obj/map_helper/electrochromatic_linker{ id = "warden-office" }, @@ -35596,7 +35595,7 @@ /turf/simulated/floor/tiled/steel, /area/crew_quarters/sleep) "wpY" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/research/xenobio) "wqh" = ( @@ -35661,7 +35660,7 @@ /turf/simulated/floor/tiled/dark, /area/security/warden) "wsj" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -35989,8 +35988,8 @@ name = "Pen 10 Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "wFo" = ( @@ -36176,7 +36175,7 @@ /turf/simulated/floor/tiled/dark, /area/security/security_processing) "wNZ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/medbay) "wOu" = ( @@ -36260,7 +36259,7 @@ /turf/simulated/floor/tiled/white, /area/medical/sleeper) "wSx" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/lounge) "wTh" = ( @@ -37956,8 +37955,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "xRj" = ( @@ -38205,7 +38204,7 @@ /turf/simulated/floor/tiled/steel, /area/security/hallway) "xXT" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/machinery/door/blast/shutters{ density = 0; dir = 2; @@ -38214,7 +38213,7 @@ name = "Research shutter"; opacity = 0 }, -/obj/effect/paint/purplegray, +/obj/map_helper/paint/purplegray, /obj/map_helper/electrochromatic_linker{ id = "research-outer" }, @@ -38237,8 +38236,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "xYV" = ( @@ -38541,8 +38540,8 @@ /obj/structure/sign/department/operational{ pixel_x = -32 }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/babyblue, /turf/simulated/floor/plating, /area/medical/sleeper) "yjq" = ( diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm index 599630ad1f3..1d7aa31a775 100644 --- a/maps/rift/levels/rift-06-surface3.dmm +++ b/maps/rift/levels/rift-06-surface3.dmm @@ -12434,7 +12434,7 @@ /turf/simulated/floor/tiled/dark, /area/bridge/meeting_room) "aMM" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/bar/lower) "aMN" = ( @@ -14465,7 +14465,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, -/obj/effect/paint/black, +/obj/map_helper/paint/black, /turf/simulated/wall/rshull, /area/shuttle/oldcentury) "aTd" = ( @@ -16848,7 +16848,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8 }, -/obj/effect/paint/black, +/obj/map_helper/paint/black, /turf/simulated/wall/rshull, /area/shuttle/oldcentury) "bqs" = ( @@ -16884,8 +16884,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/palebottlegreen, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/palebottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/bar) "btC" = ( @@ -16943,8 +16943,8 @@ name = "Shuttle Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/violet, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" @@ -17056,8 +17056,8 @@ /turf/simulated/floor/outdoors/snow/noblend/lythios43c, /area/rift/surfacebase/outside/outside3) "bKl" = ( -/obj/effect/paint/black, -/obj/effect/paint_stripe/violet, +/obj/map_helper/paint/black, +/obj/map_helper/paint_stripe/violet, /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment{ dir = 4 @@ -17468,8 +17468,8 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/courser_dock) "csw" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/commandblue, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/commandblue, /turf/simulated/floor/plating, /area/bridge/bridge_hallway) "ctl" = ( @@ -17684,8 +17684,8 @@ name = "Bridge Lockdown Shutters"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/commandblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/commandblue, /turf/simulated/floor/plating, /area/bridge) "cRE" = ( @@ -17748,7 +17748,7 @@ /area/bridge/bridge_hallway) "cZP" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/effect/paint/black, +/obj/map_helper/paint/black, /turf/simulated/wall/rshull, /area/shuttle/oldcentury) "cZT" = ( @@ -17840,7 +17840,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "dgZ" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/machinery/door/blast/shutters{ density = 0; dir = 8; @@ -17849,7 +17849,7 @@ name = "HoP Office Shutters"; opacity = 0 }, -/obj/effect/paint/commandblue, +/obj/map_helper/paint/commandblue, /obj/map_helper/electrochromatic_linker{ id = "hop-office" }, @@ -17868,7 +17868,7 @@ /turf/simulated/floor, /area/shuttle/emt/general) "din" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor, /area/shuttle/emt/cockpit) "diY" = ( @@ -17889,7 +17889,7 @@ /turf/simulated/floor, /area/shuttle/oldcentury) "dpK" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/civvie/cockpit) "dpX" = ( @@ -17951,8 +17951,8 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/barrestroom) "dxR" = ( -/obj/effect/paint/black, -/obj/effect/paint_stripe/black, +/obj/map_helper/paint/black, +/obj/map_helper/paint_stripe/black, /turf/simulated/wall/rshull, /area/shuttle/oldcentury) "dxW" = ( @@ -18075,8 +18075,8 @@ /turf/simulated/wall/r_wall/prepainted/command, /area/crew_quarters/heads/blueshield) "dIa" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/violet, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/violet, /turf/simulated/floor/plating, /area/exploration/explorer_prep) "dIm" = ( @@ -18168,8 +18168,8 @@ /turf/simulated/floor/outdoors/gravsnow/lythios43c, /area) "dRg" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/commandblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/commandblue, /obj/map_helper/electrochromatic_linker{ id = "blueshield-office" }, @@ -18422,8 +18422,8 @@ /turf/simulated/wall/r_wall/prepainted/command, /area/ai) "eor" = ( -/obj/effect/paint/black, -/obj/effect/paint_stripe/violet, +/obj/map_helper/paint/black, +/obj/map_helper/paint_stripe/violet, /turf/simulated/wall/rshull, /area/shuttle/excursion/general) "eoD" = ( @@ -18528,8 +18528,8 @@ /turf/simulated/floor/plating, /area/maintenance/commandmaint) "eyE" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/palebottlegreen, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/palebottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/kitchen) "eyO" = ( @@ -18940,11 +18940,8 @@ /turf/simulated/floor/lino, /area/crew_quarters/bar_backroom) "eYG" = ( -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/obj/effect/paint/black, -/obj/effect/paint/silver, +/obj/map_helper/paint/silver, +/obj/map_helper/paint_stripe/black, /turf/simulated/wall/rshull, /area/shuttle/oldcentury) "eZd" = ( @@ -18986,12 +18983,12 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "fam" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/door/blast/shutters{ id = "pilot_prep"; name = "Pilot Prep Window Shutters" }, -/obj/effect/paint/palebottlegreen, +/obj/map_helper/paint/palebottlegreen, /turf/simulated/floor/plating, /area/exploration/pilot_prep) "fbX" = ( @@ -19174,8 +19171,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "fsv" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/violet, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/violet, /turf/simulated/floor/plating, /area/exploration/courser_dock) "ftd" = ( @@ -19245,7 +19242,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, -/obj/effect/paint/silver, +/obj/map_helper/paint/silver, /turf/simulated/wall/rshull, /area/shuttle/oldcentury) "fxP" = ( @@ -19275,7 +19272,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "fyx" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/machinery/door/blast/shutters{ density = 0; icon_state = "shutter0"; @@ -19284,7 +19281,7 @@ name = "Bridge Lockdown Shutters"; opacity = 0 }, -/obj/effect/paint/commandblue, +/obj/map_helper/paint/commandblue, /obj/map_helper/electrochromatic_linker{ id = "bridge-tint" }, @@ -19429,11 +19426,11 @@ /turf/simulated/wall/r_wall/prepainted, /area/teleporter/departing) "fOb" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /obj/structure/cable/pink{ icon_state = "4-8" }, -/obj/effect/paint/violet, +/obj/map_helper/paint/violet, /turf/simulated/floor/plating, /area/exploration/explorer_prep) "fOF" = ( @@ -19576,12 +19573,12 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "fVL" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/door/blast/shutters{ id = "Pilot_office_Shutter"; name = "Pilot Office Window Shutters" }, -/obj/effect/paint/palebottlegreen, +/obj/map_helper/paint/palebottlegreen, /turf/simulated/floor/plating, /area/exploration/pilot_Office) "fYG" = ( @@ -19880,7 +19877,7 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "guB" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/bar) "gvz" = ( @@ -19959,7 +19956,7 @@ /turf/simulated/floor, /area/shuttle/oldcentury) "gzi" = ( -/obj/effect/paint/silver, +/obj/map_helper/paint/silver, /turf/simulated/wall/rshull, /area/shuttle/oldcentury) "gBE" = ( @@ -20090,7 +20087,7 @@ /turf/simulated/floor/plating, /area/bridge/bridge_hallway) "gOf" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/hallway/secondary/docking_hallway2) "gOH" = ( @@ -20129,8 +20126,8 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "gQu" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/commandblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/commandblue, /obj/map_helper/electrochromatic_linker{ id = "meeting-tint" }, @@ -20343,7 +20340,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, -/obj/effect/paint/black, +/obj/map_helper/paint/black, /turf/simulated/wall/rshull, /area/shuttle/oldcentury) "hwA" = ( @@ -20505,7 +20502,7 @@ /turf/simulated/floor/tiled/dark, /area/teleporter) "hIO" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; dir = 2; @@ -20514,7 +20511,7 @@ name = "Shuttle Blast Doors"; opacity = 0 }, -/obj/effect/paint_stripe/violet, +/obj/map_helper/paint_stripe/violet, /turf/simulated/floor/plating, /area/shuttle/excursion/general) "hJp" = ( @@ -20718,11 +20715,11 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "hYC" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /obj/structure/cable/pink{ icon_state = "1-2" }, -/obj/effect/paint/violet, +/obj/map_helper/paint/violet, /turf/simulated/floor/plating, /area/exploration/explorer_prep) "hYK" = ( @@ -20764,8 +20761,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/effect/paint/black, -/obj/effect/paint_stripe/black, +/obj/map_helper/paint/black, +/obj/map_helper/paint_stripe/black, /turf/simulated/wall/rshull, /area/shuttle/oldcentury) "icY" = ( @@ -20830,7 +20827,7 @@ /turf/simulated/floor/reinforced, /area/rnd/telescience_lab/chamber) "ihT" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/machinery/door/blast/shutters{ density = 0; dir = 4; @@ -20840,7 +20837,7 @@ name = "Bridge Lockdown Shutters"; opacity = 0 }, -/obj/effect/paint/commandblue, +/obj/map_helper/paint/commandblue, /obj/map_helper/electrochromatic_linker{ id = "bridge-tint" }, @@ -21081,8 +21078,8 @@ /turf/simulated/floor/tiled/steel, /area/exploration) "iFT" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/telescience_lab) "iHi" = ( @@ -21156,7 +21153,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, -/obj/effect/paint/silver, +/obj/map_helper/paint/silver, /turf/simulated/wall/rshull, /area/shuttle/oldcentury) "iLp" = ( @@ -21168,8 +21165,8 @@ name = "Arrivals Checkpoint Shutter"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/checkpoint2) "iLC" = ( @@ -21198,7 +21195,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, -/obj/effect/paint/black, +/obj/map_helper/paint/black, /turf/simulated/wall/rshull, /area/shuttle/oldcentury) "iRd" = ( @@ -21225,7 +21222,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 4 }, -/obj/effect/paint/black, +/obj/map_helper/paint/black, /turf/simulated/wall/rshull, /area/shuttle/oldcentury) "iTu" = ( @@ -21252,8 +21249,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, -/obj/effect/paint/black, -/obj/effect/paint_stripe/black, +/obj/map_helper/paint/black, +/obj/map_helper/paint_stripe/black, /turf/simulated/wall/rshull, /area/shuttle/oldcentury) "iZN" = ( @@ -21310,7 +21307,7 @@ pressure_resistance = 750; target_pressure = 750 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/floor/plating, /area/rnd/telescience_lab) "jbR" = ( @@ -21449,8 +21446,8 @@ /turf/simulated/floor/glass/reinforced, /area/hallway/primary/surfacethree) "jpO" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/violet, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/violet, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -22028,10 +22025,10 @@ /turf/simulated/wall/r_wall/prepainted/command, /area/ai_upload_foyer) "kaE" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "botany_hallway" }, -/obj/effect/paint/palebottlegreen, +/obj/map_helper/paint/palebottlegreen, /turf/simulated/floor/plating, /area/hydroponics) "kcm" = ( @@ -22268,8 +22265,8 @@ /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/blueshield) "kBn" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/violet, /turf/simulated/floor/plating, /area/shuttle/excursion/general) "kGC" = ( @@ -22310,7 +22307,7 @@ /turf/simulated/floor/plating, /area/maintenance/commandmaint) "kJm" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/teleporter/departing) "kKk" = ( @@ -22368,8 +22365,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/palebottlegreen, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/palebottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/bar) "kQV" = ( @@ -22693,8 +22690,8 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/bar) "lxt" = ( -/obj/effect/paint/black, -/obj/effect/paint_stripe/violet, +/obj/map_helper/paint/black, +/obj/map_helper/paint_stripe/violet, /turf/simulated/wall/rshull, /area/shuttle/excursion/cargo) "lzf" = ( @@ -22856,7 +22853,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/effect/paint/black, +/obj/map_helper/paint/black, /turf/simulated/wall/rshull, /area/shuttle/oldcentury) "lOq" = ( @@ -23146,8 +23143,8 @@ /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) "mnJ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/maintenance/research/xenobio) "mpo" = ( @@ -23159,10 +23156,10 @@ name = "HoP Office Shutters"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "hop_office" }, -/obj/effect/paint/commandblue, +/obj/map_helper/paint/commandblue, /obj/map_helper/electrochromatic_linker{ id = "hop-office" }, @@ -23403,8 +23400,8 @@ name = "Shuttle Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/violet, /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "mID" = ( @@ -23474,8 +23471,8 @@ dir = 4; pixel_x = -32 }, -/obj/effect/paint/black, -/obj/effect/paint_stripe/violet, +/obj/map_helper/paint/black, +/obj/map_helper/paint_stripe/violet, /turf/simulated/wall/rshull, /area/shuttle/excursion/cargo) "mTQ" = ( @@ -23777,8 +23774,8 @@ /turf/simulated/floor/reinforced, /area/rnd/telescience_lab/chamber) "nqA" = ( -/obj/effect/paint/silver, -/obj/effect/paint_stripe/black, +/obj/map_helper/paint/silver, +/obj/map_helper/paint_stripe/black, /obj/machinery/airlock_sensor{ dir = 4; id_tag = "oldcentury_docker"; @@ -23946,11 +23943,6 @@ /obj/item/floor_painter, /turf/simulated/floor/lino, /area/crew_quarters/bar_backroom) -"nMn" = ( -/obj/effect/paint/black, -/obj/effect/paint/silver, -/turf/simulated/wall/rshull, -/area/shuttle/oldcentury) "nMD" = ( /obj/structure/closet/secure_closet/pilot, /obj/machinery/light, @@ -24080,7 +24072,7 @@ name = "Shuttle Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "nXs" = ( @@ -24091,7 +24083,7 @@ /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "nYu" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/hallway/secondary/docking_hallway2) "nYS" = ( @@ -24106,8 +24098,8 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "ocs" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/violet, /turf/simulated/floor/plating, /area/shuttle/excursion/cockpit) "ocE" = ( @@ -24429,7 +24421,7 @@ /turf/simulated/wall/r_wall/prepainted, /area/rift/turbolift/maint) "oCC" = ( -/obj/effect/paint/black, +/obj/map_helper/paint/black, /turf/simulated/wall/rshull, /area/shuttle/oldcentury) "oEM" = ( @@ -24480,8 +24472,8 @@ /turf/simulated/wall/prepainted/command, /area/bridge/bridge_hallway) "oGm" = ( -/obj/effect/paint/black, -/obj/effect/paint_stripe/violet, +/obj/map_helper/paint/black, +/obj/map_helper/paint_stripe/violet, /turf/simulated/wall/rshull, /area/shuttle/excursion/cockpit) "oGH" = ( @@ -24831,7 +24823,7 @@ /turf/simulated/floor/tiled/monotile, /area/exploration/pilot_prep) "pul" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/machinery/door/blast/shutters{ density = 0; dir = 2; @@ -24841,7 +24833,7 @@ name = "Bunker Lockdown Shutters"; opacity = 0 }, -/obj/effect/paint/commandblue, +/obj/map_helper/paint/commandblue, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -24851,8 +24843,8 @@ /turf/simulated/floor/plating, /area/bridge/bunker) "pxd" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/telescience_lab/chamber) "pxw" = ( @@ -24931,28 +24923,12 @@ /turf/simulated/floor/plating, /area/maintenance/commandmaint) "pFn" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/rift/surfacebase/outside/outside3) "pJa" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/barrestroom) -"pJi" = ( -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 8; - icon_state = "shutter0"; - id = "arv_check_shutter"; - name = "Arrivals Checkpoint Shutter"; - opacity = 0 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, -/turf/simulated/floor/plating, -/area/security/checkpoint2) "pKp" = ( /obj/structure/cable/cyan{ icon_state = "1-2" @@ -25021,7 +24997,7 @@ /turf/simulated/floor/tiled/steel, /area/exploration/courser_dock) "pOJ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/hallway/secondary/docking_hallway) "pOS" = ( @@ -25066,12 +25042,12 @@ /turf/simulated/floor/plating, /area/maintenance/commandmaint) "pTC" = ( -/obj/effect/paint/silver, -/obj/effect/paint_stripe/black, +/obj/map_helper/paint/silver, +/obj/map_helper/paint_stripe/black, /turf/simulated/wall/rshull, /area/shuttle/oldcentury) "pVV" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/civvie/general) "pXI" = ( @@ -25306,15 +25282,15 @@ /turf/simulated/floor, /area/shuttle/oldcentury) "qss" = ( -/obj/effect/paint/black, -/obj/effect/paint_stripe/violet, +/obj/map_helper/paint/black, +/obj/map_helper/paint_stripe/violet, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/wall/rshull, /area/shuttle/excursion/cargo) "qsA" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/rift/trade_shop/landing_pad) "quu" = ( @@ -25356,7 +25332,7 @@ /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfacethree) "qxq" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/heads/hop) "qzK" = ( @@ -25655,8 +25631,8 @@ /turf/simulated/wall/r_wall/prepainted/civilian, /area/crew_quarters/barrestroom) "rgZ" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/telescience_lab) "riD" = ( @@ -26024,7 +26000,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, -/obj/effect/paint/black, +/obj/map_helper/paint/black, /turf/simulated/wall/rshull, /area/shuttle/oldcentury) "rXm" = ( @@ -26145,8 +26121,8 @@ /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) "siB" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/violet, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/violet, /obj/map_helper/electrochromatic_linker{ id = "pathfinder-office" }, @@ -26186,8 +26162,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, -/obj/effect/paint/black, -/obj/effect/paint_stripe/black, +/obj/map_helper/paint/black, +/obj/map_helper/paint_stripe/black, /turf/simulated/wall/rshull, /area/shuttle/oldcentury) "skM" = ( @@ -26318,8 +26294,8 @@ dir = 4; pixel_x = -32 }, -/obj/effect/paint/black, -/obj/effect/paint_stripe/violet, +/obj/map_helper/paint/black, +/obj/map_helper/paint_stripe/violet, /turf/simulated/wall/rshull, /area/shuttle/excursion/general) "sGC" = ( @@ -26364,8 +26340,8 @@ /turf/simulated/floor, /area/shuttle/emt/general) "sON" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/violet, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/violet, /turf/simulated/floor/plating, /area/exploration/meeting) "sOO" = ( @@ -26477,8 +26453,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8 }, -/obj/effect/paint/black, -/obj/effect/paint_stripe/violet, +/obj/map_helper/paint/black, +/obj/map_helper/paint_stripe/violet, /turf/simulated/wall/rshull, /area/shuttle/excursion/general) "taq" = ( @@ -26506,8 +26482,8 @@ /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/shuttle/emt/general) "tbF" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/violet, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/violet, /turf/simulated/floor/plating, /area/exploration/excursion_dock) "tcQ" = ( @@ -26869,8 +26845,8 @@ name = "Arrivals Checkpoint Shutter"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /turf/simulated/floor/plating, /area/security/checkpoint2) "tLm" = ( @@ -26935,8 +26911,8 @@ /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) "tQO" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/palebottlegreen, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/palebottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/bar) "tSS" = ( @@ -26962,8 +26938,8 @@ /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) "tXr" = ( -/obj/effect/paint/silver, -/obj/effect/paint_stripe/black, +/obj/map_helper/paint/silver, +/obj/map_helper/paint_stripe/black, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 8 }, @@ -27111,16 +27087,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/visible/fuel, /obj/machinery/atmospherics/pipe/simple/visible/aux, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/violet, /turf/simulated/floor/plating, /area/shuttle/excursion/general) "uoo" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, -/obj/effect/paint/black, -/obj/effect/paint_stripe/black, +/obj/map_helper/paint/black, +/obj/map_helper/paint_stripe/black, /turf/simulated/wall/rshull, /area/shuttle/oldcentury) "uoG" = ( @@ -27145,7 +27121,7 @@ /turf/simulated/floor, /area/shuttle/oldcentury) "urI" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/emt/general) "use" = ( @@ -27231,8 +27207,8 @@ /obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/effect/paint/silver, -/obj/effect/paint_stripe/black, +/obj/map_helper/paint/silver, +/obj/map_helper/paint_stripe/black, /turf/simulated/wall/rshull, /area/shuttle/oldcentury) "uAA" = ( @@ -27262,7 +27238,7 @@ name = "Arrivals Hallway Shutter"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/locker/laundry_arrival) "uDh" = ( @@ -27357,8 +27333,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/paint/silver, -/obj/effect/paint_stripe/black, +/obj/map_helper/paint/silver, +/obj/map_helper/paint_stripe/black, /turf/simulated/wall/rshull, /area/shuttle/oldcentury) "uOE" = ( @@ -27398,8 +27374,8 @@ name = "Shuttle Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/violet, /turf/simulated/floor/plating, /area/shuttle/excursion/general) "uQX" = ( @@ -27674,8 +27650,8 @@ name = "Bridge Lockdown Shutters"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/commandblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/commandblue, /obj/map_helper/electrochromatic_linker{ id = "bridge-tint" }, @@ -27685,7 +27661,7 @@ /turf/simulated/wall/prepainted/command, /area/bridge/bunker) "vlJ" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/rift/stairwell/primary/surfacethree) "vmn" = ( @@ -27838,8 +27814,8 @@ /turf/simulated/floor/tiled/monotile, /area/exploration/explorer_prep) "vwG" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/commandblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, +/obj/map_helper/paint/commandblue, /obj/map_helper/electrochromatic_linker{ id = "meeting-tint" }, @@ -28033,7 +28009,7 @@ /turf/simulated/floor/tiled, /area/rnd/telescience_lab) "vKy" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/monodark, /area/shuttle/oldcentury) "vLd" = ( @@ -28080,8 +28056,8 @@ name = "Arrivals Checkpoint Shutter"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint/darkred, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -28446,8 +28422,8 @@ /turf/simulated/floor/tiled/monotile, /area/security/checkpoint2) "wkX" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/violet, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/violet, /turf/simulated/floor/plating, /area/exploration/medic_prep) "wlu" = ( @@ -28455,7 +28431,7 @@ /turf/simulated/wall/r_wall/prepainted/command, /area/bridge/office) "wlz" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/machinery/door/blast/shutters{ density = 0; dir = 2; @@ -28465,7 +28441,7 @@ name = "Bunker Lockdown Shutters"; opacity = 0 }, -/obj/effect/paint/commandblue, +/obj/map_helper/paint/commandblue, /obj/map_helper/electrochromatic_linker{ id = "bunker-tint" }, @@ -28661,8 +28637,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, -/obj/effect/paint/black, -/obj/effect/paint_stripe/violet, +/obj/map_helper/paint/black, +/obj/map_helper/paint_stripe/violet, /turf/simulated/wall/rshull, /area/shuttle/excursion/general) "wGH" = ( @@ -28708,8 +28684,8 @@ /turf/simulated/floor/tiled/steel, /area/exploration/excursion_dock) "wJJ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/violet, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" @@ -28792,8 +28768,8 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/bar) "wZh" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/palebottlegreen, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/palebottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/bar) "wZt" = ( @@ -29136,7 +29112,7 @@ /turf/simulated/wall/r_wall/prepainted, /area/maintenance/bar) "xxs" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "xxH" = ( @@ -29438,8 +29414,8 @@ /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "ybn" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/palebottlegreen, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint/palebottlegreen, /turf/simulated/floor/plating, /area/hydroponics) "ybv" = ( @@ -33901,7 +33877,7 @@ rjP hDB uyX fYJ -nMn +pTC kcm gaQ qcX @@ -43867,7 +43843,7 @@ aEz aET iLp vLJ -pJi +iLp wuI wuI oqe diff --git a/maps/rift/levels/rift-11-orbital.dmm b/maps/rift/levels/rift-11-orbital.dmm index 5df9bbf244b..8897e67d2a6 100644 --- a/maps/rift/levels/rift-11-orbital.dmm +++ b/maps/rift/levels/rift-11-orbital.dmm @@ -332,7 +332,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/shuttle/escape) "bh" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "emergency_medical" }, /turf/simulated/floor, @@ -3109,7 +3109,7 @@ /turf/simulated/floor/holofloor/reinforced, /area/space) "jM" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/specops/cockpit) "jN" = ( @@ -4354,7 +4354,7 @@ id = "emergency_shuttle_lockdown"; name = "Emergency Shuttle Blast Door" }, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "emergency_security" }, /turf/simulated/floor/reinforced, @@ -4588,7 +4588,7 @@ id = "emergency_shuttle_lockdown"; name = "Emergency Shuttle Blast Door" }, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "emergency_cockpit" }, /turf/simulated/floor, @@ -6356,7 +6356,7 @@ /turf/unsimulated/floor/dark, /area/centcom/specops) "un" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor, /area/shuttle/escape) "ur" = ( @@ -7752,7 +7752,7 @@ /turf/unsimulated/floor/dark, /area/centcom/specops) "BW" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "emergency_cockpit" }, /turf/simulated/floor, @@ -8060,7 +8060,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/centcom/specops/dock) "Ey" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "emergency_security" }, /turf/simulated/floor, @@ -8388,7 +8388,7 @@ id = "emergency_shuttle_lockdown"; name = "Emergency Shuttle Blast Door" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/reinforced, /area/shuttle/escape) "Jx" = ( @@ -8824,7 +8824,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/spawner/window/low_wall/borosillicate/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/firelocks, /turf/simulated/floor/plating, /area/shuttle/specops/engine) "MJ" = ( @@ -9196,7 +9196,7 @@ id = "emergency_shuttle_lockdown"; name = "Emergency Shuttle Blast Door" }, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "emergency_medical" }, /turf/simulated/floor/reinforced, diff --git a/maps/sectors/admin_planets_192/andromeda.dmm b/maps/sectors/admin_planets_192/andromeda.dmm index a0e2e97cc34..4ff63500461 100644 --- a/maps/sectors/admin_planets_192/andromeda.dmm +++ b/maps/sectors/admin_planets_192/andromeda.dmm @@ -228,7 +228,7 @@ /turf/simulated/floor/tiled/techfloor, /area/admin_planet/andromeda/lobby) "aE" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "senior_physician" }, @@ -836,7 +836,7 @@ /turf/simulated/floor/tiled/old_tile/purple, /area/admin_planet/andromeda/rnd_lobby) "cG" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -1900,7 +1900,7 @@ /turf/simulated/floor/tiled/techfloor, /area/admin_planet/andromeda/engi_equipment) "ga" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full{ +/obj/spawner/window/low_wall/reinforced/electrochromic{ spawn_grille = 0; id = "surgical suite" }, @@ -2373,11 +2373,11 @@ /turf/simulated/floor/tiled/kafel_full/purple, /area/admin_planet/andromeda/rnd_nexus) "hD" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, -/obj/effect/paint_stripe/sun, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/tiled/techfloor/grid, /area/admin_planet/andromeda/engi_workroom) "hE" = ( @@ -2911,7 +2911,7 @@ /turf/simulated/floor/tiled/kafel_full/red, /area/admin_planet/andromeda/sec_lockers) "iF" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -3709,7 +3709,7 @@ /turf/simulated/floor/tiled/monotile, /area/admin_planet/andromeda/janitorial) "lc" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -3832,7 +3832,7 @@ /turf/simulated/floor/tiled/techfloor, /area/admin_planet/andromeda/rnd_chem_research) "lw" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full{ +/obj/spawner/window/low_wall/reinforced/electrochromic{ spawn_grille = 0; id = "surgical suite-2" }, @@ -3914,7 +3914,7 @@ /turf/simulated/floor/tiled/techfloor, /area/admin_planet/andromeda/engi_equipment) "lE" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "rd" }, @@ -4124,7 +4124,7 @@ /turf/simulated/floor/reinforced/airless, /area/admin_planet/andromeda/engi_workroom) "mk" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/yellow, /area/admin_planet/andromeda/supply_prep) "mn" = ( @@ -4255,11 +4255,11 @@ /turf/simulated/floor/tiled/techfloor, /area/admin_planet/andromeda/engi_lobby) "mI" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/effect/paint_stripe/sun, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/tiled/techfloor/grid, /area/admin_planet/andromeda/engi_workroom) "mN" = ( @@ -4586,7 +4586,7 @@ /turf/simulated/floor/tiled/techfloor, /area/admin_planet/andromeda/rnd_chem_research) "nU" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -5590,7 +5590,7 @@ }, /area/admin_planet/andromeda/medward_storage) "qS" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/floor/reinforced, /area/admin_planet/andromeda/checkpoint_1) "qT" = ( @@ -5746,7 +5746,7 @@ /turf/simulated/floor/tiled/old_tile/purple, /area/admin_planet/andromeda/rnd_lobby) "ru" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -6031,8 +6031,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/tiled/steel, /area/admin_planet/andromeda/engi_workroom) "sr" = ( @@ -6380,8 +6380,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/green{ dir = 4 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/tiled/techfloor/grid, /area/admin_planet/andromeda/engi_workroom) "tz" = ( @@ -6641,7 +6641,7 @@ /turf/simulated/floor/tiled/yellow, /area/admin_planet/andromeda/supply_office) "uv" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/kafel_full/yellow, /area/admin_planet/andromeda/supply_warehouse) "uw" = ( @@ -6694,7 +6694,7 @@ /turf/simulated/floor/tiled/kafel_full/beige, /area/admin_planet/andromeda/medward_lobby) "uD" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /obj/map_helper/electrochromatic_linker{ id = "senior_engineer" }, @@ -7055,8 +7055,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/green{ dir = 1 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/tiled/techfloor/grid, /area/admin_planet/andromeda/engi_workroom) "vP" = ( @@ -7236,7 +7236,7 @@ /turf/simulated/floor/tiled/kafel_full/gray, /area/admin_planet/andromeda/supply_lobby) "ww" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -7990,7 +7990,7 @@ }, /area/admin_planet/andromeda/lobby) "yB" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -8005,7 +8005,7 @@ /turf/simulated/floor/reinforced, /area/admin_planet/andromeda/checkpoint_1) "yE" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/cable{ icon_state = "4-8" }, @@ -8685,7 +8685,7 @@ /turf/simulated/floor/tiled/techfloor, /area/admin_planet/andromeda/engi_monitoring) "AY" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/kafel_full/yellow, /area/admin_planet/andromeda/medward_chemistry) "AZ" = ( @@ -9002,8 +9002,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 6 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/tiled/techfloor/grid, /area/admin_planet/andromeda/engi_workroom) "BP" = ( @@ -9094,7 +9094,7 @@ /turf/simulated/floor/tiled/steel, /area/admin_planet/andromeda/rnd_lockers) "Ca" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks, /turf/simulated/floor/tiled/steel_dirty/dark, /area/admin_planet/andromeda/sec_warden_office) "Cb" = ( @@ -9146,7 +9146,7 @@ /turf/simulated/floor/tiled/techfloor, /area/admin_planet/andromeda/rnd_xenobio_storage) "Co" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/techmaint{ color = "#A9A9A9" }, @@ -9221,7 +9221,7 @@ /turf/simulated/floor/tiled/techfloor, /area/admin_planet/andromeda/engi_senior_engineer) "Cz" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/floor/tiled/techfloor, /area/admin_planet/andromeda/rnd_xenobio_storage) "CC" = ( @@ -9713,7 +9713,7 @@ /turf/simulated/floor/grass, /area/admin_planet/andromeda/rnd_xenobotany) "Ej" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/wall/r_wall/prepainted/medical{ integrity_flags = 1; integrity_enabled = 0 @@ -9782,7 +9782,7 @@ /turf/simulated/floor/tiled/kafel_full/gray, /area/admin_planet/andromeda/rnd_tool_storage) "Ez" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -10326,7 +10326,7 @@ /turf/simulated/floor/reinforced, /area/admin_planet/andromeda/sec_heavy_armory) "Gf" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -11248,8 +11248,8 @@ /area/admin_planet/andromeda/lounge) "IT" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible/cyan, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/tiled/techfloor/grid, /area/admin_planet/andromeda/engi_workroom) "IU" = ( @@ -12288,7 +12288,7 @@ /turf/simulated/floor/tiled/kafel_full/green, /area/admin_planet/andromeda/medward_treatment) "Ma" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -12410,7 +12410,7 @@ /turf/simulated/floor/tiled/yellow, /area/admin_planet/andromeda/supply_lobby) "Mu" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -12502,7 +12502,7 @@ /turf/simulated/floor/plating, /area/admin_planet/andromeda/northern_lobby) "MH" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -12534,7 +12534,7 @@ /turf/simulated/floor/tiled/techfloor, /area/admin_planet/andromeda/medward_cryo_morgue) "MK" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/dark{ color = "#A9A9A9" }, @@ -12808,7 +12808,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/admin_planet/andromeda/rnd_anomaly_lab) "NE" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/kafel_full/yellow, /area/admin_planet/andromeda/supply_office) "NG" = ( @@ -12923,7 +12923,7 @@ /turf/simulated/floor/tiled/techfloor, /area/admin_planet/andromeda/engi_lobby) "Oe" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/floor/reinforced, /area/admin_planet/andromeda/checkpoint_2) "Of" = ( @@ -13286,7 +13286,7 @@ /turf/simulated/floor/tiled/kafel_full/beige, /area/admin_planet/andromeda/medward_storage) "Pl" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -13926,8 +13926,8 @@ /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 8 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/tiled/techfloor/grid, /area/admin_planet/andromeda/engi_workroom) "Rv" = ( @@ -13949,8 +13949,8 @@ }, /area/admin_planet/andromeda/northern_lobby) "Rz" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/tiled/techfloor/grid, /area/admin_planet/andromeda/engi_workroom) "RB" = ( @@ -13959,7 +13959,7 @@ /turf/simulated/floor/tiled/techfloor, /area/admin_planet/andromeda/medward_cryo_morgue) "RD" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -14615,7 +14615,7 @@ /turf/simulated/floor/bmarble, /area/admin_planet/andromeda/rnd_rd_office) "TE" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/floor/tiled/techfloor, /area/admin_planet/andromeda/rnd_chem_research) "TF" = ( @@ -14628,7 +14628,7 @@ }, /area/admin_planet/andromeda/lobby) "TG" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -15851,8 +15851,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 5 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/tiled/techfloor/grid, /area/admin_planet/andromeda/engi_workroom) "Xp" = ( @@ -16039,8 +16039,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 6 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/tiled/techfloor/grid, /area/admin_planet/andromeda/engi_workroom) "XW" = ( @@ -16210,7 +16210,7 @@ /turf/simulated/floor/tiled/red, /area/admin_planet/andromeda/sec_lobby) "Yz" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; diff --git a/maps/sectors/admin_planets_192/croatoan.dmm b/maps/sectors/admin_planets_192/croatoan.dmm index 0e918528fb7..22ba2435bbe 100644 --- a/maps/sectors/admin_planets_192/croatoan.dmm +++ b/maps/sectors/admin_planets_192/croatoan.dmm @@ -1997,7 +1997,7 @@ /turf/simulated/floor/outdoors/snow/no_tree, /area/admin_planet/croatoan/mountain_plains) "gu" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/wall/prepainted, /area/admin_planet/croatoan/civ_bar_public) "gv" = ( @@ -6550,7 +6550,7 @@ /turf/simulated/floor/reinforced, /area/admin_planet/croatoan/high_sec_science_entrance) "wN" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/floor/tiled/steel_dirty/red, /area/admin_planet/croatoan/sec_hos_office) "wO" = ( @@ -12706,7 +12706,7 @@ /turf/simulated/floor/tiled/white, /area/admin_planet/croatoan/med_treatment) "Sw" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/space/basic, /area/admin_planet/croatoan/civ_bar_public) "Sx" = ( diff --git a/maps/sectors/admin_planets_192/fey_map.dmm b/maps/sectors/admin_planets_192/fey_map.dmm index 0e57e28a4b9..b481a9233b8 100644 --- a/maps/sectors/admin_planets_192/fey_map.dmm +++ b/maps/sectors/admin_planets_192/fey_map.dmm @@ -2366,7 +2366,7 @@ /turf/simulated/floor/tiled/kafel_full/blue, /area/admin_planet/fey_forest/gateway_facility) "Ve" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /obj/structure/atmospheric_retention_field{ color = "#8B0000"; name = "military grade atmospheric retention field" @@ -2471,7 +2471,7 @@ /turf/simulated/floor/fey/dry_grass, /area/admin_planet/fey_forest/underbrush) "WS" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/floor/reinforced, /area/admin_planet/fey_forest/gateway_facility) "WV" = ( diff --git a/maps/sectors/delerict_casino/levels/delerict_casino.dmm b/maps/sectors/delerict_casino/levels/delerict_casino.dmm index 225be7ea68b..ad292f13bd8 100644 --- a/maps/sectors/delerict_casino/levels/delerict_casino.dmm +++ b/maps/sectors/delerict_casino/levels/delerict_casino.dmm @@ -1166,7 +1166,7 @@ /turf/simulated/floor/tiled/old_tile/red, /area/sector/delerictcasino/security) "fH" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/steel_dirty/dark{ outdoors = 1 }, @@ -2330,7 +2330,7 @@ /turf/simulated/floor/tiled/old_tile/red, /area/sector/delerictcasino/security) "kG" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/steel_dirty/dark{ outdoors = 1 }, @@ -2361,7 +2361,7 @@ /turf/simulated/floor/carpet/patterened/blue, /area/sector/delerictcasino/room/room3) "kN" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/steel_dirty/silver, /area/sector/delerictcasino/ringforrest) "kQ" = ( @@ -2430,7 +2430,7 @@ }, /area/sector/delerictcasino/ringforrest) "lc" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/asteroid_steel, /area/sector/delerictcasino/ringforrest) "ld" = ( @@ -3088,7 +3088,7 @@ /turf/simulated/floor, /area/sector/delerictcasino/maintenance) "on" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/steel_dirty/silver, /area/sector/delerictcasino/room/room3) "oo" = ( @@ -3370,7 +3370,7 @@ /turf/simulated/floor/tiled/steel_dirty/silver, /area/sector/delerictcasino/restaurant) "pw" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/steel_dirty/silver, /area/sector/delerictcasino/room/room6) "pz" = ( @@ -3717,7 +3717,7 @@ }, /area/sector/delerictcasino/ringforrest) "ri" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor, /area/sector/delerictcasino/ringforrest) "rk" = ( @@ -5131,7 +5131,7 @@ /turf/simulated/floor/tiled/steel_dirty/silver, /area/sector/delerictcasino/ringforrest) "yf" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/steel_dirty/silver, /area/sector/delerictcasino/room/room2) "yj" = ( @@ -5666,7 +5666,7 @@ }, /area/sector/delerictcasino/ringforrest) "Am" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/steel_dirty/dark{ outdoors = 1 }, @@ -5738,7 +5738,7 @@ /turf/simulated/floor/tiled/steel_dirty/red, /area/sector/delerictcasino/dock) "AD" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/sector/delerictcasino/dock) "AE" = ( @@ -6536,7 +6536,7 @@ }, /area/sector/delerictcasino/ringforrest) "EW" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/fey/forest_grass{ outdoors = 1 }, @@ -7257,7 +7257,7 @@ }, /area/sector/delerictcasino/ringforrest) "ID" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/steel_dirty/dark{ outdoors = 1 }, @@ -8401,7 +8401,7 @@ }, /area/sector/delerictcasino/dock) "Oe" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/steel_dirty/dark{ outdoors = 1 }, @@ -8471,7 +8471,7 @@ /area/sector/delerictcasino/ringforrest) "Oy" = ( /obj/effect/floor_decal/rust, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/steel_dirty/silver, /area/sector/delerictcasino/ringforrest) "Oz" = ( @@ -9393,7 +9393,7 @@ /turf/simulated/floor/tiled/steel_dirty/red, /area/sector/delerictcasino/dock) "Ta" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/steel_dirty/silver, /area/sector/delerictcasino/room/room1) "Tb" = ( @@ -9711,7 +9711,7 @@ /turf/simulated/floor/tiled/asteroid_steel, /area/sector/delerictcasino/spine) "Uw" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/steel_dirty/dark{ outdoors = 1 }, @@ -10233,7 +10233,7 @@ /turf/simulated/floor/tiled/steel_dirty/silver, /area/sector/delerictcasino/ringforrest) "Xb" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/space/basic, /area/sector/delerictcasino/ringforrest) "Xc" = ( @@ -10583,7 +10583,7 @@ }, /area/sector/delerictcasino/ringforrest) "YL" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/steel_dirty/silver, /area/sector/delerictcasino/exterior) "YN" = ( diff --git a/maps/sectors/gaia_192/levels/gaia_192.dmm b/maps/sectors/gaia_192/levels/gaia_192.dmm index 7e67eb40309..e902fdd39ed 100644 --- a/maps/sectors/gaia_192/levels/gaia_192.dmm +++ b/maps/sectors/gaia_192/levels/gaia_192.dmm @@ -5576,9 +5576,6 @@ /area/class_m/outside) "xR" = ( /obj/structure/curtain/open/bed, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, /obj/structure/fans/tiny, /obj/spawner/window/borosillicate/full, /turf/simulated/floor/wood, @@ -11494,9 +11491,6 @@ "Yz" = ( /obj/structure/curtain/open/bed, /obj/spawner/window/borosillicate/full, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, /obj/structure/fans/tiny, /turf/simulated/floor/wood, /area/class_m/inside/vip_dorms) diff --git a/maps/sectors/miaphus/levels/miaphus_desert.dmm b/maps/sectors/miaphus/levels/miaphus_desert.dmm index 7eb0fd585bd..0fc94576b11 100644 --- a/maps/sectors/miaphus/levels/miaphus_desert.dmm +++ b/maps/sectors/miaphus/levels/miaphus_desert.dmm @@ -231,7 +231,7 @@ /turf/simulated/floor/wood, /area/sector/miaphus/beach/desert/explored) "Ar" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/wood, /area/sector/miaphus/beach/desert/explored) "BS" = ( diff --git a/maps/sectors/nebula_tradeport/levels/nebula_tradeport.dmm b/maps/sectors/nebula_tradeport/levels/nebula_tradeport.dmm index 25f8fdad2dc..d01b2ed214b 100644 --- a/maps/sectors/nebula_tradeport/levels/nebula_tradeport.dmm +++ b/maps/sectors/nebula_tradeport/levels/nebula_tradeport.dmm @@ -157,7 +157,7 @@ name = "Blast Shutters"; opacity = 0 }, -/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/shuttle/plating, /area/shuttle/trade_ship/general) "aaB" = ( @@ -213,7 +213,7 @@ name = "Shop Shutters"; opacity = 0 }, -/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) "aaJ" = ( @@ -305,7 +305,7 @@ /turf/simulated/floor/plating, /area/tradeport/atmospherics) "aaT" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -358,7 +358,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, -/obj/effect/paint/wallgunmetal, +/obj/map_helper/paint/wallgunmetal, /turf/simulated/wall/rshull, /area/shuttle/trade_ship/general) "abc" = ( @@ -455,7 +455,7 @@ /turf/simulated/floor/grass, /area/tradeport) "abr" = ( -/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/spawner/window/low_wall/nogrille/firelocks, /obj/structure/curtain/open/black, /turf/simulated/floor/wood, /area/sector/nebula_tradeport/motel) @@ -585,7 +585,7 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) "abK" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/old_tile/beige, /area/tradeport/spine) "abL" = ( @@ -632,11 +632,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/sector/nebula_tradeport/dock2) -"abS" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/tradeport/pads) "abU" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 @@ -967,7 +962,7 @@ name = "Blast Shutters"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/shuttle/plating, /area/shuttle/trade_ship/general) "acR" = ( @@ -1343,7 +1338,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 }, -/obj/effect/paint/wallgunmetal, +/obj/map_helper/paint/wallgunmetal, /turf/simulated/wall/rshull, /area/shuttle/trade_ship/general) "adS" = ( @@ -1591,7 +1586,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/effect/paint/wallgunmetal, +/obj/map_helper/paint/wallgunmetal, /turf/simulated/wall/rshull, /area/shuttle/trade_ship/general) "aew" = ( @@ -2238,7 +2233,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, -/obj/effect/paint/wallgunmetal, +/obj/map_helper/paint/wallgunmetal, /turf/simulated/wall/rshull, /area/shuttle/trade_ship/general) "agh" = ( @@ -2362,7 +2357,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/sector/nebula_tradeport/comroom) "agt" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/sector/nebula_tradeport/engineering) "agu" = ( @@ -2790,7 +2785,7 @@ /turf/simulated/floor/tiled/old_tile/red, /area/tradeport/commons) "ahy" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -2854,11 +2849,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "med_office" - }, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/white, /area/sector/nebula_tradeport/medical/public) "ahH" = ( @@ -3360,7 +3351,7 @@ name = "Blast Shutters"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/shuttle/plating, /area/shuttle/trade_ship/general) "aiO" = ( @@ -3532,7 +3523,7 @@ /turf/simulated/floor/tiled/neutral, /area/tradeport/commons) "ajk" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/airless, /area/sector/nebula_tradeport/engineering) "ajl" = ( @@ -4377,7 +4368,7 @@ /turf/simulated/floor/plating, /area/shuttle/udang/main) "aly" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tradeport/atmospherics) "alz" = ( @@ -4499,7 +4490,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8 }, -/obj/effect/paint/wallgunmetal, +/obj/map_helper/paint/wallgunmetal, /turf/simulated/wall/rshull, /area/shuttle/trade_ship/general) "alO" = ( @@ -5030,7 +5021,7 @@ name = "Blast Shutters"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/shuttle/plating, /area/shuttle/trade_ship/general) "ann" = ( @@ -5064,7 +5055,7 @@ /turf/simulated/floor/outdoors/grass/heavy/indoors, /area/tradeport/safarizoo) "ans" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/curtain/open/black, /turf/simulated/floor/tiled/dark, /area/sector/nebula_tradeport/motel/vip) @@ -5078,7 +5069,7 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/cockpit) "anv" = ( -/obj/effect/paint/purple, +/obj/map_helper/paint/purple, /turf/simulated/wall/rshull, /area/shuttle/trade_ship/general) "anw" = ( @@ -5583,7 +5574,7 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) "aoN" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/techfloor/grid, /area/sector/nebula_tradeport/dock2) "aoO" = ( @@ -5864,7 +5855,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, -/obj/effect/paint/wallgunmetal, +/obj/map_helper/paint/wallgunmetal, /turf/simulated/wall/rshull, /area/shuttle/trade_ship/general) "apF" = ( @@ -6011,7 +6002,7 @@ /turf/simulated/floor/wood, /area/shuttle/trade_ship/general) "aqc" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tradeport/spine) "aqd" = ( @@ -8271,7 +8262,7 @@ /turf/simulated/floor/plating, /area/shuttle/adventurer) "avO" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tradeport/cafeteria) "avQ" = ( @@ -8370,7 +8361,7 @@ /turf/simulated/floor/tiled/techfloor/monogrid, /area/tradeport/spine) "awe" = ( -/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/spawner/window/low_wall/nogrille/firelocks, /obj/structure/curtain/open/shower/engineering, /turf/simulated/floor/tiled/techfloor/grid, /area/sector/nebula_tradeport/comroom/holo1) @@ -8651,7 +8642,7 @@ name = "Blast Shutters"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/shuttle/plating, /area/shuttle/trade_ship/general) "awG" = ( @@ -9007,7 +8998,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, -/obj/effect/paint/wallgunmetal, +/obj/map_helper/paint/wallgunmetal, /turf/simulated/wall/rshull, /area/shuttle/trade_ship/general) "axA" = ( @@ -9106,7 +9097,7 @@ name = "Blast Shutters"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/shuttle/plating, /area/shuttle/trade_ship/general) "axM" = ( @@ -9220,7 +9211,7 @@ /turf/simulated/floor/wood, /area/shuttle/trade_ship/general) "ayg" = ( -/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/tradeport/commons) "ayh" = ( @@ -10191,7 +10182,7 @@ /area/shuttle/runabout) "aAB" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/effect/paint/wallgunmetal, +/obj/map_helper/paint/wallgunmetal, /turf/simulated/wall/rshull, /area/shuttle/trade_ship/general) "aAC" = ( @@ -10522,7 +10513,7 @@ /turf/simulated/floor/tiled/old_tile/gray, /area/shuttle/udang/cockpit) "aBq" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, @@ -10586,7 +10577,7 @@ /area/tradeport/safarizoo) "aBy" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden, -/obj/effect/paint/wallgunmetal, +/obj/map_helper/paint/wallgunmetal, /turf/simulated/wall/rshull, /area/shuttle/trade_ship/general) "aBA" = ( @@ -10673,7 +10664,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/effect/paint/wallgunmetal, +/obj/map_helper/paint/wallgunmetal, /turf/simulated/wall/rshull, /area/shuttle/trade_ship/general) "aBM" = ( @@ -10723,7 +10714,7 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) "aBS" = ( -/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/tradeport/cafeteria) "aBT" = ( @@ -11000,7 +10991,7 @@ /turf/simulated/floor/wood, /area/tradeport/commons) "aCC" = ( -/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/spawner/window/low_wall/nogrille/firelocks, /obj/structure/curtain/open/shower/engineering, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -11090,7 +11081,7 @@ /turf/simulated/floor/tiled/neutral, /area/tradeport/facility) "aCM" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tradeport/commons) "aCP" = ( @@ -11252,7 +11243,7 @@ /turf/simulated/floor/tiled/dark, /area/tradeport/facility) "aDk" = ( -/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/spawner/window/low_wall/nogrille/firelocks, /obj/structure/curtain/open/shower/engineering, /turf/simulated/floor/tiled/techfloor/grid, /area/sector/nebula_tradeport/comroom/holo3) @@ -11460,7 +11451,7 @@ /turf/simulated/floor/carpet/patterened/red, /area/sector/nebula_tradeport/motel/vip) "aDT" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/techfloor/grid, /area/sector/nebula_tradeport/engineering) "aDU" = ( @@ -11874,7 +11865,7 @@ /turf/simulated/floor/tiled, /area/tradeport/commhall) "aEY" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, @@ -11976,7 +11967,7 @@ /turf/simulated/floor/plating, /area/tradeport/expansion) "aFi" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/udang/cockpit) "aFj" = ( @@ -12054,7 +12045,7 @@ /turf/simulated/wall/sandstonediamond, /area/tradeport/cyndishow) "aFt" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/techfloor, /area/shuttle/tug) @@ -12298,7 +12289,7 @@ /turf/simulated/floor/tiled/old_tile/yellow, /area/shuttle/udang/main) "aGa" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tradeport/safarizoo) "aGb" = ( @@ -12607,7 +12598,7 @@ /obj/machinery/holosign/bar{ id = "tradersign" }, -/obj/effect/paint/wallgunmetal, +/obj/map_helper/paint/wallgunmetal, /turf/simulated/wall/rshull, /area/shuttle/trade_ship/general) "aGX" = ( @@ -12690,7 +12681,7 @@ /turf/simulated/floor/tiled/monotechmaint, /area/tradeport/spine) "aHi" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/monotechmaint, /area/shuttle/utilitymicro) "aHj" = ( @@ -13159,7 +13150,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/sector/nebula_tradeport/dock2) "aIy" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/old_tile/purple, /area/tradeport/spine) "aIz" = ( @@ -13248,7 +13239,7 @@ /turf/simulated/floor/carpet/patterened/blue/alt, /area/sector/nebula_tradeport/motel/vip) "aIM" = ( -/obj/effect/paint/wallgunmetal, +/obj/map_helper/paint/wallgunmetal, /turf/simulated/wall/rshull, /area/shuttle/trade_ship/general) "aIN" = ( @@ -13639,7 +13630,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/sector/nebula_tradeport/engineering) "aJM" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -14284,7 +14275,7 @@ /turf/simulated/shuttle/floor/white, /area/tradeport/commons) "aLz" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/utilitymicro) "aLA" = ( @@ -14399,7 +14390,7 @@ /turf/simulated/floor/tiled/old_tile/yellow, /area/tradeport/safari) "aLS" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/space, /area/sector/nebula_tradeport/motel/vip) "aLT" = ( @@ -15108,7 +15099,7 @@ name = "Blast Shutters"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/shuttle/plating, /area/shuttle/trade_ship/general) "aNK" = ( @@ -15157,7 +15148,7 @@ name = "Blast Shutters"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/shuttle/plating, /area/shuttle/trade_ship/general) "aNQ" = ( @@ -15235,7 +15226,7 @@ /turf/simulated/floor/glass/reinforced, /area/sector/nebula_tradeport/engineering) "aOb" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/techfloor, /area/shuttle/adventurer) "aOc" = ( @@ -15602,7 +15593,7 @@ /turf/simulated/floor/plating, /area/shuttle/caravan) "aPk" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/techfloor, /area/shuttle/tug) "aPl" = ( @@ -15708,7 +15699,7 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) "aPx" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/old_tile/beige, /area/shuttle/caravan) "aPy" = ( @@ -15794,7 +15785,7 @@ /turf/simulated/floor/tiled/techfloor/monogrid, /area/shuttle/adventurer) "aPK" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/cable/orange{ icon_state = "1-2" }, @@ -16246,7 +16237,7 @@ /turf/simulated/floor/tiled/old_tile/red, /area/sector/nebula_tradeport/security) "aQW" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tradeport/facility) "aQX" = ( @@ -16894,7 +16885,7 @@ /turf/simulated/floor/tiled/neutral, /area/tradeport/commons) "aSQ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/techmaint, /area/tradeport/facility) "aSR" = ( @@ -16984,7 +16975,7 @@ /turf/simulated/floor/tiled/techmaint, /area/tradeport/engineering) "aTe" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 8 }, @@ -17071,7 +17062,7 @@ /turf/simulated/wall/r_wall, /area/tradeport/commhall) "aTp" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/techfloor/monogrid, /area/shuttle/adventurer) "aTq" = ( @@ -18288,7 +18279,7 @@ /turf/simulated/floor/tiled, /area/tradeport/commhall) "aWt" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/curtain/open/black, /turf/space/basic, /area/sector/nebula_tradeport/motel/vip) @@ -18576,7 +18567,7 @@ /turf/simulated/floor/carpet, /area/tradeport/commons) "aXk" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/glass/reinforced, /area/sector/nebula_tradeport/engineering) "aXl" = ( @@ -18660,7 +18651,7 @@ /turf/simulated/floor/tiled/old_tile/beige, /area/shuttle/caravan) "aXv" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tradeport/engineering) "aXw" = ( @@ -18685,7 +18676,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/paint/wallgunmetal, +/obj/map_helper/paint/wallgunmetal, /turf/simulated/wall/rshull, /area/shuttle/trade_ship/general) "aXz" = ( @@ -18870,7 +18861,7 @@ /turf/simulated/floor/outdoors/grass/heavy, /area/tradeport/spine) "aYb" = ( -/obj/effect/paint/wallgunmetal, +/obj/map_helper/paint/wallgunmetal, /turf/simulated/wall/rshull, /area/shuttle/trade_ship/cockpit) "aYc" = ( @@ -18963,7 +18954,7 @@ /turf/simulated/floor/tiled/asteroid_steel/airless, /area/tradeport/pads) "aYn" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tradeport/pads) "aYp" = ( @@ -19226,14 +19217,14 @@ /turf/simulated/floor/tiled/old_tile/beige, /area/tradeport/safari) "aYZ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/airless, /area/sector/nebula_tradeport/security) "aZa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/paint/wallgunmetal, +/obj/map_helper/paint/wallgunmetal, /turf/simulated/wall/rshull, /area/shuttle/trade_ship/general) "aZb" = ( @@ -19579,7 +19570,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 }, -/obj/effect/paint/wallgunmetal, +/obj/map_helper/paint/wallgunmetal, /turf/simulated/wall/rshull, /area/shuttle/trade_ship/general) "aZX" = ( @@ -19755,13 +19746,6 @@ }, /turf/simulated/floor/tiled/old_tile/gray, /area/tradeport/cafeteria) -"brN" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/structure/window/reinforced/polarized{ - id = "scoophead_office" - }, -/turf/simulated/floor/plating, -/area/shuttle/scoophead/cockpit) "bsc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -20023,7 +20007,7 @@ /turf/simulated/floor/tiled/steel, /area/tradeport/commons) "cer" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/curtain/open/black, /turf/simulated/floor/tiled/techmaint, /area/sector/nebula_tradeport/motel/room4) @@ -20153,7 +20137,7 @@ /turf/simulated/floor/plating, /area/shuttle/scoophead/main) "cst" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/curtain/open/black, /turf/simulated/floor/tiled/techmaint, /area/sector/nebula_tradeport/motel/room8) @@ -20190,17 +20174,15 @@ /turf/simulated/floor/tiled/dark, /area/sector/nebula_tradeport/motel/vip) "czU" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/shuttle/scoophead/engineering) "cAq" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 4 }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/shuttle/scoophead/engineering) "cAr" = ( @@ -20259,7 +20241,7 @@ /turf/simulated/floor/reinforced/airmix, /area/tradeport/atmospherics) "cJE" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/curtain/open/black, /turf/simulated/floor/tiled/techmaint, /area/sector/nebula_tradeport/motel/room2) @@ -20595,14 +20577,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, /area/tradeport/commons) -"dBY" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "scoophead_room" - }, -/turf/simulated/floor/plating, -/area/shuttle/scoophead/cockpit) "dCd" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 @@ -20661,7 +20635,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/scoophead/cockpit) "dGF" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/curtain/black, /turf/simulated/floor/plating, /area/sector/nebula_tradeport/medical/public) @@ -20785,7 +20759,7 @@ /turf/simulated/floor/tiled/white, /area/sector/nebula_tradeport/medical/public) "dUe" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/steel_dirty/red, /area/shuttle/arrowhead) "dVq" = ( @@ -21255,11 +21229,7 @@ /turf/simulated/floor/carpet/turcarpet, /area/sector/nebula_tradeport/motel) "eSH" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "med_office" - }, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/white, /area/sector/nebula_tradeport/medical/public) "eXQ" = ( @@ -21333,14 +21303,6 @@ }, /turf/simulated/floor/tiled/neutral, /area/tradeport/commons) -"fhh" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "scoophead_office" - }, -/turf/simulated/floor/plating, -/area/shuttle/scoophead/cockpit) "fir" = ( /obj/machinery/computer/ship/sensors, /obj/effect/floor_decal/techfloor{ @@ -21682,7 +21644,7 @@ /turf/simulated/floor/wood, /area/tradeport/safarizoo) "gsa" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/scoophead/main) "gxH" = ( @@ -22102,15 +22064,7 @@ /turf/simulated/floor/wood, /area/sector/nebula_tradeport/motel/room2) "huS" = ( -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "scoophead_office" - }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "scoophead_office" - }, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/scoophead/cockpit) "hyI" = ( @@ -22705,7 +22659,7 @@ /turf/simulated/floor/plating, /area/tradeport/commons) "jjT" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/curtain/open/black, /turf/simulated/floor/tiled/techmaint, /area/sector/nebula_tradeport/motel/room7) @@ -22775,11 +22729,7 @@ /turf/simulated/floor/carpet/patterened/red, /area/shuttle/scoophead/cockpit) "jpc" = ( -/obj/structure/window/reinforced/polarized{ - dir = 8; - id = "scoophead_room" - }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/scoophead/cockpit) "juq" = ( @@ -23165,7 +23115,7 @@ /turf/simulated/floor/carpet/turcarpet, /area/sector/nebula_tradeport/motel) "kqb" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/udang/main) "ksu" = ( @@ -23587,7 +23537,7 @@ /turf/simulated/floor/wood, /area/shuttle/scoophead/cockpit) "luQ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/curtain/open/black, /turf/simulated/floor/tiled/techmaint, /area/sector/nebula_tradeport/motel/room6) @@ -24358,7 +24308,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/scoophead/main) "nBl" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/steel_dirty/dark, /area/shuttle/arrowhead) "nFe" = ( @@ -24899,7 +24849,7 @@ /turf/simulated/floor/carpet/patterened/blue, /area/sector/nebula_tradeport/motel/room3) "piK" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/curtain/open/black, /turf/simulated/floor/tiled/techmaint, /area/sector/nebula_tradeport/motel/room3) @@ -25030,7 +24980,7 @@ /turf/simulated/floor/outdoors/grass/heavy/indoors, /area/tradeport/safarizoo) "pLj" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/curtain/open/black, /turf/simulated/floor/carpet/patterened/blue/alt, /area/sector/nebula_tradeport/motel/vip) @@ -25532,7 +25482,7 @@ /turf/simulated/floor/tiled/old_tile/blue, /area/tradeport/commons) "rdP" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -25778,7 +25728,7 @@ /turf/simulated/wall/prepainted/command, /area/shuttle/scoophead/engineering) "rWc" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/curtain/open/black, /turf/simulated/floor/tiled/techmaint, /area/sector/nebula_tradeport/motel/room5) @@ -25864,7 +25814,7 @@ /turf/simulated/floor/wood, /area/sector/nebula_tradeport/motel/room8) "snu" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/old_tile/yellow, /area/tradeport/spine) "sqp" = ( @@ -26321,7 +26271,7 @@ /turf/simulated/floor/tiled/dark, /area/sector/nebula_tradeport/motel/room3) "tEO" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/curtain/open/black, /turf/simulated/floor/tiled/techmaint, /area/sector/nebula_tradeport/motel/arcade) @@ -26837,7 +26787,7 @@ /turf/simulated/floor/tiled/neutral, /area/tradeport/commons) "vkf" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/scoophead/cockpit) "vld" = ( @@ -27030,7 +26980,7 @@ /turf/simulated/floor/carpet/patterened/blue, /area/sector/nebula_tradeport/motel/room4) "vSG" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/curtain/open/black, /turf/simulated/floor/tiled/techmaint, /area/sector/nebula_tradeport/motel/room1) @@ -54828,7 +54778,7 @@ crT rai luK eDY -dBY +vkf aDh aDh awV @@ -55022,7 +54972,7 @@ dze pfn veG tBc -dBY +vkf aDh aDh awV @@ -55404,7 +55354,7 @@ aDh aDh aDh ygc -brN +vkf bEV bCt wux @@ -55490,7 +55440,7 @@ ahH aHY aHY aEG -abS +aYn akf akf akf @@ -55598,11 +55548,11 @@ aDh aDh aDh ygc -brN +vkf iPk uFC oBT -fhh +vkf ygc aDh aDh @@ -55792,11 +55742,11 @@ aDh aDh aDh ygc -brN +vkf bEV whD joQ -fhh +vkf ygc aDh aDh diff --git a/maps/sectors/sky_planet/levels/sky_planet_ground_east.dmm b/maps/sectors/sky_planet/levels/sky_planet_ground_east.dmm index 7c537babe54..f78770306c2 100644 --- a/maps/sectors/sky_planet/levels/sky_planet_ground_east.dmm +++ b/maps/sectors/sky_planet/levels/sky_planet_ground_east.dmm @@ -42,7 +42,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/sector/sky_planet/poi) "cB" = ( -/obj/spawner/window/low_wall/reinforced/tinted/full/firelocks, +/obj/spawner/window/low_wall/reinforced/tinted/firelocks, /turf/simulated/floor/tiled/techfloor, /area/sector/sky_planet/ground) "cC" = ( @@ -590,7 +590,7 @@ /turf/simulated/floor/holofloor/reinforced, /area/sector/sky_planet/rock) "Gd" = ( -/obj/spawner/window/low_wall/reinforced/tinted/full/firelocks, +/obj/spawner/window/low_wall/reinforced/tinted/firelocks, /turf/simulated/floor/tiled/techfloor, /area/sector/sky_planet/poi) "Gk" = ( diff --git a/maps/sectors/sky_planet/levels/sky_planet_sky_east.dmm b/maps/sectors/sky_planet/levels/sky_planet_sky_east.dmm index 0e8fe5c4096..5d7a4739d1c 100644 --- a/maps/sectors/sky_planet/levels/sky_planet_sky_east.dmm +++ b/maps/sectors/sky_planet/levels/sky_planet_sky_east.dmm @@ -193,7 +193,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/sector/sky_planet/rock) "As" = ( -/obj/spawner/window/low_wall/reinforced/tinted/full/firelocks, +/obj/spawner/window/low_wall/reinforced/tinted/firelocks, /turf/simulated/floor/tiled/steel_dirty, /area/sector/sky_planet/rock) "AM" = ( diff --git a/maps/sectors/sky_planet/levels/sky_planet_sky_west.dmm b/maps/sectors/sky_planet/levels/sky_planet_sky_west.dmm index f19392fb588..87d5f4f08e4 100644 --- a/maps/sectors/sky_planet/levels/sky_planet_sky_west.dmm +++ b/maps/sectors/sky_planet/levels/sky_planet_sky_west.dmm @@ -2017,7 +2017,7 @@ /turf/simulated/floor/tiled/techfloor/lythios43c, /area/sector/sky_planet/station_city/street) "Sz" = ( -/obj/spawner/window/low_wall/full/firelocks, +/obj/spawner/window/low_wall/firelocks, /turf/simulated/floor/wood/indoors, /area/sector/sky_planet/station_city/street) "SH" = ( diff --git a/maps/sectors/sky_planet/levels/sky_planet_upper_sky_west.dmm b/maps/sectors/sky_planet/levels/sky_planet_upper_sky_west.dmm index 09a937ecc30..a97c2b14c35 100644 --- a/maps/sectors/sky_planet/levels/sky_planet_upper_sky_west.dmm +++ b/maps/sectors/sky_planet/levels/sky_planet_upper_sky_west.dmm @@ -94,7 +94,7 @@ /turf/simulated/floor/tiled/techfloor, /area/sector/sky_planet/outpost/office) "ay" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/techfloor, /area/sector/sky_planet/racing_station/dock) "aE" = ( @@ -309,7 +309,7 @@ /turf/simulated/floor/tiled/techfloor, /area/sector/sky_planet/outpost/office) "bL" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/techmaint, /area/shuttle/paripari) "bS" = ( @@ -390,8 +390,8 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/sector/sky_planet/racing_station/dock) "cp" = ( -/obj/effect/paint/offwhite, -/obj/effect/paint_stripe/cyanblue, +/obj/map_helper/paint/offwhite, +/obj/map_helper/paint_stripe/cyanblue, /turf/simulated/wall/r_wall, /area/sector/sky_planet/station_city/shop) "cr" = ( @@ -456,7 +456,7 @@ /turf/simulated/floor/tiled/monodark, /area/sector/sky_planet/station_city/street) "cL" = ( -/obj/spawner/window/low_wall/full/firelocks, +/obj/spawner/window/low_wall/firelocks, /turf/simulated/floor/tiled/techfloor, /area/sector/sky_planet/outpost/office) "cN" = ( @@ -984,7 +984,7 @@ /turf/simulated/floor/lino, /area/sector/sky_planet/outpost/office) "fX" = ( -/obj/effect/paint/offwhite, +/obj/map_helper/paint/offwhite, /turf/simulated/wall/r_wall, /area/sector/sky_planet/station_city/shop) "fY" = ( @@ -1101,11 +1101,6 @@ /obj/structure/table/hardwoodtable, /turf/simulated/floor/carpet/patterened/green, /area/sector/sky_planet/station_city/offices) -"gF" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/paripari) "gH" = ( /obj/structure/table/steel_reinforced, /obj/effect/floor_decal/rust, @@ -2429,7 +2424,7 @@ /turf/simulated/floor/wood/sif/indoors, /area/sector/sky_planet/racing_station/lounge) "ob" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/techfloor/grid, /area/sector/sky_planet/racing_station/atc) "oe" = ( @@ -5289,7 +5284,7 @@ /turf/simulated/floor/tiled/techfloor, /area/sector/sky_planet/outpost/docking_port1) "DX" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/kafel_full/beige, /area/sector/sky_planet/racing_station/dock2) "DY" = ( @@ -6577,7 +6572,7 @@ /turf/simulated/floor/tiled/techfloor, /area/sector/sky_planet/station_city/police) "Lb" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/steel_dirty/dark, /area/shuttle/redcomet) "Lc" = ( @@ -6622,7 +6617,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/sector/sky_planet/racing_station/dock) "Lt" = ( -/obj/spawner/window/low_wall/full/firelocks, +/obj/spawner/window/low_wall/firelocks, /turf/simulated/floor/reinforced, /area/sector/sky_planet/outpost/docking_port2) "Lu" = ( @@ -6843,7 +6838,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/sector/sky_planet/racing_station/atc) "MR" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/techfloor/grid, /area/sector/sky_planet/racing_station/dock) "MS" = ( @@ -6878,7 +6873,7 @@ /turf/simulated/floor/reinforced, /area/sector/sky_planet/racing_station/dock2) "Nb" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/kafel_full/beige, /area/sector/sky_planet/racing_station/lounge) "Nc" = ( @@ -7098,7 +7093,7 @@ /turf/simulated/floor/tiled/techmaint, /area/sector/sky_planet/outpost/medical) "NP" = ( -/obj/spawner/window/low_wall/full/firelocks, +/obj/spawner/window/low_wall/firelocks, /turf/simulated/floor/tiled/monotechmaint, /area/sector/sky_planet/outpost/office) "NS" = ( @@ -7941,8 +7936,8 @@ /turf/simulated/floor/tiled/steel_dirty/yellow, /area/shuttle/bonnethead) "Si" = ( -/obj/effect/paint/sun, -/obj/effect/paint_stripe/black, +/obj/map_helper/paint/sun, +/obj/map_helper/paint_stripe/black, /turf/simulated/wall/r_wall, /area/sector/sky_planet/station_city/shop) "Sj" = ( @@ -9158,7 +9153,7 @@ /turf/simulated/floor/tiled/techfloor, /area/sector/sky_planet/station_city/dock) "Yn" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/steel_dirty/yellow, /area/shuttle/bonnethead) "Yo" = ( @@ -33799,7 +33794,7 @@ iS bL hZ Fg -gF +bL ET iS iS diff --git a/maps/sectors/surt/levels/surt_west.dmm b/maps/sectors/surt/levels/surt_west.dmm index c38536cea48..18c981e9519 100644 --- a/maps/sectors/surt/levels/surt_west.dmm +++ b/maps/sectors/surt/levels/surt_west.dmm @@ -142,7 +142,7 @@ /turf/simulated/floor/plating, /area/sector/surt/central/explored) "gd" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/sector/surt/mining_base/common) "gy" = ( @@ -452,7 +452,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/sector/surt/mining_base/common) "nZ" = ( @@ -705,7 +705,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, /turf/simulated/floor/plating, /area/sector/surt/mining_base/common) "rK" = ( diff --git a/maps/shuttles/factions/corporations/nanotrasen/drone_prototype.dmm b/maps/shuttles/factions/corporations/nanotrasen/drone_prototype.dmm index eb8a58ae1c4..b2923af1866 100644 --- a/maps/shuttles/factions/corporations/nanotrasen/drone_prototype.dmm +++ b/maps/shuttles/factions/corporations/nanotrasen/drone_prototype.dmm @@ -81,7 +81,7 @@ /turf/simulated/floor/plating/indoors, /area/shuttle/nanotrasen/drone_prototype) "B" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating/indoors, /area/shuttle/nanotrasen/drone_prototype) "E" = ( diff --git a/maps/submaps/sky_planet_ground/biodome.dmm b/maps/submaps/sky_planet_ground/biodome.dmm index f1516077872..957f0331461 100644 --- a/maps/submaps/sky_planet_ground/biodome.dmm +++ b/maps/submaps/sky_planet_ground/biodome.dmm @@ -19,7 +19,7 @@ /turf/simulated/wall/r_wall, /area/submap/skyplanet/poi/bio) "eD" = ( -/obj/spawner/window/low_wall/full/firelocks, +/obj/spawner/window/low_wall/firelocks, /turf/template_noop, /area/submap/skyplanet/poi/bio) "fH" = ( @@ -83,7 +83,7 @@ /turf/simulated/floor/tiled/monotechmaint, /area/submap/skyplanet/poi/bio) "pX" = ( -/obj/spawner/window/low_wall/full/firelocks, +/obj/spawner/window/low_wall/firelocks, /turf/simulated/floor/outdoors/ash_sand, /area/submap/skyplanet/poi/bio) "qX" = ( @@ -210,11 +210,6 @@ "GM" = ( /turf/simulated/floor/outdoors/ash_sand, /area/template_noop) -"GQ" = ( -/obj/spawner/window/low_wall/full/firelocks, -/obj/spawner/window/low_wall/full/firelocks, -/turf/simulated/floor/outdoors/ash_sand, -/area/submap/skyplanet/poi/bio) "Ih" = ( /obj/effect/floor_decal/grass_edge{ dir = 8 @@ -259,11 +254,6 @@ }, /turf/simulated/floor/tiled/monotechmaint, /area/submap/skyplanet/poi/bio) -"OX" = ( -/obj/spawner/window/low_wall/full/firelocks, -/obj/spawner/window/low_wall/full/firelocks, -/turf/template_noop, -/area/submap/skyplanet/poi/bio) "QP" = ( /obj/effect/floor_decal/grass_edge{ dir = 1 @@ -333,7 +323,7 @@ Az Az GM GM -OX +eD eD eD eD @@ -396,7 +386,7 @@ Az "} (5,1,1) = {" GM -GQ +pX pL Au kE diff --git a/maps/submaps/sky_planet_ground/ruins-g3.dmm b/maps/submaps/sky_planet_ground/ruins-g3.dmm index 3c470a381c9..6557279287b 100644 --- a/maps/submaps/sky_planet_ground/ruins-g3.dmm +++ b/maps/submaps/sky_planet_ground/ruins-g3.dmm @@ -77,7 +77,7 @@ /turf/simulated/wall/r_wall, /area/template_noop) "Z" = ( -/obj/spawner/window/low_wall/full/firelocks, +/obj/spawner/window/low_wall/firelocks, /turf/simulated/floor/plating, /area/submap/skyplanet/poi/ruins2) diff --git a/maps/submaps/sky_planet_ground/shuttle_crash1.dmm b/maps/submaps/sky_planet_ground/shuttle_crash1.dmm index 242c9a1c56d..6c2fda3f06d 100644 --- a/maps/submaps/sky_planet_ground/shuttle_crash1.dmm +++ b/maps/submaps/sky_planet_ground/shuttle_crash1.dmm @@ -23,7 +23,7 @@ /turf/template_noop, /area/submap/skyplanet/poi/shuttlecrash) "gx" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full, +/obj/spawner/window/low_wall/borosillicate/reinforced, /obj/machinery/door/blast/regular, /turf/simulated/floor/plating, /area/submap/skyplanet/poi/shuttlecrash) @@ -70,7 +70,7 @@ /turf/template_noop, /area/submap/skyplanet/poi/shuttlecrash) "pl" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full, +/obj/spawner/window/low_wall/borosillicate/reinforced, /obj/machinery/door/blast/regular/open, /turf/simulated/floor/plating, /area/submap/skyplanet/poi/shuttlecrash) @@ -232,7 +232,7 @@ /area/template_noop) "Zv" = ( /obj/machinery/door/blast/regular, -/obj/spawner/window/low_wall/borosillicate/reinforced/full, +/obj/spawner/window/low_wall/borosillicate/reinforced, /turf/template_noop, /area/submap/skyplanet/poi/shuttlecrash) diff --git a/maps/submaps/sky_planet_ground/shuttle_crash3.dmm b/maps/submaps/sky_planet_ground/shuttle_crash3.dmm index 0c4e673e58f..f4492c6d10e 100644 --- a/maps/submaps/sky_planet_ground/shuttle_crash3.dmm +++ b/maps/submaps/sky_planet_ground/shuttle_crash3.dmm @@ -105,7 +105,7 @@ /turf/simulated/floor/plating, /area/submap/skyplanet/poi/shuttlecrash3) "H" = ( -/obj/spawner/window/low_wall/full/firelocks, +/obj/spawner/window/low_wall/firelocks, /obj/machinery/door/blast/regular, /turf/simulated/floor/plating, /area/submap/skyplanet/poi/shuttlecrash3) @@ -128,7 +128,7 @@ /turf/simulated/floor/plating, /area/submap/skyplanet/poi/shuttlecrash3) "O" = ( -/obj/spawner/window/low_wall/full/firelocks, +/obj/spawner/window/low_wall/firelocks, /turf/simulated/floor/tiled/techfloor/grid, /area/submap/skyplanet/poi/shuttlecrash3) "P" = ( diff --git a/maps/submaps/sky_planet_ground/shuttle_crash4.dmm b/maps/submaps/sky_planet_ground/shuttle_crash4.dmm index ecffffa03c7..11ee8260dfd 100644 --- a/maps/submaps/sky_planet_ground/shuttle_crash4.dmm +++ b/maps/submaps/sky_planet_ground/shuttle_crash4.dmm @@ -91,7 +91,7 @@ /turf/simulated/floor/plating, /area/submap/skyplanet/poi/shuttlecrash4) "O" = ( -/obj/spawner/window/low_wall/full/firelocks, +/obj/spawner/window/low_wall/firelocks, /obj/structure/barricade, /turf/simulated/floor/plating, /area/submap/skyplanet/poi/shuttlecrash4) diff --git a/maps/submaps/sky_planet_ground/shuttle_crash5.dmm b/maps/submaps/sky_planet_ground/shuttle_crash5.dmm index fdfe0d941da..8f871ebdb01 100644 --- a/maps/submaps/sky_planet_ground/shuttle_crash5.dmm +++ b/maps/submaps/sky_planet_ground/shuttle_crash5.dmm @@ -30,7 +30,7 @@ /turf/simulated/wall/r_wall, /area/submap/skyplanet/poi/shuttlecrash4) "q" = ( -/obj/spawner/window/low_wall/full/firelocks, +/obj/spawner/window/low_wall/firelocks, /turf/simulated/floor/tiled/techfloor/grid, /area/submap/skyplanet/poi/shuttlecrash4) "s" = ( @@ -89,7 +89,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/submap/skyplanet/poi/shuttlecrash4) "Z" = ( -/obj/spawner/window/low_wall/full/firelocks, +/obj/spawner/window/low_wall/firelocks, /turf/template_noop, /area/submap/skyplanet/poi/shuttlecrash4) diff --git a/maps/submaps/sky_planet_rigs/miningdrill.dmm b/maps/submaps/sky_planet_rigs/miningdrill.dmm index 12b6eb25766..d798140777c 100644 --- a/maps/submaps/sky_planet_rigs/miningdrill.dmm +++ b/maps/submaps/sky_planet_rigs/miningdrill.dmm @@ -79,7 +79,7 @@ /turf/simulated/floor/reinforced, /area/submap/skyplanet/poi/mining) "t" = ( -/obj/spawner/window/low_wall/reinforced/tinted/full, +/obj/spawner/window/low_wall/reinforced/tinted, /turf/simulated/floor/preset/linoleum/indoors, /area/submap/skyplanet/poi/mining) "u" = ( @@ -208,7 +208,7 @@ /turf/simulated/floor/preset/linoleum/indoors, /area/submap/skyplanet/poi/mining) "S" = ( -/obj/spawner/window/low_wall/reinforced/tinted/full, +/obj/spawner/window/low_wall/reinforced/tinted, /turf/simulated/floor/tiled/techfloor/lythios43c/indoors, /area/submap/skyplanet/poi/mining) "T" = ( diff --git a/maps/submaps/sky_planet_rigs/ruin3.dmm b/maps/submaps/sky_planet_rigs/ruin3.dmm index 246fde3be36..4a85c77b6c2 100644 --- a/maps/submaps/sky_planet_rigs/ruin3.dmm +++ b/maps/submaps/sky_planet_rigs/ruin3.dmm @@ -3,7 +3,7 @@ /turf/simulated/floor/carpet, /area/submap/skyplanet/poi/broken3) "d" = ( -/obj/spawner/window/low_wall/full/nogrille, +/obj/spawner/window/low_wall/nogrille, /turf/simulated/floor/plating/outdoors, /area/submap/skyplanet/poi/broken3) "f" = ( diff --git a/maps/submaps/sky_planet_rigs/tajaranrebelbase.dmm b/maps/submaps/sky_planet_rigs/tajaranrebelbase.dmm index c6ed2f063c4..76aaede7bea 100644 --- a/maps/submaps/sky_planet_rigs/tajaranrebelbase.dmm +++ b/maps/submaps/sky_planet_rigs/tajaranrebelbase.dmm @@ -53,7 +53,7 @@ /turf/simulated/floor/tiled/techmaint, /area/submap/skyplanet/poi/tajaranreb) "jc" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full, +/obj/spawner/window/low_wall/borosillicate/reinforced, /turf/simulated/floor/reinforced, /area/submap/skyplanet/poi/tajaranreb) "kb" = ( @@ -242,7 +242,7 @@ /turf/simulated/floor/tiled/techmaint, /area/submap/skyplanet/poi/tajaranreb) "Nh" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full, +/obj/spawner/window/low_wall/borosillicate/reinforced, /turf/simulated/floor/tiled/techmaint, /area/submap/skyplanet/poi/tajaranreb) "Os" = ( diff --git a/maps/templates/admin/shipcave.dmm b/maps/templates/admin/shipcave.dmm index f19eb168352..7de96fcb2b3 100644 --- a/maps/templates/admin/shipcave.dmm +++ b/maps/templates/admin/shipcave.dmm @@ -190,7 +190,7 @@ /turf/simulated/floor/cult, /area/awaymission/shipcave/ship/brig) "bR" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/awaymission/shipcave/ship/range) "bS" = ( @@ -526,7 +526,7 @@ /turf/simulated/floor/tiled/steel_dirty/dark, /area/awaymission/shipcave/ship/bridge) "fo" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/awaymission/shipcave/ship) "fp" = ( @@ -1252,7 +1252,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/awaymission/shipcave/ship/canteen) "lu" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/awaymission/shipcave/ship/guns) "lw" = ( @@ -1440,7 +1440,7 @@ /turf/simulated/wall/thull, /area/awaymission/shipcave/ship/medical) "mZ" = ( -/obj/spawner/window/low_wall/full/nogrille, +/obj/spawner/window/low_wall/nogrille, /turf/simulated/floor, /area/awaymission/shipcave) "nj" = ( @@ -1898,8 +1898,8 @@ /turf/simulated/floor/plating, /area/awaymission/shipcave/ship/morgue) "tb" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/borosillicate/reinforced, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/shuttle/floor/voidcraft, /area/awaymission/shipcave/ship/bridge) "tg" = ( @@ -1962,7 +1962,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/awaymission/shipcave/ship/hangar) "tY" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/awaymission/shipcave) "tZ" = ( @@ -3063,7 +3063,7 @@ /turf/simulated/shuttle/floor/alienplating, /area/awaymission/shipcave/ship/engines) "EJ" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/awaymission/shipcave/ship/ammo) "EK" = ( @@ -3079,7 +3079,7 @@ /turf/simulated/floor/tiled/steel_dirty/dark, /area/awaymission/shipcave/temple) "ER" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full, +/obj/spawner/window/low_wall/borosillicate/reinforced, /turf/simulated/shuttle/floor/alienplating, /area/awaymission/shipcave/ship/engines) "ET" = ( @@ -3308,8 +3308,8 @@ /turf/simulated/floor/cult, /area/awaymission/shipcave/ship/central) "Hw" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/borosillicate/reinforced, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/airless/ceiling, /area/awaymission/shipcave/ship/bridge) "Hy" = ( @@ -3441,11 +3441,11 @@ /turf/simulated/floor/carpet, /area/awaymission/shipcave/ship) "II" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/awaymission/shipcave/ship/armory) "IM" = ( -/obj/spawner/window/low_wall/full/nogrille, +/obj/spawner/window/low_wall/nogrille, /turf/simulated/floor/plating, /area/awaymission/shipcave/ship/entertainment) "IO" = ( @@ -3883,7 +3883,7 @@ /turf/simulated/floor/flesh, /area/awaymission/shipcave/ship/central) "Od" = ( -/obj/spawner/window/low_wall/full/nogrille, +/obj/spawner/window/low_wall/nogrille, /turf/simulated/floor/flesh, /area/awaymission/shipcave/ship) "Og" = ( @@ -4301,7 +4301,7 @@ /turf/simulated/floor/wood, /area/awaymission/shipcave/ship/bar) "SB" = ( -/obj/spawner/window/low_wall/full/nogrille, +/obj/spawner/window/low_wall/nogrille, /turf/simulated/floor/tiled/steel_dirty, /area/awaymission/shipcave/ship) "SD" = ( @@ -4480,8 +4480,8 @@ /turf/simulated/floor/flesh, /area/awaymission/shipcave/ship/vault) "Ux" = ( -/obj/spawner/window/low_wall/borosillicate/full, -/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/borosillicate, +/obj/map_helper/paint_stripe/violet, /turf/simulated/floor/plating, /area/awaymission/shipcave/ship/hangar) "Uy" = ( diff --git a/maps/tether/engines/rust.dmm b/maps/tether/engines/rust.dmm index c7b6d0cf0a7..eea77cc0330 100644 --- a/maps/tether/engines/rust.dmm +++ b/maps/tether/engines/rust.dmm @@ -105,8 +105,8 @@ /turf/simulated/floor, /area/engineering/engine_room) "ar" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_room) "as" = ( @@ -597,8 +597,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_room) "bN" = ( @@ -705,8 +705,8 @@ opacity = 0; dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_room) "ca" = ( @@ -790,8 +790,8 @@ opacity = 0; dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_room) "cl" = ( diff --git a/maps/tether/engines/sme.dmm b/maps/tether/engines/sme.dmm index 84cd877cfb0..39c8cffa2f7 100644 --- a/maps/tether/engines/sme.dmm +++ b/maps/tether/engines/sme.dmm @@ -756,8 +756,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_room) "bQ" = ( @@ -873,8 +873,8 @@ opacity = 0; dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_room) "cf" = ( @@ -958,8 +958,8 @@ opacity = 0; dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_room) "cq" = ( diff --git a/maps/tether/engines/tesla.dmm b/maps/tether/engines/tesla.dmm index df7ba4fe0b1..1ae4bd6ce57 100644 --- a/maps/tether/engines/tesla.dmm +++ b/maps/tether/engines/tesla.dmm @@ -564,7 +564,7 @@ name = "Reactor Blast Door"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor, /area/submap/pa_room) "be" = ( @@ -739,7 +739,7 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor, /area/submap/pa_room) "bD" = ( @@ -775,7 +775,7 @@ name = "Reactor Blast Door"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor, /area/submap/pa_room) "bG" = ( @@ -830,7 +830,7 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor, /area/submap/pa_room) "bM" = ( @@ -893,7 +893,7 @@ name = "Engine Radiator Viewport Shutter"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor, /area/submap/pa_room) "bQ" = ( @@ -1320,7 +1320,7 @@ name = "Reactor Blast Door"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor, /area/engineering/engine_room) "cF" = ( diff --git a/maps/tether/levels/mining.dmm b/maps/tether/levels/mining.dmm index a3455275a55..7124eee63b9 100644 --- a/maps/tether/levels/mining.dmm +++ b/maps/tether/levels/mining.dmm @@ -26,7 +26,7 @@ /turf/simulated/wall/r_wall/prepainted/cargo, /area/outpost/mining_main/secondary_gear_storage) "bC" = ( -/obj/spawner/window/low_wall/borosillicate/full, +/obj/spawner/window/low_wall/borosillicate, /obj/machinery/door/firedoor/glass{ dir = 4 }, @@ -323,7 +323,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/spawner/window/low_wall/borosillicate/full, +/obj/spawner/window/low_wall/borosillicate, /turf/simulated/floor/plating, /area/outpost/mining_main/break_room) "if" = ( @@ -547,7 +547,7 @@ "ns" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/machinery/door/firedoor/glass, -/obj/spawner/window/low_wall/borosillicate/full, +/obj/spawner/window/low_wall/borosillicate, /turf/simulated/floor/plating, /area/outpost/mining_main/airlock) "nR" = ( @@ -941,7 +941,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, -/obj/spawner/window/low_wall/borosillicate/full, +/obj/spawner/window/low_wall/borosillicate, /turf/simulated/floor/plating, /area/outpost/mining_main/maintenance) "xE" = ( @@ -1192,7 +1192,7 @@ /area/outpost/mining_main/drill_equipment) "DF" = ( /obj/machinery/door/firedoor/glass, -/obj/spawner/window/low_wall/borosillicate/full, +/obj/spawner/window/low_wall/borosillicate, /turf/simulated/floor/plating, /area/outpost/mining_main/break_room) "DO" = ( @@ -1443,7 +1443,7 @@ /obj/machinery/door/firedoor/glass{ dir = 4 }, -/obj/spawner/window/low_wall/borosillicate/full, +/obj/spawner/window/low_wall/borosillicate, /turf/simulated/floor/plating, /area/outpost/mining_main/maintenance) "KZ" = ( @@ -1475,12 +1475,12 @@ /obj/structure/cable/heavyduty{ icon_state = "1-2" }, -/obj/spawner/window/low_wall/borosillicate/full, +/obj/spawner/window/low_wall/borosillicate, /turf/simulated/floor/plating, /area/outpost/mining_main/maintenance) "Mr" = ( /obj/machinery/door/firedoor/glass, -/obj/spawner/window/low_wall/borosillicate/full, +/obj/spawner/window/low_wall/borosillicate, /turf/simulated/floor/plating, /area/outpost/mining_main/maintenance) "MT" = ( @@ -1835,7 +1835,7 @@ /obj/machinery/door/firedoor/glass{ dir = 4 }, -/obj/spawner/window/low_wall/borosillicate/full, +/obj/spawner/window/low_wall/borosillicate, /turf/simulated/floor/plating, /area/outpost/mining_main/break_room) "Wz" = ( @@ -1935,7 +1935,7 @@ /obj/machinery/door/firedoor/glass{ dir = 4 }, -/obj/spawner/window/low_wall/borosillicate/full, +/obj/spawner/window/low_wall/borosillicate, /turf/simulated/floor/plating, /area/outpost/mining_main/secondary_gear_storage) "ZO" = ( diff --git a/maps/tether/levels/station1.dmm b/maps/tether/levels/station1.dmm index a600a885f2c..2b8972ecf78 100644 --- a/maps/tether/levels/station1.dmm +++ b/maps/tether/levels/station1.dmm @@ -1288,8 +1288,8 @@ name = "Secondary Command Office Blast Doors"; opacity = 0 }, -/obj/effect/paint_stripe/commandblue, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/map_helper/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "secondary_bridge"; name = "Secondary Bridge" }, @@ -1501,7 +1501,7 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "cZ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; dir = 2; @@ -1510,7 +1510,7 @@ name = "Secondary Command Office Blast Doors"; opacity = 0 }, -/obj/effect/paint_stripe/commandblue, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/crew_quarters/heads/blueshield) "da" = ( @@ -1743,8 +1743,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor, /area/engineering/atmos/backup) "ds" = ( @@ -2052,8 +2052,8 @@ /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) "dX" = ( -/obj/spawner/window/low_wall/full/firelocks, -/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/firelocks, +/obj/map_helper/paint_stripe/violet, /turf/simulated/floor/plating, /area/tether/exploration/crew) "dY" = ( @@ -2503,8 +2503,8 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_server_room) "eR" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/plating, /area/engineering/gravity_lobby) "eS" = ( @@ -3551,8 +3551,8 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/shield_gen) "hj" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engineering_monitoring) "hk" = ( @@ -3647,8 +3647,8 @@ /turf/simulated/floor/tiled, /area/bridge/secondary) "hr" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_monitoring) "hs" = ( @@ -4549,8 +4549,8 @@ name = "Engine Monitoring Room Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/borosillicate/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/borosillicate/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_monitoring) "js" = ( @@ -5348,7 +5348,7 @@ /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "kQ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/security/customs) "kR" = ( @@ -7471,7 +7471,7 @@ /turf/simulated/wall/rshull, /area/shuttle/medivac/general) "pj" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor, /area/security/customs) "pk" = ( @@ -7485,8 +7485,8 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/bridge/secondary) "pm" = ( @@ -8570,7 +8570,7 @@ /turf/simulated/floor/tiled/dark, /area/bridge/secondary) "ry" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; dir = 2; @@ -8579,7 +8579,7 @@ name = "Secondary Command Office Blast Doors"; opacity = 0 }, -/obj/effect/paint_stripe/commandblue, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/bridge/meeting_room) "rz" = ( @@ -9028,8 +9028,8 @@ /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) "st" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/plating, /area/engineering/engine_airlock) "sv" = ( @@ -9367,7 +9367,7 @@ name = "Shuttle Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/securiship/general) "tf" = ( @@ -9851,7 +9851,7 @@ layer = 4; name = "EXTERNAL AIRLOCK" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/hallway/station/docks) "ul" = ( @@ -9906,8 +9906,8 @@ /turf/simulated/wall/rshull, /area/shuttle/securiship/general) "ut" = ( -/obj/spawner/window/low_wall/full/firelocks, -/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/firelocks, +/obj/map_helper/paint_stripe/violet, /turf/simulated/floor/plating, /area/tether/exploration/staircase) "uu" = ( @@ -10998,8 +10998,8 @@ /turf/simulated/floor/tiled/eris/techmaint_panels, /area/shuttle/securiship/engines) "wM" = ( -/obj/spawner/window/low_wall/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/engineering/shield_gen) "wN" = ( @@ -11201,7 +11201,7 @@ name = "Shuttle Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/securiship/general) "xg" = ( @@ -11365,8 +11365,8 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "xy" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_eva) "xz" = ( @@ -12104,8 +12104,8 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "yT" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/hallway/secondary/escape/medical_escape_pod_hallway) "yV" = ( @@ -12241,8 +12241,8 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_upload) "zl" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/engineering/workshop) "zm" = ( @@ -12440,8 +12440,8 @@ name = "Engineering Lockdown"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor, /area/engineering/atmos/backup) "zG" = ( @@ -12842,8 +12842,8 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "Aw" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engineering_airlock) "Ax" = ( @@ -12857,7 +12857,7 @@ /turf/simulated/floor/plating, /area/storage/emergency_storage/emergency4) "Az" = ( -/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor, /area/hallway/station/docks) "AA" = ( @@ -12894,11 +12894,11 @@ name = "Engineering Lockdown"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "ce_office"; name = "CE Polarized" }, -/obj/effect/paint_stripe/sun, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/crew_quarters/heads/chief) "AF" = ( @@ -13977,8 +13977,8 @@ name = "Secondary Command Office Blast Doors"; opacity = 0 }, -/obj/effect/paint_stripe/commandblue, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/map_helper/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "secondary_bridge"; name = "Secondary Bridge" }, @@ -14390,7 +14390,7 @@ /turf/simulated/floor/tiled, /area/security/customs) "DB" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor, /area/maintenance/station/eng_lower) "DC" = ( @@ -14462,8 +14462,8 @@ name = "Secondary Command Office Blast Doors"; opacity = 0 }, -/obj/effect/paint_stripe/commandblue, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/map_helper/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "secondary_bridge"; name = "Secondary Bridge" }, @@ -14497,7 +14497,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "DK" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -15043,8 +15043,8 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/bridge/secondary) "EL" = ( @@ -15098,7 +15098,7 @@ name = "Shuttle Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/securiship/cockpit) "ES" = ( @@ -15354,8 +15354,8 @@ /turf/simulated/floor/plating, /area/maintenance/station/eng_lower) "Fv" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/engineering/foyer) "Fw" = ( @@ -15820,8 +15820,8 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "Gm" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/engineering/break_room) "Gn" = ( @@ -16116,7 +16116,7 @@ /turf/simulated/floor/tiled, /area/engineering/workshop) "GW" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; @@ -16196,7 +16196,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/spawner/window/low_wall/full/firelocks, +/obj/spawner/window/low_wall/firelocks, /turf/simulated/floor/plating, /area/maintenance/abandonedlibraryconference) "He" = ( @@ -16364,12 +16364,12 @@ name = "Engineering Lockdown"; opacity = 0 }, -/obj/effect/paint_stripe/sun, -/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/map_helper/paint_stripe/sun, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor, /area/engineering/foyer) "Hu" = ( -/obj/spawner/window/low_wall/full/firelocks, +/obj/spawner/window/low_wall/firelocks, /turf/simulated/floor/plating, /area/maintenance/abandonedlibrary) "Hv" = ( @@ -17141,8 +17141,8 @@ /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) "IY" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/violet, /turf/simulated/floor/plating, /area/tether/exploration/hallway) "IZ" = ( @@ -17516,7 +17516,7 @@ /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) "JN" = ( -/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor, /area/hallway/station/atrium) "JO" = ( @@ -17673,8 +17673,8 @@ /turf/simulated/floor, /area/engineering/storage) "Kc" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/violet, /turf/simulated/floor/plating, /area/tether/exploration/staircase) "Kd" = ( @@ -17752,7 +17752,7 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "Ki" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/hallway/station/docks) "Kj" = ( @@ -18318,8 +18318,8 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "Lq" = ( -/obj/effect/paint_stripe/darkred, -/obj/spawner/window/low_wall/full/firelocks, +/obj/map_helper/paint_stripe/darkred, +/obj/spawner/window/low_wall/firelocks, /turf/simulated/floor/plating, /area/security/checkpoint/science) "Lr" = ( @@ -18755,8 +18755,8 @@ name = "Engine Monitoring Room Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/borosillicate/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/borosillicate/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_monitoring) "Ms" = ( @@ -18821,17 +18821,17 @@ /turf/simulated/floor/tiled, /area/bridge/secondary/hallway) "My" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/bridge/secondary) "Mz" = ( /obj/structure/cable/green, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "ce_office"; name = "CE Polarized" }, -/obj/effect/paint_stripe/sun, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/crew_quarters/heads/chief) "MA" = ( @@ -19004,8 +19004,8 @@ /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/shuttle/securiship/engines) "MV" = ( -/obj/effect/paint_stripe/violet, -/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/map_helper/paint_stripe/violet, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/tether/exploration/hallway) "MW" = ( @@ -19531,7 +19531,7 @@ /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) "Of" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/constructionsite) "Og" = ( @@ -19558,7 +19558,7 @@ /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "Oj" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/abandonedlibraryconference) "Ok" = ( @@ -22201,8 +22201,8 @@ /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "Tz" = ( -/obj/effect/paint_stripe/darkred, -/obj/spawner/window/low_wall/full/firelocks, +/obj/map_helper/paint_stripe/darkred, +/obj/spawner/window/low_wall/firelocks, /obj/machinery/suit_storage_unit/medic, /turf/simulated/floor/plating, /area/security/checkpoint/science) @@ -22447,7 +22447,7 @@ /turf/simulated/floor/tiled, /area/security/customs) "TY" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -23414,8 +23414,8 @@ name = "Engineering Lockdown"; opacity = 0 }, -/obj/effect/paint_stripe/sun, -/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/map_helper/paint_stripe/sun, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/engineering/foyer) "VX" = ( @@ -25267,8 +25267,8 @@ name = "Secondary Command Office Blast Doors"; opacity = 0 }, -/obj/effect/paint_stripe/commandblue, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/map_helper/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "secondary_bridge"; name = "Secondary Bridge" }, @@ -25337,8 +25337,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor, /area/engineering/atmos/backup) "ZR" = ( diff --git a/maps/tether/levels/station2.dmm b/maps/tether/levels/station2.dmm index b6e5f3c95b1..ae17f6f1371 100644 --- a/maps/tether/levels/station2.dmm +++ b/maps/tether/levels/station2.dmm @@ -487,8 +487,8 @@ /turf/simulated/floor/tiled/monotile, /area/quartermaster/office) "bb" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/violet, /turf/simulated/floor/plating, /area/tether/exploration) "bc" = ( @@ -603,7 +603,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/spawner/window/low_wall/full/nogrille, +/obj/spawner/window/low_wall/nogrille, /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "bm" = ( @@ -634,7 +634,7 @@ "bq" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor, /area/tether/station/visitorhallway/lounge) "br" = ( @@ -775,7 +775,7 @@ /turf/simulated/floor/tiled, /area/gateway/prep_room) "bE" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "shopdressingroom"; name = "Shop Dressing room" }, @@ -1333,8 +1333,8 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/cockpit) "cK" = ( -/obj/spawner/window/low_wall/full/nogrille, -/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/nogrille, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/belterdock) "cL" = ( @@ -1436,8 +1436,8 @@ /area/gateway) "cV" = ( /obj/structure/disposalpipe/segment, -/obj/effect/paint_stripe/beastybrown, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/map_helper/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/quartermaster/office) "cW" = ( @@ -1468,7 +1468,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/tether/station/visitorhallway/lounge) "cY" = ( @@ -1935,8 +1935,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "eb" = ( @@ -2310,8 +2310,8 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "eK" = ( @@ -2625,8 +2625,8 @@ /area/hallway/station/port) "fo" = ( /obj/structure/disposalpipe/segment, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/office) "fp" = ( @@ -2779,8 +2779,8 @@ /turf/simulated/floor/plating, /area/maintenance/station/cargo) "fJ" = ( -/obj/effect/paint_stripe/beastybrown, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/map_helper/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/quartermaster/office) "fK" = ( @@ -2872,8 +2872,8 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "fU" = ( @@ -3023,19 +3023,19 @@ /area/tether/station/visitorhallway/laundry) "gn" = ( /obj/structure/disposalpipe/segment, -/obj/spawner/window/low_wall/full/nogrille, -/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/nogrille, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/belterdock/gear) "go" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "qm_office"; name = "QM Office" }, -/obj/effect/paint_stripe/beastybrown, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor/tiled, /area/quartermaster/qm) "gp" = ( @@ -3812,8 +3812,8 @@ dir = 2; icon_state = "pipe-c" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/office) "hO" = ( @@ -3844,7 +3844,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/burial) "hR" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tether/station/visitorhallway/lounge) "hS" = ( @@ -3872,7 +3872,7 @@ /turf/simulated/floor/tiled/techfloor, /area/hallway/station/port) "hW" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor, /area/tether/station/visitorhallway/lounge) "hX" = ( @@ -4037,7 +4037,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/starboard) "in" = ( -/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor, /area/hallway/station/port) "io" = ( @@ -4150,8 +4150,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor, /area/quartermaster/storage) "iy" = ( @@ -4434,11 +4434,11 @@ /turf/simulated/floor, /area/maintenance/station/cargo) "ja" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "qm_office"; name = "QM Office" }, -/obj/effect/paint_stripe/beastybrown, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor/tiled, /area/quartermaster/qm) "jb" = ( @@ -5003,7 +5003,7 @@ /turf/simulated/floor/tiled/monotile, /area/quartermaster/office) "kh" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/quartermaster/foyer) "ki" = ( @@ -5340,8 +5340,8 @@ /turf/simulated/floor/tiled, /area/security/customs) "kS" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/office) "kT" = ( @@ -5470,7 +5470,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "le" = ( @@ -5733,8 +5733,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/beastybrown, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -5748,8 +5748,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "lF" = ( @@ -5859,11 +5859,11 @@ /turf/simulated/floor/tiled, /area/engineering/foyer_mezzenine) "lQ" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "pilot_office"; name = "Pilot's office" }, -/obj/effect/paint_stripe/violet, +/obj/map_helper/paint_stripe/violet, /turf/simulated/floor/plating, /area/tether/exploration/pilot_office) "lR" = ( @@ -5989,8 +5989,8 @@ /obj/structure/disposalpipe/sortjunction/untagged/flipped{ dir = 1 }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor, /area/quartermaster/storage) "mf" = ( @@ -6056,8 +6056,8 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "ml" = ( -/obj/spawner/window/low_wall/full/nogrille, -/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/nogrille, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "mm" = ( @@ -6359,8 +6359,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "mR" = ( @@ -6407,8 +6407,8 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "mY" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/beastybrown, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -6483,7 +6483,7 @@ /turf/simulated/floor/tiled/monotile, /area/tether/station/dock_one) "nh" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/excursion/general) "ni" = ( @@ -6840,7 +6840,7 @@ /turf/simulated/floor/tiled, /area/engineering/locker_room) "nV" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) "nW" = ( @@ -7075,8 +7075,8 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock) "os" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor, /area/quartermaster/storage) "ot" = ( @@ -7613,8 +7613,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/spawner/window/low_wall/full/nogrille, -/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/nogrille, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/belterdock/gear) "pD" = ( @@ -7625,8 +7625,8 @@ /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "pE" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/violet, /turf/simulated/floor/plating, /area/quartermaster/storage) "pF" = ( @@ -7960,8 +7960,8 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "qj" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/palebottlegreen, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/palebottlegreen, /turf/simulated/floor, /area/chapel/main) "qk" = ( @@ -8023,7 +8023,7 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/cargo) "qp" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "qq" = ( @@ -8822,7 +8822,7 @@ "rT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "shopdressingroom"; name = "Shop Dressing room" }, @@ -8904,8 +8904,8 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/public_meeting_room) "sc" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/belterdock) "sd" = ( @@ -9705,7 +9705,7 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "tI" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor, /area/maintenance/station/cargo) "tJ" = ( @@ -10269,8 +10269,8 @@ /turf/simulated/floor/plating, /area/quartermaster/belterdock) "uL" = ( -/obj/spawner/window/low_wall/full/firelocks/nogrille, -/obj/effect/paint_stripe/palebottlegreen, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/palebottlegreen, /turf/simulated/floor/plating, /area/tether/station/public_meeting_room) "uM" = ( @@ -10330,8 +10330,8 @@ /area/hallway/station/starboard) "uR" = ( /obj/structure/disposalpipe/segment, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor/tiled, /area/quartermaster/office) "uS" = ( @@ -10595,8 +10595,8 @@ name = "Engineering Lockdown"; opacity = 0 }, -/obj/spawner/window/low_wall/full/firelocks/nogrille, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/plating, /area/engineering/foyer_mezzenine) "vt" = ( @@ -10844,7 +10844,7 @@ /area/hallway/station/port) "vR" = ( /obj/structure/disposalpipe/segment, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) "vS" = ( @@ -11015,7 +11015,7 @@ /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "wi" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/vacant/vacant_restaurant_upper) "wj" = ( @@ -11541,7 +11541,7 @@ /turf/simulated/floor/tiled, /area/gateway/prep_room) "xj" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "visitor_meeting"; name = "Visitor Meeting Room" }, @@ -11833,8 +11833,8 @@ icon_state = "0-2" }, /obj/structure/cable/green, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "xS" = ( @@ -12316,8 +12316,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "yP" = ( @@ -12591,8 +12591,8 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "zr" = ( @@ -12987,7 +12987,7 @@ layer = 4; name = "EXTERNAL AIRLOCK" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tether/station/dock_one) "Am" = ( @@ -13107,11 +13107,11 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/cargo) "AC" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "chapel"; name = "Chaplain Office" }, -/obj/effect/paint_stripe/palebottlegreen, +/obj/map_helper/paint_stripe/palebottlegreen, /turf/simulated/floor, /area/chapel/office) "AD" = ( @@ -13535,7 +13535,7 @@ name = "Shuttle Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/excursion/general) "Bv" = ( @@ -14316,8 +14316,8 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "CV" = ( @@ -14351,8 +14351,8 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "CY" = ( @@ -14926,7 +14926,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor, /area/tether/station/visitorhallway/lounge) "Ek" = ( @@ -15048,8 +15048,8 @@ icon_state = "0-2" }, /obj/structure/cable/green, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "Ex" = ( @@ -15245,7 +15245,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/excursion/general) "EO" = ( @@ -15529,8 +15529,8 @@ /turf/simulated/floor/plating, /area/quartermaster/storage) "Fr" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/customs) "Fs" = ( @@ -15985,9 +15985,9 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/public_meeting_room) "Gy" = ( -/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/spawner/window/low_wall/nogrille/firelocks, /obj/structure/curtain/black, -/obj/effect/paint_stripe/palebottlegreen, +/obj/map_helper/paint_stripe/palebottlegreen, /turf/simulated/floor, /area/chapel/main) "Gz" = ( @@ -16871,12 +16871,12 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "Ij" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/excursion/cockpit) "Ik" = ( @@ -16995,8 +16995,8 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "IB" = ( @@ -17596,7 +17596,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/chapel/office) "JQ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tether/station/dock_one) "JR" = ( @@ -17841,7 +17841,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor, /area/tether/station/visitorhallway/lounge) "Ko" = ( @@ -18194,8 +18194,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "Ld" = ( @@ -19164,8 +19164,8 @@ layer = 4; name = "EXTERNAL AIRLOCK" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/storage) "MW" = ( @@ -20155,7 +20155,7 @@ name = "Shuttle Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/excursion/general) "OX" = ( @@ -20660,11 +20660,11 @@ /turf/simulated/shuttle/floor/voidcraft, /area/shuttle/belter) "PY" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "pathfinder_office"; name = "Pathfinder's Office" }, -/obj/effect/paint_stripe/violet, +/obj/map_helper/paint_stripe/violet, /turf/simulated/floor/plating, /area/tether/exploration/pathfinder_office) "PZ" = ( @@ -20937,7 +20937,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) "QC" = ( -/obj/spawner/window/low_wall/reinforced/tinted/full, +/obj/spawner/window/low_wall/reinforced/tinted, /turf/simulated/floor, /area/chapel/main) "QD" = ( @@ -20962,7 +20962,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor, /area/tether/station/visitorhallway/lounge) "QG" = ( @@ -21504,11 +21504,11 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "qm_office"; name = "QM Office" }, -/obj/effect/paint_stripe/beastybrown, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/qm) "RN" = ( @@ -21928,8 +21928,8 @@ /area/quartermaster/belterdock) "SN" = ( /obj/structure/cable/green, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "SO" = ( @@ -22038,8 +22038,8 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "Ta" = ( -/obj/spawner/window/low_wall/full/nogrille, -/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/nogrille, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/belterdock/gear) "Tb" = ( @@ -22121,7 +22121,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/burial) "Ti" = ( -/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/hallway/station/port) "Tj" = ( @@ -22156,8 +22156,8 @@ /turf/simulated/floor/wood, /area/tether/station/burial) "Tm" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/palebottlegreen, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/palebottlegreen, /turf/simulated/floor, /area/tether/station/burial) "Tn" = ( @@ -22369,11 +22369,11 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "TD" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "qm_office"; name = "QM Office" }, -/obj/effect/paint_stripe/beastybrown, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/qm) "TE" = ( @@ -22842,8 +22842,8 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "Uz" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/storage) "UA" = ( @@ -23335,8 +23335,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "VD" = ( @@ -24287,8 +24287,8 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) "Xp" = ( -/obj/spawner/window/low_wall/full/nogrille, -/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/nogrille, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/storage) "Xq" = ( @@ -24636,7 +24636,7 @@ /turf/simulated/floor/wood, /area/quartermaster/qm) "Yc" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/tether/station/visitorhallway/lounge) "Yd" = ( @@ -25350,12 +25350,12 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "Zz" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/hallway/station/starboard) "ZA" = ( -/obj/spawner/window/low_wall/full/nogrille, -/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/nogrille, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "ZB" = ( diff --git a/maps/tether/levels/surface1.dmm b/maps/tether/levels/surface1.dmm index e11ed36a88e..1af01c2f2fc 100644 --- a/maps/tether/levels/surface1.dmm +++ b/maps/tether/levels/surface1.dmm @@ -188,8 +188,8 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "aga" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/mixing) "agi" = ( @@ -431,8 +431,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "amv" = ( @@ -483,15 +483,15 @@ /area/rnd/hallway) "anu" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/heating) "aob" = ( /obj/structure/curtain/black{ icon_state = "open" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/visitor_dining) "aoc" = ( @@ -3499,8 +3499,8 @@ name = "Atmospherics Lockdown"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "bRr" = ( @@ -3640,11 +3640,11 @@ /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/cave) "bWi" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "psych_office_inside"; name = "Psych Office - Inside" }, -/obj/effect/paint_stripe/babyblue, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/mentalhealth) "bWA" = ( @@ -3849,8 +3849,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) "cbm" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/testingroom) "cbt" = ( @@ -5157,8 +5157,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "cHI" = ( -/obj/spawner/window/low_wall/full/firelocks/nogrille, -/obj/effect/paint_stripe/babyblue, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/mentalhealth) "cHP" = ( @@ -5263,7 +5263,7 @@ /obj/structure/cable/heavyduty{ icon_state = "4-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/virgo3b, /area/tether/outpost/solars_shed) "cKB" = ( @@ -6518,7 +6518,7 @@ /obj/structure/curtain/black{ icon_state = "open" }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/visitor_dining) "dsp" = ( @@ -6994,8 +6994,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "dFS" = ( @@ -7363,7 +7363,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "dRq" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/storage/art) "dRA" = ( @@ -7550,7 +7550,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "dWg" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/vacant/vacant_bar) "dWq" = ( @@ -8306,7 +8306,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/paramed) "era" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/storage/primary) "erh" = ( @@ -8890,8 +8890,8 @@ /obj/machinery/atmospherics/pipe/manifold/visible/blue{ dir = 1 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/mixing) "eMc" = ( @@ -8915,8 +8915,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) "eMp" = ( -/obj/spawner/window/low_wall/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "eMB" = ( @@ -9173,7 +9173,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "eXH" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /obj/structure/curtain/black, /turf/simulated/floor/plating, /area/crew_quarters/visitor_dining) @@ -11216,8 +11216,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 9 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/heating) "fTY" = ( @@ -11731,7 +11731,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) "ggL" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/visitor_laundry) "ggR" = ( @@ -12241,8 +12241,8 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/tether/surfacebase/security/brig) "gsy" = ( @@ -12365,8 +12365,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/blue{ dir = 9 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/mixing) "gwy" = ( @@ -12677,11 +12677,11 @@ opacity = 0; open_layer = 1 }, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "psych_office"; name = "Psych Office" }, -/obj/effect/paint_stripe/babyblue, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/mentalhealth) "gEn" = ( @@ -12996,8 +12996,8 @@ name = "Atmospherics Lockdown"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "gLq" = ( @@ -13329,8 +13329,8 @@ /area/rnd/outpost/xenoarch_storage) "gUt" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/anomaly_lab/testing) "gVu" = ( @@ -13352,7 +13352,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/lower/atmos) "gVG" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/funny/hideyhole) "gVJ" = ( @@ -13807,8 +13807,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "hna" = ( @@ -13924,7 +13924,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "hpc" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/first_aid_west) "hpi" = ( @@ -14262,7 +14262,7 @@ /obj/structure/cable/heavyduty{ icon_state = "1-2" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "hyj" = ( @@ -14850,7 +14850,7 @@ /obj/structure/cable/heavyduty{ icon_state = "1-2" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "hNG" = ( @@ -15497,7 +15497,7 @@ /obj/structure/curtain/black{ icon_state = "open" }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/tram) "ifV" = ( @@ -15676,7 +15676,7 @@ /area/crew_quarters/locker) "ikl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/virgo3b, /area/tether/surfacebase/outside/outside1) "ikn" = ( @@ -16237,8 +16237,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "izA" = ( @@ -17480,8 +17480,8 @@ /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "jih" = ( -/obj/spawner/window/low_wall/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, @@ -17542,8 +17542,8 @@ id = "gogogo"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/testingroom) "jmr" = ( @@ -19853,7 +19853,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost) "kCc" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/outside/outside1) "kCg" = ( @@ -20651,8 +20651,8 @@ id = "gogogo"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/testingroom) "kWC" = ( @@ -20776,8 +20776,8 @@ /turf/simulated/floor/tiled, /area/storage/primary) "kXZ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/anomaly_lab/analysis) "kYi" = ( @@ -21000,8 +21000,8 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "lea" = ( -/obj/spawner/window/low_wall/full/firelocks/nogrille, -/obj/effect/paint_stripe/babyblue, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/medical/virology) "lfc" = ( @@ -22012,8 +22012,8 @@ "lHD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/warning/corner, -/obj/spawner/window/low_wall/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/anomaly_lab) "lHE" = ( @@ -22216,7 +22216,7 @@ /area/engineering/atmos) "lPI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "lPP" = ( @@ -22820,8 +22820,8 @@ /obj/machinery/atmospherics/pipe/simple/insulated{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/heating) "mfX" = ( @@ -22936,7 +22936,7 @@ id = "surfcargooffice"; name = "Cargo Office Shutters" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/cargostore/office) "miK" = ( @@ -23082,7 +23082,7 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor, /area/tether/surfacebase/security/brig) "moy" = ( @@ -23136,8 +23136,8 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/tether/surfacebase/security/brig) "mpa" = ( @@ -24282,8 +24282,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 6 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/heating) "mQq" = ( @@ -24403,8 +24403,8 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/processing) "mUT" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost) "mVl" = ( @@ -24575,7 +24575,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/mixing) "mYB" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/virgo3b, /area/tether/outpost/solars_shed) "mYG" = ( @@ -25005,8 +25005,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/atmos) "nmF" = ( @@ -25160,8 +25160,8 @@ /obj/structure/cable/heavyduty{ icon_state = "4-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor, /area/maintenance/substation/outpost) "nsA" = ( @@ -25688,8 +25688,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/anomaly_lab/testing) "nIl" = ( @@ -25811,7 +25811,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "nLH" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/virgo3b, /area/tether/surfacebase/outside/outside1) "nLT" = ( @@ -26112,7 +26112,7 @@ /area/tether/surfacebase/surface_one_hall) "nUU" = ( /obj/structure/disposalpipe/segment, -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/locker/laundry_arrival) "nVv" = ( @@ -26221,7 +26221,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "nYQ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/firelocks{ id = "holodeck"; name = "holodeck" }, @@ -26410,7 +26410,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhall) "ofa" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/locker/laundry_arrival) "ofq" = ( @@ -26937,7 +26937,7 @@ /obj/structure/cable/heavyduty{ icon_state = "4-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "oxa" = ( @@ -27148,7 +27148,7 @@ layer = 3.1; name = "Cafe Shutters" }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/visitor_dining) "oEs" = ( @@ -29369,7 +29369,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) "pMb" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/firelocks{ id = "holodeck"; name = "holodeck" }, @@ -29383,7 +29383,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/virgo3b, /area/tether/surfacebase/outside/outside1) "pMr" = ( @@ -29699,8 +29699,8 @@ name = "Atmospherics Lockdown"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "pXd" = ( @@ -29914,7 +29914,7 @@ /turf/unsimulated/wall/mineral, /area/tether/surfacebase/outside/outside1) "qbk" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "qbr" = ( @@ -29969,8 +29969,8 @@ "qdo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/testingroom) "qdD" = ( @@ -30800,7 +30800,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/virgo3b, /area/tether/outpost/solars_shed) "qBh" = ( @@ -30971,8 +30971,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "qEE" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/heating) "qEX" = ( @@ -31468,8 +31468,8 @@ name = "Atmospherics Lockdown"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "qRz" = ( @@ -31916,7 +31916,7 @@ /obj/structure/curtain/black{ icon_state = "open" }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/surface_one_hall) "rcP" = ( @@ -32111,8 +32111,8 @@ /turf/simulated/floor/tiled/techmaint, /area/holodeck_control) "rfX" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/tiled, /area/rnd/outpost/breakroom) "rga" = ( @@ -34654,7 +34654,7 @@ /area/rnd/outpost/eva) "swU" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/virgo3b, /area/tether/surfacebase/outside/outside1) "sxr" = ( @@ -35106,8 +35106,8 @@ name = "Atmospherics Lockdown"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "sNn" = ( @@ -35304,7 +35304,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/first_aid_west) "sTk" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/security/checkpoint) "sTA" = ( @@ -35457,7 +35457,7 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/anomaly_lab/testing) "sWV" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/tram) "sXj" = ( @@ -35686,7 +35686,7 @@ /area/tether/surfacebase/security/weaponsrange) "tbR" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/asmaint2) "tcX" = ( @@ -36189,7 +36189,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "txw" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/storage/surface_eva) "txJ" = ( @@ -36626,7 +36626,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "tJK" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/security/checkpoint) "tJP" = ( @@ -36977,8 +36977,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/maintDorm2) "tSO" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/anomaly_lab/testing) "tTq" = ( @@ -37509,8 +37509,8 @@ name = "Atmospherics Lockdown"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "ugW" = ( @@ -37758,7 +37758,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) "upn" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/funny/mimeoffice) "upD" = ( @@ -38131,7 +38131,7 @@ name = "Cargo Office Shutters" }, /obj/structure/disposalpipe/segment, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/cargostore/office) "uBk" = ( @@ -38752,7 +38752,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/storage/surface_eva) "uWT" = ( @@ -39827,7 +39827,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "vyR" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/visitor_laundry) "vze" = ( @@ -40370,8 +40370,8 @@ opacity = 0; open_layer = 1 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/paramed) "vJq" = ( @@ -40481,8 +40481,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/heating) "vMn" = ( @@ -42171,8 +42171,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "wFa" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "wFz" = ( @@ -42200,7 +42200,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost) "wGb" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/hallway/lower/first_west) "wGo" = ( @@ -43024,7 +43024,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/maintDorm1) "xcL" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/tether/surfacebase/old_tram) "xcR" = ( @@ -44516,8 +44516,8 @@ id = "gogogo"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/testingroom) "xYJ" = ( @@ -44642,8 +44642,8 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "yfm" = ( diff --git a/maps/tether/levels/surface2.dmm b/maps/tether/levels/surface2.dmm index 98037017a26..214c2b6c58c 100644 --- a/maps/tether/levels/surface2.dmm +++ b/maps/tether/levels/surface2.dmm @@ -297,11 +297,11 @@ opacity = 0; open_layer = 1 }, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "patient_room_c"; name = "Patient C" }, -/obj/effect/paint_stripe/babyblue, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/patient_c) "alM" = ( @@ -554,8 +554,8 @@ name = "Pen 3 Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "axi" = ( @@ -1170,8 +1170,8 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/lower/south) "aUn" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcomfoyer) "aUw" = ( @@ -1573,8 +1573,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcommsat/chamber) "bhv" = ( @@ -2424,8 +2424,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcomsat) "bNP" = ( @@ -2955,8 +2955,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "cgz" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_slimepens) "cha" = ( @@ -3706,8 +3706,8 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "cGM" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/palebottlegreen, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/palebottlegreen, /turf/simulated/floor/plating, /area/tether/surfacebase/reading_room) "cGZ" = ( @@ -4956,8 +4956,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 6 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcommsat/chamber) "dHL" = ( @@ -5111,11 +5111,11 @@ /area/maintenance/substation/research) "dOp" = ( /obj/structure/cable/green, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "rd_office"; name = "RD Office" }, -/obj/effect/paint_stripe/purplegray, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/rdoffice) "dOK" = ( @@ -5221,8 +5221,8 @@ name = "Pen 10 Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "dRT" = ( @@ -5715,11 +5715,11 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) "ejq" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "meetingroom"; name = "Command Meeting" }, -/obj/effect/paint_stripe/commandblue, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor, /area/bridge/meeting_room) "ejF" = ( @@ -6203,11 +6203,11 @@ opacity = 0; open_layer = 1 }, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "patient_room_a"; name = "Patient A" }, -/obj/effect/paint_stripe/babyblue, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/patient_a) "eCL" = ( @@ -6579,7 +6579,7 @@ /turf/simulated/mineral, /area/tether/surfacebase/reading_room) "eQV" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/readingrooms) "eQW" = ( @@ -6877,8 +6877,8 @@ name = "Pen 10 Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "fbh" = ( @@ -7102,8 +7102,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 10 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcommsat/chamber) "fiE" = ( @@ -7666,8 +7666,8 @@ opacity = 0; open_layer = 1 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/centralhall) "fHS" = ( @@ -7766,8 +7766,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/tether/surfacebase/security/outfitting) "fKC" = ( @@ -8910,7 +8910,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "gvx" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "cmo_office"; name = "CMO office" }, @@ -9238,7 +9238,7 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/medical/cmo) "gCr" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/south) "gDl" = ( @@ -9699,8 +9699,8 @@ name = "Pen 9 Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "gVC" = ( @@ -10153,8 +10153,8 @@ name = "Pen 1 Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "hou" = ( @@ -10210,8 +10210,8 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/interrogation) "hqD" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/lower/atmos_eva) "hrp" = ( @@ -10421,11 +10421,11 @@ opacity = 0; open_layer = 1 }, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "patient_room_b"; name = "Patient B" }, -/obj/effect/paint_stripe/babyblue, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/patient_b) "hBh" = ( @@ -12076,8 +12076,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "iER" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "iFh" = ( @@ -12398,8 +12398,8 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/tiled, /area/engineering/lower/breakroom) "iOU" = ( @@ -12523,11 +12523,11 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "wardenwindows"; name = "Wardens Office" }, -/obj/effect/paint_stripe/darkred, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor, /area/tether/surfacebase/security/warden) "iTY" = ( @@ -13274,8 +13274,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "jxG" = ( @@ -13418,8 +13418,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/patient_b) "jCm" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/monitoring) "jCp" = ( @@ -13715,16 +13715,16 @@ opacity = 0; open_layer = 1 }, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "surfresleeving"; name = "Resleeving" }, -/obj/effect/paint_stripe/babyblue, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/resleeving) "jQW" = ( -/obj/spawner/window/low_wall/full/firelocks/nogrille, -/obj/effect/paint_stripe/babyblue, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/uppersouthstairwell) "jRi" = ( @@ -14507,8 +14507,8 @@ /turf/simulated/floor/tiled, /area/janitor) "kxn" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "kxY" = ( @@ -14932,8 +14932,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "kQk" = ( @@ -15168,8 +15168,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "lab" = ( -/obj/spawner/window/low_wall/full/firelocks, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/firelocks, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/tether/surfacebase/security/middlehall) "laj" = ( @@ -15460,11 +15460,11 @@ /turf/simulated/floor/tiled/dark, /area/engineering/lower/breakroom) "lmg" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "wardenwindows"; name = "Wardens Office" }, -/obj/effect/paint_stripe/darkred, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor, /area/tether/surfacebase/security/warden) "lnG" = ( @@ -16810,8 +16810,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcommsat/chamber) "mqc" = ( @@ -17018,8 +17018,8 @@ name = "Pen 5 Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "mwG" = ( @@ -17366,8 +17366,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "mKS" = ( @@ -18201,11 +18201,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) "nns" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "patient_room_c"; name = "Patient C" }, -/obj/effect/paint_stripe/babyblue, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/patient_c) "nnL" = ( @@ -18738,8 +18738,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "nGx" = ( -/obj/spawner/window/low_wall/full/firelocks/nogrille, -/obj/effect/paint_stripe/babyblue, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/breakroom) "nHa" = ( @@ -19047,8 +19047,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "nSI" = ( @@ -19462,8 +19462,8 @@ icon_state = "0-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/black, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcommsat/chamber) "ogv" = ( @@ -20494,8 +20494,8 @@ /turf/simulated/open, /area/engineering/atmos) "oXE" = ( -/obj/spawner/window/low_wall/borosillicate/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/borosillicate/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "oXK" = ( @@ -20912,8 +20912,8 @@ name = "Pen 6 Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "ppL" = ( @@ -20961,11 +20961,11 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting) "pqX" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "exam_room"; name = "Exam Room Medical" }, -/obj/effect/paint_stripe/babyblue, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/examroom) "prH" = ( @@ -21204,8 +21204,8 @@ name = "Pen 2 Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "pBO" = ( @@ -21251,8 +21251,8 @@ /area/maintenance/substation/command) "pCi" = ( /obj/structure/cable/green, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcomsat) "pCm" = ( @@ -21287,8 +21287,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "pEd" = ( @@ -21580,8 +21580,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "pQm" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/palebottlegreen, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/palebottlegreen, /turf/simulated/floor/plating, /area/tether/surfacebase/southhall) "pQr" = ( @@ -21889,8 +21889,8 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "qbU" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor, /area/tether/surfacebase/security/outfitting) "qbX" = ( @@ -22060,8 +22060,8 @@ name = "Pen 8 Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "qiO" = ( @@ -22834,8 +22834,8 @@ icon_state = "16-0" }, /obj/structure/disposalpipe/up, -/obj/spawner/window/low_wall/borosillicate/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/borosillicate/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "qNV" = ( @@ -23145,8 +23145,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "rcx" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/drone_fabrication) "rdr" = ( @@ -23365,8 +23365,8 @@ /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officeb) "rja" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/lower/breakroom) "rke" = ( @@ -24555,8 +24555,8 @@ name = "Pen 9 Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "sfQ" = ( @@ -24771,8 +24771,8 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "smB" = ( @@ -25749,11 +25749,11 @@ /turf/simulated/wall/prepainted, /area/tether/surfacebase/public_garden_two) "sRE" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "cmo_office"; name = "CMO office" }, -/obj/effect/paint_stripe/babyblue, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/cmo) "sRN" = ( @@ -26213,11 +26213,11 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining) "tlq" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "ward_tint"; name = "medical Ward" }, -/obj/effect/paint_stripe/babyblue, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/recoveryward) "tlP" = ( @@ -26499,11 +26499,11 @@ opacity = 0; open_layer = 1 }, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "cmo_office"; name = "CMO office" }, -/obj/effect/paint_stripe/babyblue, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/cmo) "tzY" = ( @@ -26545,8 +26545,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "tBD" = ( @@ -26674,8 +26674,8 @@ name = "Atmospherics Lockdown"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/lower/lobby) "tLQ" = ( @@ -26828,8 +26828,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "tTr" = ( @@ -27005,8 +27005,8 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting/storage) "udd" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "udj" = ( @@ -27300,7 +27300,7 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "upb" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/bar) "upu" = ( @@ -27566,7 +27566,7 @@ /turf/simulated/shuttle/floor/voidcraft, /area/tether/surfacebase/old_shelter) "uBL" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/asmaint2) "uBU" = ( @@ -29677,11 +29677,11 @@ /turf/simulated/wall/r_wall/prepainted, /area/tether/surfacebase/emergency_storage/atmos) "wbn" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "patient_room_a"; name = "Patient A" }, -/obj/effect/paint_stripe/babyblue, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/patient_a) "wbx" = ( @@ -30721,8 +30721,8 @@ name = "Pen 4 Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "wLH" = ( @@ -31340,8 +31340,8 @@ name = "Pen 7 Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "xlT" = ( @@ -31487,11 +31487,11 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "wardenwindows"; name = "Wardens Office" }, -/obj/effect/paint_stripe/darkred, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor, /area/tether/surfacebase/security/warden) "xqf" = ( @@ -31600,8 +31600,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/detective) "xtk" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/rdoffice) "xtn" = ( @@ -31918,11 +31918,11 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/surface_two_hall) "xIu" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "surfresleeving"; name = "Resleeving" }, -/obj/effect/paint_stripe/babyblue, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/resleeving) "xIB" = ( @@ -32410,8 +32410,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor, /area/tether/surfacebase/security/detective) "xYr" = ( @@ -32445,7 +32445,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/monitoring) "xZX" = ( -/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor, /area/maintenance/lower/south) "yam" = ( @@ -32457,7 +32457,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "yas" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "yat" = ( @@ -32514,8 +32514,8 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "ydd" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/lower/atmos_lockers) "ydu" = ( @@ -32631,11 +32631,11 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "yge" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "patient_room_b"; name = "Patient B" }, -/obj/effect/paint_stripe/babyblue, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/patient_b) "ygw" = ( @@ -32722,8 +32722,8 @@ /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/medical/morgue) "ykZ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/lower/lobby) "yli" = ( diff --git a/maps/tether/levels/surface3.dmm b/maps/tether/levels/surface3.dmm index 576b7b248c6..d21deefa255 100644 --- a/maps/tether/levels/surface3.dmm +++ b/maps/tether/levels/surface3.dmm @@ -239,11 +239,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "adV" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "surfsurgery2"; name = "surfsurgery2" }, -/obj/effect/paint_stripe/babyblue, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/surgery2) "ael" = ( @@ -939,7 +939,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/bar_backroom) "awl" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -1658,7 +1658,7 @@ /turf/simulated/floor/plating, /area/rnd/research_storage) "aPp" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/rnd/research_storage) "aQm" = ( @@ -1874,7 +1874,7 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "aVN" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/hallway/primary/port) "aVY" = ( @@ -2715,13 +2715,13 @@ /turf/simulated/floor/grass, /area/hydroponics) "bto" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) "bua" = ( /obj/structure/sign/department/bar, -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint_stripe/bottlegreen, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/bar) "buF" = ( @@ -3088,7 +3088,7 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/lobby) "bEO" = ( @@ -3481,13 +3481,13 @@ id = "DRAMATIC"; name = "Dramatic Blast Door" }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /obj/machinery/door/blast/shutters{ dir = 2; id = "Druma"; name = "Entertainment Shutters" }, -/obj/effect/paint_stripe/bottlegreen, +/obj/map_helper/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/tether/surfacebase/entertainment) "bRo" = ( @@ -4019,8 +4019,8 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint_stripe/bottlegreen, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/bar) "chg" = ( @@ -4125,8 +4125,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "cjB" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/robotics) "ckf" = ( @@ -4370,7 +4370,7 @@ id = "DRAMATIC"; name = "Dramatic Blast Door" }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /obj/machinery/door/blast/shutters{ dir = 4; id = "Druma"; @@ -5032,8 +5032,8 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "cKJ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_office) "cLd" = ( @@ -5377,8 +5377,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint_stripe/babyblue, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/storage) "daa" = ( @@ -5423,8 +5423,8 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "dbs" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint_stripe/babyblue, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/chemistry) "dbu" = ( @@ -6369,8 +6369,8 @@ name = "Freezer Shutters"; opacity = 0 }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint_stripe/bottlegreen, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/freezer) "dEh" = ( @@ -7148,8 +7148,8 @@ /turf/simulated/floor/tiled, /area/teleporter/departing) "eet" = ( -/obj/effect/paint_stripe/babyblue, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/map_helper/paint_stripe/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/storage) "eez" = ( @@ -7280,7 +7280,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_north_airlock) "eiE" = ( @@ -7721,8 +7721,8 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "evK" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) @@ -8279,8 +8279,8 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_main) "eMY" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) "eNU" = ( @@ -8364,7 +8364,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "hos_office"; name = "hos_office" }, @@ -8608,8 +8608,8 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/bridge) "eVl" = ( @@ -9340,8 +9340,8 @@ /turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/admin) "fyE" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint_stripe/bottlegreen, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/library) "fyM" = ( @@ -9490,8 +9490,8 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "fDu" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/bottlegreen, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/tether/surfacebase/servicebackroom) "fDw" = ( @@ -9617,11 +9617,11 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "fGn" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/pool) "fGZ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/shuttle_pad) "fHk" = ( @@ -10095,7 +10095,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/shuttle_pad) "fQS" = ( @@ -10291,7 +10291,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "fXg" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "robo_resleeving"; name = "robo_resleeving" }, @@ -11349,8 +11349,8 @@ /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) "gGi" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/uppernorthstairwell) "gGG" = ( @@ -11503,7 +11503,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "gMY" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -11817,7 +11817,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) "gXO" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor, /area/tether/surfacebase/security/briefingroom) "gXX" = ( @@ -12255,7 +12255,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/topairlock) "hoE" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/briefingroom) "hpn" = ( @@ -12707,8 +12707,8 @@ /area/tether/surfacebase/north_stairs_three) "hGm" = ( /obj/structure/sign/botany, -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint_stripe/bottlegreen, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/hydroponics) "hGp" = ( @@ -13218,8 +13218,8 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "hXb" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) @@ -13305,8 +13305,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "ibh" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint_stripe/bottlegreen, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/bar) "ibj" = ( @@ -13404,7 +13404,7 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/lobby) "idX" = ( @@ -14181,8 +14181,8 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "izr" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_storage) "iBt" = ( @@ -14354,8 +14354,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "iFF" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_north_airlock) "iGh" = ( @@ -14548,7 +14548,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "iLn" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/breakroom) "iLJ" = ( @@ -14849,7 +14849,7 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/upperhall) "iTu" = ( @@ -15042,8 +15042,8 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/bridge) "iWM" = ( @@ -15086,8 +15086,8 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "iXC" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/workshop) "iXH" = ( @@ -15195,8 +15195,8 @@ /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "jdA" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora) "jdP" = ( @@ -15371,7 +15371,7 @@ /turf/simulated/open, /area/tether/surfacebase/surface_three_hall) "jiE" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -15752,7 +15752,7 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "hos_office"; name = "hos_office" }, @@ -16424,8 +16424,8 @@ /turf/simulated/floor/tiled, /area/hallway/primary/fore) "jQd" = ( -/obj/effect/paint_stripe/bottlegreen, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/map_helper/paint_stripe/bottlegreen, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/botanystorage) "jQZ" = ( @@ -16511,7 +16511,7 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside3) "jUo" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/recreation_area) "jUv" = ( @@ -17015,7 +17015,7 @@ /turf/simulated/floor/tiled/eris/white/orangecorner, /area/shuttle/tourbus/cockpit) "kmR" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/iaa) "knh" = ( @@ -17078,8 +17078,8 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "koV" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/tether/surfacebase/surface_three_hall) "kpb" = ( @@ -17222,8 +17222,8 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/bridge) "ksc" = ( @@ -18619,8 +18619,8 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "lqG" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/babyblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/storage) "lqQ" = ( @@ -18675,8 +18675,8 @@ opacity = 0; open_layer = 1 }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint_stripe/babyblue, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/lobby) "lsK" = ( @@ -19350,8 +19350,8 @@ layer = 3.1; name = "Colony Directo's Shutters" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/crew_quarters/captain) "lMF" = ( @@ -19468,7 +19468,7 @@ /area/tether/surfacebase/surface_three_hall) "lSR" = ( /obj/structure/disposalpipe/segment, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/hallway/primary/port) "lTa" = ( @@ -19993,8 +19993,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "mit" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/research/researchdivision) "miz" = ( @@ -20168,11 +20168,11 @@ /turf/simulated/floor/water/pool, /area/triumph/surfacebase/sauna) "mmL" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "secreet"; name = "Game Room" }, -/obj/effect/paint_stripe/bottlegreen, +/obj/map_helper/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/tether/surfacebase/barbackmaintenance) "mnm" = ( @@ -20699,8 +20699,8 @@ layer = 3.1; name = "Colony Directo's Shutters" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/crew_quarters/captain) "mFM" = ( @@ -20871,8 +20871,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_first_aid) "mKy" = ( @@ -21362,7 +21362,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) "mYh" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/hallway/lower/third_south) "mYz" = ( @@ -21448,8 +21448,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/research) "nbe" = ( @@ -21830,7 +21830,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "nno" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/pool) "nnu" = ( @@ -22063,8 +22063,8 @@ /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "nsR" = ( -/obj/spawner/window/low_wall/reinforced/tinted/full/firelocks, -/obj/effect/paint_stripe/bottlegreen, +/obj/spawner/window/low_wall/reinforced/tinted/firelocks, +/obj/map_helper/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/bar) "ntb" = ( @@ -22248,8 +22248,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "nyb" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint_stripe/bottlegreen, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/bottlegreen, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -22413,7 +22413,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_north_airlock) "nCP" = ( @@ -22445,8 +22445,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "nDe" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint_stripe/bottlegreen, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/hydroponics) "nEA" = ( @@ -22549,8 +22549,8 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "nGW" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora) "nHh" = ( @@ -23098,7 +23098,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) "nUF" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/public_garden_three) "nUU" = ( @@ -23562,7 +23562,7 @@ /turf/simulated/floor/tiled, /area/rnd/research) "ois" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/southhall) "oiU" = ( @@ -23578,7 +23578,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "ojn" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "iaar"; name = "iaar" }, @@ -23668,7 +23668,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "okC" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/cafeteria) "okS" = ( @@ -23768,7 +23768,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "onk" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/iaa/officecommon) "ono" = ( @@ -23894,8 +23894,8 @@ /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/stage) "orl" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_breakroom) "orE" = ( @@ -25493,8 +25493,8 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/bridge) "pjN" = ( @@ -26049,8 +26049,8 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/crew_quarters/captain) "pAH" = ( @@ -26209,8 +26209,8 @@ /turf/simulated/open, /area/tether/surfacebase/surface_three_hall) "pDC" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 9 }, @@ -26511,7 +26511,7 @@ /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) "pNf" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_hallway) "pNh" = ( @@ -27140,7 +27140,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) "qgL" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_first_aid) "qhk" = ( @@ -27395,7 +27395,7 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "sec_processing"; name = "sec_processing" }, @@ -28668,7 +28668,7 @@ /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/backstage) "rdR" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/hallway/primary/fore) "red" = ( @@ -28839,7 +28839,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor, /area/tether/surfacebase/security/briefingroom) "rhH" = ( @@ -29074,8 +29074,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint_stripe/bottlegreen, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/hydroponics/cafegarden) "rtZ" = ( @@ -29490,7 +29490,7 @@ /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "rIK" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "iaal"; name = "iaal" }, @@ -29849,8 +29849,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "rRU" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/research) "rRX" = ( @@ -31545,11 +31545,11 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "sPr" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "hop_office"; name = "hop_office" }, -/obj/effect/paint_stripe/commandblue, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/crew_quarters/heads/hop) "sPw" = ( @@ -31637,8 +31637,8 @@ /obj/structure/disposalpipe/down{ dir = 1 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/open, /area/rnd/outpost/xenobiology/outpost_stairs) "sQL" = ( @@ -32401,8 +32401,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "trH" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_main) "tst" = ( @@ -32587,7 +32587,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) "tzD" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/hallway/primary/starboard) "tAn" = ( @@ -32670,7 +32670,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/upperhall) "tCm" = ( @@ -33115,8 +33115,8 @@ /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "tOO" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint_stripe/bottlegreen, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/kitchen) "tOP" = ( @@ -33401,8 +33401,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery1) "tVj" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) "tVF" = ( @@ -34103,8 +34103,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "unp" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint_stripe/babyblue, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/storage) "unR" = ( @@ -34710,8 +34710,8 @@ /turf/simulated/floor/bluegrid, /area/rnd/robotics/mechbay) "uDV" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/bottlegreen, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/tether/surfacebase/botanystorage) "uDZ" = ( @@ -34887,8 +34887,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_south_airlock) "uKK" = ( @@ -35193,7 +35193,7 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "uSt" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/public_garden_three) "uSB" = ( @@ -35975,7 +35975,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa) "vud" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -36293,8 +36293,8 @@ /obj/machinery/air_alarm{ pixel_y = 25 }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) "vFb" = ( @@ -36550,8 +36550,8 @@ opacity = 0; open_layer = 1 }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint_stripe/babyblue, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/triage) "vKk" = ( @@ -36676,7 +36676,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "vNK" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/hallway/lower/third_south) "vOL" = ( @@ -37670,8 +37670,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "woS" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_hallway) "woW" = ( @@ -37692,13 +37692,13 @@ id = "DRAMATIC"; name = "Dramatic Blast Door" }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/spawner/window/low_wall/nogrille/firelocks, /obj/machinery/door/blast/shutters{ dir = 4; id = "Druma"; name = "Entertainment Shutters" }, -/obj/effect/paint_stripe/bottlegreen, +/obj/map_helper/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/tether/surfacebase/entertainment) "wpq" = ( @@ -38173,7 +38173,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "wCJ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/upperhall) "wCO" = ( @@ -38332,8 +38332,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "wEu" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) "wEA" = ( @@ -38643,7 +38643,7 @@ /turf/simulated/floor, /area/bridge/bridge_hallway) "wRT" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "saunatint"; name = "saunatint" }, @@ -39067,8 +39067,8 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint_stripe/bottlegreen, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/kitchen) "xiZ" = ( @@ -39853,7 +39853,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa) "xDq" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/cafeteria) "xDt" = ( @@ -40174,8 +40174,8 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_north_airlock) "xKF" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/bottlegreen, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/bar) "xKJ" = ( @@ -40323,7 +40323,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/rnd/research_storage) "xPN" = ( @@ -40595,8 +40595,8 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "xWL" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_first_aid) "xWN" = ( @@ -40848,11 +40848,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_three) "yeu" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "surfsurgery1"; name = "surfsurgery1" }, -/obj/effect/paint_stripe/babyblue, +/obj/map_helper/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/surgery1) "yeM" = ( @@ -40940,8 +40940,8 @@ /turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/barbackmaintenance) "yjJ" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint_stripe/bottlegreen, +/obj/spawner/window/low_wall/nogrille/firelocks, +/obj/map_helper/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/tether/surfacebase/botanystorage) "ykw" = ( diff --git a/maps/triumph/levels/deck1.dmm b/maps/triumph/levels/deck1.dmm index b1a107912f2..e76679c63db 100644 --- a/maps/triumph/levels/deck1.dmm +++ b/maps/triumph/levels/deck1.dmm @@ -230,8 +230,8 @@ icon_state = "0-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/black, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcommsat/computer) "aD" = ( @@ -391,8 +391,8 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/plating, /area/storage/tech) "bd" = ( @@ -650,11 +650,11 @@ /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/space) "bS" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, -/obj/effect/paint_stripe/pipecyan, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/gas_storage) "bT" = ( @@ -1008,9 +1008,9 @@ /turf/space, /area/space) "df" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/visible/cyan, -/obj/effect/paint_stripe/pipecyan, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "dh" = ( @@ -1088,7 +1088,7 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; dir = 2; @@ -1097,7 +1097,7 @@ name = "CE Office Blast Doors"; opacity = 0 }, -/obj/effect/paint_stripe/sun, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/plating, /area/crew_quarters/heads/chief) "dv" = ( @@ -1680,8 +1680,8 @@ /turf/simulated/floor/plating, /area/tcommsat/powercontrol) "ft" = ( -/obj/spawner/window/low_wall/borosillicate/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/borosillicate/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/portnacelle) "fv" = ( @@ -1892,9 +1892,9 @@ }, /area/tcommsat/chamber) "gh" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/effect/paint_stripe/pipecyan, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "gi" = ( @@ -1909,8 +1909,8 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/plating, /area/crew_quarters/heads/chief) "gj" = ( @@ -2077,8 +2077,8 @@ icon_state = "0-2" }, /obj/structure/disposalpipe/segment, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/monitoring) "gD" = ( @@ -2649,7 +2649,7 @@ /turf/simulated/floor/plating, /area/maintenance/trash_pit) "iz" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/curtain/black, /turf/simulated/floor/plating, /area/maintenance/dormitory) @@ -3535,7 +3535,7 @@ id = "portnacelle_blastdoor"; opacity = 0 }, -/obj/effect/paint_stripe/sun, +/obj/map_helper/paint_stripe/sun, /obj/structure/window/phoronreinforced/full{ icon_state = "phoronwindow0" }, @@ -3558,8 +3558,8 @@ icon_state = "1-4" }, /obj/structure/cable/green, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcommsat/computer) "lO" = ( @@ -4138,7 +4138,7 @@ /turf/simulated/floor/plating, /area/engineering/hallway/lower) "nO" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/engineering/storage) "nQ" = ( @@ -4292,8 +4292,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/obj/spawner/window/low_wall/borosillicate/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/borosillicate/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "ot" = ( @@ -4375,11 +4375,11 @@ /turf/simulated/floor/tiled, /area/engineering/hallway/lower) "oI" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 8 }, -/obj/effect/paint_stripe/pipecyan, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/space) "oJ" = ( @@ -5582,13 +5582,13 @@ /turf/simulated/floor/tiled/techfloor, /area/engineering/engine_airlock) "sE" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor, /area/engineering/atmos/storage) "sF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/monitoring) "sG" = ( @@ -5737,8 +5737,8 @@ /turf/space/basic, /area/space) "tc" = ( -/obj/spawner/window/low_wall/borosillicate/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/borosillicate/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/starboardnacelle) "te" = ( @@ -6069,8 +6069,8 @@ name = "Security Checkpoint Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "ub" = ( @@ -6756,11 +6756,11 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/locker_room) "wu" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/obj/effect/paint_stripe/pipecyan, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "wv" = ( @@ -7009,7 +7009,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ dir = 4 }, -/obj/effect/paint_stripe/sun, +/obj/map_helper/paint_stripe/sun, /obj/structure/window/phoronreinforced/full{ icon_state = "phoronwindow0" }, @@ -7232,8 +7232,8 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_eva) "ya" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/monitoring) "ye" = ( @@ -7700,9 +7700,9 @@ /turf/simulated/floor/plating, /area/maintenance/engi_engine) "zJ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/visible, -/obj/effect/paint_stripe/pipecyan, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "zK" = ( @@ -7722,9 +7722,9 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/monitoring) "zP" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/visible/black, -/obj/effect/paint_stripe/pipecyan, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "zQ" = ( @@ -8309,7 +8309,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/paint_stripe/sun, +/obj/map_helper/paint_stripe/sun, /obj/structure/window/phoronreinforced/full{ icon_state = "phoronwindow0" }, @@ -8471,12 +8471,12 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/plating, /area/storage/tech) "Cn" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/station/stairs_one) "Co" = ( @@ -9144,7 +9144,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "Ey" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, @@ -9950,8 +9950,8 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "Hq" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/space) "Hr" = ( @@ -10216,14 +10216,14 @@ /area/engineering/hallway) "Ii" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/monitoring) "Ij" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/visible/blue, -/obj/effect/paint_stripe/pipecyan, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "Ik" = ( @@ -10237,8 +10237,8 @@ name = "Security Checkpoint Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "Il" = ( @@ -10506,8 +10506,8 @@ name = "Security Checkpoint Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "Jg" = ( @@ -10728,8 +10728,8 @@ opacity = 0 }, /obj/structure/cable, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/borosillicate/reinforced/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/plating, /area/storage/tech) "JO" = ( @@ -11248,7 +11248,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/door/blast/regular{ density = 0; dir = 2; @@ -11257,7 +11257,7 @@ name = "CE Office Blast Doors"; opacity = 0 }, -/obj/effect/paint_stripe/sun, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/plating, /area/crew_quarters/heads/chief) "LB" = ( @@ -11440,7 +11440,7 @@ /turf/simulated/floor/tiled, /area/station/stairs_one) "Mc" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/engineering) "Mh" = ( @@ -11519,8 +11519,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, -/obj/spawner/window/low_wall/borosillicate/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/borosillicate/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "Mv" = ( @@ -14093,11 +14093,11 @@ /turf/simulated/floor/plating, /area/engineering/hallway/lower) "UR" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 8 }, -/obj/effect/paint_stripe/pipecyan, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/space) "UV" = ( @@ -14643,8 +14643,8 @@ /turf/simulated/floor/plating, /area/engineering/hallway/lower) "WF" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "WH" = ( @@ -14749,8 +14749,8 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) "Xc" = ( -/obj/spawner/window/low_wall/borosillicate/full/firelocks, -/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/borosillicate/firelocks, +/obj/map_helper/paint_stripe/sun, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "Xi" = ( @@ -15174,7 +15174,7 @@ /turf/space/basic, /area/engineering/atmos/gas_storage) "Yr" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, @@ -15196,7 +15196,7 @@ /turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/atmos/storage) "Yu" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor, /area/maintenance/engineering) "Yv" = ( @@ -15295,8 +15295,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 1 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/pipecyan, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/pipecyan, /turf/simulated/floor/tiled, /area/engineering/atmos/monitoring) "YL" = ( diff --git a/maps/triumph/levels/deck2.dmm b/maps/triumph/levels/deck2.dmm index 92dfb088c46..698e3d78646 100644 --- a/maps/triumph/levels/deck2.dmm +++ b/maps/triumph/levels/deck2.dmm @@ -260,7 +260,7 @@ /turf/simulated/floor/tiled/steel, /area/shuttle/mining_ship/general) "aL" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/steel/airless, /area/shuttle/mining_ship/general) "aM" = ( @@ -552,7 +552,7 @@ /turf/simulated/open, /area/station/stairs_two) "bx" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/curtain/black, /turf/simulated/floor/plating, /area/triumph/surfacebase/bar_backroom) @@ -612,8 +612,8 @@ /turf/simulated/floor/tiled, /area/hydroponics) "bF" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/warehouse) "bG" = ( @@ -680,7 +680,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/triumph/surfacebase/mining_main/uxstorage) "bR" = ( @@ -1193,8 +1193,8 @@ layer = 4; name = "EXTERNAL AIRLOCK" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/warehouse) "du" = ( @@ -1635,7 +1635,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/spawner/window/low_wall/nogrille/firelocks, /obj/machinery/door/firedoor{ dir = 8 }, @@ -1797,7 +1797,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_9) "fp" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/cargo) "fq" = ( @@ -1951,8 +1951,8 @@ /turf/simulated/floor/tiled, /area/station/stairs_two) "fM" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/office) "fO" = ( @@ -2566,8 +2566,8 @@ /turf/simulated/floor/tiled, /area/crew_quarters/lounge/kitchen_freezer) "hI" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/qm) "hL" = ( @@ -2611,9 +2611,9 @@ /turf/simulated/floor/plating, /area/vacant/vacant_office) "hS" = ( -/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/spawner/window/low_wall/nogrille/firelocks, /obj/structure/curtain/black, -/obj/effect/paint_stripe/palebottlegreen, +/obj/map_helper/paint_stripe/palebottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/coffee_shop) "hT" = ( @@ -3132,7 +3132,7 @@ /turf/simulated/floor/plating, /area/maintenance/dormitory) "js" = ( -/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/vacant/vacant_shop) "ju" = ( @@ -3430,7 +3430,7 @@ /turf/simulated/floor/tiled/steel, /area/shuttle/belter) "ko" = ( -/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/wood, /area/crew_quarters/fitness) "kr" = ( @@ -3704,7 +3704,7 @@ /turf/simulated/floor/tiled, /area/station/stairs_two) "le" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/curtain/open/bed{ name = "curtain" }, @@ -4239,8 +4239,8 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "ne" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/triumph/surfacebase/mining_main/storage) "nf" = ( @@ -5402,7 +5402,7 @@ /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_2) "qC" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/station/stairs_two) "qD" = ( @@ -6005,7 +6005,7 @@ /turf/simulated/floor/tiled/steel, /area/shuttle/mining_ship/general) "sn" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/tiled/steel/airless, /area/shuttle/belter) "so" = ( @@ -7278,7 +7278,7 @@ /turf/simulated/floor/tiled/techmaint, /area/quartermaster/office) "vR" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/bar/lower) "vT" = ( @@ -8288,7 +8288,7 @@ /turf/simulated/floor/tiled, /area/hydroponics) "yE" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/maintenance/dormitory) "yF" = ( @@ -8351,7 +8351,7 @@ /turf/simulated/floor/tiled/steel, /area/shuttle/belter) "yL" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/quartermaster/office) "yO" = ( @@ -9022,7 +9022,7 @@ /turf/simulated/floor/plating, /area/maintenance/dormitory) "AD" = ( -/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/visitor_dining) "AE" = ( @@ -10587,9 +10587,9 @@ /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/coffee_shop) "FS" = ( -/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/spawner/window/low_wall/nogrille/firelocks, /obj/structure/curtain/black, -/obj/effect/paint_stripe/palebottlegreen, +/obj/map_helper/paint_stripe/palebottlegreen, /turf/simulated/floor/plating, /area/vacant/vacant_shop) "FV" = ( @@ -11433,8 +11433,8 @@ /turf/simulated/floor/tiled/dark, /area/janitor) "IF" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/triumph/surfacebase/mining_main/refinery) "IG" = ( @@ -12878,11 +12878,11 @@ /turf/simulated/floor/wood, /area/station/stairs_two) "Nb" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/structure/curtain/open/bed{ name = "curtain" }, -/obj/effect/paint_stripe/palebottlegreen, +/obj/map_helper/paint_stripe/palebottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/bar) "Nc" = ( @@ -13830,7 +13830,7 @@ "PK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/station/stairs_two) "PL" = ( @@ -14158,7 +14158,7 @@ /turf/simulated/wall/prepainted, /area/maintenance/substation/cargo) "QZ" = ( -/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/spawner/window/low_wall/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/sleep/cryo) "Ra" = ( @@ -15818,8 +15818,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/coffee_shop) "VL" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/palebottlegreen, +/obj/spawner/window/low_wall/reinforced/firelocks, +/obj/map_helper/paint_stripe/palebottlegreen, /turf/simulated/floor/plating, /area/hydroponics) "VM" = ( diff --git a/maps/triumph/levels/deck3.dmm b/maps/triumph/levels/deck3.dmm index 0ab64ecee02..ac765c5d996 100644 --- a/maps/triumph/levels/deck3.dmm +++ b/maps/triumph/levels/deck3.dmm @@ -43,7 +43,7 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "acD" = ( @@ -184,7 +184,7 @@ /area/medical/psych/psych_2) "agS" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/structure/curtain/open/shower/medical{ name = "Privacy curtain" }, @@ -493,7 +493,7 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "avE" = ( @@ -674,7 +674,7 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "aDx" = ( @@ -809,7 +809,7 @@ /obj/machinery/door/firedoor/glass{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/medical/virologyisolation) "aFW" = ( @@ -1884,7 +1884,7 @@ /area/shuttle/emt/general) "bGt" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/medical/resleeving) "bGx" = ( @@ -2463,7 +2463,7 @@ /area/medical/sleeper) "cfG" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/medical/morgue) "cfI" = ( @@ -3059,7 +3059,7 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "cEY" = ( @@ -3083,7 +3083,7 @@ /area/medical/psych_ward) "cFb" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/medical/medbay_primary_storage) "cFk" = ( @@ -3317,7 +3317,7 @@ /obj/machinery/door/firedoor/glass{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/medical/reception) "cOG" = ( @@ -3830,7 +3830,7 @@ /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "dlt" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/structure/disposalpipe/segment, /obj/machinery/door/blast/regular{ density = 0; @@ -3868,7 +3868,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora/lab_atmos) "dni" = ( @@ -4475,7 +4475,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/medical/psych_ward) "dOE" = ( @@ -4853,7 +4853,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/rnd/hallway) "ecT" = ( @@ -5023,7 +5023,7 @@ /obj/machinery/door/firedoor/glass{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/medical/surgeryprep) "egR" = ( @@ -5124,7 +5124,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/rnd/test_area) "ejF" = ( @@ -5157,7 +5157,7 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "ekU" = ( @@ -5839,7 +5839,7 @@ /area/rnd/test_area) "eWi" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/structure/curtain/open/shower/medical{ name = "Privacy curtain" }, @@ -5930,7 +5930,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -6570,7 +6570,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/medbreak/surgery) "fzt" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/structure/disposalpipe/segment, /obj/machinery/door/blast/regular{ density = 0; @@ -7566,7 +7566,7 @@ /area/rnd/breakroom) "gpg" = ( /obj/machinery/door/firedoor/glass, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/assembly/robotics) "gpS" = ( @@ -7670,7 +7670,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -7789,7 +7789,7 @@ /area/hallway/primary/aft) "gwT" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/medical/chemistry) "gxm" = ( @@ -8134,7 +8134,7 @@ "gPQ" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/rnd/anomaly_lab/containment_one) "gQh" = ( @@ -8303,7 +8303,7 @@ name = "Medbay Emergency Lockdown Shutters"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/medical/resleeving) "gYW" = ( @@ -8404,7 +8404,7 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "hdr" = ( @@ -8607,7 +8607,7 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "hlv" = ( @@ -8937,7 +8937,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/rnd/workshop) "hxs" = ( @@ -9044,7 +9044,7 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/borosillicate/reinforced/full, +/obj/spawner/window/low_wall/borosillicate/reinforced, /turf/simulated/floor/reinforced/airless, /area/rnd/test_area) "hBp" = ( @@ -10129,7 +10129,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -10259,7 +10259,7 @@ /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "iym" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/machinery/door/firedoor{ dir = 8 }, @@ -10736,7 +10736,7 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora/lab_atmos) "iNo" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -10825,7 +10825,7 @@ /area/medical/surgeryprep) "iRy" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/rnd/breakroom) "iRK" = ( @@ -10849,7 +10849,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/triumph/station/stairs_three) "iST" = ( @@ -10895,7 +10895,7 @@ /area/medical/psych/psych_2) "iVb" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/medical/ward) "iVj" = ( @@ -11457,7 +11457,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/teleporter/departing) "jsB" = ( @@ -11491,7 +11491,7 @@ /area/rnd/rdoffice) "jsT" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/structure/curtain/open/shower/medical{ name = "Privacy curtain" }, @@ -12030,7 +12030,7 @@ /area/hallway/primary/aft) "jNm" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/rnd/research_foyer_auxiliary) "jNo" = ( @@ -12142,7 +12142,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/crew_quarters/medbreak) "jRs" = ( @@ -12191,7 +12191,7 @@ /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) "jSF" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/machinery/door/firedoor{ dir = 8 }, @@ -12991,7 +12991,7 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "kIB" = ( @@ -13041,7 +13041,7 @@ /area/hallway/primary/aft) "kKY" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/rnd/anomaly_lab/containment_one) "kMe" = ( @@ -13426,12 +13426,12 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/maintenance/research) "lbH" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -13775,8 +13775,8 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/medical/psych_ward) "lsM" = ( @@ -14139,7 +14139,7 @@ /area/triumph/station/stairs_three) "lGI" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/rnd/reception_desk) "lHn" = ( @@ -14437,7 +14437,7 @@ /turf/simulated/floor/tiled, /area/holodeck_control) "lTx" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/space, /area/rnd/xenobiology) "lTF" = ( @@ -14585,7 +14585,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/holodeck_control) "mbb" = ( @@ -14633,7 +14633,7 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/borosillicate/reinforced/full, +/obj/spawner/window/low_wall/borosillicate/reinforced, /turf/simulated/floor/reinforced/airless, /area/rnd/test_area) "meR" = ( @@ -14728,7 +14728,7 @@ /area/medical/recoveryrestroom) "mkA" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/structure/curtain/open/shower/medical{ name = "Privacy curtain" }, @@ -14831,7 +14831,7 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "moH" = ( @@ -15496,7 +15496,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/shuttle/emt/general) "mTt" = ( @@ -15890,7 +15890,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/medical/medbay_emt_bay) "nih" = ( @@ -16290,7 +16290,7 @@ /area/assembly/robotics) "nBs" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/rnd/test_area) @@ -17139,7 +17139,7 @@ /turf/simulated/floor/tiled, /area/rnd/test_area) "olF" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -17393,7 +17393,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/rnd/reception_desk) "owE" = ( @@ -17669,7 +17669,7 @@ /area/rnd/anomaly_lab/containment_one) "oJw" = ( /obj/machinery/door/firedoor/glass, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/rnd/anomaly_lab/containment_two) "oJy" = ( @@ -18145,7 +18145,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "oZt" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/structure/disposalpipe/segment, /obj/machinery/door/blast/regular{ density = 0; @@ -18285,7 +18285,7 @@ /area/maintenance/research) "pgN" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/holodeck_control) "pgO" = ( @@ -18570,7 +18570,7 @@ /area/hallway/primary/port) "pqK" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/rnd/anomaly_lab) "pqY" = ( @@ -19465,7 +19465,7 @@ /area/triumph/station/stairs_three) "pXL" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) "pXO" = ( @@ -20148,7 +20148,7 @@ /area/medical/psych_ward) "qAg" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/medical/reception) "qAp" = ( @@ -20338,7 +20338,7 @@ /area/medical/resleeving) "qIy" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/structure/curtain/open/shower/medical{ name = "Privacy curtain" }, @@ -20869,7 +20869,7 @@ /turf/simulated/floor/tiled/white, /area/shuttle/emt/cockpit) "raK" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -21081,7 +21081,7 @@ /area/triumph/station/stairs_three) "rjP" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/medical/virologyisolation) "rkd" = ( @@ -21321,7 +21321,7 @@ /area/medical/ward) "rup" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/triumph/station/stairs_three) "rut" = ( @@ -21373,7 +21373,7 @@ /area/rnd/workshop) "rxi" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/shuttle/emt/general) "rxP" = ( @@ -21722,7 +21722,7 @@ /area/rnd/xenobiology/xenoflora) "rLU" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/medical/psych_ward) "rMs" = ( @@ -21796,7 +21796,7 @@ /obj/machinery/door/firedoor/glass{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/medical/virologyisolation) "rOl" = ( @@ -21895,14 +21895,14 @@ /area/medical/reception) "rRZ" = ( /obj/machinery/door/firedoor/glass, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/medical/medbay_primary_storage) "rST" = ( /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/medical/chemistry) "rUk" = ( @@ -22424,7 +22424,7 @@ /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "svd" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora/lab_atmos) "svp" = ( @@ -22971,7 +22971,7 @@ /turf/simulated/floor/reinforced/airless, /area/rnd/test_area) "sQe" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/rnd/xenobiology) "sQh" = ( @@ -23165,7 +23165,7 @@ /obj/machinery/door/firedoor/glass{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/triumph/station/stairs_three) "tbN" = ( @@ -23391,7 +23391,7 @@ /turf/simulated/floor/plating, /area/maintenance/medbay/fore) "tij" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora) "tir" = ( @@ -23561,7 +23561,7 @@ /area/medical/medbay3) "tqN" = ( /obj/machinery/door/firedoor/glass, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/holodeck_control) "tqY" = ( @@ -23936,7 +23936,7 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "tHr" = ( @@ -24112,7 +24112,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/black, /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/borosillicate/reinforced/full, +/obj/spawner/window/low_wall/borosillicate/reinforced, /turf/simulated/floor/reinforced/airless, /area/rnd/test_area) "tNv" = ( @@ -24909,7 +24909,7 @@ /area/rnd/xenobiology/xenoflora) "uuo" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -25279,7 +25279,7 @@ dir = 5 }, /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/borosillicate/reinforced/full, +/obj/spawner/window/low_wall/borosillicate/reinforced, /turf/simulated/floor/reinforced/airless, /area/rnd/test_area) "uLA" = ( @@ -25568,7 +25568,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/machinery/door/firedoor{ dir = 8 }, @@ -26946,7 +26946,7 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "wfE" = ( @@ -27253,7 +27253,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/rnd/breakroom) "wuC" = ( @@ -27504,7 +27504,7 @@ name = "Containment Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "wGY" = ( @@ -27557,7 +27557,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/medical/medbay_primary_storage) "wJN" = ( @@ -27893,7 +27893,7 @@ "wYX" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/machinery/door/firedoor/glass, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/rnd/anomaly_lab/containment_two) "wZf" = ( @@ -28302,7 +28302,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/medical/patient_wing) "xtV" = ( @@ -29130,7 +29130,7 @@ /obj/machinery/door/firedoor/glass{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/assembly/robotics) "yde" = ( @@ -29159,7 +29159,7 @@ /area/hallway/primary/port) "yfP" = ( /obj/machinery/door/firedoor/glass, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/medical/sleeper) "ygh" = ( diff --git a/maps/triumph/levels/deck4.dmm b/maps/triumph/levels/deck4.dmm index 25cc266c53c..a76ef7561ff 100644 --- a/maps/triumph/levels/deck4.dmm +++ b/maps/triumph/levels/deck4.dmm @@ -233,8 +233,8 @@ "akO" = ( /obj/machinery/door/firedoor, /obj/structure/cable/green, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/prison/cell_block) "ala" = ( @@ -901,8 +901,8 @@ name = "Bridge Lockdown"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/bridge) "aFa" = ( @@ -1237,8 +1237,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/spawner/window/low_wall/borosillicate/full, -/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/borosillicate, +/obj/map_helper/paint_stripe/violet, /turf/simulated/shuttle/floor/voidcraft, /area/shuttle/excursion/general) "aMy" = ( @@ -1314,11 +1314,11 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full, +/obj/spawner/window/low_wall/borosillicate/reinforced, /obj/structure/curtain/black{ anchored = 1 }, -/obj/effect/paint_stripe/darkred, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor, /area/security/brig) "aPj" = ( @@ -1764,7 +1764,7 @@ }, /obj/structure/grille, /obj/structure/wall_frame/prepainted, -/obj/effect/paint_stripe/commandblue, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/airless/ceiling, /area/crew_quarters/sleep/HOP_quarters) "bgv" = ( @@ -1969,7 +1969,7 @@ /turf/simulated/floor/plating, /area/security/brig) "bph" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/machinery/door/firedoor/glass, /obj/structure/curtain/black{ anchored = 1 @@ -2381,8 +2381,8 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/range) "bHa" = ( @@ -2504,8 +2504,8 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/forensics) "bJW" = ( @@ -2520,7 +2520,7 @@ /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) "bKp" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/security/hallway) "bKU" = ( @@ -2991,8 +2991,8 @@ name = "Bridge Lockdown"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/bridge) "cbm" = ( @@ -3427,7 +3427,7 @@ /obj/structure/window/reinforced/polarized/full{ id = "pathfinder_office" }, -/obj/effect/paint_stripe/violet, +/obj/map_helper/paint_stripe/violet, /obj/structure/wall_frame/prepainted, /turf/simulated/floor/plating, /area/exploration/pathfinder_office) @@ -3480,11 +3480,11 @@ /turf/simulated/floor/carpet/bcarpet, /area/chapel/main) "ctB" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/machinery/door/firedoor{ dir = 8 }, -/obj/effect/paint_stripe/commandblue, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/crew_quarters/heads/blueshield) "ctD" = ( @@ -5294,8 +5294,8 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/lobby) "dzW" = ( @@ -5993,7 +5993,7 @@ id = "det_office" }, /obj/structure/wall_frame/prepainted, -/obj/effect/paint_stripe/darkred, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/detectives_office) "dYq" = ( @@ -6037,11 +6037,11 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full, +/obj/spawner/window/low_wall/borosillicate/reinforced, /obj/structure/curtain/black{ anchored = 1 }, -/obj/effect/paint_stripe/darkred, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor, /area/security/brig) "dZn" = ( @@ -6315,8 +6315,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) "elR" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/borosillicate/reinforced, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/shuttle/floor/voidcraft, /area/bridge/meeting_room) "emu" = ( @@ -6414,8 +6414,8 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/warden) "epK" = ( @@ -6930,8 +6930,8 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/breakroom) "eJe" = ( @@ -7155,7 +7155,7 @@ id = "hop_office"; name = "HoP Office window" }, -/obj/effect/paint_stripe/commandblue, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/crew_quarters/heads/hop) "ePs" = ( @@ -8023,8 +8023,8 @@ /area/hallway/secondary/civilian_hallway_mid) "fvG" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/lobby) "fvL" = ( @@ -8048,7 +8048,7 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/full/nogrille, +/obj/spawner/window/low_wall/nogrille, /turf/simulated/floor/tiled, /area/hydroponics/garden) "fxj" = ( @@ -8271,8 +8271,8 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/lobby) "fIt" = ( @@ -8987,8 +8987,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/security_lockerroom) "ggL" = ( @@ -9053,8 +9053,8 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/palebottlegreen, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/palebottlegreen, /turf/simulated/floor, /area/hallway/secondary/docking_hallway) "gjv" = ( @@ -9258,7 +9258,7 @@ id = "pathfinder_office" }, /obj/structure/wall_frame/prepainted, -/obj/effect/paint_stripe/palebottlegreen, +/obj/map_helper/paint_stripe/palebottlegreen, /turf/simulated/floor/plating, /area/chapel/office) "gqQ" = ( @@ -9284,7 +9284,7 @@ id = "pathfinder_office" }, /obj/structure/wall_frame/prepainted, -/obj/effect/paint_stripe/palebottlegreen, +/obj/map_helper/paint_stripe/palebottlegreen, /turf/simulated/floor/plating, /area/chapel/office) "grV" = ( @@ -10146,8 +10146,8 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/prison/cell_block) "gWq" = ( @@ -10209,8 +10209,8 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/forensics) "gYv" = ( @@ -10942,8 +10942,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/prison/cell_block) "hws" = ( @@ -12471,8 +12471,8 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor, /area/security/hanger) "iBS" = ( @@ -12594,7 +12594,7 @@ /area/library) "iGx" = ( /obj/machinery/door/firedoor/glass, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/exploration/excursion_dock) "iHc" = ( @@ -12724,8 +12724,8 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/range) "iMM" = ( @@ -13053,7 +13053,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/hallway/primary/aft) "iYa" = ( @@ -13293,8 +13293,8 @@ /area/maintenance/security/starboard) "jdR" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/borosillicate/reinforced/full, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/borosillicate/reinforced, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/shuttle/floor/voidcraft, /area/bridge) "jec" = ( @@ -13988,8 +13988,8 @@ /turf/simulated/floor/tiled, /area/exploration/showers) "jBc" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/borosillicate/reinforced, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/shuttle/floor/voidcraft, /area/bridge/office) "jBm" = ( @@ -14561,7 +14561,7 @@ id = "library_study" }, /obj/structure/wall_frame/prepainted, -/obj/effect/paint_stripe/palebottlegreen, +/obj/map_helper/paint_stripe/palebottlegreen, /turf/simulated/floor/plating, /area/library/study) "jUy" = ( @@ -14809,7 +14809,7 @@ /obj/structure/window/reinforced/polarized/full{ id = "pathfinder_office" }, -/obj/effect/paint_stripe/violet, +/obj/map_helper/paint_stripe/violet, /obj/structure/wall_frame/prepainted, /turf/simulated/floor/plating, /area/exploration/pathfinder_office) @@ -14821,7 +14821,7 @@ icon_state = "fwindow"; id = "chapel" }, -/obj/effect/paint_stripe/violet, +/obj/map_helper/paint_stripe/violet, /obj/structure/wall_frame/prepainted, /turf/simulated/floor/plating, /area/exploration/explorer_prep) @@ -14833,7 +14833,7 @@ id = "lawyer_blast"; name = "Internal Aiffars window" }, -/obj/effect/paint_stripe/commandblue, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor, /area/lawoffice) "kcJ" = ( @@ -14845,8 +14845,8 @@ /obj/machinery/door/firedoor{ dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/hallway) "kdX" = ( @@ -14996,7 +14996,7 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/full/nogrille, +/obj/spawner/window/low_wall/nogrille, /turf/simulated/floor/plating, /area/crew_quarters/heads/hop) "khT" = ( @@ -15076,8 +15076,8 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/brig) "kkC" = ( @@ -15847,8 +15847,8 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/borosillicate/reinforced, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/shuttle/floor/voidcraft, /area/bridge/office) "kKt" = ( @@ -15976,7 +15976,7 @@ /area/library) "kNR" = ( /obj/machinery/door/firedoor/glass, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor, /area/maintenance/security/starboard) "kOi" = ( @@ -16093,7 +16093,7 @@ /area/chapel/main) "kRj" = ( /obj/machinery/door/firedoor/glass, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/maintenance/security/starboard) "kRq" = ( @@ -16437,8 +16437,8 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/security_lockerroom) "lft" = ( @@ -16898,8 +16898,8 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/lobby) "lCd" = ( @@ -17040,8 +17040,8 @@ /area/exploration) "lHp" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/brig) "lIa" = ( @@ -17816,8 +17816,8 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/lobby) "mma" = ( @@ -18033,7 +18033,7 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/hallway/secondary/docking_hallway) "muZ" = ( @@ -18254,8 +18254,8 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/lobby) "mEg" = ( @@ -18509,8 +18509,8 @@ /area/security/hanger) "mLh" = ( /obj/machinery/door/firedoor/glass, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/violet, /turf/simulated/floor/plating, /area/exploration/meeting) "mLt" = ( @@ -19647,7 +19647,7 @@ icon_state = "2-4" }, /obj/structure/wall_frame/prepainted, -/obj/effect/paint_stripe/darkred, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/crew_quarters/heads/hos) "nEa" = ( @@ -20426,8 +20426,8 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/forensics) "ocK" = ( @@ -21094,8 +21094,8 @@ name = "Bridge Lockdown"; opacity = 0 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/borosillicate/reinforced, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/airless/ceiling, /area/bridge) "oDx" = ( @@ -21338,8 +21338,8 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/lobby) "oNi" = ( @@ -21387,8 +21387,8 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/tiled, /area/triumph/station/stairs_four) "oOL" = ( @@ -22308,8 +22308,8 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/lobby) "ptO" = ( @@ -22447,8 +22447,8 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/prison/cell_block) "pyh" = ( @@ -22928,8 +22928,8 @@ /turf/simulated/floor/tiled/dark, /area/security/riot_control) "pNt" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/borosillicate/reinforced, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/airless/ceiling, /area/bridge) "pNx" = ( @@ -23342,8 +23342,8 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/prison) "qfW" = ( @@ -23554,8 +23554,8 @@ name = "Cockpit Lockdown"; opacity = 0 }, -/obj/spawner/window/low_wall/borosillicate/full, -/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/borosillicate, +/obj/map_helper/paint_stripe/violet, /turf/simulated/shuttle/floor/voidcraft, /area/shuttle/excursion/cockpit) "qmC" = ( @@ -23971,7 +23971,7 @@ id = "Interr"; name = "interrogation window" }, -/obj/effect/paint_stripe/darkred, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/interrogation) "qCU" = ( @@ -24078,8 +24078,8 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/breakroom) "qHn" = ( @@ -24433,8 +24433,8 @@ name = "Shuttle Lockdown"; opacity = 0 }, -/obj/spawner/window/low_wall/borosillicate/full, -/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/borosillicate, +/obj/map_helper/paint_stripe/violet, /turf/simulated/shuttle/floor/voidcraft, /area/shuttle/excursion/general) "qWo" = ( @@ -24735,7 +24735,7 @@ id = "Interr"; name = "interrogation window" }, -/obj/effect/paint_stripe/darkred, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/interrogation) "rfr" = ( @@ -25045,7 +25045,7 @@ name = "Bridge Lockdown"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/bridge) "rqD" = ( @@ -25457,8 +25457,8 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/security_lockerroom) "rIv" = ( @@ -25594,8 +25594,8 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/security_processing) "rOw" = ( @@ -25714,8 +25714,8 @@ name = "Bridge Lockdown"; opacity = 0 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/borosillicate/reinforced, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/shuttle/floor/voidcraft, /area/bridge) "rTs" = ( @@ -25770,7 +25770,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/courser_dock) "rUF" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /obj/machinery/door/firedoor/glass, /obj/structure/curtain/black{ anchored = 1 @@ -25922,7 +25922,7 @@ id = "det_office" }, /obj/structure/wall_frame/prepainted, -/obj/effect/paint_stripe/darkred, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/detectives_office) "rYj" = ( @@ -26137,7 +26137,7 @@ /area/library) "sgn" = ( /obj/machinery/door/firedoor/glass, -/obj/spawner/window/low_wall/full/nogrille, +/obj/spawner/window/low_wall/nogrille, /turf/simulated/floor/tiled, /area/hydroponics/garden) "sgq" = ( @@ -26279,8 +26279,8 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/borosillicate/reinforced, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/shuttle/floor/voidcraft, /area/bridge/meeting_room) "skY" = ( @@ -26375,7 +26375,7 @@ /area/exploration/explorer_prep) "snQ" = ( /obj/machinery/door/firedoor/glass, -/obj/spawner/window/low_wall/full/nogrille, +/obj/spawner/window/low_wall/nogrille, /turf/simulated/floor, /area/maintenance/tool_storage) "spc" = ( @@ -26832,7 +26832,7 @@ icon_state = "0-2" }, /obj/structure/wall_frame/prepainted, -/obj/effect/paint_stripe/darkred, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/crew_quarters/heads/hos) "sIs" = ( @@ -27071,7 +27071,7 @@ id = "det_office" }, /obj/structure/wall_frame/prepainted, -/obj/effect/paint_stripe/darkred, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/detectives_office) "sRK" = ( @@ -27755,7 +27755,7 @@ /area/hallway/primary/aft) "tuY" = ( /obj/machinery/door/firedoor/glass, -/obj/spawner/window/low_wall/full/nogrille, +/obj/spawner/window/low_wall/nogrille, /turf/simulated/floor/plating, /area/crew_quarters/heads/hop) "tva" = ( @@ -27818,8 +27818,8 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/borosillicate/full, -/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/borosillicate, +/obj/map_helper/paint_stripe/violet, /turf/simulated/floor/plating, /area/crew_quarters/lounge) "txV" = ( @@ -28073,8 +28073,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/prison) "tFe" = ( @@ -29087,8 +29087,8 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/borosillicate/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor, /area/security/brig) "uoD" = ( @@ -29251,7 +29251,7 @@ icon_state = "0-8" }, /obj/structure/wall_frame/prepainted, -/obj/effect/paint_stripe/darkred, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/crew_quarters/heads/hos) "utu" = ( @@ -29554,8 +29554,8 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/brig) "uCU" = ( @@ -30048,8 +30048,8 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/borosillicate/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor, /area/security/brig) "uUI" = ( @@ -30492,8 +30492,8 @@ /area/triumph/surfacebase/sauna) "vkn" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/breakroom) "vkr" = ( @@ -30655,7 +30655,7 @@ id = "hop_office"; name = "HoP Office window" }, -/obj/effect/paint_stripe/commandblue, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/crew_quarters/heads/hop) "vqJ" = ( @@ -31099,8 +31099,8 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/borosillicate/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor, /area/security/brig) "vIw" = ( @@ -31744,8 +31744,8 @@ layer = 3.1; name = "Colony Directo's Shutters" }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/crew_quarters/captain) "wge" = ( @@ -31843,8 +31843,8 @@ layer = 3.1; name = "Colony Directo's Shutters" }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/crew_quarters/captain) "wnM" = ( @@ -32223,8 +32223,8 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor, /area/security/hanger) "wzY" = ( @@ -32454,8 +32454,8 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/violet, /turf/simulated/floor/plating, /area/exploration/pilot_prep) "wIY" = ( @@ -32760,8 +32760,8 @@ /area/crew_quarters/sleep/HOP_quarters) "wVs" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/cyan, -/obj/spawner/window/low_wall/borosillicate/full, -/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/borosillicate, +/obj/map_helper/paint_stripe/violet, /turf/simulated/shuttle/floor/voidcraft, /area/shuttle/excursion/general) "wVy" = ( @@ -33008,8 +33008,8 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor, /area/security/hanger) "xdl" = ( @@ -33242,8 +33242,8 @@ "xjJ" = ( /obj/machinery/door/firedoor, /obj/structure/cable/green, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/security_processing) "xjZ" = ( @@ -33568,8 +33568,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/reinforced, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/warden) "xqI" = ( @@ -33671,7 +33671,7 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/spawner/window/low_wall/full/nogrille, +/obj/spawner/window/low_wall/nogrille, /turf/simulated/floor/plating, /area/crew_quarters/lounge) "xuR" = ( @@ -34842,7 +34842,7 @@ /area/chapel/main) "yfo" = ( /obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/simulated/floor/plating, /area/hallway/secondary/docking_hallway) "yfy" = ( @@ -34890,7 +34890,7 @@ id = "Interr"; name = "interrogation window" }, -/obj/effect/paint_stripe/darkred, +/obj/map_helper/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/interrogation) "yiH" = ( diff --git a/maps/triumph/levels/flagship.dmm b/maps/triumph/levels/flagship.dmm index 5af884286b4..85b960993dc 100644 --- a/maps/triumph/levels/flagship.dmm +++ b/maps/triumph/levels/flagship.dmm @@ -563,7 +563,7 @@ }, /area/centcom/restaurant) "bO" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/unsimulated/floor{ name = "plating" }, @@ -1042,7 +1042,7 @@ /turf/unsimulated/floor/steel, /area/centcom/command) "dj" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/unsimulated/floor{ name = "plating" }, @@ -2751,7 +2751,7 @@ /area/centcom/security) "iC" = ( /obj/structure/fans/tiny, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "emergency_medical" }, /obj/machinery/door/blast/regular/open{ @@ -3451,7 +3451,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/spawner/window/low_wall/borosillicate/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/firelocks, /turf/simulated/floor/plating, /area/shuttle/specops/engine) "kX" = ( @@ -3781,7 +3781,7 @@ /turf/unsimulated/floor/steel, /area/centcom/security) "lR" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/unsimulated/floor{ name = "plating" }, @@ -3839,7 +3839,7 @@ }, /area/centcom/command) "mb" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "emergency_cockpit" }, /turf/simulated/floor, @@ -4074,7 +4074,7 @@ /area/centcom/specops) "mE" = ( /obj/structure/fans/tiny, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "emergency_medical" }, /turf/unsimulated/floor{ @@ -4836,7 +4836,7 @@ /area/centcom/living) "oL" = ( /obj/structure/fans/tiny, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /obj/machinery/door/blast/regular/open{ id = "emergency_shuttle_lockdown"; name = "Emergency Shuttle Blast Door" @@ -5596,7 +5596,7 @@ }, /area/centcom/security) "rp" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/unsimulated/floor{ name = "plating" }, @@ -7042,7 +7042,7 @@ /turf/unsimulated/floor/steel, /area/centcom/command) "vN" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/unsimulated/floor{ name = "plating" }, @@ -7577,7 +7577,7 @@ /area/centcom/control) "xj" = ( /obj/structure/fans/tiny, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "emergency_security" }, /obj/machinery/door/blast/regular/open{ @@ -8210,7 +8210,7 @@ }, /area/centcom/control) "zm" = ( -/obj/spawner/window/low_wall/full/firelocks, +/obj/spawner/window/low_wall/firelocks, /turf/unsimulated/floor{ name = "plating" }, @@ -8606,7 +8606,7 @@ /area/centcom/control) "AA" = ( /obj/structure/fans/tiny, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "emergency_medical" }, /turf/simulated/floor, @@ -8838,7 +8838,7 @@ /turf/unsimulated/floor/wood, /area/centcom/restaurant) "Bj" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/unsimulated/floor{ name = "plating" }, @@ -9590,7 +9590,7 @@ /turf/unsimulated/floor/steel, /area/centcom/main_hall) "DZ" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/unsimulated/floor{ name = "plating" }, @@ -9712,8 +9712,8 @@ }, /area/centcom/command) "Et" = ( -/obj/spawner/window/low_wall/full/firelocks, -/obj/spawner/window/low_wall/full/firelocks, +/obj/spawner/window/low_wall/firelocks, +/obj/spawner/window/low_wall/firelocks, /turf/unsimulated/floor{ name = "plating" }, @@ -9951,7 +9951,7 @@ /area/centcom/evac) "Fl" = ( /obj/structure/fans/tiny, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "emergency_cockpit" }, /obj/machinery/door/blast/regular/open{ @@ -10697,7 +10697,7 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/specops/general) "HN" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/unsimulated/floor{ name = "plating" }, @@ -11991,7 +11991,7 @@ }, /area/centcom/control) "Lw" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/shuttle/specops/cockpit) "Lx" = ( @@ -12384,7 +12384,7 @@ /turf/unsimulated/floor/steel, /area/centcom/restaurant) "MH" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/unsimulated/floor{ name = "plating" }, @@ -13015,7 +13015,7 @@ /area/shuttle/escape) "Oz" = ( /obj/structure/fans/tiny, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ +/obj/spawner/window/low_wall/reinforced/electrochromic/firelocks{ id = "emergency_security" }, /turf/simulated/floor, @@ -14467,7 +14467,7 @@ }, /area/centcom/security) "SW" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/unsimulated/floor{ name = "plating" }, @@ -15137,7 +15137,7 @@ /turf/unsimulated/floor/steel, /area/centcom/command) "Vu" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/unsimulated/floor{ name = "plating" }, @@ -15435,7 +15435,7 @@ }, /area/centcom/security) "Wt" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/firelocks, /turf/simulated/floor/plating, /area/centcom/specops/dock) "Wu" = ( @@ -15486,7 +15486,7 @@ }, /area/centcom/security) "WD" = ( -/obj/spawner/window/low_wall/reinforced/full, +/obj/spawner/window/low_wall/reinforced, /turf/unsimulated/floor{ name = "plating" },