From 5a1bd08d69514e54de0c6f66be5d0e5da2c1ec91 Mon Sep 17 00:00:00 2001 From: Mnemeory <227217321+Mnemeory@users.noreply.github.com> Date: Sun, 19 Oct 2025 04:19:06 -0600 Subject: [PATCH] Bar Remodel; Control Hub; and Idris Smart Switch (#21437) This PR does the following: 1. Creates a control hub variant to eliminate the need for using multiple buttons (mostly so the bar wouldn't have like 5 of them, and i could make it prettier, but it's extendable for other button types/locations). 2. Creates a light switch variant which controls the color and brightness of the lights in the area it's placed in. 3. Creatures a secure safe variant which relies on an ID, instead of an access code. 4. Remodels the Bar ###IMAGES/VIDEO
**Control Hub/Idris Smart Switch** https://github.com/user-attachments/assets/8b16698a-df50-444e-8428-d85ac07ddbbf
Bar Remodel (Final as of Oct. 17, 2025) finalbar1 finalbar2 finalbar3 finalbar4 finalbar5 finalbar6 finalbar7 finalbar8
--- aurorastation.dme | 1 + code/game/machinery/controlhub.dm | 259 +++ code/game/machinery/lightswitch.dm | 152 ++ code/game/machinery/vending/booze.dm | 3 + .../objects/items/weapons/storage/secure.dm | 34 + code/game/objects/structures/curtains.dm | 14 + code/game/objects/structures/urban.dm | 4 + code/modules/multiz/structures.dm | 3 + html/changelogs/mneme-barstuff.yml | 11 + maps/sccv_horizon/sccv_horizon.dmm | 1728 +++++++++-------- 10 files changed, 1375 insertions(+), 834 deletions(-) create mode 100644 code/game/machinery/controlhub.dm create mode 100644 html/changelogs/mneme-barstuff.yml diff --git a/aurorastation.dme b/aurorastation.dme index 335d1b05d60..87d086782fe 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -936,6 +936,7 @@ #include "code\game\machinery\chem_heater.dm" #include "code\game\machinery\cloning.dm" #include "code\game\machinery\constructable_frame.dm" +#include "code\game\machinery\controlhub.dm" #include "code\game\machinery\crusher_piston.dm" #include "code\game\machinery\cryo.dm" #include "code\game\machinery\cryopod.dm" diff --git a/code/game/machinery/controlhub.dm b/code/game/machinery/controlhub.dm new file mode 100644 index 00000000000..b011fbc1620 --- /dev/null +++ b/code/game/machinery/controlhub.dm @@ -0,0 +1,259 @@ +ABSTRACT_TYPE(/obj/machinery/controlhub) +/obj/machinery/controlhub + name = "control hub" + desc = "A control interface that can manage multiple systems from a single point." + icon = 'icons/obj/modular_telescreen.dmi' + anchored = TRUE + density = FALSE + opacity = FALSE + idle_power_usage = 10 + active_power_usage = 50 + power_channel = AREA_USAGE_ENVIRON + + /// associative list of control configurations. key is control name, value is list("type", "id", optional "functions") + var/list/controls + + /// maximum range in tiles for finding machinery to control + var/range = 16 + + /// associative list tracking toggle states for controls. key is control name, value is boolean + var/list/control_states + + /// stores the initial icon_state set by subtype + var/initial_icon_state + +/* + * INITIALIZATION & POWER + */ + +/obj/machinery/controlhub/Initialize() + . = ..() + control_states = list() + initial_icon_state = icon_state + update_icon() + +/obj/machinery/controlhub/update_icon() + ClearOverlays() + + if(stat & BROKEN) + icon_state = "broken" + else if(stat & NOPOWER) + icon_state = "standby" + else + icon_state = initial_icon_state + +/obj/machinery/controlhub/power_change() + ..() + update_icon() + +/* + * INTERACTION + */ + +/obj/machinery/controlhub/attack_hand(mob/user) + if(..()) + return TRUE + + if(stat & BROKEN) + to_chat(user, SPAN_WARNING("\The [src]'s screen is shattered!")) + return TRUE + + if(stat & NOPOWER) + to_chat(user, SPAN_WARNING("\The [src] is not responding.")) + return TRUE + + if(!allowed(user)) + to_chat(user, SPAN_WARNING("Access denied.")) + return TRUE + + if(!length(controls)) + to_chat(user, SPAN_WARNING("\The [src] has no configured controls.")) + return TRUE + + var/list/choices = list() + for(var/control_name in controls) + var/list/control_data = controls[control_name] + + var/button_type + switch(control_data["type"]) + if("holosign", "windowtint") + button_type = /obj/machinery/button/switch + if("blast_door") + button_type = /obj/machinery/button/remote/blast_door + if("airlock") + button_type = /obj/machinery/button/remote/airlock + if("flasher", "igniter", "emitter", "mass_driver") + button_type = /obj/machinery/button + + choices[control_name] = image(icon = initial(button_type:icon), icon_state = initial(button_type:icon_state)) + + var/chosen_control = show_radial_menu(user, src, choices, require_near = !issilicon(user), radius = 42, tooltips = TRUE) + if(!chosen_control || stat & (BROKEN|NOPOWER)) + return TRUE + + use_power_oneoff(active_power_usage) + playsound(src, 'sound/machines/holoclick.ogg', 100, FALSE) + flick(initial_icon_state, src) + + var/list/control_data = controls[chosen_control] + if(!control_data) + return TRUE + + if(!issilicon(user)) + user.visible_message(SPAN_NOTICE("\The [user] presses the [chosen_control] button.")) + + activate_control(chosen_control, control_data) + + return TRUE + +/obj/machinery/controlhub/proc/activate_control(control_name, list/control_data) + var/control_id = control_data["id"] + + switch(control_data["type"]) + if("windowtint") + toggle_windowtint(control_id) + if("holosign") + toggle_holosign(control_id) + if("blast_door") + toggle_blast_doors(control_id) + if("airlock") + toggle_airlock(control_name, control_id, control_data["functions"]) + if("flasher") + trigger_flasher(control_id) + if("igniter") + trigger_igniter(control_id) + if("emitter") + trigger_emitter(control_id) + if("mass_driver") + trigger_mass_driver(control_id) + +/* + * MACHINERY FINDING HELPERS + */ + +/obj/machinery/controlhub/proc/find_machinery_by_id(machinery_type, target_id) + . = list() + + for(var/obj/machinery/machinery as anything in SSmachinery.machinery) + if(istype(machinery, machinery_type) && machinery:id == target_id) + . += machinery + +/obj/machinery/controlhub/proc/find_airlocks_by_id(target_id) + . = list() + + for(var/obj/machinery/door/airlock/airlock as anything in SSmachinery.machinery) + if(airlock.id_tag == target_id) + . += airlock + +/* + * CONTROL FUNCTIONS + */ + +/// toggles the tint on all polarized windows with matching ID within range +/obj/machinery/controlhub/proc/toggle_windowtint(window_id) + for(var/obj/structure/window/window in range(src, range)) + if((istype(window, /obj/structure/window/reinforced/polarized) || istype(window, /obj/structure/window/full/reinforced/polarized)) && (window:id == window_id || !window:id)) + window:toggle() + +/obj/machinery/controlhub/proc/toggle_holosign(holosign_id) + for(var/obj/machinery/holosign/holosign in find_machinery_by_id(/obj/machinery/holosign, holosign_id)) + INVOKE_ASYNC(holosign, TYPE_PROC_REF(/obj/machinery/holosign, toggle)) + +/// toggles blast doors with matching ID based on first door's state +/obj/machinery/controlhub/proc/toggle_blast_doors(door_id) + var/open_doors + + for(var/obj/machinery/door/blast/door in find_machinery_by_id(/obj/machinery/door/blast, door_id)) + if(isnull(open_doors)) + open_doors = door.density + + if(open_doors) + door.open() + else + door.close() + +/// controls airlocks with matching ID. special_functions bitflags: 1=open/close, 2=ID scan, 4=bolt, 8=electrify, 16=safeties +/obj/machinery/controlhub/proc/toggle_airlock(control_name, airlock_id, special_functions = 1) + if(isnull(control_states[control_name])) + control_states[control_name] = FALSE + + control_states[control_name] = !control_states[control_name] + + for(var/obj/machinery/door/airlock/airlock in SSmachinery.machinery) + if(airlock.id_tag != airlock_id) + continue + + if(special_functions & 1) + if(airlock.density) + airlock.open() + else + airlock.close() + return + + if(control_states[control_name]) + if(special_functions & 2) + airlock.set_idscan(FALSE) + if(special_functions & 4) + airlock.lock() + if(special_functions & 8) + airlock.electrify(-1) + if(special_functions & 16) + airlock.set_safeties(FALSE) + else + if(special_functions & 2) + airlock.set_idscan(TRUE) + if(special_functions & 4) + airlock.unlock() + if(special_functions & 8) + airlock.electrify(0) + if(special_functions & 16) + airlock.set_safeties(TRUE) + +/obj/machinery/controlhub/proc/trigger_flasher(flasher_id) + for(var/obj/machinery/flasher/flasher in find_machinery_by_id(/obj/machinery/flasher, flasher_id)) + flasher.flash() + +/obj/machinery/controlhub/proc/trigger_igniter(igniter_id) + for(var/obj/machinery/sparker/sparker in find_machinery_by_id(/obj/machinery/sparker, igniter_id)) + INVOKE_ASYNC(sparker, TYPE_PROC_REF(/obj/machinery/sparker, ignite)) + + for(var/obj/machinery/igniter/igniter in find_machinery_by_id(/obj/machinery/igniter, igniter_id)) + igniter.ignite() + +/obj/machinery/controlhub/proc/trigger_emitter(emitter_id) + for(var/obj/machinery/power/emitter/emitter in find_machinery_by_id(/obj/machinery/power/emitter, emitter_id)) + emitter.activate() + +/// opens blast door, triggers mass driver, then closes blast door +/obj/machinery/controlhub/proc/trigger_mass_driver(driver_id) + var/list/obj/machinery/door/blast/blast_doors = list() + + for(var/obj/machinery/door/blast/door in find_machinery_by_id(/obj/machinery/door/blast, driver_id)) + blast_doors += door + INVOKE_ASYNC(door, TYPE_PROC_REF(/obj/machinery/door/blast, open)) + + sleep(2 SECONDS) + + for(var/obj/machinery/mass_driver/driver in find_machinery_by_id(/obj/machinery/mass_driver, driver_id)) + driver.drive() + + sleep(5 SECONDS) + + for(var/obj/machinery/door/blast/door in blast_doors) + INVOKE_ASYNC(door, TYPE_PROC_REF(/obj/machinery/door/blast, close)) + +/* + * SUBTYPES + */ + +/obj/machinery/controlhub/bar + name = "bar control hub" + icon_state = "holocontrol" + req_access = list(ACCESS_BAR) + controls = list( + "counter shutters" = list("type" = "blast_door", "id" = "bar_shutter"), + "holosign" = list("type" = "holosign", "id" = "bar"), + "maintenance shutters" = list("type" = "blast_door", "id" = "bar_maint"), + "safety shutters" = list("type" = "blast_door", "id" = "bar_viewing_shutters"), + "window tint" = list("type" = "windowtint", "id" = "bar_fore") + ) diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 741ac4a3d5b..2287b195f79 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -84,3 +84,155 @@ return power_change() + +/obj/machinery/light_switch/idris + name = "idris smart switch" + desc = "A smart lightswitch designed by Idris Incorporated for entertainment venues, this one has additional controls for adjusting the color and brightness of the room's lighting." + var/current_light_color = LIGHT_COLOR_HALOGEN + var/current_brightness = 1.0 + var/static/list/color_options = list( + "Standard" = LIGHT_COLOR_HALOGEN, + "Red" = LIGHT_COLOR_RED, + "Green" = LIGHT_COLOR_GREEN, + "Blue" = LIGHT_COLOR_BLUE, + "Magenta" = LIGHT_COLOR_VIOLET + ) + +/obj/machinery/light_switch/idris/Initialize() + . = ..() + if(!area.lightswitch) + on = TRUE + area.lightswitch = TRUE + +/obj/machinery/light_switch/idris/attack_hand(mob/user) + if(stat & NOPOWER) + to_chat(user, SPAN_WARNING("\The [src] is not responding.")) + return + + var/choice = show_control_menu(user) + if(!choice) + return + + handle_menu_choice(user, choice) + +// displays the radial control menu for the smart switch +/obj/machinery/light_switch/idris/proc/show_control_menu(mob/user) + var/list/choices = list() + + var/image/power_toggle = image('icons/obj/machinery/button.dmi', null, "light[on ? 0 : 1]") + choices[on ? "Turn Off" : "Turn On"] = power_toggle + + for(var/color_name in color_options) + var/image/color_icon = image('icons/obj/machinery/light.dmi', null, "lbulb") + color_icon.color = color_options[color_name] + choices[color_name] = color_icon + + var/image/custom_color = image('icons/obj/machinery/light.dmi', null, "lbulb") + custom_color.color = "#ff5e00" + choices["Custom Color"] = custom_color + + var/image/brightness_icon = image('icons/obj/machinery/light.dmi', null, "lbulb") + brightness_icon.color = current_light_color + brightness_icon.alpha = 128 + choices["Brightness"] = brightness_icon + + return show_radial_menu(user, src, choices, uniqueid = "lightswitch_[REF(src)]", radius = 42, require_near = !issilicon(user), tooltips = TRUE) + +/obj/machinery/light_switch/idris/proc/handle_menu_choice(mob/user, choice) + if(choice == "Turn Off" || choice == "Turn On") + handle_power_toggle() + return + + if(choice == "Brightness") + handle_brightness_adjustment(user) + return + + if(choice == "Custom Color") + handle_custom_color(user) + return + + handle_preset_color(choice) + +/obj/machinery/light_switch/idris/proc/handle_power_toggle() + playsound(src, /singleton/sound_category/switch_sound, 30) + on = !on + sync_lights() + intent_message(BUTTON_FLICK, 5) + +//brightness adjustment +/obj/machinery/light_switch/idris/proc/handle_brightness_adjustment(mob/user) + var/display_value = convert_brightness_to_display(current_brightness) + var/input = input(user, "Enter brightness (0-100%):", "Brightness", display_value) as num|null + if(isnull(input)) + return + + current_brightness = convert_display_to_brightness(input) + apply_lighting_changes() + + +// custom color selection +/obj/machinery/light_switch/idris/proc/handle_custom_color(mob/user) + var/new_color = input(user, "Choose light color:", "Custom Light Color", current_light_color) as color|null + if(!new_color) + return + + current_light_color = sanitize_hexcolor(new_color, current_light_color) + apply_lighting_changes() + + +// preset color selection +/obj/machinery/light_switch/idris/proc/handle_preset_color(color_name) + current_light_color = color_options[color_name] + apply_lighting_changes() + +// applies current color and brightness settings to all lights in the area +/obj/machinery/light_switch/idris/proc/apply_lighting_changes() + if(!area) + return + + if(!on) + on = TRUE + + var/list/saved_switchcounts = list() + for(var/obj/machinery/light/light in area) + saved_switchcounts[light] = light.switchcount + + sync_lights() + + for(var/obj/machinery/light/light in area) + apply_light_modifications(light) + if(light in saved_switchcounts) + light.switchcount = saved_switchcounts[light] + +// applies color and brightness modifications +/obj/machinery/light_switch/idris/proc/apply_light_modifications(obj/machinery/light/light) + if(!light.brightness_range || !light.brightness_power) + return + + if(light.emergency_mode) + light.emergency_mode = FALSE + light.no_emergency = TRUE + + light.brightness_color = current_light_color + light.default_color = current_light_color + + var/power_multiplier = current_brightness ** 2.2 + var/range_multiplier = sqrt(current_brightness) + + light.brightness_power = initial(light.brightness_power) * power_multiplier + light.brightness_range = initial(light.brightness_range) * range_multiplier + + if(light.supports_nightmode && light.nightmode) + light.set_light(light.night_brightness_range, light.night_brightness_power, light.brightness_color) + else + light.set_light(light.brightness_range, light.brightness_power, light.brightness_color) + + light.update_icon() + +// converts internal brightness value (0.8-1.0) to display value (0-100) +/obj/machinery/light_switch/idris/proc/convert_brightness_to_display(brightness) + return ((brightness - 0.8) / 0.2) * 100 + +// converts display value (0-100) to internal brightness value (0.8-1.0) +/obj/machinery/light_switch/idris/proc/convert_display_to_brightness(display_value) + return 0.8 + (clamp(display_value, 0, 100) / 100) * 0.2 diff --git a/code/game/machinery/vending/booze.dm b/code/game/machinery/vending/booze.dm index c2a56791755..6ac39818023 100644 --- a/code/game/machinery/vending/booze.dm +++ b/code/game/machinery/vending/booze.dm @@ -190,3 +190,6 @@ /obj/item/reagent_containers/food/drinks/carton/cranberryjuice = 1, /obj/item/reagent_containers/food/drinks/ice = 9 ) + +/obj/machinery/vending/boozeomat/bar + layer = BELOW_TABLE_LAYER diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index 135058e2fc4..7555ab6125a 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -196,3 +196,37 @@ ABSTRACT_TYPE(/obj/item/storage/secure) ..() //new /obj/item/storage/lockbox/clusterbang(src) This item is currently broken... and probably shouldnt exist to begin with (even though it's cool) */ + +// ----------------------------- +// ID-Access Secure Safe +// ----------------------------- + +/obj/item/storage/secure/safe/id_lock + name = "ID-locked safe" + desc = "A secure safe with an ID card scanner instead of a combination lock." + +/obj/item/storage/secure/safe/id_lock/attackby(obj/item/attacking_item, mob/user) + if(istype(attacking_item, /obj/item/card/id)) + if(!allowed(user)) + to_chat(user, SPAN_WARNING("Access denied.")) + return + if(locked) + playsound(src, 'sound/machines/boop1.ogg', 30, 1) + to_chat(user, SPAN_NOTICE("\The [src] beeps and unlocks.")) + locked = 0 + ClearOverlays() + AddOverlays(icon_opened) + else + playsound(src, 'sound/machines/boop2.ogg', 30, 1) + to_chat(user, SPAN_NOTICE("\The [src] beeps and locks.")) + locked = 1 + ClearOverlays() + close(user) + return + return ..() + +/obj/item/storage/secure/safe/id_lock/attack_self(mob/user) + if(!locked) + open(user) + else + to_chat(user, SPAN_WARNING("\The [src] is locked. Swipe an authorized ID card to unlock it.")) diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm index 900d53fd2b1..70084f04b32 100644 --- a/code/game/objects/structures/curtains.dm +++ b/code/game/objects/structures/curtains.dm @@ -108,3 +108,17 @@ /obj/structure/curtain/open/shower/security color = "#AA0000" + +/obj/structure/curtain/open/bar + name = "curtain" + color = "#792f27" + icon_state = "open" + +/obj/structure/curtain/open/bar/toggle() + src.set_opacity(!src.opacity) + if(opacity) + icon_state = "closed" + layer = ABOVE_ABOVE_HUMAN_LAYER + else + icon_state = "open" + layer = ABOVE_ABOVE_HUMAN_LAYER diff --git a/code/game/objects/structures/urban.dm b/code/game/objects/structures/urban.dm index 0dea75c10da..59fa21ca9c7 100644 --- a/code/game/objects/structures/urban.dm +++ b/code/game/objects/structures/urban.dm @@ -457,6 +457,10 @@ ABSTRACT_TYPE(/obj/structure/stairs/urban/road_ramp) return FALSE return TRUE +/obj/structure/rod_railing/bar + layer = ABOVE_ABOVE_HUMAN_LAYER + + /obj/structure/dam name = "concrete dam" desc = "A hulking mass of concrete meant to hold in a large reservoir of water from passing downwards." diff --git a/code/modules/multiz/structures.dm b/code/modules/multiz/structures.dm index abeab64a4f3..4b311579bc9 100644 --- a/code/modules/multiz/structures.dm +++ b/code/modules/multiz/structures.dm @@ -506,6 +506,9 @@ /obj/structure/platform/cutout/CanPass() return TRUE +/obj/structure/platform/bar + layer = ABOVE_HUMAN_LAYER + /// No special CanPass for this one. /obj/structure/platform_deco name = "platform" diff --git a/html/changelogs/mneme-barstuff.yml b/html/changelogs/mneme-barstuff.yml new file mode 100644 index 00000000000..3bbe290de2c --- /dev/null +++ b/html/changelogs/mneme-barstuff.yml @@ -0,0 +1,11 @@ + +author: Mneme + +delete-after: True + +changes: + - rscadd: "Created a control hub system that allows for the control of multiple different types of buttons from one location." + - rscadd: "Created a light switch variant that can control the color and brightness of the lighting." + - rscadd: "Created a new secure safe variant that is controlled with an ID card." + - qol: "Remodeled the Bar" + - qol: "Connected the Deck Two Stairwell and the Bar via maintenance." diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index 6577635e9ba..dcca56b93b7 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -239,6 +239,13 @@ /obj/structure/grille, /turf/simulated/floor/plating, /area/horizon/engineering/atmos/propulsion) +"abB" = ( +/obj/structure/bed/stool/chair/padded/brown, +/obj/effect/landmark/start{ + name = "Passenger" + }, +/turf/simulated/floor/carpet/art, +/area/horizon/crew/lounge) "abC" = ( /obj/item/device/healthanalyzer, /obj/effect/floor_decal/corner/mauve/diagonal, @@ -1367,14 +1374,14 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, /obj/structure/disposalpipe/sortjunction{ dir = 1; name = "Bar"; sortType = "Bar" }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, /turf/simulated/floor/wood, /area/horizon/service/bar) "ahU" = ( @@ -2307,13 +2314,11 @@ /turf/simulated/floor/tiled, /area/horizon/rnd/xenobiology/xenoflora) "anN" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille/diagonal{ - dir = 4 +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 1 }, -/obj/structure/window/shuttle/scc_space_ship, -/turf/simulated/floor/reinforced, -/area/horizon/crew/lounge) +/turf/simulated/floor/wood, +/area/horizon/service/bar) "anW" = ( /obj/effect/floor_decal/corner/dark_green{ dir = 6 @@ -4593,6 +4598,10 @@ /obj/structure/platform{ dir = 4 }, +/obj/machinery/holosign/service{ + id = "bar"; + pixel_x = -32 + }, /turf/simulated/floor/wood, /area/horizon/service/dining_hall) "aFp" = ( @@ -4683,12 +4692,13 @@ /turf/simulated/open/airless, /area/horizon/exterior) "aGn" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_service{ - dir = 1; - name = "Bar Lounge" +/obj/effect/floor_decal/spline/plain{ + dir = 8 }, -/turf/simulated/floor/tiled/full, +/obj/structure/sign/flag/nanotrasen{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "aGq" = ( /obj/machinery/vending/cigarette{ @@ -5230,6 +5240,16 @@ /turf/simulated/floor/tiled/full, /area/horizon/security/brig) "aJJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/starboard) "aJL" = ( @@ -5758,14 +5778,12 @@ /turf/simulated/floor/tiled/dark, /area/horizon/security/evidence_storage) "aNt" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/small/south, +/obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/device/radio/intercom/north, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "aNz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -6727,24 +6745,25 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/obj/structure/table/stone/marble, -/obj/item/reagent_containers/food/drinks/shaker{ - pixel_x = 8; - pixel_y = 4 +/obj/structure/platform_deco/dark{ + dir = 6 }, -/obj/item/reagent_containers/glass/rag, -/obj/machinery/power/outlet, -/obj/machinery/door/blast/shutters{ - id = "bar_shutter"; - name = "Bar Shutter" +/obj/structure/platform_deco/ledge/dark{ + dir = 6 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 8 + }, +/obj/structure/rod_railing/bar{ + dir = 6 + }, +/obj/structure/platform/bar{ + dir = 1 + }, +/obj/machinery/vending/overloaders, +/turf/simulated/floor/plating, /area/horizon/service/bar) "aUI" = ( /obj/machinery/iv_drip, @@ -8376,7 +8395,7 @@ "bgH" = ( /obj/item/device/radio/intercom/west, /obj/effect/floor_decal/industrial/outline/grey, -/obj/machinery/vending/overloaders, +/obj/machinery/vending/mredispenser/low_supply, /turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_2/fore) "bgI" = ( @@ -10235,9 +10254,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/light/small/emergency{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, @@ -10253,8 +10269,13 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/machinery/holosign/service{ + id = "bar"; + pixel_x = 32; + pixel_y = -9 + }, /turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/service/starboard) +/area/horizon/service/bar) "btg" = ( /obj/item/storage/secure/safe{ pixel_y = -20 @@ -10898,16 +10919,9 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/horizon/engineering/bluespace_drive) "byG" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/obj/random/pottedplant{ - pixel_y = 6 - }, -/obj/structure/platform{ - dir = 1 - }, -/turf/simulated/floor/wood, +/obj/structure/flora/pottedplant/fortune_flower, +/obj/machinery/light, +/turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "byJ" = ( /obj/machinery/door/blast/odin{ @@ -12713,30 +12727,20 @@ }, /area/centcom/holding) "bNm" = ( -/obj/machinery/door/firedoor, -/obj/structure/table/stone/marble, -/obj/machinery/chemical_dispenser/coffeemaster/full{ - pixel_y = 16 +/obj/structure/platform_stairs/full{ + dir = 1 }, -/obj/item/reagent_containers/glass/bottle/syrup/caramel{ - pixel_x = -15; - pixel_y = 4 +/obj/machinery/light/floor, +/obj/machinery/door/window/southright{ + name = "Bar Access"; + req_access = list(25) }, -/obj/item/reagent_containers/glass/bottle/syrup/chocolate{ - pixel_x = -7; - pixel_y = 4 +/obj/effect/floor_decal/spline/plain{ + dir = 4 }, -/obj/item/reagent_containers/glass/bottle/syrup/pumpkin{ - pixel_x = 1; - pixel_y = 4 - }, -/obj/item/reagent_containers/glass/bottle/syrup/vanilla{ - pixel_x = 9; - pixel_y = 4 - }, -/obj/machinery/door/blast/shutters{ - id = "bar_shutter"; - name = "Bar Shutter" +/obj/machinery/camera/network/service{ + c_tag = "Service - Deck 2 - Bar Maintenance"; + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) @@ -12997,9 +13001,6 @@ dir = 8 }, /obj/structure/window/shuttle/scc_space_ship, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "bPi" = ( @@ -14065,11 +14066,13 @@ name = "sink"; pixel_x = 19 }, -/obj/machinery/button/switch/holosign{ - id = 3; - dir = 10; - pixel_x = 9; - pixel_y = 30 +/obj/machinery/light_switch/idris{ + dir = 1; + pixel_y = 28; + pixel_x = 10 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 }, /turf/simulated/floor/wood, /area/horizon/service/bar) @@ -15649,11 +15652,13 @@ /turf/simulated/floor/tiled/dark, /area/horizon/hangar/auxiliary) "cji" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/structure/bed/stool/bar/padded/green{ + dir = 8 }, -/obj/machinery/light/floor, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/spline/fancy/wood/cee{ + dir = 4 + }, +/turf/simulated/floor/wood/mahogany, /area/horizon/service/bar) "cjp" = ( /obj/effect/floor_decal/corner/yellow/full, @@ -15832,24 +15837,20 @@ }, /area/centcom/specops) "ckN" = ( -/obj/effect/floor_decal/corner/dark_green, -/turf/simulated/floor/tiled, -/area/horizon/hallway/primary/deck_3/starboard) -"ckQ" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 9 - }, -/obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/door/airlock/maintenance_hatch{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/horizon/hallway/primary/deck_3/starboard) +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_1/hangar/starboard) +"ckQ" = ( +/obj/structure/bed/stool/chair/padded/brown{ + dir = 4 + }, +/turf/simulated/floor/carpet/art, +/area/horizon/crew/lounge) "clb" = ( /obj/machinery/light/small{ dir = 8 @@ -16562,15 +16563,14 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/research) "cqM" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 - }, /obj/machinery/light/small{ dir = 1 }, -/obj/structure/table/wood, -/obj/machinery/power/outlet, -/turf/simulated/floor/wood, +/obj/machinery/computer/slot_machine, +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 1 + }, +/turf/simulated/floor/carpet/green, /area/horizon/service/bar) "cqO" = ( /obj/effect/floor_decal/corner/yellow/full{ @@ -17219,13 +17219,6 @@ /obj/machinery/atmospherics/pipe/manifold/visible/black, /turf/simulated/floor/tiled/dark, /area/horizon/engineering/atmos/propulsion) -"cuN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/hologram/holopad, -/turf/simulated/floor/wood, -/area/horizon/crew/lounge) "cuO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -20929,14 +20922,6 @@ }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/starboard) -"cVg" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 10 - }, -/obj/machinery/alarm/south, -/obj/machinery/light, -/turf/simulated/floor/tiled, -/area/horizon/hallway/primary/deck_3/starboard) "cVl" = ( /obj/machinery/door/airlock/centcom{ name = "Arrival Hangar Maintenance"; @@ -21807,7 +21792,6 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/mercenary) "dbx" = ( -/obj/random/pottedplant, /obj/structure/platform{ dir = 4 }, @@ -22570,9 +22554,6 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/mercenary) "dhg" = ( -/obj/effect/floor_decal/corner/grey{ - dir = 9 - }, /obj/structure/cable/green{ icon_state = "1-4" }, @@ -22580,7 +22561,9 @@ dir = 4; pixel_x = -19 }, -/obj/machinery/firealarm/west, +/obj/effect/floor_decal/corner/grey{ + dir = 9 + }, /turf/simulated/floor/lino, /area/horizon/service/bar) "dhh" = ( @@ -22796,6 +22779,8 @@ /obj/machinery/light/small/emergency{ dir = 8 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor, /area/horizon/maintenance/deck_3/bridge) "dhW" = ( @@ -23832,11 +23817,14 @@ /turf/simulated/floor/tiled/freezer, /area/shuttle/skipjack) "doP" = ( -/obj/machinery/light, /obj/effect/floor_decal/spline/plain{ dir = 10 }, -/obj/machinery/computer/slot_machine, +/obj/machinery/light/floor{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/firefighting_closet, +/obj/structure/closet/firecloset/full, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "doU" = ( @@ -25574,7 +25562,8 @@ /turf/simulated/floor/holofloor/wood, /area/horizon/holodeck/source_sauna) "dAC" = ( -/turf/simulated/wall, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/bridge) "dAD" = ( /obj/machinery/telecomms/processor/preset_four, @@ -25626,13 +25615,20 @@ }, /area/centcom/legion) "dAV" = ( -/obj/effect/floor_decal/corner/dark_green/diagonal, -/obj/structure/window/reinforced{ - dir = 1; - pixel_y = -14 +/obj/effect/floor_decal/corner/dark_green{ + dir = 9 + }, +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/horizon/hallway/primary/deck_3/starboard) +/area/horizon/crew/lounge) "dAW" = ( /obj/machinery/conveyor{ id = "Robocompo" @@ -26937,8 +26933,11 @@ /turf/unsimulated/floor, /area/antag/mercenary) "dIZ" = ( -/obj/effect/floor_decal/spline/fancy/wood/corner, -/turf/simulated/floor/wood, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/service/bar) "dJd" = ( /obj/structure/window/shuttle/scc_space_ship, @@ -29158,10 +29157,14 @@ /turf/simulated/floor/reinforced, /area/shuttle/hapt) "ear" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/spline/plain{ dir = 8 }, -/turf/simulated/floor/wood, +/obj/structure/closet/emcloset/communal{ + name = "emergency closet" + }, +/obj/effect/floor_decal/industrial/outline/emergency_closet, +/turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "eat" = ( /obj/structure/table/stone/marble, @@ -30382,15 +30385,13 @@ /turf/simulated/floor/holofloor/tiled, /area/horizon/holodeck/source_emptycourt) "ehC" = ( -/obj/machinery/atm{ - dir = 1; - pixel_y = 28 +/obj/effect/floor_decal/corner/dark_green{ + dir = 10 }, -/obj/structure/bed/stool/bar/padded/red{ - dir = 4 - }, -/turf/simulated/floor/lino, -/area/horizon/service/bar) +/obj/machinery/alarm/south, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/horizon/hallway/primary/deck_3/starboard) "ehM" = ( /obj/random/pottedplant, /turf/simulated/floor/holofloor/lino, @@ -31432,17 +31433,20 @@ /turf/simulated/floor/holofloor/tiled/dark, /area/horizon/holodeck/source_boxingcourt) "eqx" = ( +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ - dir = 4; + dir = 1; icon_state = "pipe-c" }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 +/obj/structure/rod_railing/bar{ + dir = 10 }, -/obj/structure/bed/stool/bar/padded/red{ - dir = 4 +/obj/structure/platform/bar{ + dir = 1 }, -/turf/simulated/floor/wood, +/obj/machinery/vending/zora, +/turf/simulated/floor/plating, /area/horizon/service/bar) "eqy" = ( /obj/structure/bed/stool/chair/office/dark{ @@ -32073,8 +32077,9 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/machinery/light{ - dir = 8 +/obj/machinery/light/floor{ + dir = 8; + pixel_y = 16 }, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) @@ -33465,23 +33470,6 @@ }, /turf/unsimulated/floor, /area/centcom/holding) -"eGr" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 10 - }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/engineer_maintenance/electric{ - dir = 4 - }, -/obj/structure/engineer_maintenance/pipe, -/obj/machinery/power/apc/critical/south, -/turf/simulated/floor/tiled, -/area/horizon/stairwell/starboard/deck_2) "eGt" = ( /turf/simulated/floor/shuttle/black, /area/centcom/specops) @@ -33546,9 +33534,6 @@ /turf/simulated/floor/carpet/rubber, /area/horizon/rnd/xenoarch/spectrometry) "eGN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -33968,17 +33953,18 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/machinery/firealarm/west, +/obj/machinery/status_display{ + pixel_x = -32 + }, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "eKS" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/machinery/camera/network/service{ - c_tag = "Service - Deck 2 - Bar Back Counter" - }, -/turf/simulated/floor/wood, +/obj/machinery/computer/arcade, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, /area/horizon/service/bar) "eKW" = ( /obj/effect/floor_decal/corner/white/diagonal, @@ -35865,13 +35851,11 @@ /turf/simulated/floor/tiled, /area/horizon/stairwell/port/deck_2) "eZN" = ( +/obj/structure/bed/stool/bar/padded/green, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 + dir = 5 }, -/obj/structure/platform{ - dir = 1 - }, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/mahogany, /area/horizon/service/bar) "eZO" = ( /obj/item/modular_computer/console/preset/security/investigations, @@ -36044,19 +36028,17 @@ "faY" = ( /obj/structure/table/stone/marble, /obj/machinery/door/firedoor, -/obj/item/glass_jar{ - desc = "A small empty jar that is mostly used for giving a tip."; - name = "tip jar"; - pixel_x = 2; - pixel_y = 18 - }, /obj/machinery/door/blast/shutters{ dir = 2; id = "bar_shutter"; name = "Bar Shutter" }, /obj/machinery/power/outlet, -/turf/simulated/floor/tiled/dark, +/obj/item/storage/box/fancy/cigarettes/cigar{ + pixel_x = -5; + pixel_y = 4 + }, +/turf/simulated/floor/lino, /area/horizon/service/bar) "fbe" = ( /obj/effect/decal/cleanable/dirt, @@ -37121,16 +37103,14 @@ /area/horizon/maintenance/deck_2/aft) "fjc" = ( /obj/machinery/door/firedoor, -/obj/machinery/light{ - dir = 1 - }, /obj/structure/table/stone/marble, /obj/machinery/door/blast/shutters{ dir = 8; id = "bar_shutter"; name = "Bar Shutter" }, -/turf/simulated/floor/tiled/dark, +/obj/item/material/ashtray/bronze, +/turf/simulated/floor/lino, /area/horizon/service/bar) "fjf" = ( /obj/structure/table/reinforced/steel, @@ -37156,9 +37136,22 @@ /turf/simulated/floor/tiled/dark/full, /area/shuttle/mercenary) "fji" = ( -/obj/machinery/light/floor, -/turf/simulated/floor/tiled/dark, -/area/horizon/service/bar) +/obj/effect/floor_decal/corner/dark_green{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/engineer_maintenance/electric{ + dir = 4 + }, +/obj/structure/engineer_maintenance/pipe, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/critical/south, +/turf/simulated/floor/tiled, +/area/horizon/stairwell/starboard/deck_2) "fjk" = ( /turf/simulated/wall, /area/horizon/maintenance/deck_2/wing/starboard/far) @@ -37217,7 +37210,7 @@ icon_state = "1-4" }, /turf/simulated/floor/tiled, -/area/horizon/hallway/primary/deck_3/starboard) +/area/horizon/crew/lounge) "fjL" = ( /obj/structure/railing/mapped{ dir = 4 @@ -37356,7 +37349,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/horizon/hallway/primary/deck_3/starboard) +/area/horizon/crew/lounge) "fkM" = ( /obj/structure/bed/stool/chair/folding{ dir = 4 @@ -37476,7 +37469,6 @@ /obj/structure/platform{ dir = 1 }, -/obj/machinery/light, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "flu" = ( @@ -38270,7 +38262,7 @@ /obj/effect/floor_decal/corner/dark_green/diagonal, /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/tiled, -/area/horizon/hallway/primary/deck_3/starboard) +/area/horizon/crew/lounge) "fre" = ( /obj/structure/table/reinforced/steel, /obj/machinery/door/firedoor, @@ -39434,11 +39426,12 @@ }, /area/shuttle/legion) "fAq" = ( -/obj/effect/floor_decal/spline/plain{ +/obj/structure/casino/roulette, +/obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 1 }, -/obj/item/device/megaphone/stagemicrophone, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/spline/fancy/wood/corner, +/turf/simulated/floor/carpet/green, /area/horizon/service/bar) "fAw" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -41656,21 +41649,6 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/unsimulated/floor, /area/centcom/control) -"fRe" = ( -/obj/machinery/light/small/emergency{ - dir = 1 - }, -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 4; - pixel_x = -20 - }, -/obj/effect/map_effect/marker/airlock{ - frequency = 1002; - master_tag = "airlock_horizon_deck_3_fore_starboard_1"; - name = "airlock_horizon_deck_3_fore_starboard_1" - }, -/turf/simulated/floor, -/area/horizon/maintenance/deck_3/bridge) "fRg" = ( /obj/structure/cable{ icon_state = "4-8" @@ -41717,10 +41695,6 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/rnd/xenobiology/xenoflora) "fRs" = ( -/obj/structure/curtain/black{ - icon_state = "open"; - opacity = 0 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -43124,11 +43098,14 @@ /turf/simulated/floor/wood, /area/horizon/rnd/hallway) "gaW" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/effect/floor_decal/spline/fancy/wood/cee, +/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/railing/mapped{ + dir = 8 }, -/turf/simulated/floor/wood, -/area/horizon/crew/lounge) +/obj/structure/window/reinforced, +/turf/simulated/floor/grass/no_edge, +/area/horizon/hallway/primary/deck_3/starboard) "gbd" = ( /obj/effect/floor_decal/spline/plain, /turf/unsimulated/floor, @@ -45403,16 +45380,20 @@ /turf/unsimulated/floor, /area/antag/raider) "grO" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/structure/table/stone/marble, -/obj/machinery/door/blast/shutters{ - id = "bar_shutter"; - name = "Bar Shutter" +/obj/structure/rod_railing/bar, +/obj/structure/platform/bar{ + dir = 1 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/flora/pottedplant/fortune_flower, +/turf/simulated/floor/plating, /area/horizon/service/bar) "grP" = ( /obj/effect/floor_decal/corner/brown{ @@ -45928,6 +45909,9 @@ /obj/structure/noticeboard{ pixel_y = 30 }, +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/service/bar) "gvX" = ( @@ -46416,7 +46400,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/horizon/hallway/primary/deck_3/starboard) +/area/horizon/crew/lounge) "gzF" = ( /obj/structure/bed/stool/chair/plastic{ dir = 8 @@ -46849,9 +46833,6 @@ dir = 8 }, /obj/structure/window/shuttle/scc_space_ship, -/obj/effect/floor_decal/spline/fancy/wood/cee{ - dir = 4 - }, /turf/simulated/floor/wood, /area/horizon/service/bar) "gCQ" = ( @@ -47362,9 +47343,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/railing/mapped{ - dir = 1 - }, /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/starboard) @@ -47878,10 +47856,9 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/button/switch/windowtint{ - pixel_y = -2; - dir = 10; - id = "bar_fore" +/obj/machinery/controlhub/bar{ + pixel_y = -10; + pixel_x = -3 }, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) @@ -48935,20 +48912,25 @@ /area/centcom/spawning) "gRO" = ( /obj/structure/closet/cabinet, -/obj/item/clothing/suit/carp_costume, -/obj/item/clothing/suit/lobster_costume, -/obj/item/clothing/suit/jester_costume, -/obj/item/clothing/suit/roman_costume, -/obj/item/clothing/suit/snowman_costume, -/obj/item/clothing/suit/sumo_costume, +/obj/random/arcade/orion, +/obj/random/arcade/orion, +/obj/random/arcade/orion, /obj/item/clothing/suit/bee_costume, +/obj/item/clothing/suit/bunny_costume, +/obj/item/clothing/suit/carp_costume, +/obj/item/clothing/suit/cheap_ghost_costume, +/obj/item/clothing/suit/lobster_costume, +/obj/item/clothing/suit/owl_costume, +/obj/item/clothing/suit/skeleton_costume, +/obj/item/clothing/suit/sumo_costume, +/obj/item/clothing/suit/sumo_costume, /obj/random/arcade, /obj/random/arcade, /obj/random/arcade, -/obj/structure/platform{ - dir = 1 - }, -/turf/simulated/floor/wood, +/obj/item/clothing/head/jester_hat, +/obj/item/clothing/suit/jester_costume, +/obj/machinery/light, +/turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "gRQ" = ( /obj/structure/window/reinforced/crescent{ @@ -49275,8 +49257,17 @@ dir = 8 }, /obj/structure/closet/crate/drinks, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 + }, +/obj/effect/floor_decal/corner/grey/full{ + dir = 8 + }, +/obj/structure/engineer_maintenance/electric{ + dir = 1 + }, /obj/effect/floor_decal/industrial/outline/service, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/lino, /area/horizon/service/bar) "gUr" = ( /obj/structure/sign/emergency/exit{ @@ -49863,8 +49854,8 @@ /obj/structure/table/wood, /obj/item/storage/box/fancy/cigarettes, /obj/machinery/power/outlet{ - pixel_y = 4; - pixel_x = 9 + pixel_y = 8; + pixel_x = 8 }, /turf/simulated/floor/carpet/art, /area/horizon/crew/lounge) @@ -49962,6 +49953,9 @@ pixel_x = 6; pixel_y = 20 }, +/obj/effect/floor_decal/corner/grey/full{ + dir = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/service/bar) "gYT" = ( @@ -50146,6 +50140,8 @@ /obj/effect/decal/cleanable/dirt, /obj/random/junk, /obj/machinery/atmospherics/pipe/manifold4w/hidden, +/obj/effect/floor_decal/industrial/warning/corner, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/horizon/maintenance/deck_3/bridge) "gZF" = ( @@ -51641,10 +51637,6 @@ /area/horizon/rnd/xenobiology) "hlC" = ( /obj/structure/table/stone/marble, -/obj/item/material/ashtray/bronze{ - pixel_x = 8; - pixel_y = -8 - }, /obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ dir = 8; @@ -51652,7 +51644,7 @@ name = "Bar Shutter" }, /obj/machinery/power/outlet, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/lino, /area/horizon/service/bar) "hlD" = ( /obj/structure/bed/stool/chair/shuttle{ @@ -52442,7 +52434,10 @@ /turf/simulated/open, /area/horizon/maintenance/deck_2/wing/port/far) "hqv" = ( -/obj/machinery/alarm/south, +/obj/effect/floor_decal/spline/plain, +/obj/machinery/media/jukebox/audioconsole/wall{ + pixel_y = -32 + }, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "hqx" = ( @@ -53425,14 +53420,6 @@ /turf/simulated/floor/tiled, /area/horizon/service/hydroponics/garden) "hwQ" = ( -/obj/machinery/button/remote/blast_door{ - dir = 4; - id = "bar_shutter"; - name = "Desk Shutters"; - pixel_x = 19; - pixel_y = 30; - req_access = list(25) - }, /turf/simulated/floor/lino, /area/horizon/service/bar) "hwS" = ( @@ -53637,14 +53624,17 @@ /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/port/far) "hys" = ( +/obj/machinery/vending/cigarette, /obj/structure/railing/mapped{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 6 + dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/extinguisher, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/starboard) "hyF" = ( @@ -54656,6 +54646,8 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/hallway/fore) "hFS" = ( +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor, /area/horizon/maintenance/deck_3/bridge) "hFU" = ( @@ -55061,12 +55053,15 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/reactor/supermatter/mainchamber) "hIq" = ( -/obj/machinery/media/jukebox/audioconsole/wall{ +/obj/effect/floor_decal/spline/plain, +/obj/machinery/atm{ + pixel_y = -6 + }, +/obj/structure/sign/flag/scc{ pixel_y = -32 }, -/obj/machinery/camera/network/service{ - c_tag = "Service - Deck 2 - Bar Starboard"; - dir = 1 +/obj/structure/sign/flag/idris{ + pixel_y = -32 }, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) @@ -56696,10 +56691,14 @@ /turf/simulated/floor/lino, /area/merchant_station) "hUO" = ( -/obj/structure/platform_stairs/south_north_solo{ - dir = 1 +/obj/effect/floor_decal/spline/plain{ + dir = 8 }, -/turf/simulated/floor/wood, +/obj/machinery/camera/network/service{ + c_tag = "Service - Deck 2 - Bar Port"; + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "hUR" = ( /obj/machinery/door/window/northright{ @@ -56780,18 +56779,14 @@ /area/horizon/command/heads/xo) "hWe" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/door/airlock/external, -/obj/machinery/access_button{ - dir = 1; - pixel_x = -28; - pixel_y = 12 +/obj/structure/railing/mapped{ + dir = 4 }, -/obj/effect/map_effect/marker/airlock{ - frequency = 1002; - master_tag = "airlock_horizon_deck_3_fore_starboard_1"; - name = "airlock_horizon_deck_3_fore_starboard_1" +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, -/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor, /area/horizon/maintenance/deck_3/bridge) "hWi" = ( @@ -56861,7 +56856,7 @@ /area/horizon/maintenance/deck_1/operations/starboard) "hXh" = ( /turf/simulated/floor/beach/water/alt, -/area/horizon/hallway/primary/deck_3/starboard) +/area/horizon/crew/lounge) "hXn" = ( /obj/effect/floor_decal/industrial/warning{ dir = 10 @@ -57184,15 +57179,7 @@ /turf/simulated/floor/exoplanet/grass/grove, /area/centcom/shared_dream) "ian" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/dark_green{ - dir = 10 - }, +/obj/effect/floor_decal/corner/dark_green, /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/starboard) "iat" = ( @@ -57803,6 +57790,11 @@ /obj/machinery/firealarm/south, /turf/simulated/floor/tiled, /area/horizon/operations/warehouse) +"ieu" = ( +/obj/effect/floor_decal/spline/plain, +/obj/structure/extinguisher_cabinet/south, +/turf/simulated/floor/tiled/dark, +/area/horizon/service/bar) "iev" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, @@ -57981,6 +57973,10 @@ "ifD" = ( /obj/random/junk, /obj/machinery/atmospherics/pipe/simple/visible/universal, +/obj/machinery/door/airlock/maintenance_hatch{ + dir = 1; + req_one_access = list(12) + }, /turf/simulated/floor, /area/horizon/maintenance/deck_3/bridge) "ifJ" = ( @@ -59087,14 +59083,11 @@ }, /area/centcom/legion/hangar5) "inP" = ( -/obj/effect/floor_decal/spline/fancy/wood/cee, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/grass/no_edge, -/area/horizon/hallway/primary/deck_3/starboard) +/obj/machinery/door/firedoor/multi_tile, +/obj/structure/curtain/open/bar, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/service/bar) "inS" = ( /obj/structure/closet{ name = "contraband" @@ -59388,10 +59381,20 @@ /turf/simulated/wall/r_wall, /area/horizon/engineering/atmos) "ipz" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/sunnybush, -/turf/simulated/floor/grass/no_edge, -/area/horizon/crew/lounge) +/obj/machinery/door/firedoor, +/obj/structure/table/stone/marble, +/obj/machinery/power/outlet, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "bar_shutter"; + name = "Bar Shutter" + }, +/obj/item/glass_jar{ + desc = "A small empty jar that is mostly used for giving a tip."; + name = "tip jar" + }, +/turf/simulated/floor/lino, +/area/horizon/service/bar) "ipB" = ( /obj/effect/floor_decal/corner/dark_green/full, /turf/simulated/floor/tiled, @@ -60395,11 +60398,16 @@ /turf/simulated/floor/plating, /area/horizon/hangar/intrepid) "iwK" = ( -/obj/machinery/vending/cigarette, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/wood, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/corner/dark_green{ + dir = 10 + }, +/turf/simulated/floor/tiled, /area/horizon/crew/lounge) "iwN" = ( /obj/machinery/light{ @@ -60432,6 +60440,10 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/camera/network/third_deck{ + c_tag = "Third Deck - Crew Lounge Port"; + dir = 8 + }, /turf/simulated/floor/wood, /area/horizon/crew/lounge) "ixi" = ( @@ -60581,7 +60593,7 @@ name = "Bar Shutter" }, /obj/machinery/power/outlet, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/lino, /area/horizon/service/bar) "iyb" = ( /obj/effect/shuttle_landmark/horizon/dock/deck_3/starboard_1{ @@ -60661,9 +60673,11 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/effect/floor_decal/spline/fancy/wood, -/obj/structure/bed/stool/bar/padded/red, -/turf/simulated/floor/wood, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/service/bar) "iyL" = ( /obj/effect/spider/stickyweb, @@ -60755,6 +60769,10 @@ /area/horizon/service/chapel/main) "izo" = ( /obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/horizon/maintenance/deck_3/bridge) "izr" = ( @@ -61375,11 +61393,28 @@ /turf/simulated/wall, /area/horizon/engineering/reactor/indra/office) "iDS" = ( -/obj/structure/bed/stool/chair/sofa/corner/concave/orange, -/obj/machinery/light/small{ - dir = 1 +/obj/structure/table/wood/gamblingtable, +/obj/item/material/ashtray/bronze, +/obj/machinery/power/outlet{ + pixel_y = 8; + pixel_x = 8 }, -/turf/simulated/floor/carpet/red, +/obj/item/deck/cards{ + pixel_x = 5; + pixel_y = -5 + }, +/obj/item/storage/pill_bottle/dice{ + pixel_x = -5; + pixel_y = 10 + }, +/obj/machinery/light/small{ + dir = 1; + must_start_working = 1 + }, +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 8 + }, +/turf/simulated/floor/carpet/green, /area/horizon/service/bar) "iDV" = ( /obj/effect/decal/cleanable/dirt, @@ -63054,13 +63089,10 @@ /turf/simulated/floor/holofloor/lino, /area/horizon/holodeck/source_meetinghall) "iRy" = ( -/obj/structure/bed/stool/chair/padded/brown{ - dir = 8 - }, -/obj/effect/landmark/start{ - name = "Passenger" - }, -/turf/simulated/floor/carpet/art, +/obj/machinery/door/firedoor, +/obj/structure/grille, +/obj/structure/window/shuttle/scc_space_ship, +/turf/simulated/floor/plating, /area/horizon/crew/lounge) "iRA" = ( /obj/effect/floor_decal/industrial/outline_straight/yellow{ @@ -63590,9 +63622,6 @@ /turf/simulated/floor/wood, /area/horizon/service/cafeteria) "iVG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -64495,6 +64524,7 @@ dir = 1; name = "Deck 3 Starboard Lounge" }, +/obj/structure/curtain/open/bar, /turf/simulated/floor/tiled, /area/horizon/crew/lounge) "jbP" = ( @@ -64843,8 +64873,10 @@ /turf/simulated/floor/reinforced/airless, /area/horizon/exterior) "jem" = ( -/obj/structure/bed/stool/chair/sofa/right/orange, -/turf/simulated/floor/carpet/red, +/obj/machinery/media/jukebox{ + anchored = 1 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "jep" = ( /obj/effect/floor_decal/industrial/hatch/yellow, @@ -67006,14 +67038,19 @@ /turf/simulated/floor/plating, /area/horizon/engineering/reactor/supermatter/mainchamber) "juR" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 - }, /obj/effect/map_effect/marker/airlock{ frequency = 1002; master_tag = "airlock_horizon_deck_3_fore_starboard_1"; name = "airlock_horizon_deck_3_fore_starboard_1" }, +/obj/machinery/access_button{ + dir = 1; + pixel_x = -28; + pixel_y = 12 + }, +/obj/machinery/door/airlock/external, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor, /area/horizon/maintenance/deck_3/bridge) "jvb" = ( @@ -69334,9 +69371,6 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/horizon/command/heads/captain) "jLJ" = ( -/obj/structure/ladder{ - pixel_y = 10 - }, /turf/simulated/open, /area/horizon/maintenance/deck_3/bridge) "jLN" = ( @@ -70870,7 +70904,10 @@ /turf/simulated/floor/plating, /area/shuttle/skipjack) "jWX" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/wood, /area/horizon/service/bar) "jWZ" = ( @@ -72862,9 +72899,7 @@ dir = 4; icon_state = "pipe-c" }, -/obj/effect/floor_decal/spline/fancy/wood, -/obj/structure/bed/stool/bar/padded/red, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark/full, /area/horizon/service/bar) "klU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -73314,12 +73349,15 @@ dir = 8; icon_state = "pipe-c" }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 6 +/obj/effect/floor_decal/spline/plain{ + dir = 4 }, -/obj/structure/bed/stool/bar/padded/red, -/obj/machinery/alarm/east, -/turf/simulated/floor/wood, +/obj/machinery/hologram/holopad, +/obj/machinery/atm{ + dir = 4; + pixel_x = 16 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "koP" = ( /turf/unsimulated/mineral/asteroid, @@ -73598,6 +73636,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "kqS" = ( @@ -74185,20 +74224,14 @@ /turf/simulated/floor/tiled/white, /area/horizon/medical/hallway/upper) "kvj" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/structure/railing/mapped{ - dir = 8 - }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/emergency, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/railing/mapped{ - dir = 4 +/obj/structure/sign/double/barsign{ + pixel_y = -32 }, -/obj/machinery/power/apc/south, -/obj/structure/cable/green, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/starboard) "kvn" = ( @@ -76974,10 +77007,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/sign/double/barsign{ - dir = 4; - pixel_x = -64 - }, /obj/effect/floor_decal/corner/dark_green/full, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, @@ -77005,6 +77034,10 @@ master_tag = "airlock_horizon_deck_3_fore_starboard_1"; name = "airlock_horizon_deck_3_fore_starboard_1" }, +/obj/machinery/airlock_sensor{ + dir = 8; + pixel_x = 20 + }, /turf/simulated/floor, /area/horizon/maintenance/deck_3/bridge) "kOt" = ( @@ -77554,7 +77587,7 @@ }, /obj/structure/lattice/catwalk, /turf/simulated/open, -/area/horizon/maintenance/deck_2/service/starboard) +/area/horizon/service/bar) "kSV" = ( /turf/simulated/floor/exoplanet/water/shallow{ icon_state = "pool" @@ -78991,10 +79024,12 @@ /turf/simulated/floor/tiled, /area/horizon/operations/mail_room) "lcY" = ( -/obj/structure/railing/mapped{ - dir = 4 +/obj/machinery/door/airlock/glass{ + dir = 4; + name = "Lounge" }, -/turf/simulated/floor/wood, +/obj/structure/curtain/open/bar, +/turf/simulated/floor, /area/horizon/crew/lounge) "ldf" = ( /obj/structure/disposalpipe/segment{ @@ -79489,19 +79524,18 @@ /turf/simulated/floor/reinforced, /area/horizon/rnd/xenoarch/isolation_a) "lgw" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/window/eastleft{ - dir = 8; - name = "Bar Access"; - req_access = list(25) - }, +/obj/effect/decal/cleanable/dirt, /obj/machinery/door/blast/shutters{ - dir = 8; - id = "bar_shutter"; + id = "bar_maint"; name = "Bar Shutter" }, -/turf/simulated/floor/tiled/dark/full, -/area/horizon/service/bar) +/obj/structure/curtain/open/bar, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/horizon/stairwell/starboard/deck_2) "lgy" = ( /obj/machinery/door/firedoor{ dir = 4 @@ -81797,19 +81831,15 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port/nacelle) "lwr" = ( -/obj/machinery/door/airlock/maintenance{ - dir = 1; - name = "Bar Maintenance"; - req_one_access = list(12, 25) - }, -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/full, +/obj/structure/curtain/open/bar, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/full, /area/horizon/service/bar) "lws" = ( /obj/effect/floor_decal/corner/paleblue{ @@ -82225,9 +82255,6 @@ /area/horizon/service/cafeteria) "lzp" = ( /obj/effect/floor_decal/corner/dark_green/full, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /obj/machinery/light{ dir = 8 }, @@ -82593,10 +82620,14 @@ /turf/simulated/floor/tiled, /area/horizon/operations/lobby) "lBQ" = ( -/obj/structure/window/shuttle/scc_space_ship, -/obj/structure/grille, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, +/obj/machinery/disposal/small/west, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/horizon/crew/lounge) "lBY" = ( /obj/item/modular_computer/console/preset/medical{ @@ -84580,12 +84611,15 @@ /turf/unsimulated/floor, /area/centcom/control) "lQa" = ( -/obj/machinery/door/airlock/service{ - dir = 1; - name = "Bar - Private Lounge" - }, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/full, +/obj/structure/curtain/open/bar, +/obj/machinery/door/airlock/glass_service{ + name = "Lounge" + }, +/obj/effect/floor_decal/spline/fancy/wood/cee{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/service/bar) "lQc" = ( /obj/structure/shuttle_part/scc/mining{ @@ -86803,11 +86837,19 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 - }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/wood, +/obj/item/reagent_containers/glass/rag{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/structure/table/stone/marble, +/obj/machinery/door/firedoor, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "bar_shutter"; + name = "Bar Shutter" + }, +/turf/simulated/floor/lino, /area/horizon/service/bar) "miS" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, @@ -87157,6 +87199,9 @@ /obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor, /turf/simulated/floor/tiled/dark/full, /area/horizon/medical/pharmacy) +"mmo" = ( +/turf/simulated/wall, +/area/horizon/maintenance/deck_2/service/starboard) "mmq" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -87461,17 +87506,14 @@ /area/horizon/maintenance/deck_1/main/interstitial) "moS" = ( /obj/structure/table/stone/marble, -/obj/item/material/ashtray/bronze{ - pixel_x = -8; - pixel_y = 8 - }, /obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ dir = 2; id = "bar_shutter"; name = "Bar Shutter" }, -/turf/simulated/floor/tiled/dark, +/obj/item/material/ashtray/bronze, +/turf/simulated/floor/lino, /area/horizon/service/bar) "moW" = ( /obj/structure/railing/mapped{ @@ -89020,6 +89062,18 @@ /area/centcom/legion/hangar5) "mCq" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/machinery/power/apc/critical/west, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/railing/mapped{ + pixel_y = -5 + }, +/obj/structure/bed/stool/bar/padded/red{ + dir = 4 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/starboard) "mCr" = ( @@ -89035,10 +89089,10 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/railing/mapped{ - dir = 8 - }, /obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/machinery/light/small/emergency{ + dir = 4 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/starboard) "mCu" = ( @@ -90287,11 +90341,12 @@ /turf/simulated/floor/tiled, /area/horizon/operations/loading) "mLO" = ( -/obj/structure/bed/stool/chair/sofa/left/orange{ - dir = 8 - }, /obj/machinery/alarm/east, -/turf/simulated/floor/carpet/red, +/obj/structure/bed/stool/bar/padded/green{ + dir = 1 + }, +/obj/effect/floor_decal/spline/fancy/wood/cee, +/turf/simulated/floor/wood/mahogany, /area/horizon/service/bar) "mLS" = ( /obj/machinery/door/firedoor, @@ -90427,26 +90482,15 @@ /turf/simulated/floor/wood, /area/horizon/command/bridge/minibar) "mMx" = ( -/obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ - pixel_y = 9; - pixel_x = 5 - }, /obj/machinery/button/switch/windowtint{ dir = 1; id = "Bar_Private_Lounge"; pixel_y = 24 }, -/obj/item/lore_radio{ - pixel_x = 9; - pixel_y = 2 +/obj/structure/bed/stool/chair/sofa/left/green{ + pixel_y = 5 }, -/obj/random/pottedplant_small{ - pixel_x = -7; - pixel_y = 3 - }, -/obj/machinery/power/outlet, -/turf/simulated/floor/carpet/red, +/turf/simulated/floor/carpet/green, /area/horizon/service/bar) "mMy" = ( /obj/effect/decal/fake_object{ @@ -90832,6 +90876,15 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_2/central) +"mQh" = ( +/obj/structure/bed/stool/chair/padded/brown{ + dir = 8 + }, +/obj/effect/landmark/start{ + name = "Passenger" + }, +/turf/simulated/floor/carpet/art, +/area/horizon/crew/lounge) "mQn" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -91538,7 +91591,7 @@ id = "bar_shutter"; name = "Bar Shutter" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/lino, /area/horizon/service/bar) "mVS" = ( /obj/structure/dueling_table{ @@ -91974,7 +92027,18 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/mercenary) "mZg" = ( -/turf/simulated/floor/carpet/red, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/wood, /area/horizon/service/bar) "mZh" = ( /obj/machinery/light/small{ @@ -92039,14 +92103,17 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 5 - }, /obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "mZE" = ( /obj/structure/lattice, @@ -93030,10 +93097,6 @@ /area/horizon/operations/mining_main/refinery) "ngN" = ( /obj/structure/table/wood, -/obj/item/book/manual/barman_recipes{ - pixel_x = 2; - pixel_y = -9 - }, /obj/item/stack/packageWrap{ pixel_y = 6 }, @@ -94242,9 +94305,6 @@ dir = 1 }, /obj/structure/window/shuttle/scc_space_ship, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "npR" = ( @@ -95404,13 +95464,12 @@ /turf/simulated/floor/plating, /area/horizon/operations/mining_main/refinery) "nyl" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /obj/effect/floor_decal/corner/dark_green{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet/south, /turf/simulated/floor/tiled, /area/horizon/stairwell/starboard/deck_2) "nyr" = ( @@ -95788,6 +95847,11 @@ /obj/structure/platform{ dir = 4 }, +/obj/structure/sign/double/barsign{ + dir = 4; + pixel_x = -64; + pixel_y = -33 + }, /turf/simulated/floor/wood, /area/horizon/service/dining_hall) "nBE" = ( @@ -97078,13 +97142,13 @@ }, /area/centcom/specops) "nJD" = ( -/obj/machinery/light{ +/obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 10 +/obj/machinery/media/jukebox/audioconsole/wall{ + pixel_x = -32 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "nJK" = ( /obj/structure/table/rack, @@ -98718,10 +98782,8 @@ /turf/simulated/floor, /area/horizon/maintenance/deck_3/security/port) "nXt" = ( -/obj/structure/ladder/up{ - pixel_y = 13 - }, /obj/effect/decal/cleanable/dirt, +/obj/structure/stairs/north, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/starboard) "nXw" = ( @@ -99824,14 +99886,6 @@ pixel_x = -4; pixel_y = 16 }, -/obj/item/reagent_containers/glass/rag{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/random/pottedplant_small{ - pixel_x = 10; - pixel_y = -2 - }, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "ofB" = ( @@ -100371,6 +100425,7 @@ dir = 1; name = "Deck 3 Starboard Lounge" }, +/obj/structure/curtain/open/bar, /turf/simulated/floor/tiled, /area/horizon/crew/lounge) "oiE" = ( @@ -102907,6 +102962,9 @@ /area/horizon/exterior) "ozK" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, /turf/simulated/floor/wood, /area/horizon/service/bar) "ozN" = ( @@ -104150,14 +104208,10 @@ /turf/simulated/floor/tiled/dark, /area/horizon/engineering/storage/tech) "oJR" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 5 +/obj/structure/bed/stool/chair/sofa/right/green{ + pixel_y = 5 }, -/obj/structure/coatrack{ - pixel_x = 10; - pixel_y = 25 - }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet/green, /area/horizon/service/bar) "oJU" = ( /obj/structure/table/rack, @@ -104499,30 +104553,6 @@ /area/horizon/maintenance/deck_1/wing/starboard) "oMf" = ( /obj/structure/table/wood, -/obj/item/storage/box/lights/colored/blue{ - pixel_x = 6; - pixel_y = 10 - }, -/obj/item/storage/box/lights/colored/cyan{ - pixel_x = -6; - pixel_y = 10 - }, -/obj/item/storage/box/lights/colored/green{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/storage/box/lights/colored/magenta{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/storage/box/lights/colored/red{ - pixel_x = 6; - pixel_y = 2 - }, -/obj/item/storage/box/lights/colored/yellow{ - pixel_x = -6; - pixel_y = 2 - }, /obj/machinery/button/switch/windowtint{ dir = 1; id = "bar_backroom"; @@ -104534,6 +104564,15 @@ pixel_y = 30; dir = 1 }, +/obj/item/device/quikpay, +/obj/item/paper{ + info = "This permit signifies that the Bartender is permitted to posess this firearm in the bar, and ONLY the bar. Failure to adhere to this permit will result in confiscation of the weapon and possibly arrest."; + name = "Shotgun permit" + }, +/obj/item/book/manual/barman_recipes{ + pixel_x = 2; + pixel_y = -9 + }, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar/backroom) "oMl" = ( @@ -105245,10 +105284,6 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/obj/machinery/camera/network/third_deck{ - c_tag = "Third Deck - Crew Lounge Port"; - dir = 8 - }, /turf/simulated/floor/wood, /area/horizon/crew/lounge) "oRS" = ( @@ -105772,16 +105807,6 @@ }, /turf/simulated/floor/tiled, /area/horizon/engineering/locker_room) -"oVv" = ( -/obj/machinery/disposal/small/west, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/horizon/crew/lounge) "oVx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -106678,12 +106703,11 @@ /turf/unsimulated/floor/plating, /area/shuttle/syndicate_elite) "pcY" = ( -/obj/effect/floor_decal/industrial/warning/cee{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/service/starboard) +/turf/simulated/floor/wood, +/area/horizon/crew/lounge) "pdb" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light/small{ @@ -107710,10 +107734,10 @@ /turf/simulated/floor/tiled/white, /area/horizon/medical/main_storage) "plg" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/shuttle/scc_space_ship, -/turf/simulated/floor/plating, +/obj/structure/railing/mapped{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/horizon/crew/lounge) "plh" = ( /obj/machinery/door/airlock/centcom{ @@ -108046,11 +108070,8 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/random/junk, -/obj/structure/railing/mapped{ - dir = 8 - }, /turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/service/starboard) +/area/horizon/service/bar) "pnv" = ( /obj/item/gun/energy/rifle/laser, /obj/item/gun/energy/rifle/laser, @@ -108084,7 +108105,6 @@ /turf/unsimulated/floor/blue_circuit, /area/antag/ninja) "pnM" = ( -/obj/machinery/hologram/holopad, /turf/simulated/floor/wood, /area/horizon/crew/lounge) "pnO" = ( @@ -108296,9 +108316,8 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/machinery/camera/network/service{ - c_tag = "Service - Deck 2 - Bar Port"; - dir = 4 +/obj/structure/sign/emergency/meetingpoint{ + pixel_x = -32 }, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) @@ -108906,8 +108925,14 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/security/armoury) "pve" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/mapped{ + dir = 8 + }, /obj/effect/floor_decal/industrial/warning, -/obj/random/junk, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/starboard) "pvo" = ( @@ -109405,10 +109430,8 @@ /turf/simulated/floor/plating, /area/horizon/engineering/atmos/propulsion/starboard) "pzD" = ( -/obj/structure/bed/stool/chair/padded/brown{ - dir = 4 - }, -/turf/simulated/floor/carpet/art, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/wood, /area/horizon/crew/lounge) "pzE" = ( /obj/structure/lattice/catwalk, @@ -110802,6 +110825,16 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/engineering/reactor/supermatter/waste) +"pJy" = ( +/obj/structure/platform_stairs/full{ + dir = 1 + }, +/obj/machinery/light/floor, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/service/bar) "pJz" = ( /obj/effect/floor_decal/industrial/warning/full, /obj/machinery/porta_turret, @@ -111067,9 +111100,6 @@ /turf/simulated/floor/lino, /area/horizon/service/dining_hall) "pLp" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, @@ -111082,6 +111112,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/horizon/service/bar) "pLr" = ( @@ -111136,13 +111167,9 @@ /turf/simulated/floor/tiled, /area/horizon/engineering/hallway/aft) "pLH" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/obj/structure/bed/stool/chair/padded/beige{ - dir = 4 - }, -/turf/simulated/floor/wood, +/obj/machinery/computer/slot_machine, +/obj/effect/floor_decal/spline/fancy/wood/corner, +/turf/simulated/floor/carpet/green, /area/horizon/service/bar) "pLN" = ( /obj/machinery/door/airlock/glass_security{ @@ -113824,6 +113851,9 @@ dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/sign/poster/pinup/bay_17{ + pixel_x = 32 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/starboard) "qhm" = ( @@ -115206,18 +115236,6 @@ /obj/structure/lattice/catwalk/indoor, /turf/space/dynamic, /area/horizon/exterior) -"qsp" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/dark_green{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/horizon/hallway/primary/deck_3/starboard) "qst" = ( /obj/effect/floor_decal/spline/plain, /obj/structure/ore_box{ @@ -115652,12 +115670,9 @@ "qvH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/industrial/warning, -/obj/machinery/light/small/emergency{ - dir = 8 +/obj/structure/sign/poster/pinup/bay_47{ + pixel_x = -32 }, -/obj/structure/table/rack, -/obj/random/loot, -/obj/random/loot, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/starboard) "qvI" = ( @@ -116488,9 +116503,10 @@ dir = 4 }, /obj/machinery/smartfridge/drinks{ - opacity = 1 + pixel_x = 32; + density = 0 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/horizon/service/bar) "qBZ" = ( /turf/simulated/wall, @@ -118183,14 +118199,17 @@ /turf/simulated/floor/tiled, /area/horizon/crew/fitness/changing) "qNm" = ( +/obj/effect/decal/cleanable/dirt, /obj/structure/railing/mapped{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ +/obj/structure/reagent_dispensers/extinguisher, +/obj/structure/railing/mapped{ + icon_state = "railing0-0" + }, +/obj/effect/floor_decal/industrial/warning/cee{ dir = 4 }, -/obj/machinery/alarm/north, -/obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/starboard) "qNo" = ( @@ -118423,7 +118442,12 @@ /turf/simulated/floor/tiled, /area/horizon/engineering/break_room) "qPO" = ( -/obj/machinery/light, +/obj/effect/floor_decal/spline/plain, +/obj/machinery/light/floor, +/obj/machinery/camera/network/service{ + c_tag = "Service - Deck 2 - Bar Starboard"; + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "qPX" = ( @@ -120434,14 +120458,11 @@ /turf/simulated/floor/tiled/dark, /area/horizon/security/interrogation/monitoring) "rfq" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/media/jukebox/audioconsole/wall{ - pixel_y = 32 - }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "rft" = ( /turf/simulated/wall/r_wall, @@ -121252,6 +121273,8 @@ name = "Distro to Airlock"; target_pressure = 200 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor, /area/horizon/maintenance/deck_3/bridge) "rmb" = ( @@ -123737,11 +123760,6 @@ }, /turf/simulated/floor/carpet/rubber, /area/horizon/engineering/reactor/supermatter/monitoring) -"rDz" = ( -/obj/effect/floor_decal/corner/dark_green/diagonal, -/obj/structure/bed/stool/chair, -/turf/simulated/floor/tiled, -/area/horizon/hallway/primary/deck_3/starboard) "rDC" = ( /obj/effect/floor_decal/corner/teal/diagonal, /obj/item/storage/box/large/condiment{ @@ -127178,6 +127196,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/curtain/open/bar, /turf/simulated/floor/tiled/full, /area/horizon/service/bar) "sdN" = ( @@ -127543,7 +127562,9 @@ dir = 9 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/railing/mapped, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor, /area/horizon/maintenance/deck_3/bridge) "sgu" = ( @@ -128478,14 +128499,18 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/maintenance{ - dir = 1; - req_one_access = list(12, 25) - }, -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/blast/shutters{ + id = "bar_maint"; + name = "Bar Shutter" + }, +/obj/structure/curtain/open/bar, +/turf/simulated/floor/plating, /area/horizon/stairwell/starboard/deck_2) "slW" = ( /obj/machinery/button/remote/blast_door{ @@ -128684,12 +128709,18 @@ /turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/central) "snp" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain{ dir = 9 }, -/obj/structure/extinguisher_cabinet/west, -/obj/machinery/computer/arcade, -/turf/simulated/floor/wood, +/obj/machinery/status_display{ + pixel_y = 32 + }, +/obj/machinery/vending/battlemonsters, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, /area/horizon/service/bar) "snq" = ( /obj/effect/floor_decal/corner/brown, @@ -128903,8 +128934,8 @@ pixel_y = -9 }, /obj/machinery/power/outlet{ - pixel_y = 4; - pixel_x = 10 + pixel_y = 8; + pixel_x = 8 }, /turf/simulated/floor/tiled/dark/full, /area/horizon/service/cafeteria) @@ -129571,7 +129602,7 @@ name = "Bar Shutter" }, /obj/machinery/power/outlet, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/lino, /area/horizon/service/bar) "stG" = ( /obj/structure/cable/green{ @@ -129631,15 +129662,11 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/operations/machinist) "stX" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal/small/north, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 6 - }, -/turf/simulated/floor/wood, -/area/horizon/service/bar) +/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/grille, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/horizon/crew/lounge) "stZ" = ( /obj/machinery/alarm/north, /obj/random/loot, @@ -131634,19 +131661,13 @@ /turf/simulated/floor/tiled/dark, /area/horizon/engineering/gravity_gen) "sHB" = ( -/obj/effect/floor_decal/corner/grey{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/engineer_maintenance/electric{ - dir = 1 - }, -/obj/structure/engineer_maintenance/pipe{ - dir = 8 +/obj/effect/floor_decal/corner/grey{ + dir = 5 }, /turf/simulated/floor/lino, /area/horizon/service/bar) @@ -132354,6 +132375,13 @@ }, /turf/unsimulated/floor, /area/centcom/control) +"sMU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/wood, +/area/horizon/crew/lounge) "sMV" = ( /obj/structure/foamedmetal, /turf/simulated/floor/plating, @@ -132539,6 +132567,13 @@ }, /turf/simulated/floor/plating, /area/horizon/rnd/xenoarch/atrium) +"sNB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/maintenance{ + name = "Deck 2 Stairwell Maintenance" + }, +/turf/simulated/floor/plating, +/area/horizon/stairwell/starboard/deck_2) "sNE" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark/full, @@ -132755,7 +132790,7 @@ dir = 6 }, /turf/simulated/floor/tiled, -/area/horizon/hallway/primary/deck_3/starboard) +/area/horizon/crew/lounge) "sPt" = ( /obj/structure/sign/biohazard{ pixel_x = -1; @@ -133197,14 +133232,16 @@ /turf/simulated/floor/holofloor/snow, /area/horizon/holodeck/source_snowfield) "sSr" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, /obj/machinery/camera/network/service{ c_tag = "Service - Deck 2 - Bar Private Lounge" }, -/obj/structure/bed/stool/chair/padded/beige, -/turf/simulated/floor/wood, +/obj/structure/bed/stool/bar/padded/green{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/turf/simulated/floor/wood/mahogany, /area/horizon/service/bar) "sSw" = ( /obj/structure/cable{ @@ -133340,6 +133377,11 @@ /obj/structure/engineer_maintenance/electric, /turf/simulated/floor/wood, /area/horizon/command/bridge/meeting_room) +"sTG" = ( +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/ausbushes/sunnybush, +/turf/simulated/floor/grass/no_edge, +/area/horizon/crew/lounge) "sTI" = ( /obj/structure/table/wood, /turf/simulated/floor/holofloor/carpet, @@ -135152,7 +135194,13 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/service/hydroponics/lower) "tiw" = ( -/turf/simulated/floor/wood, +/obj/structure/bed/stool/bar/padded/green{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 + }, +/turf/simulated/floor/wood/mahogany, /area/horizon/service/bar) "tiz" = ( /obj/structure/table/standard, @@ -136121,6 +136169,13 @@ master_tag = "airlock_horizon_deck_3_fore_starboard_1"; name = "airlock_horizon_deck_3_fore_starboard_1" }, +/obj/machinery/light/small/emergency{ + dir = 1 + }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 4; + pixel_x = -20 + }, /turf/simulated/floor, /area/horizon/maintenance/deck_3/bridge) "tos" = ( @@ -138542,7 +138597,10 @@ /area/horizon/exterior) "tFQ" = ( /obj/structure/ladder{ - pixel_y = 10 + pixel_y = 8 + }, +/obj/machinery/status_display{ + pixel_x = -32 }, /turf/simulated/open, /area/horizon/maintenance/deck_2/service/starboard) @@ -138838,7 +138896,8 @@ id = "bar_shutter"; name = "Bar Shutter" }, -/turf/simulated/floor/tiled/dark, +/obj/item/material/ashtray/bronze, +/turf/simulated/floor/lino, /area/horizon/service/bar) "tHp" = ( /turf/simulated/floor/holofloor/beach/sand{ @@ -139283,15 +139342,6 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/engineering/gravity_gen) -"tLe" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/obj/machinery/computer/ship/navigation{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/horizon/service/bar) "tLf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -139325,18 +139375,18 @@ /area/horizon/maintenance/deck_2/wing/starboard/near) "tLl" = ( /obj/structure/table/stone/marble, -/obj/item/storage/box/fancy/cigarettes/cigar{ - pixel_x = -5; - pixel_y = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ dir = 2; id = "bar_shutter"; name = "Bar Shutter" }, +/obj/item/glass_jar{ + desc = "A small empty jar that is mostly used for giving a tip."; + name = "tip jar" + }, /obj/machinery/power/outlet, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/lino, /area/horizon/service/bar) "tLr" = ( /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, @@ -139379,7 +139429,7 @@ }, /obj/random/pottedplant, /turf/simulated/floor/tiled, -/area/horizon/hallway/primary/deck_3/starboard) +/area/horizon/crew/lounge) "tLB" = ( /obj/machinery/light{ dir = 1 @@ -140779,7 +140829,7 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/full, -/area/horizon/service/chapel/office) +/area/horizon/maintenance/deck_2/service/starboard) "tXQ" = ( /obj/effect/floor_decal/corner/yellow{ dir = 9 @@ -141676,6 +141726,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/machinery/alarm/north{ + dir = 4; + pixel_y = 0; + pixel_x = 10 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/starboard) "udL" = ( @@ -143863,15 +143918,12 @@ /turf/simulated/floor/tiled, /area/horizon/hangar/auxiliary) "uup" = ( -/obj/structure/disposalpipe/segment, +/obj/machinery/vending/cigarette, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, -/obj/structure/bed/stool/bar/padded/red{ - dir = 4 + dir = 1 }, /turf/simulated/floor/wood, -/area/horizon/service/bar) +/area/horizon/crew/lounge) "uuq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -144304,8 +144356,8 @@ pixel_x = -5 }, /obj/machinery/power/outlet{ - pixel_y = 4; - pixel_x = 10 + pixel_y = 8; + pixel_x = 8 }, /turf/simulated/floor/carpet/art, /area/horizon/crew/lounge) @@ -144741,12 +144793,13 @@ /turf/simulated/floor/tiled, /area/horizon/operations/office) "uBs" = ( -/obj/machinery/holosign/service{ - id = 3; - pixel_y = -15 +/obj/machinery/door/firedoor, +/obj/structure/grille/diagonal{ + dir = 4 }, -/turf/simulated/wall, -/area/horizon/service/bar) +/obj/structure/window/shuttle/scc_space_ship, +/turf/simulated/floor/reinforced, +/area/horizon/crew/lounge) "uBt" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/cable{ @@ -146959,14 +147012,13 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port/far) "uQM" = ( -/obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 1 +/obj/effect/floor_decal/corner/dark_green/diagonal, +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = -14 }, -/obj/machinery/vending/boozeomat{ - opacity = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/horizon/service/bar) +/turf/simulated/floor/tiled, +/area/horizon/hallway/primary/deck_3/starboard) "uQP" = ( /obj/machinery/light/small{ dir = 4 @@ -147097,7 +147149,8 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/shuttle/intrepid/buffet) "uRK" = ( -/turf/simulated/open, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/starboard) "uRR" = ( /obj/machinery/door/firedoor, @@ -148772,10 +148825,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/newscaster/south, -/obj/machinery/camera/network/second_deck{ - c_tag = "Second Deck - Central Stairwell"; - dir = 1 +/obj/structure/cable/green{ + icon_state = "4-8"; + d1 = 4; + d2 = 8 }, /turf/simulated/floor/tiled, /area/horizon/stairwell/starboard/deck_2) @@ -148824,6 +148877,25 @@ pixel_x = -8; pixel_y = -1 }, +/obj/item/reagent_containers/glass/bottle/syrup/chocolate{ + pixel_x = -12; + pixel_y = 16 + }, +/obj/item/reagent_containers/glass/bottle/syrup/caramel{ + pixel_x = -3; + pixel_y = 16 + }, +/obj/item/reagent_containers/glass/bottle/syrup/pumpkin{ + pixel_x = 7; + pixel_y = 16 + }, +/obj/item/reagent_containers/glass/bottle/syrup/vanilla{ + pixel_x = 16; + pixel_y = 16 + }, +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/service/bar) "vdl" = ( @@ -149088,13 +149160,11 @@ /turf/simulated/floor/tiled, /area/horizon/hangar/operations) "vfh" = ( -/obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 1 +/obj/structure/bed/stool/bar/padded/green, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 }, -/obj/structure/platform{ - dir = 1 - }, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/mahogany, /area/horizon/service/bar) "vfl" = ( /obj/item/shovel, @@ -149302,19 +149372,16 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/port) "vhe" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 5 +/obj/machinery/door/firedoor, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "bar_shutter"; + name = "Bar Shutter" }, -/obj/structure/sink/kitchen{ - dir = 8; - name = "sink"; - pixel_x = 19 +/obj/structure/sign/flag/scc{ + pixel_x = 32 }, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/firealarm/east, -/turf/simulated/floor/wood, +/turf/simulated/floor/lino, /area/horizon/service/bar) "vhi" = ( /obj/machinery/door/firedoor, @@ -151607,10 +151674,7 @@ /turf/simulated/floor/wood, /area/horizon/command/heads/rd) "vxb" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "vxh" = ( /obj/structure/bed/stool/chair/office/bridge{ @@ -151745,8 +151809,10 @@ /turf/simulated/open, /area/horizon/medical/hallway/upper) "vyl" = ( -/turf/simulated/floor/wood, -/area/horizon/crew/lounge) +/obj/effect/floor_decal/corner/dark_green/diagonal, +/obj/structure/bed/stool/chair, +/turf/simulated/floor/tiled, +/area/horizon/hallway/primary/deck_3/starboard) "vyo" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -153565,12 +153631,14 @@ /turf/simulated/floor/tiled/full, /area/horizon/service/kitchen/freezer) "vLq" = ( -/obj/structure/railing/mapped, /obj/effect/floor_decal/industrial/warning, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, +/obj/structure/railing/mapped{ + pixel_y = -5 + }, +/obj/structure/bed/stool/bar/padded/red{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/starboard) "vLt" = ( @@ -153836,6 +153904,10 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, +/obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/wood, /area/horizon/service/bar) "vNW" = ( @@ -156569,9 +156641,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/railing/mapped{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, @@ -156584,6 +156653,7 @@ /obj/structure/disposalpipe/junction{ dir = 1 }, +/obj/effect/decal/cleanable/dirt, /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/starboard) @@ -158762,8 +158832,8 @@ pixel_x = -8 }, /obj/machinery/power/outlet{ - pixel_y = 4; - pixel_x = 10 + pixel_y = 8; + pixel_x = 8 }, /turf/simulated/floor/tiled/dark/full, /area/horizon/service/cafeteria) @@ -159074,12 +159144,12 @@ /turf/simulated/floor/tiled, /area/horizon/rnd/xenobiology/xenoflora) "wwp" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, /turf/simulated/floor/wood, /area/horizon/service/bar) "wwq" = ( @@ -160535,13 +160605,17 @@ /turf/simulated/floor/tiled/white, /area/merchant_station) "wGZ" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/obj/effect/floor_decal/industrial/warning/corner, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "1-8" }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/railing/mapped{ + pixel_y = -5 + }, +/obj/structure/table/wood/gamblingtable, +/obj/item/material/ashtray, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/starboard) "wHe" = ( @@ -162369,13 +162443,10 @@ pixel_x = -10; pixel_y = 16 }, -/obj/item/reagent_containers/food/drinks/shaker{ - pixel_x = 3; - pixel_y = 5 - }, -/obj/item/reagent_containers/food/drinks/shaker{ - pixel_x = -9; - pixel_y = 5 +/obj/machinery/vending/boozeomat/bar{ + pixel_y = 32; + density = 0; + pixel_x = 4 }, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) @@ -163720,19 +163791,12 @@ /turf/simulated/floor/tiled, /area/horizon/security/equipment) "xdC" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 8 - }, -/obj/machinery/airlock_sensor{ - dir = 8; - pixel_x = 20 - }, /obj/effect/map_effect/marker/airlock{ frequency = 1002; master_tag = "airlock_horizon_deck_3_fore_starboard_1"; name = "airlock_horizon_deck_3_fore_starboard_1" }, -/turf/simulated/floor, +/turf/simulated/wall, /area/horizon/maintenance/deck_3/bridge) "xdF" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -164857,11 +164921,10 @@ /turf/simulated/floor/tiled, /area/horizon/operations/mining_main/refinery) "xnI" = ( -/obj/machinery/atm{ - pixel_y = -6 - }, -/turf/simulated/floor/tiled/dark, -/area/horizon/service/bar) +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/service/starboard) "xnL" = ( /obj/machinery/light/small/emergency{ dir = 8 @@ -165694,10 +165757,10 @@ }, /obj/structure/disposalpipe/trunk, /obj/machinery/disposal/small/east, -/obj/structure/extinguisher_cabinet/west, /obj/effect/floor_decal/spline/plain{ dir = 8 }, +/obj/machinery/firealarm/west, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "xtD" = ( @@ -166652,8 +166715,13 @@ /turf/simulated/floor/exoplanet/grass/grove, /area/centcom/shared_dream) "xAz" = ( -/obj/structure/bed/stool/chair/sofa/orange, -/turf/simulated/floor/carpet/red, +/obj/structure/bed/stool/bar/padded/green{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy/wood/cee{ + dir = 8 + }, +/turf/simulated/floor/wood/mahogany, /area/horizon/service/bar) "xAA" = ( /obj/effect/floor_decal/industrial/outline/red, @@ -167015,10 +167083,14 @@ /turf/simulated/floor/wood, /area/horizon/rnd/hallway) "xDv" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/structure/casino/roulette_chart, +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 8 + }, +/turf/simulated/floor/carpet/green, /area/horizon/service/bar) "xDw" = ( /obj/structure/cable{ @@ -168730,27 +168802,12 @@ name = "Bar Access"; req_access = list(25) }, -/obj/machinery/button/remote/blast_door{ - dir = 4; - id = "bar_shutter"; - name = "Desk Shutters"; - pixel_x = 19; - pixel_y = 11; - req_access = list(25) - }, /obj/machinery/door/blast/shutters{ dir = 2; id = "bar_shutter"; name = "Bar Shutter" }, -/obj/machinery/button/remote/blast_door{ - dir = 4; - id = "bar_viewing_shutters"; - name = "Viewing Shutters"; - pixel_x = 20; - pixel_y = -23 - }, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/lino, /area/horizon/service/bar) "xPT" = ( /obj/effect/floor_decal/corner/dark_blue{ @@ -169329,12 +169386,17 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/atmos) "xUH" = ( -/obj/structure/bed/stool/chair/padded/brown, -/obj/effect/landmark/start{ - name = "Passenger" +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/carpet/art, -/area/horizon/crew/lounge) +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/corner/dark_green{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/horizon/hallway/primary/deck_3/starboard) "xUI" = ( /obj/effect/floor_decal/corner/brown/full, /obj/structure/cable/green{ @@ -169841,7 +169903,7 @@ /obj/structure/ladder/up{ pixel_y = 10 }, -/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/hangar/starboard) "xYO" = ( @@ -171375,6 +171437,7 @@ /turf/simulated/floor/wood, /area/horizon/service/chapel/office) "yiq" = ( +/obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "yix" = ( @@ -171474,9 +171537,6 @@ /turf/simulated/floor/grass/no_edge, /area/horizon/service/hydroponics/lower) "yjp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -201530,7 +201590,7 @@ pDv avq pDv nfW -pDv +ckN iyC dIE wrI @@ -265008,7 +265068,7 @@ pob lJD vcx vAn -vAn +bQm wrH vAn vAn @@ -266035,16 +266095,16 @@ bhL bhL bhL bhL -vAn -vAn +mmo +mmo tXP -vAn -vAn +mmo +mmo ezA pyI opq eGT -kUK +pyI pyI pyI kUK @@ -266299,17 +266359,17 @@ mCq tFQ ezA snp -ear -ear -ear -nJD +fqk +pJy aGn +nJD +hUO fqk evI ppV xtC eKR -tLe +ear doP ezA cqM @@ -266548,7 +266608,7 @@ diV why gMj nyl -bhL +sNB aJJ pve rmV @@ -266558,10 +266618,10 @@ ezA eKS dIZ eqx -uup -stX -ezA -ehC +pUZ +pUZ +pUZ +pUZ pUZ pUZ pUZ @@ -266571,7 +266631,7 @@ hqv ezA sSr tiw -gRO +byG npQ dWh uYQ @@ -266804,7 +266864,7 @@ yjm uDL uDL jAT -vcO +fji bhL qNm hys @@ -266815,9 +266875,9 @@ ezA aNt iyD grO +ipz +fjc ixZ -lgw -ezA fjc hlC tHo @@ -266827,9 +266887,9 @@ nQi kqR lQa vxb -tiw -hUO -fji +vxb +vxb +xAz kSI uYQ eSV @@ -267061,21 +267121,21 @@ yjm qII qII pmh -eGr -bhL +vcO +lgw uRK uRK gGT -pcY +xnI pns -ezA +inP rfq klT aUG miR ahF fRs -vVA +mZg vVA pLp mVK @@ -267084,7 +267144,7 @@ piX hIq ezA oJR -vNU +vxb vfh xDv pnR @@ -267332,8 +267392,8 @@ bNm vhe wwp qBY -uQM -tiw +vNU +anN yjp stz fui @@ -267341,7 +267401,7 @@ jrl qPO ezA mMx -mZg +vxb eZN fAq kSI @@ -267595,11 +267655,11 @@ iVG moS fui jrl -tUB +yiq tnA jem -mZg -eZN +tUB +vxb cji kSI uYQ @@ -267855,8 +267915,8 @@ jrl yiq tnA xAz -mZg -byG +vxb +gRO bPb ens uYQ @@ -268109,7 +268169,7 @@ gry xPS hwQ jrl -xnI +ieu ezA iDS mLO @@ -268364,7 +268424,7 @@ ezA vcq vcq ezA -uBs +ezA qxx flt ezA @@ -326430,12 +326490,12 @@ xPX qDU qDU qDU -lBQ +stX qXQ -lBQ +stX fZq -plg -anN +iRy +uBs cKu uYQ wWR @@ -326688,11 +326748,11 @@ tnl rht vzQ uhK -xUH +abB uyj tXJ eVH -plg +iRy cKu uYQ wWR @@ -326940,16 +327000,16 @@ fXo qXV gKy jAE -cVg +ehC tnl sCG gYf eEB -lcY -vyl -vyl +plg +pnM +pnM aoT -lBQ +stX dQL uYQ wWR @@ -327202,11 +327262,11 @@ oiv knm iSD oZA -ipz +sTG jQf -pnM +pzD ago -lBQ +stX cKu uYQ wWR @@ -327460,10 +327520,10 @@ xjP vVc snC dlw -vyl -vyl -iRy -lBQ +pnM +pnM +mQh +stX cKu uYQ wWR @@ -327716,7 +327776,7 @@ tnl ckr rSx cRD -oVv +lBQ cfX uqT wtE @@ -328222,7 +328282,7 @@ mGy cZU fVi hkE -dAV +uQM wtb qMe uBu @@ -328234,7 +328294,7 @@ fMV xnh jVM gdG -lBQ +stX cKu uYQ wWR @@ -328479,19 +328539,19 @@ ryY oMa qga hkE -dAV -rDz +uQM +vyl paR mPC frc hXh hXh tnl -iwK -vyl -gaW +uup +pnM +pcY kRT -lBQ +stX cKu tGt dbd @@ -328735,20 +328795,20 @@ tZP ryY oMa uCO -qsp +xUH oaC lam gQG oaC -ckQ +dAV fjG fkI tnl xMk -vyl -cuN +pnM +sMU ejj -lBQ +stX dQL cKu cKu @@ -328992,20 +329052,20 @@ syZ ryY oMa qga -ckN +ian bAj xaC ksP bAj cxO gzA -ian +iwK jbI fSf hsU iwv -iRy -lBQ +mQh +stX cKu pWB hCm @@ -329253,7 +329313,7 @@ vvj eTZ rgH hgR -inP +gaW irl sPq tLw @@ -329262,7 +329322,7 @@ cxD cVN oOg eTu -lBQ +stX cKu uYQ wWR @@ -329776,7 +329836,7 @@ nDc jVM mea azd -lBQ +stX cKu uYQ wWR @@ -330030,9 +330090,9 @@ jat kLs tnl azr -pzD +ckQ tjy -xUH +abB cDb cKu uYQ @@ -330290,7 +330350,7 @@ vol bOw kSG fOn -lBQ +stX dQL uYQ wWR @@ -330544,10 +330604,10 @@ xks kof tnl qMX -iRy +mQh snC -xUH -lBQ +abB +stX cKu uYQ wWR @@ -330804,7 +330864,7 @@ ixf oRO vZc ePm -lBQ +stX cKu lEF wWR @@ -331058,7 +331118,7 @@ kuL kuL tnl tnl -tnl +lcY tnl tnl qDU @@ -331316,7 +331376,7 @@ rma dhU hFS dAC -fRe +xdC tor aHQ ycB @@ -331829,7 +331889,7 @@ eAa wPy sgs jLJ -dAC +jLJ xdC kOr aHQ