From 2e2f1db6063962cb3d85afa04b443054a2de5590 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Wed, 20 Sep 2023 17:30:25 -0400 Subject: [PATCH 01/59] hotspots now no longer breach floors --- monkestation/code/modules/ocean_content/hotspot/hotspot.dm | 2 +- monkestation/code/modules/power/lighting/neon_lining.dm | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/monkestation/code/modules/ocean_content/hotspot/hotspot.dm b/monkestation/code/modules/ocean_content/hotspot/hotspot.dm index 768b90f1008c..a13d3f72993e 100644 --- a/monkestation/code/modules/ocean_content/hotspot/hotspot.dm +++ b/monkestation/code/modules/ocean_content/hotspot/hotspot.dm @@ -177,7 +177,7 @@ if(event_flags & WEAK_EXPLOSION) explosion(calculation_point, 0, 0, 4, 0, 0, adminlog = FALSE) if(event_flags & EXPLOSION) - explosion(calculation_point, 0, 2, 2, 0, 0, adminlog = FALSE) + explosion(calculation_point, 0, 0, 6, 6, 3, adminlog = FALSE) var/area_name_string = get_area_name(calculation_point) var/message diff --git a/monkestation/code/modules/power/lighting/neon_lining.dm b/monkestation/code/modules/power/lighting/neon_lining.dm index eff39d3b16bc..94dd9dfbe5c9 100644 --- a/monkestation/code/modules/power/lighting/neon_lining.dm +++ b/monkestation/code/modules/power/lighting/neon_lining.dm @@ -90,11 +90,7 @@ ///the current icon state of our combined shape as we have color permutations var/lining_icon_state = 1 ///the built string for use in icon updates - var/built_lining_string = "base2" - -/obj/machinery/light/neon_lining/Initialize(mapload) - . = ..() - rebuild_lining_string() + var/built_lining_string = "pink2_1" /obj/machinery/light/neon_lining/update_appearance(updates) . = ..() From eda28c96815becc9a8cb629106ac18ba7f85e1ce Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Wed, 20 Sep 2023 18:07:30 -0400 Subject: [PATCH 02/59] replaces returns with breaks --- .../code/modules/liquids/liquid_controller.dm | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/monkestation/code/modules/liquids/liquid_controller.dm b/monkestation/code/modules/liquids/liquid_controller.dm index 22b74b241d28..847fb5b7794d 100644 --- a/monkestation/code/modules/liquids/liquid_controller.dm +++ b/monkestation/code/modules/liquids/liquid_controller.dm @@ -31,20 +31,20 @@ SUBSYSTEM_DEF(liquids) msg += "AG:[active_groups.len]|BT:[burning_turfs.len]|EQ:[evaporation_queue.len]|AO:[active_ocean_turfs.len]|UO:[length(unvalidated_oceans)]" return ..() -/datum/controller/subsystem/liquids/fire(resumed = FALSE) +/datum/controller/subsystem/liquids/fire(resumed) if(!active_groups.len && !evaporation_queue.len && !active_ocean_turfs.len && !burning_turfs.len && !unvalidated_oceans.len) return if(length(unvalidated_oceans)) for(var/turf/open/floor/plating/ocean/unvalidated_turf in unvalidated_oceans) if(MC_TICK_CHECK) - return + break unvalidated_turf.assume_self() if(!length(temperature_queue)) for(var/g in active_groups) if(MC_TICK_CHECK) - return + break var/datum/liquid_group/LG = g var/list/turfs = LG.fetch_temperature_queue() temperature_queue += turfs @@ -56,7 +56,7 @@ SUBSYSTEM_DEF(liquids) populate_evaporation = TRUE for(var/g in active_groups) if(MC_TICK_CHECK) - return + break var/datum/liquid_group/LG = g LG.build_turf_reagent() @@ -72,7 +72,7 @@ SUBSYSTEM_DEF(liquids) if(temperature_queue.len) for(var/tur in temperature_queue) if(MC_TICK_CHECK) - return + break var/turf/open/temperature_turf = tur temperature_queue -= temperature_turf if(!temperature_turf.liquids) @@ -86,13 +86,13 @@ SUBSYSTEM_DEF(liquids) evaporation_counter = 0 for(var/g in active_groups) if(MC_TICK_CHECK) - return + break var/datum/liquid_group/LG = g LG.check_dead() LG.process_turf_disperse() for(var/t in evaporation_queue) if(MC_TICK_CHECK) - return + break if(!prob(EVAPORATION_CHANCE)) evaporation_queue -= t continue @@ -105,18 +105,18 @@ SUBSYSTEM_DEF(liquids) fire_counter++ for(var/g in active_groups) if(MC_TICK_CHECK) - return + break var/datum/liquid_group/LG = g if(LG.burning_members.len) for(var/turf/burning_turf in LG.burning_members) if(MC_TICK_CHECK) - return + break LG.process_spread(burning_turf) if(fire_counter > REQUIRED_FIRE_PROCESSES) for(var/g in active_groups) if(MC_TICK_CHECK) - return + break var/datum/liquid_group/LG = g if(LG.burning_members.len) LG.process_fire() @@ -131,7 +131,7 @@ SUBSYSTEM_DEF(liquids) if(ocean_counter >= REQUIRED_OCEAN_PROCESSES) for(var/turf/open/floor/plating/ocean/active_ocean in currentrun_active_ocean_turfs) if(MC_TICK_CHECK) - return + break active_ocean.process_turf() ocean_counter = 0 run_type = SSLIQUIDS_RUN_TYPE_TURFS @@ -141,7 +141,7 @@ SUBSYSTEM_DEF(liquids) if(member_counter > REQUIRED_MEMBER_PROCESSES) for(var/g in active_groups) if(MC_TICK_CHECK) - return + break var/datum/liquid_group/LG = g LG.build_turf_reagent() if(!LG.exposure) From 40eb40f320b347383ed413a1afed401c2e8e14d4 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Thu, 21 Sep 2023 00:51:56 -0400 Subject: [PATCH 03/59] when i get to the pearly gates im gonna have a word with jod --- code/__DEFINES/liquids.dm | 2 +- code/__DEFINES/subsystems.dm | 1 - .../challenges/challenge_controller.dm | 1 - .../code/modules/liquids/liquid_controller.dm | 39 +++--- .../code/modules/liquids/liquid_groups.dm | 125 +++++++++++++++--- 5 files changed, 128 insertions(+), 40 deletions(-) diff --git a/code/__DEFINES/liquids.dm b/code/__DEFINES/liquids.dm index 362543279aec..eb5ddc3a0ed0 100644 --- a/code/__DEFINES/liquids.dm +++ b/code/__DEFINES/liquids.dm @@ -3,7 +3,7 @@ #define REQUIRED_MEMBER_PROCESSES 10 -#define REQUIRED_EVAPORATION_PROCESSES 20 +#define REQUIRED_EVAPORATION_PROCESSES 5 #define EVAPORATION_CHANCE 50 #define REQUIRED_FIRE_PROCESSES 10 diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 814d96bd9d95..0e997980863e 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -214,7 +214,6 @@ #define FIRE_PRIORITY_REAGENTS 26 #define FIRE_PRIORITY_SPACEDRIFT 30 #define FIRE_PRIORITY_HOTSPOT 30 -#define FIRE_PRIOTITY_LIQUIDS 30 #define FIRE_PRIORITY_SMOOTHING 35 #define FIRE_PRIORITY_OBJ 40 #define FIRE_PRIORITY_ACID 40 diff --git a/monkestation/code/modules/coin-events/challenges/challenge_controller.dm b/monkestation/code/modules/coin-events/challenges/challenge_controller.dm index a32a6306a25c..4b7296998516 100644 --- a/monkestation/code/modules/coin-events/challenges/challenge_controller.dm +++ b/monkestation/code/modules/coin-events/challenges/challenge_controller.dm @@ -2,7 +2,6 @@ SUBSYSTEM_DEF(challenges) name = "Challenges" wait = 10 SECONDS flags = SS_KEEP_TIMING | SS_NO_INIT - priority = FIRE_PRIOTITY_LIQUIDS runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME ///list of challenges that have something we need to process diff --git a/monkestation/code/modules/liquids/liquid_controller.dm b/monkestation/code/modules/liquids/liquid_controller.dm index 847fb5b7794d..d2693e7b7194 100644 --- a/monkestation/code/modules/liquids/liquid_controller.dm +++ b/monkestation/code/modules/liquids/liquid_controller.dm @@ -1,8 +1,7 @@ SUBSYSTEM_DEF(liquids) name = "Liquid Turfs" wait = 0.5 SECONDS - flags = SS_KEEP_TIMING | SS_NO_INIT - priority = FIRE_PRIOTITY_LIQUIDS + flags = SS_POST_FIRE_TIMING | SS_NO_INIT runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME var/list/active_groups = list() @@ -27,6 +26,9 @@ SUBSYSTEM_DEF(liquids) var/member_counter = 0 + var/list/arrayed_groups = list() + + /datum/controller/subsystem/liquids/stat_entry(msg) msg += "AG:[active_groups.len]|BT:[burning_turfs.len]|EQ:[evaporation_queue.len]|AO:[active_ocean_turfs.len]|UO:[length(unvalidated_oceans)]" return ..() @@ -38,13 +40,19 @@ SUBSYSTEM_DEF(liquids) if(length(unvalidated_oceans)) for(var/turf/open/floor/plating/ocean/unvalidated_turf in unvalidated_oceans) if(MC_TICK_CHECK) - break + return unvalidated_turf.assume_self() + if(length(arrayed_groups)) + for(var/g in arrayed_groups) + var/datum/liquid_group/LG = g + while(!MC_TICK_CHECK && length(LG.splitting_array)) // three at a time until we either finish or over-run, this should be done before anything else + LG.work_on_split_queue() + if(!length(temperature_queue)) for(var/g in active_groups) if(MC_TICK_CHECK) - break + return var/datum/liquid_group/LG = g var/list/turfs = LG.fetch_temperature_queue() temperature_queue += turfs @@ -56,7 +64,7 @@ SUBSYSTEM_DEF(liquids) populate_evaporation = TRUE for(var/g in active_groups) if(MC_TICK_CHECK) - break + return var/datum/liquid_group/LG = g LG.build_turf_reagent() @@ -72,7 +80,7 @@ SUBSYSTEM_DEF(liquids) if(temperature_queue.len) for(var/tur in temperature_queue) if(MC_TICK_CHECK) - break + return var/turf/open/temperature_turf = tur temperature_queue -= temperature_turf if(!temperature_turf.liquids) @@ -86,13 +94,14 @@ SUBSYSTEM_DEF(liquids) evaporation_counter = 0 for(var/g in active_groups) if(MC_TICK_CHECK) - break + return var/datum/liquid_group/LG = g LG.check_dead() - LG.process_turf_disperse() + if(!length(LG.splitting_array)) + LG.process_turf_disperse() for(var/t in evaporation_queue) if(MC_TICK_CHECK) - break + return if(!prob(EVAPORATION_CHANCE)) evaporation_queue -= t continue @@ -105,18 +114,18 @@ SUBSYSTEM_DEF(liquids) fire_counter++ for(var/g in active_groups) if(MC_TICK_CHECK) - break + return var/datum/liquid_group/LG = g if(LG.burning_members.len) for(var/turf/burning_turf in LG.burning_members) if(MC_TICK_CHECK) - break + return LG.process_spread(burning_turf) if(fire_counter > REQUIRED_FIRE_PROCESSES) for(var/g in active_groups) if(MC_TICK_CHECK) - break + return var/datum/liquid_group/LG = g if(LG.burning_members.len) LG.process_fire() @@ -131,7 +140,7 @@ SUBSYSTEM_DEF(liquids) if(ocean_counter >= REQUIRED_OCEAN_PROCESSES) for(var/turf/open/floor/plating/ocean/active_ocean in currentrun_active_ocean_turfs) if(MC_TICK_CHECK) - break + return active_ocean.process_turf() ocean_counter = 0 run_type = SSLIQUIDS_RUN_TYPE_TURFS @@ -141,14 +150,14 @@ SUBSYSTEM_DEF(liquids) if(member_counter > REQUIRED_MEMBER_PROCESSES) for(var/g in active_groups) if(MC_TICK_CHECK) - break + return var/datum/liquid_group/LG = g LG.build_turf_reagent() if(!LG.exposure) continue for(var/turf/member in LG.members) if(MC_TICK_CHECK) - break + return LG.process_member(member) member_counter = 0 run_type = SSLIQUIDS_RUN_TYPE_GROUPS diff --git a/monkestation/code/modules/liquids/liquid_groups.dm b/monkestation/code/modules/liquids/liquid_groups.dm index d156813faec6..e25c4e33bcc0 100644 --- a/monkestation/code/modules/liquids/liquid_groups.dm +++ b/monkestation/code/modules/liquids/liquid_groups.dm @@ -64,6 +64,8 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE) var/loss_precent = 1 ///do we have any containing expose turf chemicals with volume to look for? var/exposure = FALSE + ///array generated by bulk splitting + var/list/splitting_array = list() ///NEW/DESTROY /datum/liquid_group/New(height, obj/effect/abstract/liquid_turf/created_liquid) @@ -77,6 +79,10 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE) /datum/liquid_group/Destroy() SSliquids.active_groups -= src + + if(src in SSliquids.arrayed_groups) + SSliquids.arrayed_groups -= src /// Someone made a massive fucky wucky if this is happening + for(var/t in members) var/turf/T = t T.liquids.liquid_group = null @@ -246,29 +252,28 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE) return var/list/removed_turf = list() - var/recursion_sanity = 0 - while(reagents_per_turf < 5 && recursion_sanity <= 200) - recursion_sanity++ - if(members && members.len) - var/turf/picked_turf = pick(members) - if(picked_turf.liquids) - remove_from_group(picked_turf) - qdel(picked_turf.liquids) - removed_turf |= picked_turf - if(!total_reagent_volume) - reagents_per_turf = 0 + if(reagents_per_turf < 5) + var/turfs_to_remove = round(length(members) - (total_reagent_volume / 6)) + if(turfs_to_remove <= 0) + return + while(turfs_to_remove > 0) + turfs_to_remove-- + if(members && members.len) + var/turf/picked_turf = pick(members) + if(picked_turf.liquids) + remove_from_group(picked_turf) + qdel(picked_turf.liquids) + removed_turf |= picked_turf + if(!total_reagent_volume) + reagents_per_turf = 0 + else + reagents_per_turf = total_reagent_volume / length(members) else - reagents_per_turf = total_reagent_volume / length(members) - else - members -= picked_turf - - while(removed_turf.len) - var/turf/picked_turf = pick(removed_turf) - var/list/output = try_split(picked_turf, TRUE) - removed_turf -= picked_turf - for(var/turf/outputted_turf in output) - if(outputted_turf in removed_turf) - removed_turf -= outputted_turf + members -= picked_turf + + if(!length(removed_turf)) + return + try_bulk_split(removed_turf) ///REAGENT ADD/REMOVAL HANDLING /datum/liquid_group/proc/check_liquid_removal(obj/effect/abstract/liquid_turf/remover, amount) @@ -714,6 +719,82 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE) return TRUE +/datum/liquid_group/proc/try_bulk_split(list/input_turfs) + var/list/connected_array = list() + for(var/turf/listed_input in input_turfs) + for(var/turf/cardinal in listed_input.get_atmos_adjacent_turfs()) + var/exists_already = FALSE + for(var/list/arrayed_item in connected_array) + if(cardinal in arrayed_item) + exists_already = TRUE + break + if(!exists_already) + if(cardinal.liquids) + var/list/temp = return_connected_liquids(cardinal.liquids) + if(isnull(temp) || !length(temp)) + continue + connected_array += list(temp) + + if(!length(connected_array)) + return + + splitting_array = connected_array + SSliquids.arrayed_groups += src + +///we try and work on the split queue from this point on +/datum/liquid_group/proc/work_on_split_queue() + if(!length(splitting_array)) + SSliquids.arrayed_groups -= src + return + + var/list/plucked_array = list() + var/pick_count = 3 + while(pick_count > 0 && length(splitting_array)) + var/list/temp = pick(splitting_array) + plucked_array += list(temp) + splitting_array -= list(temp) + + if(!length(splitting_array)) + SSliquids.arrayed_groups -= src + + for(var/list/connected_liquids in plucked_array) + if(isnull(connected_liquids) || !length(connected_liquids)) + continue + + var/amount_to_transfer = length(connected_liquids) * reagents_per_turf + + members -= connected_liquids + var/datum/liquid_group/new_group = new(1) + new_group.members += connected_liquids + + for(var/turf/connected_liquid in connected_liquids) + new_group.check_edges(connected_liquid) + + if(connected_liquid in burning_members) + new_group.burning_members |= connected_liquid + remove_from_group(connected_liquid, TRUE) + new_group.add_to_group(connected_liquid) + + trans_to_seperate_group(new_group.reagents, amount_to_transfer) + new_group.total_reagent_volume = new_group.reagents.total_volume + new_group.reagents_per_turf = new_group.total_reagent_volume / length(new_group.members) + + ///asses the group to see if it should exist + var/new_group_length = length(new_group.members) + if(new_group.total_reagent_volume == 0 || new_group.reagents_per_turf == 0 || !new_group_length) + qdel(new_group) + return + + for(var/turf/new_turf in new_group.members) + if(new_turf in members) + new_group.members -= new_turf + + if(!new_group.members.len) + qdel(new_group) + return + + + ///EXPOSURE AND SPREADING /datum/liquid_group/proc/expose_members_turf(obj/effect/abstract/liquid_turf/member) if(!turf_reagents) From 57a3c1f1019f205cd2e109585ecbbb8c585ce248 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Thu, 21 Sep 2023 16:48:54 -0400 Subject: [PATCH 04/59] admins should know when a despawn happens, trench ladders, pit cleanup --- code/game/turfs/open/floor/plating.dm | 103 +++++++++--------- goon/icons/obj/fluid.dmi | Bin 0 -> 375 bytes .../code/modules/cryopods/_cryopod.dm | 5 + .../code/modules/liquids/liquid_ocean.dm | 50 +++++++++ .../ocean_content/fluff/trench_ladder.dm | 71 ++++++++++++ tgstation.dme | 1 + 6 files changed, 179 insertions(+), 51 deletions(-) create mode 100644 goon/icons/obj/fluid.dmi create mode 100644 monkestation/code/modules/ocean_content/fluff/trench_ladder.dm diff --git a/code/game/turfs/open/floor/plating.dm b/code/game/turfs/open/floor/plating.dm index 56bd70107304..993deb3aedef 100644 --- a/code/game/turfs/open/floor/plating.dm +++ b/code/game/turfs/open/floor/plating.dm @@ -49,63 +49,64 @@ /turf/open/floor/plating/attackby(obj/item/C, mob/user, params) if(..()) return - if(istype(C, /obj/item/stack/rods) && attachment_holes) - if(broken || burnt) - if(!iscyborg(user)) - to_chat(user, span_warning("Repair the plating first! Use a welding tool to fix the damage.")) - else - to_chat(user, span_warning("Repair the plating first! Use a welding tool or a plating repair tool to fix the damage.")) //we don't need to confuse humans by giving them a message about plating repair tools, since only janiborgs should have access to them outside of Christmas presents or admin intervention - return - var/obj/item/stack/rods/R = C - if (R.get_amount() < 2) - to_chat(user, span_warning("You need two rods to make a reinforced floor!")) - return - else - to_chat(user, span_notice("You begin reinforcing the floor...")) - if(do_after(user, 30, target = src)) - if (R.get_amount() >= 2 && !istype(src, /turf/open/floor/engine)) - PlaceOnTop(/turf/open/floor/engine, flags = CHANGETURF_INHERIT_AIR) - playsound(src, 'sound/items/deconstruct.ogg', 80, TRUE) - R.use(2) - to_chat(user, span_notice("You reinforce the floor.")) + if(!overwrites_attack_by) + if(istype(C, /obj/item/stack/rods) && attachment_holes) + if(broken || burnt) + if(!iscyborg(user)) + to_chat(user, span_warning("Repair the plating first! Use a welding tool to fix the damage.")) + else + to_chat(user, span_warning("Repair the plating first! Use a welding tool or a plating repair tool to fix the damage.")) //we don't need to confuse humans by giving them a message about plating repair tools, since only janiborgs should have access to them outside of Christmas presents or admin intervention + return + var/obj/item/stack/rods/R = C + if (R.get_amount() < 2) + to_chat(user, span_warning("You need two rods to make a reinforced floor!")) return - else if(istype(C, /obj/item/stack/tile)) - if(!broken && !burnt) - for(var/obj/O in src) - for(var/M in O.buckled_mobs) - to_chat(user, span_warning("Someone is buckled to \the [O]! Unbuckle [M] to move \him out of the way.")) + else + to_chat(user, span_notice("You begin reinforcing the floor...")) + if(do_after(user, 30, target = src)) + if (R.get_amount() >= 2 && !istype(src, /turf/open/floor/engine)) + PlaceOnTop(/turf/open/floor/engine, flags = CHANGETURF_INHERIT_AIR) + playsound(src, 'sound/items/deconstruct.ogg', 80, TRUE) + R.use(2) + to_chat(user, span_notice("You reinforce the floor.")) return - var/obj/item/stack/tile/tile = C - tile.place_tile(src, user) - else - if(!iscyborg(user)) - balloon_alert(user, "too damaged, use a welding tool!") + else if(istype(C, /obj/item/stack/tile)) + if(!broken && !burnt) + for(var/obj/O in src) + for(var/M in O.buckled_mobs) + to_chat(user, span_warning("Someone is buckled to \the [O]! Unbuckle [M] to move \him out of the way.")) + return + var/obj/item/stack/tile/tile = C + tile.place_tile(src, user) else - balloon_alert(user, "too damaged, use a welding or plating repair tool!") - else if(istype(C, /obj/item/cautery/prt)) //plating repair tool - if((broken || burnt) && C.use_tool(src, user, 0, volume=80)) - to_chat(user, span_danger("You fix some dents on the broken plating.")) - icon_state = base_icon_state - burnt = FALSE - broken = FALSE - update_appearance() - else if(istype(C, /obj/item/stack/sheet/plasteel) && upgradable) //Reinforcement! - if(!broken && !burnt) - var/obj/item/stack/sheet/sheets = C - if(sheets.get_amount() < PLATE_REINFORCE_COST) - return - balloon_alert(user, "reinforcing plating...") - if(do_after(user, 12 SECONDS, target = src)) + if(!iscyborg(user)) + balloon_alert(user, "too damaged, use a welding tool!") + else + balloon_alert(user, "too damaged, use a welding or plating repair tool!") + else if(istype(C, /obj/item/cautery/prt)) //plating repair tool + if((broken || burnt) && C.use_tool(src, user, 0, volume=80)) + to_chat(user, span_danger("You fix some dents on the broken plating.")) + icon_state = base_icon_state + burnt = FALSE + broken = FALSE + update_appearance() + else if(istype(C, /obj/item/stack/sheet/plasteel) && upgradable) //Reinforcement! + if(!broken && !burnt) + var/obj/item/stack/sheet/sheets = C if(sheets.get_amount() < PLATE_REINFORCE_COST) return - sheets.use(PLATE_REINFORCE_COST) - playsound(src, 'sound/machines/creak.ogg', 100, vary = TRUE) - PlaceOnTop(/turf/open/floor/plating/reinforced) - else - if(!iscyborg(user)) - balloon_alert(user, "too damaged, use a welding tool!") + balloon_alert(user, "reinforcing plating...") + if(do_after(user, 12 SECONDS, target = src)) + if(sheets.get_amount() < PLATE_REINFORCE_COST) + return + sheets.use(PLATE_REINFORCE_COST) + playsound(src, 'sound/machines/creak.ogg', 100, vary = TRUE) + PlaceOnTop(/turf/open/floor/plating/reinforced) else - balloon_alert(user, "too damaged, use a welding or plating repair tool!") + if(!iscyborg(user)) + balloon_alert(user, "too damaged, use a welding tool!") + else + balloon_alert(user, "too damaged, use a welding or plating repair tool!") /turf/open/floor/plating/welder_act(mob/living/user, obj/item/I) diff --git a/goon/icons/obj/fluid.dmi b/goon/icons/obj/fluid.dmi new file mode 100644 index 0000000000000000000000000000000000000000..b7b7c6549fdd216994ff6d67082c0d1272147b58 GIT binary patch literal 375 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQlbGqA+A1|h5s3hJv=;SG8nhE zwkD^f^!4@qE!Xh@Dqt)L@(X5gcy=QV$SJN0i70VNElw`VEGWs$&tqVym=hdUP*nQ; zOK`!*uTQkRb+yi&IUl?s)Zn7=gGV~&eKb!p6!rA(urLlXzHIEJFz3;vBa=cDf;H6* zRaLiY*xCDcb{ng1ULm28cH-#FuqiWUb0sFP@bNypG$iui)$^=xxEMCR(Fo`5NpS{R zKhe|0F~p)bIe~%6jaA^J%7F%M17{J52O$TT0v|YRVd4?y)D9?QWK!S3Bz84Gfx{`H zQ?FrNW237sFUO=0GaA-0ob{D(GjjHEC{md<@r(d32WyXjGHXHRfe+@(q%W`-)HW_- zILxc^o9QyIO1p|%%mkT90_FiilO*ySK8rn^;8M=~Qql9biKjulfY0O;`xqE%ABTL{ T>t1^j=r{&XS3j3^P6[span_userdanger("Your target is no longer within reach. Objective removed!")]") + message_admins("[mob_occupant] is being despawned when they are an objective of [mind.current].") mind.announce_objectives() else if(istype(objective.target) && objective.target == mob_occupant.mind) var/old_target = objective.target @@ -283,16 +284,19 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod, 32) objective.find_target() if(!objective.target && objective.owner) to_chat(objective.owner.current, "
[span_userdanger("Your target is no longer within reach. Objective removed!")]") + message_admins("[mob_occupant] is being despawned when they are an objective of [objective.owner.current].") for(var/datum/antagonist/antag in objective.owner.antag_datums) antag.objectives -= objective if (!objective.team) objective.update_explanation_text() objective.owner.announce_objectives() to_chat(objective.owner.current, "
[span_userdanger("You get the feeling your target is no longer within reach. Time for Plan [pick("A","B","C","D","X","Y","Z")]. Objectives updated!")]") + message_admins("[mob_occupant] is being despawned when they are an objective of [objective.owner.current].") else var/list/objectivestoupdate for(var/datum/mind/objective_owner in objective.get_owners()) to_chat(objective_owner.current, "
[span_userdanger("You get the feeling your target is no longer within reach. Time for Plan [pick("A","B","C","D","X","Y","Z")]. Objectives updated!")]") + message_admins("[mob_occupant] is being despawned when they are an objective of [objective_owner.current].") for(var/datum/objective/update_target_objective in objective_owner.get_all_objectives()) LAZYADD(objectivestoupdate, update_target_objective) objectivestoupdate += objective.team.objectives @@ -302,6 +306,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod, 32) update_objective.target = objective.target update_objective.update_explanation_text() to_chat(objective.owner.current, "
[span_userdanger("You get the feeling your target is no longer within reach. Time for Plan [pick("A","B","C","D","X","Y","Z")]. Objectives updated!")]") + message_admins("[mob_occupant] is being despawned when they are an objective of [objective.owner.current].") update_objective.owner.announce_objectives() qdel(objective) diff --git a/monkestation/code/modules/liquids/liquid_ocean.dm b/monkestation/code/modules/liquids/liquid_ocean.dm index 9518d38dca06..e661207a2d84 100644 --- a/monkestation/code/modules/liquids/liquid_ocean.dm +++ b/monkestation/code/modules/liquids/liquid_ocean.dm @@ -55,6 +55,9 @@ GLOBAL_LIST_INIT(initalized_ocean_areas, list()) . = ..() ChangeTurf(replacement_turf, null, CHANGETURF_IGNORE_AIR) +/turf/open/floor/plating + ///do we still call parent but dont want other stuff? + var/overwrites_attack_by = FALSE /turf/open/floor/plating/ocean plane = FLOOR_PLANE layer = TURF_LAYER @@ -72,6 +75,8 @@ GLOBAL_LIST_INIT(initalized_ocean_areas, list()) planetary_atmos = TRUE initial_gas_mix = OSHAN_DEFAULT_ATMOS + overwrites_attack_by = TRUE + var/static/obj/effect/abstract/ocean_overlay/static_overlay var/static/list/ocean_reagents = list(/datum/reagent/water = 10) var/ocean_temp = T20C @@ -89,6 +94,9 @@ GLOBAL_LIST_INIT(initalized_ocean_areas, list()) /// Whether the turf has been dug or not var/dug = FALSE + /// do we build a catwalk or plating with rods + var/catwalk = FALSE + /turf/open/floor/plating/ocean/Initialize() . = ..() RegisterSignal(src, COMSIG_ATOM_ENTERED, PROC_REF(movable_entered)) @@ -115,6 +123,37 @@ GLOBAL_LIST_INIT(initalized_ocean_areas, list()) for(var/turf/open/floor/plating/ocean/listed_ocean as anything in ocean_turfs) listed_ocean.rebuild_adjacent() +/turf/open/floor/plating/ocean/attackby(obj/item/C, mob/user, params) + if(..()) + return + if(istype(C, /obj/item/stack/rods)) + var/obj/item/stack/rods/R = C + if (R.get_amount() < 2) + to_chat(user, span_warning("You need two rods to make a [catwalk ? "catwalk" : "plating"]!")) + return + else + to_chat(user, span_notice("You begin constructing a [catwalk ? "catwalk" : "plating"]...")) + if(do_after(user, 30, target = src)) + if (R.get_amount() >= 2 && !catwalk) + PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) + playsound(src, 'sound/items/deconstruct.ogg', 80, TRUE) + R.use(2) + to_chat(user, span_notice("You reinforce the [src].")) + else if(R.get_amount() >= 2 && catwalk) + new /obj/structure/lattice/catwalk(src) + playsound(src, 'sound/items/deconstruct.ogg', 80, TRUE) + R.use(2) + to_chat(user, span_notice("You build a catwalk over the [src].")) + + if(istype(C, /obj/item/trench_ladder_kit) && catwalk && is_safe()) + to_chat(user, span_notice("You begin constructing a ladder...")) + if(do_after(user, 30, target = src)) + qdel(C) + new /obj/structure/trench_ladder(src) + + + + /// Drops itemstack when dug and changes icon /turf/open/floor/plating/ocean/proc/getDug() dug = TRUE @@ -583,18 +622,29 @@ GLOBAL_LIST_INIT(the_lever, list()) icon = 'goon/icons/turf/outdoors.dmi' icon_state = "pit" baseturfs = /turf/open/floor/plating/ocean/pit + catwalk = TRUE /turf/open/floor/plating/ocean/pit/wall icon_state = "pit_wall" /turf/open/floor/plating/ocean/pit/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) . = ..() + if(is_safe()) + return + if(arrived.movement_type & FLYING) + return if(isprojectile(arrived)) return var/turf/turf = locate(src.x, src.y, SSmapping.levels_by_trait(ZTRAIT_MINING)[1]) visible_message("[arrived] falls helplessly into \the [src]") arrived.forceMove(turf) +/turf/open/floor/plating/ocean/proc/is_safe() + //if anything matching this typecache is found in the lava, we don't drop things + var/static/list/lava_safeties_typecache = typecacheof(list(/obj/structure/lattice/catwalk, /obj/structure/lattice/lava)) + var/list/found_safeties = typecache_filter_list(contents, lava_safeties_typecache) + return LAZYLEN(found_safeties) + /turf/closed/mineral/random/ocean/gets_drilled(mob/user, give_exp) SShotspots.disturb_turf(src) . = ..() diff --git a/monkestation/code/modules/ocean_content/fluff/trench_ladder.dm b/monkestation/code/modules/ocean_content/fluff/trench_ladder.dm new file mode 100644 index 000000000000..711a7ff7a5a5 --- /dev/null +++ b/monkestation/code/modules/ocean_content/fluff/trench_ladder.dm @@ -0,0 +1,71 @@ +/obj/item/trench_ladder_kit + name = "sea ladder" + desc = "A deployable sea ladder that will allow you to descend to and ascend from the trench." + + icon = 'goon/icons/obj/fluid.dmi' + icon_state = "ladder_off" + +/obj/structure/trench_ladder + name = "sea ladder" + desc = "A deployable sea ladder that will allow you to descend to and ascend from the trench." + + icon = 'goon/icons/obj/fluid.dmi' + icon_state = "ladder_on" + + var/obj/structure/trench_ladder/linked_ladder + var/obj/item/trench_ladder_kit/real_item + +/obj/structure/trench_ladder/Initialize(mapload) + . = ..() + if(src.z in SSmapping.levels_by_trait(ZTRAIT_STATION)) + var/turf/turf = locate(src.x, src.y, SSmapping.levels_by_trait(ZTRAIT_MINING)[1]) + var/obj/structure/trench_ladder/search = locate(/obj/structure/trench_ladder) in turf.contents + if(search) + search.linked_ladder = src + if(search.real_item) + real_item = search.real_item + else + real_item = new(src) + search.real_item = real_item + else + new /obj/structure/trench_ladder(turf) + + else if(src.z in SSmapping.levels_by_trait(ZTRAIT_MINING)) + var/turf/turf = locate(src.x, src.y, SSmapping.levels_by_trait(ZTRAIT_STATION)[1]) + var/obj/structure/trench_ladder/search = locate(/obj/structure/trench_ladder) in turf.contents + if(search) + search.linked_ladder = src + if(search.real_item) + real_item = search.real_item + else + real_item = new(src) + search.real_item = real_item + else + new /obj/structure/trench_ladder(turf) + +/obj/structure/trench_ladder/Destroy() + . = ..() + if(linked_ladder) + linked_ladder = null + if(real_item) + real_item = null + +/obj/structure/trench_ladder/attack_hand(mob/living/user, list/modifiers) + . = ..() + if(!linked_ladder) + return + + to_chat(user, span_notice("You begin climbing down [src]...")) + if(do_after(user, 30, target = src)) + user.Move(get_turf(linked_ladder)) + +/obj/structure/trench_ladder/wrench_act(mob/living/user, obj/item/tool) + . = ..() + to_chat(user, span_notice("You begin dismantling [src]...")) + if(do_after(user, 30, target = src)) + linked_ladder.real_item = null + qdel(linked_ladder) + real_item.Move(get_turf(src)) + real_item = null + linked_ladder = null + qdel(src) diff --git a/tgstation.dme b/tgstation.dme index 663fb1bbe32a..ae7e72b31a6b 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5947,6 +5947,7 @@ #include "monkestation\code\modules\ocean_content\fluff\industrial_power_cables.dm" #include "monkestation\code\modules\ocean_content\fluff\launching.dm" #include "monkestation\code\modules\ocean_content\fluff\ocean_elevators.dm" +#include "monkestation\code\modules\ocean_content\fluff\trench_ladder.dm" #include "monkestation\code\modules\ocean_content\hotspot\center.dm" #include "monkestation\code\modules\ocean_content\hotspot\hotspot.dm" #include "monkestation\code\modules\ocean_content\hotspot\hotspot_controller.dm" From 8d7bafcaa7d62a916e4e31afdb07d418598affd6 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Thu, 21 Sep 2023 18:24:50 -0400 Subject: [PATCH 05/59] breaching charges --- goon/icons/breaching_charge.dmi | Bin 0 -> 531 bytes .../code/modules/cargo/crates/engineering.dm | 10 ++++++ .../code/modules/liquids/liquid_ocean.dm | 14 +++++++- .../ocean_content/fluff/breaching_charge.dm | 30 ++++++++++++++++++ .../ocean_content/fluff/trench_ladder.dm | 12 +++++-- tgstation.dme | 1 + 6 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 goon/icons/breaching_charge.dmi create mode 100644 monkestation/code/modules/ocean_content/fluff/breaching_charge.dm diff --git a/goon/icons/breaching_charge.dmi b/goon/icons/breaching_charge.dmi new file mode 100644 index 0000000000000000000000000000000000000000..3ec0b20c6f1c9c120ebcec95c348b55d0af1978e GIT binary patch literal 531 zcmV+u0_^>XP)P)t-sOlffl z4*&`r01PPr5lR3lEC5eUO(-J(vSuJJCIB8D9zHJ~3kwVa0s}%k9)d;|Olff?DF7i4 z0LD-`F&qFd9v)F19)b!MvMeByp{}|B0004WQchCV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pS zoZ^zil2jm5DJeN4u_!%NiHkEOv#1y-V#vjrR+N~V3SpzGGs3PAXnIO&PGTiUSjUh{ zS;5uM1?(IE_-HAirA3Y90002)Nkl3Mj%QW~dbX^x;^A@1^&KL4BoWJA!=NXfn!M;E6 z8B_z55Cm7Of9yxj ze||t4NC4V^15ij6AcQFS+X0kvCJDD7`6iRe^f{^huSxBH6`=LMrrP@_q5oAtIs5r? zZO@?oIBf_~?f*3ZvHvxx{jY97{Xg9%w*S=)sJ`d>%+~iR0Bz6;Q0x2a0PFuB)&pZg V3{rym#Tozr002ovPDHLkV1l2t)w}=z literal 0 HcmV?d00001 diff --git a/monkestation/code/modules/cargo/crates/engineering.dm b/monkestation/code/modules/cargo/crates/engineering.dm index 0f3411a773e5..b641fbb774fc 100644 --- a/monkestation/code/modules/cargo/crates/engineering.dm +++ b/monkestation/code/modules/cargo/crates/engineering.dm @@ -112,3 +112,13 @@ ) crate_name = "Replacement Science Protolathe" crate_type = /obj/structure/closet/crate/secure/engineering + +/datum/supply_pack/engineering/trench_explorer + name = "Trench Explorer Kit" + desc = "A pack of 5 ladders and breaching charges to explore the pit." + cost = CARGO_CRATE_VALUE * 10 + contains = list( + /obj/item/mining_charge = 5, + /obj/item/trench_ladder_kit = 5 + ) + crate_name = "engineering vent crate" diff --git a/monkestation/code/modules/liquids/liquid_ocean.dm b/monkestation/code/modules/liquids/liquid_ocean.dm index e661207a2d84..02a6c92ab0df 100644 --- a/monkestation/code/modules/liquids/liquid_ocean.dm +++ b/monkestation/code/modules/liquids/liquid_ocean.dm @@ -75,6 +75,11 @@ GLOBAL_LIST_INIT(initalized_ocean_areas, list()) planetary_atmos = TRUE initial_gas_mix = OSHAN_DEFAULT_ATMOS + upgradable = FALSE + attachment_holes = FALSE + + resistance_flags = INDESTRUCTIBLE + overwrites_attack_by = TRUE var/static/obj/effect/abstract/ocean_overlay/static_overlay @@ -151,7 +156,14 @@ GLOBAL_LIST_INIT(initalized_ocean_areas, list()) qdel(C) new /obj/structure/trench_ladder(src) - + if(istype(C, /obj/item/mining_charge) && !catwalk) + to_chat(user, span_notice("You begin laying down a breaching charge...")) + if(do_after(user, 15, target = src)) + var/obj/item/mining_charge/boom = C + user.dropItemToGround(boom) + boom.Move(src) + boom.set_explosion() + to_chat(user, span_warning("You lay down a breaching charge, you better run.")) /// Drops itemstack when dug and changes icon diff --git a/monkestation/code/modules/ocean_content/fluff/breaching_charge.dm b/monkestation/code/modules/ocean_content/fluff/breaching_charge.dm new file mode 100644 index 000000000000..ff1a19a48bbc --- /dev/null +++ b/monkestation/code/modules/ocean_content/fluff/breaching_charge.dm @@ -0,0 +1,30 @@ +/obj/item/mining_charge + name = "sea floor breaching charge" + desc = "Mining grade explosives, useful for busting a hole down to the trench." + + icon = 'goon/icons/breaching_charge.dmi' + icon_state = "bcharge" + + ///how long until kaboom + var/prime_time = 5 SECONDS + + ///explosion vars + var/flash_range = 2 + var/minor_range = 3 + + +/obj/item/mining_charge/proc/set_explosion() + anchored = TRUE + icon_state = "bcharge2" + addtimer(CALLBACK(src, PROC_REF(kaboom)), prime_time) + +/obj/item/mining_charge/proc/kaboom() + var/turf/turf = get_turf(src) + explosion(turf, 0, 0, minor_range, 0, flash_range, TRUE) + if(istype(turf, /turf/open/floor/plating/ocean)) + turf.TerraformTurf(/turf/open/floor/plating/ocean/pit, /turf/open/floor/plating/ocean/pit, flags = CHANGETURF_INHERIT_AIR) + turf.get_sky_and_weather_states() + turf.reconsider_sunlight() + turf.outdoor_effect.Move(turf) + turf.contents |= turf.outdoor_effect + qdel(src) diff --git a/monkestation/code/modules/ocean_content/fluff/trench_ladder.dm b/monkestation/code/modules/ocean_content/fluff/trench_ladder.dm index 711a7ff7a5a5..bf255c6c3781 100644 --- a/monkestation/code/modules/ocean_content/fluff/trench_ladder.dm +++ b/monkestation/code/modules/ocean_content/fluff/trench_ladder.dm @@ -19,6 +19,8 @@ . = ..() if(src.z in SSmapping.levels_by_trait(ZTRAIT_STATION)) var/turf/turf = locate(src.x, src.y, SSmapping.levels_by_trait(ZTRAIT_MINING)[1]) + if(isclosedturf(turf)) + turf.TerraformTurf(/turf/open/floor/plating/ocean/dark/rock/heavy, /turf/open/floor/plating/ocean/dark/rock/heavy, flags = CHANGETURF_INHERIT_AIR) var/obj/structure/trench_ladder/search = locate(/obj/structure/trench_ladder) in turf.contents if(search) search.linked_ladder = src @@ -28,7 +30,10 @@ real_item = new(src) search.real_item = real_item else - new /obj/structure/trench_ladder(turf) + real_item = new(src) + var/obj/structure/trench_ladder/ladder = new /obj/structure/trench_ladder(turf) + ladder.linked_ladder = src + ladder.real_item = real_item else if(src.z in SSmapping.levels_by_trait(ZTRAIT_MINING)) var/turf/turf = locate(src.x, src.y, SSmapping.levels_by_trait(ZTRAIT_STATION)[1]) @@ -41,7 +46,10 @@ real_item = new(src) search.real_item = real_item else - new /obj/structure/trench_ladder(turf) + real_item = new(src) + var/obj/structure/trench_ladder/ladder = new /obj/structure/trench_ladder(turf) + ladder.linked_ladder = src + ladder.real_item = real_item /obj/structure/trench_ladder/Destroy() . = ..() diff --git a/tgstation.dme b/tgstation.dme index ae7e72b31a6b..986839c784b2 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5942,6 +5942,7 @@ #include "monkestation\code\modules\mob\living\simple_animal\pets\honk_platinum.dm" #include "monkestation\code\modules\ocean_content\fluff\barrier.dm" #include "monkestation\code\modules\ocean_content\fluff\base_turf_editor.dm" +#include "monkestation\code\modules\ocean_content\fluff\breaching_charge.dm" #include "monkestation\code\modules\ocean_content\fluff\cargo_driver.dm" #include "monkestation\code\modules\ocean_content\fluff\industrial_pipes.dm" #include "monkestation\code\modules\ocean_content\fluff\industrial_power_cables.dm" From 1f491b63b60e8e1b98375f83dc44f01d11864beb Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Thu, 21 Sep 2023 21:42:27 -0400 Subject: [PATCH 06/59] cleanses bad members --- monkestation/code/modules/liquids/liquid_groups.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/monkestation/code/modules/liquids/liquid_groups.dm b/monkestation/code/modules/liquids/liquid_groups.dm index e25c4e33bcc0..b615ed7aaea9 100644 --- a/monkestation/code/modules/liquids/liquid_groups.dm +++ b/monkestation/code/modules/liquids/liquid_groups.dm @@ -177,6 +177,7 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE) if(group_temperature != reagents.chem_temp) reagents.chem_temp = group_temperature + cleanse_members() handle_visual_changes() reagents.my_atom = pick(members) /// change the location of explosions and sounds every group process @@ -215,6 +216,11 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE) member.liquids.set_new_liquid_state(group_overlay_state) member.liquid_height = expected_turf_height + member.turf_height +/datum/liquid_group/proc/cleanse_members() + for(var/turf/listed_turf as anything in members) + if(isclosedturf(listed_turf)) + remove_from_group(listed_turf) + /datum/liquid_group/proc/process_member(turf/member) if(isspaceturf(member)) remove_any(member.liquids, reagents_per_turf) From a2f52dfb260ba8396e3a8ec2b3f70688b88ab78d Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Thu, 21 Sep 2023 22:59:26 -0400 Subject: [PATCH 07/59] Update cargo_driver.dm --- monkestation/code/modules/ocean_content/fluff/cargo_driver.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/monkestation/code/modules/ocean_content/fluff/cargo_driver.dm b/monkestation/code/modules/ocean_content/fluff/cargo_driver.dm index 31e04b5fc5e2..f7d8d11e3951 100644 --- a/monkestation/code/modules/ocean_content/fluff/cargo_driver.dm +++ b/monkestation/code/modules/ocean_content/fluff/cargo_driver.dm @@ -1,5 +1,5 @@ /obj/machinery/mass_driver/cargo_driver - name = "cargo_driver" + name = "Cargo Driver" id = MASSDRIVER_CARGO /obj/machinery/mass_driver/drive(amount) @@ -67,6 +67,8 @@ var/list/deletors = list() for(var/atom/movable/listed_atom in ex.exported_atoms_source) + if(isliving(listed_atom)) + continue if(listed_atom in contents_self) deletors += listed_atom contents_self -= listed_atom From b29fc02b6aea73a6f686e6982903e7576d682a4b Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Fri, 22 Sep 2023 01:11:18 -0400 Subject: [PATCH 08/59] boosts heat costs of explosions massively --- .../modules/ocean_content/hotspot/hotspot.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/monkestation/code/modules/ocean_content/hotspot/hotspot.dm b/monkestation/code/modules/ocean_content/hotspot/hotspot.dm index a13d3f72993e..42a57587abb4 100644 --- a/monkestation/code/modules/ocean_content/hotspot/hotspot.dm +++ b/monkestation/code/modules/ocean_content/hotspot/hotspot.dm @@ -120,7 +120,7 @@ #define WEAK_EXPLOSION 16 #define EXPLOSION 32 -#define SUBCALL_HEATCOST 8000 +#define SUBCALL_HEATCOST 9500 /datum/hotspot/proc/after_move_effect(subcalls = 1, subcall_heat) var/turf/center_turf = center.return_turf() @@ -135,22 +135,22 @@ ///event flags var/event_flags - ///we need to somehow convert a value into a list of flags we are gonna do this via a switch statement + ///we need to somehow convert a value into a list of flags we are gonna do this via a switch statement, now with 100% more distribution to quakes switch(heat) ///QUAKES - if(200 to 899) + if(200 to 1999) event_flags = WEAK_QUAKE - if(900 to 1799) + if(2000 to 3999) event_flags = QUAKE ///FIRES - if(1800 to 2799) + if(4000 to 4999) event_flags = QUAKE | WEAK_FIRE - if(2800 to 4399) + if(5000 to 5999) event_flags = QUAKE | FIRE_EVENT ///EXPLOSIONS - if(4400 to 5499) + if(6000 to 6999) event_flags = QUAKE | FIRE_EVENT | WEAK_EXPLOSION - if(5500 to INFINITY) + if(7000 to INFINITY) event_flags = QUAKE | FIRE_EVENT | EXPLOSION ///quakes are camera shakes so we scan for mobs in range From 9b439f2a1dd31cf16655f82937f0d555e6362bba Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Fri, 22 Sep 2023 01:11:48 -0400 Subject: [PATCH 09/59] Update hotspot.dm --- monkestation/code/modules/ocean_content/hotspot/hotspot.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/monkestation/code/modules/ocean_content/hotspot/hotspot.dm b/monkestation/code/modules/ocean_content/hotspot/hotspot.dm index 42a57587abb4..af9342524258 100644 --- a/monkestation/code/modules/ocean_content/hotspot/hotspot.dm +++ b/monkestation/code/modules/ocean_content/hotspot/hotspot.dm @@ -138,9 +138,9 @@ ///we need to somehow convert a value into a list of flags we are gonna do this via a switch statement, now with 100% more distribution to quakes switch(heat) ///QUAKES - if(200 to 1999) + if(200 to 1499) event_flags = WEAK_QUAKE - if(2000 to 3999) + if(1500 to 3999) event_flags = QUAKE ///FIRES if(4000 to 4999) From 3df1360aec1aae26a1fc2494974ab615b5890649 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Fri, 22 Sep 2023 14:05:04 -0400 Subject: [PATCH 10/59] adds the two other challenges to the game --- tgstation.dme | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tgstation.dme b/tgstation.dme index 986839c784b2..62d83f747108 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5749,7 +5749,9 @@ #include "monkestation\code\modules\coin-events\challenges\challenge_controller.dm" #include "monkestation\code\modules\coin-events\challenges\challenge_selector.dm" #include "monkestation\code\modules\coin-events\challenges\challenge\_challenge_base.dm" +#include "monkestation\code\modules\coin-events\challenges\challenge\heavy_bleeder.dm" #include "monkestation\code\modules\coin-events\challenges\challenge\no_healing.dm" +#include "monkestation\code\modules\coin-events\challenges\challenge\no_sprint.dm" #include "monkestation\code\modules\cryopods\_cryopod.dm" #include "monkestation\code\modules\cryopods\ai_cryo.dm" #include "monkestation\code\modules\cryopods\cryo_admin_helpers.dm" From c34439ce76136c4705b254a912ae8f263c37ed7e Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Fri, 22 Sep 2023 17:19:54 -0400 Subject: [PATCH 11/59] liquid runtime cleanup --- .../code/modules/liquids/liquid_groups.dm | 54 ++++++++++--------- .../code/modules/liquids/liquid_plumbers.dm | 5 +- 2 files changed, 34 insertions(+), 25 deletions(-) diff --git a/monkestation/code/modules/liquids/liquid_groups.dm b/monkestation/code/modules/liquids/liquid_groups.dm index b615ed7aaea9..600774535fed 100644 --- a/monkestation/code/modules/liquids/liquid_groups.dm +++ b/monkestation/code/modules/liquids/liquid_groups.dm @@ -111,7 +111,7 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE) /datum/liquid_group/proc/remove_from_group(turf/T) - if(burning_members[T]) + if(T in burning_members) burning_members -= T if(T in SSliquids.burning_turfs) @@ -408,6 +408,8 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE) group_alpha = clamp(round(alpha_setting / alpha_divisor, 1), 120, 255) group_color = new_color for(var/turf/member in members) + if(!member.liquids) + continue member.liquids.alpha = group_alpha member.liquids.color = group_color @@ -663,6 +665,8 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE) /datum/liquid_group/proc/try_split(turf/source, return_list = FALSE) + if(!length(members)) + return var/list/connected_liquids = list() var/turf/head_turf = source @@ -769,35 +773,37 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE) var/amount_to_transfer = length(connected_liquids) * reagents_per_turf - members -= connected_liquids - var/datum/liquid_group/new_group = new(1) - new_group.members += connected_liquids + for(var/list/liquid_list as anything in connected_liquids) + if(length(members)) + members -= liquid_list + var/datum/liquid_group/new_group = new(1) + new_group.members += liquid_list - for(var/turf/connected_liquid in connected_liquids) - new_group.check_edges(connected_liquid) + for(var/turf/connected_liquid in liquid_list) + new_group.check_edges(connected_liquid) - if(connected_liquid in burning_members) - new_group.burning_members |= connected_liquid - remove_from_group(connected_liquid, TRUE) - new_group.add_to_group(connected_liquid) + if(connected_liquid in burning_members) + new_group.burning_members |= connected_liquid + remove_from_group(connected_liquid, TRUE) + new_group.add_to_group(connected_liquid) - trans_to_seperate_group(new_group.reagents, amount_to_transfer) - new_group.total_reagent_volume = new_group.reagents.total_volume - new_group.reagents_per_turf = new_group.total_reagent_volume / length(new_group.members) + trans_to_seperate_group(new_group.reagents, amount_to_transfer) + new_group.total_reagent_volume = new_group.reagents.total_volume + new_group.reagents_per_turf = new_group.total_reagent_volume / length(new_group.members) - ///asses the group to see if it should exist - var/new_group_length = length(new_group.members) - if(new_group.total_reagent_volume == 0 || new_group.reagents_per_turf == 0 || !new_group_length) - qdel(new_group) - return + ///asses the group to see if it should exist + var/new_group_length = length(new_group.members) + if(new_group.total_reagent_volume == 0 || new_group.reagents_per_turf == 0 || !new_group_length) + qdel(new_group) + return - for(var/turf/new_turf in new_group.members) - if(new_turf in members) - new_group.members -= new_turf + for(var/turf/new_turf in new_group.members) + if(new_turf in members) + new_group.members -= new_turf - if(!new_group.members.len) - qdel(new_group) - return + if(!new_group.members.len) + qdel(new_group) + return diff --git a/monkestation/code/modules/liquids/liquid_plumbers.dm b/monkestation/code/modules/liquids/liquid_plumbers.dm index 603a5bc55f7b..747a11f242ae 100644 --- a/monkestation/code/modules/liquids/liquid_plumbers.dm +++ b/monkestation/code/modules/liquids/liquid_plumbers.dm @@ -213,13 +213,16 @@ var/list/removed_turfs = targeted_group.return_connected_liquids_in_range(affected_turf.liquids, turfs_to_pull) targeted_group.trans_to_seperate_group(reagents, target_value, merge = TRUE) for(var/turf/listed_turf in removed_turfs) + var/datum/liquid_group/listed_group = listed_turf.liquids.liquid_group targeted_group.remove_from_group(listed_turf) qdel(listed_turf.liquids) for(var/dir in GLOB.cardinals) var/turf/open/direction_turf = get_step(listed_turf, dir) if(!isopenturf(direction_turf) || !direction_turf.liquids) continue - listed_turf.liquids.liquid_group.check_edges(direction_turf) + if(!listed_group) + continue + listed_group.check_edges(direction_turf) ///recalculate the values here because processing targeted_group.total_reagent_volume = targeted_group.reagents.total_volume From 206953b2556bb96f8c43ad863af8222eadd1642b Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Fri, 22 Sep 2023 17:43:28 -0400 Subject: [PATCH 12/59] more fixes --- monkestation/code/modules/liquids/liquid_groups.dm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/monkestation/code/modules/liquids/liquid_groups.dm b/monkestation/code/modules/liquids/liquid_groups.dm index 600774535fed..6b3b2f8e56ab 100644 --- a/monkestation/code/modules/liquids/liquid_groups.dm +++ b/monkestation/code/modules/liquids/liquid_groups.dm @@ -695,9 +695,7 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE) var/amount_to_transfer = length(connected_liquids) * reagents_per_turf - members -= connected_liquids var/datum/liquid_group/new_group = new(1) - new_group.members += connected_liquids for(var/turf/connected_liquid in connected_liquids) new_group.check_edges(connected_liquid) @@ -774,12 +772,9 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE) var/amount_to_transfer = length(connected_liquids) * reagents_per_turf for(var/list/liquid_list as anything in connected_liquids) - if(length(members)) - members -= liquid_list var/datum/liquid_group/new_group = new(1) - new_group.members += liquid_list - for(var/turf/connected_liquid in liquid_list) + new_group.check_edges(connected_liquid) if(connected_liquid in burning_members) From 6decfabac535c6789a0d9b87a05e3ea8a0c64cec Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Fri, 22 Sep 2023 18:05:11 -0400 Subject: [PATCH 13/59] forgot to undo this --- code/__DEFINES/liquids.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__DEFINES/liquids.dm b/code/__DEFINES/liquids.dm index eb5ddc3a0ed0..362543279aec 100644 --- a/code/__DEFINES/liquids.dm +++ b/code/__DEFINES/liquids.dm @@ -3,7 +3,7 @@ #define REQUIRED_MEMBER_PROCESSES 10 -#define REQUIRED_EVAPORATION_PROCESSES 5 +#define REQUIRED_EVAPORATION_PROCESSES 20 #define EVAPORATION_CHANCE 50 #define REQUIRED_FIRE_PROCESSES 10 From 05a7817e8d723324a83029a1f4c0c08e881971bf Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Fri, 22 Sep 2023 20:53:27 -0400 Subject: [PATCH 14/59] ghost respawning in CC --- _maps/map_files/generic/CentCom.dmm | 295 +++++------------- code/__DEFINES/flags.dm | 4 + code/_globalvars/bitfields.dm | 2 + .../modules/mob/living/carbon/damage_procs.dm | 12 + code/modules/mob/living/damage_procs.dm | 16 + code/modules/surgery/bodyparts/_bodyparts.dm | 3 + .../modules/ghost_players/area_changes.dm | 13 + .../modules/ghost_players/ghost_player.dm | 98 ++++++ tgstation.dme | 2 + 9 files changed, 228 insertions(+), 217 deletions(-) create mode 100644 monkestation/code/modules/ghost_players/area_changes.dm create mode 100644 monkestation/code/modules/ghost_players/ghost_player.dm diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 10d9aa6e0c5f..07e0955031de 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -467,12 +467,6 @@ /obj/machinery/vending/boozeomat, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) -"bV" = ( -/obj/structure/table/reinforced, -/obj/machinery/computer/records/medical/laptop, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) "ca" = ( /obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/flora/bush/fullgrass/style_random, @@ -928,12 +922,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) -"ea" = ( -/obj/item/flashlight/lamp, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) "ec" = ( /obj/structure/railing{ dir = 4; @@ -1615,14 +1603,6 @@ dir = 1 }, /area/centcom/central_command_areas/prison) -"hc" = ( -/obj/structure/table/reinforced, -/obj/item/clipboard, -/obj/item/folder/white, -/obj/item/pen/blue, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) "hd" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -1750,20 +1730,6 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/admin) -"hF" = ( -/obj/structure/table/reinforced, -/obj/item/folder/red{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/folder/blue{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/lighter, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) "hG" = ( /obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/flora/bush/grassy/style_random, @@ -2623,12 +2589,6 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) -"kl" = ( -/turf/open/floor/wood, -/area/centcom/central_command_areas/control) -"km" = ( -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/control) "kp" = ( /turf/open/floor/circuit/green, /area/centcom/central_command_areas/supply) @@ -2640,6 +2600,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/textured_large, /area/centcom/central_command_areas/evacuation/ship) +"kt" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/indestructible/riveted, +/area/centcom/central_command_areas/ghost_spawn) "kx" = ( /obj/structure/filingcabinet/medical, /obj/effect/turf_decal/stripes/line{ @@ -3517,10 +3481,6 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/prison) -"nN" = ( -/obj/structure/chair/office, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/control) "nS" = ( /obj/structure/bookcase/random, /obj/machinery/light/directional/north, @@ -3880,13 +3840,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) -"oX" = ( -/obj/structure/chair/comfy/brown{ - color = "#596479" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) "oY" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -5030,17 +4983,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) -"tE" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/pen, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/flashlight/seclite{ - force = 2000; - desc = "The most Robust flashlight" - }, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) "tF" = ( /obj/machinery/door/airlock/centcom{ name = "Thunderdome Locker Room" @@ -5218,11 +5160,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) -"ur" = ( -/obj/machinery/pdapainter, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) "us" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, @@ -5804,10 +5741,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/any/security/general, -/obj/effect/mapping_helpers/airlock/access/any/admin/general, /turf/open/floor/iron, -/area/centcom/central_command_areas/control) +/area/centcom/central_command_areas/ghost_spawn) "wF" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -6076,12 +6011,8 @@ /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) "xD" = ( -/obj/machinery/computer/security{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) +/turf/open/floor/carpet/neon/simple/lime/nodots, +/area/centcom/central_command_areas/ghost_spawn) "xE" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 @@ -6128,18 +6059,6 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/control) -"xV" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/turf/open/floor/wood, -/area/centcom/central_command_areas/control) -"xW" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/turf/open/floor/wood, -/area/centcom/central_command_areas/control) "xX" = ( /obj/machinery/newscaster{ pixel_x = 32 @@ -6366,13 +6285,6 @@ /obj/effect/decal/cleanable/oil, /turf/open/floor/iron/smooth_large, /area/centcom/central_command_areas/evacuation/ship) -"zb" = ( -/obj/machinery/computer/records/medical{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) "zc" = ( /obj/structure/chair/comfy/brown{ dir = 1 @@ -6784,13 +6696,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) -"AO" = ( -/obj/machinery/computer/communications{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) "AT" = ( /obj/structure/sign/departments/medbay/alt, /turf/closed/indestructible/riveted, @@ -7173,6 +7078,9 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/control) +"Cb" = ( +/turf/closed/indestructible/riveted, +/area/centcom/central_command_areas/ghost_spawn) "Cd" = ( /obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/flora/bush/sparsegrass/style_random, @@ -8031,12 +7939,6 @@ }, /turf/open/floor/wood, /area/centcom/central_command_areas/fore) -"GN" = ( -/obj/structure/table/reinforced, -/obj/item/storage/fancy/donut_box, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) "GT" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, @@ -9178,6 +9080,10 @@ /mob/living/basic/garden_gnome, /turf/open/indestructible/dark, /area/centcom/central_command_areas/prison/cells) +"LT" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/centcom/central_command_areas/ghost_spawn) "LU" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/computer/records/medical{ @@ -9413,15 +9319,8 @@ /turf/open/floor/iron/grimy, /area/centcom/tdome/observation) "Ng" = ( -/obj/item/storage/box/ids{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/silver_ids, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) +/turf/open/floor/wood, +/area/centcom/central_command_areas/ghost_spawn) "Nh" = ( /obj/structure/table/wood, /obj/item/storage/box/drinkingglasses, @@ -9484,11 +9383,9 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) "Nt" = ( -/obj/structure/filingcabinet/medical, /obj/machinery/light/directional/north, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) +/turf/open/floor/wood, +/area/centcom/central_command_areas/ghost_spawn) "Nx" = ( /obj/structure/fans/tiny, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -9639,14 +9536,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) -"Oh" = ( -/obj/structure/table/reinforced, -/obj/item/clipboard, -/obj/item/folder/red, -/obj/item/pen/red, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) "Oj" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ @@ -10883,13 +10772,6 @@ /obj/machinery/rnd/production/techfab/department/medical, /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) -"SI" = ( -/obj/machinery/modular_computer/console/preset/id/centcom{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) "SM" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -11523,14 +11405,6 @@ /obj/structure/flora/bush/pale/style_random, /turf/open/misc/asteroid, /area/centcom/tdome/administration) -"Vm" = ( -/obj/machinery/computer/records/security{ - dir = 1 - }, -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) "Vn" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/iron, @@ -11618,13 +11492,6 @@ /obj/effect/turf_decal/trimline/blue/filled/warning, /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) -"VF" = ( -/obj/machinery/computer/crew{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) "VK" = ( /obj/structure/table/wood, /obj/item/storage/fancy/donut_box, @@ -11668,13 +11535,9 @@ /turf/open/floor/iron/dark, /area/centcom/tdome/observation) "VW" = ( -/obj/machinery/computer/prisoner/management{ - dir = 1 - }, /obj/machinery/light/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) +/turf/open/floor/carpet/neon/simple/lime/nodots, +/area/centcom/central_command_areas/ghost_spawn) "VY" = ( /obj/machinery/computer/records/security{ dir = 8 @@ -11784,7 +11647,6 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/four) "Wu" = ( -/obj/machinery/photocopier, /obj/machinery/light/directional/north, /obj/machinery/button/door/indestructible{ id = "XCCFerry"; @@ -11810,9 +11672,8 @@ pixel_x = -8; pixel_y = 38 }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) +/turf/open/floor/wood, +/area/centcom/central_command_areas/ghost_spawn) "Wv" = ( /obj/effect/landmark/thunderdome/observe, /obj/machinery/barsign/all_access/directional/north, @@ -55102,13 +54963,13 @@ iX iF UN tL -iu -iu +LT +LT wC -iu -iu -iu -in +LT +LT +LT +kt tL IX io @@ -55359,13 +55220,13 @@ rH Vx tK Ab -iu -ur -uc -zb -VF +LT Ng -iu +Ng +Ng +Ng +Ng +LT Ab xT iu @@ -55616,13 +55477,13 @@ Vx Za tK Ab -io +Cb Wu -uc -kl -xV -hc -iu +Ng +Ng +Ng +Ng +LT Ab An in @@ -55873,13 +55734,13 @@ rI tI tK Ab -iu -GN -hF -km -nN +LT +Ng +Ng +xD +xD VW -io +Cb vt xT iu @@ -56130,13 +55991,13 @@ rI NU tM Ab -iu -ea -oX -km -km +LT +Ng +Ng xD -iu +xD +xD +LT Ab Ab qT @@ -56387,13 +56248,13 @@ rI Jg tN Ab -iu -tE -bV -km -nN -Vm -io +LT +Ng +Ng +xD +xD +VW +Cb vt xo mk @@ -56644,13 +56505,13 @@ Vx Za tN Ab -io +Cb Nt -uc -kl -xW -Oh -iu +Ng +Ng +Ng +Ng +LT Ab Ao in @@ -56901,13 +56762,13 @@ rJ Jg tN Ab -iu -gl -uc -SI -AO -em -iu +LT +Ng +Ng +Ng +Ng +Ng +LT Ab xo iu @@ -57158,13 +57019,13 @@ io io UN tL -iu -iu +LT +LT wC -iu -iu -iu -in +LT +LT +LT +kt tL IX io diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm index 7ac94778a2a5..b13bced3ebf7 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -142,6 +142,10 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 #define NO_DEATH_MESSAGE (1<<15) /// This area should have extra shielding from certain event effects #define EVENT_PROTECTED (1<<16) +///is this a passive area +#define PASSIVE_AREA (1<<17) +///is this a ghost accessible area? +#define GHOST_AREA (1<<18) /* These defines are used specifically with the atom/pass_flags bitmask diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index e471a78c5d47..bab43dd5b81f 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -66,6 +66,8 @@ DEFINE_BITFIELD(area_flags, list( "UNIQUE_AREA" = UNIQUE_AREA, "VALID_TERRITORY" = VALID_TERRITORY, "XENOBIOLOGY_COMPATIBLE" = XENOBIOLOGY_COMPATIBLE, + "PASSIVE_AREA" = PASSIVE_AREA, + "GHOST_AREA" = GHOST_AREA, )) DEFINE_BITFIELD(turf_flags, list( diff --git a/code/modules/mob/living/carbon/damage_procs.dm b/code/modules/mob/living/carbon/damage_procs.dm index 79924693d6e2..87f4512c69f4 100644 --- a/code/modules/mob/living/carbon/damage_procs.dm +++ b/code/modules/mob/living/carbon/damage_procs.dm @@ -55,6 +55,10 @@ return amount /mob/living/carbon/adjustBruteLoss(amount, updating_health = TRUE, forced = FALSE, required_bodytype) + var/area/target_area = get_area(src) + if((target_area.area_flags & PASSIVE_AREA) && amount > 0) + return FALSE + if(amount < 0 && HAS_TRAIT(src, TRAIT_NO_HEALS)) return FALSE if(!forced && (status_flags & GODMODE)) @@ -73,6 +77,10 @@ adjustBruteLoss(diff, updating_health, forced, required_bodytype) /mob/living/carbon/adjustFireLoss(amount, updating_health = TRUE, forced = FALSE, required_bodytype) + var/area/target_area = get_area(src) + if((target_area.area_flags & PASSIVE_AREA) && amount > 0) + return FALSE + if(amount < 0 && HAS_TRAIT(src, TRAIT_NO_HEALS)) return FALSE if(!forced && (status_flags & GODMODE)) @@ -91,6 +99,10 @@ adjustFireLoss(diff, updating_health, forced, required_bodytype) /mob/living/carbon/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE, required_biotype = MOB_ORGANIC) + var/area/target_area = get_area(src) + if((target_area.area_flags & PASSIVE_AREA) && amount > 0) + return FALSE + if(amount < 0 && HAS_TRAIT(src, TRAIT_NO_HEALS)) return FALSE if(!forced && !(mob_biotypes & required_biotype)) diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index 399a52bb5d09..9ab550507b7a 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -164,6 +164,10 @@ return bruteloss /mob/living/proc/adjustBruteLoss(amount, updating_health = TRUE, forced = FALSE, required_bodytype) + var/area/target_area = get_area(src) + if((target_area.area_flags & PASSIVE_AREA) && amount > 0) + return FALSE + if(amount < 0 && HAS_TRAIT(src, TRAIT_NO_HEALS)) return FALSE if(!forced && (status_flags & GODMODE)) @@ -224,6 +228,10 @@ return toxloss /mob/living/proc/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE, required_biotype) + var/area/target_area = get_area(src) + if((target_area.area_flags & PASSIVE_AREA) && amount > 0) + return FALSE + if(amount < 0 && HAS_TRAIT(src, TRAIT_NO_HEALS)) return FALSE if(!forced && (status_flags & GODMODE)) @@ -249,6 +257,10 @@ return fireloss /mob/living/proc/adjustFireLoss(amount, updating_health = TRUE, forced = FALSE, required_bodytype) + var/area/target_area = get_area(src) + if((target_area.area_flags & PASSIVE_AREA) && amount > 0) + return FALSE + if(amount < 0 && HAS_TRAIT(src, TRAIT_NO_HEALS)) return FALSE if(!forced && (status_flags & GODMODE)) @@ -270,6 +282,10 @@ return cloneloss /mob/living/proc/adjustCloneLoss(amount, updating_health = TRUE, forced = FALSE, required_biotype) + var/area/target_area = get_area(src) + if((target_area.area_flags & PASSIVE_AREA) && amount > 0) + return FALSE + if(amount < 0 && HAS_TRAIT(src, TRAIT_NO_HEALS)) return FALSE if(!forced && ( (status_flags & GODMODE) || HAS_TRAIT(src, TRAIT_NOCLONELOSS)) ) diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index 425757bb4f8b..81d1e72c92cd 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -405,6 +405,9 @@ //Cannot apply negative damage /obj/item/bodypart/proc/receive_damage(brute = 0, burn = 0, blocked = 0, updating_health = TRUE, required_bodytype = null, wound_bonus = 0, bare_wound_bonus = 0, sharpness = NONE, attack_direction = null) SHOULD_CALL_PARENT(TRUE) + var/area/target_area = get_area(src.owner) + if((target_area.area_flags & PASSIVE_AREA)) + return FALSE var/hit_percent = (100-blocked)/100 if((!brute && !burn) || hit_percent <= 0) diff --git a/monkestation/code/modules/ghost_players/area_changes.dm b/monkestation/code/modules/ghost_players/area_changes.dm new file mode 100644 index 000000000000..3e06a18bd905 --- /dev/null +++ b/monkestation/code/modules/ghost_players/area_changes.dm @@ -0,0 +1,13 @@ +/area/centcom/central_command_areas + area_flags = UNIQUE_AREA | NOTELEPORT | GHOST_AREA + +/area/centcom/central_command_areas/ghost_spawn + name = "Centcom Ghost Spawn" + area_flags = UNIQUE_AREA | NOTELEPORT | GHOST_AREA | PASSIVE_AREA + +/area/Entered(mob/M) + . = ..() + if(!(area_flags & GHOST_AREA) && istype(M, /mob/living/carbon/human/ghost)) + var/mob/living/carbon/human/ghost/mob = M + mob.move_to_ghostspawn() + diff --git a/monkestation/code/modules/ghost_players/ghost_player.dm b/monkestation/code/modules/ghost_players/ghost_player.dm new file mode 100644 index 000000000000..29a0da9e4b80 --- /dev/null +++ b/monkestation/code/modules/ghost_players/ghost_player.dm @@ -0,0 +1,98 @@ +/mob/living/carbon/human/ghost + var/revive_prepped = FALSE + var/old_key + var/datum/mind/old_mind + var/old_reenter + + +/mob/living/carbon/human/ghost/New(_old_key, datum/mind/_old_mind, _old_reenter) + . = ..() + old_key = _old_key + old_mind = _old_mind + old_reenter = _old_reenter + + +/mob/living/carbon/human/ghost/Initialize(mapload) + . = ..() + var/datum/action/cooldown/mob_cooldown/return_to_ghost/created_ability = new /datum/action/cooldown/mob_cooldown/return_to_ghost(src) + created_ability.Grant(src) + +/mob/living/carbon/human/ghost/proc/disolve_ghost() + var/mob/dead/observer/new_ghost = ghostize(FALSE) + new_ghost.key = old_key + new_ghost.mind = old_mind + new_ghost.can_reenter_corpse = old_reenter + qdel(src) + +/datum/action/cooldown/mob_cooldown/return_to_ghost + name = "Return to Ghost" + desc = "Either returns you to being a ghost or sends your soul back to your last body if it's revived." + + button_icon = 'icons/mob/actions/actions_ecult.dmi' + button_icon_state = "eye" + background_icon_state = "bg_demon" + overlay_icon_state = "bg_demon_border" + + click_to_activate = FALSE + check_flags = NONE + shared_cooldown = NONE + +/datum/action/cooldown/mob_cooldown/return_to_ghost/Activate(atom/target) + var/mob/living/carbon/human/ghost/living_owner = owner + if(!istype(living_owner)) + return + if(living_owner.revive_prepped) + return TRUE + living_owner.disolve_ghost() + return TRUE + + +//ghost stuff + +/mob/dead/observer/Initialize(mapload) + . = ..() + var/datum/action/cooldown/mob_cooldown/create_ghost_player/created_ability = new /datum/action/cooldown/mob_cooldown/create_ghost_player(src) + created_ability.Grant(src) + +/datum/action/cooldown/mob_cooldown/create_ghost_player + name = "Create Ghost Player" + desc = "Become a ghost player that can mess around in the ghost area." + + button_icon = 'icons/mob/actions/actions_ecult.dmi' + button_icon_state = "eye" + background_icon_state = "bg_demon" + overlay_icon_state = "bg_demon_border" + + click_to_activate = FALSE + check_flags = NONE + cooldown_time = 40 SECONDS + shared_cooldown = NONE + +/datum/action/cooldown/mob_cooldown/create_ghost_player/Activate(atom/target) + var/mob/dead/observer/player = owner + if(!istype(player)) + return + player.create_ghost_body() + + +/mob/dead/observer/proc/create_ghost_body() + var/mob/living/carbon/human/ghost/new_existance = new(key, mind, can_reenter_corpse) + client?.prefs.safe_transfer_prefs_to(new_existance, TRUE, FALSE) + new_existance.move_to_ghostspawn() + new_existance.key = key + client?.init_verbs() + qdel(src) + return TRUE + + +/// Iterates over all turfs in the target area and returns the first non-dense one +/mob/living/carbon/human/ghost/proc/move_to_ghostspawn() + var/list/turfs = get_area_turfs(/area/centcom/central_command_areas/ghost_spawn) + var/turf/open/target_turf = null + var/sanity = 0 + while(!target_turf && sanity < 100) + sanity++ + var/turf/turf = pick(turfs) + if(!turf.density) + target_turf = turf + forceMove(target_turf) diff --git a/tgstation.dme b/tgstation.dme index 62d83f747108..8a8844ce8e22 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5779,6 +5779,8 @@ #include "monkestation\code\modules\donator\code\mob\pets.dm" #include "monkestation\code\modules\events\wizard\summon_gifts.dm" #include "monkestation\code\modules\food_and_drinks\recipes\boiling.dm" +#include "monkestation\code\modules\ghost_players\area_changes.dm" +#include "monkestation\code\modules\ghost_players\ghost_player.dm" #include "monkestation\code\modules\hydroponics\botanical_lexicon.dm" #include "monkestation\code\modules\hydroponics\plant_genes.dm" #include "monkestation\code\modules\hydroponics\seeds.dm" From be5cd0eeefd17c42037576f01291e8dd608f8b22 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Fri, 22 Sep 2023 22:25:53 -0400 Subject: [PATCH 15/59] aslong as not gibbed send back to spawn and heal --- monkestation/code/modules/ghost_players/ghost_player.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/monkestation/code/modules/ghost_players/ghost_player.dm b/monkestation/code/modules/ghost_players/ghost_player.dm index 29a0da9e4b80..8b652013387e 100644 --- a/monkestation/code/modules/ghost_players/ghost_player.dm +++ b/monkestation/code/modules/ghost_players/ghost_player.dm @@ -17,6 +17,12 @@ var/datum/action/cooldown/mob_cooldown/return_to_ghost/created_ability = new /datum/action/cooldown/mob_cooldown/return_to_ghost(src) created_ability.Grant(src) +/mob/living/carbon/human/ghost/Life(seconds_per_tick, times_fired) + if(CAN_SUCCUMB(src)) + move_to_ghostspawn() + fully_heal() + . = ..() + /mob/living/carbon/human/ghost/proc/disolve_ghost() var/mob/dead/observer/new_ghost = ghostize(FALSE) new_ghost.key = old_key From 40c9c2b4f0704fe39155b0fe63493880c464fe75 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Fri, 22 Sep 2023 22:27:28 -0400 Subject: [PATCH 16/59] checks if area exists for linters --- .../modules/mob/living/carbon/damage_procs.dm | 15 ++++++++------ code/modules/mob/living/damage_procs.dm | 20 +++++++++++-------- code/modules/surgery/bodyparts/_bodyparts.dm | 5 +++-- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/code/modules/mob/living/carbon/damage_procs.dm b/code/modules/mob/living/carbon/damage_procs.dm index 87f4512c69f4..0505c47fdc89 100644 --- a/code/modules/mob/living/carbon/damage_procs.dm +++ b/code/modules/mob/living/carbon/damage_procs.dm @@ -56,8 +56,9 @@ /mob/living/carbon/adjustBruteLoss(amount, updating_health = TRUE, forced = FALSE, required_bodytype) var/area/target_area = get_area(src) - if((target_area.area_flags & PASSIVE_AREA) && amount > 0) - return FALSE + if(target_area) + if((target_area.area_flags & PASSIVE_AREA) && amount > 0) + return FALSE if(amount < 0 && HAS_TRAIT(src, TRAIT_NO_HEALS)) return FALSE @@ -78,8 +79,9 @@ /mob/living/carbon/adjustFireLoss(amount, updating_health = TRUE, forced = FALSE, required_bodytype) var/area/target_area = get_area(src) - if((target_area.area_flags & PASSIVE_AREA) && amount > 0) - return FALSE + if(target_area) + if((target_area.area_flags & PASSIVE_AREA) && amount > 0) + return FALSE if(amount < 0 && HAS_TRAIT(src, TRAIT_NO_HEALS)) return FALSE @@ -100,8 +102,9 @@ /mob/living/carbon/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE, required_biotype = MOB_ORGANIC) var/area/target_area = get_area(src) - if((target_area.area_flags & PASSIVE_AREA) && amount > 0) - return FALSE + if(target_area) + if((target_area.area_flags & PASSIVE_AREA) && amount > 0) + return FALSE if(amount < 0 && HAS_TRAIT(src, TRAIT_NO_HEALS)) return FALSE diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index 9ab550507b7a..f93f31d63bd1 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -165,8 +165,9 @@ /mob/living/proc/adjustBruteLoss(amount, updating_health = TRUE, forced = FALSE, required_bodytype) var/area/target_area = get_area(src) - if((target_area.area_flags & PASSIVE_AREA) && amount > 0) - return FALSE + if(target_area) + if((target_area.area_flags & PASSIVE_AREA) && amount > 0) + return FALSE if(amount < 0 && HAS_TRAIT(src, TRAIT_NO_HEALS)) return FALSE @@ -229,8 +230,9 @@ /mob/living/proc/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE, required_biotype) var/area/target_area = get_area(src) - if((target_area.area_flags & PASSIVE_AREA) && amount > 0) - return FALSE + if(target_area) + if((target_area.area_flags & PASSIVE_AREA) && amount > 0) + return FALSE if(amount < 0 && HAS_TRAIT(src, TRAIT_NO_HEALS)) return FALSE @@ -258,8 +260,9 @@ /mob/living/proc/adjustFireLoss(amount, updating_health = TRUE, forced = FALSE, required_bodytype) var/area/target_area = get_area(src) - if((target_area.area_flags & PASSIVE_AREA) && amount > 0) - return FALSE + if(target_area) + if((target_area.area_flags & PASSIVE_AREA) && amount > 0) + return FALSE if(amount < 0 && HAS_TRAIT(src, TRAIT_NO_HEALS)) return FALSE @@ -283,8 +286,9 @@ /mob/living/proc/adjustCloneLoss(amount, updating_health = TRUE, forced = FALSE, required_biotype) var/area/target_area = get_area(src) - if((target_area.area_flags & PASSIVE_AREA) && amount > 0) - return FALSE + if(target_area) + if((target_area.area_flags & PASSIVE_AREA) && amount > 0) + return FALSE if(amount < 0 && HAS_TRAIT(src, TRAIT_NO_HEALS)) return FALSE diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index 81d1e72c92cd..ff8bd9243e94 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -406,8 +406,9 @@ /obj/item/bodypart/proc/receive_damage(brute = 0, burn = 0, blocked = 0, updating_health = TRUE, required_bodytype = null, wound_bonus = 0, bare_wound_bonus = 0, sharpness = NONE, attack_direction = null) SHOULD_CALL_PARENT(TRUE) var/area/target_area = get_area(src.owner) - if((target_area.area_flags & PASSIVE_AREA)) - return FALSE + if(target_area) + if((target_area.area_flags & PASSIVE_AREA) && amount > 0) + return FALSE var/hit_percent = (100-blocked)/100 if((!brute && !burn) || hit_percent <= 0) From 558f33b6a7a6215fb75536f8c2164e9c648784d4 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Fri, 22 Sep 2023 22:34:03 -0400 Subject: [PATCH 17/59] womp womp --- code/modules/surgery/bodyparts/_bodyparts.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index ff8bd9243e94..ae5722105c9c 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -407,7 +407,7 @@ SHOULD_CALL_PARENT(TRUE) var/area/target_area = get_area(src.owner) if(target_area) - if((target_area.area_flags & PASSIVE_AREA) && amount > 0) + if((target_area.area_flags & PASSIVE_AREA)) return FALSE var/hit_percent = (100-blocked)/100 From 3876c4ee8a9cdc7fb9f9da051610eedc859e7ec5 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sat, 23 Sep 2023 01:22:45 -0400 Subject: [PATCH 18/59] base map support with assets --- _maps/map_files/generic/CentCom.dmm | 245 +++--- code/controllers/subsystem/mapping.dm | 12 + .../modules/aesthetics/airlock/airlock.dm | 2 + .../modules/ghost_players/area_changes.dm | 6 + .../ghost_players/arena/arena_assets/alien.dm | 30 + .../arena/arena_assets/bottomless_sign.dm | 16 + .../arena/arena_assets/event_floors.dm | 10 + .../arena/arena_assets/event_walls.dm | 34 + .../ghost_players/arena/arena_assets/fish.dm | 79 ++ .../arena_assets/icons/alien_autopsy.dmi | Bin 0 -> 9243 bytes .../arena_assets/icons/alien_sleeper.dmi | Bin 0 -> 1567 bytes .../arena/arena_assets/icons/fish.dmi | Bin 0 -> 12848 bytes .../arena/arena_assets/icons/sign2.dmi | Bin 0 -> 4189 bytes .../arena/arena_assets/icons/statues.dmi | Bin 0 -> 11801 bytes .../icons/survival_pod_walls_blue.dmi | Bin 0 -> 6312 bytes .../icons/survival_pod_walls_purple.dmi | Bin 0 -> 6312 bytes .../icons/survival_pod_walls_red.dmi | Bin 0 -> 6312 bytes .../arena_assets/icons/water_overlay.dmi | Bin 0 -> 1892 bytes .../arena/arena_assets/statues.dm | 30 + .../ghost_players/arena/arena_assets/water.dm | 10 + .../ghost_players/arena/arena_cleanser.dm | 49 ++ .../ghost_players/arena/map_templates.dm | 102 +++ .../ghost_players/arena/maps/arcadia.dmm | 552 +++++++++++++ .../ghost_players/arena/maps/atlantis.dmm | 418 ++++++++++ .../arena/maps/bottomless_pit.dmm | 412 ++++++++++ .../arena/maps/conveyor_hell.dmm | 565 ++++++++++++++ .../arena/maps/conveyor_shards.dmm | 649 ++++++++++++++++ .../modules/ghost_players/arena/maps/cult.dmm | 698 +++++++++++++++++ .../ghost_players/arena/maps/default.dmm | 243 ++++++ .../ghost_players/arena/maps/diner.dmm | 626 +++++++++++++++ .../ghost_players/arena/maps/flowers.dmm | 289 +++++++ .../modules/ghost_players/arena/maps/hive.dmm | 371 +++++++++ .../ghost_players/arena/maps/jungle.dmm | 275 +++++++ .../ghost_players/arena/maps/lockers.dmm | 329 ++++++++ .../ghost_players/arena/maps/monastery.dmm | 526 +++++++++++++ .../ghost_players/arena/maps/museum.dmm | 585 ++++++++++++++ .../modules/ghost_players/arena/maps/neon.dmm | 622 +++++++++++++++ .../modules/ghost_players/arena/maps/snow.dmm | 499 ++++++++++++ .../ghost_players/arena/maps/snowfort.dmm | 306 ++++++++ .../ghost_players/arena/maps/syndie.dmm | 569 ++++++++++++++ .../ghost_players/arena/maps/two_forts.dmm | 386 ++++++++++ .../ghost_players/arena/maps/upperrail.dmm | 728 ++++++++++++++++++ tgstation.dme | 9 + 43 files changed, 10144 insertions(+), 138 deletions(-) create mode 100644 monkestation/code/modules/ghost_players/arena/arena_assets/alien.dm create mode 100644 monkestation/code/modules/ghost_players/arena/arena_assets/bottomless_sign.dm create mode 100644 monkestation/code/modules/ghost_players/arena/arena_assets/event_floors.dm create mode 100644 monkestation/code/modules/ghost_players/arena/arena_assets/event_walls.dm create mode 100644 monkestation/code/modules/ghost_players/arena/arena_assets/fish.dm create mode 100644 monkestation/code/modules/ghost_players/arena/arena_assets/icons/alien_autopsy.dmi create mode 100644 monkestation/code/modules/ghost_players/arena/arena_assets/icons/alien_sleeper.dmi create mode 100644 monkestation/code/modules/ghost_players/arena/arena_assets/icons/fish.dmi create mode 100644 monkestation/code/modules/ghost_players/arena/arena_assets/icons/sign2.dmi create mode 100644 monkestation/code/modules/ghost_players/arena/arena_assets/icons/statues.dmi create mode 100644 monkestation/code/modules/ghost_players/arena/arena_assets/icons/survival_pod_walls_blue.dmi create mode 100644 monkestation/code/modules/ghost_players/arena/arena_assets/icons/survival_pod_walls_purple.dmi create mode 100644 monkestation/code/modules/ghost_players/arena/arena_assets/icons/survival_pod_walls_red.dmi create mode 100644 monkestation/code/modules/ghost_players/arena/arena_assets/icons/water_overlay.dmi create mode 100644 monkestation/code/modules/ghost_players/arena/arena_assets/statues.dm create mode 100644 monkestation/code/modules/ghost_players/arena/arena_assets/water.dm create mode 100644 monkestation/code/modules/ghost_players/arena/arena_cleanser.dm create mode 100644 monkestation/code/modules/ghost_players/arena/map_templates.dm create mode 100644 monkestation/code/modules/ghost_players/arena/maps/arcadia.dmm create mode 100644 monkestation/code/modules/ghost_players/arena/maps/atlantis.dmm create mode 100644 monkestation/code/modules/ghost_players/arena/maps/bottomless_pit.dmm create mode 100644 monkestation/code/modules/ghost_players/arena/maps/conveyor_hell.dmm create mode 100644 monkestation/code/modules/ghost_players/arena/maps/conveyor_shards.dmm create mode 100644 monkestation/code/modules/ghost_players/arena/maps/cult.dmm create mode 100644 monkestation/code/modules/ghost_players/arena/maps/default.dmm create mode 100644 monkestation/code/modules/ghost_players/arena/maps/diner.dmm create mode 100644 monkestation/code/modules/ghost_players/arena/maps/flowers.dmm create mode 100644 monkestation/code/modules/ghost_players/arena/maps/hive.dmm create mode 100644 monkestation/code/modules/ghost_players/arena/maps/jungle.dmm create mode 100644 monkestation/code/modules/ghost_players/arena/maps/lockers.dmm create mode 100644 monkestation/code/modules/ghost_players/arena/maps/monastery.dmm create mode 100644 monkestation/code/modules/ghost_players/arena/maps/museum.dmm create mode 100644 monkestation/code/modules/ghost_players/arena/maps/neon.dmm create mode 100644 monkestation/code/modules/ghost_players/arena/maps/snow.dmm create mode 100644 monkestation/code/modules/ghost_players/arena/maps/snowfort.dmm create mode 100644 monkestation/code/modules/ghost_players/arena/maps/syndie.dmm create mode 100644 monkestation/code/modules/ghost_players/arena/maps/two_forts.dmm create mode 100644 monkestation/code/modules/ghost_players/arena/maps/upperrail.dmm diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 07e0955031de..de01b406f067 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -1286,10 +1286,6 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) -"fJ" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/centcom/tdome/arena) "fK" = ( /obj/structure/sign/painting/library{ pixel_y = -32 @@ -8175,17 +8171,12 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) "Is" = ( -/obj/machinery/igniter/on, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/centcom/tdome/arena) +/obj/effect/spawner/random_arena_spawner, +/turf/open/floor/holofloor/plating, +/area/centcom/tdome/arena/actual) "It" = ( -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"Iu" = ( -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/centcom/tdome/arena) +/turf/open/floor/holofloor/plating, +/area/centcom/tdome/arena/actual) "Iv" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -8240,36 +8231,20 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"IF" = ( -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"IG" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/centcom/tdome/arena) +/turf/open/floor/holofloor/plating, +/area/centcom/tdome/arena/actual) "IH" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 9 }, /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) -"II" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/centcom/tdome/arena) "IJ" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 }, -/turf/open/floor/iron, -/area/centcom/tdome/arena) +/turf/open/floor/holofloor/plating, +/area/centcom/tdome/arena/actual) "IK" = ( /obj/structure/closet/secure_closet/ert_sec, /obj/effect/turf_decal/stripes/line{ @@ -8403,30 +8378,20 @@ /obj/effect/turf_decal/loading_area{ dir = 4 }, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"Ji" = ( -/turf/open/floor/circuit/green, -/area/centcom/tdome/arena) -"Jj" = ( -/obj/machinery/flasher{ - id = "tdomeflash"; - name = "Thunderdome Flash" - }, -/turf/open/floor/circuit/green, -/area/centcom/tdome/arena) +/turf/open/floor/holofloor/plating, +/area/centcom/tdome/arena/actual) "Jk" = ( /obj/effect/turf_decal/loading_area{ dir = 8 }, -/turf/open/floor/iron, -/area/centcom/tdome/arena) +/turf/open/floor/holofloor/plating, +/area/centcom/tdome/arena/actual) "Jq" = ( /obj/machinery/camera/motion/thunderdome{ pixel_x = 10 }, -/turf/open/floor/circuit/green, -/area/centcom/tdome/arena) +/turf/open/floor/holofloor/plating, +/area/centcom/tdome/arena/actual) "Jr" = ( /mob/living/simple_animal/hostile/retaliate/clown{ limb_destroyer = 1 @@ -11592,6 +11557,10 @@ /obj/effect/turf_decal/tile/red/fourcorners, /turf/open/floor/iron, /area/centcom/tdome/observation) +"Wg" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/holofloor/plating, +/area/centcom/tdome/arena/actual) "Wi" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/door/airlock/public/glass{ @@ -53710,16 +53679,16 @@ bi eI bi cY -QC +fc ID ID ID ID ID ID -uf -uf -uf +fc +fc +fc uf uf uf @@ -53967,7 +53936,7 @@ Id Bs di QC -Is +Wg Jh Jh IE @@ -54482,14 +54451,14 @@ Kd nD SZ It -Iu -IF -IF -IF -IF -IF -IF -Iu +It +It +It +It +It +It +It +It It Pj Pr @@ -54740,12 +54709,12 @@ nD SZ It It -IG -IG -IG -IG -IG -IG +It +It +It +It +It +It It It Pj @@ -54997,12 +54966,12 @@ sH SZ It It -fJ -fJ -fJ -fJ -fJ -fJ +It +It +It +It +It +It It It Pj @@ -55254,12 +55223,12 @@ yY SZ It It -fJ -fJ -fJ -fJ -fJ -fJ +It +It +It +It +It +It It It Pj @@ -55511,12 +55480,12 @@ yY SZ It It -fJ -fJ -fJ -fJ -fJ -fJ +It +It +It +It +It +It It It Pj @@ -55768,12 +55737,12 @@ yY SZ It It -fJ -fJ -Ji -Ji -fJ -fJ +It +It +It +It +It +It It It Pj @@ -56025,12 +55994,12 @@ yY SZ It It -fJ -fJ -Jj +It +It +It Jq -fJ -fJ +It +It It It Pj @@ -56282,12 +56251,12 @@ yY SZ It It -fJ -fJ -Ji -Ji -fJ -fJ +It +It +It +It +It +It It It Pj @@ -56539,12 +56508,12 @@ yY SZ It It -fJ -fJ -fJ -fJ -fJ -fJ +It +It +It +It +It +It It It Pj @@ -56796,12 +56765,12 @@ yY SZ It It -fJ -fJ -fJ -fJ -fJ -fJ +It +It +It +It +It +It It It Pj @@ -57053,12 +57022,12 @@ sH SZ It It -fJ -fJ -fJ -fJ -fJ -fJ +It +It +It +It +It +It It It Pj @@ -57310,12 +57279,12 @@ nD SZ It It -II -II -II -II -II -II +It +It +It +It +It +It It It Pj @@ -57566,14 +57535,14 @@ Kd nD SZ It -Iu -IF -IF -IF -IF -IF -IF -Iu +It +It +It +It +It +It +It +It It Pj Pr @@ -58079,7 +58048,7 @@ Ot Ot di QC -Is +Wg Jk Jk IJ @@ -58088,7 +58057,7 @@ Jk Jk IJ IJ -Is +Wg Pj YO Bx diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 368d771aa1b1..877fbc58930e 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -93,6 +93,7 @@ SUBSYSTEM_DEF(mapping) var/list/random_room_templates = list() var/list/random_bar_templates = list() var/list/random_engine_templates = list() + var/list/random_arena_templates = list() ///Temporary list, where room spawners are kept roundstart. Not used later. var/list/random_room_spawners = list() var/list/random_engine_spawners = list() @@ -355,6 +356,7 @@ Used by the AI doomsday and the self-destruct nuke. random_engine_templates = SSmapping.random_engine_templates random_bar_templates = SSmapping.random_bar_templates + random_arena_templates = SSmapping.random_arena_templates config = SSmapping.config next_map_config = SSmapping.next_map_config @@ -681,6 +683,16 @@ GLOBAL_LIST_EMPTY(the_station_areas) random_bar_templates[E.room_id] = E map_templates[E.room_id] = E + for(var/item in subtypesof(/datum/map_template/random_room/random_arena)) + var/datum/map_template/random_room/random_arena/room_type = item + if(!(initial(room_type.mappath))) + message_admins("Arena Template [initial(room_type.name)] found without mappath. Yell at coders") + continue + var/datum/map_template/random_room/random_arena/E = new room_type() + random_arena_templates[E.room_id] = E + map_templates[E.room_id] = E + + /datum/controller/subsystem/mapping/proc/preloadRuinTemplates() // Still supporting bans by filename var/list/banned = generateMapList("spaceruinblacklist.txt") diff --git a/monkestation/code/modules/aesthetics/airlock/airlock.dm b/monkestation/code/modules/aesthetics/airlock/airlock.dm index f44f1fb08693..7ada0684d286 100644 --- a/monkestation/code/modules/aesthetics/airlock/airlock.dm +++ b/monkestation/code/modules/aesthetics/airlock/airlock.dm @@ -627,12 +627,14 @@ /obj/machinery/door/poddoor/shutters icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/shutters.dmi' + door_align_type = /obj/machinery/door/poddoor/shutters /obj/machinery/door/password icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/blast_door.dmi' /obj/machinery/door/poddoor icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/blast_door.dmi' + door_align_type = /obj/machinery/door/poddoor //SKYRAT EDIT ADDITION BEGIN - AESTHETICS #undef AIRLOCK_LIGHT_POWER diff --git a/monkestation/code/modules/ghost_players/area_changes.dm b/monkestation/code/modules/ghost_players/area_changes.dm index 3e06a18bd905..1b2d9f2481cb 100644 --- a/monkestation/code/modules/ghost_players/area_changes.dm +++ b/monkestation/code/modules/ghost_players/area_changes.dm @@ -1,6 +1,12 @@ /area/centcom/central_command_areas area_flags = UNIQUE_AREA | NOTELEPORT | GHOST_AREA +/area/centcom/tdome + area_flags = UNIQUE_AREA | NOTELEPORT | GHOST_AREA + +/area/centcom/tdome/arena/actual + name = "Thunder Dome Arena Area" + /area/centcom/central_command_areas/ghost_spawn name = "Centcom Ghost Spawn" area_flags = UNIQUE_AREA | NOTELEPORT | GHOST_AREA | PASSIVE_AREA diff --git a/monkestation/code/modules/ghost_players/arena/arena_assets/alien.dm b/monkestation/code/modules/ghost_players/arena/arena_assets/alien.dm new file mode 100644 index 000000000000..00d7c9c80539 --- /dev/null +++ b/monkestation/code/modules/ghost_players/arena/arena_assets/alien.dm @@ -0,0 +1,30 @@ +/obj/structure/alien_tank + name = "alien tank" + icon = 'monkestation/code/modules/ghost_players/arena/arena_assets/icons/alien_autopsy.dmi' + icon_state = "tank_empty" + desc = "An empty tank full of unknown liquid." + density = TRUE + anchored = TRUE + +/obj/structure/alien_tank/broken + name = "broken alien tank" + icon_state = "tank_broken" + desc = "This is what happens when you let humans unto an alien ship filled with fragile equipment." + +/obj/structure/alien_tank/filled + icon_state = "tank_alien" + desc = "Occupied." + +/obj/structure/alien_tank/filled/hugger + icon_state = "tank_hugger" + +/obj/structure/alien_tank/filled/larva + icon_state = "tank_larva" + +/obj/structure/alien_sleeper + name = "alien hypersleep chamber" + icon = 'monkestation/code/modules/ghost_players/arena/arena_assets/icons/alien_sleeper.dmi' + icon_state = "sleeper" + desc = "Appears to be occupied. Best not disturb their sleep." + density = TRUE + anchored = TRUE diff --git a/monkestation/code/modules/ghost_players/arena/arena_assets/bottomless_sign.dm b/monkestation/code/modules/ghost_players/arena/arena_assets/bottomless_sign.dm new file mode 100644 index 000000000000..837d1bb75e8e --- /dev/null +++ b/monkestation/code/modules/ghost_players/arena/arena_assets/bottomless_sign.dm @@ -0,0 +1,16 @@ +/obj/structure/sign/bottomless + name = "bottomless pit" + desc = "I sure hope nobody puts a bottom in the pit." + icon_state = "bottomlesspit1" + icon = 'monkestation/code/modules/ghost_players/arena/arena_assets/icons/sign2.dmi' + custom_materials = list(/datum/material/wood = 2000) + +/obj/structure/sign/bottomless/examine(mob/user) + . = ..() + . += span_nicegreen(">be me") + . += span_nicegreen(">bottomless pit supervisor") + . += span_nicegreen(">in charge of making sure the bottomless pit is, in fact, bottomless") + . += span_nicegreen(">occasionally have to go down there and check if the bottomless pit is still bottomless") + . += span_nicegreen(">one day i go down there and the bottomless pit is no longer bottomless") + . += span_nicegreen(">the bottom of the bottomless pit is now just a regular pit") + . += span_nicegreen(">distress.png") diff --git a/monkestation/code/modules/ghost_players/arena/arena_assets/event_floors.dm b/monkestation/code/modules/ghost_players/arena/arena_assets/event_floors.dm new file mode 100644 index 000000000000..5ed0633862cc --- /dev/null +++ b/monkestation/code/modules/ghost_players/arena/arena_assets/event_floors.dm @@ -0,0 +1,10 @@ +/turf/open/indestructible/event/plating + name = "plating" + icon_state = "plating" + base_icon_state = "plating" + overfloor_placed = FALSE + underfloor_accessibility = UNDERFLOOR_INTERACTABLE + footstep = FOOTSTEP_PLATING + barefootstep = FOOTSTEP_HARD_BAREFOOT + clawfootstep = FOOTSTEP_HARD_CLAW + heavyfootstep = FOOTSTEP_GENERIC_HEAVY diff --git a/monkestation/code/modules/ghost_players/arena/arena_assets/event_walls.dm b/monkestation/code/modules/ghost_players/arena/arena_assets/event_walls.dm new file mode 100644 index 000000000000..39048d5b3a46 --- /dev/null +++ b/monkestation/code/modules/ghost_players/arena/arena_assets/event_walls.dm @@ -0,0 +1,34 @@ +/turf/closed/indestructible/event + name = "wall" + desc = "Effectively impervious to conventional methods of destruction." + +/turf/closed/indestructible/event/pod + icon = 'icons/turf/walls/survival_pod_walls.dmi' + base_icon_state = "survival_pod_walls" + icon_state = "survival_pod_walls-0" + smoothing_flags = SMOOTH_BITMASK + smoothing_groups = SMOOTH_GROUP_TITANIUM_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS + canSmoothWith = SMOOTH_GROUP_SHUTTLE_PARTS + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_TITANIUM_WALLS + +/turf/closed/indestructible/event/pod/blue + icon = 'monkestation/code/modules/ghost_players/arena/arena_assets/icons/survival_pod_walls_blue.dmi' + +/turf/closed/indestructible/event/pod/purple + icon = 'monkestation/code/modules/ghost_players/arena/arena_assets/icons/survival_pod_walls_purple.dmi' + +/turf/closed/indestructible/event/pod/red + icon = 'monkestation/code/modules/ghost_players/arena/arena_assets/icons/survival_pod_walls_red.dmi' + +/turf/closed/indestructible/event/rock + name = "rock" + icon = 'icons/turf/walls/rock_wall.dmi' + icon_state = "rock_wall-0" + base_icon_state = "rock_wall" + smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER + canSmoothWith = list(SMOOTH_GROUP_CLOSED_TURFS) + +/turf/closed/indestructible/event/rock/Initialize(mapload) + . = ..() + var/matrix/M = new + M.Translate(-4, -4) + transform = M diff --git a/monkestation/code/modules/ghost_players/arena/arena_assets/fish.dm b/monkestation/code/modules/ghost_players/arena/arena_assets/fish.dm new file mode 100644 index 000000000000..5a4a70c855ed --- /dev/null +++ b/monkestation/code/modules/ghost_players/arena/arena_assets/fish.dm @@ -0,0 +1,79 @@ +/mob/living/simple_animal/fish + name = "concept of a fish" + desc = "Fishy." + icon = 'monkestation/code/modules/ghost_players/arena/arena_assets/icons/fish.dmi' + icon_state = "guppy" + icon_living = "guppy" + turns_per_move = 5 + speak_emote = list("blubs") + maxHealth = 20 + health = 20 + harm_intent_damage = 1 + del_on_death = 1 + movement_type = FLYING + friendly_verb_continuous = "nudges" + friendly_verb_simple = "nudge" + verb_say = "blubs" + verb_ask = "blubs inquisitively" + verb_exclaim = "blubs intensely" + verb_yell = "blubs intensely" + +/mob/living/simple_animal/fish/guppy + name = "guppy" + desc = "Guppy is also known as rainbow fish because of the brightly colored body and fins." + icon_state = "guppy" + loot = list(/obj/item/fish/guppy) + +/mob/living/simple_animal/fish/firefish + name = "firefish goby" + desc = "To communicate in the wild, the firefish uses its dorsal fin to alert others of potential danger." + icon_state = "firefish" + loot = list(/obj/item/fish/firefish) + +/mob/living/simple_animal/fish/greenchromis + name = "green chromis" + desc = "The Chromis can vary in color from blue to green depending on the lighting and distance from the lights." + icon_state = "greenchromis" + loot = list(/obj/item/fish/greenchromis) + +/mob/living/simple_animal/fish/catfish + name = "cory catfish" + desc = "A catfish has about 100,000 taste buds, and their bodies are covered with them to help detect chemicals present in the water and also to respond to touch." + icon_state = "catfish" + loot = list(/obj/item/fish/catfish) + +/mob/living/simple_animal/fish/plasmatetra + name = "plasma tetra" + desc = "Due to their small size, tetras are prey to many predators in their watery world, including eels, crustaceans, and invertebrates." + icon_state = "plastetra" + loot = list(/obj/item/fish/plasmatetra) + +/mob/living/simple_animal/fish/angelfish + name = "angelfish" + desc = "Young Angelfish often live in groups, while adults prefer solitary life. They become territorial and aggressive toward other fish when they reach adulthood." + icon_state = "angelfish" + loot = list(/obj/item/fish/angelfish) + +/mob/living/simple_animal/fish/clownfish + name = "clownfish" + desc = "Clownfish catch prey by swimming onto the reef, attracting larger fish, and luring them back to the anemone. The anemone will sting and eat the larger fish, leaving the remains for the clownfish." + icon_state = "clownfish" + loot = list(/obj/item/fish/clownfish) + +/mob/living/simple_animal/fish/goldfish + name = "goldfish" + desc = "Despite common belief, goldfish do not have three-second memories. They can actually remember things that happened up to three months ago." + icon_state = "goldfish" + loot = list(/obj/item/fish/goldfish) + +/mob/living/simple_animal/fish/dwarf_moonfish + name = "dwarf moonfish" + desc = "Ordinarily in the wild, the Zagoskian moonfish is around the size of a tuna, however through selective breeding a smaller breed suitable for being kept as an aquarium pet has been created." + icon_state = "dwarf_moonfish" + loot = list(/obj/item/fish/dwarf_moonfish) + +/mob/living/simple_animal/fish/gunner_jellyfish + name = "gunner jellyfish" + desc = "So called due to their resemblance to an artillery shell, the gunner jellyfish is native to Tizira, where it is enjoyed as a delicacy. Produces a mild hallucinogen that is destroyed by cooking." + icon_state = "gunner_jellyfish" + loot = list(/obj/item/fish/gunner_jellyfish) diff --git a/monkestation/code/modules/ghost_players/arena/arena_assets/icons/alien_autopsy.dmi b/monkestation/code/modules/ghost_players/arena/arena_assets/icons/alien_autopsy.dmi new file mode 100644 index 0000000000000000000000000000000000000000..1cc259eec8855748e1016155bf81cf0d15a6c24c GIT binary patch literal 9243 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 E4@W#U#sB~S literal 0 HcmV?d00001 diff --git a/monkestation/code/modules/ghost_players/arena/arena_assets/icons/alien_sleeper.dmi b/monkestation/code/modules/ghost_players/arena/arena_assets/icons/alien_sleeper.dmi new file mode 100644 index 0000000000000000000000000000000000000000..63bbdedd561b7a1a2cf492df8984eab66a267c0a GIT binary patch literal 1567 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 literal 0 HcmV?d00001 diff --git a/monkestation/code/modules/ghost_players/arena/arena_assets/icons/statues.dmi b/monkestation/code/modules/ghost_players/arena/arena_assets/icons/statues.dmi new file mode 100644 index 0000000000000000000000000000000000000000..75cf39b4358e2dba2d1f365e2042bc4325db84cd GIT binary patch literal 11801 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 SBIK+$6hKT)v_jY*@P7ca>uA6L literal 0 HcmV?d00001 diff --git a/monkestation/code/modules/ghost_players/arena/arena_assets/icons/survival_pod_walls_blue.dmi b/monkestation/code/modules/ghost_players/arena/arena_assets/icons/survival_pod_walls_blue.dmi new file mode 100644 index 0000000000000000000000000000000000000000..83d5dbf4e913a1dd3f8f9f5ce0c748cea35e725e GIT binary patch literal 6312 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 literal 0 HcmV?d00001 diff --git a/monkestation/code/modules/ghost_players/arena/arena_assets/icons/survival_pod_walls_purple.dmi b/monkestation/code/modules/ghost_players/arena/arena_assets/icons/survival_pod_walls_purple.dmi new file mode 100644 index 0000000000000000000000000000000000000000..f615dde56050c9392b8baf136ede5740a3986497 GIT binary patch literal 6312 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 E0MnpfX8-^I literal 0 HcmV?d00001 diff --git a/monkestation/code/modules/ghost_players/arena/arena_assets/icons/survival_pod_walls_red.dmi b/monkestation/code/modules/ghost_players/arena/arena_assets/icons/survival_pod_walls_red.dmi new file mode 100644 index 0000000000000000000000000000000000000000..03aded2b5abdc37a6121b48ac7221f1a7ca9bcbb GIT binary patch literal 6312 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 F{|5!_TPpwn literal 0 HcmV?d00001 diff --git a/monkestation/code/modules/ghost_players/arena/arena_assets/icons/water_overlay.dmi b/monkestation/code/modules/ghost_players/arena/arena_assets/icons/water_overlay.dmi new file mode 100644 index 0000000000000000000000000000000000000000..3a497437a8b559253c3fb8cc0d66994201550bd4 GIT binary patch literal 1892 zcmV-q2b=hbP)V=-0C=1w$1w_oFc1aMI&+GT_Oh$CX(Y0w&?`v5(FAmb$)I?93%mD9bp6kd zaD%6lC8y&Li?;fZxzel=7EMhia$2Ll$r_YlQCvY;rsHJU!d;M=lVn(Y$t)6feqEv; z9o*pQ0ZptOk28v%vH$=Es!2paR9J;oms^tD$PGmgfFz668tXCPC3tgQinrnQO^mu_ zsrgC({y>tF`llkgvY5&H!cF~gM zloWwI0k}|{ml+7ouP2#-u1Z88QU{H-qrmiGqQ7?ycqs7y3d$cI20=X-HCwTYO2(h&r#plZmcM&8OF{0~p( z5ikRf60EAh04&xHX}J5)hjR9lwtqih9?E7y2V^$Hm%oT8!r?6jpJ(x{ie%Oy0b3d# zNdg{zJ3&N|&C5|+{h#MVv!&tdS#NPbM5PytVJ{QM_xf3}Ry56m zJQOp--_P-z0@Or^#fl=J`PN}E;`J=J2AsY*{z-o(9e`S?cQI@+oD(|@dp2Zg=n<^n zR%BIF1*eZdYw)^Pg03Az@cp2DS!l63GQuJfGMtbkGnfVP*(&WGLS$l6@#>khm$_i? z&|eSwfc&;Ipa(b|`~1M)4kDqc5*h4&{h(zA?20}OHb-q5vD)x0XfHDyBc0IL#XFz04udR0TdZOrdYriQ^tlJPXcgU)n z6FtUb7RAsTwHOoCBY+ZkyB2#(uH=kSGA@g?mzmt182*h6=06@V!}0ftHNA&T`MV(x zLsW^^+8`qkz?Y(i8S-1uEOGsd%s;^7F~(8k)a zhuyQ~q7Ps?3_gOtR`#?j8g;4a)xIdAjsAWxw}u}<&fu>*eQd%*3Xv?)<|P(jW>Il ziti|!=`Z1SxdvxM5w3A!X0#78{v3_^ zQKcrob$mStkvfQ};_2m6vk?&WBYRHRa~gan?A45?4->MKPV}htmxby@6cy$8zGE*F z@{sD6Z|6X>5Sb38oj*?WY1mfZT%|-FiX2I9esiab5koJG&hNkE|3wWzcQ55fV29G* z*So-8D4zWsvj7`i9U#!X60N_Vm>M>wAW*!HiN-9*Vzif;{&o9(axPYpJPUp6#0WN1 z8wU{1-f8ybfr;W(Ujy$(W8opuN@ig0FZMu z>#`ticI7xv>^Z^z{E|HTUq8^rM$RWOLvFt}oE+)ruRHo2y>SH0RY>o38@1-sL{sp9 z+&Znl_qwlfl9t5zQ|YbMq-&pNB!Y9Gaorc)$1UmejF9){SN|vTuJDXoR7&R@uE;Iw zViFPPUN8Un=Ld4@^xiAU_Mq=u4W!Q#dQ@hV8>*1R+RJL6Cj4tX$jt7EC?Xu^f#b~c zlX%@>=&1dK6Pg*hb!2JC*Isj56lH9>mAK{)Gu^$!$jurY=Y1%BPUPE3X5!u}NB*H4 zf3I~#8|_P{Hr>~<_=l32zg~y&sI0D eJ?_I^-Qxe-4(k`v=<0+30000

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 Y;?3qVwBQY}VhFmVdF^8Md5fq22e&tcUH||9 literal 5863 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 qcGHvw? 0) + runs-- + tested_part = victim.get_bodypart(pick(zones)) + i = 1 + for(iter_test_wound_list in list(list(/datum/wound/blunt/moderate, /datum/wound/blunt/severe, /datum/wound/blunt/critical),\ + list(/datum/wound/slash/moderate, /datum/wound/slash/severe, /datum/wound/slash/critical),\ + list(/datum/wound/pierce/moderate, /datum/wound/pierce/severe, /datum/wound/pierce/critical),\ + list(/datum/wound/burn/moderate, /datum/wound/burn/severe, /datum/wound/burn/critical))) + if(prob(20)) + continue + + var/datum/wound/iter_test_wound + var/threshold_penalty = 0 + for(iter_test_wound as anything in iter_test_wound_list) + var/threshold = initial(iter_test_wound.threshold_minimum) - threshold_penalty // just enough to guarantee the next tier of wound, given the existing wound threshold penalty + if(dam_types[i] == BRUTE) + tested_part.receive_damage(WOUND_MINIMUM_DAMAGE + 15, 0, wound_bonus = threshold, sharpness=sharps[i]) + else if(dam_types[i] == BURN) + tested_part.receive_damage(0, WOUND_MINIMUM_DAMAGE + 15, wound_bonus = threshold, sharpness=sharps[i]) + var/datum/wound/actual_wound = victim.all_wounds[1] + threshold_penalty = actual_wound.threshold_penalty + i++ + +/obj/structure/injured_spawner/proc/rot_organs(mob/living/carbon/human/victim) + var/organs_to_rot = 6 + var/list/organ_slots = list(ORGAN_SLOT_BRAIN, ORGAN_SLOT_HEART, ORGAN_SLOT_EYES, ORGAN_SLOT_LIVER, ORGAN_SLOT_LUNGS, ORGAN_SLOT_STOMACH) + while(organs_to_rot > 0) + organs_to_rot-- + victim.adjustOrganLoss(pick(organ_slots), rand(50, 75)) diff --git a/tgstation.dme b/tgstation.dme index f220edf73bd1..9e17239f3d30 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5791,6 +5791,7 @@ #include "monkestation\code\modules\ghost_players\arena\arena_assets\fish.dm" #include "monkestation\code\modules\ghost_players\arena\arena_assets\statues.dm" #include "monkestation\code\modules\ghost_players\arena\arena_assets\water.dm" +#include "monkestation\code\modules\ghost_players\job_helpers\injured_spawner.dm" #include "monkestation\code\modules\hydroponics\botanical_lexicon.dm" #include "monkestation\code\modules\hydroponics\plant_genes.dm" #include "monkestation\code\modules\hydroponics\seeds.dm" From 49178dd330fdb16ca5873a45e5f7d3147cb03356 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sat, 23 Sep 2023 14:15:17 -0400 Subject: [PATCH 36/59] Update injured_spawner.dm --- .../modules/ghost_players/job_helpers/injured_spawner.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/monkestation/code/modules/ghost_players/job_helpers/injured_spawner.dm b/monkestation/code/modules/ghost_players/job_helpers/injured_spawner.dm index f51c6a2769e1..6a9b83a19909 100644 --- a/monkestation/code/modules/ghost_players/job_helpers/injured_spawner.dm +++ b/monkestation/code/modules/ghost_players/job_helpers/injured_spawner.dm @@ -46,15 +46,12 @@ continue var/datum/wound/iter_test_wound - var/threshold_penalty = 0 for(iter_test_wound as anything in iter_test_wound_list) - var/threshold = initial(iter_test_wound.threshold_minimum) - threshold_penalty // just enough to guarantee the next tier of wound, given the existing wound threshold penalty + var/threshold = initial(iter_test_wound.threshold_minimum) + rand(40, 60) // just enough to guarantee the next tier of wound, given the existing wound threshold penalty if(dam_types[i] == BRUTE) tested_part.receive_damage(WOUND_MINIMUM_DAMAGE + 15, 0, wound_bonus = threshold, sharpness=sharps[i]) else if(dam_types[i] == BURN) tested_part.receive_damage(0, WOUND_MINIMUM_DAMAGE + 15, wound_bonus = threshold, sharpness=sharps[i]) - var/datum/wound/actual_wound = victim.all_wounds[1] - threshold_penalty = actual_wound.threshold_penalty i++ /obj/structure/injured_spawner/proc/rot_organs(mob/living/carbon/human/victim) From 02f437b482e5e5a109edf4b0e4c0785778b0eb39 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sat, 23 Sep 2023 17:46:26 -0400 Subject: [PATCH 37/59] adds a generative template for base botany mutations --- .../code/modules/wiki_templater/templates.dm | 33 +++++++++++++++++++ .../modules/wiki_templater/test_generate.dm | 13 ++++++++ tgstation.dme | 2 ++ 3 files changed, 48 insertions(+) create mode 100644 monkestation/code/modules/wiki_templater/templates.dm create mode 100644 monkestation/code/modules/wiki_templater/test_generate.dm diff --git a/monkestation/code/modules/wiki_templater/templates.dm b/monkestation/code/modules/wiki_templater/templates.dm new file mode 100644 index 000000000000..5cf06a11016a --- /dev/null +++ b/monkestation/code/modules/wiki_templater/templates.dm @@ -0,0 +1,33 @@ +/datum/wiki_template/botany/proc/generate_output(datum/hydroponics/plant_mutation/mutation) + var/datum/hydroponics/plant_mutation/generated_mutation = new mutation + + var/name_string = capitalize(initial(generated_mutation.created_product.name)) + var/mutates_from_string = "" + for(var/obj/item/seeds/any_seed as anything in generated_mutation.mutates_from) + mutates_from_string += "!\[wrench.png\](/wrench.png)\[[initial(any_seed.plantname)]\](https://wiki.monkestation.com/en/jobs/service/botanist#[initial(any_seed.species)])" + + var/generated_requirements = "" + if(length(generated_mutation.required_potency)) + generated_requirements += "**Required Potency:** [generated_mutation.required_potency[1]] - [generated_mutation.required_potency[2]]
" + + if(length(generated_mutation.required_yield)) + generated_requirements += "**Required Yield:** [generated_mutation.required_yield[1]] - [generated_mutation.required_yield[2]]
" + + if(length(generated_mutation.required_production)) + generated_requirements += "**Required Production:** [generated_mutation.required_production[1]] - [generated_mutation.required_production[2]]
" + + if(length(generated_mutation.required_endurance)) + generated_requirements += "**Required Endurance:** [generated_mutation.required_endurance[1]] - [generated_mutation.required_endurance[2]]
" + + if(length(generated_mutation.required_lifespan)) + generated_requirements += "**Required Lifespan:** [generated_mutation.required_lifespan[1]] - [generated_mutation.required_lifespan[2]]
" + + var/created_template = "## [name_string] \n" + created_template += "| --- | --- | --- | \n" + created_template += "

[name_string]
Mutates From
Mutates Into | \n" + created_template += "| | [mutates_from_string] |None \n" + created_template += "
Food Information |
Mutation Requirements | \n" + created_template += " | |
Base Chemicals |
Traits [generated_requirements] \n" + created_template += "| | !\[wrench.png\](/wrench.png) TBA| !\[wrench.png\](/wrench.png) TBA|" + + return created_template diff --git a/monkestation/code/modules/wiki_templater/test_generate.dm b/monkestation/code/modules/wiki_templater/test_generate.dm new file mode 100644 index 000000000000..a3352d0b4a25 --- /dev/null +++ b/monkestation/code/modules/wiki_templater/test_generate.dm @@ -0,0 +1,13 @@ +/proc/test_generate_botany_wiki() + var/datum/wiki_template/botany/new_botany = new + return new_botany.generate_output(/datum/hydroponics/plant_mutation/life_weed) + +GLOBAL_VAR_INIT(botany_wiki, "") +/proc/generate_botany_wiki_templates() + var/mega_string = "" + var/datum/wiki_template/botany/new_botany = new + for(var/datum/hydroponics/plant_mutation/listed_mutation as anything in (subtypesof(/datum/hydroponics/plant_mutation) - typesof(/datum/hydroponics/plant_mutation/infusion))) + mega_string += "[new_botany.generate_output(listed_mutation)] \n" + + GLOB.botany_wiki = mega_string + return mega_string diff --git a/tgstation.dme b/tgstation.dme index 9e17239f3d30..9c16cc992b02 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6192,6 +6192,8 @@ #include "monkestation\code\modules\vehicles\monkey_ball.dm" #include "monkestation\code\modules\vehicles\mecha\mecha_actions.dm" #include "monkestation\code\modules\vehicles\mecha\equipment\tools\other_tools.dm" +#include "monkestation\code\modules\wiki_templater\templates.dm" +#include "monkestation\code\modules\wiki_templater\test_generate.dm" #include "monkestation\code\random_rooms\room_base.dm" #include "monkestation\code\random_rooms\bars\icebox.dm" #include "monkestation\code\random_rooms\bars\tramstation.dm" From 8e83bdce8e1f6b06febfd24553f6064b9108e6cc Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sat, 23 Sep 2023 21:49:54 -0400 Subject: [PATCH 38/59] chef food machine, organ fabricator, hydroponics helper --- _maps/map_files/generic/CentCom.dmm | 377 +++++++++--------- .../food_and_drinks/restaurant/_venue.dm | 8 +- code/modules/hydroponics/hydroponics.dm | 5 +- .../ghost_players/job_helpers/food_machine.dm | 26 ++ .../job_helpers/hydroponics_helper.dm | 120 ++++++ .../job_helpers/injured_spawner.dm | 29 +- .../job_helpers/organ_printer.dm | 48 +++ tgstation.dme | 3 + 8 files changed, 429 insertions(+), 187 deletions(-) create mode 100644 monkestation/code/modules/ghost_players/job_helpers/food_machine.dm create mode 100644 monkestation/code/modules/ghost_players/job_helpers/hydroponics_helper.dm create mode 100644 monkestation/code/modules/ghost_players/job_helpers/organ_printer.dm diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 73b6b0330e4c..2303682a91ac 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -149,29 +149,8 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) "aM" = ( -/obj/structure/closet/secure_closet/freezer/meat/open, -/obj/item/food/meat/rawbacon, -/obj/item/food/meat/rawbacon, -/obj/item/food/meat/rawbacon, -/obj/item/food/meat/rawbacon, -/obj/item/food/meat/slab/killertomato, -/obj/item/food/meat/slab/killertomato, -/obj/item/food/meat/slab/killertomato, -/obj/item/food/meat/slab/killertomato, -/obj/item/food/meat/slab/human/mutant/lizard, -/obj/item/food/meat/slab/human/mutant/lizard, -/obj/item/food/meat/slab/human/mutant/lizard, -/obj/item/food/meat/slab/human/mutant/lizard, -/obj/item/food/sausage, -/obj/item/food/sausage, -/obj/item/food/meat/rawcutlet, -/obj/item/food/meat/rawcutlet, -/obj/item/food/meat/rawcutlet, -/obj/item/food/fishmeat/carp, -/obj/item/food/fishmeat/carp, -/obj/item/food/fishmeat/carp, -/obj/item/food/fishmeat/carp, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/stove, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) "aP" = ( @@ -244,25 +223,8 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/fore) "bf" = ( -/obj/structure/closet/secure_closet/freezer/meat/open, -/obj/item/food/meat/slab/bear, -/obj/item/food/meat/slab/bear, -/obj/item/food/meat/slab/bear, -/obj/item/food/meat/slab/bear, -/obj/item/food/meat/slab/goliath, -/obj/item/food/meat/slab/goliath, -/obj/item/food/meat/slab/goliath, -/obj/item/food/meat/slab/goliath, -/obj/item/food/meat/slab/xeno, -/obj/item/food/meat/slab/xeno, -/obj/item/food/meat/slab/xeno, -/obj/item/food/meat/slab/xeno, -/obj/item/food/spaghetti, -/obj/item/food/spaghetti, -/obj/item/food/meat/rawcutlet, -/obj/item/food/meat/rawcutlet, -/obj/item/food/meat/rawcutlet, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/food_machine, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) "bg" = ( @@ -814,6 +776,13 @@ }, /turf/open/floor/wood, /area/centcom/tdome/administration) +"dI" = ( +/obj/machinery/vending/hydroseeds{ + default_price = 0; + extra_price = 0 + }, +/turf/open/floor/wood, +/area/centcom/tdome/observation) "dJ" = ( /obj/machinery/button/door/indestructible{ id = "thunderdomehea"; @@ -869,6 +838,7 @@ /obj/item/ammo_casing/shotgun/pulverizer, /obj/item/storage/backpack/duffelbag/syndie/ammo/shotgun, /obj/item/gun/ballistic/shotgun/bulldog/unrestricted, +/obj/item/holosign_creator/robot_seat/bar, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) "dW" = ( @@ -1476,6 +1446,11 @@ }, /turf/open/floor/iron/white, /area/centcom/tdome/observation) +"gz" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/directions/medical, +/turf/open/floor/plating, +/area/centcom/central_command_areas/control) "gA" = ( /obj/item/storage/briefcase{ pixel_x = -3; @@ -1737,6 +1712,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) +"hS" = ( +/obj/machinery/barsign/all_access/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/restaurant_portal/bar, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) "hT" = ( /obj/machinery/vending/boozeomat{ pixel_x = 32 @@ -2530,6 +2511,10 @@ dir = 1 }, /area/centcom/central_command_areas/prison) +"kc" = ( +/obj/machinery/hydroponics/constructable/helper, +/turf/open/floor/carpet/neon/simple/black/nodots, +/area/centcom/tdome/observation) "kd" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -3372,6 +3357,12 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/fore) +"nw" = ( +/obj/machinery/vending/hydronutrients{ + default_price = 0 + }, +/turf/open/floor/wood, +/area/centcom/tdome/observation) "nx" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ @@ -3688,25 +3679,9 @@ /turf/open/floor/iron, /area/centcom/tdome/observation) "oF" = ( -/obj/structure/closet/secure_closet/freezer/fridge/open, -/obj/item/food/grown/potato, -/obj/item/food/grown/potato, -/obj/item/food/grown/whitebeet, -/obj/item/food/grown/whitebeet, -/obj/item/food/grown/tomato, -/obj/item/food/grown/tomato, -/obj/item/food/grown/rice, -/obj/item/food/grown/rice, -/obj/item/food/grown/icepepper, -/obj/item/food/grown/icepepper, -/obj/item/food/grown/citrus/lemon, -/obj/item/food/grown/citrus/lime, -/obj/item/food/grown/citrus/orange, -/obj/item/food/grown/cherries, -/obj/item/food/grown/apple, -/obj/item/food/grown/ambrosia/deus, /obj/machinery/status_display/evac/directional/north, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/griddle, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) "oH" = ( @@ -6123,6 +6098,13 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/control) +"yv" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/directions/medical{ + dir = 4 + }, +/turf/open/floor/plating, +/area/centcom/central_command_areas/ghost_spawn) "yy" = ( /obj/machinery/light/directional/east, /obj/machinery/status_display/evac/directional/east, @@ -6245,6 +6227,9 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) +"zd" = ( +/turf/open/floor/carpet/neon/simple/black/nodots, +/area/centcom/tdome/observation) "ze" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/indestructible/dark, @@ -6415,10 +6400,6 @@ /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) "zI" = ( -/mob/living/simple_animal/bot/medbot/derelict{ - name = "\improper Advanced Medibot"; - desc = "Expertly tuned to keep you feeling 100%" - }, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, @@ -7088,6 +7069,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) +"Cu" = ( +/obj/machinery/hydroponics/constructable, +/turf/open/floor/carpet/neon/simple/lime/nodots, +/area/centcom/tdome/observation) "Cv" = ( /obj/structure/closet/crate/freezer/surplus_limbs, /obj/structure/window/reinforced/spawner/directional/north, @@ -7801,6 +7786,14 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/centcom/central_command_areas/evacuation/ship) +"Gj" = ( +/obj/machinery/light/directional/north, +/obj/machinery/vending/hydroseeds{ + default_price = 0; + extra_price = 0 + }, +/turf/open/floor/wood, +/area/centcom/tdome/observation) "Gs" = ( /obj/machinery/power/smes/magical, /obj/effect/turf_decal/stripes/line, @@ -8211,6 +8204,11 @@ "Jb" = ( /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/prison/cells) +"Je" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/restaurant_portal/restaurant, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) "Jf" = ( /obj/structure/sign/poster/random/directional/west, /obj/item/lazarus_injector{ @@ -8926,6 +8924,12 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/centcom/central_command_areas/prison) +"MA" = ( +/obj/structure/sign/directions/medical{ + dir = 1 + }, +/turf/closed/indestructible/riveted, +/area/centcom/central_command_areas/control) "MC" = ( /obj/structure/flora/grass/jungle/b, /obj/effect/decal/cleanable/garbage{ @@ -9161,6 +9165,13 @@ pixel_y = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/kitchen/spoon/soup_ladle, +/obj/item/kitchen/spoon/soup_ladle, +/obj/item/kitchen/spoon/soup_ladle, +/obj/item/reagent_containers/cup/soup_pot, +/obj/item/reagent_containers/cup/soup_pot, +/obj/item/reagent_containers/cup/soup_pot, +/obj/item/kitchen/spoon/soup_ladle, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) "NI" = ( @@ -9266,6 +9277,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) +"Og" = ( +/obj/machinery/light/directional/north, +/obj/machinery/hydroponics/constructable, +/turf/open/floor/carpet/neon/simple/lime/nodots, +/area/centcom/tdome/observation) "Oj" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ @@ -9920,6 +9936,10 @@ /obj/item/storage/toolbox/mechanical, /turf/open/floor/iron/smooth_large, /area/centcom/central_command_areas/evacuation/ship) +"Qu" = ( +/obj/machinery/light/directional/south, +/turf/open/floor/carpet/neon/simple/black/nodots, +/area/centcom/tdome/observation) "Qv" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -10233,6 +10253,7 @@ /obj/item/knife/kitchen, /obj/machinery/newscaster/directional/west, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/holosign_creator/robot_seat/restaurant, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) "Ry" = ( @@ -10246,10 +10267,7 @@ dir = 1 }, /obj/machinery/shower/directional/north, -/mob/living/simple_animal/bot/medbot/derelict{ - name = "\improper Advanced Medibot"; - desc = "Expertly tuned to keep you feeling 100%" - }, +/mob/living/simple_animal/bot/cleanbot/medbay, /turf/open/floor/noslip{ icon_state = "textured_white"; color = "#52B4E9" @@ -10350,6 +10368,9 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/centcom/tdome/observation) +"Sb" = ( +/turf/open/floor/wood, +/area/centcom/tdome/observation) "Sd" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/lattice, @@ -10477,6 +10498,36 @@ /obj/structure/window/reinforced/survival_pod/spawner/directional/west, /turf/open/floor/iron/smooth_large, /area/centcom/central_command_areas/evacuation/ship) +"SF" = ( +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/machinery/button/door/indestructible{ + id = "XCCsec3"; + name = "XCC Shutter 3 Control"; + pixel_x = -8; + pixel_y = 38 + }, +/obj/machinery/button/door/indestructible{ + id = "XCCsec1"; + name = "CC Shutter 1 Control"; + pixel_x = 8; + pixel_y = 38 + }, +/obj/machinery/button/door/indestructible{ + id = "XCCFerry"; + name = "Hanger Bay Shutters"; + pixel_x = -8; + pixel_y = 24 + }, +/obj/machinery/button/door/indestructible{ + id = "XCCsec3"; + name = "CC Main Access Control"; + pixel_x = 8; + pixel_y = 24 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/ferry) "SG" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -10724,6 +10775,10 @@ }, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/briefing) +"TH" = ( +/obj/structure/sign/departments/botany, +/turf/closed/indestructible/riveted, +/area/centcom/tdome/observation) "TI" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -11209,6 +11264,9 @@ /obj/effect/turf_decal/trimline/blue/filled/warning, /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) +"VG" = ( +/turf/open/floor/carpet/neon/simple/lime/nodots, +/area/centcom/tdome/observation) "VK" = ( /obj/structure/table/wood, /obj/item/storage/fancy/donut_box, @@ -11253,7 +11311,7 @@ /area/centcom/tdome/observation) "VW" = ( /obj/machinery/light/directional/south, -/turf/open/floor/carpet/neon/simple/lime/nodots, +/turf/open/floor/wood, /area/centcom/central_command_areas/ghost_spawn) "VY" = ( /obj/machinery/computer/records/security{ @@ -11367,36 +11425,7 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/four) -"Wu" = ( -/obj/machinery/light/directional/north, -/obj/machinery/button/door/indestructible{ - id = "XCCFerry"; - name = "Hanger Bay Shutters"; - pixel_x = -8; - pixel_y = 24 - }, -/obj/machinery/button/door/indestructible{ - id = "XCCsec3"; - name = "CC Main Access Control"; - pixel_x = 8; - pixel_y = 24 - }, -/obj/machinery/button/door/indestructible{ - id = "XCCsec1"; - name = "CC Shutter 1 Control"; - pixel_x = 8; - pixel_y = 38 - }, -/obj/machinery/button/door/indestructible{ - id = "XCCsec3"; - name = "XCC Shutter 3 Control"; - pixel_x = -8; - pixel_y = 38 - }, -/turf/open/floor/wood, -/area/centcom/central_command_areas/ghost_spawn) "Wv" = ( -/obj/effect/landmark/thunderdome/observe, /obj/machinery/barsign/all_access/directional/north, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -11928,9 +11957,8 @@ /area/centcom/tdome/observation) "YG" = ( /obj/machinery/door/airlock/centcom{ - name = "Thunderdome Green Team" + name = "Botanical Training Area" }, -/obj/effect/mapping_helpers/airlock/access/any/admin/general, /obj/effect/mapping_helpers/airlock/unres{ dir = 1 }, @@ -12067,28 +12095,9 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) "Zj" = ( -/obj/structure/closet/secure_closet/freezer/kitchen, -/obj/item/food/grown/banana, -/obj/item/food/grown/banana, -/obj/item/food/grown/wheat, -/obj/item/food/grown/wheat, -/obj/item/food/grown/vanillapod, -/obj/item/food/grown/vanillapod, -/obj/item/food/grown/sugarcane, -/obj/item/food/grown/sugarcane, -/obj/item/food/grown/oat, -/obj/item/food/grown/oat, -/obj/item/food/grown/grapes, -/obj/item/food/grown/grapes, -/obj/item/food/grown/corn, -/obj/item/food/grown/corn, -/obj/item/food/grown/chili, -/obj/item/food/grown/chili, -/obj/item/food/grown/carrot, -/obj/item/food/grown/apple, -/obj/item/food/grown/ambrosia/vulgaris, /obj/machinery/status_display/evac/directional/north, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/oven/range, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) "Zk" = ( @@ -12189,6 +12198,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark/textured_large, /area/centcom/central_command_areas/evacuation/ship) +"ZC" = ( +/obj/machinery/biogenerator/admin, +/turf/open/indestructible/event/plating, +/area/centcom/tdome/observation) "ZE" = ( /obj/effect/landmark/error, /turf/open/misc/ashplanet/wateryrock{ @@ -51322,7 +51335,7 @@ On On On mD -su +SF fw ts qR @@ -54432,7 +54445,7 @@ Xf XJ Xf QC -nD +Je Kd nD SZ @@ -55176,7 +55189,7 @@ Za tK Ab Cb -Wu +Nt Ng Ng Ng @@ -55434,7 +55447,7 @@ tK Ab LT Ng -Ng +xD xD xD VW @@ -55691,10 +55704,10 @@ tM Ab LT Ng -Ng xD xD xD +Ng LT Ab Ab @@ -55948,7 +55961,7 @@ tN Ab LT Ng -Ng +xD xD xD VW @@ -56720,7 +56733,7 @@ tL LT LT wC -LT +yv LT LT kt @@ -57002,7 +57015,7 @@ XJ Xf XJ QC -Wv +hS Kd nD SZ @@ -57259,7 +57272,7 @@ QC QC QC QC -nD +BW Kd nD SZ @@ -58292,14 +58305,14 @@ cS cS Xd QC -JH -JH -JH -JH -JH -JH -JH -JH +Cu +VG +Cu +dI +nw +zd +zd +zd uf Sz Sz @@ -58549,14 +58562,14 @@ MR TV PN QC -JH -JH -JH -JH -JH -JH -JH -JH +Og +VG +Cu +Sb +Sb +zd +kc +Qu uf Sz Js @@ -58793,7 +58806,7 @@ RR Kt io iu -io +MA Ad Nl QC @@ -58806,14 +58819,14 @@ QC QC QC QC -JH -JH -JH -JH -JH -JH -JH -JH +Cu +VG +Cu +Sb +Sb +zd +zd +zd uf Sz Js @@ -59062,15 +59075,15 @@ Vs tG Vs MK -QC -JH -JH -JH -JH -JH -JH -JH -JH +TH +Cu +VG +Cu +Sb +Sb +zd +kc +Qu uf Sz Js @@ -59293,7 +59306,7 @@ Ab Ab Ab pw -iu +gz kN Ar Fx @@ -59320,14 +59333,14 @@ ZP gU cZ YG -JH -JH -JH -JH -JH -JH -JH -JH +Sb +Sb +Sb +Sb +Sb +zd +zd +zd uf Sz Js @@ -59576,13 +59589,13 @@ QC QC Ad Rh -QC -JH -JH -JH -JH -JH -JH +TH +nw +Sb +Sb +Sb +Sb +ZC uf uf uf @@ -59834,12 +59847,12 @@ QC Qi cZ QC -JH -JH -JH -JH -JH -JH +Gj +Sb +Sb +Sb +Sb +ZC uf Sz SV diff --git a/code/modules/food_and_drinks/restaurant/_venue.dm b/code/modules/food_and_drinks/restaurant/_venue.dm index c42483e68491..0e3af728a8b3 100644 --- a/code/modules/food_and_drinks/restaurant/_venue.dm +++ b/code/modules/food_and_drinks/restaurant/_venue.dm @@ -170,6 +170,8 @@ /// A weak reference to the mob who turned on the portal var/datum/weakref/turned_on_portal + ///Are we a centcom spawned one if so ignore req_access + var/admin_spawned = FALSE /obj/machinery/restaurant_portal/Initialize(mapload) . = ..() @@ -194,7 +196,7 @@ if(!used_id) return ..() - if(!(linked_venue.req_access in used_id.GetAccess())) + if(!(linked_venue.req_access in used_id.GetAccess()) && !admin_spawned) to_chat(user, span_warning("This card lacks the access to change this venues status.")) return @@ -207,7 +209,7 @@ var/obj/item/card/id/used_id = I - if(!(linked_venue.req_access in used_id.GetAccess())) + if(!(linked_venue.req_access in used_id.GetAccess())&& !admin_spawned) to_chat(user, span_warning("This card lacks the access to change this venues status.")) return @@ -228,7 +230,7 @@ turned_on_portal = WEAKREF(user) - if(!(chosen_venue.req_access in used_id.GetAccess())) + if(!(chosen_venue.req_access in used_id.GetAccess()) && !admin_spawned) to_chat(user, span_warning("This card lacks the access to change this venues status.")) return diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index abad7f3b0cf5..df3edfa4a67e 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -66,6 +66,8 @@ var/self_growing = FALSE ///the multi these get for exisitng var/multi = 1 + ///helping tray + var/helping_tray = FALSE /obj/machinery/hydroponics/Initialize(mapload) create_reagents(40) @@ -390,7 +392,8 @@ if(myseed) SEND_SIGNAL(myseed, COMSIG_SEED_ON_GROW, src) - + if(helping_tray) + helpful_stuff() return /obj/machinery/hydroponics/proc/nutrimentMutation() diff --git a/monkestation/code/modules/ghost_players/job_helpers/food_machine.dm b/monkestation/code/modules/ghost_players/job_helpers/food_machine.dm new file mode 100644 index 000000000000..9a5b56ab6504 --- /dev/null +++ b/monkestation/code/modules/ghost_players/job_helpers/food_machine.dm @@ -0,0 +1,26 @@ +/obj/structure/food_machine + name = "all in one food transporter" + desc = "Centcomms latest and greatest, capable of transporting all forms of produce to Centcommms chefs in training." + + + resistance_flags = INDESTRUCTIBLE + anchored = TRUE + + icon = 'icons/obj/money_machine.dmi' + icon_state = "bogdanoff" + + +/obj/structure/food_machine/attack_hand(mob/living/user, list/modifiers) + . = ..() + var/list/foods = subtypesof(/obj/item/food/grown) + subtypesof(/obj/item/food/meat) + typesof(/obj/item/food/fishmeat) + subtypesof(/obj/item/reagent_containers/condiment) + + var/atom/choice = tgui_input_list(user, "Choose a food item to send", "[src.name]", foods) + if(!choice) + return + var/number = tgui_input_number(user, "How many should we send", "[src.name]", 1, 10, 1) + if(!number) + return + + while(number > 0) + number-- + new choice(get_turf(src)) diff --git a/monkestation/code/modules/ghost_players/job_helpers/hydroponics_helper.dm b/monkestation/code/modules/ghost_players/job_helpers/hydroponics_helper.dm new file mode 100644 index 000000000000..1155b7f1a5d3 --- /dev/null +++ b/monkestation/code/modules/ghost_players/job_helpers/hydroponics_helper.dm @@ -0,0 +1,120 @@ +/obj/machinery/hydroponics/constructable/helper + name = "hydro-hand 3000" + desc = "A state of the art hydroponics tray that helps upcoming botanists by giving them challenges." + + cycledelay = 3 SECONDS /// wayyyy faster for simplicity + helping_tray = TRUE + var/datum/hydroponics/plant_mutation/current_challenge + + +/obj/machinery/hydroponics/proc/helpful_stuff() + return + +/obj/machinery/hydroponics/constructable/helper/helpful_stuff() + waterlevel = maxwater // lets not worry about this + if(check_completion_state()) + fast_foward_growth() + else + generate_helpful_messages() + +/obj/machinery/hydroponics/constructable/helper/proc/check_completion_state() + if(!current_challenge) + return FALSE + + if(!current_challenge.check_viable(myseed)) + return FALSE + return TRUE + +/obj/machinery/hydroponics/constructable/helper/proc/fast_foward_growth() + var/growth_mult = (1.01 ** -myseed.maturation) + growth = myseed.harvest_age * growth_mult + set_plant_status(HYDROTRAY_PLANT_HARVESTABLE) + finish_challenge() + +/obj/machinery/hydroponics/constructable/helper/proc/finish_challenge() + maptext_height = 256 + maptext_width = 96 + maptext_x = -8 + maptext_y = 18 + + maptext = " Congratulations! \n You finished the Challenge! " + playsound(src, 'sound/items/party_horn.ogg', 50) + qdel(current_challenge) + +/obj/machinery/hydroponics/constructable/helper/proc/generate_helpful_messages() + maptext_height = 256 + maptext_width = 96 + maptext_x = -32 + maptext_y = 32 + + if(!current_challenge) + maptext = " Please Interact to Begin. " + else + var/built_string = " [initial(current_challenge.created_product.name)]" + if(current_challenge.required_potency.len) + var/low_end = current_challenge.required_potency[1] + var/high_end = current_challenge.required_potency[2] + if(!(low_end <= myseed.potency && myseed.potency <= high_end)) + built_string += " Potency: [myseed.potency] - [low_end <= myseed.potency ? "Over" : "Under"] \n" + else + built_string += " Potency: [myseed.potency] \n" + + if(current_challenge.required_yield.len) + var/low_end = current_challenge.required_yield[1] + var/high_end = current_challenge.required_yield[2] + if(!(low_end <= myseed.yield && myseed.yield <= high_end)) + built_string += " Yield: [myseed.yield] - [low_end <= myseed.yield ? "Over" : "Under"] \n" + else + built_string += " Yield: [myseed.yield] \n" + + if(current_challenge.required_production.len) + var/low_end = current_challenge.required_production[1] + var/high_end = current_challenge.required_production[2] + if(!(low_end <= myseed.production && myseed.production <= high_end)) + built_string += " Production: [myseed.production] - [low_end <= myseed.production ? "Over" : "Under"] \n" + else + built_string += " Production: [myseed.production] \n" + + if(current_challenge.required_endurance.len) + var/low_end = current_challenge.required_endurance[1] + var/high_end = current_challenge.required_endurance[2] + if(!(low_end <= myseed.endurance && myseed.endurance <= high_end)) + built_string += " Endurance: [myseed.endurance] - [low_end <= myseed.endurance ? "Over" : "Under"] \n" + else + built_string += " Endurance: [myseed.endurance] \n" + + if(current_challenge.required_lifespan.len) + var/low_end = current_challenge.required_lifespan[1] + var/high_end = current_challenge.required_lifespan[2] + if(!(low_end <= myseed.lifespan && myseed.lifespan <= high_end)) + built_string += " Lifespan: [myseed.lifespan] - [low_end <= myseed.lifespan ? "Over" : "Under"] \n" + else + built_string += " Lifespan: [myseed.lifespan] \n" + + built_string += "" + maptext = built_string + +/obj/machinery/hydroponics/constructable/helper/attack_hand(mob/user, list/modifiers) + . = ..() + if(!current_challenge) + var/list/mutations = subtypesof(/datum/hydroponics/plant_mutation) - typesof(/datum/hydroponics/plant_mutation/infusion) + + var/datum/hydroponics/plant_mutation/picked_mutation = pick(mutations) + current_challenge = new picked_mutation + var/obj/item/seeds/picked_seeds = current_challenge.mutates_from[1] + new picked_seeds(get_turf(src)) + else + var/choice = tgui_alert(user, "Do you wish to cancel this challenge?", "[src.name]", list("Yes", "No")) + if(choice != "Yes") + return + + qdel(current_challenge) + current_challenge = null + generate_helpful_messages() + +/obj/machinery/biogenerator/admin + resistance_flags = INDESTRUCTIBLE + biomass = INFINITY + +/obj/machinery/biogenerator/admin/default_deconstruction_crowbar(obj/item/crowbar, ignore_panel, custom_deconstruct) + return FALSE diff --git a/monkestation/code/modules/ghost_players/job_helpers/injured_spawner.dm b/monkestation/code/modules/ghost_players/job_helpers/injured_spawner.dm index 6a9b83a19909..7eaf15b53924 100644 --- a/monkestation/code/modules/ghost_players/job_helpers/injured_spawner.dm +++ b/monkestation/code/modules/ghost_players/job_helpers/injured_spawner.dm @@ -3,6 +3,7 @@ desc = "Sends over injured personell from other Centcomm facilities for you to treat." resistance_flags = INDESTRUCTIBLE + anchored = TRUE icon = 'icons/obj/machines/restaurant_portal.dmi' icon_state = "portal" @@ -10,13 +11,35 @@ COOLDOWN_DECLARE(spawner_cooldown) +/obj/structure/injured_spawner/Initialize(mapload) + . = ..() + register_context() + /obj/structure/injured_spawner/attack_hand(mob/living/user, list/modifiers) . = ..() if(COOLDOWN_FINISHED(src, spawner_cooldown)) generate_and_equip() + +/obj/structure/injured_spawner/add_context(atom/source, list/context, obj/item/held_item, mob/user) + . = ..() + context[SCREENTIP_CONTEXT_LMB] = "Spawn Body" + context[SCREENTIP_CONTEXT_RMB] = "Return Body (Drag Body)" + return CONTEXTUAL_SCREENTIP_SET + +/obj/structure/injured_spawner/attack_hand_secondary(mob/user, list/modifiers) + . = ..() + if(!user.pulling) + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + var/mob/living/carbon/human/injured/pullee = user.pulling + if(!istype(pullee)) + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + user.stop_pulling() + qdel(pullee) + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + /obj/structure/injured_spawner/proc/generate_and_equip() - var/mob/living/carbon/human/new_human = new() + var/mob/living/carbon/human/injured/new_human = new() new_human.equipOutfit(/datum/outfit/beachbum) apply_wounds(new_human) @@ -60,3 +83,7 @@ while(organs_to_rot > 0) organs_to_rot-- victim.adjustOrganLoss(pick(organ_slots), rand(50, 75)) + + +/mob/living/carbon/human/injured + diff --git a/monkestation/code/modules/ghost_players/job_helpers/organ_printer.dm b/monkestation/code/modules/ghost_players/job_helpers/organ_printer.dm new file mode 100644 index 000000000000..14f64e809fd2 --- /dev/null +++ b/monkestation/code/modules/ghost_players/job_helpers/organ_printer.dm @@ -0,0 +1,48 @@ +/obj/structure/organ_creator + name = "all in one organic medial fabricator" + desc = "Capable of making all organs and bodyparts needed for practitioners to fix up bodies." + + + resistance_flags = INDESTRUCTIBLE + anchored = TRUE + + icon = 'icons/obj/money_machine.dmi' + icon_state = "bogdanoff" + + + +/obj/structure/organ_creator/attack_hand(mob/living/user, list/modifiers) + . = ..() + var/list/all_internals = subtypesof(/obj/item/organ/internal) - typesof(/obj/item/organ/internal/zombie_infection) - typesof(/obj/item/organ/internal/alien) + var/list/all_externals = subtypesof(/obj/item/organ/external) + + var/list/all_bodyparts = subtypesof(/obj/item/bodypart) + + var/choice = tgui_input_list(user, "What do you wish to fabricate?", "[src.name]", list("External Organs", "Internal Organs", "Bodyparts")) + if(!choice) + return + var/list/choice_list + switch(choice) + if("External Organs") + choice_list = all_externals + if("Internal Organs") + choice_list = all_internals + else + choice_list = all_bodyparts + + var/atom/second_choice = tgui_input_list(user, "Choose what to fabricate", "[choice]", choice_list) + + new second_choice(get_turf(src)) + say("Organic Matter Fabricated") + playsound(src, 'sound/machines/ding.ogg', 50, TRUE) + + +/obj/structure/organ_creator/attackby(obj/item/attacking_item, mob/user, params) + . = ..() + if(!istype(attacking_item, /obj/item/organ) || !istype(attacking_item, /obj/item/bodypart)) + return + if(istype(attacking_item, /obj/item/organ/internal/brain)) + return + qdel(attacking_item) + say("Organic Matter Reclaimed") + playsound(src, 'sound/machines/ding.ogg', 50, TRUE) diff --git a/tgstation.dme b/tgstation.dme index 9c16cc992b02..3f055a745297 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5791,7 +5791,10 @@ #include "monkestation\code\modules\ghost_players\arena\arena_assets\fish.dm" #include "monkestation\code\modules\ghost_players\arena\arena_assets\statues.dm" #include "monkestation\code\modules\ghost_players\arena\arena_assets\water.dm" +#include "monkestation\code\modules\ghost_players\job_helpers\food_machine.dm" +#include "monkestation\code\modules\ghost_players\job_helpers\hydroponics_helper.dm" #include "monkestation\code\modules\ghost_players\job_helpers\injured_spawner.dm" +#include "monkestation\code\modules\ghost_players\job_helpers\organ_printer.dm" #include "monkestation\code\modules\hydroponics\botanical_lexicon.dm" #include "monkestation\code\modules\hydroponics\plant_genes.dm" #include "monkestation\code\modules\hydroponics\seeds.dm" From 0848924f8b2d5fd009a53a03e8c4e4514dce339b Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sat, 23 Sep 2023 21:51:53 -0400 Subject: [PATCH 39/59] adds botanical lexicons and watering cans to centcomm --- _maps/map_files/generic/CentCom.dmm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 2303682a91ac..f6cb33a1b990 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -7222,6 +7222,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/admin) +"CX" = ( +/obj/item/reagent_containers/cup/watering_can/advanced, +/obj/item/reagent_containers/cup/watering_can/advanced, +/obj/item/reagent_containers/cup/watering_can/advanced, +/obj/structure/table/wood/fancy/royalblue, +/obj/item/botanical_lexicon, +/obj/item/botanical_lexicon, +/obj/item/botanical_lexicon, +/obj/item/botanical_lexicon, +/obj/item/botanical_lexicon, +/turf/open/floor/wood, +/area/centcom/tdome/observation) "CY" = ( /obj/structure/chair{ dir = 4 @@ -7326,6 +7338,10 @@ }, /turf/open/floor/iron/dark/textured_large, /area/centcom/central_command_areas/evacuation/ship) +"DD" = ( +/obj/structure/reagent_dispensers/watertank/high, +/turf/open/floor/wood, +/area/centcom/tdome/observation) "DF" = ( /obj/structure/sign/warning/no_smoking, /turf/closed/indestructible/riveted, @@ -59849,8 +59865,8 @@ cZ QC Gj Sb -Sb -Sb +CX +DD Sb ZC uf From 4839c54b5b924b434a30b0d56bdc037ef26cc3b3 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sat, 23 Sep 2023 22:13:14 -0400 Subject: [PATCH 40/59] adds admin proc to ghost players --- code/modules/admin/admin_verbs.dm | 1 + .../code/modules/ghost_players/ghost_player.dm | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index d3e2da95b37b..86893a6fe549 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -116,6 +116,7 @@ GLOBAL_LIST_INIT(admin_verbs_fun, list( /client/proc/delay_command_report, /client/proc/drop_bomb, /client/proc/drop_dynex_bomb, + /client/proc/flip_ghost_spawn, /client/proc/forceEvent, /client/proc/generate_bulk_code, //monkestation addition /client/proc/generate_code, //monkestation addition diff --git a/monkestation/code/modules/ghost_players/ghost_player.dm b/monkestation/code/modules/ghost_players/ghost_player.dm index 5c696d2bc521..d33e34110141 100644 --- a/monkestation/code/modules/ghost_players/ghost_player.dm +++ b/monkestation/code/modules/ghost_players/ghost_player.dm @@ -1,3 +1,12 @@ +GLOBAL_VAR_INIT(disable_ghost_spawning, FALSE) + +/client/proc/flip_ghost_spawn() + set category = "Admin.Fun" + set name = "Toggle Centcomm Spawning" + set desc= "Toggles whether dead players can respawn in the centcomm area" + + GLOB.disable_ghost_spawning = !GLOB.disable_ghost_spawning + /mob/living/carbon/human/ghost var/revive_prepped = FALSE var/old_key @@ -96,6 +105,12 @@ cooldown_time = 40 SECONDS shared_cooldown = NONE + +/datum/action/cooldown/mob_cooldown/create_ghost_player/IsAvailable(feedback) + . = ..() + if(GLOB.disable_ghost_spawning) + return FALSE + /datum/action/cooldown/mob_cooldown/create_ghost_player/Activate(atom/target) var/mob/dead/observer/player = owner if(!istype(player)) From 8932aaaa9272681f23620cdff13385c70500cb45 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sat, 23 Sep 2023 23:50:00 -0400 Subject: [PATCH 41/59] should stop cryo'd stuff --- monkestation/code/modules/cryopods/_cryopod.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/monkestation/code/modules/cryopods/_cryopod.dm b/monkestation/code/modules/cryopods/_cryopod.dm index 9f5e4d265e01..14b60253e98d 100644 --- a/monkestation/code/modules/cryopods/_cryopod.dm +++ b/monkestation/code/modules/cryopods/_cryopod.dm @@ -281,7 +281,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod, 32) objective.target = null if(!objective) return - objective.find_target() if(!objective.target && objective.owner) to_chat(objective.owner.current, "
[span_userdanger("Your target is no longer within reach. Objective removed!")]") message_admins("[mob_occupant] is being despawned when they are an objective of [objective.owner.current].") From 84bb4821e8c277ed0a9a743075bb785c82cb4242 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sun, 24 Sep 2023 15:38:36 -0400 Subject: [PATCH 42/59] lets people know they are disconnected from mind and recovery is likely --- _maps/map_files/generic/CentCom.dmm | 26 +++++++++++++------ .../mob/living/carbon/human/examine.dm | 5 +++- .../modules/ghost_players/ghost_player.dm | 22 +++++++++++++--- 3 files changed, 41 insertions(+), 12 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index f6cb33a1b990..fd0d7cf8bf48 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -2989,6 +2989,17 @@ }, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/courtroom) +"lX" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/poddoor/shutters{ + id = "XCCsec1"; + name = "XCC Checkpoint 1 Shutters"; + max_integrity = 3000000 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/control) "md" = ( /obj/machinery/computer/shuttle/labor, /obj/effect/turf_decal/stripes/line{ @@ -5393,7 +5404,8 @@ "vG" = ( /obj/machinery/door/poddoor/shutters{ id = "XCCsec1"; - name = "XCC Checkpoint 1 Shutters" + name = "XCC Checkpoint 1 Shutters"; + max_integrity = 3000000 }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -10910,12 +10922,10 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin/storage) "Ud" = ( -/obj/machinery/sleeper{ - dir = 1 - }, /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/structure/organ_creator, /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) "Uf" = ( @@ -53663,10 +53673,10 @@ iF rK mQ io -vG -vG -vG -vG +lX +lX +lX +lX vG io rK diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 6054b5dc865f..3c030317f8ad 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -336,8 +336,11 @@ if(HAS_TRAIT(src, TRAIT_DUMB)) msg += "[t_He] [t_has] a stupid expression on [t_his] face.\n" if(get_organ_by_type(/obj/item/organ/internal/brain)) - if(!key) + var/obj/item/organ/internal/brain/brain = get_organ_by_type(/obj/item/organ/internal/brain) + if(!key && !brain.temporary_sleep) msg += "[span_deadsay("[t_He] [t_is] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely.")]\n" + else if(brain.temporary_sleep) + msg += "[span_deadsay("[t_He] [t_is] temporarly disconnected from their mind. Recovery is likely.")]\n" else if(!client) if(round(((world.time - lastclienttime) / (1 MINUTES)),1) >= 15) msg += "[t_He] [t_has] a blank, absent-minded stare and [t_has] been completely unresponsive to anything for [round(((world.time - lastclienttime) / (1 MINUTES)),1)] minutes. [t_He] may snap out of it soon. They are able to be put into a cryopod by you.\n" diff --git a/monkestation/code/modules/ghost_players/ghost_player.dm b/monkestation/code/modules/ghost_players/ghost_player.dm index d33e34110141..1262c0959e64 100644 --- a/monkestation/code/modules/ghost_players/ghost_player.dm +++ b/monkestation/code/modules/ghost_players/ghost_player.dm @@ -12,6 +12,7 @@ GLOBAL_VAR_INIT(disable_ghost_spawning, FALSE) var/old_key var/datum/mind/old_mind var/old_reenter + var/obj/item/organ/internal/brain/old_human ///the button we are tied to for dueling var/obj/structure/fight_button/linked_button @@ -23,12 +24,12 @@ GLOBAL_VAR_INIT(disable_ghost_spawning, FALSE) fully_heal() move_to_ghostspawn() -/mob/living/carbon/human/ghost/New(_old_key, datum/mind/_old_mind, _old_reenter) +/mob/living/carbon/human/ghost/New(_old_key, datum/mind/_old_mind, _old_reenter, obj/item/organ/internal/brain/_old_human) . = ..() old_key = _old_key old_mind = _old_mind old_reenter = _old_reenter - + old_human = _old_human /mob/living/carbon/human/ghost/Initialize(mapload) . = ..() @@ -59,6 +60,10 @@ GLOBAL_VAR_INIT(disable_ghost_spawning, FALSE) new_ghost.key = old_key new_ghost.mind = old_mind new_ghost.can_reenter_corpse = old_reenter + + if(old_human) + old_human.temporary_sleep = FALSE + qdel(src) /datum/action/cooldown/mob_cooldown/return_to_ghost @@ -119,7 +124,14 @@ GLOBAL_VAR_INIT(disable_ghost_spawning, FALSE) /mob/dead/observer/proc/create_ghost_body() - var/mob/living/carbon/human/ghost/new_existance = new(key, mind, can_reenter_corpse) + var/mob/living/carbon/human/old_mob = mind.current + var/obj/item/organ/internal/brain/brain + if(istype(old_mob)) + brain = old_mob.get_organ_by_type(/obj/item/organ/internal/brain) + if(brain) + brain.temporary_sleep = TRUE + + var/mob/living/carbon/human/ghost/new_existance = new(key, mind, can_reenter_corpse, brain) client?.prefs.safe_transfer_prefs_to(new_existance, TRUE, FALSE) new_existance.move_to_ghostspawn() new_existance.key = key @@ -139,3 +151,7 @@ GLOBAL_VAR_INIT(disable_ghost_spawning, FALSE) if(!turf.density) target_turf = turf forceMove(target_turf) + + +/obj/item/organ/internal/brain + var/temporary_sleep = FALSE From 621832f74665e75960fb46bb20f31ef027e6a1c2 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sun, 24 Sep 2023 17:04:12 -0400 Subject: [PATCH 43/59] neon arena fix --- .../modules/ghost_players/arena/maps/neon.dmm | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/monkestation/code/modules/ghost_players/arena/maps/neon.dmm b/monkestation/code/modules/ghost_players/arena/maps/neon.dmm index eeaa241c3432..b6876200b4ee 100644 --- a/monkestation/code/modules/ghost_players/arena/maps/neon.dmm +++ b/monkestation/code/modules/ghost_players/arena/maps/neon.dmm @@ -141,7 +141,9 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 }, -/turf/open/space/basic, +/turf/open/floor/fakespace{ + density = 1 + }, /area/centcom/tdome/arena/actual) "nB" = ( /obj/effect/portal/permanent{ @@ -181,7 +183,9 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 10 }, -/turf/open/space/basic, +/turf/open/floor/fakespace{ + density = 1 + }, /area/centcom/tdome/arena/actual) "rN" = ( /obj/structure/railing, @@ -275,15 +279,6 @@ "HK" = ( /turf/open/floor/carpet/neon/simple/red/nodots, /area/centcom/tdome/arena/actual) -"Jr" = ( -/obj/structure/railing{ - dir = 5 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 5 - }, -/turf/open/space/basic, -/area/centcom/tdome/arena/actual) "JZ" = ( /obj/structure/railing/corner{ dir = 8 @@ -311,7 +306,9 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 6 }, -/turf/open/space/basic, +/turf/open/floor/fakespace{ + density = 1 + }, /area/centcom/tdome/arena/actual) "Mw" = ( /obj/structure/railing{ @@ -455,7 +452,7 @@ Kv (4,1,1) = {" HK HK -Jr +mA bA Wj wq From d99ae0145827c31b29ba9c17cb947e8462196190 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Mon, 25 Sep 2023 03:31:19 -0400 Subject: [PATCH 44/59] new rails god damn --- .../map_files/Deltastation/DeltaStation2.dmm | 570 ++-- .../map_files/IceBoxStation/IceBoxStation.dmm | 672 +---- _maps/map_files/MetaStation/MetaStation.dmm | 21 +- _maps/map_files/Mining/Lavaland.dmm | 76 +- _maps/map_files/Oshan/oshan.dmm | 131 +- _maps/map_files/generic/CentCom.dmm | 85 +- _maps/map_files/tramstation/tramstation.dmm | 2354 ++++++----------- code/controllers/subsystem/materials.dm | 1 + .../modules/aesthetics/airlock/airlock.dm | 9 + .../aesthetics/icons/railing_basic.dmi | Bin 0 -> 1528 bytes .../modules/aesthetics/objects/railing.dm | 133 + .../modules/ghost_players/ghost_player.dm | 2 +- .../new_player/sprite_accessories/hair.dm | 5 + .../icons/mob/sprite_accessories/hair.dmi | Bin 11416 -> 12121 bytes tgstation.dme | 1 + 15 files changed, 1455 insertions(+), 2605 deletions(-) create mode 100644 monkestation/code/modules/aesthetics/icons/railing_basic.dmi create mode 100644 monkestation/code/modules/aesthetics/objects/railing.dm diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 90de741895dc..3e31a85dd791 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -296,6 +296,10 @@ /obj/effect/turf_decal/siding/white{ dir = 8 }, +/obj/machinery/door/window{ + dir = 4; + name = "Fitness Ring" + }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "adA" = ( @@ -1371,9 +1375,6 @@ /area/station/command/heads_quarters/ce) "apz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing{ - dir = 4 - }, /obj/effect/turf_decal/siding/white{ dir = 4 }, @@ -2266,6 +2267,14 @@ name = "SapMaster XP" }, /obj/effect/turf_decal/bot, +/obj/structure/railing{ + dir = 10; + layer = 3.1 + }, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "azi" = ( @@ -2431,7 +2440,6 @@ /area/station/engineering/atmos) "aBr" = ( /obj/structure/chair, -/obj/structure/railing, /obj/effect/turf_decal/siding/white, /turf/open/floor/iron/dark/side, /area/station/commons/fitness/recreation) @@ -3927,12 +3935,17 @@ /area/station/science/research) "aUN" = ( /obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 10 - }, /obj/item/toy/plush/space_lizard_plushie{ name = "Meets-the-Ore" }, +/obj/structure/railing{ + dir = 9; + layer = 3.1 + }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/space/basic, /area/space/nearstation) "aVo" = ( @@ -4453,6 +4466,11 @@ "bbQ" = ( /obj/machinery/vending/wardrobe/hydro_wardrobe, /obj/effect/turf_decal/bot, +/obj/structure/railing, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "bbR" = ( @@ -4890,18 +4908,6 @@ /obj/machinery/meter, /turf/open/floor/iron, /area/station/maintenance/department/electrical) -"bgW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/commons/fitness/recreation) "bhg" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -5103,9 +5109,6 @@ /obj/structure/cable, /obj/effect/landmark/start/hangover, /obj/structure/disposalpipe/segment, -/obj/structure/railing{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -5707,6 +5710,9 @@ "bqC" = ( /obj/machinery/seed_extractor, /obj/effect/turf_decal/bot, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "bqE" = ( @@ -9744,6 +9750,14 @@ "cmi" = ( /obj/structure/flora/bush/stalky/style_random, /obj/structure/flora/bush/leavy/style_random, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 6; + layer = 3.1 + }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "cmq" = ( @@ -9776,6 +9790,10 @@ /obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/flora/rock/pile/style_random, /obj/machinery/light/floor/has_bulb, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "cmI" = ( @@ -9929,6 +9947,9 @@ /obj/structure/flora/bush/fullgrass/style_random, /obj/structure/flora/bush/grassy/style_random, /obj/machinery/light/floor/has_bulb, +/obj/structure/railing{ + dir = 1 + }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "cnL" = ( @@ -11697,9 +11718,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/structure/railing{ - dir = 9 - }, /obj/structure/rack, /obj/item/wrench, /obj/item/reagent_containers/spray/plantbgone{ @@ -14622,10 +14640,6 @@ /area/station/medical/abandoned) "dxi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/window{ - dir = 8; - name = "Fitness Ring" - }, /obj/effect/turf_decal/siding/white{ dir = 8 }, @@ -15647,6 +15661,9 @@ "dLF" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/white, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "dLH" = ( @@ -18480,15 +18497,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/grimy, /area/station/service/chapel/office) -"evh" = ( -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/service/hydroponics) "evp" = ( /obj/machinery/computer/records/medical{ dir = 8 @@ -20422,7 +20430,6 @@ "eUT" = ( /obj/structure/chair, /obj/effect/landmark/start/hangover, -/obj/structure/railing, /obj/effect/turf_decal/siding/white, /turf/open/floor/iron/dark/side, /area/station/commons/fitness/recreation) @@ -20576,6 +20583,12 @@ /obj/effect/turf_decal/siding/white/corner{ dir = 8 }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "eWE" = ( @@ -21684,6 +21697,13 @@ "fju" = ( /obj/structure/flora/bush/flowers_br/style_random, /obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 1 + }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "fjx" = ( @@ -21776,9 +21796,6 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) "fkU" = ( -/obj/structure/railing{ - dir = 5 - }, /obj/item/kirbyplants/random, /obj/machinery/light/floor/has_bulb, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -22945,6 +22962,13 @@ /obj/structure/flora/bush/flowers_pp/style_random, /obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/flora/rock/pile/jungle/style_random, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 1 + }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "fzx" = ( @@ -25066,9 +25090,6 @@ "gbY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/window/right/directional/west{ - name = "Hydroponics Center" - }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 }, @@ -26367,12 +26388,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 4 - }, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) "grp" = ( @@ -27616,7 +27631,6 @@ /area/station/security/execution/transfer) "gGw" = ( /obj/effect/landmark/start/hangover, -/obj/structure/railing, /obj/structure/chair/sofa/bench/right{ dir = 1 }, @@ -31087,6 +31101,14 @@ }, /obj/machinery/disposal/bin, /obj/effect/turf_decal/stripes/box, +/obj/structure/railing{ + dir = 10; + layer = 3.1 + }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "hAN" = ( @@ -32426,10 +32448,14 @@ /area/station/engineering/atmos) "hUm" = ( /obj/structure/lattice/catwalk, +/obj/machinery/vending/coffee, /obj/structure/railing{ - dir = 9 + dir = 8; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 1 }, -/obj/machinery/vending/coffee, /turf/open/space/basic, /area/space/nearstation) "hUt" = ( @@ -34503,9 +34529,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/fore) @@ -35293,18 +35316,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) -"iCS" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central/aft) "iDc" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -38360,9 +38371,6 @@ /obj/effect/turf_decal/arrows{ dir = 8 }, -/obj/structure/railing/corner{ - dir = 4 - }, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -38763,9 +38771,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 1 - }, /turf/open/floor/iron, /area/station/service/hydroponics) "juZ" = ( @@ -39244,9 +39249,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/structure/disposalpipe/segment, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -39602,10 +39604,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/textured_large, /area/station/engineering/atmos/storage/gas) -"jEn" = ( -/obj/structure/railing, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) "jEt" = ( /obj/structure/cable, /obj/machinery/door/firedoor, @@ -40071,6 +40069,11 @@ /obj/effect/turf_decal/siding/white/corner{ dir = 4 }, +/obj/structure/railing, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "jKO" = ( @@ -40118,9 +40121,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/structure/railing{ - dir = 8 - }, /turf/open/floor/iron, /area/station/service/hydroponics) "jLe" = ( @@ -40337,7 +40337,6 @@ /area/station/maintenance/solars/port/aft) "jNB" = ( /obj/effect/landmark/start/hangover, -/obj/structure/railing/corner, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/fore) @@ -40559,9 +40558,6 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue, -/obj/structure/railing{ - dir = 6 - }, /obj/structure/rack, /obj/item/wrench, /obj/item/crowbar, @@ -41340,9 +41336,6 @@ /area/station/engineering/atmos) "jZH" = ( /obj/effect/landmark/start/hangover, -/obj/structure/railing{ - dir = 1 - }, /obj/structure/chair/sofa/bench/right, /obj/effect/turf_decal/box/corners{ dir = 8 @@ -41751,7 +41744,6 @@ "keq" = ( /obj/structure/chair, /obj/effect/landmark/start/assistant, -/obj/structure/railing, /obj/effect/turf_decal/siding/white, /turf/open/floor/iron/dark/side, /area/station/commons/fitness/recreation) @@ -42632,19 +42624,6 @@ "kpa" = ( /turf/closed/wall, /area/station/maintenance/department/eva/abandoned) -"kpc" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/window{ - dir = 4; - name = "Fitness Ring" - }, -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/commons/fitness/recreation) "kpj" = ( /obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, @@ -43329,7 +43308,6 @@ "kyR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/blue, -/obj/structure/railing/corner, /turf/open/floor/iron, /area/station/service/hydroponics) "kyW" = ( @@ -44699,9 +44677,6 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue, -/obj/structure/railing{ - dir = 4 - }, /turf/open/floor/iron, /area/station/service/hydroponics) "kQV" = ( @@ -46828,6 +46803,17 @@ /obj/item/kirbyplants/random, /turf/open/floor/wood, /area/station/commons/dorms) +"lsi" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/machinery/door/window{ + dir = 8; + name = "Fitness Ring" + }, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "lsl" = ( /obj/effect/turf_decal/bot, /obj/item/robot_suit, @@ -47851,9 +47837,6 @@ dir = 1 }, /obj/effect/landmark/start/assistant, -/obj/structure/railing{ - dir = 1 - }, /obj/effect/turf_decal/siding/white{ dir = 1 }, @@ -48215,7 +48198,6 @@ /turf/open/floor/plating, /area/station/maintenance/department/electrical) "lII" = ( -/obj/structure/railing, /obj/structure/chair/sofa/bench{ dir = 1 }, @@ -48758,6 +48740,13 @@ "lPs" = ( /obj/machinery/biogenerator, /obj/effect/turf_decal/bot, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "lPy" = ( @@ -49515,9 +49504,6 @@ /turf/open/floor/iron, /area/station/engineering/hallway) "mae" = ( -/obj/machinery/door/window/right/directional/east{ - name = "Hydroponics Center" - }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 }, @@ -49927,9 +49913,6 @@ /turf/open/floor/iron/dark, /area/station/commons/locker) "mgd" = ( -/obj/structure/railing{ - dir = 10 - }, /obj/item/kirbyplants/random, /obj/machinery/light/floor/has_bulb, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -50020,6 +50003,10 @@ /obj/structure/flora/bush/grassy/style_random, /obj/structure/flora/rock/pile/jungle/style_random, /obj/machinery/light/floor/has_bulb, +/obj/structure/railing{ + dir = 6; + layer = 3.1 + }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "mhl" = ( @@ -50642,6 +50629,10 @@ /obj/effect/turf_decal/siding/white/corner{ dir = 1 }, +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "mpO" = ( @@ -50696,11 +50687,6 @@ /obj/machinery/holopad, /turf/open/floor/iron/large, /area/station/security/checkpoint/medical/medsci) -"mqz" = ( -/obj/effect/turf_decal/tile/blue, -/obj/structure/railing/corner, -/turf/open/floor/iron, -/area/station/service/hydroponics) "mqG" = ( /obj/structure/filingcabinet/medical, /obj/effect/turf_decal/bot, @@ -50857,9 +50843,6 @@ /area/station/engineering/supermatter) "msF" = ( /obj/effect/landmark/start/hangover, -/obj/structure/railing{ - dir = 1 - }, /obj/structure/chair/sofa/bench/left, /obj/effect/turf_decal/box/corners, /obj/effect/turf_decal/box/corners{ @@ -51511,17 +51494,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark/textured_large, /area/station/security/brig) -"mAJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/structure/railing/corner, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) "mAW" = ( /obj/machinery/chem_master, /obj/effect/turf_decal/tile/yellow/opposingcorners, @@ -53386,11 +53358,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/supermatter/room) -"mWO" = ( -/obj/structure/railing/corner, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) "mWP" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -55138,15 +55105,6 @@ /mob/living/basic/pet/dog/corgi/ian, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) -"nvo" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) "nvu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/landmark/start/hangover, @@ -55989,7 +55947,6 @@ }, /obj/effect/turf_decal/tile/blue, /obj/machinery/hydroponics/constructable, -/obj/structure/railing, /turf/open/floor/iron, /area/station/service/hydroponics) "nFj" = ( @@ -56121,7 +56078,10 @@ /area/station/command/meeting_room/council) "nHf" = ( /obj/structure/lattice/catwalk, -/obj/structure/railing, +/obj/structure/railing{ + dir = 9; + layer = 3.1 + }, /turf/open/space/basic, /area/space/nearstation) "nHs" = ( @@ -56200,9 +56160,6 @@ dir = 1 }, /obj/effect/turf_decal/tile/blue, -/obj/structure/railing{ - dir = 5 - }, /obj/effect/turf_decal/box/corners{ dir = 8 }, @@ -56232,6 +56189,13 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron, /area/station/security/holding_cell) +"nId" = ( +/obj/structure/chair/stool/directional/east, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/service/theater) "nIg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/maintenance_hatch{ @@ -57767,9 +57731,6 @@ /obj/effect/turf_decal/tile/green{ dir = 8 }, -/obj/structure/railing/corner{ - dir = 8 - }, /turf/open/floor/iron, /area/station/service/hydroponics) "obI" = ( @@ -59250,9 +59211,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/structure/disposalpipe/segment, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -60212,6 +60170,13 @@ }, /obj/item/reagent_containers/cup/watering_can, /obj/item/reagent_containers/cup/watering_can, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/iron/dark/textured, /area/station/service/hydroponics) "oJy" = ( @@ -61662,9 +61627,6 @@ "pei" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/siding/white/corner{ dir = 1 }, @@ -63349,6 +63311,16 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/iron, /area/station/engineering/main) +"pzB" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "pzF" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 10 @@ -63521,9 +63493,6 @@ "pBj" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/turf_decal/siding/white/corner{ dir = 4 }, @@ -63620,10 +63589,13 @@ /area/station/hallway/primary/central/fore) "pCQ" = ( /obj/structure/lattice/catwalk, +/obj/structure/reagent_dispensers/fueltank, /obj/structure/railing{ - dir = 5 + dir = 1 + }, +/obj/structure/railing{ + dir = 4 }, -/obj/structure/reagent_dispensers/fueltank, /turf/open/space/basic, /area/space/nearstation) "pCV" = ( @@ -66793,6 +66765,14 @@ "qnY" = ( /turf/closed/wall, /area/station/science/lobby) +"qoa" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/window/right/directional/east{ + name = "Hydroponics Center" + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) "qob" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/table, @@ -68913,6 +68893,13 @@ color = "#52B4E9" }, /obj/machinery/composters, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron/dark/textured, /area/station/service/hydroponics) "qNU" = ( @@ -70201,6 +70188,14 @@ "rhK" = ( /obj/structure/flora/bush/stalky/style_random, /obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/railing{ + dir = 6; + layer = 3.1 + }, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "rhN" = ( @@ -71194,6 +71189,14 @@ "rtT" = ( /obj/structure/flora/bush/flowers_yw/style_random, /obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/railing{ + dir = 6; + layer = 3.1 + }, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "rua" = ( @@ -73392,19 +73395,6 @@ }, /turf/open/floor/iron/dark/corner, /area/station/hallway/secondary/exit/departure_lounge) -"rVs" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) "rVu" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -73766,9 +73756,6 @@ dir = 1 }, /obj/machinery/hydroponics/constructable, -/obj/structure/railing{ - dir = 1 - }, /turf/open/floor/iron, /area/station/service/hydroponics) "sau" = ( @@ -74456,6 +74443,7 @@ /obj/effect/turf_decal/siding/white{ dir = 1 }, +/obj/structure/railing, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "sjH" = ( @@ -75196,13 +75184,15 @@ /turf/open/floor/plating, /area/station/service/chapel/storage) "stN" = ( -/obj/structure/railing{ - dir = 10 - }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/obj/structure/railing, /turf/open/floor/wood, /area/station/service/theater) "stO" = ( @@ -76321,7 +76311,6 @@ /turf/open/floor/iron, /area/station/security/brig) "sIk" = ( -/obj/structure/railing, /obj/structure/chair/sofa/bench/left{ dir = 1 }, @@ -76465,6 +76454,13 @@ /obj/structure/flora/bush/ferny/style_random, /obj/structure/flora/bush/style_random, /obj/structure/flora/bush/jungle/a/style_random, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "sJo" = ( @@ -76710,6 +76706,10 @@ /obj/effect/turf_decal/siding/white{ dir = 4 }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "sLK" = ( @@ -77121,9 +77121,6 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "sQN" = ( -/obj/structure/railing{ - dir = 6 - }, /obj/item/kirbyplants/random, /obj/machinery/light/floor/has_bulb, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, @@ -77734,6 +77731,7 @@ "sXL" = ( /obj/machinery/vending/hydronutrients, /obj/effect/turf_decal/bot, +/obj/structure/railing, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "sXM" = ( @@ -80542,9 +80540,6 @@ /obj/structure/chair{ dir = 1 }, -/obj/structure/railing{ - dir = 1 - }, /obj/effect/turf_decal/siding/white{ dir = 1 }, @@ -82918,9 +82913,9 @@ /turf/open/floor/plating, /area/station/engineering/transit_tube) "ulH" = ( -/obj/structure/railing, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only, +/obj/structure/railing, /turf/open/floor/wood, /area/station/service/theater) "ulQ" = ( @@ -84290,15 +84285,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore) -"uCA" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) "uCC" = ( /obj/effect/landmark/start/cyborg, /obj/structure/cable, @@ -84330,6 +84316,10 @@ /obj/structure/flora/bush/fullgrass/style_random, /obj/structure/flora/bush/lavendergrass/style_random, /obj/machinery/light/floor/has_bulb, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "uDb" = ( @@ -85078,7 +85068,6 @@ /area/station/medical/medbay/lobby) "uOh" = ( /obj/effect/turf_decal/tile/neutral, -/obj/structure/railing, /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/hallway/primary/fore) @@ -85486,7 +85475,6 @@ /obj/effect/turf_decal/arrows{ dir = 4 }, -/obj/structure/railing/corner, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark/side{ dir = 4 @@ -86238,9 +86226,6 @@ /area/station/commons/locker) "vbK" = ( /obj/effect/landmark/start/hangover, -/obj/structure/railing{ - dir = 1 - }, /obj/structure/chair/sofa/bench, /obj/effect/landmark/start/assistant, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -86406,9 +86391,6 @@ /obj/effect/turf_decal/tile/green{ dir = 4 }, -/obj/structure/railing/corner{ - dir = 4 - }, /turf/open/floor/iron, /area/station/service/hydroponics) "vdS" = ( @@ -87265,7 +87247,8 @@ "vpk" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ - dir = 8 + dir = 8; + layer = 4.1 }, /turf/open/space/basic, /area/space/nearstation) @@ -88078,6 +88061,13 @@ /area/station/command/heads_quarters/ce) "vys" = ( /obj/structure/flora/bush/jungle/c/style_random, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "vyt" = ( @@ -88589,16 +88579,6 @@ /obj/machinery/duct, /turf/open/floor/iron/grimy, /area/station/service/bar/backroom) -"vDY" = ( -/obj/effect/landmark/start/hangover, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) "vEg" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/decal/cleanable/dirt, @@ -88738,9 +88718,6 @@ /area/station/hallway/primary/central/aft) "vFn" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/siding/white/corner{ dir = 8 }, @@ -88835,9 +88812,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/structure/railing{ - dir = 8 - }, /turf/open/floor/iron, /area/station/service/hydroponics) "vGX" = ( @@ -89477,7 +89451,6 @@ /area/station/service/kitchen) "vRn" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/structure/railing/corner, /obj/effect/turf_decal/siding/white/corner, /turf/open/floor/iron/dark/corner, /area/station/commons/fitness/recreation) @@ -90099,6 +90072,9 @@ "vZo" = ( /obj/machinery/smartfridge, /obj/effect/turf_decal/bot, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "vZq" = ( @@ -90858,9 +90834,6 @@ /obj/effect/turf_decal/tile/green{ dir = 4 }, -/obj/structure/railing/corner{ - dir = 4 - }, /turf/open/floor/iron, /area/station/service/hydroponics) "wif" = ( @@ -91064,12 +91037,13 @@ /turf/open/floor/iron, /area/station/engineering/break_room) "wkp" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/wood, /area/station/service/theater) "wkt" = ( @@ -92066,13 +92040,14 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/aft) "wuh" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/wood, /area/station/service/theater) "wuj" = ( @@ -92836,13 +92811,14 @@ /area/station/service/hydroponics/garden/abandoned) "wDi" = ( /obj/effect/landmark/start/hangover, -/obj/structure/railing{ - dir = 8 - }, /obj/effect/spawner/random/structure/musician/piano/random_piano, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/wood, /area/station/service/theater) "wDk" = ( @@ -94373,6 +94349,14 @@ /obj/structure/flora/bush/flowers_br/style_random, /obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/flora/bush/grassy/style_random, +/obj/structure/railing{ + dir = 6; + layer = 3.1 + }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "xav" = ( @@ -95114,15 +95098,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/cargo/lobby) -"xjF" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) "xjJ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/chair/sofa/bench/left{ @@ -95269,9 +95244,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 1 - }, /turf/open/floor/iron, /area/station/service/hydroponics) "xmk" = ( @@ -96340,7 +96312,6 @@ /turf/open/floor/iron, /area/station/maintenance/starboard/aft) "xzC" = ( -/obj/structure/railing, /obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, @@ -96351,6 +96322,7 @@ name = "service camera" }, /obj/machinery/light/small/directional/east, +/obj/structure/railing, /turf/open/floor/wood, /area/station/service/theater) "xzG" = ( @@ -97448,9 +97420,6 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue, -/obj/structure/railing{ - dir = 4 - }, /turf/open/floor/iron, /area/station/service/hydroponics) "xMX" = ( @@ -97846,9 +97815,6 @@ dir = 1 }, /obj/effect/turf_decal/tile/blue, -/obj/structure/railing{ - dir = 10 - }, /obj/effect/turf_decal/box/corners{ dir = 4 }, @@ -98454,6 +98420,13 @@ "yaj" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/white/corner, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "yam" = ( @@ -98482,9 +98455,6 @@ dir = 1 }, /obj/effect/landmark/start/hangover, -/obj/structure/railing{ - dir = 1 - }, /obj/effect/turf_decal/siding/white{ dir = 1 }, @@ -98514,6 +98484,9 @@ "yba" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/window/right/directional/west{ + name = "Hydroponics Center" + }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "ybb" = ( @@ -98565,10 +98538,14 @@ /area/station/science/research/abandoned) "ybr" = ( /obj/structure/lattice/catwalk, +/obj/structure/closet/crate, /obj/structure/railing{ - dir = 6 + dir = 9; + layer = 3.1 + }, +/obj/structure/railing{ + dir = 4 }, -/obj/structure/closet/crate, /turf/open/space/basic, /area/space/nearstation) "ybs" = ( @@ -98957,6 +98934,11 @@ "ygW" = ( /obj/machinery/vending/hydroseeds, /obj/effect/turf_decal/bot, +/obj/structure/railing, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "ygY" = ( @@ -130017,7 +129999,7 @@ oYs sHL glv hKE -mqz +crg xMK mae kQR @@ -131301,10 +131283,10 @@ pAy oYs aeu ueJ -evh +rID xSz oJj -yba +qoa aze cLO juX @@ -132853,11 +132835,11 @@ kel ryb kel fbU -mWO -nvo -nvo -nvo -uCA +qRx +wsp +wsp +wsp +fMo vpJ vCf xVa @@ -133115,7 +133097,7 @@ fzw uCY cmi fkU -uCA +fMo lvl rZf rul @@ -133889,7 +133871,7 @@ rhK msF suj iCu -mAJ +iCu nNc nNc nNc @@ -134137,17 +134119,17 @@ fRo fRo fRo hTi -vDY +xVa mgd fju cmG rtT uNg -xjF +fbU cwV fRo -jEn -dxk +fRo +nId wtg jwb dxk @@ -134396,15 +134378,15 @@ iyH eDV ldq jAI -rVs -rVs +iCu +iCu bjE owu tlU ikD xgL uOh -dxk +nId vqY eYQ aaz @@ -139080,7 +139062,7 @@ czf bCM ocA kzp -iCS +sqd crR hQV ojs @@ -152961,7 +152943,7 @@ vii vii cwA vRn -kpc +apz apz apz apz @@ -153219,7 +153201,7 @@ cOU hJG aBr yaj -sLB +lsi sLB jKN tJl @@ -153990,7 +153972,7 @@ tNE hJG aBr eWw -adz +pzB adz mpK tJl @@ -154246,9 +154228,9 @@ twN twN aek vFn -bgW -bgW -bgW +dxi +dxi +dxi dxi pei jCI diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index b2888158ec4c..5725c56a9b10 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -142,12 +142,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/station/service/chapel/office) -"adD" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/lava/plasma/ice_moon, -/area/icemoon/underground/explored) "adW" = ( /obj/machinery/light/directional/south, /turf/open/floor/iron, @@ -832,9 +826,6 @@ /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 4 }, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/turf_decal/trimline/green/filled/warning{ dir = 1 }, @@ -1210,9 +1201,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, /turf/open/floor/iron/white, @@ -1511,14 +1499,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"ayG" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/lava/plasma/ice_moon, -/area/icemoon/underground/explored) "azf" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -1850,12 +1830,6 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron/dark, /area/station/cargo/miningdock) -"aFG" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/underground/explored) "aFJ" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -3787,12 +3761,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/sepia, /area/station/service/library) -"blf" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "blk" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -4045,9 +4013,6 @@ /obj/effect/turf_decal/trimline/neutral/corner{ dir = 8 }, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, @@ -4175,9 +4140,6 @@ /area/station/security/checkpoint/engineering) "brC" = ( /obj/machinery/light/directional/west, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -4192,14 +4154,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/security/prison/visit) -"brL" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 5 - }, -/area/station/service/chapel) "brY" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -6945,15 +6899,18 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) "chK" = ( -/obj/structure/railing{ - dir = 9 - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/glass/reinforced, /area/station/hallway/primary/starboard) "chO" = ( @@ -8336,9 +8293,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 4 - }, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "cCF" = ( @@ -9628,7 +9582,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/corner, -/obj/structure/railing/corner, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -10527,11 +10480,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/science/robotics/lab) -"dkK" = ( -/obj/structure/railing/corner, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "dkN" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -11022,12 +10970,6 @@ }, /turf/open/floor/plating, /area/station/medical/virology) -"dsO" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/service) "dsT" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -11479,9 +11421,6 @@ name = "Research Director Observation"; req_access = list("rd") }, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/white/side{ dir = 5 @@ -12904,12 +12843,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"dZS" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/underground/explored) "dZW" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -13370,12 +13303,6 @@ name = "Observation Deck"; req_access = list("xenobiology") }, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -13682,6 +13609,9 @@ /obj/structure/railing{ dir = 10 }, +/obj/structure/railing{ + dir = 8 + }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) "enq" = ( @@ -14985,12 +14915,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"eId" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/closed/wall, -/area/station/commons/dorms/laundry) "eIk" = ( /obj/structure/filingcabinet, /obj/machinery/power/apc/auto_name/directional/north, @@ -15458,9 +15382,7 @@ /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/hos) "ePR" = ( -/obj/structure/railing{ - dir = 6 - }, +/obj/structure/railing, /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/hallway/primary/starboard) @@ -16138,9 +16060,6 @@ /turf/open/floor/iron, /area/station/science/ordnance/testlab) "faJ" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, @@ -16172,9 +16091,6 @@ /area/station/hallway/primary/central) "fbK" = ( /obj/structure/cable, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -16513,9 +16429,6 @@ /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 8 }, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/engineering/atmos/storage) @@ -16696,9 +16609,6 @@ /area/station/security/prison/safe) "fkX" = ( /obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 1 - }, /turf/open/openspace, /area/station/science/ordnance/office) "fle" = ( @@ -16804,12 +16714,6 @@ "fmD" = ( /turf/open/floor/wood/parquet, /area/station/service/bar/atrium) -"fmU" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "fna" = ( /obj/structure/chair/wood{ dir = 4 @@ -17033,9 +16937,6 @@ }, /area/station/medical/medbay/central) "frd" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -17105,9 +17006,6 @@ /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 4 }, -/obj/structure/railing/corner{ - dir = 4 - }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "frS" = ( @@ -17619,7 +17517,6 @@ /area/station/security/prison/work) "fAW" = ( /obj/structure/cable, -/obj/structure/railing/corner, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/station/commons/locker) @@ -18519,13 +18416,6 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/starboard/fore) -"fSd" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/underground/explored) "fSj" = ( /obj/effect/decal/cleanable/oil, /turf/open/floor/plating, @@ -18796,10 +18686,6 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/service/kitchen/diner) -"fWw" = ( -/obj/structure/railing/corner, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "fWL" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -18935,15 +18821,6 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/iron, /area/station/maintenance/port/fore) -"fZo" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/wood/parquet, -/area/station/service/bar/atrium) "fZq" = ( /obj/structure/curtain/cloth, /turf/open/floor/iron/showroomfloor, @@ -19348,9 +19225,6 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "gdN" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -19538,9 +19412,6 @@ /turf/open/floor/iron, /area/station/maintenance/port/fore) "ghQ" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/tile/brown/half/contrasted, @@ -19770,7 +19641,6 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "glP" = ( -/obj/structure/railing/corner, /obj/item/storage/belt/utility, /obj/machinery/newscaster/directional/north, /obj/machinery/light/directional/north, @@ -20035,12 +19905,6 @@ /obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron/dark, /area/mine/laborcamp) -"gqj" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/glass/reinforced, -/area/station/hallway/primary/starboard) "gqm" = ( /obj/machinery/conveyor{ dir = 4; @@ -20973,9 +20837,6 @@ "gGj" = ( /obj/machinery/airalarm/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 9 }, @@ -21455,15 +21316,6 @@ }, /turf/open/floor/plating, /area/mine/production) -"gOY" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/storage) "gPj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -21745,13 +21597,6 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/wood, /area/station/service/library) -"gUp" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/lava/plasma/ice_moon, -/area/icemoon/underground/explored) "gUr" = ( /obj/item/trash/sosjerky, /turf/open/floor/plating, @@ -21974,7 +21819,10 @@ /area/station/hallway/secondary/entry) "gYa" = ( /obj/structure/railing{ - dir = 9 + dir = 8 + }, +/obj/structure/railing{ + dir = 1 }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) @@ -22256,9 +22104,6 @@ /obj/structure/railing{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 8 - }, /turf/open/openspace, /area/station/engineering/atmos/storage) "hcL" = ( @@ -23365,15 +23210,18 @@ }, /area/station/service/chapel) "hxT" = ( -/obj/structure/railing{ - dir = 9 - }, /obj/machinery/light/small/directional/east, /obj/machinery/button/door/directional/east{ id = "drone_bay"; name = "Shutter Control"; pixel_y = -8 }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) "hyd" = ( @@ -23648,9 +23496,6 @@ /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/trimline/green/filled/warning{ dir = 1 }, @@ -24627,12 +24472,16 @@ /area/station/hallway/primary/starboard) "hUy" = ( /obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 5 - }, /obj/structure/marker_beacon/burgundy{ name = "landing marker" }, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 1 + }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) "hUz" = ( @@ -25678,9 +25527,6 @@ /turf/open/floor/plating, /area/station/command/heads_quarters/qm) "ikW" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/machinery/door/firedoor/border_only, /turf/open/floor/iron/dark/corner{ dir = 1 @@ -26164,7 +26010,6 @@ name = "Research Director Observation"; req_access = list("rd") }, -/obj/structure/railing/corner, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/command/heads_quarters/rd) @@ -26350,9 +26195,6 @@ /turf/open/floor/sepia, /area/station/security/prison/rec) "ixH" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -26609,10 +26451,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/railing/corner{ +/obj/machinery/status_display/evac/directional/north, +/obj/structure/railing{ dir = 1 }, -/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "iBl" = ( @@ -27682,8 +27524,10 @@ /area/mine/laborcamp/security) "iSk" = ( /obj/structure/lattice/catwalk, +/obj/structure/railing, /obj/structure/railing{ - dir = 6 + dir = 4; + layer = 4.1 }, /turf/open/openspace, /area/station/science/ordnance/office) @@ -27856,9 +27700,6 @@ /turf/open/floor/iron/cafeteria, /area/station/commons/dorms/laundry) "iVb" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -28271,7 +28112,6 @@ /turf/open/floor/iron/dark, /area/station/security/courtroom) "jbu" = ( -/obj/structure/railing/corner, /turf/open/floor/iron/dark/side{ dir = 9 }, @@ -28796,10 +28636,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/grass, /area/station/service/hydroponics) -"jlu" = ( -/obj/structure/railing/corner, -/turf/open/lava/plasma/ice_moon, -/area/icemoon/underground/explored) "jly" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -28845,9 +28681,6 @@ /turf/open/floor/iron/dark/textured, /area/station/security/range) "jmb" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/firealarm/directional/north, /obj/machinery/camera{ @@ -28887,9 +28720,6 @@ /turf/open/floor/iron/grimy, /area/station/service/chapel/office) "jnn" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/machinery/light/small/directional/east, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) @@ -29340,18 +29170,6 @@ /obj/item/stack/sheet/glass/fifty, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"juZ" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/mine/eva/lower) "jvc" = ( /obj/machinery/door/firedoor/border_only, /turf/open/openspace, @@ -29711,6 +29529,9 @@ /obj/structure/railing{ dir = 10 }, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) "jCD" = ( @@ -30275,9 +30096,6 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/duct, /obj/machinery/camera{ c_tag = "Virology Module North"; @@ -30285,6 +30103,9 @@ network = list("ss13","medbay") }, /obj/machinery/light/small/directional/north, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/iron/white, /area/station/medical/virology) "jLO" = ( @@ -30892,7 +30713,6 @@ /turf/open/floor/wood, /area/station/maintenance/fore) "jVq" = ( -/obj/structure/railing/corner, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/green{ @@ -31294,9 +31114,6 @@ /turf/open/floor/iron, /area/station/engineering/storage/tech) "kcA" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -31673,13 +31490,6 @@ /obj/effect/turf_decal/tile/blue/anticorner/contrasted, /turf/open/floor/iron/white, /area/station/medical/psychology) -"kht" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "khA" = ( /obj/machinery/firealarm/directional/west, /obj/item/kirbyplants/random, @@ -32002,9 +31812,6 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) "kmQ" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/machinery/door/firedoor/border_only, /obj/machinery/camera{ c_tag = "Service Botany - Upper South"; @@ -34132,14 +33939,6 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/white, /area/station/maintenance/port/fore) -"kUP" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner, -/turf/open/lava/plasma/ice_moon, -/area/icemoon/underground/explored) "kVx" = ( /obj/structure/cable/multilayer/multiz, /obj/effect/turf_decal/stripes/line, @@ -34644,9 +34443,6 @@ /turf/open/floor/iron, /area/station/medical/pharmacy) "lca" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/item/radio/intercom/directional/west, /turf/open/floor/iron/dark, /area/station/medical/morgue) @@ -35675,18 +35471,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/engine_smes) -"lun" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/mine/eva/lower) "lup" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 8 @@ -36322,9 +36106,6 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "lEt" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron/dark/side, /area/mine/eva) @@ -36410,6 +36191,9 @@ /obj/structure/railing{ dir = 10 }, +/obj/structure/railing{ + dir = 8 + }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "lFq" = ( @@ -36659,9 +36443,6 @@ /turf/open/floor/iron, /area/station/service/janitor) "lKZ" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -36866,10 +36647,6 @@ /turf/open/floor/iron, /area/station/maintenance/department/electrical) "lPb" = ( -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, /turf/open/floor/plating/icemoon, /area/station/security/execution/education) "lPc" = ( @@ -36910,19 +36687,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"lPJ" = ( -/obj/structure/railing/corner, -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/mid_joiner{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark/smooth_edge{ - dir = 1 - }, -/area/station/ai_monitored/command/storage/eva) "lPN" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, @@ -37666,9 +37430,6 @@ /turf/open/floor/iron, /area/station/security/prison/work) "mdy" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, @@ -39895,15 +39656,6 @@ /obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/iron/white, /area/station/maintenance/aft/greater) -"mSH" = ( -/obj/structure/fence{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/underground/explored) "mSL" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -40205,6 +39957,14 @@ /obj/structure/sign/poster/official/random/directional/east, /turf/open/floor/iron/smooth, /area/mine/mechbay) +"mXH" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) "mXK" = ( /obj/structure/table, /obj/structure/reagent_dispensers/servingdish, @@ -40847,9 +40607,6 @@ /obj/structure/fence/door{ dir = 4 }, -/obj/structure/railing/corner{ - dir = 1 - }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) "ngY" = ( @@ -41146,15 +40903,18 @@ /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/hos) "nlJ" = ( -/obj/structure/railing{ - dir = 5 - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/glass/reinforced, /area/station/hallway/primary/starboard) "nlN" = ( @@ -41629,10 +41389,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/structure/railing/corner{ +/obj/structure/sign/poster/official/random/directional/north, +/obj/structure/railing{ dir = 1 }, -/obj/structure/sign/poster/official/random/directional/north, /turf/open/floor/wood, /area/station/hallway/secondary/service) "nsi" = ( @@ -42388,7 +42148,6 @@ /turf/open/floor/iron/goonplaque, /area/station/hallway/secondary/entry) "nDl" = ( -/obj/structure/railing/corner, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/tile/dark/half/contrasted, /turf/open/floor/iron/white, @@ -42412,12 +42171,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/locker) -"nDw" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "nDz" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42849,8 +42602,10 @@ /turf/open/floor/iron, /area/station/command/teleporter) "nKl" = ( +/obj/structure/railing, /obj/structure/railing{ - dir = 6 + dir = 4; + layer = 4.1 }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) @@ -45021,7 +44776,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/obj/structure/railing/corner, /obj/machinery/door/firedoor/border_only, /turf/open/floor/iron/cafeteria{ dir = 8 @@ -45451,9 +45205,6 @@ /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 1 - }, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "oyz" = ( @@ -45549,7 +45300,6 @@ /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) "ozM" = ( -/obj/structure/railing/corner, /obj/structure/sign/warning/biohazard/directional/west, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) @@ -45705,13 +45455,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"oBz" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/lava/plasma/ice_moon, -/area/icemoon/underground/explored) "oBP" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -46155,11 +45898,6 @@ /obj/effect/spawner/random/maintenance/four, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"oJk" = ( -/obj/structure/railing/corner, -/obj/effect/turf_decal/tile/brown, -/turf/open/floor/iron, -/area/station/cargo/storage) "oJn" = ( /obj/structure/flora/grass/brown/style_3, /obj/structure/flora/bush/snow/style_random, @@ -47629,9 +47367,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -47711,9 +47446,6 @@ dir = 4 }, /obj/structure/sign/warning/cold_temp/directional/south, -/obj/structure/railing/corner{ - dir = 8 - }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/fore/lesser) "pjF" = ( @@ -48995,7 +48727,6 @@ /turf/open/floor/iron, /area/station/maintenance/starboard/fore) "pFV" = ( -/obj/structure/railing/corner, /turf/open/floor/iron/smooth, /area/station/maintenance/fore/lesser) "pFW" = ( @@ -50156,7 +49887,6 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "pYz" = ( -/obj/structure/railing/corner, /obj/machinery/door/firedoor/border_only, /turf/open/floor/iron/dark/corner{ dir = 4 @@ -50287,22 +50017,7 @@ }, /turf/open/floor/iron/white, /area/station/medical/surgery/aft) -"qbb" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/science/ordnance/office) "qbd" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -50476,9 +50191,6 @@ /turf/closed/wall/r_wall, /area/station/security/checkpoint/engineering) "qeF" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -50495,16 +50207,6 @@ /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) -"qeL" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/lava/plasma/ice_moon, -/area/icemoon/underground/explored) "qeP" = ( /obj/structure/table, /obj/item/flashlight/lantern, @@ -51396,9 +51098,6 @@ /turf/open/floor/iron, /area/station/cargo/drone_bay) "quZ" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/landmark/start/botanist, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/tile/green{ @@ -51494,9 +51193,6 @@ /area/station/hallway/primary/aft) "qwi" = ( /obj/effect/turf_decal/trimline/neutral/corner, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, @@ -52831,9 +52527,6 @@ /turf/open/floor/iron/dark/textured, /area/station/security/prison/workout) "qSe" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, /area/station/medical/morgue) @@ -52854,11 +52547,9 @@ /area/station/security/prison/garden) "qSq" = ( /obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 4 - }, +/obj/structure/railing, /obj/structure/railing{ - dir = 10 + dir = 8 }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) @@ -53004,9 +52695,6 @@ /turf/open/floor/wood, /area/station/maintenance/aft/greater) "qUS" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/tile/brown{ dir = 8 }, @@ -54558,14 +54246,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"rwe" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/openspace, -/area/station/engineering/atmos/storage) "rwk" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -55610,9 +55290,6 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/structure/cable, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -55792,11 +55469,6 @@ "rQf" = ( /turf/open/floor/plating, /area/station/engineering/supermatter/room) -"rQl" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner, -/turf/open/lava/plasma/ice_moon, -/area/icemoon/underground/explored) "rQn" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -56633,9 +56305,6 @@ /turf/open/floor/iron, /area/station/cargo/office) "sdX" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/structure/cable, /obj/item/assembly/timer{ pixel_y = 3 @@ -58354,9 +58023,6 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "sFS" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/trimline/neutral/warning{ dir = 1 }, @@ -58376,9 +58042,6 @@ name = "Medbay Access"; req_access = list("medical") }, -/obj/structure/railing/corner{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/station/medical/morgue) "sGk" = ( @@ -58409,22 +58072,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/mine/living_quarters) -"sGH" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ - dir = 8 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/engineering/atmos/storage) "sGJ" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister, @@ -58689,10 +58336,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner, /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/atmos/storage) @@ -60582,7 +60225,6 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "tux" = ( -/obj/structure/railing/corner, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -60976,9 +60618,13 @@ /area/station/security/checkpoint/supply) "tBW" = ( /obj/structure/railing{ - dir = 5 + dir = 1 }, /obj/structure/sign/warning/biohazard/directional/west, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "tCe" = ( @@ -62960,7 +62606,6 @@ /turf/open/floor/iron/white, /area/station/medical/pharmacy) "uhs" = ( -/obj/structure/railing/corner, /obj/machinery/camera/directional/south{ c_tag = "Mining B-1 Hallway North" }, @@ -63585,12 +63230,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/grass, /area/station/service/hydroponics/garden) -"urw" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/glass/reinforced, -/area/station/hallway/primary/starboard) "urx" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, @@ -63740,10 +63379,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) -"uuC" = ( -/obj/structure/railing/corner, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) "uuI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -64048,7 +63683,6 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "uAl" = ( -/obj/structure/railing/corner, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/commons/storage/primary) @@ -64134,9 +63768,6 @@ /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/machinery/duct, /turf/open/floor/iron/white, /area/station/medical/virology) @@ -64331,15 +63962,6 @@ /obj/structure/closet/crate, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) -"uEI" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) "uEJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /turf/open/floor/iron, @@ -64880,7 +64502,6 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 6 }, -/obj/structure/railing/corner, /obj/effect/landmark/start/hangover, /turf/open/floor/iron/white, /area/station/medical/virology) @@ -65238,15 +64859,6 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"uWw" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/underground/explored) "uWD" = ( /obj/machinery/disposal/delivery_chute{ dir = 4 @@ -67376,9 +66988,7 @@ /area/station/maintenance/fore) "vEH" = ( /obj/structure/industrial_lift, -/obj/structure/railing{ - dir = 6 - }, +/obj/structure/railing, /turf/open/openspace, /area/station/commons/storage/mining) "vEJ" = ( @@ -67725,9 +67335,6 @@ /turf/open/floor/iron/dark, /area/station/science/breakroom) "vJY" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/machinery/door/window/brigdoor{ dir = 8; name = "Research Director Observation"; @@ -67829,9 +67436,6 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 10 }, -/obj/structure/railing/corner{ - dir = 8 - }, /turf/open/floor/iron/white, /area/station/medical/virology) "vMi" = ( @@ -68115,12 +67719,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"vRY" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "vSa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -68383,14 +67981,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/command/bridge) -"vWP" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing, -/turf/open/lava/plasma/ice_moon, -/area/icemoon/underground/explored) "vWV" = ( /obj/structure/chair/office{ dir = 8 @@ -68430,20 +68020,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) -"vXv" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/openspace, -/area/station/engineering/atmos/storage) "vXy" = ( /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) @@ -71338,7 +70914,10 @@ "wQY" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ - dir = 9 + dir = 1 + }, +/obj/structure/railing{ + dir = 8 }, /turf/open/openspace, /area/station/science/ordnance/office) @@ -71478,7 +71057,6 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "wSX" = ( -/obj/structure/railing/corner, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron/dark/side, @@ -72860,8 +72438,9 @@ /area/station/hallway/primary/central) "xnX" = ( /obj/structure/lattice/catwalk, +/obj/structure/railing, /obj/structure/railing{ - dir = 6 + dir = 4 }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) @@ -74827,7 +74406,10 @@ /area/mine/eva/lower) "xVT" = ( /obj/structure/railing{ - dir = 9 + dir = 1 + }, +/obj/structure/railing{ + dir = 8 }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) @@ -92394,7 +91976,7 @@ ghx ghx hMz hUy -dZS +xuo xuo scw iDt @@ -92909,7 +92491,7 @@ ghx ghx ghx stA -rQl +ojf hUK hUK xMq @@ -93153,7 +92735,7 @@ ghx ghx ghx ghx -jlu +ghx uwH lWI flZ @@ -93161,7 +92743,7 @@ lWI lWI lWI qrj -ena +qSq ghx ghx ghx @@ -93410,7 +92992,7 @@ ghx ghx ghx ndA -mSH +dLH ngM kgN wDU @@ -93418,9 +93000,9 @@ sKo sKo sKo wDU -kUP +ojf okH -qSq +mXH ghx stA xlq @@ -93677,10 +93259,10 @@ fob wDU xlq ghx -qeL +stA lWI -gUp -ayG +ojf +ojf okH qSq ghx @@ -93932,9 +93514,9 @@ qmt xbA qmt wDU -oBz +ojf lWI -gUp +ojf ojf ojf xlq @@ -94194,9 +93776,9 @@ wDU dqW xuo xuo -oBz +ojf lWI -vWP +xlq ghx ghx ghx @@ -95727,7 +95309,7 @@ xBF nfr qmt iVm -lun +iGv vip gSO uPt @@ -95984,7 +95566,7 @@ kLa qmt qmt sAa -juZ +iGv vFM lIR uUT @@ -96460,7 +96042,7 @@ ghx ghx ghx psb -fSd +xuo hUK gqG thA @@ -98002,7 +97584,7 @@ thA xuo wYp odW -uWw +xuo psb ghx ghx @@ -98481,7 +98063,7 @@ thA rfu lWI lWI -adD +lWI lWI ena ghx @@ -98740,7 +98322,7 @@ xuo xuo xuo xuo -oBz +ojf ena ghx ghx @@ -98998,7 +98580,7 @@ xuo xuo xuo xuo -oBz +ojf ena ghx ghx @@ -99256,7 +98838,7 @@ rfu pjj daf kmH -oBz +ojf ena ghx ghx @@ -99514,7 +99096,7 @@ pjj daf daf xuo -oBz +ojf ena ghx ghx @@ -158157,7 +157739,7 @@ afz tKI szG iwS -eId +iwS lWh lWh iwS @@ -158683,7 +158265,7 @@ gjq gjq gjq hxT -aFG +xuo hZe xuo jnn @@ -178208,7 +177790,7 @@ fuH fuH btU oYm -kht +dYr wqi qhy dYX @@ -183101,7 +182683,7 @@ ozM nKl cgR tBW -vRY +iDt ffe oxO oxO @@ -183353,7 +182935,7 @@ thA thA xMq xMq -fWw +iDt nKl ghx ghx @@ -183867,12 +183449,12 @@ thA thA thA scw -nDw +iDt lFp ghx ghx xVT -blf +iDt xMq xMq alM @@ -184125,10 +183707,10 @@ thA thA xMq xMq -nDw +iDt tUV tUV -blf +iDt iDt scw xMq @@ -226530,12 +226112,12 @@ vlN mmi wiz mmi -oJk +jhy jjk jjk jjk sOm -uEI +eWV ajw maT maT @@ -233436,7 +233018,7 @@ iVi bWn ylz xMX -lPJ +sFS nVB nVB nVB @@ -242691,7 +242273,7 @@ cXN gmW jOY tux -dsO +tGZ kQX tGZ oBp @@ -243217,7 +242799,7 @@ izC jRA jRA dGP -fZo +ixH nGz izC yjX @@ -244552,9 +244134,9 @@ pOy njA sKW hGs -vXv +nZH hGs -gOY +wDg ylM vep trf @@ -245066,7 +244648,7 @@ npD npD gGj mue -sGH +fij bPt fij oDh @@ -246350,7 +245932,7 @@ edT wRr npD bPY -rwe +nZH wGO npD oUi @@ -251218,7 +250800,7 @@ oQx vpW jbU lec -fmU +pMF qhL wve hfc @@ -251477,7 +251059,7 @@ jbU kZd hdH qhL -dkK +wve vVP vVP vVP @@ -253244,7 +252826,7 @@ gEE gEE chK leM -gqj +bMY emp cYE lso @@ -254256,7 +253838,7 @@ rPu lUC tXV kvX -brL +hxI cYY cYY wrX @@ -254272,7 +253854,7 @@ gEE gEE nlJ rrp -urw +bMY emp bvI lso @@ -254280,7 +253862,7 @@ mtT pLa jJF yeB -uuC +lZi hDb qWn gav @@ -254793,7 +254375,7 @@ cvr cvr equ lso -uuC +lso ePR kwK qWn @@ -255842,7 +255424,7 @@ bEJ bEJ mXe bEJ -qbb +bEJ piM hLO hLO diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 975e7f4f6a7b..20b55db673a0 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -26881,7 +26881,10 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "jLG" = ( -/obj/structure/railing/corner, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, /turf/open/floor/plating/airless, /area/space/nearstation) "jMo" = ( @@ -29940,9 +29943,6 @@ /turf/open/floor/iron, /area/station/cargo/miningoffice) "kRf" = ( -/obj/structure/railing{ - dir = 6 - }, /obj/effect/turf_decal/trimline/yellow/filled/end, /obj/effect/turf_decal/trimline/yellow/warning{ dir = 10 @@ -29953,6 +29953,11 @@ pixel_y = 4 }, /obj/structure/cable, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/obj/structure/railing, /turf/open/floor/iron, /area/station/engineering/atmos) "kRi" = ( @@ -41864,8 +41869,10 @@ /area/station/hallway/secondary/entry) "pdU" = ( /obj/structure/railing{ - dir = 6 + dir = 4; + layer = 4.1 }, +/obj/structure/railing, /turf/open/floor/plating/airless, /area/space/nearstation) "pdX" = ( @@ -60993,8 +61000,10 @@ /obj/structure/railing{ dir = 4 }, +/obj/structure/railing, /obj/structure/railing{ - dir = 10 + dir = 8; + layer = 4.1 }, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos) diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index 0af79460e1bb..5b5b9b45d37b 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -560,10 +560,11 @@ /turf/open/floor/plating, /area/mine/maintenance/production) "dw" = ( +/obj/effect/turf_decal/sand/plating/volcanic, /obj/structure/railing{ - dir = 10 + dir = 8 }, -/obj/effect/turf_decal/sand/plating/volcanic, +/obj/structure/railing, /turf/open/floor/plating/lavaland_atmos, /area/lavaland/surface/outdoors) "dx" = ( @@ -745,13 +746,6 @@ /obj/structure/fans/tiny, /turf/open/floor/plating, /area/mine/laborcamp/security/maintenance) -"fb" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/lattice/catwalk/mining, -/turf/open/lava/smooth/lava_land_surface, -/area/lavaland/surface/outdoors) "fe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -3215,13 +3209,6 @@ "rF" = ( /turf/closed/wall/r_wall, /area/mine/maintenance/labor) -"rG" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/turf_decal/sand/plating/volcanic, -/turf/open/floor/plating/lavaland_atmos, -/area/lavaland/surface/outdoors) "rH" = ( /obj/machinery/mineral/processing_unit{ dir = 1; @@ -3762,13 +3749,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/mine/maintenance/service) -"vd" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/effect/turf_decal/sand/plating/volcanic, -/turf/open/floor/plating/lavaland_atmos, -/area/lavaland/surface/outdoors) "ve" = ( /obj/structure/cable, /obj/machinery/power/terminal{ @@ -4106,13 +4086,6 @@ dir = 1 }, /area/mine/mechbay) -"xh" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/effect/turf_decal/sand/plating/volcanic, -/turf/open/floor/plating/lavaland_atmos, -/area/lavaland/surface/outdoors) "xi" = ( /obj/structure/table, /obj/item/paper, @@ -4713,12 +4686,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth_edge, /area/mine/laborcamp/production) -"AQ" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/misc/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) "AV" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/item/reagent_containers/cup/glass/bottle/beer, @@ -4739,10 +4706,6 @@ }, /turf/open/floor/iron/dark, /area/mine/production) -"Bd" = ( -/obj/structure/railing/corner, -/turf/open/misc/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) "By" = ( /obj/machinery/door/poddoor/preopen{ id = "labor"; @@ -6581,9 +6544,6 @@ /turf/open/floor/iron/checker, /area/mine/cafeteria) "MQ" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/structure/sign/directions/security/directional/west{ pixel_x = 32; pixel_y = -8 @@ -7288,20 +7248,10 @@ /obj/structure/closet/toolcloset, /turf/open/floor/plating, /area/mine/maintenance/service) -"RB" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/lattice/catwalk/mining, -/turf/open/lava/smooth/lava_land_surface, -/area/lavaland/surface/outdoors) "RD" = ( /turf/closed/wall, /area/mine/maintenance/labor) "RF" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/structure/sign/directions/security/directional/west{ pixel_x = 0; pixel_y = 24 @@ -34609,7 +34559,7 @@ pU pU pU pU -AQ +pU ZM ZM ZM @@ -34622,8 +34572,8 @@ ZM ZM ZM Ka -vd -xh +BP +BP dw pU aj @@ -34864,7 +34814,7 @@ pU pU pU pU -Bd +pU VK VK VK @@ -35137,7 +35087,7 @@ aj aj aj FH -rG +BP ol aj aj @@ -37451,7 +37401,7 @@ px DI oS BP -xh +BP ZM ZM ZM @@ -37711,7 +37661,7 @@ xt VK VK VK -fb +tF BP dx Kf @@ -44383,7 +44333,7 @@ pU nm Nc nm -RB +tF Yq aj aj @@ -47193,7 +47143,7 @@ pU pU pU pU -AQ +pU ZM ZM ZM @@ -47450,7 +47400,7 @@ pU pU pU pU -Bd +pU VK VK VK diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index cdccfc870255..16a8802a3e0f 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -2491,7 +2491,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, -/obj/structure/railing/corner, /obj/machinery/ticket_machine/directional/north{ id = "ticket_machine_med" }, @@ -4386,9 +4385,6 @@ /obj/effect/turf_decal/trimline/purple/arrow_cw{ dir = 9 }, -/obj/structure/railing/corner{ - dir = 4 - }, /turf/open/floor/iron/dark/textured/airless, /area/station/science/lobby) "cwX" = ( @@ -6542,17 +6538,6 @@ dir = 8 }, /area/station/security/office) -"dDB" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4; - invisibility = 101 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/iron/white/textured, -/area/station/medical/medbay/lobby) "dDN" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -8678,12 +8663,12 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 }, -/obj/structure/railing{ - dir = 10 - }, /obj/machinery/ticket_machine/directional/east{ id = "ticket_machine_engie" }, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/plastic, /area/station/hallway/primary/central) "eLw" = ( @@ -9694,6 +9679,13 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/disposal/incinerator) +"fmC" = ( +/mob/living/basic/chicken, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/misc/sandy_dirt, +/area/station/service/hydroponics/upper) "fmI" = ( /obj/structure/spider/stickyweb/sealed, /turf/open/floor/plating, @@ -12845,6 +12837,13 @@ }, /turf/open/floor/iron/dark/textured, /area/station/engineering/break_room) +"hfF" = ( +/mob/living/basic/chicken/brown, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/misc/sandy_dirt, +/area/station/service/hydroponics/upper) "hfR" = ( /obj/structure/weightmachine/stacklifter, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -13958,14 +13957,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) -"hNC" = ( -/obj/structure/railing, -/obj/structure/disposalpipe/segment{ - dir = 4; - invisibility = 101 - }, -/turf/open/floor/wood, -/area/station/service/hydroponics/upper) "hNH" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 @@ -15395,9 +15386,6 @@ /obj/effect/turf_decal/trimline/purple/corner{ dir = 8 }, -/obj/structure/railing/corner{ - dir = 8 - }, /turf/open/floor/iron/dark/textured_corner{ dir = 8 }, @@ -15503,13 +15491,6 @@ /obj/effect/spawner/random/trash, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) -"iIX" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing{ - dir = 4 - }, -/turf/open/floor/wood, -/area/station/service/hydroponics/upper) "iJb" = ( /obj/effect/turf_decal/stripes{ dir = 9 @@ -16155,21 +16136,6 @@ "jcU" = ( /turf/open/floor/carpet/purple, /area/station/science/server) -"jdb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/machinery/ticket_machine/directional/north{ - id = "ticket_machine_med" - }, -/obj/effect/turf_decal/trimline/blue/line, -/turf/open/floor/iron/dark/textured, -/area/station/medical/medbay/lobby) "jdl" = ( /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar/backroom) @@ -18216,7 +18182,6 @@ /obj/effect/turf_decal/trimline/purple/arrow_cw{ dir = 10 }, -/obj/structure/railing/corner, /turf/open/floor/iron/dark/textured/airless, /area/station/science/lobby) "kie" = ( @@ -19028,9 +18993,6 @@ "kFH" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing{ - dir = 4 - }, /turf/open/floor/wood, /area/station/service/hydroponics/upper) "kFT" = ( @@ -19377,6 +19339,12 @@ "kMm" = ( /obj/structure/cable, /obj/structure/nestbox, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, /turf/open/misc/sandy_dirt, /area/station/service/hydroponics/upper) "kMx" = ( @@ -22322,7 +22290,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, -/obj/structure/railing, /obj/structure/disposalpipe/segment{ dir = 4; invisibility = 101 @@ -22927,6 +22894,9 @@ /area/station/hallway/primary/central) "mQX" = ( /mob/living/basic/chicken, +/obj/structure/railing{ + dir = 1 + }, /obj/structure/railing{ dir = 4 }, @@ -23029,9 +22999,6 @@ "mTs" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, -/obj/structure/railing{ - dir = 8 - }, /turf/open/floor/wood, /area/station/service/hydroponics/upper) "mTt" = ( @@ -25685,6 +25652,9 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) "opQ" = ( +/obj/structure/railing{ + dir = 1 + }, /turf/open/misc/sandy_dirt, /area/station/service/hydroponics/upper) "opR" = ( @@ -29754,6 +29724,9 @@ /area/station/tcommsat/server) "qEb" = ( /obj/machinery/camera/autoname/directional/north, +/obj/structure/railing{ + dir = 4 + }, /turf/open/misc/sandy_dirt, /area/station/service/hydroponics/upper) "qEi" = ( @@ -31558,9 +31531,6 @@ /obj/effect/turf_decal/trimline/purple/corner{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 1 - }, /turf/open/floor/iron/dark/textured_corner{ dir = 1 }, @@ -32664,7 +32634,6 @@ "skl" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing, /obj/structure/disposalpipe/segment{ dir = 4; invisibility = 101 @@ -33658,17 +33627,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/security/office) -"sNI" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4; - invisibility = 101 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/iron/white/textured, -/area/station/medical/medbay/lobby) "sNP" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 @@ -40094,6 +40052,13 @@ }, /turf/open/floor/wood/large, /area/station/security/checkpoint/customs) +"wzS" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing, +/turf/open/misc/sandy_dirt, +/area/station/service/hydroponics/upper) "wAk" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -62874,10 +62839,10 @@ csW csW syi qEb -hsV +wzS xyY kFH -iIX +kqQ kqQ eqZ djv @@ -63134,7 +63099,7 @@ syi mTs skl kMm -dJB +fmC hmD hmD sxX @@ -63646,7 +63611,7 @@ qxW xCU eig aST -hNC +xva opQ xPK hmD @@ -63903,8 +63868,8 @@ qxW csW syi clC -hNC -xPK +xva +hfF mLJ hmD uRS @@ -70306,7 +70271,7 @@ xxZ eJv eJv bsc -dDB +dno kAH cIO oIu @@ -72104,8 +72069,8 @@ eXH uOF eJv eJv -jdb -sNI +bsc +dno kAH cIO xev diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index fd0d7cf8bf48..d2acc42cf531 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -2634,7 +2634,7 @@ /obj/item/folder/blue, /obj/item/stamp/law, /obj/item/banhammer{ - force = 2000; + force = -10; name = "Hammer of Justice"; desc = "Divine Judgement." }, @@ -2989,17 +2989,6 @@ }, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/courtroom) -"lX" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door/poddoor/shutters{ - id = "XCCsec1"; - name = "XCC Checkpoint 1 Shutters"; - max_integrity = 3000000 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/control) "md" = ( /obj/machinery/computer/shuttle/labor, /obj/effect/turf_decal/stripes/line{ @@ -3833,15 +3822,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) -"pi" = ( -/obj/structure/table/reinforced, -/obj/item/folder/yellow, -/obj/item/stamp/qm, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supply) "pj" = ( /obj/structure/chair/office{ dir = 8 @@ -3859,7 +3839,8 @@ dir = 4; icon_state = "rightsecure"; name = "CentCom Customs"; - req_access = list("cent_captain") + req_access = list("cent_captain"); + max_integrity = 300000000 }, /obj/item/clipboard, /obj/item/folder/yellow, @@ -3991,7 +3972,9 @@ "pQ" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/east{ + max_integrity = 300000000 + }, /obj/item/paper_bin, /obj/item/pen/red, /obj/effect/turf_decal/bot, @@ -4300,6 +4283,9 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/courtroom) +"rj" = ( +/turf/open/floor/iron, +/area/centcom/central_command_areas/supply) "rk" = ( /turf/open/floor/wood, /area/centcom/central_command_areas/courtroom) @@ -4924,15 +4910,6 @@ /obj/effect/mapping_helpers/airlock/access/any/command/general, /turf/open/floor/iron, /area/centcom/tdome/administration) -"tD" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, -/obj/machinery/light/directional/east, -/obj/structure/mirror/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin) "tF" = ( /obj/machinery/door/airlock/centcom{ name = "Thunderdome Locker Room" @@ -5187,11 +5164,8 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/supply) "uH" = ( -/obj/machinery/door/airlock/centcom{ - name = "Shuttle Control Office" - }, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, +/turf/closed/indestructible/riveted, /area/centcom/central_command_areas/supply) "uK" = ( /obj/machinery/processor, @@ -5402,14 +5376,10 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) "vG" = ( -/obj/machinery/door/poddoor/shutters{ - id = "XCCsec1"; - name = "XCC Checkpoint 1 Shutters"; - max_integrity = 3000000 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/door/poddoor/shutters/cc/xcc, /turf/open/floor/iron, /area/centcom/central_command_areas/control) "vH" = ( @@ -7723,6 +7693,14 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/dark/textured_large, /area/centcom/central_command_areas/evacuation/ship) +"FJ" = ( +/obj/machinery/door/airlock/centcom{ + name = "Shuttle Control Office" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/mapping_helpers/airlock/access/any/admin/general, +/turf/open/space/basic, +/area/centcom/central_command_areas/admin) "FK" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/trimline/dark_red/filled/line, @@ -9151,6 +9129,7 @@ "Nx" = ( /obj/structure/fans/tiny, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/door/poddoor/shutters/cc/xcc, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/supply) "Ny" = ( @@ -52122,7 +52101,7 @@ TO On Ui Cs -tD +Hz oB ZF YU @@ -52379,7 +52358,7 @@ yP On On On -On +FJ On On YU @@ -52636,7 +52615,7 @@ nG iF yd GL -pi +jt FO Tq YU @@ -53673,10 +53652,10 @@ iF rK mQ io -lX -lX -lX -lX +vG +vG +vG +vG vG io rK @@ -54170,8 +54149,8 @@ oJ oJ oJ lo -lK -iR +uH +rj oJ oJ lo @@ -54678,7 +54657,7 @@ iF iF iF iF -iX +Ih iF iF iF @@ -54691,10 +54670,10 @@ no iF iF iN -iX +Ih pl pQ -iX +Ih iF iX iF diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index b7876ed56dd4..af27739e701d 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -806,9 +806,6 @@ }, /area/station/escapepodbay) "acv" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/filingcabinet, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -818,6 +815,9 @@ c_tag = "Security - Prison Prep Room" }, /obj/structure/cable, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/iron, /area/station/security/execution/transfer) "acw" = ( @@ -1680,13 +1680,6 @@ /obj/machinery/door/airlock/freezer, /turf/open/floor/catwalk_floor, /area/station/service/kitchen/coldroom) -"aeO" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating, -/area/station/engineering/atmos) "aeP" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner, /obj/structure/cable, @@ -1925,42 +1918,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/openspace, -/area/station/asteroid) -"afB" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/openspace, -/area/station/asteroid) -"afC" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/openspace, -/area/station/asteroid) -"afD" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/openspace, -/area/station/asteroid) -"afE" = ( /obj/structure/railing{ - dir = 4 + dir = 1 }, -/obj/structure/lattice/catwalk, /turf/open/openspace, /area/station/asteroid) "afF" = ( @@ -1974,13 +1934,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison/safe) -"afG" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/lattice/catwalk, -/turf/open/openspace, -/area/station/asteroid) "afH" = ( /obj/structure/grille, /obj/structure/window/spawner/directional/west, @@ -1995,30 +1948,19 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "afJ" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/structure/lattice/catwalk, +/obj/structure/railing, /obj/structure/railing{ - pixel_y = -8 - }, -/obj/structure/railing/corner{ - dir = 4; - pixel_x = -32; - pixel_y = -29 + dir = 8; + layer = 4.1 }, /turf/open/openspace, /area/station/asteroid) "afK" = ( /obj/machinery/light/directional/north, -/obj/structure/railing{ - dir = 1 - }, /obj/structure/ladder, /obj/structure/lattice/catwalk, -/obj/structure/railing{ - pixel_y = -8 - }, +/obj/structure/railing, /turf/open/openspace, /area/station/asteroid) "afL" = ( @@ -2026,17 +1968,11 @@ /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) "afM" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/structure/lattice/catwalk, +/obj/structure/railing, /obj/structure/railing{ - pixel_y = -8 - }, -/obj/structure/railing/corner{ - dir = 1; - pixel_x = 32; - pixel_y = -29 + dir = 4; + layer = 4.1 }, /turf/open/openspace, /area/station/asteroid) @@ -2048,7 +1984,6 @@ "afO" = ( /obj/machinery/light/directional/east, /obj/structure/lattice, -/obj/structure/railing, /turf/open/openspace, /area/station/asteroid) "afP" = ( @@ -2095,13 +2030,6 @@ /obj/structure/lattice, /turf/open/openspace, /area/station/asteroid) -"afW" = ( -/obj/effect/spawner/random{ - loot = list(/obj/effect/decal/cleanable/oil/slippery=10,/obj/effect/decal/cleanable/oil=90); - name = "funny slipper :)" - }, -/turf/open/floor/noslip/tram_plate, -/area/station/hallway/primary/tram/right) "afX" = ( /obj/structure/fluff/tram_rail{ dir = 1 @@ -2131,45 +2059,31 @@ /turf/open/openspace, /area/station/asteroid) "agb" = ( -/obj/structure/railing/corner, /obj/structure/lattice/catwalk, /obj/structure/railing{ - dir = 1; - pixel_x = 1; - pixel_y = 6 + dir = 8 }, -/obj/structure/railing/corner{ - pixel_y = 30; - pixel_x = -31 +/obj/structure/railing{ + dir = 1 }, /turf/open/openspace, /area/station/asteroid) "agc" = ( /obj/machinery/light/directional/south, -/obj/structure/railing, /obj/structure/ladder, /obj/structure/lattice/catwalk, /obj/structure/railing{ - dir = 1; - pixel_x = 1; - pixel_y = 6 + dir = 1 }, /turf/open/openspace, /area/station/asteroid) "agd" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/structure/lattice/catwalk, /obj/structure/railing{ - dir = 1; - pixel_x = 1; - pixel_y = 6 + dir = 4 }, -/obj/structure/railing/corner{ - pixel_y = 30; - dir = 8; - pixel_x = 32 +/obj/structure/railing{ + dir = 1 }, /turf/open/openspace, /area/station/asteroid) @@ -2179,26 +2093,8 @@ /area/station/asteroid) "agf" = ( /obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/openspace, -/area/station/asteroid) -"agg" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/openspace, -/area/station/asteroid) -"agh" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/structure/cable, +/obj/structure/railing, /turf/open/openspace, /area/station/asteroid) "agi" = ( @@ -3844,7 +3740,6 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "asK" = ( -/obj/structure/railing, /obj/effect/turf_decal/siding/wideplating/dark, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, @@ -4526,7 +4421,6 @@ "ayT" = ( /obj/machinery/light/directional/west, /obj/structure/lattice, -/obj/structure/railing, /turf/open/openspace, /area/station/asteroid) "azd" = ( @@ -5051,6 +4945,10 @@ dir = 10 }, /obj/machinery/smartfridge/petri/preloaded, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron/white, /area/station/science/xenobiology) "aDq" = ( @@ -5444,9 +5342,6 @@ /obj/effect/turf_decal/trimline/dark_blue/corner{ dir = 8 }, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) @@ -5644,12 +5539,6 @@ /obj/structure/cable, /turf/open/openspace, /area/station/asteroid) -"aHk" = ( -/obj/structure/railing{ - dir = 6 - }, -/turf/open/openspace, -/area/station/asteroid) "aHl" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -5781,6 +5670,12 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit) +"aIe" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/openspace, +/area/station/security/brig) "aIi" = ( /turf/open/floor/iron, /area/station/security/prison/work) @@ -6223,12 +6118,6 @@ /turf/open/floor/iron, /area/station/commons/fitness/recreation) "aMm" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 1 }, @@ -6242,9 +6131,6 @@ /turf/open/floor/iron, /area/station/commons/fitness/recreation) "aMn" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 1 }, @@ -6288,21 +6174,6 @@ }, /turf/closed/wall, /area/station/hallway/primary/tram/left) -"aME" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/space/openspace, -/area/station/solars/port) "aMG" = ( /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron/white, @@ -6656,6 +6527,17 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) +"aPn" = ( +/obj/structure/railing{ + dir = 10; + layer = 3.1 + }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/turf/open/openspace, +/area/station/maintenance/department/security) "aPo" = ( /obj/machinery/door/airlock/research{ name = "Chemical Storage" @@ -6885,6 +6767,13 @@ "aQO" = ( /turf/closed/wall/r_wall, /area/station/command/bridge) +"aQT" = ( +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/turf/open/openspace, +/area/station/security/brig) "aQU" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -7037,12 +6926,6 @@ /area/station/commons/dorms) "aSQ" = ( /obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -8160,21 +8043,6 @@ /obj/structure/chair/stool/directional/south, /turf/open/floor/plating, /area/station/asteroid) -"bok" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner, -/turf/open/space/openspace, -/area/station/solars/port) "bop" = ( /obj/machinery/button/door/directional/west{ id = "private_c"; @@ -8340,6 +8208,13 @@ /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/wood/parquet, /area/station/medical/psychology) +"brX" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/openspace, +/area/station/security/brig) "bsf" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/portable_atmospherics/canister/bz, @@ -8471,9 +8346,6 @@ /turf/open/floor/iron/cafeteria, /area/station/commons/dorms/laundry) "btO" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/machinery/light/directional/east, /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/glass/reinforced, @@ -8719,17 +8591,6 @@ }, /turf/open/floor/iron/white, /area/station/science/lower) -"bwT" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "bxd" = ( /obj/machinery/computer/message_monitor{ dir = 1 @@ -8858,16 +8719,6 @@ /obj/item/lightreplacer, /turf/open/floor/glass/reinforced, /area/station/engineering/break_room) -"byH" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/space/openspace, -/area/station/solars/port) "byL" = ( /obj/effect/turf_decal/trimline/brown/filled/line, /turf/open/floor/iron, @@ -9217,10 +9068,6 @@ "bEA" = ( /obj/structure/lattice/catwalk, /obj/machinery/light/small/directional/west, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner, /turf/open/space/openspace, /area/station/solars/starboard/fore) "bEM" = ( @@ -9554,8 +9401,9 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "bJP" = ( +/obj/structure/railing, /obj/structure/railing{ - dir = 10 + dir = 8 }, /turf/open/floor/glass/reinforced, /area/station/ai_monitored/turret_protected/aisat/hallway) @@ -9570,7 +9418,6 @@ /obj/structure/railing{ dir = 8 }, -/obj/structure/railing/corner, /obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/station/engineering/atmos) @@ -9588,14 +9435,6 @@ /obj/item/fuel_pellet, /turf/open/floor/iron/dark, /area/station/cargo/drone_bay) -"bKy" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "bKK" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -9731,15 +9570,6 @@ /obj/machinery/bluespace_beacon, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) -"bME" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/space/openspace, -/area/station/solars/port) "bMV" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -10029,11 +9859,6 @@ /obj/structure/lattice/catwalk, /turf/open/floor/plating/airless, /area/station/solars/port) -"bRF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing/corner, -/turf/open/floor/iron/smooth, -/area/station/maintenance/department/medical) "bRU" = ( /obj/machinery/smartfridge/chemistry/preloaded, /obj/machinery/door/poddoor/shutters/preopen{ @@ -10285,9 +10110,6 @@ /turf/open/floor/iron/dark, /area/station/security/courtroom) "bVN" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/siding/thinplating{ dir = 5 }, @@ -10301,17 +10123,6 @@ /obj/machinery/keycard_auth/directional/east, /turf/open/floor/carpet, /area/station/command/heads_quarters/hos) -"bWi" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/space/openspace, -/area/station/solars/port) "bWr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -11034,20 +10845,6 @@ /obj/structure/closet/firecloset/full, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"cfp" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "cfq" = ( /obj/structure/ladder, /obj/effect/decal/cleanable/dirt, @@ -11542,15 +11339,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, /area/station/cargo/miningdock) -"coM" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/purple/filled/corner{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "coN" = ( /turf/open/indestructible/dark, /area/ruin/powered/clownplanet) @@ -13061,12 +12849,6 @@ /obj/effect/turf_decal/box/red/corners, /turf/open/floor/engine, /area/station/science/cytology) -"cPl" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/glass/reinforced, -/area/station/ai_monitored/turret_protected/aisat/hallway) "cPu" = ( /obj/effect/spawner/random{ loot = list(/obj/effect/decal/cleanable/oil/slippery=10,/obj/effect/decal/cleanable/oil=90); @@ -13141,16 +12923,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/station/science/lower) -"cQk" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/department/security) "cQD" = ( /obj/structure/table/reinforced, /obj/structure/reagent_dispensers/servingdish, @@ -13604,16 +13376,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) -"cYl" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ - dir = 8 - }, -/obj/structure/railing/corner, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/center) "cYA" = ( /obj/docking_port/stationary{ dheight = 4; @@ -13875,10 +13637,12 @@ }, /turf/open/floor/iron, /area/station/maintenance/tram/mid) -"ddh" = ( -/obj/structure/railing/corner, -/turf/open/floor/glass, -/area/station/commons/fitness/recreation) +"dcv" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/openspace, +/area/station/security/brig) "ddz" = ( /obj/machinery/modular_computer/console/preset/cargochat/service{ dir = 1 @@ -14720,12 +14484,6 @@ /turf/open/floor/iron/dark, /area/station/security/interrogation) "drw" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing{ - dir = 1 - }, /obj/effect/turf_decal/siding/thinplating{ dir = 1 }, @@ -15073,7 +14831,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/green/filled/line, -/obj/structure/railing/corner, /obj/effect/turf_decal/trimline/yellow/corner, /turf/open/floor/iron/dark, /area/station/service/hydroponics) @@ -16289,6 +16046,14 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/checkpoint/engineering) +"dSR" = ( +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/obj/structure/railing, +/turf/open/openspace, +/area/station/security/brig) "dSZ" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -16512,19 +16277,11 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/airless, /area/station/maintenance/starboard/lesser) -"dXc" = ( -/obj/structure/lattice, -/obj/structure/railing, -/turf/open/openspace, -/area/station/asteroid) "dXm" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 9 }, /obj/machinery/vending/cigarette, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 8 }, @@ -16533,6 +16290,9 @@ c_tag = "Civilian - Dormitories East Stairwell" }, /obj/structure/sign/flag/terragov/directional/north, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/iron, /area/station/commons/dorms) "dXo" = ( @@ -16668,7 +16428,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/ladder, -/obj/structure/railing, +/obj/structure/railing{ + dir = 9; + layer = 3.1 + }, /turf/open/openspace, /area/station/maintenance/department/cargo) "dZX" = ( @@ -17369,9 +17132,6 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/department/crew_quarters/dorms) "ekX" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/effect/turf_decal/siding/wideplating/dark{ dir = 4 }, @@ -17863,24 +17623,6 @@ }, /turf/open/space/openspace, /area/station/solars/port) -"esY" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "etf" = ( /obj/machinery/ntnet_relay, /obj/structure/sign/warning/no_smoking{ @@ -18305,17 +18047,6 @@ }, /turf/open/floor/iron/white, /area/station/science/lobby) -"ezS" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/central/greater) "ezV" = ( /obj/machinery/duct, /obj/effect/turf_decal/trimline/neutral/filled/line, @@ -18327,6 +18058,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"ezW" = ( +/obj/effect/spawner/random{ + loot = list(/obj/effect/decal/cleanable/oil/slippery=10,/obj/effect/decal/cleanable/oil=90); + name = "funny slipper :)" + }, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/center) "eAe" = ( /turf/open/floor/iron/stairs/right{ dir = 1 @@ -18440,16 +18178,6 @@ /obj/effect/landmark/start/prisoner, /turf/open/floor/iron, /area/station/security/prison/safe) -"eBC" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/department/security) "eBF" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 1 @@ -18789,9 +18517,6 @@ dir = 9 }, /obj/structure/industrial_lift/public, -/obj/structure/railing{ - dir = 9 - }, /obj/machinery/elevator_control_panel/directional/west{ linked_elevator_id = "tram_sci_lift"; preset_destination_names = list("2"="Lower Deck","3"="Upper Deck") @@ -18859,7 +18584,6 @@ /turf/open/lava, /area/station/security/execution/education) "eLB" = ( -/obj/structure/railing/corner, /obj/effect/turf_decal/trimline/red/filled/corner, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, @@ -19135,12 +18859,10 @@ /turf/open/floor/plating, /area/station/maintenance/central/greater) "eQR" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, +/obj/structure/railing, /turf/open/floor/iron/smooth, /area/station/command/gateway) "eQZ" = ( @@ -19554,7 +19276,6 @@ /area/station/engineering/atmos/pumproom) "eXL" = ( /obj/effect/turf_decal/siding/thinplating/corner, -/obj/structure/railing/corner, /obj/effect/turf_decal/trimline/red/corner, /turf/open/floor/iron, /area/station/security/checkpoint/supply) @@ -19727,6 +19448,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/maintenance/department/crew_quarters/dorms) +"faA" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/obj/structure/railing, +/turf/open/floor/plating, +/area/station/maintenance/central/greater) "faH" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -20072,12 +19805,6 @@ }, /turf/open/floor/plastic, /area/station/engineering/break_room) -"fho" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/glass/reinforced, -/area/station/ai_monitored/turret_protected/aisat/hallway) "fhv" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 6 @@ -20159,6 +19886,14 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/commons/dorms) +"fia" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/openspace, +/area/station/asteroid) "fid" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/lattice/catwalk, @@ -20267,15 +20002,16 @@ /turf/open/floor/iron, /area/station/maintenance/tram/left) "fjA" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron/white, /area/station/science/xenobiology) "fjN" = ( @@ -20938,10 +20674,13 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing, /obj/structure/railing{ dir = 1 }, +/obj/structure/railing{ + dir = 10; + layer = 3.1 + }, /turf/open/openspace, /area/station/maintenance/department/security) "ftQ" = ( @@ -21793,13 +21532,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -"fIC" = ( -/obj/machinery/light/directional/west, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/openspace, -/area/station/asteroid) "fIH" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -23030,7 +22762,6 @@ dir = 9 }, /obj/effect/turf_decal/trimline/dark_blue/corner, -/obj/structure/railing/corner, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) "ghZ" = ( @@ -23377,12 +23108,6 @@ }, /turf/open/space/openspace, /area/station/solars/port) -"gnq" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/carpet/neon/simple/yellow, -/area/ruin/powered/clownplanet) "gnr" = ( /obj/structure/table, /obj/item/storage/box/bodybags{ @@ -23496,6 +23221,9 @@ /obj/structure/railing{ dir = 6 }, +/obj/structure/railing{ + dir = 4 + }, /turf/open/openspace/airless, /area/station/asteroid) "gpH" = ( @@ -23618,9 +23346,6 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/department/crew_quarters/dorms) "gsO" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 8 }, @@ -23642,7 +23367,6 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "gtr" = ( -/obj/structure/railing/corner, /obj/effect/turf_decal/siding/thinplating/corner, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 4 @@ -23718,7 +23442,6 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "gun" = ( -/obj/structure/railing/corner, /obj/effect/turf_decal/trimline/purple/filled/corner, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 4 @@ -24079,10 +23802,6 @@ /turf/open/floor/iron, /area/station/hallway/secondary/exit) "gAO" = ( -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/siding/thinplating{ dir = 1 }, @@ -24156,9 +23875,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 4 }, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -24770,13 +24486,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/prison) -"gMh" = ( -/obj/structure/railing/corner, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/department/cargo) "gMi" = ( /obj/machinery/air_sensor/air_tank, /turf/open/floor/engine/air, @@ -25282,9 +24991,7 @@ dir = 10 }, /obj/structure/industrial_lift/public, -/obj/structure/railing{ - dir = 10 - }, +/obj/structure/railing, /turf/open/floor/plating/elevatorshaft, /area/station/security/execution/transfer) "gTw" = ( @@ -25824,6 +25531,17 @@ /area/station/commons/fitness/recreation) "heE" = ( /obj/structure/ladder, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, /turf/open/floor/glass/reinforced, /area/station/command/bridge) "heI" = ( @@ -25904,9 +25622,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -26143,15 +25858,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -"hjM" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/purple/filled/corner{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "hjN" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -26355,6 +26061,12 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating, /area/station/maintenance/central/lesser) +"hoi" = ( +/obj/structure/cable, +/obj/structure/lattice/catwalk, +/obj/structure/railing, +/turf/open/openspace, +/area/station/asteroid) "hou" = ( /obj/machinery/duct, /obj/structure/cable, @@ -26462,6 +26174,20 @@ /obj/effect/turf_decal/sand, /turf/open/floor/iron/smooth, /area/station/maintenance/department/security) +"hpJ" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/central/greater) "hqb" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 5 @@ -26695,7 +26421,8 @@ dir = 4 }, /obj/structure/railing{ - dir = 10 + dir = 9; + layer = 3.1 }, /turf/open/floor/plating, /area/station/maintenance/department/cargo) @@ -26861,6 +26588,11 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor, /area/station/maintenance/central/lesser) +"hyB" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing, +/turf/open/openspace, +/area/station/asteroid) "hyE" = ( /obj/structure/table/glass, /obj/item/book/manual/wiki/security_space_law{ @@ -27052,10 +26784,6 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor, /area/station/maintenance/starboard/greater) @@ -27401,12 +27129,6 @@ }, /turf/open/floor/carpet, /area/station/command/heads_quarters/hos) -"hGI" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/glass, -/area/station/commons/fitness/recreation) "hGK" = ( /obj/effect/turf_decal/trimline/yellow/arrow_cw, /obj/structure/cable/layer1, @@ -27415,12 +27137,6 @@ }, /turf/open/floor/iron, /area/station/engineering/main) -"hGM" = ( -/obj/structure/railing{ - dir = 5 - }, -/turf/open/openspace, -/area/station/asteroid) "hHf" = ( /obj/structure/closet/bombcloset/security, /turf/open/floor/iron/showroomfloor, @@ -28182,6 +27898,7 @@ }, /obj/structure/flora/bush/flowers_yw/style_random, /obj/structure/flora/bush/grassy/style_random, +/obj/structure/railing, /turf/open/floor/grass, /area/station/commons/dorms) "hVb" = ( @@ -28238,10 +27955,6 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/event_spawn, /turf/open/floor/iron/stairs/old{ @@ -28279,9 +27992,6 @@ /turf/open/floor/iron, /area/station/hallway/primary/tram/center) "hWL" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 9 }, @@ -28289,6 +27999,10 @@ /obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 8 }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron, /area/station/security/brig) "hWZ" = ( @@ -28409,9 +28123,6 @@ /turf/open/misc/asteroid, /area/station/maintenance/department/security) "hYN" = ( -/obj/structure/railing{ - dir = 1 - }, /obj/effect/turf_decal/siding/thinplating/corner, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -28460,9 +28171,6 @@ /turf/open/floor/iron, /area/station/tcommsat/computer) "hZP" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 8 }, @@ -28641,9 +28349,6 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "idk" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/cigbutt, /turf/open/floor/iron/smooth, @@ -28712,10 +28417,10 @@ }, /area/station/science/robotics/mechbay) "idW" = ( -/obj/structure/railing/corner, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, +/obj/structure/railing, /turf/open/floor/iron/smooth, /area/station/command/gateway) "idZ" = ( @@ -29128,12 +28833,6 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor, /area/station/maintenance/department/security) @@ -29280,6 +28979,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"ioh" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/openspace, +/area/station/security/brig) "ioi" = ( /turf/open/floor/plating/airless, /area/station/science/ordnance/bomb) @@ -29465,7 +29173,6 @@ /turf/open/floor/glass/reinforced, /area/station/science/genetics) "ird" = ( -/obj/structure/railing/corner, /obj/effect/turf_decal/siding/thinplating{ dir = 9 }, @@ -30093,8 +29800,8 @@ /area/station/maintenance/department/cargo) "iAt" = ( /obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 4 +/obj/structure/railing{ + dir = 1 }, /turf/open/openspace/airless, /area/station/asteroid) @@ -30176,9 +29883,6 @@ /turf/open/floor/iron/freezer, /area/station/commons/toilet) "iCu" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 }, @@ -30189,6 +29893,10 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron, /area/station/security/brig) "iCA" = ( @@ -31214,6 +30922,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/medical/morgue) +"iUg" = ( +/obj/effect/turf_decal/siding/thinplating{ + dir = 8 + }, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/structure/railing, +/turf/open/floor/grass, +/area/station/hallway/secondary/construction/engineering) "iUh" = ( /turf/closed/wall, /area/station/security/warden) @@ -31299,14 +31019,6 @@ /obj/item/reagent_containers/cup/bucket, /turf/open/floor/iron, /area/station/service/janitor) -"iVe" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/cigbutt, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/iron/smooth, -/area/station/maintenance/department/security) "iVj" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -31441,16 +31153,6 @@ }, /turf/open/floor/iron/smooth, /area/station/maintenance/central/greater) -"iXv" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/department/security) "iXw" = ( /obj/structure/table/glass, /obj/item/storage/medkit/regular{ @@ -31805,7 +31507,6 @@ /turf/open/floor/iron, /area/station/security/prison/safe) "jdF" = ( -/obj/structure/railing, /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -32013,10 +31714,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"jgq" = ( -/obj/structure/railing/corner, -/turf/open/floor/glass/reinforced, -/area/station/ai_monitored/turret_protected/aisat/hallway) "jgs" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -32056,10 +31753,6 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 - }, /turf/open/openspace, /area/station/maintenance/department/security) "jhd" = ( @@ -32424,6 +32117,7 @@ /obj/effect/turf_decal/trimline/dark_blue/arrow_ccw, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/landmark/navigate_destination/hop, +/obj/structure/railing, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) "jne" = ( @@ -32613,7 +32307,6 @@ dir = 6 }, /obj/structure/industrial_lift/public, -/obj/structure/railing, /turf/open/floor/plating/elevatorshaft, /area/station/science/lower) "jpV" = ( @@ -32950,6 +32643,16 @@ /obj/effect/turf_decal/trimline/neutral/filled/corner, /turf/open/floor/iron, /area/station/hallway/secondary/command) +"juA" = ( +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/openspace, +/area/station/security/brig) "juN" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -33256,30 +32959,13 @@ /turf/open/floor/iron, /area/station/security/prison) "jAH" = ( -/obj/structure/railing{ - dir = 10 - }, +/obj/structure/railing, /obj/effect/turf_decal/trimline/dark_red/warning{ dir = 10 }, /obj/structure/industrial_lift/public, /turf/open/floor/plating/elevatorshaft, /area/station/hallway/secondary/service) -"jAK" = ( -/obj/effect/turf_decal/siding/thinplating{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/commons/dorms) "jAL" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/structure/disposalpipe/segment{ @@ -33452,9 +33138,6 @@ /turf/open/floor/iron/grimy, /area/station/service/chapel/office) "jDQ" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/structure/cable, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -33526,13 +33209,6 @@ }, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain) -"jFc" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/smooth, -/area/station/maintenance/department/security) "jFh" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -33609,13 +33285,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"jGl" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "jGx" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 @@ -33879,9 +33548,6 @@ /obj/effect/turf_decal/trimline/dark_blue/corner{ dir = 4 }, -/obj/structure/railing/corner{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) "jLf" = ( @@ -34257,12 +33923,6 @@ /obj/effect/turf_decal/trimline/dark_blue/corner{ dir = 8 }, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) "jSe" = ( @@ -34309,6 +33969,12 @@ /obj/item/pipe_dispenser, /turf/open/floor/iron, /area/station/construction/mining/aux_base) +"jSY" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/openspace, +/area/station/security/brig) "jSZ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet, @@ -35697,9 +35363,6 @@ /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -35860,9 +35523,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 5 }, -/obj/structure/railing{ - dir = 1 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/construction/engineering) @@ -36734,6 +36394,13 @@ }, /turf/open/floor/catwalk_floor, /area/station/command/gateway) +"kIp" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/openspace, +/area/station/security/brig) "kIE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/white/line{ @@ -37553,6 +37220,9 @@ "kTO" = ( /obj/structure/cable, /obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 1 + }, /turf/open/openspace, /area/station/asteroid) "kTT" = ( @@ -37611,15 +37281,6 @@ "kUo" = ( /turf/open/floor/iron/dark, /area/station/service/chapel) -"kUF" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "kUN" = ( /obj/machinery/door/airlock/external{ autoclose = 0; @@ -37784,16 +37445,6 @@ "kXk" = ( /obj/structure/lattice/catwalk, /obj/item/stack/cable_coil, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/structure/cable, /turf/open/space/openspace, /area/station/solars/port) @@ -39602,9 +39253,6 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "lAR" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 4 }, @@ -39777,6 +39425,13 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"lES" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/railing, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/department/cargo) "lEU" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 4 @@ -40041,17 +39696,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/maintenance/department/medical) -"lKC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/central/lesser) "lKI" = ( /obj/structure/chair/stool/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/violet/visible, @@ -40186,14 +39830,6 @@ /obj/structure/cable/layer1, /turf/open/floor/plating/airless, /area/station/solars/port) -"lMU" = ( -/obj/machinery/light/directional/east, -/obj/structure/lattice, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/openspace, -/area/station/asteroid) "lMZ" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 8 @@ -41180,17 +40816,6 @@ /obj/machinery/vending/boozeomat, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) -"mcn" = ( -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/department/medical) "mcD" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -41962,12 +41587,6 @@ "mos" = ( /turf/closed/wall, /area/station/tcommsat/server) -"mou" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/open/openspace, -/area/station/asteroid) "moz" = ( /turf/open/floor/iron, /area/station/science/robotics/mechbay) @@ -42730,9 +42349,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/green/filled/line, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/trimline/yellow/corner{ dir = 8 }, @@ -42941,15 +42557,15 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "mFY" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 6 }, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/iron/white, /area/station/science/xenobiology) "mGl" = ( @@ -43738,6 +43354,10 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/plating, /area/station/maintenance/central/greater) "mUd" = ( @@ -43791,6 +43411,13 @@ dir = 1 }, /area/station/science/robotics/lab) +"mUY" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/openspace, +/area/station/asteroid) "mVd" = ( /obj/machinery/door/airlock/atmos{ name = "The Pipe Cave" @@ -44085,7 +43712,6 @@ /turf/open/floor/iron/grimy, /area/station/service/library/lounge) "nbh" = ( -/obj/structure/railing/corner, /obj/effect/turf_decal/trimline/blue/filled/corner, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -44207,9 +43833,6 @@ /obj/structure/railing{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 8 - }, /turf/open/space/openspace, /area/station/solars/starboard/fore) "ncE" = ( @@ -44307,35 +43930,13 @@ "ney" = ( /turf/open/floor/circuit/telecomms/mainframe, /area/station/tcommsat/server) -"neB" = ( -/obj/structure/cable/multilayer/multiz, -/obj/effect/turf_decal/stripes/box, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/solars/starboard/fore) "neC" = ( -/obj/structure/railing{ - dir = 1 - }, /obj/effect/turf_decal/siding/thinplating, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /turf/open/floor/glass/reinforced, /area/station/security/brig) -"neD" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 8 - }, -/turf/open/floor/iron/smooth, -/area/station/maintenance/department/security) "neE" = ( /obj/structure/table/optable, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -44984,12 +44585,6 @@ /obj/machinery/vending/wardrobe/chem_wardrobe, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"noO" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/open/openspace, -/area/station/asteroid) "noW" = ( /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/machinery/door/airlock/maintenance_hatch{ @@ -45573,9 +45168,6 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -46078,13 +45670,6 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/station/engineering/atmos) -"nFM" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/smooth, -/area/station/maintenance/department/medical) "nFZ" = ( /obj/machinery/airalarm/directional/east, /obj/machinery/camera/directional/east{ @@ -46752,6 +46337,16 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"nRS" = ( +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/openspace, +/area/station/security/brig) "nRT" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -47085,13 +46680,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/service/bar/backroom) -"nYa" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/iron/smooth, -/area/station/maintenance/department/security) "nYr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -47209,9 +46797,6 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "oai" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, @@ -47413,21 +46998,9 @@ "odl" = ( /obj/structure/lattice/catwalk, /obj/machinery/light/small/directional/east, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, /turf/open/space/openspace, /area/station/solars/starboard/fore) "odr" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -47483,6 +47056,13 @@ }, /turf/open/floor/iron/smooth, /area/station/hallway/primary/tram/center) +"oev" = ( +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/turf/open/openspace, +/area/station/maintenance/department/security) "oeN" = ( /obj/effect/decal/cleanable/dirt, /obj/item/weldingtool/empty{ @@ -47510,7 +47090,6 @@ /area/station/hallway/secondary/entry) "oft" = ( /obj/item/assembly/mousetrap/armed, -/obj/structure/railing, /obj/effect/turf_decal/siding/wideplating/dark, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, @@ -47765,12 +47344,6 @@ "ojP" = ( /obj/structure/cable/multilayer/multiz, /obj/effect/turf_decal/stripes/box, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/solars/port) @@ -47986,9 +47559,7 @@ dir = 5 }, /obj/structure/industrial_lift/public, -/obj/structure/railing{ - dir = 5 - }, +/obj/structure/railing, /turf/open/floor/plating/elevatorshaft, /area/station/commons/dorms) "onc" = ( @@ -48075,15 +47646,6 @@ "ooB" = ( /turf/closed/wall/r_wall, /area/station/engineering) -"opb" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/space/openspace, -/area/station/solars/port) "opn" = ( /obj/structure/closet/crate/science, /obj/effect/spawner/random/mod/maint, @@ -48151,6 +47713,7 @@ }, /obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/flora/bush/grassy/style_random, +/obj/structure/railing, /turf/open/floor/grass, /area/station/commons/dorms) "ora" = ( @@ -48383,12 +47946,6 @@ /obj/structure/closet/wardrobe/mixed, /turf/open/floor/plating, /area/station/maintenance/department/security) -"ovC" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/glass/reinforced, -/area/station/science/research) "ovL" = ( /turf/open/floor/iron, /area/station/hallway/secondary/service) @@ -48482,9 +48039,6 @@ /obj/effect/turf_decal/trimline/dark_blue/arrow_ccw{ dir = 1 }, -/obj/structure/railing{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, @@ -48826,9 +48380,6 @@ dir = 5 }, /obj/structure/industrial_lift/public, -/obj/structure/railing{ - dir = 1 - }, /turf/open/floor/plating/elevatorshaft, /area/station/science/lower) "oCR" = ( @@ -48912,14 +48463,6 @@ icon_state = "clown_carpet" }, /area/station/security/execution/education) -"oEf" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/engineering/atmos) "oEz" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/yellow/arrow_cw{ @@ -49308,15 +48851,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) -"oMU" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating{ - dir = 10 - }, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "oMX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -49692,7 +49226,10 @@ /area/station/cargo/sorting) "oTa" = ( /obj/structure/railing{ - dir = 9 + dir = 1 + }, +/obj/structure/railing{ + dir = 8 }, /turf/open/floor/glass/reinforced, /area/station/ai_monitored/turret_protected/aisat/hallway) @@ -49759,9 +49296,6 @@ /turf/open/floor/plating, /area/station/hallway/secondary/entry) "oTJ" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/effect/turf_decal/siding/thinplating{ dir = 8 }, @@ -50268,9 +49802,6 @@ /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 4 }, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/blue, @@ -50441,12 +49972,13 @@ /turf/open/floor/carpet, /area/station/command/heads_quarters/captain) "phs" = ( -/obj/structure/railing{ - dir = 10 - }, +/obj/structure/railing, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/catwalk_floor, /area/station/maintenance/department/cargo) "phB" = ( @@ -51375,9 +50907,7 @@ /turf/open/floor/plating, /area/station/maintenance/tram/mid) "pwm" = ( -/obj/structure/railing{ - dir = 10 - }, +/obj/structure/railing, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor, /area/station/command/gateway) @@ -51791,15 +51321,6 @@ /obj/structure/reagent_dispensers/wall/peppertank/directional/north, /turf/open/floor/iron, /area/station/security/checkpoint/escape) -"pBZ" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "pCa" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/wooden{ @@ -51830,6 +51351,14 @@ "pCm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/moisture_trap, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/plating, /area/station/maintenance/department/security) "pCr" = ( @@ -52007,10 +51536,8 @@ /turf/open/space/openspace, /area/space) "pEM" = ( -/obj/structure/railing{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing, /turf/open/floor/catwalk_floor, /area/station/command/gateway) "pEZ" = ( @@ -52217,6 +51744,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) +"pHq" = ( +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/turf/open/openspace, +/area/station/security/brig) "pHs" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/window/reinforced/spawner/directional/north, @@ -52308,20 +51842,6 @@ /obj/structure/cable, /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/ai) -"pIS" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/space/openspace, -/area/station/solars/port) "pIT" = ( /obj/effect/turf_decal/trimline/purple/filled/corner, /turf/open/floor/iron, @@ -52694,12 +52214,16 @@ /turf/open/floor/iron, /area/station/maintenance/tram/right) "pOv" = ( -/obj/structure/railing{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/structure/railing{ + dir = 9; + layer = 3.1 + }, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/catwalk_floor, /area/station/maintenance/department/cargo) "pOA" = ( @@ -52803,12 +52327,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"pPC" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/glass, -/area/station/commons/fitness/recreation) "pPN" = ( /obj/structure/reagent_dispensers/watertank/high, /obj/structure/railing{ @@ -53091,9 +52609,6 @@ /turf/open/floor/iron/white, /area/station/medical/surgery/fore) "pVy" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/light/directional/west, /turf/open/floor/mineral/bananium, /area/ruin/powered/clownplanet) @@ -53271,7 +52786,6 @@ /area/station/security/prison/workout) "pZv" = ( /obj/machinery/light/directional/west, -/obj/structure/railing, /turf/open/openspace, /area/station/asteroid) "pZz" = ( @@ -53557,15 +53071,15 @@ /area/station/security/brig) "qea" = ( /obj/structure/ladder, -/obj/structure/railing{ - dir = 4 - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 }, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/iron/white, /area/station/science/xenobiology) "qec" = ( @@ -53582,7 +53096,6 @@ /turf/open/floor/engine, /area/station/science/ordnance/burnchamber) "qei" = ( -/obj/structure/railing/corner, /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/glass/reinforced, /area/station/science/genetics) @@ -53807,9 +53320,7 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "qir" = ( -/obj/structure/railing{ - dir = 5 - }, +/obj/structure/railing, /obj/effect/decal/cleanable/dirt, /obj/structure/chair/plastic, /turf/open/floor/iron/smooth, @@ -54039,7 +53550,11 @@ /obj/structure/cable/multilayer/multiz, /obj/effect/turf_decal/stripes/end, /obj/structure/railing{ - dir = 6 + dir = 4 + }, +/obj/structure/railing{ + dir = 9; + layer = 3.1 }, /turf/open/floor/plating, /area/station/maintenance/department/cargo) @@ -54342,6 +53857,9 @@ dir = 4 }, /obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 1 + }, /turf/open/openspace, /area/station/asteroid) "qrm" = ( @@ -55516,9 +55034,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 9 }, -/obj/structure/railing{ - dir = 1 - }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/construction/engineering) @@ -55589,12 +55104,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"qJh" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/glass/reinforced, -/area/station/ai_monitored/turret_protected/aisat/hallway) "qJy" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/machinery/light/directional/south, @@ -55637,17 +55146,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/brig) -"qKh" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "qKj" = ( /obj/effect/turf_decal/bot/left, /obj/effect/decal/cleanable/dirt, @@ -55829,9 +55327,6 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/department/cargo) "qNz" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, @@ -56012,6 +55507,14 @@ /obj/structure/ore_box, /turf/open/floor/iron/smooth, /area/station/maintenance/central/lesser) +"qQQ" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/turf/open/openspace, +/area/station/security/brig) "qQW" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/structure/sign/flag{ @@ -56105,7 +55608,10 @@ "qSG" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ - dir = 5 + dir = 1 + }, +/obj/structure/railing{ + dir = 4 }, /turf/open/openspace/airless, /area/station/asteroid) @@ -56681,6 +56187,15 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) +"rav" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/openspace, +/area/station/security/brig) "raP" = ( /obj/effect/turf_decal/trimline/purple/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -56949,9 +56464,7 @@ dir = 10 }, /obj/structure/industrial_lift/public, -/obj/structure/railing{ - dir = 10 - }, +/obj/structure/railing, /turf/open/floor/plating/elevatorshaft, /area/station/cargo/miningdock) "rfk" = ( @@ -57202,12 +56715,6 @@ /obj/effect/landmark/start/quartermaster, /turf/open/floor/carpet, /area/station/command/heads_quarters/qm) -"riN" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/open/openspace, -/area/station/asteroid) "riS" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -57307,15 +56814,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/medical/medbay/lobby) -"rkA" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/light/small/directional/west, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "rkI" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -57887,9 +57385,6 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/central) "ruA" = ( -/obj/structure/railing{ - dir = 1 - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -58165,15 +57660,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, /area/station/maintenance/radshelter/civil) -"rzX" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating{ - dir = 6 - }, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "rzZ" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 4 @@ -58541,14 +58027,15 @@ /obj/structure/railing{ dir = 4 }, -/obj/structure/railing{ - dir = 8 - }, /obj/structure/ladder, /obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/openspace, /area/station/maintenance/department/crew_quarters/dorms) "rHC" = ( @@ -58867,12 +58354,6 @@ /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "rMJ" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, /obj/machinery/light/floor/has_bulb, /obj/effect/landmark/event_spawn, /obj/machinery/door/firedoor/border_only{ @@ -59164,6 +58645,10 @@ }, /turf/open/floor/glass/reinforced, /area/station/science/genetics) +"rQF" = ( +/obj/structure/railing, +/turf/open/openspace, +/area/station/security/brig) "rQG" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 @@ -59179,9 +58664,6 @@ "rQR" = ( /obj/structure/lattice/catwalk, /obj/structure/railing, -/obj/structure/railing/corner{ - dir = 4 - }, /turf/open/space/openspace, /area/station/solars/starboard/fore) "rQT" = ( @@ -59323,6 +58805,9 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 1 }, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) "rSZ" = ( @@ -59490,6 +58975,15 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/iron/smooth, /area/station/maintenance/department/cargo) +"rXX" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/glass/reinforced, +/area/station/ai_monitored/turret_protected/aisat/hallway) "rYd" = ( /obj/structure/bodycontainer/morgue{ dir = 2 @@ -60739,21 +60233,6 @@ /obj/machinery/nanite_program_hub, /turf/open/floor/iron/white, /area/station/science/ordnance/office) -"stK" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner, -/obj/structure/cable, -/turf/open/space/openspace, -/area/station/solars/port) "stL" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -61601,6 +61080,18 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/service/janitor) +"sHp" = ( +/obj/effect/turf_decal/siding/thinplating{ + dir = 4 + }, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/structure/railing, +/turf/open/floor/grass, +/area/station/hallway/secondary/construction/engineering) "sHu" = ( /obj/machinery/firealarm/directional/west, /turf/open/floor/iron, @@ -61898,15 +61389,6 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/iron, /area/station/security/office) -"sLi" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/obj/structure/railing/corner, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "sLv" = ( /obj/machinery/light/directional/north, /obj/machinery/camera{ @@ -61983,9 +61465,6 @@ /turf/open/floor/iron, /area/station/commons/dorms) "sNb" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/turf_decal/trimline/red/filled/line, /obj/effect/turf_decal/trimline/red/corner{ dir = 4 @@ -62060,21 +61539,6 @@ }, /turf/open/floor/iron, /area/station/cargo/miningdock) -"sOg" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/space/openspace, -/area/station/solars/port) "sOq" = ( /obj/machinery/vending/wardrobe/sec_wardrobe, /obj/machinery/status_display/ai/directional/west, @@ -62979,10 +62443,6 @@ }, /turf/open/floor/iron, /area/station/science/lab) -"tdu" = ( -/obj/structure/railing, -/turf/open/openspace, -/area/station/asteroid) "tdx" = ( /turf/closed/wall, /area/station/maintenance/port/aft) @@ -63136,7 +62596,6 @@ /turf/open/floor/iron, /area/station/security/office) "tfp" = ( -/obj/structure/railing, /obj/effect/turf_decal/siding/thinplating{ dir = 1 }, @@ -63190,9 +62649,6 @@ dir = 10 }, /obj/structure/industrial_lift/public, -/obj/structure/railing{ - dir = 10 - }, /obj/effect/landmark/lift_id{ specific_lift_id = "tram_sci_lift" }, @@ -63582,12 +63038,6 @@ }, /turf/open/floor/iron/smooth, /area/station/hallway/primary/tram/center) -"tlH" = ( -/obj/structure/railing{ - dir = 10 - }, -/turf/open/openspace, -/area/station/asteroid) "tlO" = ( /obj/structure/industrial_lift/public, /obj/effect/turf_decal/caution/stand_clear/red, @@ -63706,15 +63156,6 @@ }, /turf/open/floor/iron, /area/station/construction/mining/aux_base) -"tnX" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/department/cargo) "tod" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -64694,16 +64135,6 @@ /obj/structure/fluff/tram_rail, /turf/open/openspace, /area/station/hallway/primary/tram/center) -"tCw" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "tCT" = ( /turf/open/floor/plating, /area/station/hallway/secondary/entry) @@ -65617,9 +65048,6 @@ /turf/open/floor/iron, /area/station/hallway/primary/tram/right) "tTJ" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/effect/turf_decal/siding/thinplating{ dir = 4 }, @@ -65793,23 +65221,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"tWo" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "tWw" = ( -/obj/structure/railing/corner, /obj/effect/turf_decal/siding/thinplating/corner, /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -66281,19 +65693,6 @@ /obj/effect/turf_decal/trimline/blue/filled/corner, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"ueM" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/starboard/lesser) "ueZ" = ( /obj/machinery/atmospherics/miner/carbon_dioxide, /turf/open/floor/engine/co2, @@ -66944,21 +66343,6 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/airless, /area/station/asteroid) -"upS" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "upX" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -66995,13 +66379,15 @@ dir = 5 }, /obj/effect/spawner/random/vending/colavend, -/obj/structure/railing/corner, /obj/effect/turf_decal/siding/thinplating/corner, /obj/item/radio/intercom/directional/east, /obj/machinery/camera/directional/east{ c_tag = "Civilian - Dormitories West Stairwell" }, /obj/structure/sign/flag/nanotrasen/directional/north, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/iron, /area/station/commons/dorms) "uqo" = ( @@ -67325,12 +66711,6 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"uvB" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/glass/reinforced, -/area/station/science/research) "uvD" = ( /obj/effect/decal/cleanable/dirt, /obj/item/soap, @@ -67615,13 +66995,6 @@ /obj/effect/turf_decal/trimline/white/warning, /turf/open/floor/iron, /area/station/maintenance/tram/left) -"uAc" = ( -/obj/structure/lattice, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/openspace, -/area/station/asteroid) "uAn" = ( /obj/effect/landmark/start/depsec/supply, /obj/structure/chair/office{ @@ -67736,7 +67109,10 @@ /area/station/maintenance/disposal/incinerator) "uCh" = ( /obj/structure/railing{ - dir = 5 + dir = 4 + }, +/obj/structure/railing{ + dir = 1 }, /turf/open/floor/glass/reinforced, /area/station/ai_monitored/turret_protected/aisat/hallway) @@ -68153,10 +67529,6 @@ "uHW" = ( /obj/structure/ladder, /obj/effect/turf_decal/stripes/box, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/solars/port) @@ -68679,17 +68051,6 @@ /obj/structure/reagent_dispensers/beerkeg, /turf/open/floor/iron/smooth, /area/station/maintenance/department/cargo) -"uPh" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/iron/smooth, -/area/station/maintenance/department/security) "uPi" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -68759,9 +68120,7 @@ /area/station/hallway/secondary/exit/departure_lounge) "uQP" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 5 - }, +/obj/structure/railing, /obj/effect/turf_decal/siding/wideplating/dark{ dir = 5 }, @@ -68817,12 +68176,6 @@ /obj/structure/lattice/catwalk, /obj/machinery/light/small/directional/east, /obj/structure/cable, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, /turf/open/space/openspace, /area/station/solars/port) "uSL" = ( @@ -69164,17 +68517,6 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/freezer, /area/station/security/prison) -"uXM" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/space/openspace, -/area/station/solars/port) "uXV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/yellow/warning{ @@ -69698,9 +69040,6 @@ /turf/open/floor/iron/dark/textured, /area/station/engineering/main) "vgl" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 }, @@ -69713,6 +69052,10 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron, /area/station/security/brig) "vgm" = ( @@ -69791,6 +69134,7 @@ }, /obj/effect/turf_decal/delivery/white, /obj/effect/mapping_helpers/trapdoor_placer, +/obj/structure/railing, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) "vhU" = ( @@ -70653,9 +69997,6 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/lesser) "vsg" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/effect/turf_decal/siding/wideplating/dark{ dir = 4 }, @@ -70917,11 +70258,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit) -"vwN" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "vwT" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -71093,16 +70429,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/tcommsat/computer) -"vAj" = ( -/obj/structure/ladder, -/obj/effect/turf_decal/stripes/box, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/solars/starboard/fore) "vAm" = ( /obj/machinery/computer/bank_machine{ dir = 1 @@ -71365,6 +70691,9 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) "vCt" = ( @@ -71714,21 +71043,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/smooth, /area/station/maintenance/disposal/incinerator) -"vHO" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/commons/dorms) "vIa" = ( /obj/machinery/button/door/directional/west{ id = "Engineering3"; @@ -72337,10 +71651,6 @@ /turf/open/floor/circuit/telecomms/server, /area/station/science/server) "vSh" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner, /obj/machinery/disposal/bin, /obj/effect/turf_decal/siding/thinplating/corner, /obj/effect/turf_decal/siding/thinplating/corner{ @@ -72590,6 +71900,9 @@ /obj/structure/railing{ dir = 6 }, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/glass/reinforced, /area/station/ai_monitored/turret_protected/aisat/hallway) "vWx" = ( @@ -73260,15 +72573,6 @@ }, /turf/open/floor/glass/reinforced, /area/station/science/research) -"whS" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "whW" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -73739,12 +73043,6 @@ "wqC" = ( /obj/structure/lattice/catwalk, /obj/structure/railing, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/structure/cable, /obj/machinery/light/floor/has_bulb, /turf/open/openspace, @@ -73996,9 +73294,6 @@ /turf/open/floor/iron, /area/station/command/heads_quarters/qm) "wuE" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /turf/open/floor/glass, /area/station/commons/fitness/recreation) "wuF" = ( @@ -74445,9 +73740,6 @@ /turf/open/floor/plating, /area/station/maintenance/tram/mid) "wAs" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 8 }, @@ -74718,10 +74010,6 @@ /obj/structure/railing{ dir = 1 }, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/machinery/light/floor/has_bulb, /turf/open/openspace, /area/station/solars/port) @@ -74864,9 +74152,6 @@ /obj/effect/turf_decal/siding/thinplating/corner{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -75707,12 +74992,6 @@ }, /turf/open/floor/iron, /area/station/security/prison) -"wWT" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/glass/reinforced, -/area/station/science/research) "wXi" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 10 @@ -76175,9 +75454,6 @@ /turf/open/floor/iron, /area/station/commons/fitness) "xhN" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/engineering/canister, /turf/open/floor/iron/smooth, @@ -76204,14 +75480,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/maintenance/port/central) -"xis" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/turf/open/openspace, -/area/station/asteroid) "xiA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -76677,13 +75945,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/interrogation) -"xrt" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 4 - }, -/turf/open/floor/iron/smooth, -/area/station/maintenance/department/security) "xrD" = ( /obj/effect/landmark/navigate_destination/engineering, /obj/structure/table/wood/fancy/orange, @@ -76791,6 +76052,17 @@ }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) +"xtd" = ( +/obj/structure/lattice/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/openspace, +/area/station/asteroid) "xti" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 @@ -76931,9 +76203,6 @@ /turf/open/floor/iron/dark, /area/station/service/hydroponics) "xwa" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 }, @@ -77077,10 +76346,6 @@ }, /turf/open/floor/iron, /area/station/construction/mining/aux_base) -"xyt" = ( -/obj/structure/railing/corner, -/turf/open/floor/glass/reinforced, -/area/station/science/research) "xyu" = ( /obj/machinery/duct, /obj/effect/turf_decal/trimline/neutral/filled/line, @@ -77410,14 +76675,6 @@ "xDQ" = ( /turf/closed/wall, /area/station/security/processing) -"xDT" = ( -/obj/machinery/light/directional/west, -/obj/structure/lattice, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/openspace, -/area/station/asteroid) "xDW" = ( /obj/machinery/door/airlock/mining/glass{ name = "MULE Storage" @@ -77634,9 +76891,6 @@ /turf/open/floor/iron, /area/station/cargo/drone_bay) "xJt" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 4 }, @@ -77821,9 +77075,6 @@ /turf/open/floor/iron/freezer, /area/station/medical/coldroom) "xMV" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 8 }, @@ -78020,9 +77271,6 @@ /obj/effect/turf_decal/siding/thinplating/corner{ dir = 8 }, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/trimline/red/corner{ dir = 8 }, @@ -78039,12 +77287,6 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/commons/fitness/recreation/entertainment) "xPP" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 1 }, @@ -78277,12 +77519,13 @@ /obj/structure/railing{ dir = 4 }, -/obj/structure/railing{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/openspace, /area/station/maintenance/department/crew_quarters/dorms) "xUC" = ( @@ -78355,12 +77598,6 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/iron, /area/station/cargo/miningdock) -"xVN" = ( -/obj/structure/railing{ - dir = 9 - }, -/turf/open/openspace, -/area/station/asteroid) "xVQ" = ( /obj/structure/closet/lasertag/red, /obj/effect/turf_decal/tile/red/full, @@ -78799,9 +78036,6 @@ /turf/open/floor/iron, /area/station/engineering/main) "ycm" = ( -/obj/structure/railing{ - dir = 1 - }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 8 }, @@ -84599,7 +83833,7 @@ nPb nPb gcp jGN -gnq +tkp tkp tkp bSM @@ -97647,7 +96881,7 @@ apC qSs vYD vYD -jAK +nyV wbb xFx vAF @@ -98418,7 +97652,7 @@ apC qSs vYD vYD -jAK +nyV wbb xFx kzQ @@ -98675,7 +97909,7 @@ apC elr tzJ hVa -vHO +drw wbb xFx bPo @@ -104845,7 +104079,7 @@ kzD jIG wGs pCr -lKC +pCr oks cjq jnq @@ -106854,7 +106088,7 @@ avt hFr vsg ekX -ezS +oOj ekX ekX hFr @@ -107110,9 +106344,9 @@ hFr avt hFr mTS -mTS +faA hWh -mTS +hpJ mTS hFr hFr @@ -109715,7 +108949,7 @@ hxz jnq kbi kbi -kbi +sHp qIC nQo fhA @@ -110486,7 +109720,7 @@ wrD xHL oQW oQW -oQW +iUg ksP iJd qKx @@ -116176,7 +115410,7 @@ inb pHM oNq slb -oEf +hYn ixc slb bNz @@ -117718,7 +116952,7 @@ dkm dkm dww cjG -aeO +djX nPp gTl bKe @@ -118466,7 +117700,7 @@ ccC psP pgS shg -ueM +tey tey euP wQP @@ -124656,7 +123890,7 @@ asv jiQ wUg nED -hjM +aet tjP roQ qVr @@ -125684,7 +124918,7 @@ asv jiQ nLH gJY -coM +scO bgH mTR qVr @@ -161114,14 +160348,14 @@ mGQ yiM fpg heY -ddh +wuE mQp mQp mQp mQp mQp wuE -ddh +wuE mQp mQp mQp @@ -161588,7 +160822,7 @@ ird oTJ oTJ oTJ -oMU +qdY uCZ dSo lNZ @@ -161842,9 +161076,9 @@ awr awy eSM tfp -nca -nca -nca +nRS +aQT +dSR neC iUE rxE @@ -161885,20 +161119,20 @@ wDB qqi fpg gpH -pPC +wuE nqH nqH nqH nqH nqH -hGI -pPC +wuE +wuE nqH nqH nqH nqH nqH -hGI +wuE mzD oxE pUw @@ -162099,9 +161333,9 @@ awp dob cmH tfp +dcv nca -nca -nca +rQF neC jNw yji @@ -162356,9 +161590,9 @@ iUh iUh iEm tfp +dcv nca -nca -nca +rQF neC niZ yeG @@ -162613,9 +161847,9 @@ bjv awz rOh tfp +dcv nca -nca -nca +rQF neC eOh mwg @@ -162870,9 +162104,9 @@ wOU awz rOh tfp +dcv nca -nca -nca +rQF ycm qdY eOh @@ -163127,9 +162361,9 @@ kCm awz rOh tfp -nca -nca -nca +juA +pHq +qQQ ruA nyt phB @@ -163387,7 +162621,7 @@ gAO odr rMJ odr -pBZ +lSo lSo lSo azy @@ -163641,9 +162875,9 @@ kQy awz rOh tfp -nca -nca -nca +rav +jSY +brX ruA otz kTT @@ -163898,9 +163132,9 @@ nzz awz rOh tfp +dcv nca -nca -nca +rQF hYN hMA gvQ @@ -164155,9 +163389,9 @@ wsw awz rOh tfp +dcv nca -nca -nca +rQF neC gvQ gvQ @@ -164412,9 +163646,9 @@ iUh iUh dHn tfp +dcv nca -nca -nca +rQF neC iBO blo @@ -164669,9 +163903,9 @@ awu wOb nCy tfp +dcv nca -nca -nca +rQF neC uXt yji @@ -164748,7 +163982,7 @@ sLJ vBG mAG tMW -byH +tMW tMW tMW esT @@ -164926,9 +164160,9 @@ rLf dUj mjF tfp -nca -nca -nca +ioh +aIe +kIp neC fph sHw @@ -164969,14 +164203,14 @@ oDj qqi fpg jGi -ddh +wuE mQp mQp mQp mQp mQp wuE -ddh +wuE mQp mQp mQp @@ -165186,7 +164420,7 @@ bVN tTJ tTJ tTJ -rzX +hMA wEx dSo lNZ @@ -165262,7 +164496,7 @@ tCf bOF esT tMW -pIS +tMW tMW esT sdb @@ -165740,20 +164974,20 @@ lQv yiM qJf gyz -pPC +wuE nqH nqH nqH nqH nqH -hGI -pPC +wuE +wuE nqH nqH nqH nqH nqH -hGI +wuE uMk vGi ptO @@ -165776,7 +165010,7 @@ sLJ vBG tMW tMW -sOg +mAG mAG mAG esT @@ -167324,11 +166558,11 @@ qZq mnp iFN feN -bME +mAG vKe kXk oOJ -uXM +mAG jhd jhd tMW @@ -167585,14 +166819,14 @@ tMW jhd tMW jhd -opb +mAG oOJ oOJ -stK +mAG ixH -sOg +mAG oOJ -uXM +mAG jhd jhd tMW @@ -167781,19 +167015,19 @@ aaa abM abW abM -tdu +afy afA -afN -fIC +agf +pZv afy afP nJq afX afy pZv -afN -age -riN +fia +hyB +afy afg abS aaa @@ -167849,14 +167083,14 @@ tMW jhd tMW jhd -opb +mAG oOJ oOJ -aME +mAG oOJ -bok +mAG gnp -bWi +mAG mAG fnI jhd @@ -168038,19 +167272,19 @@ abW abW abW abS -tdu +afy afA -afN -riN +agf +afy afy afP nJq afX afy -tdu -afN -age -riN +afy +fia +hyB +afy acm abW aaa @@ -168295,19 +167529,19 @@ abS afg afg afy -tdu +afy afA -afN -riN +agf +afy afy afP nJq afX afy -tdu -afN -age -riN +afy +fia +hyB +afy abW afo aaa @@ -168552,19 +167786,19 @@ abW afg afg abS -tdu +afy afA -afN -riN +agf +afy afy afP nJq afX afy -tdu -afN -age -riN +afy +fia +hyB +afy afy afo aaa @@ -168809,19 +168043,19 @@ afo abS acm abS -tdu -aHf -afN -hGM +afy +xtd +agf +afy afy afP nJq afX afy -aHk -afN -age -riN +afy +fia +hyB +afy afy abS aaa @@ -169066,9 +168300,9 @@ afo abW abW abW -aHk -afB -afE +afy +xtd +age afJ afy afP @@ -169076,9 +168310,9 @@ nJq afX afy agb -xis +afN agf -hGM +afy afy abW aaa @@ -169324,7 +168558,7 @@ abS abW afv age -afC +aHf vFt afK afy @@ -169334,7 +168568,7 @@ afX afy agc yiM -agg +afN age age afv @@ -169558,8 +168792,8 @@ bfa omm vdh rxn -xrt -nYa +oeY +oeY omm abM abW @@ -169580,9 +168814,9 @@ abW afg acm afg -tlH -afD -afG +afy +xtd +age afM afy afP @@ -169590,9 +168824,9 @@ nJq afX afy agd -afG -agh -xVN +age +agf +afy afy abW aaa @@ -169816,7 +169050,7 @@ omm vdh omm pCm -uPh +hXQ omm aaa aaa @@ -169837,19 +169071,19 @@ abS abS abS afo -tdu -aHf -age -xVN +afy +xtd +hyB +afy afy afP nJq afX afy -tlH -age -afN -riN +afy +mUY +agf +afy abW abW aaa @@ -170072,8 +169306,8 @@ etQ omm vdh omm -neD -iVe +oeY +saa omm aaa aaa @@ -170094,19 +169328,19 @@ afg abW abS afo -tdu -aHf -age -riN +afy +xtd +hyB +afy afy afP nJq afX afy -tdu -age -afN -riN +afy +mUY +agf +afy afo abW abS @@ -170351,19 +169585,19 @@ abW acm acm afo -tdu -aHf -age -riN +afy +xtd +hyB +afy afy afP omp afX afy -tdu -age -afN -riN +afy +mUY +agf +afy abS acm acm @@ -170608,19 +169842,19 @@ abS acm acm abW -tdu -aHf -age -hGM +afy +xtd +hyB +afy afy afP omp afX afy -aHk -age -afN -riN +afy +mUY +agf +afy abW acm acm @@ -170865,9 +170099,9 @@ abS abW abW afg -aHk -afB -afE +afy +xtd +age afJ afy afP @@ -170875,9 +170109,9 @@ omp afX afy agb -afE +age agf -hGM +afy afg abW afg @@ -171123,7 +170357,7 @@ abW afv age age -afC +aHf izU afK afy @@ -171133,7 +170367,7 @@ afX afy agc qas -agg +afN age afv abW @@ -171379,9 +170613,9 @@ acm afg abW abW -tlH -afD -afG +afy +xtd +age afM afy afP @@ -171389,9 +170623,9 @@ omp afX afy agd -afG -agh -xVN +age +agf +afy abW abW acm @@ -171636,19 +170870,19 @@ abW abW abS abW -tdu -aHf -afN -xVN +afy +xtd +agf +afy afy afP omp afX afy -tlH -afN -afN -riN +afy +fia +agf +afy abW abS afo @@ -171868,8 +171102,8 @@ dtA dtA omm xhN -jFc -eBC +oeY +vdh omm xvC gFp @@ -171893,19 +171127,19 @@ abM abW afo abS -tdu +afy afA -afN -riN +agf +afy afy afP omp afX afy -tdu -afN -age -riN +afy +fia +hyB +afy abW abS aaa @@ -172124,9 +171358,9 @@ dtA nLi dtA omm -eLv -eLv -iXv +oev +aPn +vdh omm gPW oni @@ -172150,19 +171384,19 @@ abM abM abW abW -tdu +afy afA -afN -riN +agf +afy afy afP omp afX afy -tdu -afN -age -riN +afy +fia +hyB +afy abS acm aaa @@ -172383,7 +171617,7 @@ omm omm omm omm -cQk +vdh omm cIq gxy @@ -172407,19 +171641,19 @@ abM aaa abM abM -tdu +afy afA -afN -riN +agf +afy afy afP omp afX afy -tdu -afN -age -riN +afy +fia +hyB +afy abW abW aaa @@ -172664,19 +171898,19 @@ aaa aaa aaa abM -tdu +afy afA -afN -riN +agf +afy afy afP omp afX afy -tdu -afN -age -riN +afy +fia +hyB +afy abW afg aaa @@ -172907,7 +172141,7 @@ ehP ilo ehP ehP -cQk +vdh vdh bGU eLv @@ -172921,19 +172155,19 @@ aaa aaa aaa afv -dXc +afz afA -afN -lMU +agf +afO afy afP omp afX afy afO -afN -age -uAc +fia +hyB +afz afv aaa aaa @@ -175248,7 +174482,7 @@ wOC wce mpA xXL -cYl +xXL sjE sjE kkd @@ -180843,7 +180077,7 @@ avE aTY iCA fZL -rkA +bEA fZL fZL aTY @@ -181147,8 +180381,8 @@ lZW aaS aaS qqX -kTO -xDT +hoi +ayT afy afP omp @@ -181156,7 +180390,7 @@ afX afy ayT kTO -age +hyB whz vNN whz @@ -181357,7 +180591,7 @@ jhd jhd aTY iCA -cfp +fZL fZL aTY jhd @@ -181402,18 +180636,18 @@ vJs lZW aaS afy -tdu +afy afA -afN -riN +agf +pZv afy afP omp afX afy -tdu -afN -age +pZv +fia +hyB hOm vNN vNN @@ -181659,18 +180893,18 @@ lZW lZW abW afy -tdu +afy afA -afN -riN +agf +afy afy afP omp afX afy -tdu -afN -age +afy +fia +hyB hOm srC srC @@ -181871,8 +181105,8 @@ jhd aTY fZL fZL -tCw -kUF +fZL +iCA iCA iCA aTY @@ -181916,18 +181150,18 @@ abM aaa aaa afy -tdu +afy afA -afN -riN +agf +afy afy afP omp afX afy -tdu -afN -age +afy +fia +hyB whz whz whz @@ -182162,7 +181396,7 @@ mBh sVx kxh bSp -gMh +qHl jWO lZW aaa @@ -182173,19 +181407,19 @@ aaa aaa abW abS -tdu +afy afA -afN -riN +agf +afy afy afP omp afX afy -tdu -afN -age -riN +afy +fia +hyB +afy afy whz srC @@ -182386,7 +181620,7 @@ jhd jhd aTY fZL -cfp +fZL fZL aTY uRv @@ -182430,19 +181664,19 @@ aaa abW afo abS -tdu -aHf -afN -hGM +afy +xtd +agf +afy afy afP omp afX afy -aHk -afN -age -riN +afy +fia +hyB +afy afy whz srC @@ -182457,9 +181691,9 @@ whz whz iLn vNN -bRF +iLn vnJ -nFM +iLn srC srC cgy @@ -182687,9 +181921,9 @@ abW abW abS abW -aHk -afB -afE +afy +xtd +age afJ afy afP @@ -182697,10 +181931,10 @@ omp afX afy agb -xis +afN agf -hGM -noO +afy +afy whz whz vNN @@ -182900,8 +182134,8 @@ avE aTY iCA iCA -tCw -bKy +fZL +fZL fZL fZL aTY @@ -182945,17 +182179,17 @@ abS abW afv age -afC +aHf qas afK afy afP -omp +ezW afX afy agc izU -agg +afN age age afv @@ -183201,9 +182435,9 @@ afo afo afg afy -tlH -afD -afG +afy +xtd +age afM afy afP @@ -183211,10 +182445,10 @@ omp afX afy agd -afG -agh -xVN -mou +age +agf +afy +afy abW whz whz @@ -183415,7 +182649,7 @@ jhd jhd aTY iCA -upS +iCA fZL aTY jhd @@ -183444,8 +182678,8 @@ aaa aaa lZW sAO -gMh -sVA +qHl +qHl sVA pOv nAY @@ -183458,19 +182692,19 @@ afo afo afy afy -tdu -aHf -age -xVN +afy +xtd +hyB +afy afy afP omp afX afy -tlH -age -afN -riN +afy +mUY +agf +afy abW abW afo @@ -183701,7 +182935,7 @@ aaa aaa lZW sAO -tnX +qHl hur nAY nAY @@ -183715,19 +182949,19 @@ abS abS abW afy -tdu -aHf -age -riN +afy +xtd +hyB +afy afy afP omp afX afy -tdu -age -afN -riN +afy +mUY +agf +afy abS afg abW @@ -183742,7 +182976,7 @@ xTG xip too iLn -mcn +vNN quJ quJ quJ @@ -183929,8 +183163,8 @@ jhd aTY fZL fZL -tCw -vwN +fZL +fZL iCA iCA aTY @@ -183972,19 +183206,19 @@ agm abS abW afg -tdu -aHf -age -riN +afy +xtd +hyB +afy afy afP ozQ afX afy -tdu -age -afN -riN +afy +mUY +agf +afy abW abS abW @@ -184215,7 +183449,7 @@ aaa aaa lZW sAO -gMh +qHl qmD nAY nAY @@ -184229,19 +183463,19 @@ abW abW abS afo -tdu -aHf -age -hGM +afy +xtd +hyB +afy afy afP ozQ afX afy -aHk -age -afN -riN +afy +mUY +agf +afy afy abS abW @@ -184486,9 +183720,9 @@ abS abW abW abW -aHk -afB -afE +afy +xtd +age afJ afy afP @@ -184496,10 +183730,10 @@ ozQ afX afy agb -afE +age agf -hGM -noO +afy +afy afo abW xip @@ -184729,7 +183963,7 @@ aaa aaa lZW fDd -tnX +qHl ena ena phs @@ -184744,7 +183978,7 @@ afo acm afv age -afC +aHf bMb afK afy @@ -184754,7 +183988,7 @@ afX afy agc mZJ -agg +afN age age afv @@ -185000,9 +184234,9 @@ abW abW abW afy -tlH -afD -afG +afy +xtd +age afM afy afP @@ -185010,10 +184244,10 @@ ozQ afX afy agd -afG -agh -xVN -mou +age +agf +afy +afy abS abW xip @@ -185257,19 +184491,19 @@ abW abS abW afy -tdu -aHf -afN -xVN +afy +xtd +agf +afy afy afP -afW +ozQ afX afy -tlH -afN -afN -riN +afy +fia +agf +afy afy abW aaa @@ -185472,7 +184706,7 @@ iCA iCA plk plk -vAj +deQ plk plk fZL @@ -185514,19 +184748,19 @@ aaa abW abW afy -tdu +afy afA -afN -riN +agf +afy afy afP ozQ afX afy -tdu -afN -age -riN +afy +fia +hyB +afy lVi lVi lVi @@ -185771,19 +185005,19 @@ abW abW acm afy -tdu +afy afA -afN -riN +agf +afy afy afP ozQ afX afy -tdu -afN -age -riN +afy +fia +hyB +afy lVi mHE mHE @@ -185971,17 +185205,17 @@ jhd uRv sIx iCA -whS +iCA viR viR -esY +iCA viR dec -tWo +iCA viR viR viR -bwT +iCA lzc sGx cko @@ -186028,18 +185262,18 @@ abW aaa abW abM -tdu +afy afA -afN -riN +agf +afy afy afP ozQ afX afy -tdu -afN -age +afy +fia +hyB lVi lVi kCF @@ -186285,18 +185519,18 @@ abM aaa aaa abM -tdu +afy afA -afN -riN +agf +afy afy afP ozQ afX afy -tdu -afN -age +afy +fia +hyB lVi kCF kCF @@ -186500,7 +185734,7 @@ iCA iCA plk plk -neB +eBc plk plk fZL @@ -186542,18 +185776,18 @@ aaa aaa aaa afv -dXc +afz afA -afN -lMU +agf +afO afy afP ozQ afX afy afO -afN -age +fia +hyB lVi kCF soq @@ -186788,7 +186022,7 @@ aaa aaa aaa lZW -xiG +lES nAY lZW kXi @@ -187045,7 +186279,7 @@ aaa aaa aaa lZW -tnX +qHl gFX lZW ddD @@ -188042,8 +187276,8 @@ jhd aTY fZL fZL -jGl -bKy +fZL +fZL fZL fZL aTY @@ -188557,7 +187791,7 @@ jhd jhd aTY iCA -cfp +fZL fZL aTY jhd @@ -189071,8 +188305,8 @@ avE aTY iCA iCA -qKh -bKy +iCA +fZL fZL fZL aTY @@ -189586,7 +188820,7 @@ jhd jhd aTY fZL -cfp +fZL iCA aTY uRv @@ -190100,8 +189334,8 @@ jhd aTY fZL fZL -tCw -bKy +fZL +fZL fZL fZL aTY @@ -190165,9 +189399,9 @@ xQN mEt vNk kTU -xyt +dzx whP -ovC +dzx dCq uiV rGj @@ -190358,7 +189592,7 @@ jhd jhd jhd uRv -sLi +kgS uRv jhd jhd @@ -190615,7 +189849,7 @@ jhd jhd aTY fZL -cfp +fZL iCA aTY jhd @@ -191193,9 +190427,9 @@ vTb vTb rbn crj -wWT +dzx fDB -uvB +dzx rBb tbK kye @@ -192540,13 +191774,13 @@ oMI oTa tDn tDn -qJh +uqS dVM dVM dVM dVM dVM -fho +uqS tDn bJP oMI @@ -193576,7 +192810,7 @@ dVM rOT rSB dVM -fho +uqS cEb gFf wbW @@ -194090,7 +193324,7 @@ dVM qYJ rSB dVM -jgq +uqS xWe gFf mrF @@ -195107,16 +194341,16 @@ vUu gFf gFf oMI -uCh +rXX hic hic -cPl +uqS dVM dVM dVM dVM dVM -jgq +uqS hic vWw oMI diff --git a/code/controllers/subsystem/materials.dm b/code/controllers/subsystem/materials.dm index a9c807cc38a5..515fdd465a39 100644 --- a/code/controllers/subsystem/materials.dm +++ b/code/controllers/subsystem/materials.dm @@ -27,6 +27,7 @@ SUBSYSTEM_DEF(materials) new /datum/stack_recipe("Sink Frame", /obj/structure/sinkframe, one_per_turf = TRUE, on_solid_ground = TRUE, applies_mats = TRUE, category = CAT_FURNITURE), new /datum/stack_recipe("Material floor tile", /obj/item/stack/tile/material, 1, 4, 20, applies_mats = TRUE, check_density = FALSE, category = CAT_TILES), new /datum/stack_recipe("Material airlock assembly", /obj/structure/door_assembly/door_assembly_material, 4, time = 5 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, applies_mats = TRUE, category = CAT_DOORS), + new /datum/stack_recipe("Railing", /obj/structure/railing, one_per_turf = FALSE, on_solid_ground = TRUE, applies_mats = TRUE, category = CAT_FURNITURE), ) ///List of stackcrafting recipes for materials using rigid recipes var/list/rigid_stack_recipes = list( diff --git a/monkestation/code/modules/aesthetics/airlock/airlock.dm b/monkestation/code/modules/aesthetics/airlock/airlock.dm index 7ada0684d286..6447edc0ab60 100644 --- a/monkestation/code/modules/aesthetics/airlock/airlock.dm +++ b/monkestation/code/modules/aesthetics/airlock/airlock.dm @@ -659,3 +659,12 @@ #undef AIRLOCK_FRAME_CLOSING #undef AIRLOCK_FRAME_OPEN #undef AIRLOCK_FRAME_OPENING + + +/obj/machinery/door/poddoor/shutters/cc + obj_flags = INDESTRUCTIBLE + +/obj/machinery/door/poddoor/shutters/cc/xcc + id = "XCCsec1" + name = "XCC Checkpoint 1 Shutters" + max_integrity = 3000000 diff --git a/monkestation/code/modules/aesthetics/icons/railing_basic.dmi b/monkestation/code/modules/aesthetics/icons/railing_basic.dmi new file mode 100644 index 0000000000000000000000000000000000000000..df17d1a486a8c1bd32be4b3adf6acf757d0fe67d GIT binary patch literal 1528 zcmZvcc{G%J7{`CF7t>*4Bzwl(R!R|3L}oO$n;6+r7$uCd3?@gT$(t-8-A=b<3ddL? z*^+&UA#`OOSt{FP9T9WwmzX=Zd+vYtoada+^Zh>0f6sHiaU>gy?Gnlo0D$dQmc(-a zK*AORqOcGJuBDDb$dRla%!FhznXay`91drFeVxT(MMp=wccH%gvrao_V-N6?pS*>l zg6?phM)V5t4ECkcd;a=r52a`>PlibgVb0I!6?iMm7f3=9mD8wp$Si4q?gPlgYtf@aX2m zf!cnnb*cUQL9XO6C8;j&W&@x*v1OqiF-w{+C`ldH)4x+2+r}(yk~YgLS$M9wsCP)2 zA&qV>Q8%RX(32B{#g~a%jv1*E$op3rPdm7I^zedFwQDq_aKOB7C$Js3@2&?dr2U@! zD*dQcp!!-v54k|eM!G?B2agJ8dPF^IpUqRq}CW59n#N9g5185mazX?NRkwi^Uw~_ zue%1MmI<306ALv@QRfbK-ieGP6`eRMfzhR^RI&k@y9LB^5fV~=kktZ>H@!<|ZWP+f zVRm0i3MjVz4%sCg8JX|fsGRht#8qAC>Av?tpop++nfX&UD4W)f_`9DZwu$k^AiLNo z5#AoV2;8Bm8?&Cly6K^1JEx!hWr&R#o`bk?$ui}I&QMsUF+W%iLFw4EHaP-jyjQ3i zc8y@uvYfiXXETpdUwsafu0VWSXJvsJ>_?*KU z8XFL!$jb)-ADJ<1uGnGCH?5{ohE9^XGg>p?TSYboOv|xeS8ctKV%_hJoZIw%8s5}X zbRi?0rFX#iG^4Y>mxq0=NNKm~w3LTsp}W=H#(SPEUMxCmZ{=vM81F>#qdx_hm@H{_ zpTZ8%(6waD4xQZ#qS9`8-Ha^#`j7PACzR9S$m1rYiOo8S4A!85<@}9qz||Sh!(B)z z#_m!Du2a<@eT7|O%)TX{0KN_Y4gv=Lk@+eJTkR3U4AD}`PegeRs74S~x9>TH&1(hwZU->S4WMaZm$3ZRoj`**} zq@EDEc42J9AN!^tWWh`fb@y+dY?eGnxmkTn&aX)?KAy^(BYi8%EUj|ibGBMDr zgHu;y-r;1pCT+#U-(0*G->G7NkN>!Sl Q2*Vjznb{BvOg$q124au6NB{r; literal 0 HcmV?d00001 diff --git a/monkestation/code/modules/aesthetics/objects/railing.dm b/monkestation/code/modules/aesthetics/objects/railing.dm new file mode 100644 index 000000000000..3ca795d28728 --- /dev/null +++ b/monkestation/code/modules/aesthetics/objects/railing.dm @@ -0,0 +1,133 @@ +/obj/structure/railing + icon = 'monkestation/code/modules/aesthetics/icons/railing_basic.dmi' + icon_state = "railing0-1" + + obj_flags = IGNORE_DENSITY | CAN_BE_HIT | BLOCKS_CONSTRUCTION_DIR + custom_materials = list(/datum/material/iron = 100) + material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS + + var/neighbor_status = list() ///list of smoothing we need doing + + +/obj/structure/railing/Initialize(mapload) + . = ..() + return INITIALIZE_HINT_LATELOAD + +/obj/structure/railing/LateInitialize() + . = ..() + if(anchored) + update_icon() + + +/obj/structure/railing/setDir(newdir) + . = ..() + if(anchored) + update_icon() + +/obj/structure/railing/Destroy() + . = ..() + for(var/thing in range(1, src)) + var/turf/T = thing + for(var/obj/structure/railing/R in T.contents) + R.update_icon() + +/obj/structure/railing/proc/check_neighbors(updates = TRUE) + neighbor_status = list() + var/Rturn = turn(src.dir, -90) + var/Lturn = turn(src.dir, 90) + + for(var/obj/structure/railing/R in get_turf(src)) + if((R.dir == Lturn) && R.anchored) + neighbor_status |= "corneroverlay_l" + if(updates) + R.update_icon(FALSE) + if((R.dir == Rturn) && R.anchored) + neighbor_status |= "corneroverlay_r" + if(updates) + R.update_icon(FALSE) + for(var/obj/structure/railing/R in get_step(src, Lturn)) + if((R.dir == src.dir) && R.anchored) + neighbor_status |= "frontoverlay_l" + if(updates) + R.update_icon(FALSE) + for(var/obj/structure/railing/R in get_step(src, Rturn)) + if((R.dir == src.dir) && R.anchored) + neighbor_status |= "frontoverlay_r" + if (updates) + R.update_icon(FALSE) + for(var/obj/structure/railing/R in get_step(src, (Lturn + src.dir))) + if((R.dir == Rturn) && R.anchored) + neighbor_status |= "frontoverlay_l" + if (updates) + R.update_icon(FALSE) + for(var/obj/structure/railing/R in get_step(src, (Rturn + src.dir))) + if((R.dir == Lturn) && R.anchored) + neighbor_status |= "mcorneroverlay_l" + if (updates) + R.update_icon(FALSE) + + ///corner hell + ///we are basically checking if 2 or more cardinal directions exist here so we can set our dir + + +/obj/structure/railing/update_icon(update_neighbors = TRUE) + . = ..() + check_neighbors(update_neighbors) + overlays.Cut() + + if(dir == SOUTH) + layer = ABOVE_MOB_LAYER + 0.01 + + else if( dir != NORTH) + SET_PLANE(src, GAME_PLANE_FOV_HIDDEN, get_turf(src)) + else + SET_PLANE(src, GAME_PLANE, get_turf(src)) + layer = initial(layer) + + if(!neighbor_status || !anchored) + icon_state = "railing0-[density]" + else + icon_state = "railing1-[density]" + + if(("corneroverlay_l" in neighbor_status) && ("corneroverlay_r" in neighbor_status)) + icon_state = "blank" + + + var/turf/right_turf = get_step(src, turn(src.dir, -90)) + var/turf/left_turf = get_step(src, turn(src.dir, 90)) + + if((!locate(/obj/structure/railing) in right_turf.contents)) + if(!("mcorneroverlay_l" in neighbor_status)) + overlays += image(icon, "frontend_r[density]") + else + overlays += image(icon, "frontoverlay_r[density]") + + + if((!locate(/obj/structure/railing) in left_turf.contents)) + if(!("mcorneroverlay_l" in neighbor_status)) + overlays += image(icon, "frontend_l[density]") + else + overlays += image(icon, "frontoverlay_l[density]") + + + if("corneroverlay_l" in neighbor_status) + overlays += image(icon, "corneroverlay_l[density]") + if("corneroverlay_r" in neighbor_status) + overlays += image(icon, "corneroverlay_r[density]") + if("frontoverlay_l" in neighbor_status) + overlays += image(icon, "frontoverlay_l[density]") + if("frontoverlay_r" in neighbor_status) + overlays += image(icon, "frontoverlay_r[density]") + if("mcorneroverlay_l" in neighbor_status) + var/pix_offset_x = 0 + var/pix_offset_y = 0 + switch(dir) + if(NORTH) + pix_offset_x = 32 + if(SOUTH) + pix_offset_x = -32 + if(EAST) + pix_offset_y = -32 + if(WEST) + pix_offset_y = 32 + overlays += image(icon, "mcorneroverlay_l[density]", pixel_x = pix_offset_x, pixel_y = pix_offset_y) diff --git a/monkestation/code/modules/ghost_players/ghost_player.dm b/monkestation/code/modules/ghost_players/ghost_player.dm index 1262c0959e64..fd7d5fc46b7c 100644 --- a/monkestation/code/modules/ghost_players/ghost_player.dm +++ b/monkestation/code/modules/ghost_players/ghost_player.dm @@ -124,7 +124,7 @@ GLOBAL_VAR_INIT(disable_ghost_spawning, FALSE) /mob/dead/observer/proc/create_ghost_body() - var/mob/living/carbon/human/old_mob = mind.current + var/mob/living/carbon/human/old_mob = mind?.current var/obj/item/organ/internal/brain/brain if(istype(old_mob)) brain = old_mob.get_organ_by_type(/obj/item/organ/internal/brain) diff --git a/monkestation/code/modules/mob/dead/new_player/sprite_accessories/hair.dm b/monkestation/code/modules/mob/dead/new_player/sprite_accessories/hair.dm index 8ab5663ce2b6..a8bfd20700e7 100644 --- a/monkestation/code/modules/mob/dead/new_player/sprite_accessories/hair.dm +++ b/monkestation/code/modules/mob/dead/new_player/sprite_accessories/hair.dm @@ -85,3 +85,8 @@ icon = 'monkestation/icons/mob/sprite_accessories/hair.dmi' name = "Mullet" icon_state = "hair_mullet" + +/datum/sprite_accessory/hair/long_messy + icon = 'monkestation/icons/mob/sprite_accessories/hair.dmi' + name = "Long and Messy" + icon_state = "long_messy" diff --git a/monkestation/icons/mob/sprite_accessories/hair.dmi b/monkestation/icons/mob/sprite_accessories/hair.dmi index df59586e6740d269d2ed4ed961ad06900f91fd2f..10a508c4d9b8678a01730808613059f02181fa99 100644 GIT binary patch literal 12121 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 B3<3ZE diff --git a/tgstation.dme b/tgstation.dme index 3f055a745297..287bc5821cff 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5479,6 +5479,7 @@ #include "monkestation\code\modules\aesthetics\items\clothing.dm" #include "monkestation\code\modules\aesthetics\mobs\slime.dm" #include "monkestation\code\modules\aesthetics\objects\misc.dm" +#include "monkestation\code\modules\aesthetics\objects\railing.dm" #include "monkestation\code\modules\aesthetics\objects\window_sill.dm" #include "monkestation\code\modules\aesthetics\objects\windows.dm" #include "monkestation\code\modules\aesthetics\subsystem\coloring.dm" From b1945f787e459dbab216436b2ec7f932cd989ab8 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Mon, 25 Sep 2023 03:33:57 -0400 Subject: [PATCH 45/59] Revert "new rails god damn" This reverts commit d99ae0145827c31b29ba9c17cb947e8462196190. --- .../map_files/Deltastation/DeltaStation2.dmm | 570 ++-- .../map_files/IceBoxStation/IceBoxStation.dmm | 672 ++++- _maps/map_files/MetaStation/MetaStation.dmm | 21 +- _maps/map_files/Mining/Lavaland.dmm | 76 +- _maps/map_files/Oshan/oshan.dmm | 131 +- _maps/map_files/generic/CentCom.dmm | 85 +- _maps/map_files/tramstation/tramstation.dmm | 2354 +++++++++++------ code/controllers/subsystem/materials.dm | 1 - .../modules/aesthetics/airlock/airlock.dm | 9 - .../aesthetics/icons/railing_basic.dmi | Bin 1528 -> 0 bytes .../modules/aesthetics/objects/railing.dm | 133 - .../modules/ghost_players/ghost_player.dm | 2 +- .../new_player/sprite_accessories/hair.dm | 5 - .../icons/mob/sprite_accessories/hair.dmi | Bin 12121 -> 11416 bytes tgstation.dme | 1 - 15 files changed, 2605 insertions(+), 1455 deletions(-) delete mode 100644 monkestation/code/modules/aesthetics/icons/railing_basic.dmi delete mode 100644 monkestation/code/modules/aesthetics/objects/railing.dm diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 3e31a85dd791..90de741895dc 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -296,10 +296,6 @@ /obj/effect/turf_decal/siding/white{ dir = 8 }, -/obj/machinery/door/window{ - dir = 4; - name = "Fitness Ring" - }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "adA" = ( @@ -1375,6 +1371,9 @@ /area/station/command/heads_quarters/ce) "apz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing{ + dir = 4 + }, /obj/effect/turf_decal/siding/white{ dir = 4 }, @@ -2267,14 +2266,6 @@ name = "SapMaster XP" }, /obj/effect/turf_decal/bot, -/obj/structure/railing{ - dir = 10; - layer = 3.1 - }, -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "azi" = ( @@ -2440,6 +2431,7 @@ /area/station/engineering/atmos) "aBr" = ( /obj/structure/chair, +/obj/structure/railing, /obj/effect/turf_decal/siding/white, /turf/open/floor/iron/dark/side, /area/station/commons/fitness/recreation) @@ -3935,16 +3927,11 @@ /area/station/science/research) "aUN" = ( /obj/structure/lattice/catwalk, -/obj/item/toy/plush/space_lizard_plushie{ - name = "Meets-the-Ore" - }, /obj/structure/railing{ - dir = 9; - layer = 3.1 + dir = 10 }, -/obj/structure/railing{ - dir = 8; - layer = 4.1 +/obj/item/toy/plush/space_lizard_plushie{ + name = "Meets-the-Ore" }, /turf/open/space/basic, /area/space/nearstation) @@ -4466,11 +4453,6 @@ "bbQ" = ( /obj/machinery/vending/wardrobe/hydro_wardrobe, /obj/effect/turf_decal/bot, -/obj/structure/railing, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "bbR" = ( @@ -4908,6 +4890,18 @@ /obj/machinery/meter, /turf/open/floor/iron, /area/station/maintenance/department/electrical) +"bgW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/commons/fitness/recreation) "bhg" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -5109,6 +5103,9 @@ /obj/structure/cable, /obj/effect/landmark/start/hangover, /obj/structure/disposalpipe/segment, +/obj/structure/railing{ + dir = 8 + }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -5710,9 +5707,6 @@ "bqC" = ( /obj/machinery/seed_extractor, /obj/effect/turf_decal/bot, -/obj/structure/railing{ - dir = 1 - }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "bqE" = ( @@ -9750,14 +9744,6 @@ "cmi" = ( /obj/structure/flora/bush/stalky/style_random, /obj/structure/flora/bush/leavy/style_random, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, -/obj/structure/railing{ - dir = 6; - layer = 3.1 - }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "cmq" = ( @@ -9790,10 +9776,6 @@ /obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/flora/rock/pile/style_random, /obj/machinery/light/floor/has_bulb, -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "cmI" = ( @@ -9947,9 +9929,6 @@ /obj/structure/flora/bush/fullgrass/style_random, /obj/structure/flora/bush/grassy/style_random, /obj/machinery/light/floor/has_bulb, -/obj/structure/railing{ - dir = 1 - }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "cnL" = ( @@ -11718,6 +11697,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/structure/railing{ + dir = 9 + }, /obj/structure/rack, /obj/item/wrench, /obj/item/reagent_containers/spray/plantbgone{ @@ -14640,6 +14622,10 @@ /area/station/medical/abandoned) "dxi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/window{ + dir = 8; + name = "Fitness Ring" + }, /obj/effect/turf_decal/siding/white{ dir = 8 }, @@ -15661,9 +15647,6 @@ "dLF" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/white, -/obj/structure/railing{ - dir = 1 - }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "dLH" = ( @@ -18497,6 +18480,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/grimy, /area/station/service/chapel/office) +"evh" = ( +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) "evp" = ( /obj/machinery/computer/records/medical{ dir = 8 @@ -20430,6 +20422,7 @@ "eUT" = ( /obj/structure/chair, /obj/effect/landmark/start/hangover, +/obj/structure/railing, /obj/effect/turf_decal/siding/white, /turf/open/floor/iron/dark/side, /area/station/commons/fitness/recreation) @@ -20583,12 +20576,6 @@ /obj/effect/turf_decal/siding/white/corner{ dir = 8 }, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "eWE" = ( @@ -21697,13 +21684,6 @@ "fju" = ( /obj/structure/flora/bush/flowers_br/style_random, /obj/structure/flora/bush/sparsegrass/style_random, -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, -/obj/structure/railing{ - dir = 1 - }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "fjx" = ( @@ -21796,6 +21776,9 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) "fkU" = ( +/obj/structure/railing{ + dir = 5 + }, /obj/item/kirbyplants/random, /obj/machinery/light/floor/has_bulb, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -22962,13 +22945,6 @@ /obj/structure/flora/bush/flowers_pp/style_random, /obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/flora/rock/pile/jungle/style_random, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, -/obj/structure/railing{ - dir = 1 - }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "fzx" = ( @@ -25090,6 +25066,9 @@ "gbY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/window/right/directional/west{ + name = "Hydroponics Center" + }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 }, @@ -26388,6 +26367,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 4 + }, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) "grp" = ( @@ -27631,6 +27616,7 @@ /area/station/security/execution/transfer) "gGw" = ( /obj/effect/landmark/start/hangover, +/obj/structure/railing, /obj/structure/chair/sofa/bench/right{ dir = 1 }, @@ -31101,14 +31087,6 @@ }, /obj/machinery/disposal/bin, /obj/effect/turf_decal/stripes/box, -/obj/structure/railing{ - dir = 10; - layer = 3.1 - }, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "hAN" = ( @@ -32448,14 +32426,10 @@ /area/station/engineering/atmos) "hUm" = ( /obj/structure/lattice/catwalk, -/obj/machinery/vending/coffee, /obj/structure/railing{ - dir = 8; - layer = 4.1 - }, -/obj/structure/railing{ - dir = 1 + dir = 9 }, +/obj/machinery/vending/coffee, /turf/open/space/basic, /area/space/nearstation) "hUt" = ( @@ -34529,6 +34503,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/fore) @@ -35316,6 +35293,18 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) +"iCS" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central/aft) "iDc" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -38371,6 +38360,9 @@ /obj/effect/turf_decal/arrows{ dir = 8 }, +/obj/structure/railing/corner{ + dir = 4 + }, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -38771,6 +38763,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/structure/railing/corner{ + dir = 1 + }, /turf/open/floor/iron, /area/station/service/hydroponics) "juZ" = ( @@ -39249,6 +39244,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/structure/disposalpipe/segment, +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -39604,6 +39602,10 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/textured_large, /area/station/engineering/atmos/storage/gas) +"jEn" = ( +/obj/structure/railing, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) "jEt" = ( /obj/structure/cable, /obj/machinery/door/firedoor, @@ -40069,11 +40071,6 @@ /obj/effect/turf_decal/siding/white/corner{ dir = 4 }, -/obj/structure/railing, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "jKO" = ( @@ -40121,6 +40118,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/iron, /area/station/service/hydroponics) "jLe" = ( @@ -40337,6 +40337,7 @@ /area/station/maintenance/solars/port/aft) "jNB" = ( /obj/effect/landmark/start/hangover, +/obj/structure/railing/corner, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/fore) @@ -40558,6 +40559,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue, +/obj/structure/railing{ + dir = 6 + }, /obj/structure/rack, /obj/item/wrench, /obj/item/crowbar, @@ -41336,6 +41340,9 @@ /area/station/engineering/atmos) "jZH" = ( /obj/effect/landmark/start/hangover, +/obj/structure/railing{ + dir = 1 + }, /obj/structure/chair/sofa/bench/right, /obj/effect/turf_decal/box/corners{ dir = 8 @@ -41744,6 +41751,7 @@ "keq" = ( /obj/structure/chair, /obj/effect/landmark/start/assistant, +/obj/structure/railing, /obj/effect/turf_decal/siding/white, /turf/open/floor/iron/dark/side, /area/station/commons/fitness/recreation) @@ -42624,6 +42632,19 @@ "kpa" = ( /turf/closed/wall, /area/station/maintenance/department/eva/abandoned) +"kpc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/window{ + dir = 4; + name = "Fitness Ring" + }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/commons/fitness/recreation) "kpj" = ( /obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, @@ -43308,6 +43329,7 @@ "kyR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/blue, +/obj/structure/railing/corner, /turf/open/floor/iron, /area/station/service/hydroponics) "kyW" = ( @@ -44677,6 +44699,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/iron, /area/station/service/hydroponics) "kQV" = ( @@ -46803,17 +46828,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/wood, /area/station/commons/dorms) -"lsi" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/obj/machinery/door/window{ - dir = 8; - name = "Fitness Ring" - }, -/turf/open/floor/iron/dark, -/area/station/commons/fitness/recreation) "lsl" = ( /obj/effect/turf_decal/bot, /obj/item/robot_suit, @@ -47837,6 +47851,9 @@ dir = 1 }, /obj/effect/landmark/start/assistant, +/obj/structure/railing{ + dir = 1 + }, /obj/effect/turf_decal/siding/white{ dir = 1 }, @@ -48198,6 +48215,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/electrical) "lII" = ( +/obj/structure/railing, /obj/structure/chair/sofa/bench{ dir = 1 }, @@ -48740,13 +48758,6 @@ "lPs" = ( /obj/machinery/biogenerator, /obj/effect/turf_decal/bot, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "lPy" = ( @@ -49504,6 +49515,9 @@ /turf/open/floor/iron, /area/station/engineering/hallway) "mae" = ( +/obj/machinery/door/window/right/directional/east{ + name = "Hydroponics Center" + }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 }, @@ -49913,6 +49927,9 @@ /turf/open/floor/iron/dark, /area/station/commons/locker) "mgd" = ( +/obj/structure/railing{ + dir = 10 + }, /obj/item/kirbyplants/random, /obj/machinery/light/floor/has_bulb, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -50003,10 +50020,6 @@ /obj/structure/flora/bush/grassy/style_random, /obj/structure/flora/rock/pile/jungle/style_random, /obj/machinery/light/floor/has_bulb, -/obj/structure/railing{ - dir = 6; - layer = 3.1 - }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "mhl" = ( @@ -50629,10 +50642,6 @@ /obj/effect/turf_decal/siding/white/corner{ dir = 1 }, -/obj/structure/railing, -/obj/structure/railing{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "mpO" = ( @@ -50687,6 +50696,11 @@ /obj/machinery/holopad, /turf/open/floor/iron/large, /area/station/security/checkpoint/medical/medsci) +"mqz" = ( +/obj/effect/turf_decal/tile/blue, +/obj/structure/railing/corner, +/turf/open/floor/iron, +/area/station/service/hydroponics) "mqG" = ( /obj/structure/filingcabinet/medical, /obj/effect/turf_decal/bot, @@ -50843,6 +50857,9 @@ /area/station/engineering/supermatter) "msF" = ( /obj/effect/landmark/start/hangover, +/obj/structure/railing{ + dir = 1 + }, /obj/structure/chair/sofa/bench/left, /obj/effect/turf_decal/box/corners, /obj/effect/turf_decal/box/corners{ @@ -51494,6 +51511,17 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark/textured_large, /area/station/security/brig) +"mAJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/structure/railing/corner, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) "mAW" = ( /obj/machinery/chem_master, /obj/effect/turf_decal/tile/yellow/opposingcorners, @@ -53358,6 +53386,11 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/supermatter/room) +"mWO" = ( +/obj/structure/railing/corner, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) "mWP" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -55105,6 +55138,15 @@ /mob/living/basic/pet/dog/corgi/ian, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) +"nvo" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) "nvu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/landmark/start/hangover, @@ -55947,6 +55989,7 @@ }, /obj/effect/turf_decal/tile/blue, /obj/machinery/hydroponics/constructable, +/obj/structure/railing, /turf/open/floor/iron, /area/station/service/hydroponics) "nFj" = ( @@ -56078,10 +56121,7 @@ /area/station/command/meeting_room/council) "nHf" = ( /obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 9; - layer = 3.1 - }, +/obj/structure/railing, /turf/open/space/basic, /area/space/nearstation) "nHs" = ( @@ -56160,6 +56200,9 @@ dir = 1 }, /obj/effect/turf_decal/tile/blue, +/obj/structure/railing{ + dir = 5 + }, /obj/effect/turf_decal/box/corners{ dir = 8 }, @@ -56189,13 +56232,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron, /area/station/security/holding_cell) -"nId" = ( -/obj/structure/chair/stool/directional/east, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/service/theater) "nIg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/maintenance_hatch{ @@ -57731,6 +57767,9 @@ /obj/effect/turf_decal/tile/green{ dir = 8 }, +/obj/structure/railing/corner{ + dir = 8 + }, /turf/open/floor/iron, /area/station/service/hydroponics) "obI" = ( @@ -59211,6 +59250,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/structure/disposalpipe/segment, +/obj/structure/railing/corner{ + dir = 1 + }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -60170,13 +60212,6 @@ }, /obj/item/reagent_containers/cup/watering_can, /obj/item/reagent_containers/cup/watering_can, -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, -/obj/structure/railing{ - dir = 1 - }, /turf/open/floor/iron/dark/textured, /area/station/service/hydroponics) "oJy" = ( @@ -61627,6 +61662,9 @@ "pei" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/railing/corner{ + dir = 1 + }, /obj/effect/turf_decal/siding/white/corner{ dir = 1 }, @@ -63311,16 +63349,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/iron, /area/station/engineering/main) -"pzB" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/commons/fitness/recreation) "pzF" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 10 @@ -63493,6 +63521,9 @@ "pBj" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing/corner{ + dir = 4 + }, /obj/effect/turf_decal/siding/white/corner{ dir = 4 }, @@ -63589,13 +63620,10 @@ /area/station/hallway/primary/central/fore) "pCQ" = ( /obj/structure/lattice/catwalk, -/obj/structure/reagent_dispensers/fueltank, /obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 4 + dir = 5 }, +/obj/structure/reagent_dispensers/fueltank, /turf/open/space/basic, /area/space/nearstation) "pCV" = ( @@ -66765,14 +66793,6 @@ "qnY" = ( /turf/closed/wall, /area/station/science/lobby) -"qoa" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/window/right/directional/east{ - name = "Hydroponics Center" - }, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics) "qob" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/table, @@ -68893,13 +68913,6 @@ color = "#52B4E9" }, /obj/machinery/composters, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, /turf/open/floor/iron/dark/textured, /area/station/service/hydroponics) "qNU" = ( @@ -70188,14 +70201,6 @@ "rhK" = ( /obj/structure/flora/bush/stalky/style_random, /obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/railing{ - dir = 6; - layer = 3.1 - }, -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "rhN" = ( @@ -71189,14 +71194,6 @@ "rtT" = ( /obj/structure/flora/bush/flowers_yw/style_random, /obj/structure/flora/bush/sparsegrass/style_random, -/obj/structure/railing{ - dir = 6; - layer = 3.1 - }, -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "rua" = ( @@ -73395,6 +73392,19 @@ }, /turf/open/floor/iron/dark/corner, /area/station/hallway/secondary/exit/departure_lounge) +"rVs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) "rVu" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -73756,6 +73766,9 @@ dir = 1 }, /obj/machinery/hydroponics/constructable, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/iron, /area/station/service/hydroponics) "sau" = ( @@ -74443,7 +74456,6 @@ /obj/effect/turf_decal/siding/white{ dir = 1 }, -/obj/structure/railing, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "sjH" = ( @@ -75184,15 +75196,13 @@ /turf/open/floor/plating, /area/station/service/chapel/storage) "stN" = ( +/obj/structure/railing{ + dir = 10 + }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, -/obj/structure/railing, /turf/open/floor/wood, /area/station/service/theater) "stO" = ( @@ -76311,6 +76321,7 @@ /turf/open/floor/iron, /area/station/security/brig) "sIk" = ( +/obj/structure/railing, /obj/structure/chair/sofa/bench/left{ dir = 1 }, @@ -76454,13 +76465,6 @@ /obj/structure/flora/bush/ferny/style_random, /obj/structure/flora/bush/style_random, /obj/structure/flora/bush/jungle/a/style_random, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "sJo" = ( @@ -76706,10 +76710,6 @@ /obj/effect/turf_decal/siding/white{ dir = 4 }, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "sLK" = ( @@ -77121,6 +77121,9 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "sQN" = ( +/obj/structure/railing{ + dir = 6 + }, /obj/item/kirbyplants/random, /obj/machinery/light/floor/has_bulb, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, @@ -77731,7 +77734,6 @@ "sXL" = ( /obj/machinery/vending/hydronutrients, /obj/effect/turf_decal/bot, -/obj/structure/railing, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "sXM" = ( @@ -80540,6 +80542,9 @@ /obj/structure/chair{ dir = 1 }, +/obj/structure/railing{ + dir = 1 + }, /obj/effect/turf_decal/siding/white{ dir = 1 }, @@ -82913,9 +82918,9 @@ /turf/open/floor/plating, /area/station/engineering/transit_tube) "ulH" = ( +/obj/structure/railing, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only, -/obj/structure/railing, /turf/open/floor/wood, /area/station/service/theater) "ulQ" = ( @@ -84285,6 +84290,15 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore) +"uCA" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) "uCC" = ( /obj/effect/landmark/start/cyborg, /obj/structure/cable, @@ -84316,10 +84330,6 @@ /obj/structure/flora/bush/fullgrass/style_random, /obj/structure/flora/bush/lavendergrass/style_random, /obj/machinery/light/floor/has_bulb, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "uDb" = ( @@ -85068,6 +85078,7 @@ /area/station/medical/medbay/lobby) "uOh" = ( /obj/effect/turf_decal/tile/neutral, +/obj/structure/railing, /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/hallway/primary/fore) @@ -85475,6 +85486,7 @@ /obj/effect/turf_decal/arrows{ dir = 4 }, +/obj/structure/railing/corner, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark/side{ dir = 4 @@ -86226,6 +86238,9 @@ /area/station/commons/locker) "vbK" = ( /obj/effect/landmark/start/hangover, +/obj/structure/railing{ + dir = 1 + }, /obj/structure/chair/sofa/bench, /obj/effect/landmark/start/assistant, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -86391,6 +86406,9 @@ /obj/effect/turf_decal/tile/green{ dir = 4 }, +/obj/structure/railing/corner{ + dir = 4 + }, /turf/open/floor/iron, /area/station/service/hydroponics) "vdS" = ( @@ -87247,8 +87265,7 @@ "vpk" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ - dir = 8; - layer = 4.1 + dir = 8 }, /turf/open/space/basic, /area/space/nearstation) @@ -88061,13 +88078,6 @@ /area/station/command/heads_quarters/ce) "vys" = ( /obj/structure/flora/bush/jungle/c/style_random, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "vyt" = ( @@ -88579,6 +88589,16 @@ /obj/machinery/duct, /turf/open/floor/iron/grimy, /area/station/service/bar/backroom) +"vDY" = ( +/obj/effect/landmark/start/hangover, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) "vEg" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/decal/cleanable/dirt, @@ -88718,6 +88738,9 @@ /area/station/hallway/primary/central/aft) "vFn" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/turf_decal/siding/white/corner{ dir = 8 }, @@ -88812,6 +88835,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/iron, /area/station/service/hydroponics) "vGX" = ( @@ -89451,6 +89477,7 @@ /area/station/service/kitchen) "vRn" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/structure/railing/corner, /obj/effect/turf_decal/siding/white/corner, /turf/open/floor/iron/dark/corner, /area/station/commons/fitness/recreation) @@ -90072,9 +90099,6 @@ "vZo" = ( /obj/machinery/smartfridge, /obj/effect/turf_decal/bot, -/obj/structure/railing{ - dir = 1 - }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "vZq" = ( @@ -90834,6 +90858,9 @@ /obj/effect/turf_decal/tile/green{ dir = 4 }, +/obj/structure/railing/corner{ + dir = 4 + }, /turf/open/floor/iron, /area/station/service/hydroponics) "wif" = ( @@ -91037,12 +91064,11 @@ /turf/open/floor/iron, /area/station/engineering/break_room) "wkp" = ( -/obj/machinery/door/firedoor/border_only{ +/obj/structure/railing{ dir = 8 }, -/obj/structure/railing{ - dir = 8; - layer = 4.1 +/obj/machinery/door/firedoor/border_only{ + dir = 8 }, /turf/open/floor/wood, /area/station/service/theater) @@ -92040,14 +92066,13 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/aft) "wuh" = ( +/obj/structure/railing{ + dir = 8 + }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, /turf/open/floor/wood, /area/station/service/theater) "wuj" = ( @@ -92811,14 +92836,13 @@ /area/station/service/hydroponics/garden/abandoned) "wDi" = ( /obj/effect/landmark/start/hangover, +/obj/structure/railing{ + dir = 8 + }, /obj/effect/spawner/random/structure/musician/piano/random_piano, /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, /turf/open/floor/wood, /area/station/service/theater) "wDk" = ( @@ -94349,14 +94373,6 @@ /obj/structure/flora/bush/flowers_br/style_random, /obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/flora/bush/grassy/style_random, -/obj/structure/railing{ - dir = 6; - layer = 3.1 - }, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "xav" = ( @@ -95098,6 +95114,15 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/cargo/lobby) +"xjF" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) "xjJ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/chair/sofa/bench/left{ @@ -95244,6 +95269,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/structure/railing/corner{ + dir = 1 + }, /turf/open/floor/iron, /area/station/service/hydroponics) "xmk" = ( @@ -96312,6 +96340,7 @@ /turf/open/floor/iron, /area/station/maintenance/starboard/aft) "xzC" = ( +/obj/structure/railing, /obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, @@ -96322,7 +96351,6 @@ name = "service camera" }, /obj/machinery/light/small/directional/east, -/obj/structure/railing, /turf/open/floor/wood, /area/station/service/theater) "xzG" = ( @@ -97420,6 +97448,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/iron, /area/station/service/hydroponics) "xMX" = ( @@ -97815,6 +97846,9 @@ dir = 1 }, /obj/effect/turf_decal/tile/blue, +/obj/structure/railing{ + dir = 10 + }, /obj/effect/turf_decal/box/corners{ dir = 4 }, @@ -98420,13 +98454,6 @@ "yaj" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/white/corner, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "yam" = ( @@ -98455,6 +98482,9 @@ dir = 1 }, /obj/effect/landmark/start/hangover, +/obj/structure/railing{ + dir = 1 + }, /obj/effect/turf_decal/siding/white{ dir = 1 }, @@ -98484,9 +98514,6 @@ "yba" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/window/right/directional/west{ - name = "Hydroponics Center" - }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "ybb" = ( @@ -98538,14 +98565,10 @@ /area/station/science/research/abandoned) "ybr" = ( /obj/structure/lattice/catwalk, -/obj/structure/closet/crate, /obj/structure/railing{ - dir = 9; - layer = 3.1 - }, -/obj/structure/railing{ - dir = 4 + dir = 6 }, +/obj/structure/closet/crate, /turf/open/space/basic, /area/space/nearstation) "ybs" = ( @@ -98934,11 +98957,6 @@ "ygW" = ( /obj/machinery/vending/hydroseeds, /obj/effect/turf_decal/bot, -/obj/structure/railing, -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "ygY" = ( @@ -129999,7 +130017,7 @@ oYs sHL glv hKE -crg +mqz xMK mae kQR @@ -131283,10 +131301,10 @@ pAy oYs aeu ueJ -rID +evh xSz oJj -qoa +yba aze cLO juX @@ -132835,11 +132853,11 @@ kel ryb kel fbU -qRx -wsp -wsp -wsp -fMo +mWO +nvo +nvo +nvo +uCA vpJ vCf xVa @@ -133097,7 +133115,7 @@ fzw uCY cmi fkU -fMo +uCA lvl rZf rul @@ -133871,7 +133889,7 @@ rhK msF suj iCu -iCu +mAJ nNc nNc nNc @@ -134119,17 +134137,17 @@ fRo fRo fRo hTi -xVa +vDY mgd fju cmG rtT uNg -fbU +xjF cwV fRo -fRo -nId +jEn +dxk wtg jwb dxk @@ -134378,15 +134396,15 @@ iyH eDV ldq jAI -iCu -iCu +rVs +rVs bjE owu tlU ikD xgL uOh -nId +dxk vqY eYQ aaz @@ -139062,7 +139080,7 @@ czf bCM ocA kzp -sqd +iCS crR hQV ojs @@ -152943,7 +152961,7 @@ vii vii cwA vRn -apz +kpc apz apz apz @@ -153201,7 +153219,7 @@ cOU hJG aBr yaj -lsi +sLB sLB jKN tJl @@ -153972,7 +153990,7 @@ tNE hJG aBr eWw -pzB +adz adz mpK tJl @@ -154228,9 +154246,9 @@ twN twN aek vFn -dxi -dxi -dxi +bgW +bgW +bgW dxi pei jCI diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 5725c56a9b10..b2888158ec4c 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -142,6 +142,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/station/service/chapel/office) +"adD" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) "adW" = ( /obj/machinery/light/directional/south, /turf/open/floor/iron, @@ -826,6 +832,9 @@ /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 4 }, +/obj/structure/railing/corner{ + dir = 4 + }, /obj/effect/turf_decal/trimline/green/filled/warning{ dir = 1 }, @@ -1201,6 +1210,9 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, +/obj/structure/railing/corner{ + dir = 8 + }, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, /turf/open/floor/iron/white, @@ -1499,6 +1511,14 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +"ayG" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) "azf" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -1830,6 +1850,12 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron/dark, /area/station/cargo/miningdock) +"aFG" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) "aFJ" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -3761,6 +3787,12 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/sepia, /area/station/service/library) +"blf" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "blk" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -4013,6 +4045,9 @@ /obj/effect/turf_decal/trimline/neutral/corner{ dir = 8 }, +/obj/structure/railing/corner{ + dir = 4 + }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, @@ -4140,6 +4175,9 @@ /area/station/security/checkpoint/engineering) "brC" = ( /obj/machinery/light/directional/west, +/obj/structure/railing/corner{ + dir = 4 + }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -4154,6 +4192,14 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/security/prison/visit) +"brL" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 5 + }, +/area/station/service/chapel) "brY" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -6899,16 +6945,13 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) "chK" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/structure/railing{ + dir = 9 }, /obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/structure/railing{ dir = 1 }, -/obj/structure/railing{ +/obj/machinery/door/firedoor/border_only{ dir = 8 }, /turf/open/floor/glass/reinforced, @@ -8293,6 +8336,9 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, +/obj/structure/railing/corner{ + dir = 4 + }, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "cCF" = ( @@ -9582,6 +9628,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/corner, +/obj/structure/railing/corner, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -10480,6 +10527,11 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/science/robotics/lab) +"dkK" = ( +/obj/structure/railing/corner, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "dkN" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -10970,6 +11022,12 @@ }, /turf/open/floor/plating, /area/station/medical/virology) +"dsO" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) "dsT" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -11421,6 +11479,9 @@ name = "Research Director Observation"; req_access = list("rd") }, +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/white/side{ dir = 5 @@ -12843,6 +12904,12 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"dZS" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) "dZW" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -13303,6 +13370,12 @@ name = "Observation Deck"; req_access = list("xenobiology") }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -13609,9 +13682,6 @@ /obj/structure/railing{ dir = 10 }, -/obj/structure/railing{ - dir = 8 - }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) "enq" = ( @@ -14915,6 +14985,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"eId" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/closed/wall, +/area/station/commons/dorms/laundry) "eIk" = ( /obj/structure/filingcabinet, /obj/machinery/power/apc/auto_name/directional/north, @@ -15382,7 +15458,9 @@ /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/hos) "ePR" = ( -/obj/structure/railing, +/obj/structure/railing{ + dir = 6 + }, /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/hallway/primary/starboard) @@ -16060,6 +16138,9 @@ /turf/open/floor/iron, /area/station/science/ordnance/testlab) "faJ" = ( +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, @@ -16091,6 +16172,9 @@ /area/station/hallway/primary/central) "fbK" = ( /obj/structure/cable, +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -16429,6 +16513,9 @@ /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 8 }, +/obj/structure/railing/corner{ + dir = 1 + }, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/engineering/atmos/storage) @@ -16609,6 +16696,9 @@ /area/station/security/prison/safe) "fkX" = ( /obj/structure/lattice/catwalk, +/obj/structure/railing/corner{ + dir = 1 + }, /turf/open/openspace, /area/station/science/ordnance/office) "fle" = ( @@ -16714,6 +16804,12 @@ "fmD" = ( /turf/open/floor/wood/parquet, /area/station/service/bar/atrium) +"fmU" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "fna" = ( /obj/structure/chair/wood{ dir = 4 @@ -16937,6 +17033,9 @@ }, /area/station/medical/medbay/central) "frd" = ( +/obj/structure/railing/corner{ + dir = 1 + }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -17006,6 +17105,9 @@ /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 4 }, +/obj/structure/railing/corner{ + dir = 4 + }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "frS" = ( @@ -17517,6 +17619,7 @@ /area/station/security/prison/work) "fAW" = ( /obj/structure/cable, +/obj/structure/railing/corner, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/station/commons/locker) @@ -18416,6 +18519,13 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/starboard/fore) +"fSd" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) "fSj" = ( /obj/effect/decal/cleanable/oil, /turf/open/floor/plating, @@ -18686,6 +18796,10 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/service/kitchen/diner) +"fWw" = ( +/obj/structure/railing/corner, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "fWL" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -18821,6 +18935,15 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/iron, /area/station/maintenance/port/fore) +"fZo" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/wood/parquet, +/area/station/service/bar/atrium) "fZq" = ( /obj/structure/curtain/cloth, /turf/open/floor/iron/showroomfloor, @@ -19225,6 +19348,9 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "gdN" = ( +/obj/structure/railing/corner{ + dir = 1 + }, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -19412,6 +19538,9 @@ /turf/open/floor/iron, /area/station/maintenance/port/fore) "ghQ" = ( +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/tile/brown/half/contrasted, @@ -19641,6 +19770,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "glP" = ( +/obj/structure/railing/corner, /obj/item/storage/belt/utility, /obj/machinery/newscaster/directional/north, /obj/machinery/light/directional/north, @@ -19905,6 +20035,12 @@ /obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron/dark, /area/mine/laborcamp) +"gqj" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/glass/reinforced, +/area/station/hallway/primary/starboard) "gqm" = ( /obj/machinery/conveyor{ dir = 4; @@ -20837,6 +20973,9 @@ "gGj" = ( /obj/machinery/airalarm/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 9 }, @@ -21316,6 +21455,15 @@ }, /turf/open/floor/plating, /area/mine/production) +"gOY" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) "gPj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -21597,6 +21745,13 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/wood, /area/station/service/library) +"gUp" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) "gUr" = ( /obj/item/trash/sosjerky, /turf/open/floor/plating, @@ -21819,10 +21974,7 @@ /area/station/hallway/secondary/entry) "gYa" = ( /obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 1 + dir = 9 }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) @@ -22104,6 +22256,9 @@ /obj/structure/railing{ dir = 1 }, +/obj/structure/railing/corner{ + dir = 8 + }, /turf/open/openspace, /area/station/engineering/atmos/storage) "hcL" = ( @@ -23210,18 +23365,15 @@ }, /area/station/service/chapel) "hxT" = ( +/obj/structure/railing{ + dir = 9 + }, /obj/machinery/light/small/directional/east, /obj/machinery/button/door/directional/east{ id = "drone_bay"; name = "Shutter Control"; pixel_y = -8 }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 1 - }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) "hyd" = ( @@ -23496,6 +23648,9 @@ /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 1 }, +/obj/structure/railing/corner{ + dir = 1 + }, /obj/effect/turf_decal/trimline/green/filled/warning{ dir = 1 }, @@ -24472,15 +24627,11 @@ /area/station/hallway/primary/starboard) "hUy" = ( /obj/structure/lattice/catwalk, -/obj/structure/marker_beacon/burgundy{ - name = "landing marker" - }, /obj/structure/railing{ - dir = 4; - layer = 4.1 + dir = 5 }, -/obj/structure/railing{ - dir = 1 +/obj/structure/marker_beacon/burgundy{ + name = "landing marker" }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) @@ -25527,6 +25678,9 @@ /turf/open/floor/plating, /area/station/command/heads_quarters/qm) "ikW" = ( +/obj/structure/railing/corner{ + dir = 8 + }, /obj/machinery/door/firedoor/border_only, /turf/open/floor/iron/dark/corner{ dir = 1 @@ -26010,6 +26164,7 @@ name = "Research Director Observation"; req_access = list("rd") }, +/obj/structure/railing/corner, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/command/heads_quarters/rd) @@ -26195,6 +26350,9 @@ /turf/open/floor/sepia, /area/station/security/prison/rec) "ixH" = ( +/obj/structure/railing/corner{ + dir = 1 + }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -26451,10 +26609,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/status_display/evac/directional/north, -/obj/structure/railing{ +/obj/structure/railing/corner{ dir = 1 }, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "iBl" = ( @@ -27524,10 +27682,8 @@ /area/mine/laborcamp/security) "iSk" = ( /obj/structure/lattice/catwalk, -/obj/structure/railing, /obj/structure/railing{ - dir = 4; - layer = 4.1 + dir = 6 }, /turf/open/openspace, /area/station/science/ordnance/office) @@ -27700,6 +27856,9 @@ /turf/open/floor/iron/cafeteria, /area/station/commons/dorms/laundry) "iVb" = ( +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -28112,6 +28271,7 @@ /turf/open/floor/iron/dark, /area/station/security/courtroom) "jbu" = ( +/obj/structure/railing/corner, /turf/open/floor/iron/dark/side{ dir = 9 }, @@ -28636,6 +28796,10 @@ /obj/machinery/light/directional/east, /turf/open/floor/grass, /area/station/service/hydroponics) +"jlu" = ( +/obj/structure/railing/corner, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) "jly" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -28681,6 +28845,9 @@ /turf/open/floor/iron/dark/textured, /area/station/security/range) "jmb" = ( +/obj/structure/railing/corner{ + dir = 4 + }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/firealarm/directional/north, /obj/machinery/camera{ @@ -28720,6 +28887,9 @@ /turf/open/floor/iron/grimy, /area/station/service/chapel/office) "jnn" = ( +/obj/structure/railing/corner{ + dir = 8 + }, /obj/machinery/light/small/directional/east, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) @@ -29170,6 +29340,18 @@ /obj/item/stack/sheet/glass/fifty, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"juZ" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/mine/eva/lower) "jvc" = ( /obj/machinery/door/firedoor/border_only, /turf/open/openspace, @@ -29529,9 +29711,6 @@ /obj/structure/railing{ dir = 10 }, -/obj/structure/railing{ - dir = 8 - }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) "jCD" = ( @@ -30096,6 +30275,9 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 }, +/obj/structure/railing/corner{ + dir = 4 + }, /obj/machinery/duct, /obj/machinery/camera{ c_tag = "Virology Module North"; @@ -30103,9 +30285,6 @@ network = list("ss13","medbay") }, /obj/machinery/light/small/directional/north, -/obj/structure/railing{ - dir = 1 - }, /turf/open/floor/iron/white, /area/station/medical/virology) "jLO" = ( @@ -30713,6 +30892,7 @@ /turf/open/floor/wood, /area/station/maintenance/fore) "jVq" = ( +/obj/structure/railing/corner, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/green{ @@ -31114,6 +31294,9 @@ /turf/open/floor/iron, /area/station/engineering/storage/tech) "kcA" = ( +/obj/structure/railing/corner{ + dir = 1 + }, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -31490,6 +31673,13 @@ /obj/effect/turf_decal/tile/blue/anticorner/contrasted, /turf/open/floor/iron/white, /area/station/medical/psychology) +"kht" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "khA" = ( /obj/machinery/firealarm/directional/west, /obj/item/kirbyplants/random, @@ -31812,6 +32002,9 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) "kmQ" = ( +/obj/structure/railing/corner{ + dir = 8 + }, /obj/machinery/door/firedoor/border_only, /obj/machinery/camera{ c_tag = "Service Botany - Upper South"; @@ -33939,6 +34132,14 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/white, /area/station/maintenance/port/fore) +"kUP" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/railing/corner, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) "kVx" = ( /obj/structure/cable/multilayer/multiz, /obj/effect/turf_decal/stripes/line, @@ -34443,6 +34644,9 @@ /turf/open/floor/iron, /area/station/medical/pharmacy) "lca" = ( +/obj/structure/railing/corner{ + dir = 1 + }, /obj/item/radio/intercom/directional/west, /turf/open/floor/iron/dark, /area/station/medical/morgue) @@ -35471,6 +35675,18 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/engine_smes) +"lun" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/mine/eva/lower) "lup" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 8 @@ -36106,6 +36322,9 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "lEt" = ( +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron/dark/side, /area/mine/eva) @@ -36191,9 +36410,6 @@ /obj/structure/railing{ dir = 10 }, -/obj/structure/railing{ - dir = 8 - }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "lFq" = ( @@ -36443,6 +36659,9 @@ /turf/open/floor/iron, /area/station/service/janitor) "lKZ" = ( +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -36647,6 +36866,10 @@ /turf/open/floor/iron, /area/station/maintenance/department/electrical) "lPb" = ( +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 8 + }, /turf/open/floor/plating/icemoon, /area/station/security/execution/education) "lPc" = ( @@ -36687,6 +36910,19 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"lPJ" = ( +/obj/structure/railing/corner, +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 1 + }, +/area/station/ai_monitored/command/storage/eva) "lPN" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, @@ -37430,6 +37666,9 @@ /turf/open/floor/iron, /area/station/security/prison/work) "mdy" = ( +/obj/structure/railing/corner{ + dir = 4 + }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, @@ -39656,6 +39895,15 @@ /obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/iron/white, /area/station/maintenance/aft/greater) +"mSH" = ( +/obj/structure/fence{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) "mSL" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -39957,14 +40205,6 @@ /obj/structure/sign/poster/official/random/directional/east, /turf/open/floor/iron/smooth, /area/mine/mechbay) -"mXH" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing, -/turf/open/lava/plasma/ice_moon, -/area/icemoon/underground/explored) "mXK" = ( /obj/structure/table, /obj/structure/reagent_dispensers/servingdish, @@ -40607,6 +40847,9 @@ /obj/structure/fence/door{ dir = 4 }, +/obj/structure/railing/corner{ + dir = 1 + }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) "ngY" = ( @@ -40903,16 +41146,13 @@ /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/hos) "nlJ" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/structure/railing{ + dir = 5 }, /obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/structure/railing{ dir = 1 }, -/obj/structure/railing{ +/obj/machinery/door/firedoor/border_only{ dir = 4 }, /turf/open/floor/glass/reinforced, @@ -41389,10 +41629,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/structure/sign/poster/official/random/directional/north, -/obj/structure/railing{ +/obj/structure/railing/corner{ dir = 1 }, +/obj/structure/sign/poster/official/random/directional/north, /turf/open/floor/wood, /area/station/hallway/secondary/service) "nsi" = ( @@ -42148,6 +42388,7 @@ /turf/open/floor/iron/goonplaque, /area/station/hallway/secondary/entry) "nDl" = ( +/obj/structure/railing/corner, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/tile/dark/half/contrasted, /turf/open/floor/iron/white, @@ -42171,6 +42412,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/locker) +"nDw" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "nDz" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42602,10 +42849,8 @@ /turf/open/floor/iron, /area/station/command/teleporter) "nKl" = ( -/obj/structure/railing, /obj/structure/railing{ - dir = 4; - layer = 4.1 + dir = 6 }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) @@ -44776,6 +45021,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, +/obj/structure/railing/corner, /obj/machinery/door/firedoor/border_only, /turf/open/floor/iron/cafeteria{ dir = 8 @@ -45205,6 +45451,9 @@ /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 1 }, +/obj/structure/railing/corner{ + dir = 1 + }, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "oyz" = ( @@ -45300,6 +45549,7 @@ /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) "ozM" = ( +/obj/structure/railing/corner, /obj/structure/sign/warning/biohazard/directional/west, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) @@ -45455,6 +45705,13 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"oBz" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) "oBP" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -45898,6 +46155,11 @@ /obj/effect/spawner/random/maintenance/four, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"oJk" = ( +/obj/structure/railing/corner, +/obj/effect/turf_decal/tile/brown, +/turf/open/floor/iron, +/area/station/cargo/storage) "oJn" = ( /obj/structure/flora/grass/brown/style_3, /obj/structure/flora/bush/snow/style_random, @@ -47367,6 +47629,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/railing/corner{ + dir = 1 + }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -47446,6 +47711,9 @@ dir = 4 }, /obj/structure/sign/warning/cold_temp/directional/south, +/obj/structure/railing/corner{ + dir = 8 + }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/fore/lesser) "pjF" = ( @@ -48727,6 +48995,7 @@ /turf/open/floor/iron, /area/station/maintenance/starboard/fore) "pFV" = ( +/obj/structure/railing/corner, /turf/open/floor/iron/smooth, /area/station/maintenance/fore/lesser) "pFW" = ( @@ -49887,6 +50156,7 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "pYz" = ( +/obj/structure/railing/corner, /obj/machinery/door/firedoor/border_only, /turf/open/floor/iron/dark/corner{ dir = 4 @@ -50017,7 +50287,22 @@ }, /turf/open/floor/iron/white, /area/station/medical/surgery/aft) +"qbb" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) "qbd" = ( +/obj/structure/railing/corner{ + dir = 8 + }, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -50191,6 +50476,9 @@ /turf/closed/wall/r_wall, /area/station/security/checkpoint/engineering) "qeF" = ( +/obj/structure/railing/corner{ + dir = 1 + }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -50207,6 +50495,16 @@ /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) +"qeL" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) "qeP" = ( /obj/structure/table, /obj/item/flashlight/lantern, @@ -51098,6 +51396,9 @@ /turf/open/floor/iron, /area/station/cargo/drone_bay) "quZ" = ( +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/landmark/start/botanist, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/tile/green{ @@ -51193,6 +51494,9 @@ /area/station/hallway/primary/aft) "qwi" = ( /obj/effect/turf_decal/trimline/neutral/corner, +/obj/structure/railing/corner{ + dir = 1 + }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, @@ -52527,6 +52831,9 @@ /turf/open/floor/iron/dark/textured, /area/station/security/prison/workout) "qSe" = ( +/obj/structure/railing/corner{ + dir = 1 + }, /obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, /area/station/medical/morgue) @@ -52547,9 +52854,11 @@ /area/station/security/prison/garden) "qSq" = ( /obj/structure/lattice/catwalk, -/obj/structure/railing, +/obj/structure/railing/corner{ + dir = 4 + }, /obj/structure/railing{ - dir = 8 + dir = 10 }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) @@ -52695,6 +53004,9 @@ /turf/open/floor/wood, /area/station/maintenance/aft/greater) "qUS" = ( +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/turf_decal/tile/brown{ dir = 8 }, @@ -54246,6 +54558,14 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"rwe" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/openspace, +/area/station/engineering/atmos/storage) "rwk" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -55290,6 +55610,9 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing/corner{ + dir = 8 + }, /obj/structure/cable, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -55469,6 +55792,11 @@ "rQf" = ( /turf/open/floor/plating, /area/station/engineering/supermatter/room) +"rQl" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) "rQn" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -56305,6 +56633,9 @@ /turf/open/floor/iron, /area/station/cargo/office) "sdX" = ( +/obj/structure/railing/corner{ + dir = 4 + }, /obj/structure/cable, /obj/item/assembly/timer{ pixel_y = 3 @@ -58023,6 +58354,9 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "sFS" = ( +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/turf_decal/trimline/neutral/warning{ dir = 1 }, @@ -58042,6 +58376,9 @@ name = "Medbay Access"; req_access = list("medical") }, +/obj/structure/railing/corner{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/medical/morgue) "sGk" = ( @@ -58072,6 +58409,22 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/mine/living_quarters) +"sGH" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 8 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) "sGJ" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister, @@ -58336,6 +58689,10 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/railing/corner, /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/atmos/storage) @@ -60225,6 +60582,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "tux" = ( +/obj/structure/railing/corner, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -60618,13 +60976,9 @@ /area/station/security/checkpoint/supply) "tBW" = ( /obj/structure/railing{ - dir = 1 + dir = 5 }, /obj/structure/sign/warning/biohazard/directional/west, -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "tCe" = ( @@ -62606,6 +62960,7 @@ /turf/open/floor/iron/white, /area/station/medical/pharmacy) "uhs" = ( +/obj/structure/railing/corner, /obj/machinery/camera/directional/south{ c_tag = "Mining B-1 Hallway North" }, @@ -63230,6 +63585,12 @@ /obj/machinery/light/directional/east, /turf/open/floor/grass, /area/station/service/hydroponics/garden) +"urw" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/glass/reinforced, +/area/station/hallway/primary/starboard) "urx" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, @@ -63379,6 +63740,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) +"uuC" = ( +/obj/structure/railing/corner, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "uuI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -63683,6 +64048,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "uAl" = ( +/obj/structure/railing/corner, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/commons/storage/primary) @@ -63768,6 +64134,9 @@ /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 1 }, +/obj/structure/railing/corner{ + dir = 1 + }, /obj/machinery/duct, /turf/open/floor/iron/white, /area/station/medical/virology) @@ -63962,6 +64331,15 @@ /obj/structure/closet/crate, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) +"uEI" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) "uEJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /turf/open/floor/iron, @@ -64502,6 +64880,7 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 6 }, +/obj/structure/railing/corner, /obj/effect/landmark/start/hangover, /turf/open/floor/iron/white, /area/station/medical/virology) @@ -64859,6 +65238,15 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"uWw" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) "uWD" = ( /obj/machinery/disposal/delivery_chute{ dir = 4 @@ -66988,7 +67376,9 @@ /area/station/maintenance/fore) "vEH" = ( /obj/structure/industrial_lift, -/obj/structure/railing, +/obj/structure/railing{ + dir = 6 + }, /turf/open/openspace, /area/station/commons/storage/mining) "vEJ" = ( @@ -67335,6 +67725,9 @@ /turf/open/floor/iron/dark, /area/station/science/breakroom) "vJY" = ( +/obj/structure/railing/corner{ + dir = 8 + }, /obj/machinery/door/window/brigdoor{ dir = 8; name = "Research Director Observation"; @@ -67436,6 +67829,9 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 10 }, +/obj/structure/railing/corner{ + dir = 8 + }, /turf/open/floor/iron/white, /area/station/medical/virology) "vMi" = ( @@ -67719,6 +68115,12 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"vRY" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "vSa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -67981,6 +68383,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/command/bridge) +"vWP" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) "vWV" = ( /obj/structure/chair/office{ dir = 8 @@ -68020,6 +68430,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) +"vXv" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/openspace, +/area/station/engineering/atmos/storage) "vXy" = ( /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) @@ -70914,10 +71338,7 @@ "wQY" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8 + dir = 9 }, /turf/open/openspace, /area/station/science/ordnance/office) @@ -71057,6 +71478,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "wSX" = ( +/obj/structure/railing/corner, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron/dark/side, @@ -72438,9 +72860,8 @@ /area/station/hallway/primary/central) "xnX" = ( /obj/structure/lattice/catwalk, -/obj/structure/railing, /obj/structure/railing{ - dir = 4 + dir = 6 }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) @@ -74406,10 +74827,7 @@ /area/mine/eva/lower) "xVT" = ( /obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8 + dir = 9 }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) @@ -91976,7 +92394,7 @@ ghx ghx hMz hUy -xuo +dZS xuo scw iDt @@ -92491,7 +92909,7 @@ ghx ghx ghx stA -ojf +rQl hUK hUK xMq @@ -92735,7 +93153,7 @@ ghx ghx ghx ghx -ghx +jlu uwH lWI flZ @@ -92743,7 +93161,7 @@ lWI lWI lWI qrj -qSq +ena ghx ghx ghx @@ -92992,7 +93410,7 @@ ghx ghx ghx ndA -dLH +mSH ngM kgN wDU @@ -93000,9 +93418,9 @@ sKo sKo sKo wDU -ojf +kUP okH -mXH +qSq ghx stA xlq @@ -93259,10 +93677,10 @@ fob wDU xlq ghx -stA +qeL lWI -ojf -ojf +gUp +ayG okH qSq ghx @@ -93514,9 +93932,9 @@ qmt xbA qmt wDU -ojf +oBz lWI -ojf +gUp ojf ojf xlq @@ -93776,9 +94194,9 @@ wDU dqW xuo xuo -ojf +oBz lWI -xlq +vWP ghx ghx ghx @@ -95309,7 +95727,7 @@ xBF nfr qmt iVm -iGv +lun vip gSO uPt @@ -95566,7 +95984,7 @@ kLa qmt qmt sAa -iGv +juZ vFM lIR uUT @@ -96042,7 +96460,7 @@ ghx ghx ghx psb -xuo +fSd hUK gqG thA @@ -97584,7 +98002,7 @@ thA xuo wYp odW -xuo +uWw psb ghx ghx @@ -98063,7 +98481,7 @@ thA rfu lWI lWI -lWI +adD lWI ena ghx @@ -98322,7 +98740,7 @@ xuo xuo xuo xuo -ojf +oBz ena ghx ghx @@ -98580,7 +98998,7 @@ xuo xuo xuo xuo -ojf +oBz ena ghx ghx @@ -98838,7 +99256,7 @@ rfu pjj daf kmH -ojf +oBz ena ghx ghx @@ -99096,7 +99514,7 @@ pjj daf daf xuo -ojf +oBz ena ghx ghx @@ -157739,7 +158157,7 @@ afz tKI szG iwS -iwS +eId lWh lWh iwS @@ -158265,7 +158683,7 @@ gjq gjq gjq hxT -xuo +aFG hZe xuo jnn @@ -177790,7 +178208,7 @@ fuH fuH btU oYm -dYr +kht wqi qhy dYX @@ -182683,7 +183101,7 @@ ozM nKl cgR tBW -iDt +vRY ffe oxO oxO @@ -182935,7 +183353,7 @@ thA thA xMq xMq -iDt +fWw nKl ghx ghx @@ -183449,12 +183867,12 @@ thA thA thA scw -iDt +nDw lFp ghx ghx xVT -iDt +blf xMq xMq alM @@ -183707,10 +184125,10 @@ thA thA xMq xMq -iDt +nDw tUV tUV -iDt +blf iDt scw xMq @@ -226112,12 +226530,12 @@ vlN mmi wiz mmi -jhy +oJk jjk jjk jjk sOm -eWV +uEI ajw maT maT @@ -233018,7 +233436,7 @@ iVi bWn ylz xMX -sFS +lPJ nVB nVB nVB @@ -242273,7 +242691,7 @@ cXN gmW jOY tux -tGZ +dsO kQX tGZ oBp @@ -242799,7 +243217,7 @@ izC jRA jRA dGP -ixH +fZo nGz izC yjX @@ -244134,9 +244552,9 @@ pOy njA sKW hGs -nZH +vXv hGs -wDg +gOY ylM vep trf @@ -244648,7 +245066,7 @@ npD npD gGj mue -fij +sGH bPt fij oDh @@ -245932,7 +246350,7 @@ edT wRr npD bPY -nZH +rwe wGO npD oUi @@ -250800,7 +251218,7 @@ oQx vpW jbU lec -pMF +fmU qhL wve hfc @@ -251059,7 +251477,7 @@ jbU kZd hdH qhL -wve +dkK vVP vVP vVP @@ -252826,7 +253244,7 @@ gEE gEE chK leM -bMY +gqj emp cYE lso @@ -253838,7 +254256,7 @@ rPu lUC tXV kvX -hxI +brL cYY cYY wrX @@ -253854,7 +254272,7 @@ gEE gEE nlJ rrp -bMY +urw emp bvI lso @@ -253862,7 +254280,7 @@ mtT pLa jJF yeB -lZi +uuC hDb qWn gav @@ -254375,7 +254793,7 @@ cvr cvr equ lso -lso +uuC ePR kwK qWn @@ -255424,7 +255842,7 @@ bEJ bEJ mXe bEJ -bEJ +qbb piM hLO hLO diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 20b55db673a0..975e7f4f6a7b 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -26881,10 +26881,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "jLG" = ( -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, +/obj/structure/railing/corner, /turf/open/floor/plating/airless, /area/space/nearstation) "jMo" = ( @@ -29943,6 +29940,9 @@ /turf/open/floor/iron, /area/station/cargo/miningoffice) "kRf" = ( +/obj/structure/railing{ + dir = 6 + }, /obj/effect/turf_decal/trimline/yellow/filled/end, /obj/effect/turf_decal/trimline/yellow/warning{ dir = 10 @@ -29953,11 +29953,6 @@ pixel_y = 4 }, /obj/structure/cable, -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, -/obj/structure/railing, /turf/open/floor/iron, /area/station/engineering/atmos) "kRi" = ( @@ -41869,10 +41864,8 @@ /area/station/hallway/secondary/entry) "pdU" = ( /obj/structure/railing{ - dir = 4; - layer = 4.1 + dir = 6 }, -/obj/structure/railing, /turf/open/floor/plating/airless, /area/space/nearstation) "pdX" = ( @@ -61000,10 +60993,8 @@ /obj/structure/railing{ dir = 4 }, -/obj/structure/railing, /obj/structure/railing{ - dir = 8; - layer = 4.1 + dir = 10 }, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos) diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index 5b5b9b45d37b..0af79460e1bb 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -560,11 +560,10 @@ /turf/open/floor/plating, /area/mine/maintenance/production) "dw" = ( -/obj/effect/turf_decal/sand/plating/volcanic, /obj/structure/railing{ - dir = 8 + dir = 10 }, -/obj/structure/railing, +/obj/effect/turf_decal/sand/plating/volcanic, /turf/open/floor/plating/lavaland_atmos, /area/lavaland/surface/outdoors) "dx" = ( @@ -746,6 +745,13 @@ /obj/structure/fans/tiny, /turf/open/floor/plating, /area/mine/laborcamp/security/maintenance) +"fb" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/lattice/catwalk/mining, +/turf/open/lava/smooth/lava_land_surface, +/area/lavaland/surface/outdoors) "fe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -3209,6 +3215,13 @@ "rF" = ( /turf/closed/wall/r_wall, /area/mine/maintenance/labor) +"rG" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/effect/turf_decal/sand/plating/volcanic, +/turf/open/floor/plating/lavaland_atmos, +/area/lavaland/surface/outdoors) "rH" = ( /obj/machinery/mineral/processing_unit{ dir = 1; @@ -3749,6 +3762,13 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/mine/maintenance/service) +"vd" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/effect/turf_decal/sand/plating/volcanic, +/turf/open/floor/plating/lavaland_atmos, +/area/lavaland/surface/outdoors) "ve" = ( /obj/structure/cable, /obj/machinery/power/terminal{ @@ -4086,6 +4106,13 @@ dir = 1 }, /area/mine/mechbay) +"xh" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/effect/turf_decal/sand/plating/volcanic, +/turf/open/floor/plating/lavaland_atmos, +/area/lavaland/surface/outdoors) "xi" = ( /obj/structure/table, /obj/item/paper, @@ -4686,6 +4713,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth_edge, /area/mine/laborcamp/production) +"AQ" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) "AV" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/item/reagent_containers/cup/glass/bottle/beer, @@ -4706,6 +4739,10 @@ }, /turf/open/floor/iron/dark, /area/mine/production) +"Bd" = ( +/obj/structure/railing/corner, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) "By" = ( /obj/machinery/door/poddoor/preopen{ id = "labor"; @@ -6544,6 +6581,9 @@ /turf/open/floor/iron/checker, /area/mine/cafeteria) "MQ" = ( +/obj/structure/railing/corner{ + dir = 4 + }, /obj/structure/sign/directions/security/directional/west{ pixel_x = 32; pixel_y = -8 @@ -7248,10 +7288,20 @@ /obj/structure/closet/toolcloset, /turf/open/floor/plating, /area/mine/maintenance/service) +"RB" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/lattice/catwalk/mining, +/turf/open/lava/smooth/lava_land_surface, +/area/lavaland/surface/outdoors) "RD" = ( /turf/closed/wall, /area/mine/maintenance/labor) "RF" = ( +/obj/structure/railing/corner{ + dir = 1 + }, /obj/structure/sign/directions/security/directional/west{ pixel_x = 0; pixel_y = 24 @@ -34559,7 +34609,7 @@ pU pU pU pU -pU +AQ ZM ZM ZM @@ -34572,8 +34622,8 @@ ZM ZM ZM Ka -BP -BP +vd +xh dw pU aj @@ -34814,7 +34864,7 @@ pU pU pU pU -pU +Bd VK VK VK @@ -35087,7 +35137,7 @@ aj aj aj FH -BP +rG ol aj aj @@ -37401,7 +37451,7 @@ px DI oS BP -BP +xh ZM ZM ZM @@ -37661,7 +37711,7 @@ xt VK VK VK -tF +fb BP dx Kf @@ -44333,7 +44383,7 @@ pU nm Nc nm -tF +RB Yq aj aj @@ -47143,7 +47193,7 @@ pU pU pU pU -pU +AQ ZM ZM ZM @@ -47400,7 +47450,7 @@ pU pU pU pU -pU +Bd VK VK VK diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index 16a8802a3e0f..cdccfc870255 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -2491,6 +2491,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, +/obj/structure/railing/corner, /obj/machinery/ticket_machine/directional/north{ id = "ticket_machine_med" }, @@ -4385,6 +4386,9 @@ /obj/effect/turf_decal/trimline/purple/arrow_cw{ dir = 9 }, +/obj/structure/railing/corner{ + dir = 4 + }, /turf/open/floor/iron/dark/textured/airless, /area/station/science/lobby) "cwX" = ( @@ -6538,6 +6542,17 @@ dir = 8 }, /area/station/security/office) +"dDB" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4; + invisibility = 101 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/iron/white/textured, +/area/station/medical/medbay/lobby) "dDN" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -8663,12 +8678,12 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 }, +/obj/structure/railing{ + dir = 10 + }, /obj/machinery/ticket_machine/directional/east{ id = "ticket_machine_engie" }, -/obj/structure/railing{ - dir = 8 - }, /turf/open/floor/plastic, /area/station/hallway/primary/central) "eLw" = ( @@ -9679,13 +9694,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/disposal/incinerator) -"fmC" = ( -/mob/living/basic/chicken, -/obj/structure/railing{ - dir = 8 - }, -/turf/open/misc/sandy_dirt, -/area/station/service/hydroponics/upper) "fmI" = ( /obj/structure/spider/stickyweb/sealed, /turf/open/floor/plating, @@ -12837,13 +12845,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/engineering/break_room) -"hfF" = ( -/mob/living/basic/chicken/brown, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/misc/sandy_dirt, -/area/station/service/hydroponics/upper) "hfR" = ( /obj/structure/weightmachine/stacklifter, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -13957,6 +13958,14 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) +"hNC" = ( +/obj/structure/railing, +/obj/structure/disposalpipe/segment{ + dir = 4; + invisibility = 101 + }, +/turf/open/floor/wood, +/area/station/service/hydroponics/upper) "hNH" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 @@ -15386,6 +15395,9 @@ /obj/effect/turf_decal/trimline/purple/corner{ dir = 8 }, +/obj/structure/railing/corner{ + dir = 8 + }, /turf/open/floor/iron/dark/textured_corner{ dir = 8 }, @@ -15491,6 +15503,13 @@ /obj/effect/spawner/random/trash, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +"iIX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/service/hydroponics/upper) "iJb" = ( /obj/effect/turf_decal/stripes{ dir = 9 @@ -16136,6 +16155,21 @@ "jcU" = ( /turf/open/floor/carpet/purple, /area/station/science/server) +"jdb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/machinery/ticket_machine/directional/north{ + id = "ticket_machine_med" + }, +/obj/effect/turf_decal/trimline/blue/line, +/turf/open/floor/iron/dark/textured, +/area/station/medical/medbay/lobby) "jdl" = ( /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar/backroom) @@ -18182,6 +18216,7 @@ /obj/effect/turf_decal/trimline/purple/arrow_cw{ dir = 10 }, +/obj/structure/railing/corner, /turf/open/floor/iron/dark/textured/airless, /area/station/science/lobby) "kie" = ( @@ -18993,6 +19028,9 @@ "kFH" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/wood, /area/station/service/hydroponics/upper) "kFT" = ( @@ -19339,12 +19377,6 @@ "kMm" = ( /obj/structure/cable, /obj/structure/nestbox, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8 - }, /turf/open/misc/sandy_dirt, /area/station/service/hydroponics/upper) "kMx" = ( @@ -22290,6 +22322,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, +/obj/structure/railing, /obj/structure/disposalpipe/segment{ dir = 4; invisibility = 101 @@ -22894,9 +22927,6 @@ /area/station/hallway/primary/central) "mQX" = ( /mob/living/basic/chicken, -/obj/structure/railing{ - dir = 1 - }, /obj/structure/railing{ dir = 4 }, @@ -22999,6 +23029,9 @@ "mTs" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/wood, /area/station/service/hydroponics/upper) "mTt" = ( @@ -25652,9 +25685,6 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) "opQ" = ( -/obj/structure/railing{ - dir = 1 - }, /turf/open/misc/sandy_dirt, /area/station/service/hydroponics/upper) "opR" = ( @@ -29724,9 +29754,6 @@ /area/station/tcommsat/server) "qEb" = ( /obj/machinery/camera/autoname/directional/north, -/obj/structure/railing{ - dir = 4 - }, /turf/open/misc/sandy_dirt, /area/station/service/hydroponics/upper) "qEi" = ( @@ -31531,6 +31558,9 @@ /obj/effect/turf_decal/trimline/purple/corner{ dir = 1 }, +/obj/structure/railing/corner{ + dir = 1 + }, /turf/open/floor/iron/dark/textured_corner{ dir = 1 }, @@ -32634,6 +32664,7 @@ "skl" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing, /obj/structure/disposalpipe/segment{ dir = 4; invisibility = 101 @@ -33627,6 +33658,17 @@ }, /turf/open/floor/iron/dark/textured, /area/station/security/office) +"sNI" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4; + invisibility = 101 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/iron/white/textured, +/area/station/medical/medbay/lobby) "sNP" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 @@ -40052,13 +40094,6 @@ }, /turf/open/floor/wood/large, /area/station/security/checkpoint/customs) -"wzS" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing, -/turf/open/misc/sandy_dirt, -/area/station/service/hydroponics/upper) "wAk" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -62839,10 +62874,10 @@ csW csW syi qEb -wzS +hsV xyY kFH -kqQ +iIX kqQ eqZ djv @@ -63099,7 +63134,7 @@ syi mTs skl kMm -fmC +dJB hmD hmD sxX @@ -63611,7 +63646,7 @@ qxW xCU eig aST -xva +hNC opQ xPK hmD @@ -63868,8 +63903,8 @@ qxW csW syi clC -xva -hfF +hNC +xPK mLJ hmD uRS @@ -70271,7 +70306,7 @@ xxZ eJv eJv bsc -dno +dDB kAH cIO oIu @@ -72069,8 +72104,8 @@ eXH uOF eJv eJv -bsc -dno +jdb +sNI kAH cIO xev diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index d2acc42cf531..fd0d7cf8bf48 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -2634,7 +2634,7 @@ /obj/item/folder/blue, /obj/item/stamp/law, /obj/item/banhammer{ - force = -10; + force = 2000; name = "Hammer of Justice"; desc = "Divine Judgement." }, @@ -2989,6 +2989,17 @@ }, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/courtroom) +"lX" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/poddoor/shutters{ + id = "XCCsec1"; + name = "XCC Checkpoint 1 Shutters"; + max_integrity = 3000000 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/control) "md" = ( /obj/machinery/computer/shuttle/labor, /obj/effect/turf_decal/stripes/line{ @@ -3822,6 +3833,15 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) +"pi" = ( +/obj/structure/table/reinforced, +/obj/item/folder/yellow, +/obj/item/stamp/qm, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supply) "pj" = ( /obj/structure/chair/office{ dir = 8 @@ -3839,8 +3859,7 @@ dir = 4; icon_state = "rightsecure"; name = "CentCom Customs"; - req_access = list("cent_captain"); - max_integrity = 300000000 + req_access = list("cent_captain") }, /obj/item/clipboard, /obj/item/folder/yellow, @@ -3972,9 +3991,7 @@ "pQ" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/structure/window/reinforced/spawner/directional/east{ - max_integrity = 300000000 - }, +/obj/structure/window/reinforced/spawner/directional/east, /obj/item/paper_bin, /obj/item/pen/red, /obj/effect/turf_decal/bot, @@ -4283,9 +4300,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/courtroom) -"rj" = ( -/turf/open/floor/iron, -/area/centcom/central_command_areas/supply) "rk" = ( /turf/open/floor/wood, /area/centcom/central_command_areas/courtroom) @@ -4910,6 +4924,15 @@ /obj/effect/mapping_helpers/airlock/access/any/command/general, /turf/open/floor/iron, /area/centcom/tdome/administration) +"tD" = ( +/obj/item/kirbyplants{ + icon_state = "plant-21" + }, +/obj/machinery/light/directional/east, +/obj/structure/mirror/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "tF" = ( /obj/machinery/door/airlock/centcom{ name = "Thunderdome Locker Room" @@ -5164,8 +5187,11 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/supply) "uH" = ( +/obj/machinery/door/airlock/centcom{ + name = "Shuttle Control Office" + }, /obj/effect/turf_decal/stripes/line, -/turf/closed/indestructible/riveted, +/turf/open/floor/iron, /area/centcom/central_command_areas/supply) "uK" = ( /obj/machinery/processor, @@ -5376,10 +5402,14 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) "vG" = ( +/obj/machinery/door/poddoor/shutters{ + id = "XCCsec1"; + name = "XCC Checkpoint 1 Shutters"; + max_integrity = 3000000 + }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/door/poddoor/shutters/cc/xcc, /turf/open/floor/iron, /area/centcom/central_command_areas/control) "vH" = ( @@ -7693,14 +7723,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/dark/textured_large, /area/centcom/central_command_areas/evacuation/ship) -"FJ" = ( -/obj/machinery/door/airlock/centcom{ - name = "Shuttle Control Office" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/mapping_helpers/airlock/access/any/admin/general, -/turf/open/space/basic, -/area/centcom/central_command_areas/admin) "FK" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/trimline/dark_red/filled/line, @@ -9129,7 +9151,6 @@ "Nx" = ( /obj/structure/fans/tiny, /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/door/poddoor/shutters/cc/xcc, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/supply) "Ny" = ( @@ -52101,7 +52122,7 @@ TO On Ui Cs -Hz +tD oB ZF YU @@ -52358,7 +52379,7 @@ yP On On On -FJ +On On On YU @@ -52615,7 +52636,7 @@ nG iF yd GL -jt +pi FO Tq YU @@ -53652,10 +53673,10 @@ iF rK mQ io -vG -vG -vG -vG +lX +lX +lX +lX vG io rK @@ -54149,8 +54170,8 @@ oJ oJ oJ lo -uH -rj +lK +iR oJ oJ lo @@ -54657,7 +54678,7 @@ iF iF iF iF -Ih +iX iF iF iF @@ -54670,10 +54691,10 @@ no iF iF iN -Ih +iX pl pQ -Ih +iX iF iX iF diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index af27739e701d..b7876ed56dd4 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -806,6 +806,9 @@ }, /area/station/escapepodbay) "acv" = ( +/obj/structure/railing/corner{ + dir = 4 + }, /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/filingcabinet, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -815,9 +818,6 @@ c_tag = "Security - Prison Prep Room" }, /obj/structure/cable, -/obj/structure/railing{ - dir = 4 - }, /turf/open/floor/iron, /area/station/security/execution/transfer) "acw" = ( @@ -1680,6 +1680,13 @@ /obj/machinery/door/airlock/freezer, /turf/open/floor/catwalk_floor, /area/station/service/kitchen/coldroom) +"aeO" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating, +/area/station/engineering/atmos) "aeP" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner, /obj/structure/cable, @@ -1918,9 +1925,42 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/open/openspace, +/area/station/asteroid) +"afB" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/openspace, +/area/station/asteroid) +"afC" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/openspace, +/area/station/asteroid) +"afD" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/openspace, +/area/station/asteroid) +"afE" = ( /obj/structure/railing{ - dir = 1 + dir = 4 }, +/obj/structure/lattice/catwalk, /turf/open/openspace, /area/station/asteroid) "afF" = ( @@ -1934,6 +1974,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison/safe) +"afG" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/lattice/catwalk, +/turf/open/openspace, +/area/station/asteroid) "afH" = ( /obj/structure/grille, /obj/structure/window/spawner/directional/west, @@ -1948,19 +1995,30 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "afJ" = ( +/obj/structure/railing/corner{ + dir = 4 + }, /obj/structure/lattice/catwalk, -/obj/structure/railing, /obj/structure/railing{ - dir = 8; - layer = 4.1 + pixel_y = -8 + }, +/obj/structure/railing/corner{ + dir = 4; + pixel_x = -32; + pixel_y = -29 }, /turf/open/openspace, /area/station/asteroid) "afK" = ( /obj/machinery/light/directional/north, +/obj/structure/railing{ + dir = 1 + }, /obj/structure/ladder, /obj/structure/lattice/catwalk, -/obj/structure/railing, +/obj/structure/railing{ + pixel_y = -8 + }, /turf/open/openspace, /area/station/asteroid) "afL" = ( @@ -1968,11 +2026,17 @@ /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) "afM" = ( +/obj/structure/railing/corner{ + dir = 1 + }, /obj/structure/lattice/catwalk, -/obj/structure/railing, /obj/structure/railing{ - dir = 4; - layer = 4.1 + pixel_y = -8 + }, +/obj/structure/railing/corner{ + dir = 1; + pixel_x = 32; + pixel_y = -29 }, /turf/open/openspace, /area/station/asteroid) @@ -1984,6 +2048,7 @@ "afO" = ( /obj/machinery/light/directional/east, /obj/structure/lattice, +/obj/structure/railing, /turf/open/openspace, /area/station/asteroid) "afP" = ( @@ -2030,6 +2095,13 @@ /obj/structure/lattice, /turf/open/openspace, /area/station/asteroid) +"afW" = ( +/obj/effect/spawner/random{ + loot = list(/obj/effect/decal/cleanable/oil/slippery=10,/obj/effect/decal/cleanable/oil=90); + name = "funny slipper :)" + }, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/right) "afX" = ( /obj/structure/fluff/tram_rail{ dir = 1 @@ -2059,31 +2131,45 @@ /turf/open/openspace, /area/station/asteroid) "agb" = ( +/obj/structure/railing/corner, /obj/structure/lattice/catwalk, /obj/structure/railing{ - dir = 8 + dir = 1; + pixel_x = 1; + pixel_y = 6 }, -/obj/structure/railing{ - dir = 1 +/obj/structure/railing/corner{ + pixel_y = 30; + pixel_x = -31 }, /turf/open/openspace, /area/station/asteroid) "agc" = ( /obj/machinery/light/directional/south, +/obj/structure/railing, /obj/structure/ladder, /obj/structure/lattice/catwalk, /obj/structure/railing{ - dir = 1 + dir = 1; + pixel_x = 1; + pixel_y = 6 }, /turf/open/openspace, /area/station/asteroid) "agd" = ( +/obj/structure/railing/corner{ + dir = 8 + }, /obj/structure/lattice/catwalk, /obj/structure/railing{ - dir = 4 + dir = 1; + pixel_x = 1; + pixel_y = 6 }, -/obj/structure/railing{ - dir = 1 +/obj/structure/railing/corner{ + pixel_y = 30; + dir = 8; + pixel_x = 32 }, /turf/open/openspace, /area/station/asteroid) @@ -2093,8 +2179,26 @@ /area/station/asteroid) "agf" = ( /obj/structure/lattice/catwalk, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/openspace, +/area/station/asteroid) +"agg" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/openspace, +/area/station/asteroid) +"agh" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner{ + dir = 1 + }, /obj/structure/cable, -/obj/structure/railing, /turf/open/openspace, /area/station/asteroid) "agi" = ( @@ -3740,6 +3844,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "asK" = ( +/obj/structure/railing, /obj/effect/turf_decal/siding/wideplating/dark, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, @@ -4421,6 +4526,7 @@ "ayT" = ( /obj/machinery/light/directional/west, /obj/structure/lattice, +/obj/structure/railing, /turf/open/openspace, /area/station/asteroid) "azd" = ( @@ -4945,10 +5051,6 @@ dir = 10 }, /obj/machinery/smartfridge/petri/preloaded, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, /turf/open/floor/iron/white, /area/station/science/xenobiology) "aDq" = ( @@ -5342,6 +5444,9 @@ /obj/effect/turf_decal/trimline/dark_blue/corner{ dir = 8 }, +/obj/structure/railing/corner{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) @@ -5539,6 +5644,12 @@ /obj/structure/cable, /turf/open/openspace, /area/station/asteroid) +"aHk" = ( +/obj/structure/railing{ + dir = 6 + }, +/turf/open/openspace, +/area/station/asteroid) "aHl" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -5670,12 +5781,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit) -"aIe" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/open/openspace, -/area/station/security/brig) "aIi" = ( /turf/open/floor/iron, /area/station/security/prison/work) @@ -6118,6 +6223,12 @@ /turf/open/floor/iron, /area/station/commons/fitness/recreation) "aMm" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 4 + }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 1 }, @@ -6131,6 +6242,9 @@ /turf/open/floor/iron, /area/station/commons/fitness/recreation) "aMn" = ( +/obj/structure/railing/corner{ + dir = 1 + }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 1 }, @@ -6174,6 +6288,21 @@ }, /turf/closed/wall, /area/station/hallway/primary/tram/left) +"aME" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/space/openspace, +/area/station/solars/port) "aMG" = ( /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron/white, @@ -6527,17 +6656,6 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) -"aPn" = ( -/obj/structure/railing{ - dir = 10; - layer = 3.1 - }, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, -/turf/open/openspace, -/area/station/maintenance/department/security) "aPo" = ( /obj/machinery/door/airlock/research{ name = "Chemical Storage" @@ -6767,13 +6885,6 @@ "aQO" = ( /turf/closed/wall/r_wall, /area/station/command/bridge) -"aQT" = ( -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, -/turf/open/openspace, -/area/station/security/brig) "aQU" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -6926,6 +7037,12 @@ /area/station/commons/dorms) "aSQ" = ( /obj/structure/lattice/catwalk, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -8043,6 +8160,21 @@ /obj/structure/chair/stool/directional/south, /turf/open/floor/plating, /area/station/asteroid) +"bok" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/railing/corner, +/turf/open/space/openspace, +/area/station/solars/port) "bop" = ( /obj/machinery/button/door/directional/west{ id = "private_c"; @@ -8208,13 +8340,6 @@ /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/wood/parquet, /area/station/medical/psychology) -"brX" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 8 - }, -/turf/open/openspace, -/area/station/security/brig) "bsf" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/portable_atmospherics/canister/bz, @@ -8346,6 +8471,9 @@ /turf/open/floor/iron/cafeteria, /area/station/commons/dorms/laundry) "btO" = ( +/obj/structure/railing/corner{ + dir = 8 + }, /obj/machinery/light/directional/east, /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/glass/reinforced, @@ -8591,6 +8719,17 @@ }, /turf/open/floor/iron/white, /area/station/science/lower) +"bwT" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/space/openspace, +/area/station/solars/starboard/fore) "bxd" = ( /obj/machinery/computer/message_monitor{ dir = 1 @@ -8719,6 +8858,16 @@ /obj/item/lightreplacer, /turf/open/floor/glass/reinforced, /area/station/engineering/break_room) +"byH" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/space/openspace, +/area/station/solars/port) "byL" = ( /obj/effect/turf_decal/trimline/brown/filled/line, /turf/open/floor/iron, @@ -9068,6 +9217,10 @@ "bEA" = ( /obj/structure/lattice/catwalk, /obj/machinery/light/small/directional/west, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner, /turf/open/space/openspace, /area/station/solars/starboard/fore) "bEM" = ( @@ -9401,9 +9554,8 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "bJP" = ( -/obj/structure/railing, /obj/structure/railing{ - dir = 8 + dir = 10 }, /turf/open/floor/glass/reinforced, /area/station/ai_monitored/turret_protected/aisat/hallway) @@ -9418,6 +9570,7 @@ /obj/structure/railing{ dir = 8 }, +/obj/structure/railing/corner, /obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/station/engineering/atmos) @@ -9435,6 +9588,14 @@ /obj/item/fuel_pellet, /turf/open/floor/iron/dark, /area/station/cargo/drone_bay) +"bKy" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/space/openspace, +/area/station/solars/starboard/fore) "bKK" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -9570,6 +9731,15 @@ /obj/machinery/bluespace_beacon, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) +"bME" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/space/openspace, +/area/station/solars/port) "bMV" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -9859,6 +10029,11 @@ /obj/structure/lattice/catwalk, /turf/open/floor/plating/airless, /area/station/solars/port) +"bRF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/corner, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/medical) "bRU" = ( /obj/machinery/smartfridge/chemistry/preloaded, /obj/machinery/door/poddoor/shutters/preopen{ @@ -10110,6 +10285,9 @@ /turf/open/floor/iron/dark, /area/station/security/courtroom) "bVN" = ( +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/turf_decal/siding/thinplating{ dir = 5 }, @@ -10123,6 +10301,17 @@ /obj/machinery/keycard_auth/directional/east, /turf/open/floor/carpet, /area/station/command/heads_quarters/hos) +"bWi" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/space/openspace, +/area/station/solars/port) "bWr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -10845,6 +11034,20 @@ /obj/structure/closet/firecloset/full, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"cfp" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/space/openspace, +/area/station/solars/starboard/fore) "cfq" = ( /obj/structure/ladder, /obj/effect/decal/cleanable/dirt, @@ -11339,6 +11542,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, /area/station/cargo/miningdock) +"coM" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "coN" = ( /turf/open/indestructible/dark, /area/ruin/powered/clownplanet) @@ -12849,6 +13061,12 @@ /obj/effect/turf_decal/box/red/corners, /turf/open/floor/engine, /area/station/science/cytology) +"cPl" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/glass/reinforced, +/area/station/ai_monitored/turret_protected/aisat/hallway) "cPu" = ( /obj/effect/spawner/random{ loot = list(/obj/effect/decal/cleanable/oil/slippery=10,/obj/effect/decal/cleanable/oil=90); @@ -12923,6 +13141,16 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/station/science/lower) +"cQk" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/department/security) "cQD" = ( /obj/structure/table/reinforced, /obj/structure/reagent_dispensers/servingdish, @@ -13376,6 +13604,16 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) +"cYl" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/warning{ + dir = 8 + }, +/obj/structure/railing/corner, +/turf/open/floor/iron, +/area/station/hallway/primary/tram/center) "cYA" = ( /obj/docking_port/stationary{ dheight = 4; @@ -13637,12 +13875,10 @@ }, /turf/open/floor/iron, /area/station/maintenance/tram/mid) -"dcv" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/open/openspace, -/area/station/security/brig) +"ddh" = ( +/obj/structure/railing/corner, +/turf/open/floor/glass, +/area/station/commons/fitness/recreation) "ddz" = ( /obj/machinery/modular_computer/console/preset/cargochat/service{ dir = 1 @@ -14484,6 +14720,12 @@ /turf/open/floor/iron/dark, /area/station/security/interrogation) "drw" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, /obj/effect/turf_decal/siding/thinplating{ dir = 1 }, @@ -14831,6 +15073,7 @@ dir = 4 }, /obj/effect/turf_decal/trimline/green/filled/line, +/obj/structure/railing/corner, /obj/effect/turf_decal/trimline/yellow/corner, /turf/open/floor/iron/dark, /area/station/service/hydroponics) @@ -16046,14 +16289,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/checkpoint/engineering) -"dSR" = ( -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, -/obj/structure/railing, -/turf/open/openspace, -/area/station/security/brig) "dSZ" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -16277,11 +16512,19 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/airless, /area/station/maintenance/starboard/lesser) +"dXc" = ( +/obj/structure/lattice, +/obj/structure/railing, +/turf/open/openspace, +/area/station/asteroid) "dXm" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 9 }, /obj/machinery/vending/cigarette, +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 8 }, @@ -16290,9 +16533,6 @@ c_tag = "Civilian - Dormitories East Stairwell" }, /obj/structure/sign/flag/terragov/directional/north, -/obj/structure/railing{ - dir = 8 - }, /turf/open/floor/iron, /area/station/commons/dorms) "dXo" = ( @@ -16428,10 +16668,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/ladder, -/obj/structure/railing{ - dir = 9; - layer = 3.1 - }, +/obj/structure/railing, /turf/open/openspace, /area/station/maintenance/department/cargo) "dZX" = ( @@ -17132,6 +17369,9 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/department/crew_quarters/dorms) "ekX" = ( +/obj/structure/railing{ + dir = 4 + }, /obj/effect/turf_decal/siding/wideplating/dark{ dir = 4 }, @@ -17623,6 +17863,24 @@ }, /turf/open/space/openspace, /area/station/solars/port) +"esY" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/space/openspace, +/area/station/solars/starboard/fore) "etf" = ( /obj/machinery/ntnet_relay, /obj/structure/sign/warning/no_smoking{ @@ -18047,6 +18305,17 @@ }, /turf/open/floor/iron/white, /area/station/science/lobby) +"ezS" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/central/greater) "ezV" = ( /obj/machinery/duct, /obj/effect/turf_decal/trimline/neutral/filled/line, @@ -18058,13 +18327,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"ezW" = ( -/obj/effect/spawner/random{ - loot = list(/obj/effect/decal/cleanable/oil/slippery=10,/obj/effect/decal/cleanable/oil=90); - name = "funny slipper :)" - }, -/turf/open/floor/noslip/tram_plate, -/area/station/hallway/primary/tram/center) "eAe" = ( /turf/open/floor/iron/stairs/right{ dir = 1 @@ -18178,6 +18440,16 @@ /obj/effect/landmark/start/prisoner, /turf/open/floor/iron, /area/station/security/prison/safe) +"eBC" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/department/security) "eBF" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 1 @@ -18517,6 +18789,9 @@ dir = 9 }, /obj/structure/industrial_lift/public, +/obj/structure/railing{ + dir = 9 + }, /obj/machinery/elevator_control_panel/directional/west{ linked_elevator_id = "tram_sci_lift"; preset_destination_names = list("2"="Lower Deck","3"="Upper Deck") @@ -18584,6 +18859,7 @@ /turf/open/lava, /area/station/security/execution/education) "eLB" = ( +/obj/structure/railing/corner, /obj/effect/turf_decal/trimline/red/filled/corner, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, @@ -18859,10 +19135,12 @@ /turf/open/floor/plating, /area/station/maintenance/central/greater) "eQR" = ( +/obj/structure/railing/corner{ + dir = 8 + }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, -/obj/structure/railing, /turf/open/floor/iron/smooth, /area/station/command/gateway) "eQZ" = ( @@ -19276,6 +19554,7 @@ /area/station/engineering/atmos/pumproom) "eXL" = ( /obj/effect/turf_decal/siding/thinplating/corner, +/obj/structure/railing/corner, /obj/effect/turf_decal/trimline/red/corner, /turf/open/floor/iron, /area/station/security/checkpoint/supply) @@ -19448,18 +19727,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/maintenance/department/crew_quarters/dorms) -"faA" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, -/obj/structure/railing, -/turf/open/floor/plating, -/area/station/maintenance/central/greater) "faH" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -19805,6 +20072,12 @@ }, /turf/open/floor/plastic, /area/station/engineering/break_room) +"fho" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/glass/reinforced, +/area/station/ai_monitored/turret_protected/aisat/hallway) "fhv" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 6 @@ -19886,14 +20159,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/commons/dorms) -"fia" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/openspace, -/area/station/asteroid) "fid" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/lattice/catwalk, @@ -20002,16 +20267,15 @@ /turf/open/floor/iron, /area/station/maintenance/tram/left) "fjA" = ( +/obj/structure/railing{ + dir = 8 + }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, /turf/open/floor/iron/white, /area/station/science/xenobiology) "fjN" = ( @@ -20674,13 +20938,10 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing, /obj/structure/railing{ dir = 1 }, -/obj/structure/railing{ - dir = 10; - layer = 3.1 - }, /turf/open/openspace, /area/station/maintenance/department/security) "ftQ" = ( @@ -21532,6 +21793,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +"fIC" = ( +/obj/machinery/light/directional/west, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/openspace, +/area/station/asteroid) "fIH" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -22762,6 +23030,7 @@ dir = 9 }, /obj/effect/turf_decal/trimline/dark_blue/corner, +/obj/structure/railing/corner, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) "ghZ" = ( @@ -23108,6 +23377,12 @@ }, /turf/open/space/openspace, /area/station/solars/port) +"gnq" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/carpet/neon/simple/yellow, +/area/ruin/powered/clownplanet) "gnr" = ( /obj/structure/table, /obj/item/storage/box/bodybags{ @@ -23221,9 +23496,6 @@ /obj/structure/railing{ dir = 6 }, -/obj/structure/railing{ - dir = 4 - }, /turf/open/openspace/airless, /area/station/asteroid) "gpH" = ( @@ -23346,6 +23618,9 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/department/crew_quarters/dorms) "gsO" = ( +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 8 }, @@ -23367,6 +23642,7 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "gtr" = ( +/obj/structure/railing/corner, /obj/effect/turf_decal/siding/thinplating/corner, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 4 @@ -23442,6 +23718,7 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "gun" = ( +/obj/structure/railing/corner, /obj/effect/turf_decal/trimline/purple/filled/corner, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 4 @@ -23802,6 +24079,10 @@ /turf/open/floor/iron, /area/station/hallway/secondary/exit) "gAO" = ( +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/turf_decal/siding/thinplating{ dir = 1 }, @@ -23875,6 +24156,9 @@ /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 4 }, +/obj/structure/railing/corner{ + dir = 4 + }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -24486,6 +24770,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/prison) +"gMh" = ( +/obj/structure/railing/corner, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/department/cargo) "gMi" = ( /obj/machinery/air_sensor/air_tank, /turf/open/floor/engine/air, @@ -24991,7 +25282,9 @@ dir = 10 }, /obj/structure/industrial_lift/public, -/obj/structure/railing, +/obj/structure/railing{ + dir = 10 + }, /turf/open/floor/plating/elevatorshaft, /area/station/security/execution/transfer) "gTw" = ( @@ -25531,17 +25824,6 @@ /area/station/commons/fitness/recreation) "heE" = ( /obj/structure/ladder, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, /turf/open/floor/glass/reinforced, /area/station/command/bridge) "heI" = ( @@ -25622,6 +25904,9 @@ /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 1 }, +/obj/structure/railing/corner{ + dir = 1 + }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -25858,6 +26143,15 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +"hjM" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "hjN" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -26061,12 +26355,6 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating, /area/station/maintenance/central/lesser) -"hoi" = ( -/obj/structure/cable, -/obj/structure/lattice/catwalk, -/obj/structure/railing, -/turf/open/openspace, -/area/station/asteroid) "hou" = ( /obj/machinery/duct, /obj/structure/cable, @@ -26174,20 +26462,6 @@ /obj/effect/turf_decal/sand, /turf/open/floor/iron/smooth, /area/station/maintenance/department/security) -"hpJ" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/maintenance/central/greater) "hqb" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 5 @@ -26421,8 +26695,7 @@ dir = 4 }, /obj/structure/railing{ - dir = 9; - layer = 3.1 + dir = 10 }, /turf/open/floor/plating, /area/station/maintenance/department/cargo) @@ -26588,11 +26861,6 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor, /area/station/maintenance/central/lesser) -"hyB" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing, -/turf/open/openspace, -/area/station/asteroid) "hyE" = ( /obj/structure/table/glass, /obj/item/book/manual/wiki/security_space_law{ @@ -26784,6 +27052,10 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor, /area/station/maintenance/starboard/greater) @@ -27129,6 +27401,12 @@ }, /turf/open/floor/carpet, /area/station/command/heads_quarters/hos) +"hGI" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/glass, +/area/station/commons/fitness/recreation) "hGK" = ( /obj/effect/turf_decal/trimline/yellow/arrow_cw, /obj/structure/cable/layer1, @@ -27137,6 +27415,12 @@ }, /turf/open/floor/iron, /area/station/engineering/main) +"hGM" = ( +/obj/structure/railing{ + dir = 5 + }, +/turf/open/openspace, +/area/station/asteroid) "hHf" = ( /obj/structure/closet/bombcloset/security, /turf/open/floor/iron/showroomfloor, @@ -27898,7 +28182,6 @@ }, /obj/structure/flora/bush/flowers_yw/style_random, /obj/structure/flora/bush/grassy/style_random, -/obj/structure/railing, /turf/open/floor/grass, /area/station/commons/dorms) "hVb" = ( @@ -27955,6 +28238,10 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/event_spawn, /turf/open/floor/iron/stairs/old{ @@ -27992,6 +28279,9 @@ /turf/open/floor/iron, /area/station/hallway/primary/tram/center) "hWL" = ( +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 9 }, @@ -27999,10 +28289,6 @@ /obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 8 }, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, /turf/open/floor/iron, /area/station/security/brig) "hWZ" = ( @@ -28123,6 +28409,9 @@ /turf/open/misc/asteroid, /area/station/maintenance/department/security) "hYN" = ( +/obj/structure/railing{ + dir = 1 + }, /obj/effect/turf_decal/siding/thinplating/corner, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -28171,6 +28460,9 @@ /turf/open/floor/iron, /area/station/tcommsat/computer) "hZP" = ( +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 8 }, @@ -28349,6 +28641,9 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "idk" = ( +/obj/structure/railing/corner{ + dir = 4 + }, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/cigbutt, /turf/open/floor/iron/smooth, @@ -28417,10 +28712,10 @@ }, /area/station/science/robotics/mechbay) "idW" = ( +/obj/structure/railing/corner, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, -/obj/structure/railing, /turf/open/floor/iron/smooth, /area/station/command/gateway) "idZ" = ( @@ -28833,6 +29128,12 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor, /area/station/maintenance/department/security) @@ -28979,15 +29280,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"ioh" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/open/openspace, -/area/station/security/brig) "ioi" = ( /turf/open/floor/plating/airless, /area/station/science/ordnance/bomb) @@ -29173,6 +29465,7 @@ /turf/open/floor/glass/reinforced, /area/station/science/genetics) "ird" = ( +/obj/structure/railing/corner, /obj/effect/turf_decal/siding/thinplating{ dir = 9 }, @@ -29800,8 +30093,8 @@ /area/station/maintenance/department/cargo) "iAt" = ( /obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 +/obj/structure/railing/corner{ + dir = 4 }, /turf/open/openspace/airless, /area/station/asteroid) @@ -29883,6 +30176,9 @@ /turf/open/floor/iron/freezer, /area/station/commons/toilet) "iCu" = ( +/obj/structure/railing{ + dir = 8 + }, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 }, @@ -29893,10 +30189,6 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, /turf/open/floor/iron, /area/station/security/brig) "iCA" = ( @@ -30922,18 +31214,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/medical/morgue) -"iUg" = ( -/obj/effect/turf_decal/siding/thinplating{ - dir = 8 - }, -/obj/structure/flora/bush/flowers_yw/style_random, -/obj/structure/flora/bush/grassy/style_random, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/structure/railing, -/turf/open/floor/grass, -/area/station/hallway/secondary/construction/engineering) "iUh" = ( /turf/closed/wall, /area/station/security/warden) @@ -31019,6 +31299,14 @@ /obj/item/reagent_containers/cup/bucket, /turf/open/floor/iron, /area/station/service/janitor) +"iVe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash/cigbutt, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/security) "iVj" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -31153,6 +31441,16 @@ }, /turf/open/floor/iron/smooth, /area/station/maintenance/central/greater) +"iXv" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/department/security) "iXw" = ( /obj/structure/table/glass, /obj/item/storage/medkit/regular{ @@ -31507,6 +31805,7 @@ /turf/open/floor/iron, /area/station/security/prison/safe) "jdF" = ( +/obj/structure/railing, /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -31714,6 +32013,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"jgq" = ( +/obj/structure/railing/corner, +/turf/open/floor/glass/reinforced, +/area/station/ai_monitored/turret_protected/aisat/hallway) "jgs" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -31753,6 +32056,10 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, /turf/open/openspace, /area/station/maintenance/department/security) "jhd" = ( @@ -32117,7 +32424,6 @@ /obj/effect/turf_decal/trimline/dark_blue/arrow_ccw, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/landmark/navigate_destination/hop, -/obj/structure/railing, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) "jne" = ( @@ -32307,6 +32613,7 @@ dir = 6 }, /obj/structure/industrial_lift/public, +/obj/structure/railing, /turf/open/floor/plating/elevatorshaft, /area/station/science/lower) "jpV" = ( @@ -32643,16 +32950,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/corner, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"juA" = ( -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/openspace, -/area/station/security/brig) "juN" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -32959,13 +33256,30 @@ /turf/open/floor/iron, /area/station/security/prison) "jAH" = ( -/obj/structure/railing, +/obj/structure/railing{ + dir = 10 + }, /obj/effect/turf_decal/trimline/dark_red/warning{ dir = 10 }, /obj/structure/industrial_lift/public, /turf/open/floor/plating/elevatorshaft, /area/station/hallway/secondary/service) +"jAK" = ( +/obj/effect/turf_decal/siding/thinplating{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) "jAL" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/structure/disposalpipe/segment{ @@ -33138,6 +33452,9 @@ /turf/open/floor/iron/grimy, /area/station/service/chapel/office) "jDQ" = ( +/obj/structure/railing/corner{ + dir = 8 + }, /obj/structure/cable, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -33209,6 +33526,13 @@ }, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain) +"jFc" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/security) "jFh" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -33285,6 +33609,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"jGl" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/space/openspace, +/area/station/solars/starboard/fore) "jGx" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 @@ -33548,6 +33879,9 @@ /obj/effect/turf_decal/trimline/dark_blue/corner{ dir = 4 }, +/obj/structure/railing/corner{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) "jLf" = ( @@ -33923,6 +34257,12 @@ /obj/effect/turf_decal/trimline/dark_blue/corner{ dir = 8 }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) "jSe" = ( @@ -33969,12 +34309,6 @@ /obj/item/pipe_dispenser, /turf/open/floor/iron, /area/station/construction/mining/aux_base) -"jSY" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/open/openspace, -/area/station/security/brig) "jSZ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet, @@ -35363,6 +35697,9 @@ /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 }, +/obj/structure/railing/corner{ + dir = 1 + }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -35523,6 +35860,9 @@ /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 5 }, +/obj/structure/railing{ + dir = 1 + }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/construction/engineering) @@ -36394,13 +36734,6 @@ }, /turf/open/floor/catwalk_floor, /area/station/command/gateway) -"kIp" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 4 - }, -/turf/open/openspace, -/area/station/security/brig) "kIE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/white/line{ @@ -37220,9 +37553,6 @@ "kTO" = ( /obj/structure/cable, /obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, /turf/open/openspace, /area/station/asteroid) "kTT" = ( @@ -37281,6 +37611,15 @@ "kUo" = ( /turf/open/floor/iron/dark, /area/station/service/chapel) +"kUF" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/space/openspace, +/area/station/solars/starboard/fore) "kUN" = ( /obj/machinery/door/airlock/external{ autoclose = 0; @@ -37445,6 +37784,16 @@ "kXk" = ( /obj/structure/lattice/catwalk, /obj/item/stack/cable_coil, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 8 + }, /obj/structure/cable, /turf/open/space/openspace, /area/station/solars/port) @@ -39253,6 +39602,9 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "lAR" = ( +/obj/structure/railing/corner{ + dir = 4 + }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 4 }, @@ -39425,13 +39777,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"lES" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/railing, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/department/cargo) "lEU" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 4 @@ -39696,6 +40041,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/maintenance/department/medical) +"lKC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/central/lesser) "lKI" = ( /obj/structure/chair/stool/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/violet/visible, @@ -39830,6 +40186,14 @@ /obj/structure/cable/layer1, /turf/open/floor/plating/airless, /area/station/solars/port) +"lMU" = ( +/obj/machinery/light/directional/east, +/obj/structure/lattice, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/openspace, +/area/station/asteroid) "lMZ" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 8 @@ -40816,6 +41180,17 @@ /obj/machinery/vending/boozeomat, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) +"mcn" = ( +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/department/medical) "mcD" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -41587,6 +41962,12 @@ "mos" = ( /turf/closed/wall, /area/station/tcommsat/server) +"mou" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/openspace, +/area/station/asteroid) "moz" = ( /turf/open/floor/iron, /area/station/science/robotics/mechbay) @@ -42349,6 +42730,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/green/filled/line, +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/turf_decal/trimline/yellow/corner{ dir = 8 }, @@ -42557,15 +42941,15 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "mFY" = ( +/obj/structure/railing{ + dir = 4 + }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 6 }, -/obj/structure/railing{ - dir = 4 - }, /turf/open/floor/iron/white, /area/station/science/xenobiology) "mGl" = ( @@ -43354,10 +43738,6 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, /turf/open/floor/plating, /area/station/maintenance/central/greater) "mUd" = ( @@ -43411,13 +43791,6 @@ dir = 1 }, /area/station/science/robotics/lab) -"mUY" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/openspace, -/area/station/asteroid) "mVd" = ( /obj/machinery/door/airlock/atmos{ name = "The Pipe Cave" @@ -43712,6 +44085,7 @@ /turf/open/floor/iron/grimy, /area/station/service/library/lounge) "nbh" = ( +/obj/structure/railing/corner, /obj/effect/turf_decal/trimline/blue/filled/corner, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -43833,6 +44207,9 @@ /obj/structure/railing{ dir = 1 }, +/obj/structure/railing/corner{ + dir = 8 + }, /turf/open/space/openspace, /area/station/solars/starboard/fore) "ncE" = ( @@ -43930,13 +44307,35 @@ "ney" = ( /turf/open/floor/circuit/telecomms/mainframe, /area/station/tcommsat/server) +"neB" = ( +/obj/structure/cable/multilayer/multiz, +/obj/effect/turf_decal/stripes/box, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/solars/starboard/fore) "neC" = ( +/obj/structure/railing{ + dir = 1 + }, /obj/effect/turf_decal/siding/thinplating, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /turf/open/floor/glass/reinforced, /area/station/security/brig) +"neD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/security) "neE" = ( /obj/structure/table/optable, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -44585,6 +44984,12 @@ /obj/machinery/vending/wardrobe/chem_wardrobe, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"noO" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/openspace, +/area/station/asteroid) "noW" = ( /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/machinery/door/airlock/maintenance_hatch{ @@ -45168,6 +45573,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/structure/railing/corner{ + dir = 1 + }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -45670,6 +46078,13 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/station/engineering/atmos) +"nFM" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/medical) "nFZ" = ( /obj/machinery/airalarm/directional/east, /obj/machinery/camera/directional/east{ @@ -46337,16 +46752,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"nRS" = ( -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/openspace, -/area/station/security/brig) "nRT" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -46680,6 +47085,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/service/bar/backroom) +"nYa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/security) "nYr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -46797,6 +47209,9 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "oai" = ( +/obj/structure/railing{ + dir = 8 + }, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, @@ -46998,9 +47413,21 @@ "odl" = ( /obj/structure/lattice/catwalk, /obj/machinery/light/small/directional/east, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, /turf/open/space/openspace, /area/station/solars/starboard/fore) "odr" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -47056,13 +47483,6 @@ }, /turf/open/floor/iron/smooth, /area/station/hallway/primary/tram/center) -"oev" = ( -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, -/turf/open/openspace, -/area/station/maintenance/department/security) "oeN" = ( /obj/effect/decal/cleanable/dirt, /obj/item/weldingtool/empty{ @@ -47090,6 +47510,7 @@ /area/station/hallway/secondary/entry) "oft" = ( /obj/item/assembly/mousetrap/armed, +/obj/structure/railing, /obj/effect/turf_decal/siding/wideplating/dark, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, @@ -47344,6 +47765,12 @@ "ojP" = ( /obj/structure/cable/multilayer/multiz, /obj/effect/turf_decal/stripes/box, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/railing/corner{ + dir = 1 + }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/solars/port) @@ -47559,7 +47986,9 @@ dir = 5 }, /obj/structure/industrial_lift/public, -/obj/structure/railing, +/obj/structure/railing{ + dir = 5 + }, /turf/open/floor/plating/elevatorshaft, /area/station/commons/dorms) "onc" = ( @@ -47646,6 +48075,15 @@ "ooB" = ( /turf/closed/wall/r_wall, /area/station/engineering) +"opb" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/space/openspace, +/area/station/solars/port) "opn" = ( /obj/structure/closet/crate/science, /obj/effect/spawner/random/mod/maint, @@ -47713,7 +48151,6 @@ }, /obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/flora/bush/grassy/style_random, -/obj/structure/railing, /turf/open/floor/grass, /area/station/commons/dorms) "ora" = ( @@ -47946,6 +48383,12 @@ /obj/structure/closet/wardrobe/mixed, /turf/open/floor/plating, /area/station/maintenance/department/security) +"ovC" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/glass/reinforced, +/area/station/science/research) "ovL" = ( /turf/open/floor/iron, /area/station/hallway/secondary/service) @@ -48039,6 +48482,9 @@ /obj/effect/turf_decal/trimline/dark_blue/arrow_ccw{ dir = 1 }, +/obj/structure/railing{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, @@ -48380,6 +48826,9 @@ dir = 5 }, /obj/structure/industrial_lift/public, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/plating/elevatorshaft, /area/station/science/lower) "oCR" = ( @@ -48463,6 +48912,14 @@ icon_state = "clown_carpet" }, /area/station/security/execution/education) +"oEf" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/engineering/atmos) "oEz" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/yellow/arrow_cw{ @@ -48851,6 +49308,15 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +"oMU" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating{ + dir = 10 + }, +/turf/open/floor/glass/reinforced, +/area/station/security/brig) "oMX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -49226,10 +49692,7 @@ /area/station/cargo/sorting) "oTa" = ( /obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8 + dir = 9 }, /turf/open/floor/glass/reinforced, /area/station/ai_monitored/turret_protected/aisat/hallway) @@ -49296,6 +49759,9 @@ /turf/open/floor/plating, /area/station/hallway/secondary/entry) "oTJ" = ( +/obj/structure/railing{ + dir = 4 + }, /obj/effect/turf_decal/siding/thinplating{ dir = 8 }, @@ -49802,6 +50268,9 @@ /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 4 }, +/obj/structure/railing/corner{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/blue, @@ -49972,13 +50441,12 @@ /turf/open/floor/carpet, /area/station/command/heads_quarters/captain) "phs" = ( -/obj/structure/railing, +/obj/structure/railing{ + dir = 10 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/structure/railing{ - dir = 8 - }, /turf/open/floor/catwalk_floor, /area/station/maintenance/department/cargo) "phB" = ( @@ -50907,7 +51375,9 @@ /turf/open/floor/plating, /area/station/maintenance/tram/mid) "pwm" = ( -/obj/structure/railing, +/obj/structure/railing{ + dir = 10 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor, /area/station/command/gateway) @@ -51321,6 +51791,15 @@ /obj/structure/reagent_dispensers/wall/peppertank/directional/north, /turf/open/floor/iron, /area/station/security/checkpoint/escape) +"pBZ" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/glass/reinforced, +/area/station/security/brig) "pCa" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/wooden{ @@ -51351,14 +51830,6 @@ "pCm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/moisture_trap, -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, /turf/open/floor/plating, /area/station/maintenance/department/security) "pCr" = ( @@ -51536,8 +52007,10 @@ /turf/open/space/openspace, /area/space) "pEM" = ( +/obj/structure/railing{ + dir = 6 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing, /turf/open/floor/catwalk_floor, /area/station/command/gateway) "pEZ" = ( @@ -51744,13 +52217,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) -"pHq" = ( -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, -/turf/open/openspace, -/area/station/security/brig) "pHs" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/window/reinforced/spawner/directional/north, @@ -51842,6 +52308,20 @@ /obj/structure/cable, /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/ai) +"pIS" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/space/openspace, +/area/station/solars/port) "pIT" = ( /obj/effect/turf_decal/trimline/purple/filled/corner, /turf/open/floor/iron, @@ -52214,16 +52694,12 @@ /turf/open/floor/iron, /area/station/maintenance/tram/right) "pOv" = ( +/obj/structure/railing{ + dir = 6 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/structure/railing{ - dir = 9; - layer = 3.1 - }, -/obj/structure/railing{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/station/maintenance/department/cargo) "pOA" = ( @@ -52327,6 +52803,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"pPC" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/glass, +/area/station/commons/fitness/recreation) "pPN" = ( /obj/structure/reagent_dispensers/watertank/high, /obj/structure/railing{ @@ -52609,6 +53091,9 @@ /turf/open/floor/iron/white, /area/station/medical/surgery/fore) "pVy" = ( +/obj/structure/railing/corner{ + dir = 4 + }, /obj/machinery/light/directional/west, /turf/open/floor/mineral/bananium, /area/ruin/powered/clownplanet) @@ -52786,6 +53271,7 @@ /area/station/security/prison/workout) "pZv" = ( /obj/machinery/light/directional/west, +/obj/structure/railing, /turf/open/openspace, /area/station/asteroid) "pZz" = ( @@ -53071,13 +53557,13 @@ /area/station/security/brig) "qea" = ( /obj/structure/ladder, -/obj/machinery/door/firedoor/border_only{ +/obj/structure/railing{ dir = 4 }, -/obj/effect/turf_decal/trimline/purple/filled/line{ +/obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/structure/railing{ +/obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 }, /turf/open/floor/iron/white, @@ -53096,6 +53582,7 @@ /turf/open/floor/engine, /area/station/science/ordnance/burnchamber) "qei" = ( +/obj/structure/railing/corner, /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/glass/reinforced, /area/station/science/genetics) @@ -53320,7 +53807,9 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "qir" = ( -/obj/structure/railing, +/obj/structure/railing{ + dir = 5 + }, /obj/effect/decal/cleanable/dirt, /obj/structure/chair/plastic, /turf/open/floor/iron/smooth, @@ -53550,11 +54039,7 @@ /obj/structure/cable/multilayer/multiz, /obj/effect/turf_decal/stripes/end, /obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 9; - layer = 3.1 + dir = 6 }, /turf/open/floor/plating, /area/station/maintenance/department/cargo) @@ -53857,9 +54342,6 @@ dir = 4 }, /obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, /turf/open/openspace, /area/station/asteroid) "qrm" = ( @@ -55034,6 +55516,9 @@ /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 9 }, +/obj/structure/railing{ + dir = 1 + }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/construction/engineering) @@ -55104,6 +55589,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"qJh" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/glass/reinforced, +/area/station/ai_monitored/turret_protected/aisat/hallway) "qJy" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/machinery/light/directional/south, @@ -55146,6 +55637,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/brig) +"qKh" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/space/openspace, +/area/station/solars/starboard/fore) "qKj" = ( /obj/effect/turf_decal/bot/left, /obj/effect/decal/cleanable/dirt, @@ -55327,6 +55829,9 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/department/cargo) "qNz" = ( +/obj/structure/railing{ + dir = 4 + }, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, @@ -55507,14 +56012,6 @@ /obj/structure/ore_box, /turf/open/floor/iron/smooth, /area/station/maintenance/central/lesser) -"qQQ" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, -/turf/open/openspace, -/area/station/security/brig) "qQW" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/structure/sign/flag{ @@ -55608,10 +56105,7 @@ "qSG" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 4 + dir = 5 }, /turf/open/openspace/airless, /area/station/asteroid) @@ -56187,15 +56681,6 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) -"rav" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/open/openspace, -/area/station/security/brig) "raP" = ( /obj/effect/turf_decal/trimline/purple/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -56464,7 +56949,9 @@ dir = 10 }, /obj/structure/industrial_lift/public, -/obj/structure/railing, +/obj/structure/railing{ + dir = 10 + }, /turf/open/floor/plating/elevatorshaft, /area/station/cargo/miningdock) "rfk" = ( @@ -56715,6 +57202,12 @@ /obj/effect/landmark/start/quartermaster, /turf/open/floor/carpet, /area/station/command/heads_quarters/qm) +"riN" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/openspace, +/area/station/asteroid) "riS" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -56814,6 +57307,15 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/medical/medbay/lobby) +"rkA" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/light/small/directional/west, +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/space/openspace, +/area/station/solars/starboard/fore) "rkI" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -57385,6 +57887,9 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/central) "ruA" = ( +/obj/structure/railing{ + dir = 1 + }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -57660,6 +58165,15 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, /area/station/maintenance/radshelter/civil) +"rzX" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating{ + dir = 6 + }, +/turf/open/floor/glass/reinforced, +/area/station/security/brig) "rzZ" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 4 @@ -58027,15 +58541,14 @@ /obj/structure/railing{ dir = 4 }, +/obj/structure/railing{ + dir = 8 + }, /obj/structure/ladder, /obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, /turf/open/openspace, /area/station/maintenance/department/crew_quarters/dorms) "rHC" = ( @@ -58354,6 +58867,12 @@ /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "rMJ" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, /obj/machinery/light/floor/has_bulb, /obj/effect/landmark/event_spawn, /obj/machinery/door/firedoor/border_only{ @@ -58645,10 +59164,6 @@ }, /turf/open/floor/glass/reinforced, /area/station/science/genetics) -"rQF" = ( -/obj/structure/railing, -/turf/open/openspace, -/area/station/security/brig) "rQG" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 @@ -58664,6 +59179,9 @@ "rQR" = ( /obj/structure/lattice/catwalk, /obj/structure/railing, +/obj/structure/railing/corner{ + dir = 4 + }, /turf/open/space/openspace, /area/station/solars/starboard/fore) "rQT" = ( @@ -58805,9 +59323,6 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 1 }, -/obj/structure/railing{ - dir = 1 - }, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) "rSZ" = ( @@ -58975,15 +59490,6 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/iron/smooth, /area/station/maintenance/department/cargo) -"rXX" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/open/floor/glass/reinforced, -/area/station/ai_monitored/turret_protected/aisat/hallway) "rYd" = ( /obj/structure/bodycontainer/morgue{ dir = 2 @@ -60233,6 +60739,21 @@ /obj/machinery/nanite_program_hub, /turf/open/floor/iron/white, /area/station/science/ordnance/office) +"stK" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/railing/corner, +/obj/structure/cable, +/turf/open/space/openspace, +/area/station/solars/port) "stL" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -61080,18 +61601,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/service/janitor) -"sHp" = ( -/obj/effect/turf_decal/siding/thinplating{ - dir = 4 - }, -/obj/structure/flora/bush/flowers_yw/style_random, -/obj/structure/flora/bush/grassy/style_random, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/structure/railing, -/turf/open/floor/grass, -/area/station/hallway/secondary/construction/engineering) "sHu" = ( /obj/machinery/firealarm/directional/west, /turf/open/floor/iron, @@ -61389,6 +61898,15 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/iron, /area/station/security/office) +"sLi" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing, +/obj/structure/railing/corner, +/turf/open/space/openspace, +/area/station/solars/starboard/fore) "sLv" = ( /obj/machinery/light/directional/north, /obj/machinery/camera{ @@ -61465,6 +61983,9 @@ /turf/open/floor/iron, /area/station/commons/dorms) "sNb" = ( +/obj/structure/railing/corner{ + dir = 4 + }, /obj/effect/turf_decal/trimline/red/filled/line, /obj/effect/turf_decal/trimline/red/corner{ dir = 4 @@ -61539,6 +62060,21 @@ }, /turf/open/floor/iron, /area/station/cargo/miningdock) +"sOg" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/space/openspace, +/area/station/solars/port) "sOq" = ( /obj/machinery/vending/wardrobe/sec_wardrobe, /obj/machinery/status_display/ai/directional/west, @@ -62443,6 +62979,10 @@ }, /turf/open/floor/iron, /area/station/science/lab) +"tdu" = ( +/obj/structure/railing, +/turf/open/openspace, +/area/station/asteroid) "tdx" = ( /turf/closed/wall, /area/station/maintenance/port/aft) @@ -62596,6 +63136,7 @@ /turf/open/floor/iron, /area/station/security/office) "tfp" = ( +/obj/structure/railing, /obj/effect/turf_decal/siding/thinplating{ dir = 1 }, @@ -62649,6 +63190,9 @@ dir = 10 }, /obj/structure/industrial_lift/public, +/obj/structure/railing{ + dir = 10 + }, /obj/effect/landmark/lift_id{ specific_lift_id = "tram_sci_lift" }, @@ -63038,6 +63582,12 @@ }, /turf/open/floor/iron/smooth, /area/station/hallway/primary/tram/center) +"tlH" = ( +/obj/structure/railing{ + dir = 10 + }, +/turf/open/openspace, +/area/station/asteroid) "tlO" = ( /obj/structure/industrial_lift/public, /obj/effect/turf_decal/caution/stand_clear/red, @@ -63156,6 +63706,15 @@ }, /turf/open/floor/iron, /area/station/construction/mining/aux_base) +"tnX" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/department/cargo) "tod" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -64135,6 +64694,16 @@ /obj/structure/fluff/tram_rail, /turf/open/openspace, /area/station/hallway/primary/tram/center) +"tCw" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/space/openspace, +/area/station/solars/starboard/fore) "tCT" = ( /turf/open/floor/plating, /area/station/hallway/secondary/entry) @@ -65048,6 +65617,9 @@ /turf/open/floor/iron, /area/station/hallway/primary/tram/right) "tTJ" = ( +/obj/structure/railing{ + dir = 8 + }, /obj/effect/turf_decal/siding/thinplating{ dir = 4 }, @@ -65221,7 +65793,23 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/command) +"tWo" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/space/openspace, +/area/station/solars/starboard/fore) "tWw" = ( +/obj/structure/railing/corner, /obj/effect/turf_decal/siding/thinplating/corner, /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -65693,6 +66281,19 @@ /obj/effect/turf_decal/trimline/blue/filled/corner, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"ueM" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/starboard/lesser) "ueZ" = ( /obj/machinery/atmospherics/miner/carbon_dioxide, /turf/open/floor/engine/co2, @@ -66343,6 +66944,21 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/airless, /area/station/asteroid) +"upS" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/space/openspace, +/area/station/solars/starboard/fore) "upX" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -66379,15 +66995,13 @@ dir = 5 }, /obj/effect/spawner/random/vending/colavend, +/obj/structure/railing/corner, /obj/effect/turf_decal/siding/thinplating/corner, /obj/item/radio/intercom/directional/east, /obj/machinery/camera/directional/east{ c_tag = "Civilian - Dormitories West Stairwell" }, /obj/structure/sign/flag/nanotrasen/directional/north, -/obj/structure/railing{ - dir = 4 - }, /turf/open/floor/iron, /area/station/commons/dorms) "uqo" = ( @@ -66711,6 +67325,12 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"uvB" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/glass/reinforced, +/area/station/science/research) "uvD" = ( /obj/effect/decal/cleanable/dirt, /obj/item/soap, @@ -66995,6 +67615,13 @@ /obj/effect/turf_decal/trimline/white/warning, /turf/open/floor/iron, /area/station/maintenance/tram/left) +"uAc" = ( +/obj/structure/lattice, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/openspace, +/area/station/asteroid) "uAn" = ( /obj/effect/landmark/start/depsec/supply, /obj/structure/chair/office{ @@ -67109,10 +67736,7 @@ /area/station/maintenance/disposal/incinerator) "uCh" = ( /obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 1 + dir = 5 }, /turf/open/floor/glass/reinforced, /area/station/ai_monitored/turret_protected/aisat/hallway) @@ -67529,6 +68153,10 @@ "uHW" = ( /obj/structure/ladder, /obj/effect/turf_decal/stripes/box, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/solars/port) @@ -68051,6 +68679,17 @@ /obj/structure/reagent_dispensers/beerkeg, /turf/open/floor/iron/smooth, /area/station/maintenance/department/cargo) +"uPh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/security) "uPi" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -68120,7 +68759,9 @@ /area/station/hallway/secondary/exit/departure_lounge) "uQP" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/railing, +/obj/structure/railing{ + dir = 5 + }, /obj/effect/turf_decal/siding/wideplating/dark{ dir = 5 }, @@ -68176,6 +68817,12 @@ /obj/structure/lattice/catwalk, /obj/machinery/light/small/directional/east, /obj/structure/cable, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, /turf/open/space/openspace, /area/station/solars/port) "uSL" = ( @@ -68517,6 +69164,17 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/freezer, /area/station/security/prison) +"uXM" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/space/openspace, +/area/station/solars/port) "uXV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/yellow/warning{ @@ -69040,6 +69698,9 @@ /turf/open/floor/iron/dark/textured, /area/station/engineering/main) "vgl" = ( +/obj/structure/railing{ + dir = 8 + }, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 }, @@ -69052,10 +69713,6 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, /turf/open/floor/iron, /area/station/security/brig) "vgm" = ( @@ -69134,7 +69791,6 @@ }, /obj/effect/turf_decal/delivery/white, /obj/effect/mapping_helpers/trapdoor_placer, -/obj/structure/railing, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) "vhU" = ( @@ -69997,6 +70653,9 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/lesser) "vsg" = ( +/obj/structure/railing{ + dir = 4 + }, /obj/effect/turf_decal/siding/wideplating/dark{ dir = 4 }, @@ -70258,6 +70917,11 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit) +"vwN" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner, +/turf/open/space/openspace, +/area/station/solars/starboard/fore) "vwT" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -70429,6 +71093,16 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/tcommsat/computer) +"vAj" = ( +/obj/structure/ladder, +/obj/effect/turf_decal/stripes/box, +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/solars/starboard/fore) "vAm" = ( /obj/machinery/computer/bank_machine{ dir = 1 @@ -70691,9 +71365,6 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 1 - }, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) "vCt" = ( @@ -71043,6 +71714,21 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/smooth, /area/station/maintenance/disposal/incinerator) +"vHO" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) "vIa" = ( /obj/machinery/button/door/directional/west{ id = "Engineering3"; @@ -71651,6 +72337,10 @@ /turf/open/floor/circuit/telecomms/server, /area/station/science/server) "vSh" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/railing/corner, /obj/machinery/disposal/bin, /obj/effect/turf_decal/siding/thinplating/corner, /obj/effect/turf_decal/siding/thinplating/corner{ @@ -71900,9 +72590,6 @@ /obj/structure/railing{ dir = 6 }, -/obj/structure/railing{ - dir = 4 - }, /turf/open/floor/glass/reinforced, /area/station/ai_monitored/turret_protected/aisat/hallway) "vWx" = ( @@ -72573,6 +73260,15 @@ }, /turf/open/floor/glass/reinforced, /area/station/science/research) +"whS" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/railing/corner, +/turf/open/space/openspace, +/area/station/solars/starboard/fore) "whW" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -73043,6 +73739,12 @@ "wqC" = ( /obj/structure/lattice/catwalk, /obj/structure/railing, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 1 + }, /obj/structure/cable, /obj/machinery/light/floor/has_bulb, /turf/open/openspace, @@ -73294,6 +73996,9 @@ /turf/open/floor/iron, /area/station/command/heads_quarters/qm) "wuE" = ( +/obj/structure/railing/corner{ + dir = 4 + }, /turf/open/floor/glass, /area/station/commons/fitness/recreation) "wuF" = ( @@ -73740,6 +74445,9 @@ /turf/open/floor/plating, /area/station/maintenance/tram/mid) "wAs" = ( +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 8 }, @@ -74010,6 +74718,10 @@ /obj/structure/railing{ dir = 1 }, +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 8 + }, /obj/machinery/light/floor/has_bulb, /turf/open/openspace, /area/station/solars/port) @@ -74152,6 +74864,9 @@ /obj/effect/turf_decal/siding/thinplating/corner{ dir = 1 }, +/obj/structure/railing/corner{ + dir = 1 + }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -74992,6 +75707,12 @@ }, /turf/open/floor/iron, /area/station/security/prison) +"wWT" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/glass/reinforced, +/area/station/science/research) "wXi" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 10 @@ -75454,6 +76175,9 @@ /turf/open/floor/iron, /area/station/commons/fitness) "xhN" = ( +/obj/structure/railing{ + dir = 4 + }, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/engineering/canister, /turf/open/floor/iron/smooth, @@ -75480,6 +76204,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/maintenance/port/central) +"xis" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/turf/open/openspace, +/area/station/asteroid) "xiA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -75945,6 +76677,13 @@ }, /turf/open/floor/iron/dark, /area/station/security/interrogation) +"xrt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/security) "xrD" = ( /obj/effect/landmark/navigate_destination/engineering, /obj/structure/table/wood/fancy/orange, @@ -76052,17 +76791,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) -"xtd" = ( -/obj/structure/lattice/catwalk, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/openspace, -/area/station/asteroid) "xti" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 @@ -76203,6 +76931,9 @@ /turf/open/floor/iron/dark, /area/station/service/hydroponics) "xwa" = ( +/obj/structure/railing/corner{ + dir = 1 + }, /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 }, @@ -76346,6 +77077,10 @@ }, /turf/open/floor/iron, /area/station/construction/mining/aux_base) +"xyt" = ( +/obj/structure/railing/corner, +/turf/open/floor/glass/reinforced, +/area/station/science/research) "xyu" = ( /obj/machinery/duct, /obj/effect/turf_decal/trimline/neutral/filled/line, @@ -76675,6 +77410,14 @@ "xDQ" = ( /turf/closed/wall, /area/station/security/processing) +"xDT" = ( +/obj/machinery/light/directional/west, +/obj/structure/lattice, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/openspace, +/area/station/asteroid) "xDW" = ( /obj/machinery/door/airlock/mining/glass{ name = "MULE Storage" @@ -76891,6 +77634,9 @@ /turf/open/floor/iron, /area/station/cargo/drone_bay) "xJt" = ( +/obj/structure/railing/corner{ + dir = 4 + }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 4 }, @@ -77075,6 +77821,9 @@ /turf/open/floor/iron/freezer, /area/station/medical/coldroom) "xMV" = ( +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 8 }, @@ -77271,6 +78020,9 @@ /obj/effect/turf_decal/siding/thinplating/corner{ dir = 8 }, +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/turf_decal/trimline/red/corner{ dir = 8 }, @@ -77287,6 +78039,12 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/commons/fitness/recreation/entertainment) "xPP" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 4 + }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 1 }, @@ -77519,13 +78277,12 @@ /obj/structure/railing{ dir = 4 }, +/obj/structure/railing{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, /turf/open/openspace, /area/station/maintenance/department/crew_quarters/dorms) "xUC" = ( @@ -77598,6 +78355,12 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/iron, /area/station/cargo/miningdock) +"xVN" = ( +/obj/structure/railing{ + dir = 9 + }, +/turf/open/openspace, +/area/station/asteroid) "xVQ" = ( /obj/structure/closet/lasertag/red, /obj/effect/turf_decal/tile/red/full, @@ -78036,6 +78799,9 @@ /turf/open/floor/iron, /area/station/engineering/main) "ycm" = ( +/obj/structure/railing{ + dir = 1 + }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 8 }, @@ -83833,7 +84599,7 @@ nPb nPb gcp jGN -tkp +gnq tkp tkp bSM @@ -96881,7 +97647,7 @@ apC qSs vYD vYD -nyV +jAK wbb xFx vAF @@ -97652,7 +98418,7 @@ apC qSs vYD vYD -nyV +jAK wbb xFx kzQ @@ -97909,7 +98675,7 @@ apC elr tzJ hVa -drw +vHO wbb xFx bPo @@ -104079,7 +104845,7 @@ kzD jIG wGs pCr -pCr +lKC oks cjq jnq @@ -106088,7 +106854,7 @@ avt hFr vsg ekX -oOj +ezS ekX ekX hFr @@ -106344,9 +107110,9 @@ hFr avt hFr mTS -faA +mTS hWh -hpJ +mTS mTS hFr hFr @@ -108949,7 +109715,7 @@ hxz jnq kbi kbi -sHp +kbi qIC nQo fhA @@ -109720,7 +110486,7 @@ wrD xHL oQW oQW -iUg +oQW ksP iJd qKx @@ -115410,7 +116176,7 @@ inb pHM oNq slb -hYn +oEf ixc slb bNz @@ -116952,7 +117718,7 @@ dkm dkm dww cjG -djX +aeO nPp gTl bKe @@ -117700,7 +118466,7 @@ ccC psP pgS shg -tey +ueM tey euP wQP @@ -123890,7 +124656,7 @@ asv jiQ wUg nED -aet +hjM tjP roQ qVr @@ -124918,7 +125684,7 @@ asv jiQ nLH gJY -scO +coM bgH mTR qVr @@ -160348,14 +161114,14 @@ mGQ yiM fpg heY -wuE +ddh mQp mQp mQp mQp mQp wuE -wuE +ddh mQp mQp mQp @@ -160822,7 +161588,7 @@ ird oTJ oTJ oTJ -qdY +oMU uCZ dSo lNZ @@ -161076,9 +161842,9 @@ awr awy eSM tfp -nRS -aQT -dSR +nca +nca +nca neC iUE rxE @@ -161119,20 +161885,20 @@ wDB qqi fpg gpH -wuE +pPC nqH nqH nqH nqH nqH -wuE -wuE +hGI +pPC nqH nqH nqH nqH nqH -wuE +hGI mzD oxE pUw @@ -161333,9 +162099,9 @@ awp dob cmH tfp -dcv nca -rQF +nca +nca neC jNw yji @@ -161590,9 +162356,9 @@ iUh iUh iEm tfp -dcv nca -rQF +nca +nca neC niZ yeG @@ -161847,9 +162613,9 @@ bjv awz rOh tfp -dcv nca -rQF +nca +nca neC eOh mwg @@ -162104,9 +162870,9 @@ wOU awz rOh tfp -dcv nca -rQF +nca +nca ycm qdY eOh @@ -162361,9 +163127,9 @@ kCm awz rOh tfp -juA -pHq -qQQ +nca +nca +nca ruA nyt phB @@ -162621,7 +163387,7 @@ gAO odr rMJ odr -lSo +pBZ lSo lSo azy @@ -162875,9 +163641,9 @@ kQy awz rOh tfp -rav -jSY -brX +nca +nca +nca ruA otz kTT @@ -163132,9 +163898,9 @@ nzz awz rOh tfp -dcv nca -rQF +nca +nca hYN hMA gvQ @@ -163389,9 +164155,9 @@ wsw awz rOh tfp -dcv nca -rQF +nca +nca neC gvQ gvQ @@ -163646,9 +164412,9 @@ iUh iUh dHn tfp -dcv nca -rQF +nca +nca neC iBO blo @@ -163903,9 +164669,9 @@ awu wOb nCy tfp -dcv nca -rQF +nca +nca neC uXt yji @@ -163982,7 +164748,7 @@ sLJ vBG mAG tMW -tMW +byH tMW tMW esT @@ -164160,9 +164926,9 @@ rLf dUj mjF tfp -ioh -aIe -kIp +nca +nca +nca neC fph sHw @@ -164203,14 +164969,14 @@ oDj qqi fpg jGi -wuE +ddh mQp mQp mQp mQp mQp wuE -wuE +ddh mQp mQp mQp @@ -164420,7 +165186,7 @@ bVN tTJ tTJ tTJ -hMA +rzX wEx dSo lNZ @@ -164496,7 +165262,7 @@ tCf bOF esT tMW -tMW +pIS tMW esT sdb @@ -164974,20 +165740,20 @@ lQv yiM qJf gyz -wuE +pPC nqH nqH nqH nqH nqH -wuE -wuE +hGI +pPC nqH nqH nqH nqH nqH -wuE +hGI uMk vGi ptO @@ -165010,7 +165776,7 @@ sLJ vBG tMW tMW -mAG +sOg mAG mAG esT @@ -166558,11 +167324,11 @@ qZq mnp iFN feN -mAG +bME vKe kXk oOJ -mAG +uXM jhd jhd tMW @@ -166819,14 +167585,14 @@ tMW jhd tMW jhd -mAG +opb oOJ oOJ -mAG +stK ixH -mAG +sOg oOJ -mAG +uXM jhd jhd tMW @@ -167015,19 +167781,19 @@ aaa abM abW abM -afy +tdu afA -agf -pZv +afN +fIC afy afP nJq afX afy pZv -fia -hyB -afy +afN +age +riN afg abS aaa @@ -167083,14 +167849,14 @@ tMW jhd tMW jhd -mAG +opb oOJ oOJ -mAG +aME oOJ -mAG +bok gnp -mAG +bWi mAG fnI jhd @@ -167272,19 +168038,19 @@ abW abW abW abS -afy +tdu afA -agf -afy +afN +riN afy afP nJq afX afy -afy -fia -hyB -afy +tdu +afN +age +riN acm abW aaa @@ -167529,19 +168295,19 @@ abS afg afg afy -afy +tdu afA -agf -afy +afN +riN afy afP nJq afX afy -afy -fia -hyB -afy +tdu +afN +age +riN abW afo aaa @@ -167786,19 +168552,19 @@ abW afg afg abS -afy +tdu afA -agf -afy +afN +riN afy afP nJq afX afy -afy -fia -hyB -afy +tdu +afN +age +riN afy afo aaa @@ -168043,19 +168809,19 @@ afo abS acm abS -afy -xtd -agf -afy +tdu +aHf +afN +hGM afy afP nJq afX afy -afy -fia -hyB -afy +aHk +afN +age +riN afy abS aaa @@ -168300,9 +169066,9 @@ afo abW abW abW -afy -xtd -age +aHk +afB +afE afJ afy afP @@ -168310,9 +169076,9 @@ nJq afX afy agb -afN +xis agf -afy +hGM afy abW aaa @@ -168558,7 +169324,7 @@ abS abW afv age -aHf +afC vFt afK afy @@ -168568,7 +169334,7 @@ afX afy agc yiM -afN +agg age age afv @@ -168792,8 +169558,8 @@ bfa omm vdh rxn -oeY -oeY +xrt +nYa omm abM abW @@ -168814,9 +169580,9 @@ abW afg acm afg -afy -xtd -age +tlH +afD +afG afM afy afP @@ -168824,9 +169590,9 @@ nJq afX afy agd -age -agf -afy +afG +agh +xVN afy abW aaa @@ -169050,7 +169816,7 @@ omm vdh omm pCm -hXQ +uPh omm aaa aaa @@ -169071,19 +169837,19 @@ abS abS abS afo -afy -xtd -hyB -afy +tdu +aHf +age +xVN afy afP nJq afX afy -afy -mUY -agf -afy +tlH +age +afN +riN abW abW aaa @@ -169306,8 +170072,8 @@ etQ omm vdh omm -oeY -saa +neD +iVe omm aaa aaa @@ -169328,19 +170094,19 @@ afg abW abS afo -afy -xtd -hyB -afy +tdu +aHf +age +riN afy afP nJq afX afy -afy -mUY -agf -afy +tdu +age +afN +riN afo abW abS @@ -169585,19 +170351,19 @@ abW acm acm afo -afy -xtd -hyB -afy +tdu +aHf +age +riN afy afP omp afX afy -afy -mUY -agf -afy +tdu +age +afN +riN abS acm acm @@ -169842,19 +170608,19 @@ abS acm acm abW -afy -xtd -hyB -afy +tdu +aHf +age +hGM afy afP omp afX afy -afy -mUY -agf -afy +aHk +age +afN +riN abW acm acm @@ -170099,9 +170865,9 @@ abS abW abW afg -afy -xtd -age +aHk +afB +afE afJ afy afP @@ -170109,9 +170875,9 @@ omp afX afy agb -age +afE agf -afy +hGM afg abW afg @@ -170357,7 +171123,7 @@ abW afv age age -aHf +afC izU afK afy @@ -170367,7 +171133,7 @@ afX afy agc qas -afN +agg age afv abW @@ -170613,9 +171379,9 @@ acm afg abW abW -afy -xtd -age +tlH +afD +afG afM afy afP @@ -170623,9 +171389,9 @@ omp afX afy agd -age -agf -afy +afG +agh +xVN abW abW acm @@ -170870,19 +171636,19 @@ abW abW abS abW -afy -xtd -agf -afy +tdu +aHf +afN +xVN afy afP omp afX afy -afy -fia -agf -afy +tlH +afN +afN +riN abW abS afo @@ -171102,8 +171868,8 @@ dtA dtA omm xhN -oeY -vdh +jFc +eBC omm xvC gFp @@ -171127,19 +171893,19 @@ abM abW afo abS -afy +tdu afA -agf -afy +afN +riN afy afP omp afX afy -afy -fia -hyB -afy +tdu +afN +age +riN abW abS aaa @@ -171358,9 +172124,9 @@ dtA nLi dtA omm -oev -aPn -vdh +eLv +eLv +iXv omm gPW oni @@ -171384,19 +172150,19 @@ abM abM abW abW -afy +tdu afA -agf -afy +afN +riN afy afP omp afX afy -afy -fia -hyB -afy +tdu +afN +age +riN abS acm aaa @@ -171617,7 +172383,7 @@ omm omm omm omm -vdh +cQk omm cIq gxy @@ -171641,19 +172407,19 @@ abM aaa abM abM -afy +tdu afA -agf -afy +afN +riN afy afP omp afX afy -afy -fia -hyB -afy +tdu +afN +age +riN abW abW aaa @@ -171898,19 +172664,19 @@ aaa aaa aaa abM -afy +tdu afA -agf -afy +afN +riN afy afP omp afX afy -afy -fia -hyB -afy +tdu +afN +age +riN abW afg aaa @@ -172141,7 +172907,7 @@ ehP ilo ehP ehP -vdh +cQk vdh bGU eLv @@ -172155,19 +172921,19 @@ aaa aaa aaa afv -afz +dXc afA -agf -afO +afN +lMU afy afP omp afX afy afO -fia -hyB -afz +afN +age +uAc afv aaa aaa @@ -174482,7 +175248,7 @@ wOC wce mpA xXL -xXL +cYl sjE sjE kkd @@ -180077,7 +180843,7 @@ avE aTY iCA fZL -bEA +rkA fZL fZL aTY @@ -180381,8 +181147,8 @@ lZW aaS aaS qqX -hoi -ayT +kTO +xDT afy afP omp @@ -180390,7 +181156,7 @@ afX afy ayT kTO -hyB +age whz vNN whz @@ -180591,7 +181357,7 @@ jhd jhd aTY iCA -fZL +cfp fZL aTY jhd @@ -180636,18 +181402,18 @@ vJs lZW aaS afy -afy +tdu afA -agf -pZv +afN +riN afy afP omp afX afy -pZv -fia -hyB +tdu +afN +age hOm vNN vNN @@ -180893,18 +181659,18 @@ lZW lZW abW afy -afy +tdu afA -agf -afy +afN +riN afy afP omp afX afy -afy -fia -hyB +tdu +afN +age hOm srC srC @@ -181105,8 +181871,8 @@ jhd aTY fZL fZL -fZL -iCA +tCw +kUF iCA iCA aTY @@ -181150,18 +181916,18 @@ abM aaa aaa afy -afy +tdu afA -agf -afy +afN +riN afy afP omp afX afy -afy -fia -hyB +tdu +afN +age whz whz whz @@ -181396,7 +182162,7 @@ mBh sVx kxh bSp -qHl +gMh jWO lZW aaa @@ -181407,19 +182173,19 @@ aaa aaa abW abS -afy +tdu afA -agf -afy +afN +riN afy afP omp afX afy -afy -fia -hyB -afy +tdu +afN +age +riN afy whz srC @@ -181620,7 +182386,7 @@ jhd jhd aTY fZL -fZL +cfp fZL aTY uRv @@ -181664,19 +182430,19 @@ aaa abW afo abS -afy -xtd -agf -afy +tdu +aHf +afN +hGM afy afP omp afX afy -afy -fia -hyB -afy +aHk +afN +age +riN afy whz srC @@ -181691,9 +182457,9 @@ whz whz iLn vNN -iLn +bRF vnJ -iLn +nFM srC srC cgy @@ -181921,9 +182687,9 @@ abW abW abS abW -afy -xtd -age +aHk +afB +afE afJ afy afP @@ -181931,10 +182697,10 @@ omp afX afy agb -afN +xis agf -afy -afy +hGM +noO whz whz vNN @@ -182134,8 +182900,8 @@ avE aTY iCA iCA -fZL -fZL +tCw +bKy fZL fZL aTY @@ -182179,17 +182945,17 @@ abS abW afv age -aHf +afC qas afK afy afP -ezW +omp afX afy agc izU -afN +agg age age afv @@ -182435,9 +183201,9 @@ afo afo afg afy -afy -xtd -age +tlH +afD +afG afM afy afP @@ -182445,10 +183211,10 @@ omp afX afy agd -age -agf -afy -afy +afG +agh +xVN +mou abW whz whz @@ -182649,7 +183415,7 @@ jhd jhd aTY iCA -iCA +upS fZL aTY jhd @@ -182678,8 +183444,8 @@ aaa aaa lZW sAO -qHl -qHl +gMh +sVA sVA pOv nAY @@ -182692,19 +183458,19 @@ afo afo afy afy -afy -xtd -hyB -afy +tdu +aHf +age +xVN afy afP omp afX afy -afy -mUY -agf -afy +tlH +age +afN +riN abW abW afo @@ -182935,7 +183701,7 @@ aaa aaa lZW sAO -qHl +tnX hur nAY nAY @@ -182949,19 +183715,19 @@ abS abS abW afy -afy -xtd -hyB -afy +tdu +aHf +age +riN afy afP omp afX afy -afy -mUY -agf -afy +tdu +age +afN +riN abS afg abW @@ -182976,7 +183742,7 @@ xTG xip too iLn -vNN +mcn quJ quJ quJ @@ -183163,8 +183929,8 @@ jhd aTY fZL fZL -fZL -fZL +tCw +vwN iCA iCA aTY @@ -183206,19 +183972,19 @@ agm abS abW afg -afy -xtd -hyB -afy +tdu +aHf +age +riN afy afP ozQ afX afy -afy -mUY -agf -afy +tdu +age +afN +riN abW abS abW @@ -183449,7 +184215,7 @@ aaa aaa lZW sAO -qHl +gMh qmD nAY nAY @@ -183463,19 +184229,19 @@ abW abW abS afo -afy -xtd -hyB -afy +tdu +aHf +age +hGM afy afP ozQ afX afy -afy -mUY -agf -afy +aHk +age +afN +riN afy abS abW @@ -183720,9 +184486,9 @@ abS abW abW abW -afy -xtd -age +aHk +afB +afE afJ afy afP @@ -183730,10 +184496,10 @@ ozQ afX afy agb -age +afE agf -afy -afy +hGM +noO afo abW xip @@ -183963,7 +184729,7 @@ aaa aaa lZW fDd -qHl +tnX ena ena phs @@ -183978,7 +184744,7 @@ afo acm afv age -aHf +afC bMb afK afy @@ -183988,7 +184754,7 @@ afX afy agc mZJ -afN +agg age age afv @@ -184234,9 +185000,9 @@ abW abW abW afy -afy -xtd -age +tlH +afD +afG afM afy afP @@ -184244,10 +185010,10 @@ ozQ afX afy agd -age -agf -afy -afy +afG +agh +xVN +mou abS abW xip @@ -184491,19 +185257,19 @@ abW abS abW afy -afy -xtd -agf -afy +tdu +aHf +afN +xVN afy afP -ozQ +afW afX afy -afy -fia -agf -afy +tlH +afN +afN +riN afy abW aaa @@ -184706,7 +185472,7 @@ iCA iCA plk plk -deQ +vAj plk plk fZL @@ -184748,19 +185514,19 @@ aaa abW abW afy -afy +tdu afA -agf -afy +afN +riN afy afP ozQ afX afy -afy -fia -hyB -afy +tdu +afN +age +riN lVi lVi lVi @@ -185005,19 +185771,19 @@ abW abW acm afy -afy +tdu afA -agf -afy +afN +riN afy afP ozQ afX afy -afy -fia -hyB -afy +tdu +afN +age +riN lVi mHE mHE @@ -185205,17 +185971,17 @@ jhd uRv sIx iCA -iCA +whS viR viR -iCA +esY viR dec -iCA +tWo viR viR viR -iCA +bwT lzc sGx cko @@ -185262,18 +186028,18 @@ abW aaa abW abM -afy +tdu afA -agf -afy +afN +riN afy afP ozQ afX afy -afy -fia -hyB +tdu +afN +age lVi lVi kCF @@ -185519,18 +186285,18 @@ abM aaa aaa abM -afy +tdu afA -agf -afy +afN +riN afy afP ozQ afX afy -afy -fia -hyB +tdu +afN +age lVi kCF kCF @@ -185734,7 +186500,7 @@ iCA iCA plk plk -eBc +neB plk plk fZL @@ -185776,18 +186542,18 @@ aaa aaa aaa afv -afz +dXc afA -agf -afO +afN +lMU afy afP ozQ afX afy afO -fia -hyB +afN +age lVi kCF soq @@ -186022,7 +186788,7 @@ aaa aaa aaa lZW -lES +xiG nAY lZW kXi @@ -186279,7 +187045,7 @@ aaa aaa aaa lZW -qHl +tnX gFX lZW ddD @@ -187276,8 +188042,8 @@ jhd aTY fZL fZL -fZL -fZL +jGl +bKy fZL fZL aTY @@ -187791,7 +188557,7 @@ jhd jhd aTY iCA -fZL +cfp fZL aTY jhd @@ -188305,8 +189071,8 @@ avE aTY iCA iCA -iCA -fZL +qKh +bKy fZL fZL aTY @@ -188820,7 +189586,7 @@ jhd jhd aTY fZL -fZL +cfp iCA aTY uRv @@ -189334,8 +190100,8 @@ jhd aTY fZL fZL -fZL -fZL +tCw +bKy fZL fZL aTY @@ -189399,9 +190165,9 @@ xQN mEt vNk kTU -dzx +xyt whP -dzx +ovC dCq uiV rGj @@ -189592,7 +190358,7 @@ jhd jhd jhd uRv -kgS +sLi uRv jhd jhd @@ -189849,7 +190615,7 @@ jhd jhd aTY fZL -fZL +cfp iCA aTY jhd @@ -190427,9 +191193,9 @@ vTb vTb rbn crj -dzx +wWT fDB -dzx +uvB rBb tbK kye @@ -191774,13 +192540,13 @@ oMI oTa tDn tDn -uqS +qJh dVM dVM dVM dVM dVM -uqS +fho tDn bJP oMI @@ -192810,7 +193576,7 @@ dVM rOT rSB dVM -uqS +fho cEb gFf wbW @@ -193324,7 +194090,7 @@ dVM qYJ rSB dVM -uqS +jgq xWe gFf mrF @@ -194341,16 +195107,16 @@ vUu gFf gFf oMI -rXX +uCh hic hic -uqS +cPl dVM dVM dVM dVM dVM -uqS +jgq hic vWw oMI diff --git a/code/controllers/subsystem/materials.dm b/code/controllers/subsystem/materials.dm index 515fdd465a39..a9c807cc38a5 100644 --- a/code/controllers/subsystem/materials.dm +++ b/code/controllers/subsystem/materials.dm @@ -27,7 +27,6 @@ SUBSYSTEM_DEF(materials) new /datum/stack_recipe("Sink Frame", /obj/structure/sinkframe, one_per_turf = TRUE, on_solid_ground = TRUE, applies_mats = TRUE, category = CAT_FURNITURE), new /datum/stack_recipe("Material floor tile", /obj/item/stack/tile/material, 1, 4, 20, applies_mats = TRUE, check_density = FALSE, category = CAT_TILES), new /datum/stack_recipe("Material airlock assembly", /obj/structure/door_assembly/door_assembly_material, 4, time = 5 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, applies_mats = TRUE, category = CAT_DOORS), - new /datum/stack_recipe("Railing", /obj/structure/railing, one_per_turf = FALSE, on_solid_ground = TRUE, applies_mats = TRUE, category = CAT_FURNITURE), ) ///List of stackcrafting recipes for materials using rigid recipes var/list/rigid_stack_recipes = list( diff --git a/monkestation/code/modules/aesthetics/airlock/airlock.dm b/monkestation/code/modules/aesthetics/airlock/airlock.dm index 6447edc0ab60..7ada0684d286 100644 --- a/monkestation/code/modules/aesthetics/airlock/airlock.dm +++ b/monkestation/code/modules/aesthetics/airlock/airlock.dm @@ -659,12 +659,3 @@ #undef AIRLOCK_FRAME_CLOSING #undef AIRLOCK_FRAME_OPEN #undef AIRLOCK_FRAME_OPENING - - -/obj/machinery/door/poddoor/shutters/cc - obj_flags = INDESTRUCTIBLE - -/obj/machinery/door/poddoor/shutters/cc/xcc - id = "XCCsec1" - name = "XCC Checkpoint 1 Shutters" - max_integrity = 3000000 diff --git a/monkestation/code/modules/aesthetics/icons/railing_basic.dmi b/monkestation/code/modules/aesthetics/icons/railing_basic.dmi deleted file mode 100644 index df17d1a486a8c1bd32be4b3adf6acf757d0fe67d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1528 zcmZvcc{G%J7{`CF7t>*4Bzwl(R!R|3L}oO$n;6+r7$uCd3?@gT$(t-8-A=b<3ddL? z*^+&UA#`OOSt{FP9T9WwmzX=Zd+vYtoada+^Zh>0f6sHiaU>gy?Gnlo0D$dQmc(-a zK*AORqOcGJuBDDb$dRla%!FhznXay`91drFeVxT(MMp=wccH%gvrao_V-N6?pS*>l zg6?phM)V5t4ECkcd;a=r52a`>PlibgVb0I!6?iMm7f3=9mD8wp$Si4q?gPlgYtf@aX2m zf!cnnb*cUQL9XO6C8;j&W&@x*v1OqiF-w{+C`ldH)4x+2+r}(yk~YgLS$M9wsCP)2 zA&qV>Q8%RX(32B{#g~a%jv1*E$op3rPdm7I^zedFwQDq_aKOB7C$Js3@2&?dr2U@! zD*dQcp!!-v54k|eM!G?B2agJ8dPF^IpUqRq}CW59n#N9g5185mazX?NRkwi^Uw~_ zue%1MmI<306ALv@QRfbK-ieGP6`eRMfzhR^RI&k@y9LB^5fV~=kktZ>H@!<|ZWP+f zVRm0i3MjVz4%sCg8JX|fsGRht#8qAC>Av?tpop++nfX&UD4W)f_`9DZwu$k^AiLNo z5#AoV2;8Bm8?&Cly6K^1JEx!hWr&R#o`bk?$ui}I&QMsUF+W%iLFw4EHaP-jyjQ3i zc8y@uvYfiXXETpdUwsafu0VWSXJvsJ>_?*KU z8XFL!$jb)-ADJ<1uGnGCH?5{ohE9^XGg>p?TSYboOv|xeS8ctKV%_hJoZIw%8s5}X zbRi?0rFX#iG^4Y>mxq0=NNKm~w3LTsp}W=H#(SPEUMxCmZ{=vM81F>#qdx_hm@H{_ zpTZ8%(6waD4xQZ#qS9`8-Ha^#`j7PACzR9S$m1rYiOo8S4A!85<@}9qz||Sh!(B)z z#_m!Du2a<@eT7|O%)TX{0KN_Y4gv=Lk@+eJTkR3U4AD}`PegeRs74S~x9>TH&1(hwZU->S4WMaZm$3ZRoj`**} zq@EDEc42J9AN!^tWWh`fb@y+dY?eGnxmkTn&aX)?KAy^(BYi8%EUj|ibGBMDr zgHu;y-r;1pCT+#U-(0*G->G7NkN>!Sl Q2*Vjznb{BvOg$q124au6NB{r; diff --git a/monkestation/code/modules/aesthetics/objects/railing.dm b/monkestation/code/modules/aesthetics/objects/railing.dm deleted file mode 100644 index 3ca795d28728..000000000000 --- a/monkestation/code/modules/aesthetics/objects/railing.dm +++ /dev/null @@ -1,133 +0,0 @@ -/obj/structure/railing - icon = 'monkestation/code/modules/aesthetics/icons/railing_basic.dmi' - icon_state = "railing0-1" - - obj_flags = IGNORE_DENSITY | CAN_BE_HIT | BLOCKS_CONSTRUCTION_DIR - custom_materials = list(/datum/material/iron = 100) - material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS - - var/neighbor_status = list() ///list of smoothing we need doing - - -/obj/structure/railing/Initialize(mapload) - . = ..() - return INITIALIZE_HINT_LATELOAD - -/obj/structure/railing/LateInitialize() - . = ..() - if(anchored) - update_icon() - - -/obj/structure/railing/setDir(newdir) - . = ..() - if(anchored) - update_icon() - -/obj/structure/railing/Destroy() - . = ..() - for(var/thing in range(1, src)) - var/turf/T = thing - for(var/obj/structure/railing/R in T.contents) - R.update_icon() - -/obj/structure/railing/proc/check_neighbors(updates = TRUE) - neighbor_status = list() - var/Rturn = turn(src.dir, -90) - var/Lturn = turn(src.dir, 90) - - for(var/obj/structure/railing/R in get_turf(src)) - if((R.dir == Lturn) && R.anchored) - neighbor_status |= "corneroverlay_l" - if(updates) - R.update_icon(FALSE) - if((R.dir == Rturn) && R.anchored) - neighbor_status |= "corneroverlay_r" - if(updates) - R.update_icon(FALSE) - for(var/obj/structure/railing/R in get_step(src, Lturn)) - if((R.dir == src.dir) && R.anchored) - neighbor_status |= "frontoverlay_l" - if(updates) - R.update_icon(FALSE) - for(var/obj/structure/railing/R in get_step(src, Rturn)) - if((R.dir == src.dir) && R.anchored) - neighbor_status |= "frontoverlay_r" - if (updates) - R.update_icon(FALSE) - for(var/obj/structure/railing/R in get_step(src, (Lturn + src.dir))) - if((R.dir == Rturn) && R.anchored) - neighbor_status |= "frontoverlay_l" - if (updates) - R.update_icon(FALSE) - for(var/obj/structure/railing/R in get_step(src, (Rturn + src.dir))) - if((R.dir == Lturn) && R.anchored) - neighbor_status |= "mcorneroverlay_l" - if (updates) - R.update_icon(FALSE) - - ///corner hell - ///we are basically checking if 2 or more cardinal directions exist here so we can set our dir - - -/obj/structure/railing/update_icon(update_neighbors = TRUE) - . = ..() - check_neighbors(update_neighbors) - overlays.Cut() - - if(dir == SOUTH) - layer = ABOVE_MOB_LAYER + 0.01 - - else if( dir != NORTH) - SET_PLANE(src, GAME_PLANE_FOV_HIDDEN, get_turf(src)) - else - SET_PLANE(src, GAME_PLANE, get_turf(src)) - layer = initial(layer) - - if(!neighbor_status || !anchored) - icon_state = "railing0-[density]" - else - icon_state = "railing1-[density]" - - if(("corneroverlay_l" in neighbor_status) && ("corneroverlay_r" in neighbor_status)) - icon_state = "blank" - - - var/turf/right_turf = get_step(src, turn(src.dir, -90)) - var/turf/left_turf = get_step(src, turn(src.dir, 90)) - - if((!locate(/obj/structure/railing) in right_turf.contents)) - if(!("mcorneroverlay_l" in neighbor_status)) - overlays += image(icon, "frontend_r[density]") - else - overlays += image(icon, "frontoverlay_r[density]") - - - if((!locate(/obj/structure/railing) in left_turf.contents)) - if(!("mcorneroverlay_l" in neighbor_status)) - overlays += image(icon, "frontend_l[density]") - else - overlays += image(icon, "frontoverlay_l[density]") - - - if("corneroverlay_l" in neighbor_status) - overlays += image(icon, "corneroverlay_l[density]") - if("corneroverlay_r" in neighbor_status) - overlays += image(icon, "corneroverlay_r[density]") - if("frontoverlay_l" in neighbor_status) - overlays += image(icon, "frontoverlay_l[density]") - if("frontoverlay_r" in neighbor_status) - overlays += image(icon, "frontoverlay_r[density]") - if("mcorneroverlay_l" in neighbor_status) - var/pix_offset_x = 0 - var/pix_offset_y = 0 - switch(dir) - if(NORTH) - pix_offset_x = 32 - if(SOUTH) - pix_offset_x = -32 - if(EAST) - pix_offset_y = -32 - if(WEST) - pix_offset_y = 32 - overlays += image(icon, "mcorneroverlay_l[density]", pixel_x = pix_offset_x, pixel_y = pix_offset_y) diff --git a/monkestation/code/modules/ghost_players/ghost_player.dm b/monkestation/code/modules/ghost_players/ghost_player.dm index fd7d5fc46b7c..1262c0959e64 100644 --- a/monkestation/code/modules/ghost_players/ghost_player.dm +++ b/monkestation/code/modules/ghost_players/ghost_player.dm @@ -124,7 +124,7 @@ GLOBAL_VAR_INIT(disable_ghost_spawning, FALSE) /mob/dead/observer/proc/create_ghost_body() - var/mob/living/carbon/human/old_mob = mind?.current + var/mob/living/carbon/human/old_mob = mind.current var/obj/item/organ/internal/brain/brain if(istype(old_mob)) brain = old_mob.get_organ_by_type(/obj/item/organ/internal/brain) diff --git a/monkestation/code/modules/mob/dead/new_player/sprite_accessories/hair.dm b/monkestation/code/modules/mob/dead/new_player/sprite_accessories/hair.dm index a8bfd20700e7..8ab5663ce2b6 100644 --- a/monkestation/code/modules/mob/dead/new_player/sprite_accessories/hair.dm +++ b/monkestation/code/modules/mob/dead/new_player/sprite_accessories/hair.dm @@ -85,8 +85,3 @@ icon = 'monkestation/icons/mob/sprite_accessories/hair.dmi' name = "Mullet" icon_state = "hair_mullet" - -/datum/sprite_accessory/hair/long_messy - icon = 'monkestation/icons/mob/sprite_accessories/hair.dmi' - name = "Long and Messy" - icon_state = "long_messy" diff --git a/monkestation/icons/mob/sprite_accessories/hair.dmi b/monkestation/icons/mob/sprite_accessories/hair.dmi index 10a508c4d9b8678a01730808613059f02181fa99..df59586e6740d269d2ed4ed961ad06900f91fd2f 100644 GIT binary patch literal 11416 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 B3<3ZE literal 12121 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 Date: Mon, 25 Sep 2023 03:34:37 -0400 Subject: [PATCH 46/59] Revert "new rails god damn" This reverts commit d99ae0145827c31b29ba9c17cb947e8462196190. --- .../map_files/Deltastation/DeltaStation2.dmm | 570 ++-- .../map_files/IceBoxStation/IceBoxStation.dmm | 672 +---- _maps/map_files/MetaStation/MetaStation.dmm | 21 +- _maps/map_files/Mining/Lavaland.dmm | 76 +- _maps/map_files/generic/CentCom.dmm | 85 +- _maps/map_files/tramstation/tramstation.dmm | 2352 ++++++----------- code/controllers/subsystem/materials.dm | 1 + .../modules/aesthetics/airlock/airlock.dm | 9 + .../aesthetics/icons/railing_basic.dmi | Bin 0 -> 1528 bytes .../modules/aesthetics/objects/railing.dm | 133 + .../modules/ghost_players/ghost_player.dm | 2 +- .../new_player/sprite_accessories/hair.dm | 5 + .../icons/mob/sprite_accessories/hair.dmi | Bin 11416 -> 12121 bytes tgstation.dme | 1 + 14 files changed, 1406 insertions(+), 2521 deletions(-) create mode 100644 monkestation/code/modules/aesthetics/icons/railing_basic.dmi create mode 100644 monkestation/code/modules/aesthetics/objects/railing.dm diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 90de741895dc..56683ab5eea3 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -296,6 +296,10 @@ /obj/effect/turf_decal/siding/white{ dir = 8 }, +/obj/machinery/door/window{ + dir = 4; + name = "Fitness Ring" + }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "adA" = ( @@ -1371,9 +1375,6 @@ /area/station/command/heads_quarters/ce) "apz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing{ - dir = 4 - }, /obj/effect/turf_decal/siding/white{ dir = 4 }, @@ -2266,6 +2267,14 @@ name = "SapMaster XP" }, /obj/effect/turf_decal/bot, +/obj/structure/railing{ + dir = 10; + layer = 3.1 + }, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "azi" = ( @@ -2431,7 +2440,6 @@ /area/station/engineering/atmos) "aBr" = ( /obj/structure/chair, -/obj/structure/railing, /obj/effect/turf_decal/siding/white, /turf/open/floor/iron/dark/side, /area/station/commons/fitness/recreation) @@ -3927,12 +3935,17 @@ /area/station/science/research) "aUN" = ( /obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 10 - }, /obj/item/toy/plush/space_lizard_plushie{ name = "Meets-the-Ore" }, +/obj/structure/railing{ + dir = 9; + layer = 3.1 + }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/space/basic, /area/space/nearstation) "aVo" = ( @@ -4453,6 +4466,11 @@ "bbQ" = ( /obj/machinery/vending/wardrobe/hydro_wardrobe, /obj/effect/turf_decal/bot, +/obj/structure/railing, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "bbR" = ( @@ -4890,18 +4908,6 @@ /obj/machinery/meter, /turf/open/floor/iron, /area/station/maintenance/department/electrical) -"bgW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/commons/fitness/recreation) "bhg" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -5103,9 +5109,6 @@ /obj/structure/cable, /obj/effect/landmark/start/hangover, /obj/structure/disposalpipe/segment, -/obj/structure/railing{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -5707,6 +5710,9 @@ "bqC" = ( /obj/machinery/seed_extractor, /obj/effect/turf_decal/bot, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "bqE" = ( @@ -9744,6 +9750,14 @@ "cmi" = ( /obj/structure/flora/bush/stalky/style_random, /obj/structure/flora/bush/leavy/style_random, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 6; + layer = 3.1 + }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "cmq" = ( @@ -9776,6 +9790,10 @@ /obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/flora/rock/pile/style_random, /obj/machinery/light/floor/has_bulb, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "cmI" = ( @@ -9929,6 +9947,9 @@ /obj/structure/flora/bush/fullgrass/style_random, /obj/structure/flora/bush/grassy/style_random, /obj/machinery/light/floor/has_bulb, +/obj/structure/railing{ + dir = 1 + }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "cnL" = ( @@ -11697,9 +11718,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/structure/railing{ - dir = 9 - }, /obj/structure/rack, /obj/item/wrench, /obj/item/reagent_containers/spray/plantbgone{ @@ -14622,10 +14640,6 @@ /area/station/medical/abandoned) "dxi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/window{ - dir = 8; - name = "Fitness Ring" - }, /obj/effect/turf_decal/siding/white{ dir = 8 }, @@ -15647,6 +15661,9 @@ "dLF" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/white, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "dLH" = ( @@ -18480,15 +18497,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/grimy, /area/station/service/chapel/office) -"evh" = ( -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/service/hydroponics) "evp" = ( /obj/machinery/computer/records/medical{ dir = 8 @@ -20422,7 +20430,6 @@ "eUT" = ( /obj/structure/chair, /obj/effect/landmark/start/hangover, -/obj/structure/railing, /obj/effect/turf_decal/siding/white, /turf/open/floor/iron/dark/side, /area/station/commons/fitness/recreation) @@ -20576,6 +20583,12 @@ /obj/effect/turf_decal/siding/white/corner{ dir = 8 }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "eWE" = ( @@ -21684,6 +21697,13 @@ "fju" = ( /obj/structure/flora/bush/flowers_br/style_random, /obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 1 + }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "fjx" = ( @@ -21776,9 +21796,6 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) "fkU" = ( -/obj/structure/railing{ - dir = 5 - }, /obj/item/kirbyplants/random, /obj/machinery/light/floor/has_bulb, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -21801,6 +21818,16 @@ }, /turf/open/floor/iron/grimy, /area/station/service/chapel) +"fln" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "flw" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -22945,6 +22972,13 @@ /obj/structure/flora/bush/flowers_pp/style_random, /obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/flora/rock/pile/jungle/style_random, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 1 + }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "fzx" = ( @@ -25066,9 +25100,6 @@ "gbY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/window/right/directional/west{ - name = "Hydroponics Center" - }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 }, @@ -26367,12 +26398,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 4 - }, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) "grp" = ( @@ -27616,7 +27641,6 @@ /area/station/security/execution/transfer) "gGw" = ( /obj/effect/landmark/start/hangover, -/obj/structure/railing, /obj/structure/chair/sofa/bench/right{ dir = 1 }, @@ -31087,6 +31111,14 @@ }, /obj/machinery/disposal/bin, /obj/effect/turf_decal/stripes/box, +/obj/structure/railing{ + dir = 10; + layer = 3.1 + }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "hAN" = ( @@ -32426,10 +32458,14 @@ /area/station/engineering/atmos) "hUm" = ( /obj/structure/lattice/catwalk, +/obj/machinery/vending/coffee, /obj/structure/railing{ - dir = 9 + dir = 8; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 1 }, -/obj/machinery/vending/coffee, /turf/open/space/basic, /area/space/nearstation) "hUt" = ( @@ -34503,9 +34539,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/fore) @@ -35293,18 +35326,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) -"iCS" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central/aft) "iDc" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -38360,9 +38381,6 @@ /obj/effect/turf_decal/arrows{ dir = 8 }, -/obj/structure/railing/corner{ - dir = 4 - }, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -38763,9 +38781,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 1 - }, /turf/open/floor/iron, /area/station/service/hydroponics) "juZ" = ( @@ -39244,9 +39259,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/structure/disposalpipe/segment, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -39602,10 +39614,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/textured_large, /area/station/engineering/atmos/storage/gas) -"jEn" = ( -/obj/structure/railing, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) "jEt" = ( /obj/structure/cable, /obj/machinery/door/firedoor, @@ -40071,6 +40079,11 @@ /obj/effect/turf_decal/siding/white/corner{ dir = 4 }, +/obj/structure/railing, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "jKO" = ( @@ -40118,9 +40131,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/structure/railing{ - dir = 8 - }, /turf/open/floor/iron, /area/station/service/hydroponics) "jLe" = ( @@ -40337,7 +40347,6 @@ /area/station/maintenance/solars/port/aft) "jNB" = ( /obj/effect/landmark/start/hangover, -/obj/structure/railing/corner, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/fore) @@ -40559,9 +40568,6 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue, -/obj/structure/railing{ - dir = 6 - }, /obj/structure/rack, /obj/item/wrench, /obj/item/crowbar, @@ -41340,9 +41346,6 @@ /area/station/engineering/atmos) "jZH" = ( /obj/effect/landmark/start/hangover, -/obj/structure/railing{ - dir = 1 - }, /obj/structure/chair/sofa/bench/right, /obj/effect/turf_decal/box/corners{ dir = 8 @@ -41751,7 +41754,6 @@ "keq" = ( /obj/structure/chair, /obj/effect/landmark/start/assistant, -/obj/structure/railing, /obj/effect/turf_decal/siding/white, /turf/open/floor/iron/dark/side, /area/station/commons/fitness/recreation) @@ -42112,6 +42114,13 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/engineering/atmos) +"khN" = ( +/obj/structure/chair/stool/directional/east, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/service/theater) "khQ" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 @@ -42632,19 +42641,6 @@ "kpa" = ( /turf/closed/wall, /area/station/maintenance/department/eva/abandoned) -"kpc" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/window{ - dir = 4; - name = "Fitness Ring" - }, -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/commons/fitness/recreation) "kpj" = ( /obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, @@ -43329,7 +43325,6 @@ "kyR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/blue, -/obj/structure/railing/corner, /turf/open/floor/iron, /area/station/service/hydroponics) "kyW" = ( @@ -44699,9 +44694,6 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue, -/obj/structure/railing{ - dir = 4 - }, /turf/open/floor/iron, /area/station/service/hydroponics) "kQV" = ( @@ -47851,9 +47843,6 @@ dir = 1 }, /obj/effect/landmark/start/assistant, -/obj/structure/railing{ - dir = 1 - }, /obj/effect/turf_decal/siding/white{ dir = 1 }, @@ -48215,7 +48204,6 @@ /turf/open/floor/plating, /area/station/maintenance/department/electrical) "lII" = ( -/obj/structure/railing, /obj/structure/chair/sofa/bench{ dir = 1 }, @@ -48758,6 +48746,13 @@ "lPs" = ( /obj/machinery/biogenerator, /obj/effect/turf_decal/bot, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "lPy" = ( @@ -49515,9 +49510,6 @@ /turf/open/floor/iron, /area/station/engineering/hallway) "mae" = ( -/obj/machinery/door/window/right/directional/east{ - name = "Hydroponics Center" - }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 }, @@ -49927,9 +49919,6 @@ /turf/open/floor/iron/dark, /area/station/commons/locker) "mgd" = ( -/obj/structure/railing{ - dir = 10 - }, /obj/item/kirbyplants/random, /obj/machinery/light/floor/has_bulb, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -50020,6 +50009,10 @@ /obj/structure/flora/bush/grassy/style_random, /obj/structure/flora/rock/pile/jungle/style_random, /obj/machinery/light/floor/has_bulb, +/obj/structure/railing{ + dir = 6; + layer = 3.1 + }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "mhl" = ( @@ -50642,6 +50635,10 @@ /obj/effect/turf_decal/siding/white/corner{ dir = 1 }, +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "mpO" = ( @@ -50696,11 +50693,6 @@ /obj/machinery/holopad, /turf/open/floor/iron/large, /area/station/security/checkpoint/medical/medsci) -"mqz" = ( -/obj/effect/turf_decal/tile/blue, -/obj/structure/railing/corner, -/turf/open/floor/iron, -/area/station/service/hydroponics) "mqG" = ( /obj/structure/filingcabinet/medical, /obj/effect/turf_decal/bot, @@ -50857,9 +50849,6 @@ /area/station/engineering/supermatter) "msF" = ( /obj/effect/landmark/start/hangover, -/obj/structure/railing{ - dir = 1 - }, /obj/structure/chair/sofa/bench/left, /obj/effect/turf_decal/box/corners, /obj/effect/turf_decal/box/corners{ @@ -51511,17 +51500,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark/textured_large, /area/station/security/brig) -"mAJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/structure/railing/corner, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) "mAW" = ( /obj/machinery/chem_master, /obj/effect/turf_decal/tile/yellow/opposingcorners, @@ -53386,11 +53364,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/supermatter/room) -"mWO" = ( -/obj/structure/railing/corner, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) "mWP" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -55138,15 +55111,6 @@ /mob/living/basic/pet/dog/corgi/ian, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) -"nvo" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) "nvu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/landmark/start/hangover, @@ -55308,6 +55272,17 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/wall, /area/station/cargo/sorting) +"nxm" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/machinery/door/window{ + dir = 8; + name = "Fitness Ring" + }, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "nxn" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -55989,7 +55964,6 @@ }, /obj/effect/turf_decal/tile/blue, /obj/machinery/hydroponics/constructable, -/obj/structure/railing, /turf/open/floor/iron, /area/station/service/hydroponics) "nFj" = ( @@ -56121,7 +56095,10 @@ /area/station/command/meeting_room/council) "nHf" = ( /obj/structure/lattice/catwalk, -/obj/structure/railing, +/obj/structure/railing{ + dir = 9; + layer = 3.1 + }, /turf/open/space/basic, /area/space/nearstation) "nHs" = ( @@ -56200,9 +56177,6 @@ dir = 1 }, /obj/effect/turf_decal/tile/blue, -/obj/structure/railing{ - dir = 5 - }, /obj/effect/turf_decal/box/corners{ dir = 8 }, @@ -57767,9 +57741,6 @@ /obj/effect/turf_decal/tile/green{ dir = 8 }, -/obj/structure/railing/corner{ - dir = 8 - }, /turf/open/floor/iron, /area/station/service/hydroponics) "obI" = ( @@ -59250,9 +59221,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/structure/disposalpipe/segment, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -60212,6 +60180,13 @@ }, /obj/item/reagent_containers/cup/watering_can, /obj/item/reagent_containers/cup/watering_can, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/iron/dark/textured, /area/station/service/hydroponics) "oJy" = ( @@ -61662,9 +61637,6 @@ "pei" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/siding/white/corner{ dir = 1 }, @@ -63521,9 +63493,6 @@ "pBj" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/turf_decal/siding/white/corner{ dir = 4 }, @@ -63620,10 +63589,13 @@ /area/station/hallway/primary/central/fore) "pCQ" = ( /obj/structure/lattice/catwalk, +/obj/structure/reagent_dispensers/fueltank, /obj/structure/railing{ - dir = 5 + dir = 1 + }, +/obj/structure/railing{ + dir = 4 }, -/obj/structure/reagent_dispensers/fueltank, /turf/open/space/basic, /area/space/nearstation) "pCV" = ( @@ -68913,6 +68885,13 @@ color = "#52B4E9" }, /obj/machinery/composters, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron/dark/textured, /area/station/service/hydroponics) "qNU" = ( @@ -69248,6 +69227,14 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/grimy, /area/station/service/library) +"qSB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/window/right/directional/east{ + name = "Hydroponics Center" + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) "qSG" = ( /obj/machinery/portable_atmospherics/canister/anesthetic_mix, /obj/machinery/light/small/blacklight/directional/north, @@ -70201,6 +70188,14 @@ "rhK" = ( /obj/structure/flora/bush/stalky/style_random, /obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/railing{ + dir = 6; + layer = 3.1 + }, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "rhN" = ( @@ -71194,6 +71189,14 @@ "rtT" = ( /obj/structure/flora/bush/flowers_yw/style_random, /obj/structure/flora/bush/sparsegrass/style_random, +/obj/structure/railing{ + dir = 6; + layer = 3.1 + }, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "rua" = ( @@ -73392,19 +73395,6 @@ }, /turf/open/floor/iron/dark/corner, /area/station/hallway/secondary/exit/departure_lounge) -"rVs" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) "rVu" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -73766,9 +73756,6 @@ dir = 1 }, /obj/machinery/hydroponics/constructable, -/obj/structure/railing{ - dir = 1 - }, /turf/open/floor/iron, /area/station/service/hydroponics) "sau" = ( @@ -74456,6 +74443,7 @@ /obj/effect/turf_decal/siding/white{ dir = 1 }, +/obj/structure/railing, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "sjH" = ( @@ -75196,13 +75184,15 @@ /turf/open/floor/plating, /area/station/service/chapel/storage) "stN" = ( -/obj/structure/railing{ - dir = 10 - }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/obj/structure/railing, /turf/open/floor/wood, /area/station/service/theater) "stO" = ( @@ -76321,7 +76311,6 @@ /turf/open/floor/iron, /area/station/security/brig) "sIk" = ( -/obj/structure/railing, /obj/structure/chair/sofa/bench/left{ dir = 1 }, @@ -76465,6 +76454,13 @@ /obj/structure/flora/bush/ferny/style_random, /obj/structure/flora/bush/style_random, /obj/structure/flora/bush/jungle/a/style_random, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "sJo" = ( @@ -76710,6 +76706,10 @@ /obj/effect/turf_decal/siding/white{ dir = 4 }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "sLK" = ( @@ -77121,9 +77121,6 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "sQN" = ( -/obj/structure/railing{ - dir = 6 - }, /obj/item/kirbyplants/random, /obj/machinery/light/floor/has_bulb, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, @@ -77734,6 +77731,7 @@ "sXL" = ( /obj/machinery/vending/hydronutrients, /obj/effect/turf_decal/bot, +/obj/structure/railing, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "sXM" = ( @@ -80542,9 +80540,6 @@ /obj/structure/chair{ dir = 1 }, -/obj/structure/railing{ - dir = 1 - }, /obj/effect/turf_decal/siding/white{ dir = 1 }, @@ -82918,9 +82913,9 @@ /turf/open/floor/plating, /area/station/engineering/transit_tube) "ulH" = ( -/obj/structure/railing, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only, +/obj/structure/railing, /turf/open/floor/wood, /area/station/service/theater) "ulQ" = ( @@ -84290,15 +84285,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore) -"uCA" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) "uCC" = ( /obj/effect/landmark/start/cyborg, /obj/structure/cable, @@ -84330,6 +84316,10 @@ /obj/structure/flora/bush/fullgrass/style_random, /obj/structure/flora/bush/lavendergrass/style_random, /obj/machinery/light/floor/has_bulb, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "uDb" = ( @@ -85078,7 +85068,6 @@ /area/station/medical/medbay/lobby) "uOh" = ( /obj/effect/turf_decal/tile/neutral, -/obj/structure/railing, /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/hallway/primary/fore) @@ -85486,7 +85475,6 @@ /obj/effect/turf_decal/arrows{ dir = 4 }, -/obj/structure/railing/corner, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark/side{ dir = 4 @@ -86238,9 +86226,6 @@ /area/station/commons/locker) "vbK" = ( /obj/effect/landmark/start/hangover, -/obj/structure/railing{ - dir = 1 - }, /obj/structure/chair/sofa/bench, /obj/effect/landmark/start/assistant, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -86406,9 +86391,6 @@ /obj/effect/turf_decal/tile/green{ dir = 4 }, -/obj/structure/railing/corner{ - dir = 4 - }, /turf/open/floor/iron, /area/station/service/hydroponics) "vdS" = ( @@ -87265,7 +87247,8 @@ "vpk" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ - dir = 8 + dir = 8; + layer = 4.1 }, /turf/open/space/basic, /area/space/nearstation) @@ -88078,6 +88061,13 @@ /area/station/command/heads_quarters/ce) "vys" = ( /obj/structure/flora/bush/jungle/c/style_random, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "vyt" = ( @@ -88589,16 +88579,6 @@ /obj/machinery/duct, /turf/open/floor/iron/grimy, /area/station/service/bar/backroom) -"vDY" = ( -/obj/effect/landmark/start/hangover, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) "vEg" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/decal/cleanable/dirt, @@ -88738,9 +88718,6 @@ /area/station/hallway/primary/central/aft) "vFn" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/siding/white/corner{ dir = 8 }, @@ -88835,9 +88812,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/structure/railing{ - dir = 8 - }, /turf/open/floor/iron, /area/station/service/hydroponics) "vGX" = ( @@ -89477,7 +89451,6 @@ /area/station/service/kitchen) "vRn" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/structure/railing/corner, /obj/effect/turf_decal/siding/white/corner, /turf/open/floor/iron/dark/corner, /area/station/commons/fitness/recreation) @@ -90099,6 +90072,9 @@ "vZo" = ( /obj/machinery/smartfridge, /obj/effect/turf_decal/bot, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "vZq" = ( @@ -90858,9 +90834,6 @@ /obj/effect/turf_decal/tile/green{ dir = 4 }, -/obj/structure/railing/corner{ - dir = 4 - }, /turf/open/floor/iron, /area/station/service/hydroponics) "wif" = ( @@ -91064,12 +91037,13 @@ /turf/open/floor/iron, /area/station/engineering/break_room) "wkp" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/wood, /area/station/service/theater) "wkt" = ( @@ -92066,13 +92040,14 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/aft) "wuh" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/wood, /area/station/service/theater) "wuj" = ( @@ -92836,13 +92811,14 @@ /area/station/service/hydroponics/garden/abandoned) "wDi" = ( /obj/effect/landmark/start/hangover, -/obj/structure/railing{ - dir = 8 - }, /obj/effect/spawner/random/structure/musician/piano/random_piano, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/wood, /area/station/service/theater) "wDk" = ( @@ -94373,6 +94349,14 @@ /obj/structure/flora/bush/flowers_br/style_random, /obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/flora/bush/grassy/style_random, +/obj/structure/railing{ + dir = 6; + layer = 3.1 + }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/misc/grass, /area/station/hallway/primary/fore) "xav" = ( @@ -95114,15 +95098,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/cargo/lobby) -"xjF" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) "xjJ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/chair/sofa/bench/left{ @@ -95269,9 +95244,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 1 - }, /turf/open/floor/iron, /area/station/service/hydroponics) "xmk" = ( @@ -96340,7 +96312,6 @@ /turf/open/floor/iron, /area/station/maintenance/starboard/aft) "xzC" = ( -/obj/structure/railing, /obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, @@ -96351,6 +96322,7 @@ name = "service camera" }, /obj/machinery/light/small/directional/east, +/obj/structure/railing, /turf/open/floor/wood, /area/station/service/theater) "xzG" = ( @@ -97448,9 +97420,6 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue, -/obj/structure/railing{ - dir = 4 - }, /turf/open/floor/iron, /area/station/service/hydroponics) "xMX" = ( @@ -97846,9 +97815,6 @@ dir = 1 }, /obj/effect/turf_decal/tile/blue, -/obj/structure/railing{ - dir = 10 - }, /obj/effect/turf_decal/box/corners{ dir = 4 }, @@ -98454,6 +98420,13 @@ "yaj" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/white/corner, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "yam" = ( @@ -98482,9 +98455,6 @@ dir = 1 }, /obj/effect/landmark/start/hangover, -/obj/structure/railing{ - dir = 1 - }, /obj/effect/turf_decal/siding/white{ dir = 1 }, @@ -98514,6 +98484,9 @@ "yba" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/window/right/directional/west{ + name = "Hydroponics Center" + }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "ybb" = ( @@ -98565,10 +98538,14 @@ /area/station/science/research/abandoned) "ybr" = ( /obj/structure/lattice/catwalk, +/obj/structure/closet/crate, /obj/structure/railing{ - dir = 6 + dir = 9; + layer = 3.1 + }, +/obj/structure/railing{ + dir = 4 }, -/obj/structure/closet/crate, /turf/open/space/basic, /area/space/nearstation) "ybs" = ( @@ -98957,6 +98934,11 @@ "ygW" = ( /obj/machinery/vending/hydroseeds, /obj/effect/turf_decal/bot, +/obj/structure/railing, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "ygY" = ( @@ -130017,7 +129999,7 @@ oYs sHL glv hKE -mqz +crg xMK mae kQR @@ -131301,10 +131283,10 @@ pAy oYs aeu ueJ -evh +rID xSz oJj -yba +qSB aze cLO juX @@ -132853,11 +132835,11 @@ kel ryb kel fbU -mWO -nvo -nvo -nvo -uCA +qRx +wsp +wsp +wsp +fMo vpJ vCf xVa @@ -133115,7 +133097,7 @@ fzw uCY cmi fkU -uCA +fMo lvl rZf rul @@ -133889,7 +133871,7 @@ rhK msF suj iCu -mAJ +iCu nNc nNc nNc @@ -134137,17 +134119,17 @@ fRo fRo fRo hTi -vDY +xVa mgd fju cmG rtT uNg -xjF +fbU cwV fRo -jEn -dxk +fRo +khN wtg jwb dxk @@ -134396,15 +134378,15 @@ iyH eDV ldq jAI -rVs -rVs +iCu +iCu bjE owu tlU ikD xgL uOh -dxk +khN vqY eYQ aaz @@ -139080,7 +139062,7 @@ czf bCM ocA kzp -iCS +sqd crR hQV ojs @@ -152961,7 +152943,7 @@ vii vii cwA vRn -kpc +apz apz apz apz @@ -153219,7 +153201,7 @@ cOU hJG aBr yaj -sLB +nxm sLB jKN tJl @@ -153990,7 +153972,7 @@ tNE hJG aBr eWw -adz +fln adz mpK tJl @@ -154246,9 +154228,9 @@ twN twN aek vFn -bgW -bgW -bgW +dxi +dxi +dxi dxi pei jCI diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index b2888158ec4c..dc1474505976 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -142,12 +142,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/station/service/chapel/office) -"adD" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/lava/plasma/ice_moon, -/area/icemoon/underground/explored) "adW" = ( /obj/machinery/light/directional/south, /turf/open/floor/iron, @@ -832,9 +826,6 @@ /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 4 }, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/turf_decal/trimline/green/filled/warning{ dir = 1 }, @@ -1210,9 +1201,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, /turf/open/floor/iron/white, @@ -1511,14 +1499,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"ayG" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/lava/plasma/ice_moon, -/area/icemoon/underground/explored) "azf" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -1850,12 +1830,6 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron/dark, /area/station/cargo/miningdock) -"aFG" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/underground/explored) "aFJ" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -3787,12 +3761,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/sepia, /area/station/service/library) -"blf" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "blk" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -4045,9 +4013,6 @@ /obj/effect/turf_decal/trimline/neutral/corner{ dir = 8 }, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, @@ -4175,9 +4140,6 @@ /area/station/security/checkpoint/engineering) "brC" = ( /obj/machinery/light/directional/west, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -4192,14 +4154,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/security/prison/visit) -"brL" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 5 - }, -/area/station/service/chapel) "brY" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -6945,15 +6899,18 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) "chK" = ( -/obj/structure/railing{ - dir = 9 - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/glass/reinforced, /area/station/hallway/primary/starboard) "chO" = ( @@ -8336,9 +8293,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 4 - }, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "cCF" = ( @@ -9628,7 +9582,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/corner, -/obj/structure/railing/corner, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -10527,11 +10480,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/science/robotics/lab) -"dkK" = ( -/obj/structure/railing/corner, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "dkN" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -11022,12 +10970,6 @@ }, /turf/open/floor/plating, /area/station/medical/virology) -"dsO" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/service) "dsT" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -11479,9 +11421,6 @@ name = "Research Director Observation"; req_access = list("rd") }, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/white/side{ dir = 5 @@ -12904,12 +12843,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"dZS" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/underground/explored) "dZW" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -13370,12 +13303,6 @@ name = "Observation Deck"; req_access = list("xenobiology") }, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -13682,6 +13609,9 @@ /obj/structure/railing{ dir = 10 }, +/obj/structure/railing{ + dir = 8 + }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) "enq" = ( @@ -14985,12 +14915,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"eId" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/closed/wall, -/area/station/commons/dorms/laundry) "eIk" = ( /obj/structure/filingcabinet, /obj/machinery/power/apc/auto_name/directional/north, @@ -15458,9 +15382,7 @@ /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/hos) "ePR" = ( -/obj/structure/railing{ - dir = 6 - }, +/obj/structure/railing, /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/hallway/primary/starboard) @@ -16138,9 +16060,6 @@ /turf/open/floor/iron, /area/station/science/ordnance/testlab) "faJ" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, @@ -16172,9 +16091,6 @@ /area/station/hallway/primary/central) "fbK" = ( /obj/structure/cable, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -16513,9 +16429,6 @@ /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 8 }, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/engineering/atmos/storage) @@ -16696,9 +16609,6 @@ /area/station/security/prison/safe) "fkX" = ( /obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 1 - }, /turf/open/openspace, /area/station/science/ordnance/office) "fle" = ( @@ -16804,12 +16714,6 @@ "fmD" = ( /turf/open/floor/wood/parquet, /area/station/service/bar/atrium) -"fmU" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "fna" = ( /obj/structure/chair/wood{ dir = 4 @@ -17033,9 +16937,6 @@ }, /area/station/medical/medbay/central) "frd" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -17105,9 +17006,6 @@ /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 4 }, -/obj/structure/railing/corner{ - dir = 4 - }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "frS" = ( @@ -17619,7 +17517,6 @@ /area/station/security/prison/work) "fAW" = ( /obj/structure/cable, -/obj/structure/railing/corner, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/station/commons/locker) @@ -18519,13 +18416,6 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/starboard/fore) -"fSd" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/underground/explored) "fSj" = ( /obj/effect/decal/cleanable/oil, /turf/open/floor/plating, @@ -18796,10 +18686,6 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/service/kitchen/diner) -"fWw" = ( -/obj/structure/railing/corner, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "fWL" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -18935,15 +18821,6 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/iron, /area/station/maintenance/port/fore) -"fZo" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/wood/parquet, -/area/station/service/bar/atrium) "fZq" = ( /obj/structure/curtain/cloth, /turf/open/floor/iron/showroomfloor, @@ -19348,9 +19225,6 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "gdN" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -19538,9 +19412,6 @@ /turf/open/floor/iron, /area/station/maintenance/port/fore) "ghQ" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/tile/brown/half/contrasted, @@ -19770,7 +19641,6 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "glP" = ( -/obj/structure/railing/corner, /obj/item/storage/belt/utility, /obj/machinery/newscaster/directional/north, /obj/machinery/light/directional/north, @@ -20035,12 +19905,6 @@ /obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron/dark, /area/mine/laborcamp) -"gqj" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/glass/reinforced, -/area/station/hallway/primary/starboard) "gqm" = ( /obj/machinery/conveyor{ dir = 4; @@ -20973,9 +20837,6 @@ "gGj" = ( /obj/machinery/airalarm/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 9 }, @@ -21455,15 +21316,6 @@ }, /turf/open/floor/plating, /area/mine/production) -"gOY" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/storage) "gPj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -21745,13 +21597,6 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/wood, /area/station/service/library) -"gUp" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/lava/plasma/ice_moon, -/area/icemoon/underground/explored) "gUr" = ( /obj/item/trash/sosjerky, /turf/open/floor/plating, @@ -21974,7 +21819,10 @@ /area/station/hallway/secondary/entry) "gYa" = ( /obj/structure/railing{ - dir = 9 + dir = 8 + }, +/obj/structure/railing{ + dir = 1 }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) @@ -22256,9 +22104,6 @@ /obj/structure/railing{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 8 - }, /turf/open/openspace, /area/station/engineering/atmos/storage) "hcL" = ( @@ -23365,15 +23210,18 @@ }, /area/station/service/chapel) "hxT" = ( -/obj/structure/railing{ - dir = 9 - }, /obj/machinery/light/small/directional/east, /obj/machinery/button/door/directional/east{ id = "drone_bay"; name = "Shutter Control"; pixel_y = -8 }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) "hyd" = ( @@ -23648,9 +23496,6 @@ /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/trimline/green/filled/warning{ dir = 1 }, @@ -24627,12 +24472,16 @@ /area/station/hallway/primary/starboard) "hUy" = ( /obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 5 - }, /obj/structure/marker_beacon/burgundy{ name = "landing marker" }, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 1 + }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) "hUz" = ( @@ -25678,9 +25527,6 @@ /turf/open/floor/plating, /area/station/command/heads_quarters/qm) "ikW" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/machinery/door/firedoor/border_only, /turf/open/floor/iron/dark/corner{ dir = 1 @@ -26164,7 +26010,6 @@ name = "Research Director Observation"; req_access = list("rd") }, -/obj/structure/railing/corner, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/command/heads_quarters/rd) @@ -26350,9 +26195,6 @@ /turf/open/floor/sepia, /area/station/security/prison/rec) "ixH" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -26609,10 +26451,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/railing/corner{ +/obj/machinery/status_display/evac/directional/north, +/obj/structure/railing{ dir = 1 }, -/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "iBl" = ( @@ -27682,8 +27524,10 @@ /area/mine/laborcamp/security) "iSk" = ( /obj/structure/lattice/catwalk, +/obj/structure/railing, /obj/structure/railing{ - dir = 6 + dir = 4; + layer = 4.1 }, /turf/open/openspace, /area/station/science/ordnance/office) @@ -27856,9 +27700,6 @@ /turf/open/floor/iron/cafeteria, /area/station/commons/dorms/laundry) "iVb" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -28271,7 +28112,6 @@ /turf/open/floor/iron/dark, /area/station/security/courtroom) "jbu" = ( -/obj/structure/railing/corner, /turf/open/floor/iron/dark/side{ dir = 9 }, @@ -28796,10 +28636,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/grass, /area/station/service/hydroponics) -"jlu" = ( -/obj/structure/railing/corner, -/turf/open/lava/plasma/ice_moon, -/area/icemoon/underground/explored) "jly" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -28845,9 +28681,6 @@ /turf/open/floor/iron/dark/textured, /area/station/security/range) "jmb" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/firealarm/directional/north, /obj/machinery/camera{ @@ -28887,9 +28720,6 @@ /turf/open/floor/iron/grimy, /area/station/service/chapel/office) "jnn" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/machinery/light/small/directional/east, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) @@ -29340,18 +29170,6 @@ /obj/item/stack/sheet/glass/fifty, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"juZ" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/mine/eva/lower) "jvc" = ( /obj/machinery/door/firedoor/border_only, /turf/open/openspace, @@ -29711,6 +29529,9 @@ /obj/structure/railing{ dir = 10 }, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) "jCD" = ( @@ -30275,9 +30096,6 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/duct, /obj/machinery/camera{ c_tag = "Virology Module North"; @@ -30285,6 +30103,9 @@ network = list("ss13","medbay") }, /obj/machinery/light/small/directional/north, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/iron/white, /area/station/medical/virology) "jLO" = ( @@ -30892,7 +30713,6 @@ /turf/open/floor/wood, /area/station/maintenance/fore) "jVq" = ( -/obj/structure/railing/corner, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/green{ @@ -31294,9 +31114,6 @@ /turf/open/floor/iron, /area/station/engineering/storage/tech) "kcA" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -31673,13 +31490,6 @@ /obj/effect/turf_decal/tile/blue/anticorner/contrasted, /turf/open/floor/iron/white, /area/station/medical/psychology) -"kht" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "khA" = ( /obj/machinery/firealarm/directional/west, /obj/item/kirbyplants/random, @@ -32002,9 +31812,6 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) "kmQ" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/machinery/door/firedoor/border_only, /obj/machinery/camera{ c_tag = "Service Botany - Upper South"; @@ -34132,14 +33939,6 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/white, /area/station/maintenance/port/fore) -"kUP" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner, -/turf/open/lava/plasma/ice_moon, -/area/icemoon/underground/explored) "kVx" = ( /obj/structure/cable/multilayer/multiz, /obj/effect/turf_decal/stripes/line, @@ -34644,9 +34443,6 @@ /turf/open/floor/iron, /area/station/medical/pharmacy) "lca" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/item/radio/intercom/directional/west, /turf/open/floor/iron/dark, /area/station/medical/morgue) @@ -35675,18 +35471,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/engine_smes) -"lun" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/mine/eva/lower) "lup" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 8 @@ -36322,9 +36106,6 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "lEt" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron/dark/side, /area/mine/eva) @@ -36410,6 +36191,9 @@ /obj/structure/railing{ dir = 10 }, +/obj/structure/railing{ + dir = 8 + }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "lFq" = ( @@ -36659,9 +36443,6 @@ /turf/open/floor/iron, /area/station/service/janitor) "lKZ" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -36866,10 +36647,6 @@ /turf/open/floor/iron, /area/station/maintenance/department/electrical) "lPb" = ( -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, /turf/open/floor/plating/icemoon, /area/station/security/execution/education) "lPc" = ( @@ -36910,19 +36687,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"lPJ" = ( -/obj/structure/railing/corner, -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/mid_joiner{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark/smooth_edge{ - dir = 1 - }, -/area/station/ai_monitored/command/storage/eva) "lPN" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, @@ -37666,9 +37430,6 @@ /turf/open/floor/iron, /area/station/security/prison/work) "mdy" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, @@ -39895,15 +39656,6 @@ /obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/iron/white, /area/station/maintenance/aft/greater) -"mSH" = ( -/obj/structure/fence{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/underground/explored) "mSL" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -40847,9 +40599,6 @@ /obj/structure/fence/door{ dir = 4 }, -/obj/structure/railing/corner{ - dir = 1 - }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) "ngY" = ( @@ -41146,15 +40895,18 @@ /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/hos) "nlJ" = ( -/obj/structure/railing{ - dir = 5 - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/glass/reinforced, /area/station/hallway/primary/starboard) "nlN" = ( @@ -41629,10 +41381,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/structure/railing/corner{ +/obj/structure/sign/poster/official/random/directional/north, +/obj/structure/railing{ dir = 1 }, -/obj/structure/sign/poster/official/random/directional/north, /turf/open/floor/wood, /area/station/hallway/secondary/service) "nsi" = ( @@ -42388,7 +42140,6 @@ /turf/open/floor/iron/goonplaque, /area/station/hallway/secondary/entry) "nDl" = ( -/obj/structure/railing/corner, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/tile/dark/half/contrasted, /turf/open/floor/iron/white, @@ -42412,12 +42163,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/locker) -"nDw" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "nDz" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42849,8 +42594,10 @@ /turf/open/floor/iron, /area/station/command/teleporter) "nKl" = ( +/obj/structure/railing, /obj/structure/railing{ - dir = 6 + dir = 4; + layer = 4.1 }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) @@ -45021,7 +44768,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/obj/structure/railing/corner, /obj/machinery/door/firedoor/border_only, /turf/open/floor/iron/cafeteria{ dir = 8 @@ -45451,9 +45197,6 @@ /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 1 - }, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "oyz" = ( @@ -45549,7 +45292,6 @@ /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) "ozM" = ( -/obj/structure/railing/corner, /obj/structure/sign/warning/biohazard/directional/west, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) @@ -45705,13 +45447,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"oBz" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/lava/plasma/ice_moon, -/area/icemoon/underground/explored) "oBP" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -46155,11 +45890,6 @@ /obj/effect/spawner/random/maintenance/four, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"oJk" = ( -/obj/structure/railing/corner, -/obj/effect/turf_decal/tile/brown, -/turf/open/floor/iron, -/area/station/cargo/storage) "oJn" = ( /obj/structure/flora/grass/brown/style_3, /obj/structure/flora/bush/snow/style_random, @@ -47629,9 +47359,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -47711,9 +47438,6 @@ dir = 4 }, /obj/structure/sign/warning/cold_temp/directional/south, -/obj/structure/railing/corner{ - dir = 8 - }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/fore/lesser) "pjF" = ( @@ -48995,7 +48719,6 @@ /turf/open/floor/iron, /area/station/maintenance/starboard/fore) "pFV" = ( -/obj/structure/railing/corner, /turf/open/floor/iron/smooth, /area/station/maintenance/fore/lesser) "pFW" = ( @@ -49109,6 +48832,14 @@ }, /turf/open/floor/iron/dark/textured, /area/station/ai_monitored/security/armory) +"pHr" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) "pHy" = ( /obj/structure/rack, /obj/item/clothing/mask/breath, @@ -50156,7 +49887,6 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "pYz" = ( -/obj/structure/railing/corner, /obj/machinery/door/firedoor/border_only, /turf/open/floor/iron/dark/corner{ dir = 4 @@ -50287,22 +50017,7 @@ }, /turf/open/floor/iron/white, /area/station/medical/surgery/aft) -"qbb" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/science/ordnance/office) "qbd" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -50476,9 +50191,6 @@ /turf/closed/wall/r_wall, /area/station/security/checkpoint/engineering) "qeF" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -50495,16 +50207,6 @@ /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) -"qeL" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/lava/plasma/ice_moon, -/area/icemoon/underground/explored) "qeP" = ( /obj/structure/table, /obj/item/flashlight/lantern, @@ -51396,9 +51098,6 @@ /turf/open/floor/iron, /area/station/cargo/drone_bay) "quZ" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/landmark/start/botanist, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/tile/green{ @@ -51494,9 +51193,6 @@ /area/station/hallway/primary/aft) "qwi" = ( /obj/effect/turf_decal/trimline/neutral/corner, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, @@ -52831,9 +52527,6 @@ /turf/open/floor/iron/dark/textured, /area/station/security/prison/workout) "qSe" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, /area/station/medical/morgue) @@ -52854,11 +52547,9 @@ /area/station/security/prison/garden) "qSq" = ( /obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 4 - }, +/obj/structure/railing, /obj/structure/railing{ - dir = 10 + dir = 8 }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) @@ -53004,9 +52695,6 @@ /turf/open/floor/wood, /area/station/maintenance/aft/greater) "qUS" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/tile/brown{ dir = 8 }, @@ -54558,14 +54246,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"rwe" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/openspace, -/area/station/engineering/atmos/storage) "rwk" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -55610,9 +55290,6 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/structure/cable, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -55792,11 +55469,6 @@ "rQf" = ( /turf/open/floor/plating, /area/station/engineering/supermatter/room) -"rQl" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner, -/turf/open/lava/plasma/ice_moon, -/area/icemoon/underground/explored) "rQn" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -56633,9 +56305,6 @@ /turf/open/floor/iron, /area/station/cargo/office) "sdX" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/structure/cable, /obj/item/assembly/timer{ pixel_y = 3 @@ -58354,9 +58023,6 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "sFS" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/trimline/neutral/warning{ dir = 1 }, @@ -58376,9 +58042,6 @@ name = "Medbay Access"; req_access = list("medical") }, -/obj/structure/railing/corner{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/station/medical/morgue) "sGk" = ( @@ -58409,22 +58072,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/mine/living_quarters) -"sGH" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ - dir = 8 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/engineering/atmos/storage) "sGJ" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister, @@ -58689,10 +58336,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner, /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/atmos/storage) @@ -60582,7 +60225,6 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "tux" = ( -/obj/structure/railing/corner, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -60976,9 +60618,13 @@ /area/station/security/checkpoint/supply) "tBW" = ( /obj/structure/railing{ - dir = 5 + dir = 1 }, /obj/structure/sign/warning/biohazard/directional/west, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "tCe" = ( @@ -62960,7 +62606,6 @@ /turf/open/floor/iron/white, /area/station/medical/pharmacy) "uhs" = ( -/obj/structure/railing/corner, /obj/machinery/camera/directional/south{ c_tag = "Mining B-1 Hallway North" }, @@ -63585,12 +63230,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/grass, /area/station/service/hydroponics/garden) -"urw" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/glass/reinforced, -/area/station/hallway/primary/starboard) "urx" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, @@ -63740,10 +63379,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) -"uuC" = ( -/obj/structure/railing/corner, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) "uuI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -64048,7 +63683,6 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "uAl" = ( -/obj/structure/railing/corner, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/commons/storage/primary) @@ -64134,9 +63768,6 @@ /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/machinery/duct, /turf/open/floor/iron/white, /area/station/medical/virology) @@ -64331,15 +63962,6 @@ /obj/structure/closet/crate, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) -"uEI" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) "uEJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /turf/open/floor/iron, @@ -64880,7 +64502,6 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 6 }, -/obj/structure/railing/corner, /obj/effect/landmark/start/hangover, /turf/open/floor/iron/white, /area/station/medical/virology) @@ -65238,15 +64859,6 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"uWw" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/underground/explored) "uWD" = ( /obj/machinery/disposal/delivery_chute{ dir = 4 @@ -67376,9 +66988,7 @@ /area/station/maintenance/fore) "vEH" = ( /obj/structure/industrial_lift, -/obj/structure/railing{ - dir = 6 - }, +/obj/structure/railing, /turf/open/openspace, /area/station/commons/storage/mining) "vEJ" = ( @@ -67725,9 +67335,6 @@ /turf/open/floor/iron/dark, /area/station/science/breakroom) "vJY" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/machinery/door/window/brigdoor{ dir = 8; name = "Research Director Observation"; @@ -67829,9 +67436,6 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 10 }, -/obj/structure/railing/corner{ - dir = 8 - }, /turf/open/floor/iron/white, /area/station/medical/virology) "vMi" = ( @@ -68115,12 +67719,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"vRY" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "vSa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -68383,14 +67981,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/command/bridge) -"vWP" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing, -/turf/open/lava/plasma/ice_moon, -/area/icemoon/underground/explored) "vWV" = ( /obj/structure/chair/office{ dir = 8 @@ -68430,20 +68020,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) -"vXv" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/openspace, -/area/station/engineering/atmos/storage) "vXy" = ( /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) @@ -71338,7 +70914,10 @@ "wQY" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ - dir = 9 + dir = 1 + }, +/obj/structure/railing{ + dir = 8 }, /turf/open/openspace, /area/station/science/ordnance/office) @@ -71478,7 +71057,6 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "wSX" = ( -/obj/structure/railing/corner, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron/dark/side, @@ -72860,8 +72438,9 @@ /area/station/hallway/primary/central) "xnX" = ( /obj/structure/lattice/catwalk, +/obj/structure/railing, /obj/structure/railing{ - dir = 6 + dir = 4 }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) @@ -74827,7 +74406,10 @@ /area/mine/eva/lower) "xVT" = ( /obj/structure/railing{ - dir = 9 + dir = 1 + }, +/obj/structure/railing{ + dir = 8 }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) @@ -92394,7 +91976,7 @@ ghx ghx hMz hUy -dZS +xuo xuo scw iDt @@ -92909,7 +92491,7 @@ ghx ghx ghx stA -rQl +ojf hUK hUK xMq @@ -93153,7 +92735,7 @@ ghx ghx ghx ghx -jlu +ghx uwH lWI flZ @@ -93161,7 +92743,7 @@ lWI lWI lWI qrj -ena +qSq ghx ghx ghx @@ -93410,7 +92992,7 @@ ghx ghx ghx ndA -mSH +dLH ngM kgN wDU @@ -93418,9 +93000,9 @@ sKo sKo sKo wDU -kUP +ojf okH -qSq +pHr ghx stA xlq @@ -93677,10 +93259,10 @@ fob wDU xlq ghx -qeL +stA lWI -gUp -ayG +ojf +ojf okH qSq ghx @@ -93932,9 +93514,9 @@ qmt xbA qmt wDU -oBz +ojf lWI -gUp +ojf ojf ojf xlq @@ -94194,9 +93776,9 @@ wDU dqW xuo xuo -oBz +ojf lWI -vWP +xlq ghx ghx ghx @@ -95727,7 +95309,7 @@ xBF nfr qmt iVm -lun +iGv vip gSO uPt @@ -95984,7 +95566,7 @@ kLa qmt qmt sAa -juZ +iGv vFM lIR uUT @@ -96460,7 +96042,7 @@ ghx ghx ghx psb -fSd +xuo hUK gqG thA @@ -98002,7 +97584,7 @@ thA xuo wYp odW -uWw +xuo psb ghx ghx @@ -98481,7 +98063,7 @@ thA rfu lWI lWI -adD +lWI lWI ena ghx @@ -98740,7 +98322,7 @@ xuo xuo xuo xuo -oBz +ojf ena ghx ghx @@ -98998,7 +98580,7 @@ xuo xuo xuo xuo -oBz +ojf ena ghx ghx @@ -99256,7 +98838,7 @@ rfu pjj daf kmH -oBz +ojf ena ghx ghx @@ -99514,7 +99096,7 @@ pjj daf daf xuo -oBz +ojf ena ghx ghx @@ -158157,7 +157739,7 @@ afz tKI szG iwS -eId +iwS lWh lWh iwS @@ -158683,7 +158265,7 @@ gjq gjq gjq hxT -aFG +xuo hZe xuo jnn @@ -178208,7 +177790,7 @@ fuH fuH btU oYm -kht +dYr wqi qhy dYX @@ -183101,7 +182683,7 @@ ozM nKl cgR tBW -vRY +iDt ffe oxO oxO @@ -183353,7 +182935,7 @@ thA thA xMq xMq -fWw +iDt nKl ghx ghx @@ -183867,12 +183449,12 @@ thA thA thA scw -nDw +iDt lFp ghx ghx xVT -blf +iDt xMq xMq alM @@ -184125,10 +183707,10 @@ thA thA xMq xMq -nDw +iDt tUV tUV -blf +iDt iDt scw xMq @@ -226530,12 +226112,12 @@ vlN mmi wiz mmi -oJk +jhy jjk jjk jjk sOm -uEI +eWV ajw maT maT @@ -233436,7 +233018,7 @@ iVi bWn ylz xMX -lPJ +sFS nVB nVB nVB @@ -242691,7 +242273,7 @@ cXN gmW jOY tux -dsO +tGZ kQX tGZ oBp @@ -243217,7 +242799,7 @@ izC jRA jRA dGP -fZo +ixH nGz izC yjX @@ -244552,9 +244134,9 @@ pOy njA sKW hGs -vXv +nZH hGs -gOY +wDg ylM vep trf @@ -245066,7 +244648,7 @@ npD npD gGj mue -sGH +fij bPt fij oDh @@ -246350,7 +245932,7 @@ edT wRr npD bPY -rwe +nZH wGO npD oUi @@ -251218,7 +250800,7 @@ oQx vpW jbU lec -fmU +pMF qhL wve hfc @@ -251477,7 +251059,7 @@ jbU kZd hdH qhL -dkK +wve vVP vVP vVP @@ -253244,7 +252826,7 @@ gEE gEE chK leM -gqj +bMY emp cYE lso @@ -254256,7 +253838,7 @@ rPu lUC tXV kvX -brL +hxI cYY cYY wrX @@ -254272,7 +253854,7 @@ gEE gEE nlJ rrp -urw +bMY emp bvI lso @@ -254280,7 +253862,7 @@ mtT pLa jJF yeB -uuC +lZi hDb qWn gav @@ -254793,7 +254375,7 @@ cvr cvr equ lso -uuC +lso ePR kwK qWn @@ -255842,7 +255424,7 @@ bEJ bEJ mXe bEJ -qbb +bEJ piM hLO hLO diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 975e7f4f6a7b..20b55db673a0 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -26881,7 +26881,10 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "jLG" = ( -/obj/structure/railing/corner, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, /turf/open/floor/plating/airless, /area/space/nearstation) "jMo" = ( @@ -29940,9 +29943,6 @@ /turf/open/floor/iron, /area/station/cargo/miningoffice) "kRf" = ( -/obj/structure/railing{ - dir = 6 - }, /obj/effect/turf_decal/trimline/yellow/filled/end, /obj/effect/turf_decal/trimline/yellow/warning{ dir = 10 @@ -29953,6 +29953,11 @@ pixel_y = 4 }, /obj/structure/cable, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/obj/structure/railing, /turf/open/floor/iron, /area/station/engineering/atmos) "kRi" = ( @@ -41864,8 +41869,10 @@ /area/station/hallway/secondary/entry) "pdU" = ( /obj/structure/railing{ - dir = 6 + dir = 4; + layer = 4.1 }, +/obj/structure/railing, /turf/open/floor/plating/airless, /area/space/nearstation) "pdX" = ( @@ -60993,8 +61000,10 @@ /obj/structure/railing{ dir = 4 }, +/obj/structure/railing, /obj/structure/railing{ - dir = 10 + dir = 8; + layer = 4.1 }, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos) diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index 0af79460e1bb..5b5b9b45d37b 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -560,10 +560,11 @@ /turf/open/floor/plating, /area/mine/maintenance/production) "dw" = ( +/obj/effect/turf_decal/sand/plating/volcanic, /obj/structure/railing{ - dir = 10 + dir = 8 }, -/obj/effect/turf_decal/sand/plating/volcanic, +/obj/structure/railing, /turf/open/floor/plating/lavaland_atmos, /area/lavaland/surface/outdoors) "dx" = ( @@ -745,13 +746,6 @@ /obj/structure/fans/tiny, /turf/open/floor/plating, /area/mine/laborcamp/security/maintenance) -"fb" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/lattice/catwalk/mining, -/turf/open/lava/smooth/lava_land_surface, -/area/lavaland/surface/outdoors) "fe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -3215,13 +3209,6 @@ "rF" = ( /turf/closed/wall/r_wall, /area/mine/maintenance/labor) -"rG" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/turf_decal/sand/plating/volcanic, -/turf/open/floor/plating/lavaland_atmos, -/area/lavaland/surface/outdoors) "rH" = ( /obj/machinery/mineral/processing_unit{ dir = 1; @@ -3762,13 +3749,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/mine/maintenance/service) -"vd" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/effect/turf_decal/sand/plating/volcanic, -/turf/open/floor/plating/lavaland_atmos, -/area/lavaland/surface/outdoors) "ve" = ( /obj/structure/cable, /obj/machinery/power/terminal{ @@ -4106,13 +4086,6 @@ dir = 1 }, /area/mine/mechbay) -"xh" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/effect/turf_decal/sand/plating/volcanic, -/turf/open/floor/plating/lavaland_atmos, -/area/lavaland/surface/outdoors) "xi" = ( /obj/structure/table, /obj/item/paper, @@ -4713,12 +4686,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth_edge, /area/mine/laborcamp/production) -"AQ" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/misc/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) "AV" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/item/reagent_containers/cup/glass/bottle/beer, @@ -4739,10 +4706,6 @@ }, /turf/open/floor/iron/dark, /area/mine/production) -"Bd" = ( -/obj/structure/railing/corner, -/turf/open/misc/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) "By" = ( /obj/machinery/door/poddoor/preopen{ id = "labor"; @@ -6581,9 +6544,6 @@ /turf/open/floor/iron/checker, /area/mine/cafeteria) "MQ" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/structure/sign/directions/security/directional/west{ pixel_x = 32; pixel_y = -8 @@ -7288,20 +7248,10 @@ /obj/structure/closet/toolcloset, /turf/open/floor/plating, /area/mine/maintenance/service) -"RB" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/lattice/catwalk/mining, -/turf/open/lava/smooth/lava_land_surface, -/area/lavaland/surface/outdoors) "RD" = ( /turf/closed/wall, /area/mine/maintenance/labor) "RF" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/structure/sign/directions/security/directional/west{ pixel_x = 0; pixel_y = 24 @@ -34609,7 +34559,7 @@ pU pU pU pU -AQ +pU ZM ZM ZM @@ -34622,8 +34572,8 @@ ZM ZM ZM Ka -vd -xh +BP +BP dw pU aj @@ -34864,7 +34814,7 @@ pU pU pU pU -Bd +pU VK VK VK @@ -35137,7 +35087,7 @@ aj aj aj FH -rG +BP ol aj aj @@ -37451,7 +37401,7 @@ px DI oS BP -xh +BP ZM ZM ZM @@ -37711,7 +37661,7 @@ xt VK VK VK -fb +tF BP dx Kf @@ -44383,7 +44333,7 @@ pU nm Nc nm -RB +tF Yq aj aj @@ -47193,7 +47143,7 @@ pU pU pU pU -AQ +pU ZM ZM ZM @@ -47450,7 +47400,7 @@ pU pU pU pU -Bd +pU VK VK VK diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index fd0d7cf8bf48..a92e486f9650 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -2634,7 +2634,7 @@ /obj/item/folder/blue, /obj/item/stamp/law, /obj/item/banhammer{ - force = 2000; + force = -10; name = "Hammer of Justice"; desc = "Divine Judgement." }, @@ -2989,17 +2989,6 @@ }, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/courtroom) -"lX" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door/poddoor/shutters{ - id = "XCCsec1"; - name = "XCC Checkpoint 1 Shutters"; - max_integrity = 3000000 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/control) "md" = ( /obj/machinery/computer/shuttle/labor, /obj/effect/turf_decal/stripes/line{ @@ -3795,6 +3784,14 @@ }, /turf/open/floor/stone, /area/centcom/central_command_areas/evacuation/ship) +"pa" = ( +/obj/machinery/door/airlock/centcom{ + name = "Shuttle Control Office" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/mapping_helpers/airlock/access/any/admin/general, +/turf/open/space/basic, +/area/centcom/central_command_areas/admin) "pc" = ( /obj/structure/sign/nanotrasen, /turf/closed/indestructible/riveted, @@ -3833,15 +3830,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) -"pi" = ( -/obj/structure/table/reinforced, -/obj/item/folder/yellow, -/obj/item/stamp/qm, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supply) "pj" = ( /obj/structure/chair/office{ dir = 8 @@ -3859,7 +3847,8 @@ dir = 4; icon_state = "rightsecure"; name = "CentCom Customs"; - req_access = list("cent_captain") + req_access = list("cent_captain"); + max_integrity = 300000000 }, /obj/item/clipboard, /obj/item/folder/yellow, @@ -3991,7 +3980,9 @@ "pQ" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/east{ + max_integrity = 300000000 + }, /obj/item/paper_bin, /obj/item/pen/red, /obj/effect/turf_decal/bot, @@ -4924,15 +4915,6 @@ /obj/effect/mapping_helpers/airlock/access/any/command/general, /turf/open/floor/iron, /area/centcom/tdome/administration) -"tD" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, -/obj/machinery/light/directional/east, -/obj/structure/mirror/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin) "tF" = ( /obj/machinery/door/airlock/centcom{ name = "Thunderdome Locker Room" @@ -5187,11 +5169,8 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/supply) "uH" = ( -/obj/machinery/door/airlock/centcom{ - name = "Shuttle Control Office" - }, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, +/turf/closed/indestructible/riveted, /area/centcom/central_command_areas/supply) "uK" = ( /obj/machinery/processor, @@ -5402,14 +5381,10 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) "vG" = ( -/obj/machinery/door/poddoor/shutters{ - id = "XCCsec1"; - name = "XCC Checkpoint 1 Shutters"; - max_integrity = 3000000 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/door/poddoor/shutters/cc/xcc, /turf/open/floor/iron, /area/centcom/central_command_areas/control) "vH" = ( @@ -5728,6 +5703,9 @@ /obj/effect/turf_decal/tile/blue/anticorner/contrasted, /turf/open/floor/iron, /area/centcom/central_command_areas/evacuation) +"wM" = ( +/turf/open/floor/iron, +/area/centcom/central_command_areas/supply) "wN" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -9151,6 +9129,7 @@ "Nx" = ( /obj/structure/fans/tiny, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/door/poddoor/shutters/cc/xcc, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/supply) "Ny" = ( @@ -52122,7 +52101,7 @@ TO On Ui Cs -tD +Hz oB ZF YU @@ -52379,7 +52358,7 @@ yP On On On -On +pa On On YU @@ -52636,7 +52615,7 @@ nG iF yd GL -pi +jt FO Tq YU @@ -53673,10 +53652,10 @@ iF rK mQ io -lX -lX -lX -lX +vG +vG +vG +vG vG io rK @@ -54170,8 +54149,8 @@ oJ oJ oJ lo -lK -iR +uH +wM oJ oJ lo @@ -54678,7 +54657,7 @@ iF iF iF iF -iX +Ih iF iF iF @@ -54691,10 +54670,10 @@ no iF iF iN -iX +Ih pl pQ -iX +Ih iF iX iF diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index b7876ed56dd4..ba14c8c9b5e2 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -806,9 +806,6 @@ }, /area/station/escapepodbay) "acv" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/filingcabinet, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -818,6 +815,9 @@ c_tag = "Security - Prison Prep Room" }, /obj/structure/cable, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/iron, /area/station/security/execution/transfer) "acw" = ( @@ -1680,13 +1680,6 @@ /obj/machinery/door/airlock/freezer, /turf/open/floor/catwalk_floor, /area/station/service/kitchen/coldroom) -"aeO" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating, -/area/station/engineering/atmos) "aeP" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner, /obj/structure/cable, @@ -1925,42 +1918,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/openspace, -/area/station/asteroid) -"afB" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/openspace, -/area/station/asteroid) -"afC" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/openspace, -/area/station/asteroid) -"afD" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/openspace, -/area/station/asteroid) -"afE" = ( /obj/structure/railing{ - dir = 4 + dir = 1 }, -/obj/structure/lattice/catwalk, /turf/open/openspace, /area/station/asteroid) "afF" = ( @@ -1974,13 +1934,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison/safe) -"afG" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/lattice/catwalk, -/turf/open/openspace, -/area/station/asteroid) "afH" = ( /obj/structure/grille, /obj/structure/window/spawner/directional/west, @@ -1995,30 +1948,19 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "afJ" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/structure/lattice/catwalk, +/obj/structure/railing, /obj/structure/railing{ - pixel_y = -8 - }, -/obj/structure/railing/corner{ - dir = 4; - pixel_x = -32; - pixel_y = -29 + dir = 8; + layer = 4.1 }, /turf/open/openspace, /area/station/asteroid) "afK" = ( /obj/machinery/light/directional/north, -/obj/structure/railing{ - dir = 1 - }, /obj/structure/ladder, /obj/structure/lattice/catwalk, -/obj/structure/railing{ - pixel_y = -8 - }, +/obj/structure/railing, /turf/open/openspace, /area/station/asteroid) "afL" = ( @@ -2026,17 +1968,11 @@ /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) "afM" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/structure/lattice/catwalk, +/obj/structure/railing, /obj/structure/railing{ - pixel_y = -8 - }, -/obj/structure/railing/corner{ - dir = 1; - pixel_x = 32; - pixel_y = -29 + dir = 4; + layer = 4.1 }, /turf/open/openspace, /area/station/asteroid) @@ -2048,7 +1984,6 @@ "afO" = ( /obj/machinery/light/directional/east, /obj/structure/lattice, -/obj/structure/railing, /turf/open/openspace, /area/station/asteroid) "afP" = ( @@ -2095,13 +2030,6 @@ /obj/structure/lattice, /turf/open/openspace, /area/station/asteroid) -"afW" = ( -/obj/effect/spawner/random{ - loot = list(/obj/effect/decal/cleanable/oil/slippery=10,/obj/effect/decal/cleanable/oil=90); - name = "funny slipper :)" - }, -/turf/open/floor/noslip/tram_plate, -/area/station/hallway/primary/tram/right) "afX" = ( /obj/structure/fluff/tram_rail{ dir = 1 @@ -2131,45 +2059,31 @@ /turf/open/openspace, /area/station/asteroid) "agb" = ( -/obj/structure/railing/corner, /obj/structure/lattice/catwalk, /obj/structure/railing{ - dir = 1; - pixel_x = 1; - pixel_y = 6 + dir = 8 }, -/obj/structure/railing/corner{ - pixel_y = 30; - pixel_x = -31 +/obj/structure/railing{ + dir = 1 }, /turf/open/openspace, /area/station/asteroid) "agc" = ( /obj/machinery/light/directional/south, -/obj/structure/railing, /obj/structure/ladder, /obj/structure/lattice/catwalk, /obj/structure/railing{ - dir = 1; - pixel_x = 1; - pixel_y = 6 + dir = 1 }, /turf/open/openspace, /area/station/asteroid) "agd" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/structure/lattice/catwalk, /obj/structure/railing{ - dir = 1; - pixel_x = 1; - pixel_y = 6 + dir = 4 }, -/obj/structure/railing/corner{ - pixel_y = 30; - dir = 8; - pixel_x = 32 +/obj/structure/railing{ + dir = 1 }, /turf/open/openspace, /area/station/asteroid) @@ -2179,26 +2093,8 @@ /area/station/asteroid) "agf" = ( /obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/openspace, -/area/station/asteroid) -"agg" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/openspace, -/area/station/asteroid) -"agh" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/structure/cable, +/obj/structure/railing, /turf/open/openspace, /area/station/asteroid) "agi" = ( @@ -3844,7 +3740,6 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "asK" = ( -/obj/structure/railing, /obj/effect/turf_decal/siding/wideplating/dark, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, @@ -4526,7 +4421,6 @@ "ayT" = ( /obj/machinery/light/directional/west, /obj/structure/lattice, -/obj/structure/railing, /turf/open/openspace, /area/station/asteroid) "azd" = ( @@ -5051,6 +4945,10 @@ dir = 10 }, /obj/machinery/smartfridge/petri/preloaded, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron/white, /area/station/science/xenobiology) "aDq" = ( @@ -5444,9 +5342,6 @@ /obj/effect/turf_decal/trimline/dark_blue/corner{ dir = 8 }, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) @@ -5644,12 +5539,6 @@ /obj/structure/cable, /turf/open/openspace, /area/station/asteroid) -"aHk" = ( -/obj/structure/railing{ - dir = 6 - }, -/turf/open/openspace, -/area/station/asteroid) "aHl" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -6223,12 +6112,6 @@ /turf/open/floor/iron, /area/station/commons/fitness/recreation) "aMm" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 1 }, @@ -6242,9 +6125,6 @@ /turf/open/floor/iron, /area/station/commons/fitness/recreation) "aMn" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 1 }, @@ -6288,21 +6168,6 @@ }, /turf/closed/wall, /area/station/hallway/primary/tram/left) -"aME" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/space/openspace, -/area/station/solars/port) "aMG" = ( /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron/white, @@ -7037,12 +6902,6 @@ /area/station/commons/dorms) "aSQ" = ( /obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -7238,6 +7097,18 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) +"aVq" = ( +/obj/effect/turf_decal/siding/thinplating{ + dir = 8 + }, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/structure/railing, +/turf/open/floor/grass, +/area/station/hallway/secondary/construction/engineering) "aVD" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/neutral/filled/line, @@ -8160,21 +8031,6 @@ /obj/structure/chair/stool/directional/south, /turf/open/floor/plating, /area/station/asteroid) -"bok" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner, -/turf/open/space/openspace, -/area/station/solars/port) "bop" = ( /obj/machinery/button/door/directional/west{ id = "private_c"; @@ -8471,9 +8327,6 @@ /turf/open/floor/iron/cafeteria, /area/station/commons/dorms/laundry) "btO" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/machinery/light/directional/east, /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/glass/reinforced, @@ -8719,17 +8572,6 @@ }, /turf/open/floor/iron/white, /area/station/science/lower) -"bwT" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "bxd" = ( /obj/machinery/computer/message_monitor{ dir = 1 @@ -8858,16 +8700,6 @@ /obj/item/lightreplacer, /turf/open/floor/glass/reinforced, /area/station/engineering/break_room) -"byH" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/space/openspace, -/area/station/solars/port) "byL" = ( /obj/effect/turf_decal/trimline/brown/filled/line, /turf/open/floor/iron, @@ -9217,10 +9049,6 @@ "bEA" = ( /obj/structure/lattice/catwalk, /obj/machinery/light/small/directional/west, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner, /turf/open/space/openspace, /area/station/solars/starboard/fore) "bEM" = ( @@ -9554,8 +9382,9 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "bJP" = ( +/obj/structure/railing, /obj/structure/railing{ - dir = 10 + dir = 8 }, /turf/open/floor/glass/reinforced, /area/station/ai_monitored/turret_protected/aisat/hallway) @@ -9570,7 +9399,6 @@ /obj/structure/railing{ dir = 8 }, -/obj/structure/railing/corner, /obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/station/engineering/atmos) @@ -9588,14 +9416,6 @@ /obj/item/fuel_pellet, /turf/open/floor/iron/dark, /area/station/cargo/drone_bay) -"bKy" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "bKK" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -9731,15 +9551,6 @@ /obj/machinery/bluespace_beacon, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) -"bME" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/space/openspace, -/area/station/solars/port) "bMV" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -10029,11 +9840,6 @@ /obj/structure/lattice/catwalk, /turf/open/floor/plating/airless, /area/station/solars/port) -"bRF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing/corner, -/turf/open/floor/iron/smooth, -/area/station/maintenance/department/medical) "bRU" = ( /obj/machinery/smartfridge/chemistry/preloaded, /obj/machinery/door/poddoor/shutters/preopen{ @@ -10285,9 +10091,6 @@ /turf/open/floor/iron/dark, /area/station/security/courtroom) "bVN" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/siding/thinplating{ dir = 5 }, @@ -10301,17 +10104,6 @@ /obj/machinery/keycard_auth/directional/east, /turf/open/floor/carpet, /area/station/command/heads_quarters/hos) -"bWi" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/space/openspace, -/area/station/solars/port) "bWr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -11034,20 +10826,6 @@ /obj/structure/closet/firecloset/full, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"cfp" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "cfq" = ( /obj/structure/ladder, /obj/effect/decal/cleanable/dirt, @@ -11327,6 +11105,13 @@ /obj/structure/sign/directions/ptl/directional/south, /turf/open/floor/catwalk_floor, /area/station/maintenance/central/lesser) +"cjx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/railing, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/department/cargo) "cjy" = ( /turf/closed/wall/r_wall, /area/station/engineering/main) @@ -11542,15 +11327,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, /area/station/cargo/miningdock) -"coM" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/purple/filled/corner{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "coN" = ( /turf/open/indestructible/dark, /area/ruin/powered/clownplanet) @@ -13061,12 +12837,6 @@ /obj/effect/turf_decal/box/red/corners, /turf/open/floor/engine, /area/station/science/cytology) -"cPl" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/glass/reinforced, -/area/station/ai_monitored/turret_protected/aisat/hallway) "cPu" = ( /obj/effect/spawner/random{ loot = list(/obj/effect/decal/cleanable/oil/slippery=10,/obj/effect/decal/cleanable/oil=90); @@ -13141,16 +12911,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/station/science/lower) -"cQk" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/department/security) "cQD" = ( /obj/structure/table/reinforced, /obj/structure/reagent_dispensers/servingdish, @@ -13336,6 +13096,13 @@ }, /turf/open/floor/iron/smooth, /area/station/maintenance/central/lesser) +"cTH" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/openspace, +/area/station/security/brig) "cTM" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -13604,16 +13371,13 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) -"cYl" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ - dir = 8 +"cYj" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 1 }, -/obj/structure/railing/corner, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/center) +/turf/open/openspace, +/area/station/asteroid) "cYA" = ( /obj/docking_port/stationary{ dheight = 4; @@ -13875,10 +13639,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/tram/mid) -"ddh" = ( -/obj/structure/railing/corner, -/turf/open/floor/glass, -/area/station/commons/fitness/recreation) "ddz" = ( /obj/machinery/modular_computer/console/preset/cargochat/service{ dir = 1 @@ -14720,12 +14480,6 @@ /turf/open/floor/iron/dark, /area/station/security/interrogation) "drw" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing{ - dir = 1 - }, /obj/effect/turf_decal/siding/thinplating{ dir = 1 }, @@ -15073,7 +14827,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/green/filled/line, -/obj/structure/railing/corner, /obj/effect/turf_decal/trimline/yellow/corner, /turf/open/floor/iron/dark, /area/station/service/hydroponics) @@ -16512,19 +16265,11 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/airless, /area/station/maintenance/starboard/lesser) -"dXc" = ( -/obj/structure/lattice, -/obj/structure/railing, -/turf/open/openspace, -/area/station/asteroid) "dXm" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 9 }, /obj/machinery/vending/cigarette, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 8 }, @@ -16533,6 +16278,9 @@ c_tag = "Civilian - Dormitories East Stairwell" }, /obj/structure/sign/flag/terragov/directional/north, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/iron, /area/station/commons/dorms) "dXo" = ( @@ -16668,7 +16416,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/ladder, -/obj/structure/railing, +/obj/structure/railing{ + dir = 9; + layer = 3.1 + }, /turf/open/openspace, /area/station/maintenance/department/cargo) "dZX" = ( @@ -16774,6 +16525,12 @@ /obj/structure/railing, /turf/open/misc/sandy_dirt, /area/station/service/hydroponics) +"eaY" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/openspace, +/area/station/security/brig) "eaZ" = ( /obj/structure/rack, /obj/item/storage/toolbox/mechanical{ @@ -17369,9 +17126,6 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/department/crew_quarters/dorms) "ekX" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/effect/turf_decal/siding/wideplating/dark{ dir = 4 }, @@ -17863,24 +17617,6 @@ }, /turf/open/space/openspace, /area/station/solars/port) -"esY" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "etf" = ( /obj/machinery/ntnet_relay, /obj/structure/sign/warning/no_smoking{ @@ -18305,17 +18041,6 @@ }, /turf/open/floor/iron/white, /area/station/science/lobby) -"ezS" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/central/greater) "ezV" = ( /obj/machinery/duct, /obj/effect/turf_decal/trimline/neutral/filled/line, @@ -18440,16 +18165,6 @@ /obj/effect/landmark/start/prisoner, /turf/open/floor/iron, /area/station/security/prison/safe) -"eBC" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/department/security) "eBF" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 1 @@ -18689,6 +18404,13 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"eGs" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/openspace, +/area/station/security/brig) "eGt" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/white, @@ -18789,9 +18511,6 @@ dir = 9 }, /obj/structure/industrial_lift/public, -/obj/structure/railing{ - dir = 9 - }, /obj/machinery/elevator_control_panel/directional/west{ linked_elevator_id = "tram_sci_lift"; preset_destination_names = list("2"="Lower Deck","3"="Upper Deck") @@ -18859,7 +18578,6 @@ /turf/open/lava, /area/station/security/execution/education) "eLB" = ( -/obj/structure/railing/corner, /obj/effect/turf_decal/trimline/red/filled/corner, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, @@ -19135,12 +18853,10 @@ /turf/open/floor/plating, /area/station/maintenance/central/greater) "eQR" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, +/obj/structure/railing, /turf/open/floor/iron/smooth, /area/station/command/gateway) "eQZ" = ( @@ -19312,6 +19028,13 @@ }, /turf/open/floor/iron/smooth, /area/station/maintenance/department/crew_quarters/dorms) +"eTI" = ( +/obj/effect/spawner/random{ + loot = list(/obj/effect/decal/cleanable/oil/slippery=10,/obj/effect/decal/cleanable/oil=90); + name = "funny slipper :)" + }, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/center) "eTW" = ( /obj/structure/cable, /turf/open/floor/wood/large, @@ -19554,7 +19277,6 @@ /area/station/engineering/atmos/pumproom) "eXL" = ( /obj/effect/turf_decal/siding/thinplating/corner, -/obj/structure/railing/corner, /obj/effect/turf_decal/trimline/red/corner, /turf/open/floor/iron, /area/station/security/checkpoint/supply) @@ -20072,12 +19794,6 @@ }, /turf/open/floor/plastic, /area/station/engineering/break_room) -"fho" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/glass/reinforced, -/area/station/ai_monitored/turret_protected/aisat/hallway) "fhv" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 6 @@ -20267,15 +19983,16 @@ /turf/open/floor/iron, /area/station/maintenance/tram/left) "fjA" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron/white, /area/station/science/xenobiology) "fjN" = ( @@ -20704,6 +20421,15 @@ }, /turf/open/floor/plating, /area/station/cargo/sorting) +"fqc" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/openspace, +/area/station/security/brig) "fqn" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -20938,10 +20664,13 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing, /obj/structure/railing{ dir = 1 }, +/obj/structure/railing{ + dir = 10; + layer = 3.1 + }, /turf/open/openspace, /area/station/maintenance/department/security) "ftQ" = ( @@ -21371,6 +21100,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) +"fCh" = ( +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/turf/open/openspace, +/area/station/security/brig) "fCB" = ( /obj/effect/turf_decal/sand/plating, /obj/machinery/light/small/directional/west, @@ -21793,13 +21529,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -"fIC" = ( -/obj/machinery/light/directional/west, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/openspace, -/area/station/asteroid) "fIH" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -22685,6 +22414,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/smooth, /area/station/hallway/primary/tram/right) +"gaX" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/obj/structure/railing, +/turf/open/floor/plating, +/area/station/maintenance/central/greater) "gaY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -23030,7 +22771,6 @@ dir = 9 }, /obj/effect/turf_decal/trimline/dark_blue/corner, -/obj/structure/railing/corner, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) "ghZ" = ( @@ -23377,12 +23117,6 @@ }, /turf/open/space/openspace, /area/station/solars/port) -"gnq" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/carpet/neon/simple/yellow, -/area/ruin/powered/clownplanet) "gnr" = ( /obj/structure/table, /obj/item/storage/box/bodybags{ @@ -23496,6 +23230,9 @@ /obj/structure/railing{ dir = 6 }, +/obj/structure/railing{ + dir = 4 + }, /turf/open/openspace/airless, /area/station/asteroid) "gpH" = ( @@ -23618,9 +23355,6 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/department/crew_quarters/dorms) "gsO" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 8 }, @@ -23642,7 +23376,6 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "gtr" = ( -/obj/structure/railing/corner, /obj/effect/turf_decal/siding/thinplating/corner, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 4 @@ -23718,7 +23451,6 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "gun" = ( -/obj/structure/railing/corner, /obj/effect/turf_decal/trimline/purple/filled/corner, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 4 @@ -24079,10 +23811,6 @@ /turf/open/floor/iron, /area/station/hallway/secondary/exit) "gAO" = ( -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/siding/thinplating{ dir = 1 }, @@ -24156,9 +23884,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 4 }, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -24770,13 +24495,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/prison) -"gMh" = ( -/obj/structure/railing/corner, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/department/cargo) "gMi" = ( /obj/machinery/air_sensor/air_tank, /turf/open/floor/engine/air, @@ -24979,6 +24697,14 @@ /obj/machinery/computer/tram_controls/directional/west, /turf/open/floor/noslip/tram_plate, /area/station/hallway/primary/tram/center) +"gOA" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/turf/open/openspace, +/area/station/security/brig) "gOF" = ( /obj/structure/fluff/tram_rail/floor{ dir = 1 @@ -25282,9 +25008,7 @@ dir = 10 }, /obj/structure/industrial_lift/public, -/obj/structure/railing{ - dir = 10 - }, +/obj/structure/railing, /turf/open/floor/plating/elevatorshaft, /area/station/security/execution/transfer) "gTw" = ( @@ -25824,6 +25548,17 @@ /area/station/commons/fitness/recreation) "heE" = ( /obj/structure/ladder, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, /turf/open/floor/glass/reinforced, /area/station/command/bridge) "heI" = ( @@ -25904,9 +25639,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -26143,15 +25875,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -"hjM" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/purple/filled/corner{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "hjN" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -26695,7 +26418,8 @@ dir = 4 }, /obj/structure/railing{ - dir = 10 + dir = 9; + layer = 3.1 }, /turf/open/floor/plating, /area/station/maintenance/department/cargo) @@ -27052,10 +26776,6 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor, /area/station/maintenance/starboard/greater) @@ -27401,12 +27121,6 @@ }, /turf/open/floor/carpet, /area/station/command/heads_quarters/hos) -"hGI" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/glass, -/area/station/commons/fitness/recreation) "hGK" = ( /obj/effect/turf_decal/trimline/yellow/arrow_cw, /obj/structure/cable/layer1, @@ -27415,12 +27129,6 @@ }, /turf/open/floor/iron, /area/station/engineering/main) -"hGM" = ( -/obj/structure/railing{ - dir = 5 - }, -/turf/open/openspace, -/area/station/asteroid) "hHf" = ( /obj/structure/closet/bombcloset/security, /turf/open/floor/iron/showroomfloor, @@ -28182,6 +27890,7 @@ }, /obj/structure/flora/bush/flowers_yw/style_random, /obj/structure/flora/bush/grassy/style_random, +/obj/structure/railing, /turf/open/floor/grass, /area/station/commons/dorms) "hVb" = ( @@ -28238,10 +27947,6 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/event_spawn, /turf/open/floor/iron/stairs/old{ @@ -28279,9 +27984,6 @@ /turf/open/floor/iron, /area/station/hallway/primary/tram/center) "hWL" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 9 }, @@ -28289,6 +27991,10 @@ /obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 8 }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron, /area/station/security/brig) "hWZ" = ( @@ -28409,9 +28115,6 @@ /turf/open/misc/asteroid, /area/station/maintenance/department/security) "hYN" = ( -/obj/structure/railing{ - dir = 1 - }, /obj/effect/turf_decal/siding/thinplating/corner, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -28460,9 +28163,6 @@ /turf/open/floor/iron, /area/station/tcommsat/computer) "hZP" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 8 }, @@ -28641,9 +28341,6 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "idk" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/cigbutt, /turf/open/floor/iron/smooth, @@ -28712,10 +28409,10 @@ }, /area/station/science/robotics/mechbay) "idW" = ( -/obj/structure/railing/corner, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, +/obj/structure/railing, /turf/open/floor/iron/smooth, /area/station/command/gateway) "idZ" = ( @@ -29128,12 +28825,6 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor, /area/station/maintenance/department/security) @@ -29465,7 +29156,6 @@ /turf/open/floor/glass/reinforced, /area/station/science/genetics) "ird" = ( -/obj/structure/railing/corner, /obj/effect/turf_decal/siding/thinplating{ dir = 9 }, @@ -30093,8 +29783,8 @@ /area/station/maintenance/department/cargo) "iAt" = ( /obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 4 +/obj/structure/railing{ + dir = 1 }, /turf/open/openspace/airless, /area/station/asteroid) @@ -30176,9 +29866,6 @@ /turf/open/floor/iron/freezer, /area/station/commons/toilet) "iCu" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 }, @@ -30189,6 +29876,10 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron, /area/station/security/brig) "iCA" = ( @@ -31299,14 +30990,6 @@ /obj/item/reagent_containers/cup/bucket, /turf/open/floor/iron, /area/station/service/janitor) -"iVe" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/cigbutt, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/iron/smooth, -/area/station/maintenance/department/security) "iVj" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -31441,16 +31124,6 @@ }, /turf/open/floor/iron/smooth, /area/station/maintenance/central/greater) -"iXv" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/department/security) "iXw" = ( /obj/structure/table/glass, /obj/item/storage/medkit/regular{ @@ -31805,7 +31478,6 @@ /turf/open/floor/iron, /area/station/security/prison/safe) "jdF" = ( -/obj/structure/railing, /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -32013,10 +31685,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"jgq" = ( -/obj/structure/railing/corner, -/turf/open/floor/glass/reinforced, -/area/station/ai_monitored/turret_protected/aisat/hallway) "jgs" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -32056,10 +31724,6 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 - }, /turf/open/openspace, /area/station/maintenance/department/security) "jhd" = ( @@ -32424,6 +32088,7 @@ /obj/effect/turf_decal/trimline/dark_blue/arrow_ccw, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/landmark/navigate_destination/hop, +/obj/structure/railing, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) "jne" = ( @@ -32613,7 +32278,6 @@ dir = 6 }, /obj/structure/industrial_lift/public, -/obj/structure/railing, /turf/open/floor/plating/elevatorshaft, /area/station/science/lower) "jpV" = ( @@ -32777,6 +32441,16 @@ }, /turf/closed/wall, /area/station/maintenance/disposal) +"jrK" = ( +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/openspace, +/area/station/security/brig) "jrR" = ( /obj/effect/turf_decal/trimline/white/line{ dir = 5 @@ -33256,30 +32930,13 @@ /turf/open/floor/iron, /area/station/security/prison) "jAH" = ( -/obj/structure/railing{ - dir = 10 - }, +/obj/structure/railing, /obj/effect/turf_decal/trimline/dark_red/warning{ dir = 10 }, /obj/structure/industrial_lift/public, /turf/open/floor/plating/elevatorshaft, /area/station/hallway/secondary/service) -"jAK" = ( -/obj/effect/turf_decal/siding/thinplating{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/commons/dorms) "jAL" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/structure/disposalpipe/segment{ @@ -33452,9 +33109,6 @@ /turf/open/floor/iron/grimy, /area/station/service/chapel/office) "jDQ" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/structure/cable, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -33526,13 +33180,6 @@ }, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain) -"jFc" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/smooth, -/area/station/maintenance/department/security) "jFh" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -33609,13 +33256,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"jGl" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "jGx" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 @@ -33879,9 +33519,6 @@ /obj/effect/turf_decal/trimline/dark_blue/corner{ dir = 4 }, -/obj/structure/railing/corner{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) "jLf" = ( @@ -34257,12 +33894,6 @@ /obj/effect/turf_decal/trimline/dark_blue/corner{ dir = 8 }, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) "jSe" = ( @@ -35697,9 +35328,6 @@ /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -35860,9 +35488,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 5 }, -/obj/structure/railing{ - dir = 1 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/construction/engineering) @@ -37553,6 +37178,9 @@ "kTO" = ( /obj/structure/cable, /obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 1 + }, /turf/open/openspace, /area/station/asteroid) "kTT" = ( @@ -37611,15 +37239,6 @@ "kUo" = ( /turf/open/floor/iron/dark, /area/station/service/chapel) -"kUF" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "kUN" = ( /obj/machinery/door/airlock/external{ autoclose = 0; @@ -37784,16 +37403,6 @@ "kXk" = ( /obj/structure/lattice/catwalk, /obj/item/stack/cable_coil, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/structure/cable, /turf/open/space/openspace, /area/station/solars/port) @@ -38052,6 +37661,12 @@ }, /turf/open/floor/iron/dark, /area/station/medical/break_room) +"kZS" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/openspace, +/area/station/security/brig) "lai" = ( /obj/structure/chair, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -38798,6 +38413,14 @@ }, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"lmx" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/openspace, +/area/station/asteroid) "lmy" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -39602,9 +39225,6 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "lAR" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 4 }, @@ -40041,17 +39661,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/maintenance/department/medical) -"lKC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/central/lesser) "lKI" = ( /obj/structure/chair/stool/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/violet/visible, @@ -40186,14 +39795,6 @@ /obj/structure/cable/layer1, /turf/open/floor/plating/airless, /area/station/solars/port) -"lMU" = ( -/obj/machinery/light/directional/east, -/obj/structure/lattice, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/openspace, -/area/station/asteroid) "lMZ" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 8 @@ -41180,17 +40781,6 @@ /obj/machinery/vending/boozeomat, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) -"mcn" = ( -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/department/medical) "mcD" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -41962,12 +41552,6 @@ "mos" = ( /turf/closed/wall, /area/station/tcommsat/server) -"mou" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/open/openspace, -/area/station/asteroid) "moz" = ( /turf/open/floor/iron, /area/station/science/robotics/mechbay) @@ -42730,9 +42314,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/green/filled/line, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/trimline/yellow/corner{ dir = 8 }, @@ -42941,15 +42522,15 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "mFY" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 6 }, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/iron/white, /area/station/science/xenobiology) "mGl" = ( @@ -43738,6 +43319,10 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/plating, /area/station/maintenance/central/greater) "mUd" = ( @@ -44085,7 +43670,6 @@ /turf/open/floor/iron/grimy, /area/station/service/library/lounge) "nbh" = ( -/obj/structure/railing/corner, /obj/effect/turf_decal/trimline/blue/filled/corner, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -44207,9 +43791,6 @@ /obj/structure/railing{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 8 - }, /turf/open/space/openspace, /area/station/solars/starboard/fore) "ncE" = ( @@ -44307,35 +43888,13 @@ "ney" = ( /turf/open/floor/circuit/telecomms/mainframe, /area/station/tcommsat/server) -"neB" = ( -/obj/structure/cable/multilayer/multiz, -/obj/effect/turf_decal/stripes/box, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/solars/starboard/fore) "neC" = ( -/obj/structure/railing{ - dir = 1 - }, /obj/effect/turf_decal/siding/thinplating, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /turf/open/floor/glass/reinforced, /area/station/security/brig) -"neD" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 8 - }, -/turf/open/floor/iron/smooth, -/area/station/maintenance/department/security) "neE" = ( /obj/structure/table/optable, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -44787,6 +44346,17 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"nlN" = ( +/obj/structure/railing{ + dir = 10; + layer = 3.1 + }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/turf/open/openspace, +/area/station/maintenance/department/security) "nlV" = ( /obj/machinery/firealarm/directional/south, /obj/structure/cable, @@ -44984,12 +44554,6 @@ /obj/machinery/vending/wardrobe/chem_wardrobe, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"noO" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/open/openspace, -/area/station/asteroid) "noW" = ( /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/machinery/door/airlock/maintenance_hatch{ @@ -45046,6 +44610,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/cargo/office) +"npL" = ( +/obj/structure/cable, +/obj/structure/lattice/catwalk, +/obj/structure/railing, +/turf/open/openspace, +/area/station/asteroid) "npR" = ( /obj/machinery/recharge_station, /obj/machinery/light/small/directional/east, @@ -45573,9 +45143,6 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -46078,13 +45645,6 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/station/engineering/atmos) -"nFM" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/smooth, -/area/station/maintenance/department/medical) "nFZ" = ( /obj/machinery/airalarm/directional/east, /obj/machinery/camera/directional/east{ @@ -46861,6 +46421,13 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) +"nTy" = ( +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/turf/open/openspace, +/area/station/security/brig) "nTG" = ( /obj/structure/table, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -47085,13 +46652,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/service/bar/backroom) -"nYa" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/iron/smooth, -/area/station/maintenance/department/security) "nYr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -47209,9 +46769,6 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "oai" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, @@ -47413,21 +46970,9 @@ "odl" = ( /obj/structure/lattice/catwalk, /obj/machinery/light/small/directional/east, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, /turf/open/space/openspace, /area/station/solars/starboard/fore) "odr" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -47510,7 +47055,6 @@ /area/station/hallway/secondary/entry) "oft" = ( /obj/item/assembly/mousetrap/armed, -/obj/structure/railing, /obj/effect/turf_decal/siding/wideplating/dark, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, @@ -47765,12 +47309,6 @@ "ojP" = ( /obj/structure/cable/multilayer/multiz, /obj/effect/turf_decal/stripes/box, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/solars/port) @@ -47986,9 +47524,7 @@ dir = 5 }, /obj/structure/industrial_lift/public, -/obj/structure/railing{ - dir = 5 - }, +/obj/structure/railing, /turf/open/floor/plating/elevatorshaft, /area/station/commons/dorms) "onc" = ( @@ -48075,15 +47611,6 @@ "ooB" = ( /turf/closed/wall/r_wall, /area/station/engineering) -"opb" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/space/openspace, -/area/station/solars/port) "opn" = ( /obj/structure/closet/crate/science, /obj/effect/spawner/random/mod/maint, @@ -48151,6 +47678,7 @@ }, /obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/flora/bush/grassy/style_random, +/obj/structure/railing, /turf/open/floor/grass, /area/station/commons/dorms) "ora" = ( @@ -48383,12 +47911,6 @@ /obj/structure/closet/wardrobe/mixed, /turf/open/floor/plating, /area/station/maintenance/department/security) -"ovC" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/glass/reinforced, -/area/station/science/research) "ovL" = ( /turf/open/floor/iron, /area/station/hallway/secondary/service) @@ -48482,9 +48004,6 @@ /obj/effect/turf_decal/trimline/dark_blue/arrow_ccw{ dir = 1 }, -/obj/structure/railing{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, @@ -48826,9 +48345,6 @@ dir = 5 }, /obj/structure/industrial_lift/public, -/obj/structure/railing{ - dir = 1 - }, /turf/open/floor/plating/elevatorshaft, /area/station/science/lower) "oCR" = ( @@ -48912,14 +48428,6 @@ icon_state = "clown_carpet" }, /area/station/security/execution/education) -"oEf" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/engineering/atmos) "oEz" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/yellow/arrow_cw{ @@ -49308,15 +48816,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) -"oMU" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating{ - dir = 10 - }, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "oMX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -49692,7 +49191,10 @@ /area/station/cargo/sorting) "oTa" = ( /obj/structure/railing{ - dir = 9 + dir = 1 + }, +/obj/structure/railing{ + dir = 8 }, /turf/open/floor/glass/reinforced, /area/station/ai_monitored/turret_protected/aisat/hallway) @@ -49759,9 +49261,6 @@ /turf/open/floor/plating, /area/station/hallway/secondary/entry) "oTJ" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/effect/turf_decal/siding/thinplating{ dir = 8 }, @@ -50268,9 +49767,6 @@ /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 4 }, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/blue, @@ -50440,13 +49936,19 @@ "phl" = ( /turf/open/floor/carpet, /area/station/command/heads_quarters/captain) +"phm" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing, +/turf/open/openspace, +/area/station/asteroid) "phs" = ( -/obj/structure/railing{ - dir = 10 - }, +/obj/structure/railing, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/catwalk_floor, /area/station/maintenance/department/cargo) "phB" = ( @@ -50493,6 +49995,16 @@ }, /turf/open/floor/iron, /area/station/science/robotics/lab) +"piz" = ( +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/openspace, +/area/station/security/brig) "piE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, @@ -51375,9 +50887,7 @@ /turf/open/floor/plating, /area/station/maintenance/tram/mid) "pwm" = ( -/obj/structure/railing{ - dir = 10 - }, +/obj/structure/railing, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor, /area/station/command/gateway) @@ -51791,15 +51301,6 @@ /obj/structure/reagent_dispensers/wall/peppertank/directional/north, /turf/open/floor/iron, /area/station/security/checkpoint/escape) -"pBZ" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "pCa" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/wooden{ @@ -51830,6 +51331,14 @@ "pCm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/moisture_trap, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/plating, /area/station/maintenance/department/security) "pCr" = ( @@ -52007,10 +51516,8 @@ /turf/open/space/openspace, /area/space) "pEM" = ( -/obj/structure/railing{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing, /turf/open/floor/catwalk_floor, /area/station/command/gateway) "pEZ" = ( @@ -52308,20 +51815,6 @@ /obj/structure/cable, /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/ai) -"pIS" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/space/openspace, -/area/station/solars/port) "pIT" = ( /obj/effect/turf_decal/trimline/purple/filled/corner, /turf/open/floor/iron, @@ -52694,12 +52187,16 @@ /turf/open/floor/iron, /area/station/maintenance/tram/right) "pOv" = ( -/obj/structure/railing{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/structure/railing{ + dir = 9; + layer = 3.1 + }, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/catwalk_floor, /area/station/maintenance/department/cargo) "pOA" = ( @@ -52803,12 +52300,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"pPC" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/glass, -/area/station/commons/fitness/recreation) "pPN" = ( /obj/structure/reagent_dispensers/watertank/high, /obj/structure/railing{ @@ -53091,9 +52582,6 @@ /turf/open/floor/iron/white, /area/station/medical/surgery/fore) "pVy" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/light/directional/west, /turf/open/floor/mineral/bananium, /area/ruin/powered/clownplanet) @@ -53271,7 +52759,6 @@ /area/station/security/prison/workout) "pZv" = ( /obj/machinery/light/directional/west, -/obj/structure/railing, /turf/open/openspace, /area/station/asteroid) "pZz" = ( @@ -53452,6 +52939,14 @@ }, /turf/open/floor/iron/smooth, /area/station/service/hydroponics) +"qcR" = ( +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/obj/structure/railing, +/turf/open/openspace, +/area/station/security/brig) "qcV" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ @@ -53557,15 +53052,15 @@ /area/station/security/brig) "qea" = ( /obj/structure/ladder, -/obj/structure/railing{ - dir = 4 - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 }, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/iron/white, /area/station/science/xenobiology) "qec" = ( @@ -53582,7 +53077,6 @@ /turf/open/floor/engine, /area/station/science/ordnance/burnchamber) "qei" = ( -/obj/structure/railing/corner, /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/glass/reinforced, /area/station/science/genetics) @@ -53807,9 +53301,7 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "qir" = ( -/obj/structure/railing{ - dir = 5 - }, +/obj/structure/railing, /obj/effect/decal/cleanable/dirt, /obj/structure/chair/plastic, /turf/open/floor/iron/smooth, @@ -54039,7 +53531,11 @@ /obj/structure/cable/multilayer/multiz, /obj/effect/turf_decal/stripes/end, /obj/structure/railing{ - dir = 6 + dir = 4 + }, +/obj/structure/railing{ + dir = 9; + layer = 3.1 }, /turf/open/floor/plating, /area/station/maintenance/department/cargo) @@ -54342,8 +53838,15 @@ dir = 4 }, /obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 1 + }, /turf/open/openspace, /area/station/asteroid) +"qrc" = ( +/obj/structure/railing, +/turf/open/openspace, +/area/station/security/brig) "qrm" = ( /obj/structure/sign/directions/supply{ dir = 1; @@ -54797,6 +54300,15 @@ }, /turf/open/floor/iron/white, /area/station/science/lower) +"qye" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/glass/reinforced, +/area/station/ai_monitored/turret_protected/aisat/hallway) "qyg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -55516,9 +55028,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 9 }, -/obj/structure/railing{ - dir = 1 - }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/construction/engineering) @@ -55589,12 +55098,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"qJh" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/glass/reinforced, -/area/station/ai_monitored/turret_protected/aisat/hallway) "qJy" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/machinery/light/directional/south, @@ -55637,17 +55140,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/brig) -"qKh" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "qKj" = ( /obj/effect/turf_decal/bot/left, /obj/effect/decal/cleanable/dirt, @@ -55829,9 +55321,6 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/department/cargo) "qNz" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, @@ -56105,7 +55594,10 @@ "qSG" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ - dir = 5 + dir = 1 + }, +/obj/structure/railing{ + dir = 4 }, /turf/open/openspace/airless, /area/station/asteroid) @@ -56834,6 +56326,15 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/carpet, /area/station/medical/psychology) +"rcH" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/openspace, +/area/station/security/brig) "rcI" = ( /obj/machinery/blackbox_recorder, /turf/open/floor/iron/dark/telecomms, @@ -56949,9 +56450,7 @@ dir = 10 }, /obj/structure/industrial_lift/public, -/obj/structure/railing{ - dir = 10 - }, +/obj/structure/railing, /turf/open/floor/plating/elevatorshaft, /area/station/cargo/miningdock) "rfk" = ( @@ -57202,12 +56701,6 @@ /obj/effect/landmark/start/quartermaster, /turf/open/floor/carpet, /area/station/command/heads_quarters/qm) -"riN" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/open/openspace, -/area/station/asteroid) "riS" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -57307,15 +56800,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/medical/medbay/lobby) -"rkA" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/light/small/directional/west, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "rkI" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -57887,9 +57371,6 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/central) "ruA" = ( -/obj/structure/railing{ - dir = 1 - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -58165,15 +57646,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, /area/station/maintenance/radshelter/civil) -"rzX" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating{ - dir = 6 - }, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "rzZ" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 4 @@ -58541,14 +58013,15 @@ /obj/structure/railing{ dir = 4 }, -/obj/structure/railing{ - dir = 8 - }, /obj/structure/ladder, /obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/openspace, /area/station/maintenance/department/crew_quarters/dorms) "rHC" = ( @@ -58867,12 +58340,6 @@ /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "rMJ" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, /obj/machinery/light/floor/has_bulb, /obj/effect/landmark/event_spawn, /obj/machinery/door/firedoor/border_only{ @@ -59179,9 +58646,6 @@ "rQR" = ( /obj/structure/lattice/catwalk, /obj/structure/railing, -/obj/structure/railing/corner{ - dir = 4 - }, /turf/open/space/openspace, /area/station/solars/starboard/fore) "rQT" = ( @@ -59323,6 +58787,9 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 1 }, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) "rSZ" = ( @@ -60739,21 +60206,6 @@ /obj/machinery/nanite_program_hub, /turf/open/floor/iron/white, /area/station/science/ordnance/office) -"stK" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner, -/obj/structure/cable, -/turf/open/space/openspace, -/area/station/solars/port) "stL" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -61275,6 +60727,20 @@ }, /turf/open/floor/iron/dark, /area/station/medical/storage) +"sBd" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/central/greater) "sBr" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -61898,15 +61364,6 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/iron, /area/station/security/office) -"sLi" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/obj/structure/railing/corner, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "sLv" = ( /obj/machinery/light/directional/north, /obj/machinery/camera{ @@ -61983,9 +61440,6 @@ /turf/open/floor/iron, /area/station/commons/dorms) "sNb" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/turf_decal/trimline/red/filled/line, /obj/effect/turf_decal/trimline/red/corner{ dir = 4 @@ -62060,21 +61514,6 @@ }, /turf/open/floor/iron, /area/station/cargo/miningdock) -"sOg" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/space/openspace, -/area/station/solars/port) "sOq" = ( /obj/machinery/vending/wardrobe/sec_wardrobe, /obj/machinery/status_display/ai/directional/west, @@ -62944,6 +62383,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) +"tcu" = ( +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/turf/open/openspace, +/area/station/maintenance/department/security) "tcH" = ( /obj/machinery/light/directional/south, /turf/open/floor/grass, @@ -62979,10 +62425,6 @@ }, /turf/open/floor/iron, /area/station/science/lab) -"tdu" = ( -/obj/structure/railing, -/turf/open/openspace, -/area/station/asteroid) "tdx" = ( /turf/closed/wall, /area/station/maintenance/port/aft) @@ -63136,7 +62578,6 @@ /turf/open/floor/iron, /area/station/security/office) "tfp" = ( -/obj/structure/railing, /obj/effect/turf_decal/siding/thinplating{ dir = 1 }, @@ -63190,9 +62631,6 @@ dir = 10 }, /obj/structure/industrial_lift/public, -/obj/structure/railing{ - dir = 10 - }, /obj/effect/landmark/lift_id{ specific_lift_id = "tram_sci_lift" }, @@ -63582,12 +63020,6 @@ }, /turf/open/floor/iron/smooth, /area/station/hallway/primary/tram/center) -"tlH" = ( -/obj/structure/railing{ - dir = 10 - }, -/turf/open/openspace, -/area/station/asteroid) "tlO" = ( /obj/structure/industrial_lift/public, /obj/effect/turf_decal/caution/stand_clear/red, @@ -63706,15 +63138,6 @@ }, /turf/open/floor/iron, /area/station/construction/mining/aux_base) -"tnX" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/department/cargo) "tod" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -64694,16 +64117,6 @@ /obj/structure/fluff/tram_rail, /turf/open/openspace, /area/station/hallway/primary/tram/center) -"tCw" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "tCT" = ( /turf/open/floor/plating, /area/station/hallway/secondary/entry) @@ -65617,9 +65030,6 @@ /turf/open/floor/iron, /area/station/hallway/primary/tram/right) "tTJ" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/effect/turf_decal/siding/thinplating{ dir = 4 }, @@ -65793,23 +65203,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"tWo" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "tWw" = ( -/obj/structure/railing/corner, /obj/effect/turf_decal/siding/thinplating/corner, /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -66281,19 +65675,6 @@ /obj/effect/turf_decal/trimline/blue/filled/corner, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"ueM" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/starboard/lesser) "ueZ" = ( /obj/machinery/atmospherics/miner/carbon_dioxide, /turf/open/floor/engine/co2, @@ -66944,21 +66325,6 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/airless, /area/station/asteroid) -"upS" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "upX" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -66995,13 +66361,15 @@ dir = 5 }, /obj/effect/spawner/random/vending/colavend, -/obj/structure/railing/corner, /obj/effect/turf_decal/siding/thinplating/corner, /obj/item/radio/intercom/directional/east, /obj/machinery/camera/directional/east{ c_tag = "Civilian - Dormitories West Stairwell" }, /obj/structure/sign/flag/nanotrasen/directional/north, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/iron, /area/station/commons/dorms) "uqo" = ( @@ -67325,12 +66693,6 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"uvB" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/glass/reinforced, -/area/station/science/research) "uvD" = ( /obj/effect/decal/cleanable/dirt, /obj/item/soap, @@ -67615,13 +66977,6 @@ /obj/effect/turf_decal/trimline/white/warning, /turf/open/floor/iron, /area/station/maintenance/tram/left) -"uAc" = ( -/obj/structure/lattice, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/openspace, -/area/station/asteroid) "uAn" = ( /obj/effect/landmark/start/depsec/supply, /obj/structure/chair/office{ @@ -67736,7 +67091,10 @@ /area/station/maintenance/disposal/incinerator) "uCh" = ( /obj/structure/railing{ - dir = 5 + dir = 4 + }, +/obj/structure/railing{ + dir = 1 }, /turf/open/floor/glass/reinforced, /area/station/ai_monitored/turret_protected/aisat/hallway) @@ -68153,10 +67511,6 @@ "uHW" = ( /obj/structure/ladder, /obj/effect/turf_decal/stripes/box, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/solars/port) @@ -68679,17 +68033,6 @@ /obj/structure/reagent_dispensers/beerkeg, /turf/open/floor/iron/smooth, /area/station/maintenance/department/cargo) -"uPh" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/iron/smooth, -/area/station/maintenance/department/security) "uPi" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -68759,9 +68102,7 @@ /area/station/hallway/secondary/exit/departure_lounge) "uQP" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 5 - }, +/obj/structure/railing, /obj/effect/turf_decal/siding/wideplating/dark{ dir = 5 }, @@ -68817,12 +68158,6 @@ /obj/structure/lattice/catwalk, /obj/machinery/light/small/directional/east, /obj/structure/cable, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, /turf/open/space/openspace, /area/station/solars/port) "uSL" = ( @@ -69044,6 +68379,12 @@ }, /turf/open/floor/iron/dark, /area/station/security/courtroom) +"uVS" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/openspace, +/area/station/security/brig) "uVW" = ( /obj/machinery/camera/directional/west{ c_tag = "Medical - Cryo Treatment"; @@ -69164,17 +68505,6 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/freezer, /area/station/security/prison) -"uXM" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/space/openspace, -/area/station/solars/port) "uXV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/yellow/warning{ @@ -69698,9 +69028,6 @@ /turf/open/floor/iron/dark/textured, /area/station/engineering/main) "vgl" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 }, @@ -69713,6 +69040,10 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron, /area/station/security/brig) "vgm" = ( @@ -69791,6 +69122,7 @@ }, /obj/effect/turf_decal/delivery/white, /obj/effect/mapping_helpers/trapdoor_placer, +/obj/structure/railing, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) "vhU" = ( @@ -70653,9 +69985,6 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/lesser) "vsg" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/effect/turf_decal/siding/wideplating/dark{ dir = 4 }, @@ -70917,11 +70246,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit) -"vwN" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "vwT" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -71093,16 +70417,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/tcommsat/computer) -"vAj" = ( -/obj/structure/ladder, -/obj/effect/turf_decal/stripes/box, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/solars/starboard/fore) "vAm" = ( /obj/machinery/computer/bank_machine{ dir = 1 @@ -71365,6 +70679,9 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) "vCt" = ( @@ -71714,21 +71031,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/smooth, /area/station/maintenance/disposal/incinerator) -"vHO" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/commons/dorms) "vIa" = ( /obj/machinery/button/door/directional/west{ id = "Engineering3"; @@ -72337,10 +71639,6 @@ /turf/open/floor/circuit/telecomms/server, /area/station/science/server) "vSh" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner, /obj/machinery/disposal/bin, /obj/effect/turf_decal/siding/thinplating/corner, /obj/effect/turf_decal/siding/thinplating/corner{ @@ -72590,6 +71888,9 @@ /obj/structure/railing{ dir = 6 }, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/glass/reinforced, /area/station/ai_monitored/turret_protected/aisat/hallway) "vWx" = ( @@ -73260,15 +72561,6 @@ }, /turf/open/floor/glass/reinforced, /area/station/science/research) -"whS" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner, -/turf/open/space/openspace, -/area/station/solars/starboard/fore) "whW" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -73739,12 +73031,6 @@ "wqC" = ( /obj/structure/lattice/catwalk, /obj/structure/railing, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/structure/cable, /obj/machinery/light/floor/has_bulb, /turf/open/openspace, @@ -73996,9 +73282,6 @@ /turf/open/floor/iron, /area/station/command/heads_quarters/qm) "wuE" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /turf/open/floor/glass, /area/station/commons/fitness/recreation) "wuF" = ( @@ -74445,9 +73728,6 @@ /turf/open/floor/plating, /area/station/maintenance/tram/mid) "wAs" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 8 }, @@ -74718,10 +73998,6 @@ /obj/structure/railing{ dir = 1 }, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/machinery/light/floor/has_bulb, /turf/open/openspace, /area/station/solars/port) @@ -74864,9 +74140,6 @@ /obj/effect/turf_decal/siding/thinplating/corner{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -75707,12 +74980,6 @@ }, /turf/open/floor/iron, /area/station/security/prison) -"wWT" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/glass/reinforced, -/area/station/science/research) "wXi" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 10 @@ -76175,9 +75442,6 @@ /turf/open/floor/iron, /area/station/commons/fitness) "xhN" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/engineering/canister, /turf/open/floor/iron/smooth, @@ -76204,14 +75468,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/maintenance/port/central) -"xis" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/turf/open/openspace, -/area/station/asteroid) "xiA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -76677,13 +75933,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/interrogation) -"xrt" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 4 - }, -/turf/open/floor/iron/smooth, -/area/station/maintenance/department/security) "xrD" = ( /obj/effect/landmark/navigate_destination/engineering, /obj/structure/table/wood/fancy/orange, @@ -76931,9 +76180,6 @@ /turf/open/floor/iron/dark, /area/station/service/hydroponics) "xwa" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 }, @@ -77077,10 +76323,6 @@ }, /turf/open/floor/iron, /area/station/construction/mining/aux_base) -"xyt" = ( -/obj/structure/railing/corner, -/turf/open/floor/glass/reinforced, -/area/station/science/research) "xyu" = ( /obj/machinery/duct, /obj/effect/turf_decal/trimline/neutral/filled/line, @@ -77410,14 +76652,6 @@ "xDQ" = ( /turf/closed/wall, /area/station/security/processing) -"xDT" = ( -/obj/machinery/light/directional/west, -/obj/structure/lattice, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/openspace, -/area/station/asteroid) "xDW" = ( /obj/machinery/door/airlock/mining/glass{ name = "MULE Storage" @@ -77634,9 +76868,6 @@ /turf/open/floor/iron, /area/station/cargo/drone_bay) "xJt" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 4 }, @@ -77821,9 +77052,6 @@ /turf/open/floor/iron/freezer, /area/station/medical/coldroom) "xMV" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 8 }, @@ -77880,6 +77108,18 @@ /obj/item/lighter, /turf/open/floor/carpet, /area/station/security/detectives_office) +"xNB" = ( +/obj/effect/turf_decal/siding/thinplating{ + dir = 4 + }, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/structure/railing, +/turf/open/floor/grass, +/area/station/hallway/secondary/construction/engineering) "xNH" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -78020,9 +77260,6 @@ /obj/effect/turf_decal/siding/thinplating/corner{ dir = 8 }, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/trimline/red/corner{ dir = 8 }, @@ -78039,12 +77276,6 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/commons/fitness/recreation/entertainment) "xPP" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 1 }, @@ -78277,12 +77508,13 @@ /obj/structure/railing{ dir = 4 }, -/obj/structure/railing{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/openspace, /area/station/maintenance/department/crew_quarters/dorms) "xUC" = ( @@ -78355,12 +77587,6 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/iron, /area/station/cargo/miningdock) -"xVN" = ( -/obj/structure/railing{ - dir = 9 - }, -/turf/open/openspace, -/area/station/asteroid) "xVQ" = ( /obj/structure/closet/lasertag/red, /obj/effect/turf_decal/tile/red/full, @@ -78799,9 +78025,6 @@ /turf/open/floor/iron, /area/station/engineering/main) "ycm" = ( -/obj/structure/railing{ - dir = 1 - }, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 8 }, @@ -78874,6 +78097,17 @@ /obj/structure/industrial_lift/tram, /turf/open/openspace, /area/station/hallway/primary/tram/center) +"ycH" = ( +/obj/structure/lattice/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/openspace, +/area/station/asteroid) "ycI" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 @@ -84599,7 +83833,7 @@ nPb nPb gcp jGN -gnq +tkp tkp tkp bSM @@ -97647,7 +96881,7 @@ apC qSs vYD vYD -jAK +nyV wbb xFx vAF @@ -98418,7 +97652,7 @@ apC qSs vYD vYD -jAK +nyV wbb xFx kzQ @@ -98675,7 +97909,7 @@ apC elr tzJ hVa -vHO +drw wbb xFx bPo @@ -104845,7 +104079,7 @@ kzD jIG wGs pCr -lKC +pCr oks cjq jnq @@ -106854,7 +106088,7 @@ avt hFr vsg ekX -ezS +oOj ekX ekX hFr @@ -107110,9 +106344,9 @@ hFr avt hFr mTS -mTS +gaX hWh -mTS +sBd mTS hFr hFr @@ -109715,7 +108949,7 @@ hxz jnq kbi kbi -kbi +xNB qIC nQo fhA @@ -110486,7 +109720,7 @@ wrD xHL oQW oQW -oQW +aVq ksP iJd qKx @@ -116176,7 +115410,7 @@ inb pHM oNq slb -oEf +hYn ixc slb bNz @@ -117718,7 +116952,7 @@ dkm dkm dww cjG -aeO +djX nPp gTl bKe @@ -118466,7 +117700,7 @@ ccC psP pgS shg -ueM +tey tey euP wQP @@ -124656,7 +123890,7 @@ asv jiQ wUg nED -hjM +aet tjP roQ qVr @@ -125684,7 +124918,7 @@ asv jiQ nLH gJY -coM +scO bgH mTR qVr @@ -161114,14 +160348,14 @@ mGQ yiM fpg heY -ddh +wuE mQp mQp mQp mQp mQp wuE -ddh +wuE mQp mQp mQp @@ -161588,7 +160822,7 @@ ird oTJ oTJ oTJ -oMU +qdY uCZ dSo lNZ @@ -161842,9 +161076,9 @@ awr awy eSM tfp -nca -nca -nca +jrK +fCh +qcR neC iUE rxE @@ -161885,20 +161119,20 @@ wDB qqi fpg gpH -pPC +wuE nqH nqH nqH nqH nqH -hGI -pPC +wuE +wuE nqH nqH nqH nqH nqH -hGI +wuE mzD oxE pUw @@ -162099,9 +161333,9 @@ awp dob cmH tfp +kZS nca -nca -nca +qrc neC jNw yji @@ -162356,9 +161590,9 @@ iUh iUh iEm tfp +kZS nca -nca -nca +qrc neC niZ yeG @@ -162613,9 +161847,9 @@ bjv awz rOh tfp +kZS nca -nca -nca +qrc neC eOh mwg @@ -162870,9 +162104,9 @@ wOU awz rOh tfp +kZS nca -nca -nca +qrc ycm qdY eOh @@ -163127,9 +162361,9 @@ kCm awz rOh tfp -nca -nca -nca +piz +nTy +gOA ruA nyt phB @@ -163387,7 +162621,7 @@ gAO odr rMJ odr -pBZ +lSo lSo lSo azy @@ -163641,9 +162875,9 @@ kQy awz rOh tfp -nca -nca -nca +rcH +eaY +eGs ruA otz kTT @@ -163898,9 +163132,9 @@ nzz awz rOh tfp +kZS nca -nca -nca +qrc hYN hMA gvQ @@ -164155,9 +163389,9 @@ wsw awz rOh tfp +kZS nca -nca -nca +qrc neC gvQ gvQ @@ -164412,9 +163646,9 @@ iUh iUh dHn tfp +kZS nca -nca -nca +qrc neC iBO blo @@ -164669,9 +163903,9 @@ awu wOb nCy tfp +kZS nca -nca -nca +qrc neC uXt yji @@ -164748,7 +163982,7 @@ sLJ vBG mAG tMW -byH +tMW tMW tMW esT @@ -164926,9 +164160,9 @@ rLf dUj mjF tfp -nca -nca -nca +fqc +uVS +cTH neC fph sHw @@ -164969,14 +164203,14 @@ oDj qqi fpg jGi -ddh +wuE mQp mQp mQp mQp mQp wuE -ddh +wuE mQp mQp mQp @@ -165186,7 +164420,7 @@ bVN tTJ tTJ tTJ -rzX +hMA wEx dSo lNZ @@ -165262,7 +164496,7 @@ tCf bOF esT tMW -pIS +tMW tMW esT sdb @@ -165740,20 +164974,20 @@ lQv yiM qJf gyz -pPC +wuE nqH nqH nqH nqH nqH -hGI -pPC +wuE +wuE nqH nqH nqH nqH nqH -hGI +wuE uMk vGi ptO @@ -165776,7 +165010,7 @@ sLJ vBG tMW tMW -sOg +mAG mAG mAG esT @@ -167324,11 +166558,11 @@ qZq mnp iFN feN -bME +mAG vKe kXk oOJ -uXM +mAG jhd jhd tMW @@ -167585,14 +166819,14 @@ tMW jhd tMW jhd -opb +mAG oOJ oOJ -stK +mAG ixH -sOg +mAG oOJ -uXM +mAG jhd jhd tMW @@ -167781,19 +167015,19 @@ aaa abM abW abM -tdu +afy afA -afN -fIC +agf +pZv afy afP nJq afX afy pZv -afN -age -riN +lmx +phm +afy afg abS aaa @@ -167849,14 +167083,14 @@ tMW jhd tMW jhd -opb +mAG oOJ oOJ -aME +mAG oOJ -bok +mAG gnp -bWi +mAG mAG fnI jhd @@ -168038,19 +167272,19 @@ abW abW abW abS -tdu +afy afA -afN -riN +agf +afy afy afP nJq afX afy -tdu -afN -age -riN +afy +lmx +phm +afy acm abW aaa @@ -168295,19 +167529,19 @@ abS afg afg afy -tdu +afy afA -afN -riN +agf +afy afy afP nJq afX afy -tdu -afN -age -riN +afy +lmx +phm +afy abW afo aaa @@ -168552,19 +167786,19 @@ abW afg afg abS -tdu +afy afA -afN -riN +agf +afy afy afP nJq afX afy -tdu -afN -age -riN +afy +lmx +phm +afy afy afo aaa @@ -168809,19 +168043,19 @@ afo abS acm abS -tdu -aHf -afN -hGM +afy +ycH +agf +afy afy afP nJq afX afy -aHk -afN -age -riN +afy +lmx +phm +afy afy abS aaa @@ -169066,9 +168300,9 @@ afo abW abW abW -aHk -afB -afE +afy +ycH +age afJ afy afP @@ -169076,9 +168310,9 @@ nJq afX afy agb -xis +afN agf -hGM +afy afy abW aaa @@ -169324,7 +168558,7 @@ abS abW afv age -afC +aHf vFt afK afy @@ -169334,7 +168568,7 @@ afX afy agc yiM -agg +afN age age afv @@ -169558,8 +168792,8 @@ bfa omm vdh rxn -xrt -nYa +oeY +oeY omm abM abW @@ -169580,9 +168814,9 @@ abW afg acm afg -tlH -afD -afG +afy +ycH +age afM afy afP @@ -169590,9 +168824,9 @@ nJq afX afy agd -afG -agh -xVN +age +agf +afy afy abW aaa @@ -169816,7 +169050,7 @@ omm vdh omm pCm -uPh +hXQ omm aaa aaa @@ -169837,19 +169071,19 @@ abS abS abS afo -tdu -aHf -age -xVN +afy +ycH +phm +afy afy afP nJq afX afy -tlH -age -afN -riN +afy +cYj +agf +afy abW abW aaa @@ -170072,8 +169306,8 @@ etQ omm vdh omm -neD -iVe +oeY +saa omm aaa aaa @@ -170094,19 +169328,19 @@ afg abW abS afo -tdu -aHf -age -riN +afy +ycH +phm +afy afy afP nJq afX afy -tdu -age -afN -riN +afy +cYj +agf +afy afo abW abS @@ -170351,19 +169585,19 @@ abW acm acm afo -tdu -aHf -age -riN +afy +ycH +phm +afy afy afP omp afX afy -tdu -age -afN -riN +afy +cYj +agf +afy abS acm acm @@ -170608,19 +169842,19 @@ abS acm acm abW -tdu -aHf -age -hGM +afy +ycH +phm +afy afy afP omp afX afy -aHk -age -afN -riN +afy +cYj +agf +afy abW acm acm @@ -170865,9 +170099,9 @@ abS abW abW afg -aHk -afB -afE +afy +ycH +age afJ afy afP @@ -170875,9 +170109,9 @@ omp afX afy agb -afE +age agf -hGM +afy afg abW afg @@ -171123,7 +170357,7 @@ abW afv age age -afC +aHf izU afK afy @@ -171133,7 +170367,7 @@ afX afy agc qas -agg +afN age afv abW @@ -171379,9 +170613,9 @@ acm afg abW abW -tlH -afD -afG +afy +ycH +age afM afy afP @@ -171389,9 +170623,9 @@ omp afX afy agd -afG -agh -xVN +age +agf +afy abW abW acm @@ -171636,19 +170870,19 @@ abW abW abS abW -tdu -aHf -afN -xVN +afy +ycH +agf +afy afy afP omp afX afy -tlH -afN -afN -riN +afy +lmx +agf +afy abW abS afo @@ -171868,8 +171102,8 @@ dtA dtA omm xhN -jFc -eBC +oeY +vdh omm xvC gFp @@ -171893,19 +171127,19 @@ abM abW afo abS -tdu +afy afA -afN -riN +agf +afy afy afP omp afX afy -tdu -afN -age -riN +afy +lmx +phm +afy abW abS aaa @@ -172124,9 +171358,9 @@ dtA nLi dtA omm -eLv -eLv -iXv +tcu +nlN +vdh omm gPW oni @@ -172150,19 +171384,19 @@ abM abM abW abW -tdu +afy afA -afN -riN +agf +afy afy afP omp afX afy -tdu -afN -age -riN +afy +lmx +phm +afy abS acm aaa @@ -172383,7 +171617,7 @@ omm omm omm omm -cQk +vdh omm cIq gxy @@ -172407,19 +171641,19 @@ abM aaa abM abM -tdu +afy afA -afN -riN +agf +afy afy afP omp afX afy -tdu -afN -age -riN +afy +lmx +phm +afy abW abW aaa @@ -172664,19 +171898,19 @@ aaa aaa aaa abM -tdu +afy afA -afN -riN +agf +afy afy afP omp afX afy -tdu -afN -age -riN +afy +lmx +phm +afy abW afg aaa @@ -172907,7 +172141,7 @@ ehP ilo ehP ehP -cQk +vdh vdh bGU eLv @@ -172921,19 +172155,19 @@ aaa aaa aaa afv -dXc +afz afA -afN -lMU +agf +afO afy afP omp afX afy afO -afN -age -uAc +lmx +phm +afz afv aaa aaa @@ -175248,7 +174482,7 @@ wOC wce mpA xXL -cYl +xXL sjE sjE kkd @@ -180843,7 +180077,7 @@ avE aTY iCA fZL -rkA +bEA fZL fZL aTY @@ -181147,8 +180381,8 @@ lZW aaS aaS qqX -kTO -xDT +npL +ayT afy afP omp @@ -181156,7 +180390,7 @@ afX afy ayT kTO -age +phm whz vNN whz @@ -181357,7 +180591,7 @@ jhd jhd aTY iCA -cfp +fZL fZL aTY jhd @@ -181402,18 +180636,18 @@ vJs lZW aaS afy -tdu +afy afA -afN -riN +agf +pZv afy afP omp afX afy -tdu -afN -age +pZv +lmx +phm hOm vNN vNN @@ -181659,18 +180893,18 @@ lZW lZW abW afy -tdu +afy afA -afN -riN +agf +afy afy afP omp afX afy -tdu -afN -age +afy +lmx +phm hOm srC srC @@ -181871,8 +181105,8 @@ jhd aTY fZL fZL -tCw -kUF +fZL +iCA iCA iCA aTY @@ -181916,18 +181150,18 @@ abM aaa aaa afy -tdu +afy afA -afN -riN +agf +afy afy afP omp afX afy -tdu -afN -age +afy +lmx +phm whz whz whz @@ -182162,7 +181396,7 @@ mBh sVx kxh bSp -gMh +qHl jWO lZW aaa @@ -182173,19 +181407,19 @@ aaa aaa abW abS -tdu +afy afA -afN -riN +agf +afy afy afP omp afX afy -tdu -afN -age -riN +afy +lmx +phm +afy afy whz srC @@ -182386,7 +181620,7 @@ jhd jhd aTY fZL -cfp +fZL fZL aTY uRv @@ -182430,19 +181664,19 @@ aaa abW afo abS -tdu -aHf -afN -hGM +afy +ycH +agf +afy afy afP omp afX afy -aHk -afN -age -riN +afy +lmx +phm +afy afy whz srC @@ -182457,9 +181691,9 @@ whz whz iLn vNN -bRF +iLn vnJ -nFM +iLn srC srC cgy @@ -182687,9 +181921,9 @@ abW abW abS abW -aHk -afB -afE +afy +ycH +age afJ afy afP @@ -182697,10 +181931,10 @@ omp afX afy agb -xis +afN agf -hGM -noO +afy +afy whz whz vNN @@ -182900,8 +182134,8 @@ avE aTY iCA iCA -tCw -bKy +fZL +fZL fZL fZL aTY @@ -182945,17 +182179,17 @@ abS abW afv age -afC +aHf qas afK afy afP -omp +eTI afX afy agc izU -agg +afN age age afv @@ -183201,9 +182435,9 @@ afo afo afg afy -tlH -afD -afG +afy +ycH +age afM afy afP @@ -183211,10 +182445,10 @@ omp afX afy agd -afG -agh -xVN -mou +age +agf +afy +afy abW whz whz @@ -183415,7 +182649,7 @@ jhd jhd aTY iCA -upS +iCA fZL aTY jhd @@ -183444,8 +182678,8 @@ aaa aaa lZW sAO -gMh -sVA +qHl +qHl sVA pOv nAY @@ -183458,19 +182692,19 @@ afo afo afy afy -tdu -aHf -age -xVN +afy +ycH +phm +afy afy afP omp afX afy -tlH -age -afN -riN +afy +cYj +agf +afy abW abW afo @@ -183701,7 +182935,7 @@ aaa aaa lZW sAO -tnX +qHl hur nAY nAY @@ -183715,19 +182949,19 @@ abS abS abW afy -tdu -aHf -age -riN +afy +ycH +phm +afy afy afP omp afX afy -tdu -age -afN -riN +afy +cYj +agf +afy abS afg abW @@ -183742,7 +182976,7 @@ xTG xip too iLn -mcn +vNN quJ quJ quJ @@ -183929,8 +183163,8 @@ jhd aTY fZL fZL -tCw -vwN +fZL +fZL iCA iCA aTY @@ -183972,19 +183206,19 @@ agm abS abW afg -tdu -aHf -age -riN +afy +ycH +phm +afy afy afP ozQ afX afy -tdu -age -afN -riN +afy +cYj +agf +afy abW abS abW @@ -184215,7 +183449,7 @@ aaa aaa lZW sAO -gMh +qHl qmD nAY nAY @@ -184229,19 +183463,19 @@ abW abW abS afo -tdu -aHf -age -hGM +afy +ycH +phm +afy afy afP ozQ afX afy -aHk -age -afN -riN +afy +cYj +agf +afy afy abS abW @@ -184486,9 +183720,9 @@ abS abW abW abW -aHk -afB -afE +afy +ycH +age afJ afy afP @@ -184496,10 +183730,10 @@ ozQ afX afy agb -afE +age agf -hGM -noO +afy +afy afo abW xip @@ -184729,7 +183963,7 @@ aaa aaa lZW fDd -tnX +qHl ena ena phs @@ -184744,7 +183978,7 @@ afo acm afv age -afC +aHf bMb afK afy @@ -184754,7 +183988,7 @@ afX afy agc mZJ -agg +afN age age afv @@ -185000,9 +184234,9 @@ abW abW abW afy -tlH -afD -afG +afy +ycH +age afM afy afP @@ -185010,10 +184244,10 @@ ozQ afX afy agd -afG -agh -xVN -mou +age +agf +afy +afy abS abW xip @@ -185257,19 +184491,19 @@ abW abS abW afy -tdu -aHf -afN -xVN +afy +ycH +agf +afy afy afP -afW +ozQ afX afy -tlH -afN -afN -riN +afy +lmx +agf +afy afy abW aaa @@ -185472,7 +184706,7 @@ iCA iCA plk plk -vAj +deQ plk plk fZL @@ -185514,19 +184748,19 @@ aaa abW abW afy -tdu +afy afA -afN -riN +agf +afy afy afP ozQ afX afy -tdu -afN -age -riN +afy +lmx +phm +afy lVi lVi lVi @@ -185771,19 +185005,19 @@ abW abW acm afy -tdu +afy afA -afN -riN +agf +afy afy afP ozQ afX afy -tdu -afN -age -riN +afy +lmx +phm +afy lVi mHE mHE @@ -185971,17 +185205,17 @@ jhd uRv sIx iCA -whS +iCA viR viR -esY +iCA viR dec -tWo +iCA viR viR viR -bwT +iCA lzc sGx cko @@ -186028,18 +185262,18 @@ abW aaa abW abM -tdu +afy afA -afN -riN +agf +afy afy afP ozQ afX afy -tdu -afN -age +afy +lmx +phm lVi lVi kCF @@ -186285,18 +185519,18 @@ abM aaa aaa abM -tdu +afy afA -afN -riN +agf +afy afy afP ozQ afX afy -tdu -afN -age +afy +lmx +phm lVi kCF kCF @@ -186500,7 +185734,7 @@ iCA iCA plk plk -neB +eBc plk plk fZL @@ -186542,18 +185776,18 @@ aaa aaa aaa afv -dXc +afz afA -afN -lMU +agf +afO afy afP ozQ afX afy afO -afN -age +lmx +phm lVi kCF soq @@ -186788,7 +186022,7 @@ aaa aaa aaa lZW -xiG +cjx nAY lZW kXi @@ -187045,7 +186279,7 @@ aaa aaa aaa lZW -tnX +qHl gFX lZW ddD @@ -188042,8 +187276,8 @@ jhd aTY fZL fZL -jGl -bKy +fZL +fZL fZL fZL aTY @@ -188557,7 +187791,7 @@ jhd jhd aTY iCA -cfp +fZL fZL aTY jhd @@ -189071,8 +188305,8 @@ avE aTY iCA iCA -qKh -bKy +iCA +fZL fZL fZL aTY @@ -189586,7 +188820,7 @@ jhd jhd aTY fZL -cfp +fZL iCA aTY uRv @@ -190100,8 +189334,8 @@ jhd aTY fZL fZL -tCw -bKy +fZL +fZL fZL fZL aTY @@ -190165,9 +189399,9 @@ xQN mEt vNk kTU -xyt +dzx whP -ovC +dzx dCq uiV rGj @@ -190358,7 +189592,7 @@ jhd jhd jhd uRv -sLi +kgS uRv jhd jhd @@ -190615,7 +189849,7 @@ jhd jhd aTY fZL -cfp +fZL iCA aTY jhd @@ -191193,9 +190427,9 @@ vTb vTb rbn crj -wWT +dzx fDB -uvB +dzx rBb tbK kye @@ -192540,13 +191774,13 @@ oMI oTa tDn tDn -qJh +uqS dVM dVM dVM dVM dVM -fho +uqS tDn bJP oMI @@ -193576,7 +192810,7 @@ dVM rOT rSB dVM -fho +uqS cEb gFf wbW @@ -194090,7 +193324,7 @@ dVM qYJ rSB dVM -jgq +uqS xWe gFf mrF @@ -195107,16 +194341,16 @@ vUu gFf gFf oMI -uCh +qye hic hic -cPl +uqS dVM dVM dVM dVM dVM -jgq +uqS hic vWw oMI diff --git a/code/controllers/subsystem/materials.dm b/code/controllers/subsystem/materials.dm index a9c807cc38a5..515fdd465a39 100644 --- a/code/controllers/subsystem/materials.dm +++ b/code/controllers/subsystem/materials.dm @@ -27,6 +27,7 @@ SUBSYSTEM_DEF(materials) new /datum/stack_recipe("Sink Frame", /obj/structure/sinkframe, one_per_turf = TRUE, on_solid_ground = TRUE, applies_mats = TRUE, category = CAT_FURNITURE), new /datum/stack_recipe("Material floor tile", /obj/item/stack/tile/material, 1, 4, 20, applies_mats = TRUE, check_density = FALSE, category = CAT_TILES), new /datum/stack_recipe("Material airlock assembly", /obj/structure/door_assembly/door_assembly_material, 4, time = 5 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, applies_mats = TRUE, category = CAT_DOORS), + new /datum/stack_recipe("Railing", /obj/structure/railing, one_per_turf = FALSE, on_solid_ground = TRUE, applies_mats = TRUE, category = CAT_FURNITURE), ) ///List of stackcrafting recipes for materials using rigid recipes var/list/rigid_stack_recipes = list( diff --git a/monkestation/code/modules/aesthetics/airlock/airlock.dm b/monkestation/code/modules/aesthetics/airlock/airlock.dm index 7ada0684d286..6447edc0ab60 100644 --- a/monkestation/code/modules/aesthetics/airlock/airlock.dm +++ b/monkestation/code/modules/aesthetics/airlock/airlock.dm @@ -659,3 +659,12 @@ #undef AIRLOCK_FRAME_CLOSING #undef AIRLOCK_FRAME_OPEN #undef AIRLOCK_FRAME_OPENING + + +/obj/machinery/door/poddoor/shutters/cc + obj_flags = INDESTRUCTIBLE + +/obj/machinery/door/poddoor/shutters/cc/xcc + id = "XCCsec1" + name = "XCC Checkpoint 1 Shutters" + max_integrity = 3000000 diff --git a/monkestation/code/modules/aesthetics/icons/railing_basic.dmi b/monkestation/code/modules/aesthetics/icons/railing_basic.dmi new file mode 100644 index 0000000000000000000000000000000000000000..df17d1a486a8c1bd32be4b3adf6acf757d0fe67d GIT binary patch literal 1528 zcmZvcc{G%J7{`CF7t>*4Bzwl(R!R|3L}oO$n;6+r7$uCd3?@gT$(t-8-A=b<3ddL? z*^+&UA#`OOSt{FP9T9WwmzX=Zd+vYtoada+^Zh>0f6sHiaU>gy?Gnlo0D$dQmc(-a zK*AORqOcGJuBDDb$dRla%!FhznXay`91drFeVxT(MMp=wccH%gvrao_V-N6?pS*>l zg6?phM)V5t4ECkcd;a=r52a`>PlibgVb0I!6?iMm7f3=9mD8wp$Si4q?gPlgYtf@aX2m zf!cnnb*cUQL9XO6C8;j&W&@x*v1OqiF-w{+C`ldH)4x+2+r}(yk~YgLS$M9wsCP)2 zA&qV>Q8%RX(32B{#g~a%jv1*E$op3rPdm7I^zedFwQDq_aKOB7C$Js3@2&?dr2U@! zD*dQcp!!-v54k|eM!G?B2agJ8dPF^IpUqRq}CW59n#N9g5185mazX?NRkwi^Uw~_ zue%1MmI<306ALv@QRfbK-ieGP6`eRMfzhR^RI&k@y9LB^5fV~=kktZ>H@!<|ZWP+f zVRm0i3MjVz4%sCg8JX|fsGRht#8qAC>Av?tpop++nfX&UD4W)f_`9DZwu$k^AiLNo z5#AoV2;8Bm8?&Cly6K^1JEx!hWr&R#o`bk?$ui}I&QMsUF+W%iLFw4EHaP-jyjQ3i zc8y@uvYfiXXETpdUwsafu0VWSXJvsJ>_?*KU z8XFL!$jb)-ADJ<1uGnGCH?5{ohE9^XGg>p?TSYboOv|xeS8ctKV%_hJoZIw%8s5}X zbRi?0rFX#iG^4Y>mxq0=NNKm~w3LTsp}W=H#(SPEUMxCmZ{=vM81F>#qdx_hm@H{_ zpTZ8%(6waD4xQZ#qS9`8-Ha^#`j7PACzR9S$m1rYiOo8S4A!85<@}9qz||Sh!(B)z z#_m!Du2a<@eT7|O%)TX{0KN_Y4gv=Lk@+eJTkR3U4AD}`PegeRs74S~x9>TH&1(hwZU->S4WMaZm$3ZRoj`**} zq@EDEc42J9AN!^tWWh`fb@y+dY?eGnxmkTn&aX)?KAy^(BYi8%EUj|ibGBMDr zgHu;y-r;1pCT+#U-(0*G->G7NkN>!Sl Q2*Vjznb{BvOg$q124au6NB{r; literal 0 HcmV?d00001 diff --git a/monkestation/code/modules/aesthetics/objects/railing.dm b/monkestation/code/modules/aesthetics/objects/railing.dm new file mode 100644 index 000000000000..3ca795d28728 --- /dev/null +++ b/monkestation/code/modules/aesthetics/objects/railing.dm @@ -0,0 +1,133 @@ +/obj/structure/railing + icon = 'monkestation/code/modules/aesthetics/icons/railing_basic.dmi' + icon_state = "railing0-1" + + obj_flags = IGNORE_DENSITY | CAN_BE_HIT | BLOCKS_CONSTRUCTION_DIR + custom_materials = list(/datum/material/iron = 100) + material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS + + var/neighbor_status = list() ///list of smoothing we need doing + + +/obj/structure/railing/Initialize(mapload) + . = ..() + return INITIALIZE_HINT_LATELOAD + +/obj/structure/railing/LateInitialize() + . = ..() + if(anchored) + update_icon() + + +/obj/structure/railing/setDir(newdir) + . = ..() + if(anchored) + update_icon() + +/obj/structure/railing/Destroy() + . = ..() + for(var/thing in range(1, src)) + var/turf/T = thing + for(var/obj/structure/railing/R in T.contents) + R.update_icon() + +/obj/structure/railing/proc/check_neighbors(updates = TRUE) + neighbor_status = list() + var/Rturn = turn(src.dir, -90) + var/Lturn = turn(src.dir, 90) + + for(var/obj/structure/railing/R in get_turf(src)) + if((R.dir == Lturn) && R.anchored) + neighbor_status |= "corneroverlay_l" + if(updates) + R.update_icon(FALSE) + if((R.dir == Rturn) && R.anchored) + neighbor_status |= "corneroverlay_r" + if(updates) + R.update_icon(FALSE) + for(var/obj/structure/railing/R in get_step(src, Lturn)) + if((R.dir == src.dir) && R.anchored) + neighbor_status |= "frontoverlay_l" + if(updates) + R.update_icon(FALSE) + for(var/obj/structure/railing/R in get_step(src, Rturn)) + if((R.dir == src.dir) && R.anchored) + neighbor_status |= "frontoverlay_r" + if (updates) + R.update_icon(FALSE) + for(var/obj/structure/railing/R in get_step(src, (Lturn + src.dir))) + if((R.dir == Rturn) && R.anchored) + neighbor_status |= "frontoverlay_l" + if (updates) + R.update_icon(FALSE) + for(var/obj/structure/railing/R in get_step(src, (Rturn + src.dir))) + if((R.dir == Lturn) && R.anchored) + neighbor_status |= "mcorneroverlay_l" + if (updates) + R.update_icon(FALSE) + + ///corner hell + ///we are basically checking if 2 or more cardinal directions exist here so we can set our dir + + +/obj/structure/railing/update_icon(update_neighbors = TRUE) + . = ..() + check_neighbors(update_neighbors) + overlays.Cut() + + if(dir == SOUTH) + layer = ABOVE_MOB_LAYER + 0.01 + + else if( dir != NORTH) + SET_PLANE(src, GAME_PLANE_FOV_HIDDEN, get_turf(src)) + else + SET_PLANE(src, GAME_PLANE, get_turf(src)) + layer = initial(layer) + + if(!neighbor_status || !anchored) + icon_state = "railing0-[density]" + else + icon_state = "railing1-[density]" + + if(("corneroverlay_l" in neighbor_status) && ("corneroverlay_r" in neighbor_status)) + icon_state = "blank" + + + var/turf/right_turf = get_step(src, turn(src.dir, -90)) + var/turf/left_turf = get_step(src, turn(src.dir, 90)) + + if((!locate(/obj/structure/railing) in right_turf.contents)) + if(!("mcorneroverlay_l" in neighbor_status)) + overlays += image(icon, "frontend_r[density]") + else + overlays += image(icon, "frontoverlay_r[density]") + + + if((!locate(/obj/structure/railing) in left_turf.contents)) + if(!("mcorneroverlay_l" in neighbor_status)) + overlays += image(icon, "frontend_l[density]") + else + overlays += image(icon, "frontoverlay_l[density]") + + + if("corneroverlay_l" in neighbor_status) + overlays += image(icon, "corneroverlay_l[density]") + if("corneroverlay_r" in neighbor_status) + overlays += image(icon, "corneroverlay_r[density]") + if("frontoverlay_l" in neighbor_status) + overlays += image(icon, "frontoverlay_l[density]") + if("frontoverlay_r" in neighbor_status) + overlays += image(icon, "frontoverlay_r[density]") + if("mcorneroverlay_l" in neighbor_status) + var/pix_offset_x = 0 + var/pix_offset_y = 0 + switch(dir) + if(NORTH) + pix_offset_x = 32 + if(SOUTH) + pix_offset_x = -32 + if(EAST) + pix_offset_y = -32 + if(WEST) + pix_offset_y = 32 + overlays += image(icon, "mcorneroverlay_l[density]", pixel_x = pix_offset_x, pixel_y = pix_offset_y) diff --git a/monkestation/code/modules/ghost_players/ghost_player.dm b/monkestation/code/modules/ghost_players/ghost_player.dm index 1262c0959e64..fd7d5fc46b7c 100644 --- a/monkestation/code/modules/ghost_players/ghost_player.dm +++ b/monkestation/code/modules/ghost_players/ghost_player.dm @@ -124,7 +124,7 @@ GLOBAL_VAR_INIT(disable_ghost_spawning, FALSE) /mob/dead/observer/proc/create_ghost_body() - var/mob/living/carbon/human/old_mob = mind.current + var/mob/living/carbon/human/old_mob = mind?.current var/obj/item/organ/internal/brain/brain if(istype(old_mob)) brain = old_mob.get_organ_by_type(/obj/item/organ/internal/brain) diff --git a/monkestation/code/modules/mob/dead/new_player/sprite_accessories/hair.dm b/monkestation/code/modules/mob/dead/new_player/sprite_accessories/hair.dm index 8ab5663ce2b6..a8bfd20700e7 100644 --- a/monkestation/code/modules/mob/dead/new_player/sprite_accessories/hair.dm +++ b/monkestation/code/modules/mob/dead/new_player/sprite_accessories/hair.dm @@ -85,3 +85,8 @@ icon = 'monkestation/icons/mob/sprite_accessories/hair.dmi' name = "Mullet" icon_state = "hair_mullet" + +/datum/sprite_accessory/hair/long_messy + icon = 'monkestation/icons/mob/sprite_accessories/hair.dmi' + name = "Long and Messy" + icon_state = "long_messy" diff --git a/monkestation/icons/mob/sprite_accessories/hair.dmi b/monkestation/icons/mob/sprite_accessories/hair.dmi index df59586e6740d269d2ed4ed961ad06900f91fd2f..10a508c4d9b8678a01730808613059f02181fa99 100644 GIT binary patch literal 12121 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 B3<3ZE diff --git a/tgstation.dme b/tgstation.dme index 3f055a745297..287bc5821cff 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5479,6 +5479,7 @@ #include "monkestation\code\modules\aesthetics\items\clothing.dm" #include "monkestation\code\modules\aesthetics\mobs\slime.dm" #include "monkestation\code\modules\aesthetics\objects\misc.dm" +#include "monkestation\code\modules\aesthetics\objects\railing.dm" #include "monkestation\code\modules\aesthetics\objects\window_sill.dm" #include "monkestation\code\modules\aesthetics\objects\windows.dm" #include "monkestation\code\modules\aesthetics\subsystem\coloring.dm" From 6fb8611f638e9e5f321073cdfeb39ecffa33b26a Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Mon, 25 Sep 2023 03:38:36 -0400 Subject: [PATCH 47/59] Update railing.dm --- monkestation/code/modules/aesthetics/objects/railing.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/monkestation/code/modules/aesthetics/objects/railing.dm b/monkestation/code/modules/aesthetics/objects/railing.dm index 3ca795d28728..0af197473acb 100644 --- a/monkestation/code/modules/aesthetics/objects/railing.dm +++ b/monkestation/code/modules/aesthetics/objects/railing.dm @@ -75,13 +75,14 @@ check_neighbors(update_neighbors) overlays.Cut() + var/turf/turf = get_turf(src) if(dir == SOUTH) layer = ABOVE_MOB_LAYER + 0.01 - else if( dir != NORTH) - SET_PLANE(src, GAME_PLANE_FOV_HIDDEN, get_turf(src)) + else if(dir != NORTH) + SET_PLANE(src, GAME_PLANE_FOV_HIDDEN, turf) else - SET_PLANE(src, GAME_PLANE, get_turf(src)) + SET_PLANE(src, GAME_PLANE, turf) layer = initial(layer) if(!neighbor_status || !anchored) From 8fb8cfa1cf0b33a451fa83d9197d5a5cb784e543 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Mon, 25 Sep 2023 04:00:16 -0400 Subject: [PATCH 48/59] plane fix --- monkestation/code/modules/aesthetics/objects/railing.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/monkestation/code/modules/aesthetics/objects/railing.dm b/monkestation/code/modules/aesthetics/objects/railing.dm index 0af197473acb..2ad7f7a72840 100644 --- a/monkestation/code/modules/aesthetics/objects/railing.dm +++ b/monkestation/code/modules/aesthetics/objects/railing.dm @@ -77,6 +77,7 @@ var/turf/turf = get_turf(src) if(dir == SOUTH) + SET_PLANE(src, GAME_PLANE_FOV_HIDDEN, turf) layer = ABOVE_MOB_LAYER + 0.01 else if(dir != NORTH) From 2cf2df821fa303a558595c22bdd0710d78b9786a Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Mon, 25 Sep 2023 04:03:48 -0400 Subject: [PATCH 49/59] fixes --- _maps/map_files/IceBoxStation/IceBoxStation.dmm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index dc1474505976..202a5feb524f 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -35066,6 +35066,13 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) +"lmW" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) "lmY" = ( /obj/machinery/newscaster/directional/west, /obj/machinery/camera{ @@ -63753,7 +63760,10 @@ "uBy" = ( /obj/structure/flora/grass/brown/style_random, /obj/structure/railing{ - dir = 9 + dir = 1 + }, +/obj/structure/railing{ + dir = 8 }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/underground/explored) @@ -158535,7 +158545,7 @@ uBy gQe gQe gQe -nzG +lmW eJf gjq gOU From 84746d76964298c1053b60b0fd5194a4cdada8a5 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Mon, 25 Sep 2023 14:13:03 -0400 Subject: [PATCH 50/59] railing fixes --- _maps/map_files/generic/CentCom.dmm | 37 +++++++++++++----------- code/game/objects/structures/railings.dm | 1 - 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index a92e486f9650..d1ea83aef15c 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -140,12 +140,15 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/admin) "aL" = ( -/obj/structure/railing/corner, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 6; + layer = 3.1 + }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) "aM" = ( @@ -717,12 +720,6 @@ /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/courtroom) "dv" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 8 }, @@ -894,6 +891,10 @@ /obj/effect/turf_decal/siding/dark{ dir = 4 }, +/obj/structure/railing{ + dir = 10; + layer = 3.1 + }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) "ef" = ( @@ -4608,6 +4609,10 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 10; + layer = 3.1 + }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) "sx" = ( @@ -6452,10 +6457,6 @@ /turf/open/floor/iron, /area/centcom/tdome/observation) "Ae" = ( -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 8 }, @@ -7895,9 +7896,6 @@ /obj/effect/turf_decal/siding/wideplating/dark{ dir = 4 }, -/obj/structure/railing/corner{ - dir = 1 - }, /turf/open/floor/wood, /area/centcom/central_command_areas/fore) "GT" = ( @@ -8065,6 +8063,10 @@ /obj/effect/turf_decal/siding/dark{ dir = 6 }, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) "Id" = ( @@ -8701,6 +8703,10 @@ /obj/effect/turf_decal/siding/dark{ dir = 10 }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) "LA" = ( @@ -10609,9 +10615,6 @@ /turf/closed/indestructible/fakeglass, /area/centcom/tdome/observation) "Tb" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm index d350e0388738..0da5236b321b 100644 --- a/code/game/objects/structures/railings.dm +++ b/code/game/objects/structures/railings.dm @@ -24,7 +24,6 @@ bomb = 10 /obj/structure/railing/corner //aesthetic corner sharp edges hurt oof ouch - icon_state = "railing_corner" density = FALSE climbable = FALSE From f56218b49249006a423de85a1fb1b5a53699f212 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Mon, 25 Sep 2023 14:28:05 -0400 Subject: [PATCH 51/59] Update CentCom.dmm --- _maps/map_files/generic/CentCom.dmm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index d1ea83aef15c..d37877d5bee6 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -3791,7 +3791,8 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/mapping_helpers/airlock/access/any/admin/general, -/turf/open/space/basic, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/grimy, /area/centcom/central_command_areas/admin) "pc" = ( /obj/structure/sign/nanotrasen, From 6a7deab9dc23517c252d37be3dc4a74b3593f7a9 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Mon, 25 Sep 2023 18:14:03 -0400 Subject: [PATCH 52/59] basic fish mob --- code/__DEFINES/ai/ai_blackboard.dm | 2 + .../basic_ai_behaviors/step_towards_turf.dm | 26 +++---- .../code/modules/ocean_content/icons/fish.dmi | Bin 0 -> 3997 bytes .../mobs/ai/behaviours/attempt_group_find.dm | 24 +++++++ .../mobs/ai/behaviours/group_move_towards.dm | 28 ++++++++ .../ocean_content/mobs/ai/controller.dm | 10 +++ .../ai/subtrees/simple_try_attach_group.dm | 24 +++++++ .../modules/ocean_content/mobs/fish_base.dm | 18 +++++ .../ocean_content/mobs/group_planning.dm | 68 ++++++++++++++++++ tgstation.dme | 6 ++ 10 files changed, 194 insertions(+), 12 deletions(-) create mode 100644 monkestation/code/modules/ocean_content/icons/fish.dmi create mode 100644 monkestation/code/modules/ocean_content/mobs/ai/behaviours/attempt_group_find.dm create mode 100644 monkestation/code/modules/ocean_content/mobs/ai/behaviours/group_move_towards.dm create mode 100644 monkestation/code/modules/ocean_content/mobs/ai/controller.dm create mode 100644 monkestation/code/modules/ocean_content/mobs/ai/subtrees/simple_try_attach_group.dm create mode 100644 monkestation/code/modules/ocean_content/mobs/fish_base.dm create mode 100644 monkestation/code/modules/ocean_content/mobs/group_planning.dm diff --git a/code/__DEFINES/ai/ai_blackboard.dm b/code/__DEFINES/ai/ai_blackboard.dm index 289f75862229..fe8e9541bf33 100644 --- a/code/__DEFINES/ai/ai_blackboard.dm +++ b/code/__DEFINES/ai/ai_blackboard.dm @@ -83,3 +83,5 @@ #define BB_MOD_IMPLANT "BB_mod_implant" ///Range for a MOD AI controller. #define MOD_AI_RANGE 200 + +#define BB_GROUP_DATUM "BB_group_datum" diff --git a/code/datums/ai/basic_mobs/basic_ai_behaviors/step_towards_turf.dm b/code/datums/ai/basic_mobs/basic_ai_behaviors/step_towards_turf.dm index f941b2eb95d5..70a557ccc436 100644 --- a/code/datums/ai/basic_mobs/basic_ai_behaviors/step_towards_turf.dm +++ b/code/datums/ai/basic_mobs/basic_ai_behaviors/step_towards_turf.dm @@ -9,22 +9,24 @@ /// How far ahead do we plot movement per action? Further means longer until we return to the decision tree, fewer means jerkier movement /// This can still result in long moves because this is "a tile x tiles away" not "only move x tiles", you might path around some walls var/step_distance = 3 + var/overwrites_main = FALSE /datum/ai_behavior/step_towards_turf/setup(datum/ai_controller/controller, turf_key) - var/turf/target_turf = controller.blackboard[turf_key] - if (QDELETED(target_turf) || target_turf.is_blocked_turf(exclude_mobs = TRUE)) - target_turf = find_destination_turf(args) - if (!target_turf) - return FALSE - controller.set_blackboard_key(turf_key, target_turf) + if(!overwrites_main) + var/turf/target_turf = controller.blackboard[turf_key] + if (QDELETED(target_turf) || target_turf.is_blocked_turf(exclude_mobs = TRUE)) + target_turf = find_destination_turf(args) + if (!target_turf) + return FALSE + controller.set_blackboard_key(turf_key, target_turf) - if (target_turf.z != controller.pawn.z) - return FALSE + if (target_turf.z != controller.pawn.z) + return FALSE - var/turf/destination = plot_movement(controller, target_turf) - if (!destination) - return FALSE - set_movement_target(controller, destination) + var/turf/destination = plot_movement(controller, target_turf) + if (!destination) + return FALSE + set_movement_target(controller, destination) return ..() /** diff --git a/monkestation/code/modules/ocean_content/icons/fish.dmi b/monkestation/code/modules/ocean_content/icons/fish.dmi new file mode 100644 index 0000000000000000000000000000000000000000..028d52fdc2d5661e8f5430a5bce6b6aa678a82d7 GIT binary patch literal 3997 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 A!vFvP literal 0 HcmV?d00001 diff --git a/monkestation/code/modules/ocean_content/mobs/ai/behaviours/attempt_group_find.dm b/monkestation/code/modules/ocean_content/mobs/ai/behaviours/attempt_group_find.dm new file mode 100644 index 000000000000..9d0f176f7fd7 --- /dev/null +++ b/monkestation/code/modules/ocean_content/mobs/ai/behaviours/attempt_group_find.dm @@ -0,0 +1,24 @@ +/datum/ai_behavior/attempt_group_find + var/group_to_find = /datum/group_planning + +/datum/ai_behavior/attempt_group_find/perform(seconds_per_tick, datum/ai_controller/controller, ...) + . = ..() + for(var/mob/living/basic/found_basic in view(7, controller.pawn)) + if(BB_GROUP_DATUM in found_basic.ai_controller.blackboard) + var/datum/group_planning/found_group = found_basic.ai_controller.blackboard[BB_GROUP_DATUM] + if(!found_group) + continue + if(found_group.type != group_to_find) + continue + controller.blackboard[BB_GROUP_DATUM] = found_group + found_group.group_mobs |= controller.pawn + finish_action(controller, TRUE) + break + + var/datum/group_planning/new_group = new group_to_find + controller.blackboard[BB_GROUP_DATUM] = new_group + new_group.group_mobs |= controller.pawn + finish_action(controller, TRUE) + +/datum/ai_behavior/attempt_group_find/fish + group_to_find = /datum/group_planning/fish diff --git a/monkestation/code/modules/ocean_content/mobs/ai/behaviours/group_move_towards.dm b/monkestation/code/modules/ocean_content/mobs/ai/behaviours/group_move_towards.dm new file mode 100644 index 000000000000..8cd5218651f0 --- /dev/null +++ b/monkestation/code/modules/ocean_content/mobs/ai/behaviours/group_move_towards.dm @@ -0,0 +1,28 @@ +/datum/ai_behavior/step_towards_turf/group_movement + overwrites_main = TRUE + +/datum/ai_behavior/step_towards_turf/group_movement/setup(datum/ai_controller/controller, turf_key) + var/datum/group_planning/listed_group = controller.blackboard[BB_GROUP_DATUM] + var/turf/target_turf = listed_group.target + + if(!target_turf) + listed_group.decide_next_action() + target_turf = listed_group.target + if(!target_turf) + return FALSE + + if (target_turf.z != controller.pawn.z) + return FALSE + + var/turf/destination = plot_movement(controller, target_turf) + if (!destination) + return FALSE + set_movement_target(controller, destination) + return ..() + + +/datum/ai_behavior/step_towards_turf/group_movement/finish_action(datum/ai_controller/controller, succeeded, ...) + . = ..() + var/datum/group_planning/listed_group = controller.blackboard[BB_GROUP_DATUM] + if(listed_group) + listed_group.finish_action(controller) diff --git a/monkestation/code/modules/ocean_content/mobs/ai/controller.dm b/monkestation/code/modules/ocean_content/mobs/ai/controller.dm new file mode 100644 index 000000000000..b4b0bc58f519 --- /dev/null +++ b/monkestation/code/modules/ocean_content/mobs/ai/controller.dm @@ -0,0 +1,10 @@ +/datum/ai_controller/basic_controller/fish + blackboard = list( + BB_GROUP_DATUM = null + ) + + ai_movement = /datum/ai_movement/basic_avoidance + idle_behavior = /datum/idle_behavior/idle_random_walk + planning_subtrees = list( + /datum/ai_planning_subtree/simple_create_or_follow_commands/fish, + ) diff --git a/monkestation/code/modules/ocean_content/mobs/ai/subtrees/simple_try_attach_group.dm b/monkestation/code/modules/ocean_content/mobs/ai/subtrees/simple_try_attach_group.dm new file mode 100644 index 000000000000..cf52ae6d8ebd --- /dev/null +++ b/monkestation/code/modules/ocean_content/mobs/ai/subtrees/simple_try_attach_group.dm @@ -0,0 +1,24 @@ +/datum/ai_planning_subtree/simple_create_or_follow_commands + var/group_finding_behaviour = /datum/ai_behavior/attempt_group_find + +/datum/ai_planning_subtree/simple_create_or_follow_commands/fish + group_finding_behaviour = /datum/ai_behavior/attempt_group_find/fish + + +/datum/ai_planning_subtree/simple_create_or_follow_commands/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) + var/datum/group_planning/attached = controller.blackboard[BB_GROUP_DATUM] + if(!attached) + controller.queue_behavior(group_finding_behaviour) + return + + if(length(attached.in_progress_mobs) && !(controller.pawn in attached.in_progress_mobs) && !(controller.pawn in attached.finished_mobs)) + attached.add_to_current_action(controller) + return + + if(!attached.next_action > world.time && !length(attached.in_progress_mobs)) + return + + if(!attached.fetched_behaviour) + attached.decide_next_action() + attached.bulk_queue() + diff --git a/monkestation/code/modules/ocean_content/mobs/fish_base.dm b/monkestation/code/modules/ocean_content/mobs/fish_base.dm new file mode 100644 index 000000000000..d592a19bd47b --- /dev/null +++ b/monkestation/code/modules/ocean_content/mobs/fish_base.dm @@ -0,0 +1,18 @@ +/mob/living/basic/aquatic/fish + icon = 'monkestation/code/modules/ocean_content/icons/fish.dmi' + icon_state = "fish" + icon_living = "fish" + icon_dead = "fish_dead" + icon_gib = "fish_dead" + + mob_size = MOB_SIZE_SMALL + faction = list(FACTION_CARP) + speak_emote = list("glubs") + + habitable_atmos = list("min_oxy" = 2, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) + minimum_survivable_temperature = 0 + maximum_survivable_temperature = 1200 + + ai_controller = /datum/ai_controller/basic_controller/fish + + diff --git a/monkestation/code/modules/ocean_content/mobs/group_planning.dm b/monkestation/code/modules/ocean_content/mobs/group_planning.dm new file mode 100644 index 000000000000..b65c54d713ca --- /dev/null +++ b/monkestation/code/modules/ocean_content/mobs/group_planning.dm @@ -0,0 +1,68 @@ +/datum/group_planning + ///when our next queuing is done + var/next_action = 0 + ///our cooldown time of actions + var/cooldown_time = 10 SECONDS + ///list of mobs in our group + var/list/group_mobs = list() + ///list of mobs still executing our queued_behavior + var/list/in_progress_mobs = list() + ///list of finished mobs + var/list/finished_mobs = list() + ///our behaviour that we are queing + var/queued_behavior + ///do we need to fetch a new behaviour? + var/fetched_behaviour = FALSE + ///list of all behaviours we can do + var/list/usable_behaviours = list() + ///our current_target + var/atom/target + +/datum/group_planning/proc/bulk_queue() + for(var/mob/living/basic/listed as anything in group_mobs) + if(!istype(listed) || !listed.ai_controller || listed.stat == DEAD) //cull dead members that shouldn't exist anymore + if(isbasicmob(listed) && listed.ai_controller && (BB_GROUP_DATUM in listed.ai_controller.blackboard)) + listed.ai_controller.blackboard[BB_GROUP_DATUM] = null + group_mobs -= listed + continue + listed.ai_controller.queue_behavior(queued_behavior) + in_progress_mobs |= listed + +/datum/group_planning/proc/decide_next_action() + if(length(in_progress_mobs)) + return /// we are still doing an action + if(!length(usable_behaviours)) + return //how did this happen + queued_behavior = pick(usable_behaviours) + fetched_behaviour = TRUE + +/datum/group_planning/proc/add_to_current_action(datum/ai_controller/controller) + controller.queue_behavior(queued_behavior) + in_progress_mobs |= controller.pawn + + +/datum/group_planning/proc/finish_action(datum/ai_controller/controller) + if(controller.pawn in in_progress_mobs) + in_progress_mobs -= controller.pawn + finished_mobs += controller.pawn + if(!length(in_progress_mobs)) + next_action = world.time + cooldown_time + fetched_behaviour = FALSE + finished_mobs = list() + +/datum/group_planning/fish + cooldown_time = 25 SECONDS + usable_behaviours = list(/datum/ai_behavior/step_towards_turf/group_movement) + +/datum/group_planning/fish/decide_next_action() + . = ..() + var/mob/living/basic/picked_mob = pick(group_mobs) + + var/list/turfs = view(7, picked_mob) + var/turf/picked + var/sanity = 25 + + while(!isopenturf(picked) && sanity > 0) + sanity-- + picked = get_turf(pick(turfs)) + target = picked diff --git a/tgstation.dme b/tgstation.dme index 287bc5821cff..c6849d09446e 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5976,6 +5976,12 @@ #include "monkestation\code\modules\ocean_content\hotspot_machines\dousing_rod.dm" #include "monkestation\code\modules\ocean_content\hotspot_machines\hotspot_vents.dm" #include "monkestation\code\modules\ocean_content\hotspot_machines\stomper.dm" +#include "monkestation\code\modules\ocean_content\mobs\fish_base.dm" +#include "monkestation\code\modules\ocean_content\mobs\group_planning.dm" +#include "monkestation\code\modules\ocean_content\mobs\ai\controller.dm" +#include "monkestation\code\modules\ocean_content\mobs\ai\behaviours\attempt_group_find.dm" +#include "monkestation\code\modules\ocean_content\mobs\ai\behaviours\group_move_towards.dm" +#include "monkestation\code\modules\ocean_content\mobs\ai\subtrees\simple_try_attach_group.dm" #include "monkestation\code\modules\outdoors\code\admin_commands.dm" #include "monkestation\code\modules\outdoors\code\misc_procs.dm" #include "monkestation\code\modules\outdoors\code\new_vars.dm" From 6ac3fd1bc8f17d4a5dbfc649b182c25c149edfb3 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Mon, 25 Sep 2023 19:01:05 -0400 Subject: [PATCH 53/59] tranqulity shuttle --- _maps/shuttles/emergency_tranquility.dmm | 348 ++++++++++++----------- 1 file changed, 187 insertions(+), 161 deletions(-) diff --git a/_maps/shuttles/emergency_tranquility.dmm b/_maps/shuttles/emergency_tranquility.dmm index 47fa0e006337..52f97d015c2f 100644 --- a/_maps/shuttles/emergency_tranquility.dmm +++ b/_maps/shuttles/emergency_tranquility.dmm @@ -10,10 +10,6 @@ /turf/open/floor/grass, /area/shuttle/escape) "aj" = ( -/obj/structure/railing/corner{ - dir = 8; - color = "#A47449" - }, /obj/effect/turf_decal/siding/wood/corner{ dir = 8 }, @@ -22,14 +18,26 @@ }, /turf/open/floor/grass, /area/shuttle/escape) -"aI" = ( +"ar" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, /obj/structure/railing{ - color = "#A47449"; - dir = 4 + dir = 8; + layer = 4.1 }, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/grass, +/area/shuttle/escape) +"aI" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/structure/railing{ + dir = 4 + }, /turf/open/water/jungle, /area/shuttle/escape) "ba" = ( @@ -95,10 +103,6 @@ /turf/open/floor/wood, /area/shuttle/escape) "bS" = ( -/obj/structure/railing{ - color = "#A47449"; - dir = 8 - }, /obj/effect/turf_decal/weather/dirt{ dir = 9 }, @@ -109,6 +113,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, +/obj/structure/railing{ + dir = 8 + }, /turf/open/water/jungle, /area/shuttle/escape) "ct" = ( @@ -324,10 +331,6 @@ /turf/open/floor/carpet/green, /area/shuttle/escape) "hk" = ( -/obj/structure/railing/corner{ - dir = 4; - color = "#A47449" - }, /obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, @@ -389,10 +392,6 @@ /turf/open/floor/stone, /area/shuttle/escape) "ij" = ( -/obj/structure/railing/corner{ - dir = 2; - color = "#A47449" - }, /obj/effect/turf_decal/siding/wood/corner, /obj/structure/chair/sofa/bamboo/left{ dir = 8 @@ -418,10 +417,6 @@ /turf/open/floor/iron/herringbone, /area/shuttle/escape) "iM" = ( -/obj/structure/railing/corner{ - dir = 1; - color = "#A47449" - }, /obj/effect/turf_decal/siding/wood/corner{ dir = 1 }, @@ -442,15 +437,16 @@ /turf/open/floor/stone, /area/shuttle/escape) "jl" = ( -/obj/structure/railing{ - color = "#A47449"; - dir = 10; - layer = 3.1 - }, /obj/structure/flora/bush/fullgrass/style_2, /obj/effect/turf_decal/siding/wood{ dir = 10 }, +/obj/structure/railing{ + dir = 5 + }, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/grass, /area/shuttle/escape) "jt" = ( @@ -504,22 +500,21 @@ /turf/open/floor/wood/parquet, /area/shuttle/escape) "jM" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/structure/flora/bush/style_4, /obj/structure/railing{ - color = "#A47449"; dir = 6; layer = 3.1 }, -/obj/effect/turf_decal/siding/wood{ - dir = 6 +/obj/structure/railing{ + dir = 4; + layer = 4.1 }, -/obj/structure/flora/bush/style_4, /turf/open/floor/grass, /area/shuttle/escape) "kh" = ( -/obj/structure/railing/corner{ - dir = 2; - color = "#A47449" - }, /obj/effect/turf_decal/siding/wood/corner, /turf/open/water/jungle, /area/shuttle/escape) @@ -527,15 +522,16 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/structure/railing{ - color = "#A47449"; - dir = 10; - layer = 3.1 - }, /obj/structure/flora/bush/fullgrass, /obj/effect/turf_decal/siding/wood{ dir = 10 }, +/obj/structure/railing{ + dir = 5 + }, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/grass, /area/shuttle/escape) "kn" = ( @@ -709,11 +705,6 @@ /turf/open/floor/wood/large, /area/shuttle/escape) "nA" = ( -/obj/structure/railing/corner{ - dir = 8; - color = "#A47449"; - layer = 3.1 - }, /obj/structure/flora/rock/pile/jungle/style_3{ pixel_x = -4 }, @@ -765,15 +756,18 @@ /turf/template_noop, /area/shuttle/escape) "oj" = ( -/obj/structure/railing{ - color = "#A47449"; - dir = 10; - layer = 3.1 - }, /obj/effect/turf_decal/siding/wood{ dir = 10 }, /obj/structure/flora/bush/style_3, +/obj/structure/railing{ + dir = 6; + layer = 3.1 + }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/grass, /area/shuttle/escape) "os" = ( @@ -794,10 +788,13 @@ dir = 10 }, /obj/structure/railing{ - color = "#A47449"; - dir = 10; + dir = 6; layer = 3.1 }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/grass, /area/shuttle/escape) "oy" = ( @@ -843,17 +840,20 @@ /turf/open/floor/plating, /area/shuttle/escape) "pf" = ( -/obj/structure/railing{ - color = "#A47449"; - dir = 6; - layer = 3.1 - }, /obj/effect/turf_decal/siding/wood{ dir = 6 }, /mob/living/basic/butterfly{ name = "Peacekeeper Henry" }, +/obj/structure/railing{ + dir = 6; + layer = 3.1 + }, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, /turf/open/floor/grass, /area/shuttle/escape) "pn" = ( @@ -868,6 +868,22 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plating, /area/shuttle/escape) +"pM" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/grass, +/area/shuttle/escape) "pN" = ( /obj/item/paper_bin{ pixel_x = -4 @@ -1056,10 +1072,6 @@ /turf/open/floor/wood/tile, /area/shuttle/escape) "sU" = ( -/obj/structure/railing/corner{ - dir = 1; - color = "#A47449" - }, /obj/effect/turf_decal/siding/wood/corner{ dir = 1 }, @@ -1088,13 +1100,16 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, /obj/structure/railing{ - color = "#A47449"; dir = 6; layer = 3.1 }, -/obj/effect/turf_decal/siding/wood{ - dir = 6 +/obj/structure/railing{ + dir = 4; + layer = 4.1 }, /turf/open/floor/grass, /area/shuttle/escape) @@ -1197,18 +1212,33 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "vB" = ( -/obj/structure/railing/corner{ - dir = 2; - color = "#A47449" - }, -/obj/structure/railing/corner{ +/obj/structure/railing{ dir = 8; - color = "#A47449" + layer = 4.1 + }, +/obj/structure/railing{ + dir = 4; + layer = 4.1 }, /turf/open/floor/iron/stairs{ dir = 1 }, /area/shuttle/escape) +"vG" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/grass, +/area/shuttle/escape) "vI" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 @@ -1216,13 +1246,15 @@ /turf/open/floor/iron/dark/small, /area/shuttle/escape) "vT" = ( -/obj/structure/railing{ - color = "#A47449"; - dir = 9 - }, /obj/effect/turf_decal/siding/wood{ dir = 9 }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/grass, /area/shuttle/escape) "vX" = ( @@ -1339,10 +1371,6 @@ /turf/open/floor/grass, /area/shuttle/escape) "yF" = ( -/obj/structure/railing/corner{ - dir = 1; - color = "#A47449" - }, /obj/structure/flora/bush/fullgrass, /obj/structure/flora/bush/flowers_yw, /obj/effect/turf_decal/siding/wood/corner{ @@ -1355,11 +1383,6 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/structure/railing{ - color = "#A47449"; - dir = 6; - layer = 3.1 - }, /obj/effect/turf_decal/weather/dirt{ dir = 5 }, @@ -1369,6 +1392,12 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, +/obj/structure/railing{ + dir = 5 + }, +/obj/structure/railing{ + dir = 4 + }, /turf/open/water/jungle, /area/shuttle/escape) "yV" = ( @@ -1429,15 +1458,22 @@ }, /turf/open/floor/carpet/red, /area/shuttle/escape) -"zI" = ( -/obj/structure/railing/corner{ - dir = 4; - color = "#A47449" +"zC" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5 }, -/obj/structure/railing/corner{ - dir = 1; - color = "#A47449" +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 }, +/turf/open/floor/grass, +/area/shuttle/escape) +"zI" = ( /turf/open/floor/iron/stairs, /area/shuttle/escape) "zX" = ( @@ -1497,7 +1533,6 @@ /turf/open/floor/wood/tile, /area/shuttle/escape) "Bn" = ( -/obj/structure/railing/corner, /obj/effect/turf_decal/siding/wood/corner, /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/large, @@ -1513,11 +1548,6 @@ /turf/open/floor/stone, /area/shuttle/escape) "By" = ( -/obj/structure/railing/corner{ - dir = 8; - color = "#A47449"; - layer = 3.1 - }, /obj/structure/flora/bush/large/style_2{ pixel_x = -6; pixel_y = -16 @@ -1553,14 +1583,15 @@ /turf/open/floor/wood/large, /area/shuttle/escape) "Ci" = ( -/obj/structure/railing{ - color = "#A47449"; - dir = 6; - layer = 3.1 - }, /obj/effect/turf_decal/siding/wood{ dir = 6 }, +/obj/structure/railing{ + dir = 5 + }, +/obj/structure/railing{ + dir = 4 + }, /turf/open/water/jungle, /area/shuttle/escape) "Cw" = ( @@ -1593,6 +1624,19 @@ /obj/structure/chair/comfy/shuttle, /turf/open/floor/carpet/royalblue, /area/shuttle/escape) +"Dv" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/grass, +/area/shuttle/escape) "DC" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -1641,10 +1685,6 @@ /turf/open/floor/grass, /area/shuttle/escape) "EH" = ( -/obj/structure/railing/corner{ - dir = 4; - color = "#A47449" - }, /obj/structure/flora/bush/flowers_br{ pixel_x = -3; pixel_y = -2 @@ -1683,10 +1723,6 @@ /turf/open/floor/sepia, /area/shuttle/escape) "Fg" = ( -/obj/structure/railing/corner{ - dir = 4; - color = "#A47449" - }, /obj/effect/turf_decal/weather/dirt{ dir = 5 }, @@ -1872,21 +1908,19 @@ /turf/open/floor/stone, /area/shuttle/escape) "HL" = ( -/obj/structure/railing/corner{ - dir = 2; - color = "#A47449" - }, /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/grass, /area/shuttle/escape) "HS" = ( -/obj/structure/railing{ - color = "#A47449"; - dir = 5 - }, /obj/effect/turf_decal/siding/wood{ dir = 5 }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/grass, /area/shuttle/escape) "Ih" = ( @@ -1937,10 +1971,6 @@ /turf/open/floor/wood, /area/shuttle/escape) "IV" = ( -/obj/structure/railing/corner{ - dir = 8; - color = "#A47449" - }, /obj/effect/turf_decal/siding/wood/corner{ dir = 8 }, @@ -1960,10 +1990,6 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "Jp" = ( -/obj/structure/railing/corner{ - dir = 4; - color = "#A47449" - }, /obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, @@ -2067,13 +2093,12 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/structure/flora/bush/flowers_pp, +/obj/structure/flora/bush/flowers_pp/style_2, /obj/structure/railing{ - color = "#A47449"; dir = 4; - layer = 3.2 + layer = 4.1 }, -/obj/structure/flora/bush/flowers_pp, -/obj/structure/flora/bush/flowers_pp/style_2, /turf/open/floor/grass, /area/shuttle/escape) "KK" = ( @@ -2102,13 +2127,16 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/structure/railing{ - color = "#A47449"; - dir = 5 - }, /obj/effect/turf_decal/siding/wood{ dir = 5 }, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/grass, /area/shuttle/escape) "LD" = ( @@ -2165,9 +2193,8 @@ }, /obj/structure/flora/bush/fullgrass/style_random, /obj/structure/railing{ - color = "#A47449"; dir = 8; - layer = 3.2 + layer = 4.1 }, /turf/open/floor/grass, /area/shuttle/escape) @@ -2218,13 +2245,16 @@ /turf/open/floor/grass, /area/shuttle/escape) "Oj" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, /obj/structure/railing{ - color = "#A47449"; - dir = 10; + dir = 6; layer = 3.1 }, -/obj/effect/turf_decal/siding/wood{ - dir = 10 +/obj/structure/railing{ + dir = 8; + layer = 4.1 }, /turf/open/floor/grass, /area/shuttle/escape) @@ -2356,10 +2386,6 @@ /turf/open/floor/iron/dark/small, /area/shuttle/escape) "RG" = ( -/obj/structure/railing/corner{ - dir = 2; - color = "#A47449" - }, /obj/structure/flora/bush/reed/style_2{ pixel_y = 21; pixel_x = -1 @@ -2558,13 +2584,15 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/structure/railing{ - color = "#A47449"; - dir = 9 - }, /obj/effect/turf_decal/siding/wood{ dir = 9 }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/grass, /area/shuttle/escape) "VF" = ( @@ -2622,23 +2650,21 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/structure/railing{ - color = "#A47449"; - dir = 5 - }, /obj/effect/turf_decal/siding/wood{ dir = 5 }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, /turf/open/misc/dirt/jungle/dark, /area/shuttle/escape) "Wo" = ( /turf/closed/wall/mineral/titanium, /area/shuttle/escape) "Wx" = ( -/obj/structure/railing/corner{ - dir = 1; - color = "#A47449" - }, /obj/effect/turf_decal/siding/wood/corner{ dir = 1 }, @@ -3125,7 +3151,7 @@ oB Bs qw ni -UU +pM ow os IR @@ -3149,7 +3175,7 @@ sW NC ux zo -vT +ar iM aj oj @@ -3182,7 +3208,7 @@ Oj Zh Sa nE -vT +vG yF ag ag @@ -3232,7 +3258,7 @@ pf Zh AF nE -HS +zC EH QK bB @@ -3249,7 +3275,7 @@ UF pe ux AN -HS +Dv hk ij jM From 7655f3f8a2a45c715bbfbe0e115e53bc56662109 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Mon, 25 Sep 2023 21:49:26 -0400 Subject: [PATCH 54/59] fesh --- .../map_files/Deltastation/DeltaStation2.dmm | 135 +++++++++--------- .../code/modules/liquids/ocean_biomes.dm | 16 +-- .../modules/ocean_content/mobs/fish_base.dm | 15 ++ 3 files changed, 88 insertions(+), 78 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 56683ab5eea3..3ee0c049aefa 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -2267,14 +2267,11 @@ name = "SapMaster XP" }, /obj/effect/turf_decal/bot, -/obj/structure/railing{ - dir = 10; - layer = 3.1 - }, /obj/structure/railing{ dir = 4; layer = 4.1 }, +/obj/structure/railing, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "azi" = ( @@ -9754,10 +9751,7 @@ dir = 8; layer = 4.1 }, -/obj/structure/railing{ - dir = 6; - layer = 3.1 - }, +/obj/structure/railing, /turf/open/misc/grass, /area/station/hallway/primary/fore) "cmq" = ( @@ -21119,6 +21113,10 @@ /obj/machinery/status_display/ai/directional/south, /obj/structure/chair/stool/directional/east, /obj/machinery/light/directional/south, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron/dark, /area/station/service/theater) "fdG" = ( @@ -31111,14 +31109,11 @@ }, /obj/machinery/disposal/bin, /obj/effect/turf_decal/stripes/box, -/obj/structure/railing{ - dir = 10; - layer = 3.1 - }, /obj/structure/railing{ dir = 8; layer = 4.1 }, +/obj/structure/railing, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "hAN" = ( @@ -36073,6 +36068,14 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/white, /area/station/medical/medbay) +"iNu" = ( +/obj/structure/chair/stool/directional/east, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/turf/open/floor/iron/dark, +/area/station/service/theater) "iNA" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -36844,6 +36847,16 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/engineering/atmos) +"iYP" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/stool/directional/east, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/turf/open/floor/iron/dark, +/area/station/service/theater) "iYS" = ( /obj/structure/cable, /obj/machinery/light/small/directional/east, @@ -44228,6 +44241,17 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +"kKA" = ( +/obj/structure/chair/stool/directional/east, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/turf/open/floor/iron/dark, +/area/station/service/theater) "kKK" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/stripes/line{ @@ -50009,10 +50033,7 @@ /obj/structure/flora/bush/grassy/style_random, /obj/structure/flora/rock/pile/jungle/style_random, /obj/machinery/light/floor/has_bulb, -/obj/structure/railing{ - dir = 6; - layer = 3.1 - }, +/obj/structure/railing, /turf/open/misc/grass, /area/station/hallway/primary/fore) "mhl" = ( @@ -56624,19 +56645,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/engineering/atmos) -"nNc" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) "nNq" = ( /obj/machinery/button/door/directional/east{ id = "Dorm5"; @@ -68032,19 +68040,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"qFe" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) "qFj" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -69290,6 +69285,10 @@ /obj/effect/landmark/start/hangover, /obj/effect/decal/cleanable/dirt, /obj/structure/chair/stool/directional/east, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron/dark, /area/station/service/theater) "qTB" = ( @@ -70188,14 +70187,11 @@ "rhK" = ( /obj/structure/flora/bush/stalky/style_random, /obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/railing{ - dir = 6; - layer = 3.1 - }, /obj/structure/railing{ dir = 4; layer = 4.1 }, +/obj/structure/railing, /turf/open/misc/grass, /area/station/hallway/primary/fore) "rhN" = ( @@ -71189,14 +71185,11 @@ "rtT" = ( /obj/structure/flora/bush/flowers_yw/style_random, /obj/structure/flora/bush/sparsegrass/style_random, -/obj/structure/railing{ - dir = 6; - layer = 3.1 - }, /obj/structure/railing{ dir = 4; layer = 4.1 }, +/obj/structure/railing, /turf/open/misc/grass, /area/station/hallway/primary/fore) "rua" = ( @@ -84983,9 +84976,6 @@ /area/station/service/library/artgallery) "uNg" = ( /obj/item/kirbyplants/random, -/obj/structure/railing{ - dir = 9 - }, /obj/machinery/light/floor/has_bulb, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 @@ -90075,6 +90065,10 @@ /obj/structure/railing{ dir = 1 }, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "vZq" = ( @@ -91952,6 +91946,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/landmark/start/hangover, /obj/structure/chair/stool/directional/east, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, /turf/open/floor/iron/dark, /area/station/service/theater) "wtv" = ( @@ -94349,14 +94347,11 @@ /obj/structure/flora/bush/flowers_br/style_random, /obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/flora/bush/grassy/style_random, -/obj/structure/railing{ - dir = 6; - layer = 3.1 - }, /obj/structure/railing{ dir = 8; layer = 4.1 }, +/obj/structure/railing, /turf/open/misc/grass, /area/station/hallway/primary/fore) "xav" = ( @@ -133872,15 +133867,15 @@ msF suj iCu iCu -nNc -nNc -nNc -nNc iCu -nNc -nNc -nNc -qFe +iCu +iCu +iCu +iCu +iCu +iCu +iCu +owu rPh fxu kQK @@ -134129,13 +134124,13 @@ fbU cwV fRo fRo -khN +kKA wtg -jwb -dxk +iYP +iNu qGm -dxk -dxk +iNu +iNu qTA fdA vnU diff --git a/monkestation/code/modules/liquids/ocean_biomes.dm b/monkestation/code/modules/liquids/ocean_biomes.dm index de9f17e039f0..e759372152e1 100644 --- a/monkestation/code/modules/liquids/ocean_biomes.dm +++ b/monkestation/code/modules/liquids/ocean_biomes.dm @@ -7,15 +7,15 @@ turf_type = /turf/open/floor/plating/ocean/dark flora_types = list(/obj/effect/spawner/ocean_curio, /obj/structure/flora/rock/pile, /obj/structure/flora/ocean/glowweed, /obj/structure/flora/ocean/seaweed, /obj/structure/flora/ocean/longseaweed, /obj/structure/flora/ocean/coral) flora_density = 25 - fauna_density = 0.03 - fauna_types = list(/mob/living/basic/carp) + fauna_density = 0.1 + fauna_types = list(/mob/living/basic/aquatic/fish, /mob/living/basic/aquatic/fish/gupper, /mob/living/basic/aquatic/fish/cod) /datum/biome/ocean_redsand turf_type = /turf/open/floor/plating/ocean/dark/ironsand flora_types = list(/obj/effect/spawner/ocean_curio, /obj/structure/flora/rock/pile, /obj/structure/flora/ocean/glowweed, /obj/structure/flora/ocean/seaweed, /obj/structure/flora/ocean/longseaweed, /obj/structure/flora/ocean/coral) flora_density = 40 - fauna_density = 0.06 - fauna_types = list(/mob/living/basic/carp) + fauna_density = 0.1 + fauna_types = list(/mob/living/basic/aquatic/fish, /mob/living/basic/aquatic/fish/gupper, /mob/living/basic/aquatic/fish/cod) /datum/biome/ocean_rocklight turf_type = /turf/open/floor/plating/ocean/dark/rock @@ -47,15 +47,15 @@ turf_type = /turf/open/floor/plating/ocean flora_types = list(/obj/effect/spawner/ocean_curio, /obj/structure/flora/rock/pile, /obj/structure/flora/ocean/glowweed, /obj/structure/flora/ocean/seaweed, /obj/structure/flora/ocean/longseaweed, /obj/structure/flora/ocean/coral) flora_density = 25 - fauna_density = 0.03 - fauna_types = list(/mob/living/basic/carp) + fauna_density = 1.5 + fauna_types = list(/mob/living/basic/aquatic/fish, /mob/living/basic/aquatic/fish/gupper, /mob/living/basic/aquatic/fish/cod) /datum/biome/ocean_redsand/above turf_type = /turf/open/floor/plating/ocean/ironsand flora_types = list(/obj/effect/spawner/ocean_curio, /obj/structure/flora/rock/pile, /obj/structure/flora/ocean/glowweed, /obj/structure/flora/ocean/seaweed, /obj/structure/flora/ocean/longseaweed, /obj/structure/flora/ocean/coral) flora_density = 40 - fauna_density = 0.06 - fauna_types = list(/mob/living/basic/carp) + fauna_density = 1.5 + fauna_types = list(/mob/living/basic/aquatic/fish, /mob/living/basic/aquatic/fish/gupper, /mob/living/basic/aquatic/fish/cod) /datum/biome/ocean_rocklight/above turf_type = /turf/open/floor/plating/ocean/rock diff --git a/monkestation/code/modules/ocean_content/mobs/fish_base.dm b/monkestation/code/modules/ocean_content/mobs/fish_base.dm index d592a19bd47b..5c6636ea9458 100644 --- a/monkestation/code/modules/ocean_content/mobs/fish_base.dm +++ b/monkestation/code/modules/ocean_content/mobs/fish_base.dm @@ -1,4 +1,6 @@ /mob/living/basic/aquatic/fish + name = "Fish" + desc = "Found in the ocean." icon = 'monkestation/code/modules/ocean_content/icons/fish.dmi' icon_state = "fish" icon_living = "fish" @@ -16,3 +18,16 @@ ai_controller = /datum/ai_controller/basic_controller/fish +/mob/living/basic/aquatic/fish/cod + name = "Cod" + icon_state = "cod" + icon_living = "cod" + icon_dead = "cod_dead" + icon_gib = "cod_dead" + +/mob/living/basic/aquatic/fish/gupper + name = "Gupper" + icon_state = "gupper" + icon_living = "gupper" + icon_dead = "gupper_dead" + icon_gib = "gupper_dead" From 93af49abedafe2aa23e47a14e341550e37e724ca Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Mon, 25 Sep 2023 22:01:50 -0400 Subject: [PATCH 55/59] Update DeltaStation2.dmm --- _maps/map_files/Deltastation/DeltaStation2.dmm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 3ee0c049aefa..3b9beee06e03 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -3935,14 +3935,14 @@ /obj/item/toy/plush/space_lizard_plushie{ name = "Meets-the-Ore" }, -/obj/structure/railing{ - dir = 9; - layer = 3.1 - }, /obj/structure/railing{ dir = 8; layer = 4.1 }, +/obj/structure/railing{ + dir = 10; + layer = 3.1 + }, /turf/open/space/basic, /area/space/nearstation) "aVo" = ( @@ -56117,7 +56117,7 @@ "nHf" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ - dir = 9; + dir = 10; layer = 3.1 }, /turf/open/space/basic, @@ -98535,11 +98535,11 @@ /obj/structure/lattice/catwalk, /obj/structure/closet/crate, /obj/structure/railing{ - dir = 9; - layer = 3.1 + dir = 4 }, /obj/structure/railing{ - dir = 4 + dir = 10; + layer = 3.1 }, /turf/open/space/basic, /area/space/nearstation) From e21f655ede75ef4fdf6a818001b8478be49ec9c1 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Mon, 25 Sep 2023 23:02:13 -0400 Subject: [PATCH 56/59] Update hair.dmi --- .../icons/mob/sprite_accessories/hair.dmi | Bin 12121 -> 12102 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/monkestation/icons/mob/sprite_accessories/hair.dmi b/monkestation/icons/mob/sprite_accessories/hair.dmi index 10a508c4d9b8678a01730808613059f02181fa99..f00f89c0aebe76306916953dbab22a16708db417 100644 GIT binary patch delta 8964 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 delta 9045 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 From cb6de76e6d0729f19a9b74c09989a6087e70d361 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Mon, 25 Sep 2023 23:46:13 -0400 Subject: [PATCH 57/59] should fix cleanse and exposure lag --- monkestation/code/modules/liquids/liquid_controller.dm | 2 ++ monkestation/code/modules/liquids/liquid_groups.dm | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/monkestation/code/modules/liquids/liquid_controller.dm b/monkestation/code/modules/liquids/liquid_controller.dm index d2693e7b7194..acdb58359679 100644 --- a/monkestation/code/modules/liquids/liquid_controller.dm +++ b/monkestation/code/modules/liquids/liquid_controller.dm @@ -48,6 +48,7 @@ SUBSYSTEM_DEF(liquids) var/datum/liquid_group/LG = g while(!MC_TICK_CHECK && length(LG.splitting_array)) // three at a time until we either finish or over-run, this should be done before anything else LG.work_on_split_queue() + LG.cleanse_members() if(!length(temperature_queue)) for(var/g in active_groups) @@ -74,6 +75,7 @@ SUBSYSTEM_DEF(liquids) for(var/tur in LG.members) var/turf/listed_turf = tur evaporation_queue |= listed_turf + run_type = SSLIQUIDS_RUN_TYPE_TEMPERATURE if(run_type == SSLIQUIDS_RUN_TYPE_TEMPERATURE) diff --git a/monkestation/code/modules/liquids/liquid_groups.dm b/monkestation/code/modules/liquids/liquid_groups.dm index 6b3b2f8e56ab..0ced5908313f 100644 --- a/monkestation/code/modules/liquids/liquid_groups.dm +++ b/monkestation/code/modules/liquids/liquid_groups.dm @@ -177,7 +177,6 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE) if(group_temperature != reagents.chem_temp) reagents.chem_temp = group_temperature - cleanse_members() handle_visual_changes() reagents.my_atom = pick(members) /// change the location of explosions and sounds every group process @@ -246,7 +245,7 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE) if(pulled_reagent.type in turf_reagents.previous_reagent_list) turf_reagents.remove_all_type(pulled_reagent.type, 100000) turf_reagents.add_reagent(pulled_reagent.type, amount) - if(pulled_reagent.turf_exposure) + if(pulled_reagent.turf_exposure && amount > 10) exposure = TRUE From 757cb2c8c84ec8ecf107b0dde1619b0ef48b5cf6 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Mon, 25 Sep 2023 23:55:56 -0400 Subject: [PATCH 58/59] oshan blocked --- code/modules/events/_event.dm | 4 ++++ code/modules/events/anomaly/_anomaly.dm | 2 +- code/modules/events/anomaly/anomaly_flux.dm | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/events/_event.dm b/code/modules/events/_event.dm index 00ef65180b05..a5a7b699bea4 100644 --- a/code/modules/events/_event.dm +++ b/code/modules/events/_event.dm @@ -143,6 +143,8 @@ Runs the event */ UnregisterSignal(SSdcs, COMSIG_GLOB_RANDOM_EVENT) var/datum/round_event/round_event = new typepath(TRUE, src) + if(round_event.oshan_blocked && SSmapping.config.map_name == "Oshan Station") + return if(admin_forced && length(admin_setup)) //not part of the signal because it's conditional and relies on usr heavily for(var/datum/event_admin_setup/admin_setup_datum in admin_setup) @@ -201,6 +203,8 @@ Runs the event var/fakeable = TRUE /// Whether a admin wants this event to be cancelled var/cancel_event = FALSE + ///canceled on oshan + var/oshan_blocked = FALSE //Called first before processing. //Allows you to setup your event, such as randomly diff --git a/code/modules/events/anomaly/_anomaly.dm b/code/modules/events/anomaly/_anomaly.dm index 9ca70817c0ff..13fedcde2768 100644 --- a/code/modules/events/anomaly/_anomaly.dm +++ b/code/modules/events/anomaly/_anomaly.dm @@ -52,4 +52,4 @@ /datum/event_admin_setup/set_location/anomaly/apply_to_event(datum/round_event/anomaly/event) event.spawn_location = chosen_turf - + diff --git a/code/modules/events/anomaly/anomaly_flux.dm b/code/modules/events/anomaly/anomaly_flux.dm index 41481a9ef1a9..18d84d749bf5 100644 --- a/code/modules/events/anomaly/anomaly_flux.dm +++ b/code/modules/events/anomaly/anomaly_flux.dm @@ -13,6 +13,7 @@ start_when = ANOMALY_START_DANGEROUS_TIME announce_when = ANOMALY_ANNOUNCE_DANGEROUS_TIME anomaly_path = /obj/effect/anomaly/flux + oshan_blocked = TRUE /datum/round_event/anomaly/anomaly_flux/announce(fake) priority_announce("Hyper-energetic flux wave detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT]. [impact_area.name].", "Anomaly Alert") From eae7e63b01549c34fc9510fb3910cf652f594cd8 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Tue, 26 Sep 2023 01:26:19 -0400 Subject: [PATCH 59/59] removes egg --- .../code/modules/ghost_players/job_helpers/organ_printer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monkestation/code/modules/ghost_players/job_helpers/organ_printer.dm b/monkestation/code/modules/ghost_players/job_helpers/organ_printer.dm index 14f64e809fd2..814622797ce3 100644 --- a/monkestation/code/modules/ghost_players/job_helpers/organ_printer.dm +++ b/monkestation/code/modules/ghost_players/job_helpers/organ_printer.dm @@ -13,7 +13,7 @@ /obj/structure/organ_creator/attack_hand(mob/living/user, list/modifiers) . = ..() - var/list/all_internals = subtypesof(/obj/item/organ/internal) - typesof(/obj/item/organ/internal/zombie_infection) - typesof(/obj/item/organ/internal/alien) + var/list/all_internals = subtypesof(/obj/item/organ/internal) - typesof(/obj/item/organ/internal/zombie_infection) - typesof(/obj/item/organ/internal/alien) - typesof(/obj/item/organ/internal/body_egg) var/list/all_externals = subtypesof(/obj/item/organ/external) var/list/all_bodyparts = subtypesof(/obj/item/bodypart)