diff --git a/code/__defines/flags.dm b/code/__defines/flags.dm index 106bafe44ce..0f3cd9bd04b 100644 --- a/code/__defines/flags.dm +++ b/code/__defines/flags.dm @@ -46,7 +46,7 @@ The latter will result in a linter warning and will not work correctly. #define ATOM_FLAG_ADJACENT_EXCEPTION BITFLAG(9) // Skips adjacent checks for atoms that should always be reachable in window tiles #define ATOM_FLAG_NO_DISSOLVE BITFLAG(10) // Bypasses solvent reactions in the container. #define ATOM_FLAG_NO_PHASE_CHANGE BITFLAG(11) // Bypasses heating and cooling product reactions in the container. -#define ATOM_FLAG_ALLOW_DIAGONAL_FACING BITFLAG(12) // Atom can face non-cardinal directions. +#define ATOM_FLAG_BLOCK_DIAGONAL_FACING BITFLAG(12) // Atom cannot face non-cardinal directions. #define ATOM_IS_OPEN_CONTAINER(A) (A.atom_flags & ATOM_FLAG_OPEN_CONTAINER) diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm index 69493131744..e61cf91fddd 100644 --- a/code/_onclick/hud/radial.dm +++ b/code/_onclick/hud/radial.dm @@ -32,6 +32,8 @@ var/global/list/radial_menus = list() closeToolTip(usr) /obj/screen/radial/slice/Click(location, control, params) + if(QDELETED(src) || QDELETED(parent)) + return if(parent && usr.client == parent.current_user) if(next_page) parent.next_page() @@ -51,6 +53,8 @@ var/global/list/radial_menus = list() icon_state = "radial_center" /obj/screen/radial/center/Click(location, control, params) + if(QDELETED(src) || QDELETED(parent)) + return if(usr.client == parent.current_user) parent.finished = TRUE @@ -274,6 +278,7 @@ var/global/list/radial_menus = list() /datum/radial_menu/proc/hide() if(current_user) current_user.images -= menu_holder + clear_vis_contents(menu_holder) /datum/radial_menu/proc/wait(atom/user, atom/anchor, require_near = FALSE, list/check_locs) while (current_user && !finished && !selected_choice) diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index c653a3d34c7..504ed39436e 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -237,7 +237,7 @@ var/global/obj/screen/robot_inventory else //Modules display is hidden //R.client.screen -= robot_inventory //"store" icon - for(var/atom/A in R.module.equipment) + for(var/atom/A in R.module?.equipment) if( (A != R.module_state_1) && (A != R.module_state_2) && (A != R.module_state_3) ) //Module is not currently active R.client.screen -= A diff --git a/code/datums/observation/dir_set.dm b/code/datums/observation/dir_set.dm index 9245e15dd1c..b4456ff0ffd 100644 --- a/code/datums/observation/dir_set.dm +++ b/code/datums/observation/dir_set.dm @@ -27,7 +27,7 @@ /atom/set_dir(ndir) var/old_dir = dir // This attempts to mimic BYOND's handling of diagonal directions and cardinal icon states. - if(!(atom_flags & ATOM_FLAG_ALLOW_DIAGONAL_FACING) && !IsPowerOfTwo(ndir)) + if((atom_flags & ATOM_FLAG_BLOCK_DIAGONAL_FACING) && !IsPowerOfTwo(ndir)) if(old_dir & ndir) ndir = old_dir else diff --git a/code/datums/security_state.dm b/code/datums/security_state.dm index 114b660d8de..f1bbdb3ea1a 100644 --- a/code/datums/security_state.dm +++ b/code/datums/security_state.dm @@ -62,10 +62,11 @@ comm_console_security_levels = list() // Setup the list of selectable security levels available in the comm. console - for(var/security_level in all_security_levels) + for(var/decl/security_level/security_level in all_security_levels) if(security_level == highest_standard_security_level) break - comm_console_security_levels += security_level + if(security_level.selectable) + comm_console_security_levels += security_level // Now we ensure the high security level is not above the severe one (but we allow them to be equal) var/severe_index = all_security_levels.Find(severe_security_level) @@ -149,6 +150,8 @@ var/up_description var/down_description + var/selectable = TRUE + var/datum/alarm_appearance/alarm_appearance /decl/security_level/Initialize() @@ -293,6 +296,21 @@ alarm_icon = "alarm_normal" alarm_icon_color = PIPE_COLOR_GREEN +/decl/security_level/default/code_yellow + name = "code yellow" + icon = 'icons/misc/security_state.dmi' + + light_color_alarm = COLOR_YELLOW_GRAY + light_color_status_display = COLOR_YELLOW_GRAY + overlay_alarm = "alarm_orange" + overlay_status_display = "status_display_orange" + alarm_appearance = /datum/alarm_appearance/yellow + + up_description = "Subsector FTL Procedures are now in effect; observe modified Code Orange protocols, secure all stations for superluminal transition. EVA Ban in effect." + down_description = "Subsector FTL Procedures are now in effect; observe modified Code Orange protocols, secure all stations for superluminal transition. EVA Ban in effect." + + selectable = FALSE + /datum/alarm_appearance/blue display_icon = "status_display_lines" display_icon_color = COLOR_BLUE @@ -327,4 +345,14 @@ alarm_icon_color = COLOR_RED alarm_icon_twotone = "alarm_blinking_twotone2" - alarm_icon_twotone_color = PIPE_COLOR_YELLOW \ No newline at end of file + alarm_icon_twotone_color = PIPE_COLOR_YELLOW + +/datum/alarm_appearance/yellow + display_icon = "status_display_lines" + display_icon_color = COLOR_YELLOW_GRAY + + display_emblem = "status_display_ftl" + display_emblem_color = COLOR_WHITE + + alarm_icon = "alarm_normal" + alarm_icon_color = COLOR_YELLOW_GRAY \ No newline at end of file diff --git a/code/game/machinery/bodyscanner_console.dm b/code/game/machinery/bodyscanner_console.dm index 1bd8108b490..60f5b92206e 100644 --- a/code/game/machinery/bodyscanner_console.dm +++ b/code/game/machinery/bodyscanner_console.dm @@ -1,5 +1,5 @@ /obj/machinery/body_scanconsole - var/obj/machinery/bodyscanner/connected + var/obj/machinery/bodyscanner/connected var/stored_scan_subject name = "Body Scanner Console" icon = 'icons/obj/Cryogenic2.dmi' @@ -20,7 +20,7 @@ /obj/machinery/body_scanconsole/on_update_icon() if(stat & (BROKEN | NOPOWER)) - icon_state = "body_scannerconsole-p" + icon_state = "body_scannerconsole-p" else icon_state = initial(icon_state) @@ -31,13 +31,14 @@ break events_repository.register(/decl/observ/destroyed, connected, src, .proc/unlink_scanner) -/obj/machinery/body_scanconsole/proc/unlink_scanner(var/obj/machinery/bodyscanner/scanner) +/obj/machinery/body_scanconsole/proc/unlink_scanner(var/obj/machinery/bodyscanner/scanner) events_repository.unregister(/decl/observ/destroyed, scanner, src, .proc/unlink_scanner) connected = null /obj/machinery/body_scanconsole/proc/FindDisplays() for(var/obj/machinery/body_scan_display/D in SSmachines.machinery) - if(D.tag in display_tags) + // TODO: Convert to use networking + if(D.id_tag in display_tags) connected_displays += D events_repository.register(/decl/observ/destroyed, D, src, .proc/remove_display) return !!connected_displays.len @@ -97,7 +98,7 @@ data["html_scan_header"] = display_medical_data_header(data["scan"], user.get_skill_value(SKILL_MEDICAL)) data["html_scan_health"] = display_medical_data_health(data["scan"], user.get_skill_value(SKILL_MEDICAL)) data["html_scan_body"] = display_medical_data_body(data["scan"], user.get_skill_value(SKILL_MEDICAL)) - + stored_scan_subject = connected.occupant user.visible_message("\The [user] performs a scan of \the [connected.occupant] using \the [connected].") playsound(connected.loc, 'sound/machines/medbayscanner.ogg', 50) @@ -111,7 +112,7 @@ new /obj/item/paper/bodyscan(loc, "Printout error.", "Body scan report - [stored_scan_subject]", scan.Copy()) return TOPIC_REFRESH - if(href_list["push"]) + if(href_list["push"]) if(!connected_displays.len && !FindDisplays()) to_chat(user, "[html_icon(src)]Error: No configured displays detected.") return TOPIC_REFRESH diff --git a/code/modules/fabrication/_fabricator.dm b/code/modules/fabrication/_fabricator.dm index 7d68380da2d..e34397bd246 100644 --- a/code/modules/fabrication/_fabricator.dm +++ b/code/modules/fabrication/_fabricator.dm @@ -128,15 +128,19 @@ if(length(installed_designs)) design_cache |= installed_designs - if(!known_tech) - known_tech = get_default_initial_tech_levels() - var/datum/extension/network_device/device = get_extension(src, /datum/extension/network_device) - var/datum/computer_network/network = device.get_network() - if(network) - for(var/obj/machinery/design_database/db in network.get_devices_by_type(/obj/machinery/design_database)) - for(var/tech in db.tech_levels) - if(db.tech_levels[tech] > known_tech[tech]) - known_tech[tech] = db.tech_levels[tech] + // This is necessary to prevent database consoles from overwriting the default tech levels. + var/list/default_tech = get_default_initial_tech_levels() + LAZYINITLIST(known_tech) + for(var/tech_key in known_tech) + known_tech[tech_key] = max(default_tech[tech_key], known_tech[tech_key]) + + var/datum/extension/network_device/device = get_extension(src, /datum/extension/network_device) + var/datum/computer_network/network = device.get_network() + if(network) + for(var/obj/machinery/design_database/db in network.get_devices_by_type(/obj/machinery/design_database)) + for(var/tech in db.tech_levels) + if(db.tech_levels[tech] > known_tech[tech]) + known_tech[tech] = db.tech_levels[tech] var/list/unlocked_tech = SSfabrication.get_unlocked_recipes(fabricator_class, known_tech) if(length(unlocked_tech)) diff --git a/code/modules/materials/recipes_furniture.dm b/code/modules/materials/recipes_furniture.dm index 39ef009e977..656cf98da88 100644 --- a/code/modules/materials/recipes_furniture.dm +++ b/code/modules/materials/recipes_furniture.dm @@ -232,7 +232,7 @@ if(.) for(var/obj/structure/window/check_window in user.loc) if(check_window.is_fulltile()) - to_chat(user, "There is already a fll-tile window here!") + to_chat(user, SPAN_WARNING("There is already a full-tile window here!")) return FALSE /datum/stack_recipe/furniture/fullwindow/spawn_result(mob/user, location, amount) diff --git a/code/modules/mechs/mech.dm b/code/modules/mechs/mech.dm index 92873fa7f98..41801061217 100644 --- a/code/modules/mechs/mech.dm +++ b/code/modules/mechs/mech.dm @@ -12,7 +12,7 @@ status_flags = PASSEMOTES a_intent = I_HURT mob_size = MOB_SIZE_LARGE - atom_flags = ATOM_FLAG_SHIELD_CONTENTS | ATOM_FLAG_NO_TEMP_CHANGE + atom_flags = ATOM_FLAG_SHIELD_CONTENTS | ATOM_FLAG_NO_TEMP_CHANGE | ATOM_FLAG_BLOCK_DIAGONAL_FACING meat_type = null meat_amount = 0 diff --git a/code/modules/overmap/ftl_shunt/_shunt.dm b/code/modules/overmap/ftl_shunt/_shunt.dm index ea641c1e9b8..80ce41b86cc 100644 --- a/code/modules/overmap/ftl_shunt/_shunt.dm +++ b/code/modules/overmap/ftl_shunt/_shunt.dm @@ -1,6 +1,7 @@ #define CHARGE_TIME_PER_TON 0.1 //In deciseconds. #define JOULES_PER_TON 5000 #define REQUIRED_CHARGE_MULTIPLIER 0.005 +#define JUMP_TIME_PER_TILE 20 SECONDS #define FTL_START_FAILURE_FUEL 1 //Not enough fuel. #define FTL_START_FAILURE_POWER 2 //Not enough power. diff --git a/code/modules/overmap/ftl_shunt/computer.dm b/code/modules/overmap/ftl_shunt/computer.dm index 94d4a35dfaa..bbe88c028ea 100644 --- a/code/modules/overmap/ftl_shunt/computer.dm +++ b/code/modules/overmap/ftl_shunt/computer.dm @@ -29,8 +29,7 @@ if(!istype(sector)) return INFINITY var/jump_dist = get_dist(linked, locate(linked_core.shunt_x, linked_core.shunt_y, sector.z)) - var/jump_cost = ((linked.vessel_mass * JOULES_PER_TON) / 1000) * jump_dist - return jump_cost + return jump_dist /obj/machinery/computer/ship/ftl/proc/recalc_cost_power() if(!linked_core) @@ -41,8 +40,7 @@ return INFINITY var/jump_dist = get_dist(linked, locate(linked_core.shunt_x, linked_core.shunt_y, sector.z)) - var/jump_cost = ((linked.vessel_mass * JOULES_PER_TON) / 1000) * jump_dist - var/jump_cost_power = jump_cost * REQUIRED_CHARGE_MULTIPLIER + var/jump_cost_power = ((jump_dist * linked.vessel_mass)* REQUIRED_CHARGE_MULTIPLIER)*1000 return jump_cost_power /obj/machinery/computer/ship/ftl/proc/get_status() @@ -123,13 +121,12 @@ data["shunt_y"] = linked_core.shunt_y data["to_plot_x"] = to_plot_x data["to_plot_y"] = to_plot_y - data["fuel_joules"] = (linked_core.get_fuel(linked_core.fuel_ports) / 1000) - data["fuel_conversion"] = linked_core.get_total_fuel_conversion_rate() + data["fuel_joules"] = linked_core.get_charges() || 0 data["jumpcost"] = recalc_cost() - data["powercost"] = recalc_cost_power() + data["powercost"] = recalc_cost_power()/1000 data["chargetime"] = linked_core.get_charge_time() data["chargepercent"] = linked_core.chargepercent - data["maxfuel"] = linked_core.get_fuel_maximum(linked_core.fuel_ports) + data["maxfuel"] = linked_core.get_max_charges() data["jump_status"] = get_status() data["power_input"] = linked_core.allowed_power_usage / 1000 data["max_power"] = linked_core.max_power_usage / 1000 diff --git a/code/modules/overmap/ftl_shunt/core.dm b/code/modules/overmap/ftl_shunt/core.dm index c029bbcc969..afe4d1b34b3 100644 --- a/code/modules/overmap/ftl_shunt/core.dm +++ b/code/modules/overmap/ftl_shunt/core.dm @@ -20,8 +20,7 @@ icon_state = "ftl_core" pixel_x = -32 pixel_y = -32 - bound_x = -32 - bound_y = -32 + density = TRUE var/list/fuel_ports = list() //We mainly use fusion fuels. var/charge_time //Actually, we do use power now. This is here for the console. @@ -32,8 +31,7 @@ var/chargepercent = 0 var/last_percent_tick = 0 var/obj/machinery/computer/ship/ftl/ftl_computer - var/required_fuel_joules - var/required_charge //This is a function of the required fuel joules. + var/required_charge var/accumulated_charge var/max_charge = 2000000 var/target_charge @@ -49,6 +47,12 @@ var/last_power_drawn var/jump_delay = 2 MINUTES var/jump_timer //used to cancel the jump. + var/required_jump_cores = 0 + //HEARTH EXCLUSIVE + var/cached_security_level + //HEARTH EXCLUSIVE END + var/datum/event/ftl_event + var/last_stress_sound var/power_on_animation_played = FALSE var/power_off_animation_played = FALSE @@ -58,9 +62,10 @@ var/static/datum/announcement/priority/ftl_announcement = new(do_log = 0, do_newscast = 1, new_sound = sound('sound/misc/notice2.ogg')) - var/static/shunt_start_text = "Attention! Superluminal shunt warm-up initiated! Spool-up ETA: %%TIME%%" - var/static/shunt_cancel_text = "Attention! Faster-than-light transition cancelled." - var/static/shunt_complete_text = "Attention! Faster-than-light transition completed." + var/static/shunt_start_text = "Attention! Superluminal shunt warm-up initiated! ETA to subsector jump: %%TIME%%" + var/static/shunt_cancel_text = "Attention! Subsector superluminal transition cancelled." + var/static/shunt_entered_text = "Attention! Vessel has completed superluminal translation; FTL exit in %%TIME%% seconds." + var/static/shunt_complete_text = "Attention! Subsector superluminal transition completed." var/static/shunt_spooling_text = "Attention! Superluminal shunt warm-up complete, spooling up." var/static/shunt_sabotage_text_minor = "Warning! Electromagnetic flux beyond safety limits - aborting shunt!" @@ -73,6 +78,19 @@ var/obj/effect/shunt_dummy/charge_indicator var/obj/effect/shunt_dummy/pumps + var/static/ftl_sounds = list( + 'sound/effects/thunder/thunder1.ogg', + 'sound/effects/thunder/thunder2.ogg', + 'sound/effects/thunder/thunder3.ogg', + 'sound/effects/thunder/thunder4.ogg', + 'sound/effects/thunder/thunder5.ogg', + 'sound/effects/thunder/thunder6.ogg', + 'sound/effects/thunder/thunder7.ogg', + 'sound/effects/thunder/thunder8.ogg', + 'sound/effects/thunder/thunder9.ogg', + 'sound/effects/thunder/thunder10.ogg' + ) + use_power = POWER_USE_OFF power_channel = EQUIP idle_power_usage = 1600 @@ -210,13 +228,6 @@ portal.animate_filter("glow", list(size = rand(1,2)*2, time = 1 SECONDS, offset = 2*rand(1,3))) addtimer(CALLBACK(src, /atom/movable/proc/animate_filter, "glow", list(size = 2, time = 1 SECONDS, offset = 2)), 2 SECONDS) -/* - if(!filter_data) - add_filter("ripple", 1, list(type="ripple", size = 5, repeat = 10, radius = 1)) - animate_filter("ripple", list(time = 0.5 SECONDS, radius = 25, size = 5)) - addtimer(CALLBACK(src, /atom/movable/proc/animate_filter, "ripple",list(time = 0.5 SECONDS, size = 0, radius = 0)), 0.6 SECONDS) -*/ - /obj/machinery/ftl_shunt/core/examine(mob/user) . = ..() if(sabotaged) @@ -311,6 +322,8 @@ //Starts the teleport process, returns 1-6, with 6 being the all-clear. /obj/machinery/ftl_shunt/core/proc/start_shunt() + var/decl/security_state/security_state = GET_DECL(global.using_map.security_state) + if(isnull(ftl_computer)) return @@ -337,7 +350,7 @@ if(max_charge < required_charge) return FTL_START_FAILURE_POWER - if(required_fuel_joules > get_fuel(fuel_ports)) + if(required_jump_cores > get_charges()) return FTL_START_FAILURE_FUEL if(sabotaged) @@ -350,6 +363,9 @@ var/announcetxt = replacetext(shunt_start_text, "%%TIME%%", "[round(jump_delay/600)] minutes.") ftl_announcement.Announce(announcetxt, "FTL Shunt Management System", new_sound = sound('sound/misc/notice2.ogg')) + + cached_security_level = security_state.current_security_level + security_state.set_security_level(GET_DECL(/decl/security_level/default/code_yellow), TRUE) update_icon() if(check_charge()) @@ -363,23 +379,27 @@ var/vessel_mass = ftl_computer.linked.get_vessel_mass() var/shunt_turf = locate(shunt_x, shunt_y, O.z) shunt_distance = get_dist(get_turf(ftl_computer.linked), shunt_turf) - required_fuel_joules = (vessel_mass * JOULES_PER_TON) * shunt_distance - required_charge = required_fuel_joules * REQUIRED_CHARGE_MULTIPLIER + required_jump_cores = shunt_distance + required_charge = ((shunt_distance * vessel_mass)* REQUIRED_CHARGE_MULTIPLIER)*1000 //Cancels the in-progress shunt. /obj/machinery/ftl_shunt/core/proc/cancel_shunt(var/silent = FALSE) + var/decl/security_state/security_state = GET_DECL(global.using_map.security_state) if(!jump_timer) return deltimer(jump_timer) charge_time = null cooldown = null - required_fuel_joules = null + required_jump_cores = null if(!silent) ftl_announcement.Announce(shunt_cancel_text, "FTL Shunt Management System", new_sound = sound('sound/misc/notice2.ogg')) update_icon() jump_timer = null + //HEARTH EXCLUSIVE + security_state.set_security_level(cached_security_level, TRUE) + //END HEARTH EXCLUSIVE -//Starts the shunt, and then hands off to do_shunt to finish it. +//Starts the shunt, and then hands off to enter_shunt to finish it. /obj/machinery/ftl_shunt/core/proc/execute_shunt() ftl_announcement.Announce(shunt_spooling_text, "FTL Shunt Management System", new_sound = sound('sound/misc/notice2.ogg')) if(sabotaged) @@ -388,8 +408,8 @@ ftl_computer.jump_plotted = FALSE return - if(use_fuel(required_fuel_joules)) - jump_timer = addtimer(CALLBACK(src, .proc/execute_shunt), jump_delay, TIMER_STOPPABLE) + if(can_use_fuel(required_jump_cores)) + use_fuel(required_jump_cores) else cancel_shunt() return //If for some reason we don't have fuel now, just return. @@ -398,9 +418,7 @@ if(O) var/destination = locate(shunt_x, shunt_y, O.z) var/jumpdist = get_dist(get_turf(ftl_computer.linked), destination) - var/obj/effect/portal/wormhole/W = new(destination) //Generate a wormhole effect on overmap to give some indication that something is about to happen. - QDEL_IN(W, 6 SECONDS) - addtimer(CALLBACK(src, .proc/do_shunt, shunt_x, shunt_y, jumpdist, destination), 6 SECONDS) + addtimer(CALLBACK(src, .proc/enter_shunt, shunt_x, shunt_y, jumpdist, destination), 6 SECONDS) jumping = TRUE update_icon() for(var/mob/living/carbon/M in global.living_mob_list_) @@ -408,8 +426,23 @@ continue sound_to(M, 'sound/machines/hyperspace_begin.ogg') -/obj/machinery/ftl_shunt/core/proc/do_shunt(var/turfx, var/turfy, var/jumpdist, var/destination) //this does the actual teleportation, execute_shunt is there to give us time to do our fancy effects +/obj/machinery/ftl_shunt/core/proc/enter_shunt(var/shunt_x, var/shunt_x, var/jumpdist, var/destination) + var/announcetxt = replacetext(shunt_entered_text, "%%TIME%%", "[round((jumpdist*JUMP_TIME_PER_TILE)/60)]") + var/datum/event_meta/EM = new(EVENT_LEVEL_MUNDANE, "FTL", /datum/event/ftl, add_to_queue = FALSE, is_one_shot = TRUE) + ftl_event = new /datum/event/ftl(EM) + ftl_event.startWhen = 0 + ftl_event.endWhen = INFINITY + ftl_event.affecting_z = ftl_computer.linked.map_z + ftl_computer.linked.forceMove(null) + ftl_computer.linked.halted = TRUE + + ftl_announcement.Announce(announcetxt, "FTL Shunt Management System", new_sound = sound('sound/misc/notice2.ogg')) + addtimer(CALLBACK(src, .proc/end_shunt, shunt_x, shunt_y, jumpdist, destination),jumpdist*JUMP_TIME_PER_TILE) + +/obj/machinery/ftl_shunt/core/proc/end_shunt(var/turfx, var/turfy, var/jumpdist, var/destination) //this does the actual teleportation, execute_shunt is there to give us time to do our fancy effects + var/decl/security_state/security_state = GET_DECL(global.using_map.security_state) ftl_computer.linked.forceMove(destination) + ftl_computer.linked.halted = FALSE ftl_announcement.Announce(shunt_complete_text, "FTL Shunt Management System", new_sound = sound('sound/misc/notice2.ogg')) cooldown = world.time + cooldown_delay do_effects(jumpdist) @@ -419,6 +452,12 @@ accumulated_charge -= required_charge jump_timer = null ftl_computer.jump_plotted = FALSE + //HEARTH EXCLUSIVE + addtimer(CALLBACK(security_state, /decl/security_state/.proc/set_security_level, cached_security_level, TRUE), 4 SECONDS) + //END HEARTH EXCLUSIVE + if(ftl_event) + ftl_event.kill() + ftl_event = null //Handles all the effects of the jump. /obj/machinery/ftl_shunt/core/proc/do_effects(var/distance) //If we're jumping too far, have some !!FUN!! with people and ship systems. @@ -448,7 +487,7 @@ switch(shunt_sev) if(SHUNT_SEVERITY_MINOR) to_chat(H, SPAN_NOTICE("You feel your insides flutter about inside of you as you are briefly shunted into an alternate dimension.")) //No major effects. - shake_camera(H, 2, 1) + shake_camera(H, 3, 3) if(SHUNT_SEVERITY_MAJOR) to_chat(H, SPAN_WARNING("You feel your insides twisted inside and out as you are violently shunted between dimensions, and you feel like something is watching you!")) @@ -456,7 +495,7 @@ H.set_hallucination(50, 50) if(prob(15)) H.vomit() - shake_camera(H, 2, 1) + shake_camera(H, 3, 3) if(SHUNT_SEVERITY_CRITICAL) to_chat(H, SPAN_DANGER("You feel an overwhelming sense of nausea and vertigo wash over you, your instincts screaming that something is wrong!")) @@ -471,10 +510,10 @@ continue switch(shunt_sev) if(SHUNT_SEVERITY_MINOR) - if(prob(15)) + if(prob(25)) L.flicker() if(SHUNT_SEVERITY_MAJOR) - if(prob(35)) + if(prob(45)) L.flicker() for(var/obj/machinery/power/apc/A in SSmachines.machinery) @@ -482,9 +521,9 @@ continue switch(shunt_sev) if(SHUNT_SEVERITY_MAJOR) - if(prob(15)) + if(prob(25)) A.energy_fail(rand(30, 80)) - if(prob(10)) + if(prob(35)) A.overload_lighting(25) if(SHUNT_SEVERITY_CRITICAL) @@ -546,7 +585,6 @@ ftl_announcement.Announce(announcetxt, "FTL Shunt Management System", new_sound = sound('sound/misc/ftlsiren.ogg')) - //Returns status to ftl computer. /obj/machinery/ftl_shunt/core/proc/get_status() if(stat & (BROKEN|NOPOWER)) @@ -558,75 +596,36 @@ else return FTL_STATUS_GOOD -/obj/machinery/ftl_shunt/core/proc/get_fuel(var/list/input) - . = 0 - for(var/obj/machinery/ftl_shunt/fuel_port/F in input) - . += F.get_fuel_joules(FALSE) - -/obj/machinery/ftl_shunt/core/proc/get_fuel_maximum(var/list/input) - . = 0 - for(var/obj/machinery/ftl_shunt/fuel_port/F in input) - . += F.get_fuel_joules(TRUE) - -/obj/machinery/ftl_shunt/core/proc/fuelpercentage() - if(!length(fuel_ports)) - return 0 - var/fuel_max = get_fuel_maximum(fuel_ports) - if(fuel_max == 0) - return 0 - return round(100.0*get_fuel(fuel_ports)/fuel_max, 0.1) - - -/obj/machinery/ftl_shunt/core/proc/use_fuel(var/joules_req) - var/avail_fuel = get_fuel(fuel_ports) - - if(joules_req > avail_fuel) //Not enough fuel in the system. +/obj/machinery/ftl_shunt/core/proc/can_use_fuel(var/charges_required) + var/avaliable_charges + for(var/obj/machinery/ftl_shunt/fuel_port/F in fuel_ports) + avaliable_charges += F.get_charge() + if(avaliable_charges >= charges_required) + return TRUE + else return FALSE - var/list/fueled_ports = list() - var/total_joules - var/joules_per_port - var/joule_debt - - for(var/obj/machinery/ftl_shunt/fuel_port/F in fuel_ports) //Step one, loop through ports, sort them by those who are fully fueled and those that are not. - if(!F.has_fuel()) - continue - fueled_ports += F - - joules_per_port = (joules_req / length(fueled_ports)) +/obj/machinery/ftl_shunt/core/proc/use_fuel(var/charges_required) + var/avaliable_charges + var/used_charges - for(var/obj/machinery/ftl_shunt/fuel_port/F in fueled_ports) //Loop through all our ports, use fuel from those that have enough and those that are partially empty. - if(F.get_fuel_joules() >= joules_per_port) //Enough fuel in this one! - if(F.use_fuel_joules(joules_per_port)) - total_joules += joules_per_port - continue - else //Not enough fuel in this port to meet the per-port quota - take as much as we can and pick up the slack with others. - var/available_fuel = F.get_fuel_joules() - if(F.use_fuel_joules(available_fuel)) - total_joules += available_fuel - joule_debt += joules_per_port - available_fuel - fueled_ports -= F //Remove this one from the pool of avaliable ports, since it's used up. - continue - - if(total_joules == joules_req) - return TRUE //All ports supplied enough fuel first go around, return early. - - if(joule_debt) //We haven't rallied up enough energy for the jump, probably from ports that were only partially fueled. - var/fuel_debt_spread = joule_debt / length(fueled_ports) - for(var/obj/machinery/ftl_shunt/fuel_port/F in fueled_ports) //Loop through all our ports, use fuel from those that have enough and those that are partially empty. - if(F.get_fuel_joules() >= fuel_debt_spread) //Enough fuel in this one! - if(F.use_fuel_joules(fuel_debt_spread)) - total_joules += fuel_debt_spread - continue - else //Not enough fuel in this port to meet the per-port quota - take as much as we can and pick up the slack with others. - var/available_fuel_debt = F.get_fuel_joules() - if(F.use_fuel_joules(available_fuel_debt)) - total_joules += available_fuel_debt - joule_debt -= available_fuel_debt - continue + for(var/obj/machinery/ftl_shunt/fuel_port/F in fuel_ports) + avaliable_charges += F.get_charge() + if(avaliable_charges >= charges_required) + for(var/obj/machinery/ftl_shunt/fuel_port/F in fuel_ports) + F.use_charge() + F.update_icon() + used_charges++ + if(used_charges == charges_required) + break + +/obj/machinery/ftl_shunt/core/proc/get_charges() + for(var/obj/machinery/ftl_shunt/fuel_port/F in fuel_ports) + . += F.get_charge() - if(total_joules == joules_req && !joule_debt) - return TRUE +/obj/machinery/ftl_shunt/core/proc/get_max_charges() + for(var/obj/machinery/ftl_shunt/fuel_port/F in fuel_ports) + . += 1 /obj/machinery/ftl_shunt/core/proc/get_charge_time() if(isnull(last_power_drawn)) @@ -651,13 +650,6 @@ else return FALSE -/obj/machinery/ftl_shunt/core/proc/get_total_fuel_conversion_rate() - var/rate - for(var/obj/machinery/ftl_shunt/fuel_port/F in fuel_ports) - rate += F.get_fuel_conversion_rate() - . = round((rate / length(fuel_ports)), 0.1) - - /obj/machinery/ftl_shunt/core/Process() if(stat & (BROKEN|NOPOWER)) return @@ -670,100 +662,14 @@ SSradiation.radiate(src, (active_power_usage / 1000)) chargepercent = round(100*(accumulated_charge/max_charge), 0.1) -/obj/machinery/ftl_shunt/fuel_port - name = "superluminal shunt fuel port" - desc = "A fuel port for an FTL shunt." - icon_state = "empty" - icon = 'icons/obj/ftlshunt_fuelport.dmi' - - var/static/list/fuels = list( - /decl/material/gas/hydrogen/tritium = 25000, - /decl/material/gas/hydrogen/deuterium = 25000, - /decl/material/gas/hydrogen = 25000, - /decl/material/solid/exotic_matter = 50000 - ) - var/obj/item/fuel_assembly/fuel - var/obj/machinery/ftl_shunt/core/master - var/max_fuel = 0 - -/obj/machinery/ftl_shunt/fuel_port/on_update_icon() - if(fuel) - icon_state = "full" - else - icon_state = "empty" - -/obj/machinery/ftl_shunt/fuel_port/Initialize() - set_extension(src, /datum/extension/local_network_member) - if(initial_id_tag) - var/datum/extension/local_network_member/local_network = get_extension(src, /datum/extension/local_network_member) - local_network.set_tag(null, initial_id_tag) - . = ..() - -/obj/machinery/ftl_shunt/fuel_port/modify_mapped_vars(map_hash) - ..() - ADJUST_TAG_VAR(initial_id_tag, map_hash) - -/obj/machinery/ftl_shunt/fuel_port/Destroy() - . = ..() - if(master) - master.fuel_ports -= src - master = null - QDEL_NULL(fuel) - -/obj/machinery/ftl_shunt/fuel_port/attackby(var/obj/item/O, var/mob/user) - if(istype(O, /obj/item/fuel_assembly)) - if(!fuel) - if(!do_after(user, 2 SECONDS, src) || fuel) - return - if(!user || !user.unEquip(O, src)) - return - fuel = O - max_fuel = get_fuel_joules(TRUE) - flick("insert", src) - update_icon() - return TRUE - - . = ..() - -/obj/machinery/ftl_shunt/fuel_port/physical_attack_hand(var/mob/user) - if(fuel) - to_chat(user, SPAN_NOTICE("You begin to remove the fuel assembly from [src]...")) - if(!do_after(user, 2 SECONDS, src) || !fuel || fuel.loc != src) - return FALSE - fuel.dropInto(loc) - user.put_in_hands(fuel) - fuel = null - max_fuel = 0 - to_chat(user, SPAN_NOTICE("You remove the fuel assembly!")) - return TRUE - - . = ..() - -/obj/machinery/ftl_shunt/fuel_port/proc/has_fuel() - return !!fuel - -/obj/machinery/ftl_shunt/fuel_port/proc/get_fuel_joules(var/get_fuel_maximum) - if(fuel) - for(var/G in fuel.matter) - if(G in fuels) - . += (get_fuel_maximum ? 10000 : fuel.matter[G]) * fuels[G] - -/obj/machinery/ftl_shunt/fuel_port/proc/get_fuel_conversion_rate() //This is mostly a fluff proc, since internally everything is done in joules. - if(fuel) - for(var/G in fuel.matter) - if(G in fuels) - . = fuels[G] - -/obj/machinery/ftl_shunt/fuel_port/proc/use_fuel_joules(var/joules) - if(!fuel) - return FALSE - - for(var/G in fuel.matter) - if(G in fuels) - var/fuel_to_use = joules / fuels[G] - fuel.matter[G] -= fuel_to_use - - return TRUE + if(jumping) + if(prob(15) && last_stress_sound < world.time + 2 SECONDS) + for(var/mob/living/carbon/M in global.living_mob_list_) + if(!(M.z in ftl_computer.linked.map_z)) + continue + sound_to(M, pick(ftl_sounds)) + shake_camera(M, rand(1,2), rand(1,2)) + last_stress_sound = world.time // // Construction MacGuffins down here. @@ -783,3 +689,5 @@ icon_state = "smes_coil" color = COLOR_YELLOW matter = list(/decl/material/solid/exotic_matter = MATTER_AMOUNT_REINFORCEMENT, /decl/material/solid/metal/plasteel = MATTER_AMOUNT_PRIMARY) + + diff --git a/code/modules/overmap/ftl_shunt/ftl_event.dm b/code/modules/overmap/ftl_shunt/ftl_event.dm new file mode 100644 index 00000000000..9ad8b0ebe73 --- /dev/null +++ b/code/modules/overmap/ftl_shunt/ftl_event.dm @@ -0,0 +1,17 @@ +/datum/event/ftl + has_skybox_image = TRUE + endWhen = INFINITY + var/static/lightning_color + var/static/background_color + +/datum/event/ftl/get_skybox_image() + if(!background_color) + background_color = pick(COLOR_BLUE, COLOR_BLUE_GRAY, COLOR_BLUE_LIGHT, COLOR_CYAN, COLOR_CYAN_BLUE, COLOR_NAVY_BLUE) + if(!lightning_color) + lightning_color = pick("#ffd98c", "#ebc7ff", "#bdfcff", "#bdd2ff", "#b0ffca", "#ff8178", "#ad74cc") + var/image/res = overlay_image('icons/skybox/ftlbox.dmi', "ftl", lightning_color, RESET_COLOR) + var/image/res_2 = overlay_image('icons/skybox/electrobox.dmi', "lightning", lightning_color, RESET_COLOR) + res.overlays += res_2 + res_2.blend_mode = BLEND_ADD + res.blend_mode = BLEND_OVERLAY + return res diff --git a/code/modules/overmap/ftl_shunt/fuel_port.dm b/code/modules/overmap/ftl_shunt/fuel_port.dm new file mode 100644 index 00000000000..30da071cc3c --- /dev/null +++ b/code/modules/overmap/ftl_shunt/fuel_port.dm @@ -0,0 +1,125 @@ +/obj/machinery/ftl_shunt/fuel_port + name = "superluminal shunt fuel port" + desc = "A fuel port for an FTL shunt." + icon_state = "empty" + icon = 'icons/obj/ftlshunt_fuelport.dmi' + + var/obj/item/jumpcore/fuel + var/obj/machinery/ftl_shunt/core/master + +/obj/machinery/ftl_shunt/fuel_port/on_update_icon() + cut_overlays() + var/image/I = image(icon, "spent_overlay") + if(fuel) + icon_state = "full" + else + icon_state = "empty" + if(fuel) + if(fuel.spent) + I.color = COLOR_RED + else + I.color = COLOR_GREEN + add_overlay(I) + +/obj/machinery/ftl_shunt/fuel_port/Initialize() + set_extension(src, /datum/extension/local_network_member) + if(initial_id_tag) + var/datum/extension/local_network_member/local_network = get_extension(src, /datum/extension/local_network_member) + local_network.set_tag(null, initial_id_tag) + . = ..() + +/obj/machinery/ftl_shunt/fuel_port/modify_mapped_vars(map_hash) + ..() + ADJUST_TAG_VAR(initial_id_tag, map_hash) + +/obj/machinery/ftl_shunt/fuel_port/Destroy() + . = ..() + if(master) + master.fuel_ports -= src + master = null + QDEL_NULL(fuel) + +/obj/machinery/ftl_shunt/fuel_port/attackby(var/obj/item/O, var/mob/user) + if(istype(O, /obj/item/jumpcore)) + if(!fuel) + if(!do_after(user, 2 SECONDS, src) || fuel) + return + if(!user || !user.unEquip(O, src)) + return + fuel = O + flick("insert", src) + update_icon() + return TRUE + + . = ..() + +/obj/machinery/ftl_shunt/fuel_port/physical_attack_hand(var/mob/user) + if(fuel) + to_chat(user, SPAN_NOTICE("You begin to remove the fuel assembly from [src]...")) + if(!do_after(user, 2 SECONDS, src) || !fuel || fuel.loc != src) + return FALSE + fuel.dropInto(loc) + user.put_in_hands(fuel) + fuel = null + to_chat(user, SPAN_NOTICE("You remove the fuel assembly!")) + return TRUE + + . = ..() + +/obj/machinery/ftl_shunt/fuel_port/proc/has_fuel() + return fuel && !fuel.spent + +/obj/machinery/ftl_shunt/fuel_port/proc/get_charge() + if(fuel && !fuel.spent) + return TRUE + +/obj/machinery/ftl_shunt/fuel_port/proc/use_charge() + if(fuel && !fuel.spent) + fuel.use_charge() + fuel.update_icon() + +// +// Jump cores down here +// +/obj/item/jumpcore + name = "superluminal fuel core" + icon = 'icons/obj/ftlshunt_fuelport.dmi' + icon_state = "rod_v2" + desc = "A container for an exotic blend of radioactive materials utilized in going faster-than-light." + w_class = ITEM_SIZE_LARGE + var/spent = FALSE + +/obj/item/jumpcore/Initialize(ml, material_key) + . = ..() + update_icon() + +/obj/item/jumpcore/Destroy() + . = ..() + STOP_PROCESSING(SSobj, src) + +/obj/item/jumpcore/examine(mob/user, distance, infix, suffix) + . = ..() + if(spent) + to_chat(user, SPAN_WARNING("This one is spent.")) + +/obj/item/jumpcore/proc/use_charge() + spent = TRUE + START_PROCESSING(SSobj, src) + +/obj/item/jumpcore/Process() + if(!spent) + return PROCESS_KILL + + if(istype(loc, /turf)) + SSradiation.radiate(src,5) + +/obj/item/jumpcore/on_update_icon() + cut_overlays() + var/image/I = image(icon, "rod_v2_overlay") + if(spent) + I.color = COLOR_RED + else + I.color = COLOR_CYAN + add_overlay(I) + return + diff --git a/code/modules/reagents/reactions/reaction_recipe.dm b/code/modules/reagents/reactions/reaction_recipe.dm index 69cb96d9757..6748eb14353 100644 --- a/code/modules/reagents/reactions/reaction_recipe.dm +++ b/code/modules/reagents/reactions/reaction_recipe.dm @@ -153,4 +153,21 @@ result = /decl/material/liquid/drink/syrup/pumpkin required_reagents = list(/decl/material/liquid/drink/juice/pumpkinpulp = 2, /decl/material/liquid/drink/syrup/sugar = 3) result_amount = 5 - mix_message = "The solution takes on an orange hue and the aroma of pumpkin spice." \ No newline at end of file + mix_message = "The solution takes on an orange hue and the aroma of pumpkin spice." + +// HEARTH EDIT START +/decl/chemical_reaction/recipe/browniemix + name = "Brownie Mix" + result = /decl/material/liquid/nutriment/browniemix + required_reagents = list(/decl/material/liquid/nutriment/flour = 5, /decl/material/liquid/nutriment/coco = 5, /decl/material/liquid/nutriment/sugar = 5) + result_amount = 15 + mix_message = "The solution is mixed into a light brown powder." + +/decl/chemical_reaction/recipe/beerbatter + name = "Beer Batter Mix" + result = /decl/material/liquid/nutriment/batter/beerbatter + required_reagents = list(/decl/material/liquid/nutriment/protein/egg = 3, /decl/material/liquid/nutriment/flour = 10, /decl/material/liquid/ethanol/beer = 5,/decl/material/solid/sodiumchloride = 2) + result_amount = 20 + mix_message = "The solution thickens into a light batter." + + //HEARTH EDIT END \ No newline at end of file diff --git a/code/unit_tests/map_tests.dm b/code/unit_tests/map_tests.dm index db1d63e9c97..6bd35d9318e 100644 --- a/code/unit_tests/map_tests.dm +++ b/code/unit_tests/map_tests.dm @@ -484,6 +484,34 @@ //======================================================================================= +/datum/unit_test/disposal_overlap_test + name = "MAP: Disposal Pipe Overlap Test" + +/datum/unit_test/disposal_overlap_test/start_test() + var/disposal_test_count = 0 + var/bad_tests = 0 + var/turf/T = null + var/obj/structure/disposalpipe/D = null + var/list/pipe_turfs = list() + + for(D in world) + disposal_test_count++ + T = get_turf(D) + if(pipe_turfs[T]) + var/bad_msg = "[ascii_red]--------------- [T.name] \[[T.x] / [T.y] / [T.z]\]" + bad_tests++ + log_unit_test("[bad_msg] contains multiple pipes overlapping.") + pipe_turfs |= T + + if(bad_tests) + fail("\[[bad_tests] / [disposal_test_count]\] Some turfs had overlapping pipes.") + else + pass("All \[[disposal_test_count]\] pipes did not overlap.") + + return 1 + +//======================================================================================= + // Having them face north or west is now supported fully in code; this is for map consistency. /datum/unit_test/simple_pipes_shall_not_face_north_or_west name = "MAP: Simple pipes shall not face north or west" diff --git a/icons/misc/security_state.dmi b/icons/misc/security_state.dmi index aff829cdb6c..f933e553df3 100644 Binary files a/icons/misc/security_state.dmi and b/icons/misc/security_state.dmi differ diff --git a/icons/obj/ftlshunt_fuelport.dmi b/icons/obj/ftlshunt_fuelport.dmi index e685dcbf5e3..61ce716bfa5 100644 Binary files a/icons/obj/ftlshunt_fuelport.dmi and b/icons/obj/ftlshunt_fuelport.dmi differ diff --git a/icons/obj/monitors.dmi b/icons/obj/monitors.dmi index d6ea9f5b004..2ae9e5a3381 100644 Binary files a/icons/obj/monitors.dmi and b/icons/obj/monitors.dmi differ diff --git a/icons/skybox/ftlbox.dmi b/icons/skybox/ftlbox.dmi new file mode 100644 index 00000000000..8a0e869a14f Binary files /dev/null and b/icons/skybox/ftlbox.dmi differ diff --git a/maps/modpack_testing/modpack_testing.dm b/maps/modpack_testing/modpack_testing.dm index 0fba6a622bd..3d09b580de2 100644 --- a/maps/modpack_testing/modpack_testing.dm +++ b/maps/modpack_testing/modpack_testing.dm @@ -16,6 +16,7 @@ #include "../../mods/content/hearth_content/_hearth_content.dme" #include "../../mods/content/hearth_culture/_hearth_culture.dme" #include "../../mods/content/hearthfoods/_hearthfoods.dme" + #include "../../mods/content/hearthdrinks/_hearthdrinks.dme" #include "../../mods/content/matchmaking/_matchmaking.dme" #include "../../mods/content/modern_earth/_modern_earth.dme" #include "../../mods/content/mouse_highlights/_mouse_highlight.dme" diff --git a/maps/torch/icons/borrowed_icons/pilot/ace.dmi b/maps/torch/icons/borrowed_icons/pilot/ace.dmi new file mode 100644 index 00000000000..56a5afefd76 Binary files /dev/null and b/maps/torch/icons/borrowed_icons/pilot/ace.dmi differ diff --git a/maps/torch/icons/borrowed_icons/pilot/checker.dmi b/maps/torch/icons/borrowed_icons/pilot/checker.dmi new file mode 100644 index 00000000000..8c9189e1013 Binary files /dev/null and b/maps/torch/icons/borrowed_icons/pilot/checker.dmi differ diff --git a/maps/torch/icons/borrowed_icons/pilot/corvid.dmi b/maps/torch/icons/borrowed_icons/pilot/corvid.dmi new file mode 100644 index 00000000000..a8a0f79464f Binary files /dev/null and b/maps/torch/icons/borrowed_icons/pilot/corvid.dmi differ diff --git a/maps/torch/icons/borrowed_icons/pilot/helmet.dmi b/maps/torch/icons/borrowed_icons/pilot/helmet.dmi new file mode 100644 index 00000000000..dc5c1d6b593 Binary files /dev/null and b/maps/torch/icons/borrowed_icons/pilot/helmet.dmi differ diff --git a/maps/torch/icons/borrowed_icons/pilot/luke.dmi b/maps/torch/icons/borrowed_icons/pilot/luke.dmi new file mode 100644 index 00000000000..fa1a88f2ebe Binary files /dev/null and b/maps/torch/icons/borrowed_icons/pilot/luke.dmi differ diff --git a/maps/torch/icons/borrowed_icons/pilot/mobius.dmi b/maps/torch/icons/borrowed_icons/pilot/mobius.dmi new file mode 100644 index 00000000000..51f455092f4 Binary files /dev/null and b/maps/torch/icons/borrowed_icons/pilot/mobius.dmi differ diff --git a/maps/torch/icons/borrowed_icons/pilot/pilot_borrowed_readme.md b/maps/torch/icons/borrowed_icons/pilot/pilot_borrowed_readme.md new file mode 100644 index 00000000000..c8c5e1cc2a9 --- /dev/null +++ b/maps/torch/icons/borrowed_icons/pilot/pilot_borrowed_readme.md @@ -0,0 +1,5 @@ +These sprites are borrowed from Shiptest. + +All credit to Apogee-dev + +https://github.com/shiptest-ss13/Shiptest/pull/455 \ No newline at end of file diff --git a/maps/torch/icons/borrowed_icons/pilot/shark.dmi b/maps/torch/icons/borrowed_icons/pilot/shark.dmi new file mode 100644 index 00000000000..9919f066eea Binary files /dev/null and b/maps/torch/icons/borrowed_icons/pilot/shark.dmi differ diff --git a/maps/torch/icons/borrowed_icons/pilot/viper.dmi b/maps/torch/icons/borrowed_icons/pilot/viper.dmi new file mode 100644 index 00000000000..f88239f7245 Binary files /dev/null and b/maps/torch/icons/borrowed_icons/pilot/viper.dmi differ diff --git a/maps/torch/icons/original_icons/suit_locker/suit_locker_decals.dmi b/maps/torch/icons/original_icons/suit_locker/suit_locker_decals.dmi index 69ce96fb839..6a98ab7a6d0 100644 Binary files a/maps/torch/icons/original_icons/suit_locker/suit_locker_decals.dmi and b/maps/torch/icons/original_icons/suit_locker/suit_locker_decals.dmi differ diff --git a/maps/torch/items/hearth_clothing/hats.dm b/maps/torch/items/hearth_clothing/hats.dm new file mode 100644 index 00000000000..e1608f9219c --- /dev/null +++ b/maps/torch/items/hearth_clothing/hats.dm @@ -0,0 +1,53 @@ +/obj/item/clothing/head/helmet/pilot/alternate + name = "pilot's helmet" + desc = "A pilot's helmet for operating the cockpit in style. This one is worn by members of the ISEO Fleet." + icon = 'maps/torch/icons/borrowed_icons/pilot/helmet.dmi' + var/open = FALSE + +/obj/item/clothing/head/helmet/pilot/alternate/attack_self(mob/user) + open = !open + to_chat(user, SPAN_NOTICE("You [open ? "flip your visor up and undo your mask." : "flip your visor down and put your mask on."]")) + update_icon() + adjust_airtightness() + +/obj/item/clothing/head/helmet/pilot/alternate/on_update_icon(mob/user) + . = ..() + icon_state = get_world_inventory_state() + if(open && check_state_in_icon("[icon_state]-open", icon)) + icon_state = "[icon_state]-open" + update_clothing_icon() + +/obj/item/clothing/head/helmet/pilot/alternate/adjust_mob_overlay(var/mob/living/user_mob, var/bodytype, var/image/overlay, var/slot, var/bodypart) + if(overlay && open && check_state_in_icon("[overlay.icon_state]-open", overlay.icon)) + overlay.icon_state = "[overlay.icon_state]-open" + . = ..() + +/obj/item/clothing/head/helmet/pilot/alternate/proc/adjust_airtightness() + if(open) + item_flags &= ~ITEM_FLAG_AIRTIGHT + else + item_flags |= ITEM_FLAG_AIRTIGHT + +//Variants below. + +/obj/item/clothing/head/helmet/pilot/alternate/mobius + icon = 'maps/torch/icons/borrowed_icons/pilot/mobius.dmi' + +/obj/item/clothing/head/helmet/pilot/alternate/viper + icon = 'maps/torch/icons/borrowed_icons/pilot/viper.dmi' + +/obj/item/clothing/head/helmet/pilot/alternate/luke + icon = 'maps/torch/icons/borrowed_icons/pilot/luke.dmi' + +/obj/item/clothing/head/helmet/pilot/alternate/shark + icon = 'maps/torch/icons/borrowed_icons/pilot/shark.dmi' + +/obj/item/clothing/head/helmet/pilot/alternate/corvid + icon = 'maps/torch/icons/borrowed_icons/pilot/corvid.dmi' + +/obj/item/clothing/head/helmet/pilot/alternate/ace + icon = 'maps/torch/icons/borrowed_icons/pilot/ace.dmi' + +/obj/item/clothing/head/helmet/pilot/alternate/checker + icon = 'maps/torch/icons/borrowed_icons/pilot/checker.dmi' + diff --git a/maps/torch/loadout/loadout_head.dm b/maps/torch/loadout/loadout_head.dm index a964c63fc7d..54191404a8e 100644 --- a/maps/torch/loadout/loadout_head.dm +++ b/maps/torch/loadout/loadout_head.dm @@ -59,4 +59,23 @@ allowed_roles = ARMORED_ROLES /decl/loadout_option/head/corporateberet - allowed_branches = CIVILIAN_BRANCHES \ No newline at end of file + allowed_branches = CIVILIAN_BRANCHES + +/decl/loadout_option/head/pilot_helmet + name = "ISSC pilot helmet" + description = "A customized pilot's helmet." + path = /obj/item/clothing/head/helmet/pilot/alternate + allowed_branches = ISEO_BRANCHES + allowed_roles = list(/datum/job/nt_pilot) + +/decl/loadout_option/head/pilot_helmet/Initialize() + . = ..() + var/helmets = list() + helmets["mobius pattern"] = /obj/item/clothing/head/helmet/pilot/alternate/mobius + helmets["viper pattern"] = /obj/item/clothing/head/helmet/pilot/alternate/viper + helmets["red one pattern"] = /obj/item/clothing/head/helmet/pilot/alternate/luke + helmets["shark pattern"] = /obj/item/clothing/head/helmet/pilot/alternate/shark + helmets["corvid pattern"] = /obj/item/clothing/head/helmet/pilot/alternate/corvid + helmets["ace of spades pattern"] = /obj/item/clothing/head/helmet/pilot/alternate/ace + helmets["checker pattern"] = /obj/item/clothing/head/helmet/pilot/alternate/checker + gear_tweaks += new/datum/gear_tweak/path(helmets) \ No newline at end of file diff --git a/maps/torch/structures/closets/services.dm b/maps/torch/structures/closets/services.dm index db5033a467e..4f1deb8281b 100644 --- a/maps/torch/structures/closets/services.dm +++ b/maps/torch/structures/closets/services.dm @@ -25,6 +25,20 @@ /obj/item/clothing/suit/chef/classic ) +/obj/structure/closet/waitstaff_torch + name = "waitstaff closet" + desc = "It's a storage unit for waitstaff equipment." + closet_appearance = /decl/closet_appearance/wardrobe/black + +/obj/structure/closet/waitstaff_torch/WillContain() + return list( + /obj/item/clothing/head/soft/black, + /obj/item/radio/headset/headset_service = 2, + /obj/item/clothing/under/sundress, + /obj/item/clothing/under/waiter = 2, + /obj/item/clothing/suit/chef/classic = 2 + ) + /obj/structure/closet/secure_closet/hydroponics_torch //done so that it has no access reqs name = "hydroponics locker" req_access = list() diff --git a/maps/torch/torch.dm b/maps/torch/torch.dm index a6f8fd8cd44..b9fe1ccd134 100644 --- a/maps/torch/torch.dm +++ b/maps/torch/torch.dm @@ -17,6 +17,7 @@ #include "..\..\mods\content\neural_laces\_laces.dme" #include "..\..\mods\content\genemodding\_genemodding.dme" #include "..\..\mods\content\hearthfoods\_hearthfoods.dme" + #include "..\..\mods\content\hearthdrinks\_hearthdrinks.dme" #include "..\..\mods\content\shards\_shards.dme" #include "..\..\mods\verbs\antighost\_subtle_antighost.dme" @@ -200,6 +201,7 @@ #include "items\hearth_clothing\hats_general.dm" #include "structures\closets\suit_lockers.dm" #include "items\hearth_clothing\skinsuits.dm" + #include "items\hearth_clothing\hats.dm" //end HEARTH #include "torch1_deck5.dmm" diff --git a/maps/torch/torch3_deck3.dmm b/maps/torch/torch3_deck3.dmm index 3e7ee423071..de541fa9b4e 100644 --- a/maps/torch/torch3_deck3.dmm +++ b/maps/torch/torch3_deck3.dmm @@ -109,6 +109,11 @@ }, /turf/simulated/floor/tiled/techfloor, /area/thruster/d3port) +"au" = ( +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/monotile, +/area/hallway/primary/thirddeck/center) "az" = ( /turf/simulated/wall/r_wall/prepainted, /area/maintenance/thirddeck/aftport) @@ -133,12 +138,10 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hardstorage) "aG" = ( -/obj/effect/wallframe_spawn/no_grille, -/obj/machinery/door/firedoor, -/obj/effect/paint_stripe/common, -/obj/effect/paint_stripe/common, -/turf/simulated/floor/plating, -/area/crew_quarters/mess) +/obj/structure/rack, +/obj/random/tech_supply, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/thirddeck/forestarboard) "aI" = ( /turf/simulated/floor/reinforced/airless, /area/space) @@ -419,12 +422,16 @@ /turf/simulated/wall/map_preset/tan, /area/hydroponics) "bB" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/light/spot{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/tiled/white, /area/crew_quarters/galley) "bC" = ( @@ -727,15 +734,9 @@ /turf/simulated/floor/tiled/monotile, /area/hydroponics) "cj" = ( -/obj/structure/closet/emcloset/torch, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled/techfloor, /area/maintenance/thirddeck/starboard) -"cl" = ( -/obj/structure/reagent_dispensers/beerkeg, -/obj/effect/floor_decal/corner/green/half, -/obj/machinery/light/spot, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/bar) "cm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -786,34 +787,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/thirddeck/aftstarboard) -"cs" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/mess) -"ct" = ( -/obj/structure/table/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/green/half{ - dir = 4 - }, -/obj/item/chems/drinks/glass2/mug, -/obj/item/chems/drinks/glass2/mug, -/obj/item/chems/drinks/glass2/mug, -/obj/item/chems/drinks/glass2/mug, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/bar) "cu" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/atmospherics/binary/passive_gate, @@ -1066,8 +1039,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/corner/green{ - dir = 9 +/obj/structure/closet/walllocker/skinsuit{ + dir = 1 }, /turf/simulated/floor/tiled/monotile, /area/hydroponics) @@ -1106,36 +1079,29 @@ }, /turf/simulated/floor/plating, /area/hallway/primary/thirddeck/center) -"cT" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/corner/green/half{ - dir = 8 - }, -/obj/item/stool/bar/padded, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/mess) "cU" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, /obj/item/radio/intercom{ dir = 4; pixel_x = -21 }, -/obj/structure/table/marble, -/obj/item/chems/condiment/small/peppermill{ - pixel_x = 3; - pixel_y = 1 +/obj/effect/floor_decal/corner/green/half{ + dir = 8 }, -/obj/item/chems/condiment/small/saltshaker{ - pixel_x = -3 +/obj/structure/table, +/obj/item/chems/drinks/glass2/coffeecup/britcup{ + pixel_x = -5; + pixel_y = 8 }, -/obj/item/chems/condiment/enzyme{ - pixel_x = 9; - pixel_y = 5 +/obj/item/chems/drinks/glass2/coffeecup/black{ + pixel_x = -5; + pixel_y = -2 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) +/obj/item/sticky_pad{ + pixel_x = 5; + pixel_y = 3 + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "cV" = ( /obj/effect/floor_decal/corner/green{ dir = 10 @@ -1306,9 +1272,9 @@ /turf/simulated/floor/tiled/dark, /area/vacant/mess) "dk" = ( -/obj/structure/closet/crate/freezer, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/galleybackroom) +/obj/effect/paint_stripe/common, +/turf/simulated/wall/map_preset/tan, +/area/maintenance/thirddeck/forestarboard) "dl" = ( /turf/simulated/wall/prepainted, /area/maintenance/substation/thirddeck) @@ -1434,38 +1400,15 @@ /turf/simulated/floor/tiled/dark/monotile, /area/security/habcheck) "dF" = ( -/obj/structure/table/marble, -/obj/machinery/door/blast/shutters{ - dir = 4; - id_tag = "bar"; - name = "Bar Shutters" - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/dark, -/area/crew_quarters/bar) +/area/crew_quarters/mess) "dG" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/item/chems/glass/bucket, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/camera/network/third_deck{ - c_tag = "Hydroponics - Fore"; - dir = 1 - }, -/obj/effect/floor_decal/corner/green{ - dir = 1 - }, -/turf/simulated/floor/tiled/monotile, -/area/hydroponics) +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/vending/dinnerware, +/obj/effect/floor_decal/corner/black/diagonal, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/galley) "dH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -1476,16 +1419,20 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/machinery/seed_storage/garden, -/turf/simulated/floor/tiled, -/area/hydroponics) -"dI" = ( -/obj/structure/table, -/obj/machinery/chemical_dispenser/bar_coffee/full{ +/obj/structure/reagent_dispensers/watertank, +/obj/item/chems/glass/bucket, +/obj/machinery/camera/network/third_deck{ + c_tag = "Hydroponics - Fore"; + dir = 1 + }, +/obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/bar) +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, +/turf/simulated/floor/tiled/monotile, +/area/hydroponics) "dJ" = ( /obj/structure/table/steel, /obj/random/snack, @@ -1604,16 +1551,14 @@ /turf/simulated/floor/plating, /area/vacant/mess) "dY" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/corner/green/half{ - dir = 8 +/obj/structure/table/marble, +/obj/machinery/door/blast/shutters{ + dir = 2; + id_tag = "bar"; + name = "Bar Shutters" }, -/obj/item/stool/bar/padded, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/mess) +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "dZ" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -1771,33 +1716,19 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/thirddeck/forestarboard) "et" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/closet/secure_closet/freezer/meat, -/obj/item/chems/condiment/barbecue, +/obj/structure/closet/secure_closet/freezer/fridge, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/galleybackroom) "eu" = ( +/obj/structure/cable/green, +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -24 + }, /obj/machinery/icecream_vat, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/galleybackroom) -"ew" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) "ex" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 8; @@ -1962,16 +1893,30 @@ /turf/simulated/floor/plating, /area/thruster/d3starboard) "eQ" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 +/obj/structure/table, +/obj/machinery/button/blast_door{ + id_tag = "bar"; + name = "Bar Shutters"; + pixel_x = -5; + pixel_y = -3 }, -/obj/structure/closet/secure_closet/freezer/fridge, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/status_display{ - pixel_x = -32 +/obj/machinery/light_switch{ + pixel_x = 5; + pixel_y = -3 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) +/obj/effect/floor_decal/corner/green/half{ + dir = 8 + }, +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -24 + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "eR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -2210,22 +2155,14 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/head) -"fp" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) "fq" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, /obj/machinery/light{ dir = 1 }, /obj/structure/closet/shipping_wall/filled{ pixel_y = 32 }, +/obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/tiled/white, /area/crew_quarters/galley) "fr" = ( @@ -2248,26 +2185,26 @@ /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/aft) "ft" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/obj/structure/closet/chefcloset_torch, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) -"fy" = ( +/obj/effect/floor_decal/corner/green/mono, +/obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/effect/floor_decal/corner/green/mono, -/obj/item/radio/intercom{ +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) +"fy" = ( +/obj/machinery/smartfridge/foods, +/obj/machinery/door/blast/shutters{ dir = 4; - pixel_x = -22 + id_tag = "kitchen"; + name = "Kitchen Shutters" }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/mess) +/turf/simulated/floor/plating, +/area/crew_quarters/galley) "fz" = ( /obj/structure/sign/poster, /obj/effect/paint/eggshell, @@ -2298,6 +2235,17 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/head) "fE" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/starboard) +"fF" = ( +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -2311,26 +2259,6 @@ dir = 8; icon_state = "warning" }, -/obj/structure/catwalk, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/thirddeck/starboard) -"fF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/catwalk, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) "fG" = ( @@ -2343,14 +2271,13 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -22 - }, /obj/structure/catwalk, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/alarm{ + pixel_y = 24 + }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) "fH" = ( @@ -2497,11 +2424,13 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/thirddeck/foreport) "fU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/bed/chair, +/obj/item/radio/intercom{ + dir = 4; + pixel_x = -23 }, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/bar) +/turf/simulated/floor/carpet/blue, +/area/storage/service) "fV" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -2770,22 +2699,37 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/thirddeck/foreport) "gv" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock/civilian{ + name = "Galley" + }, +/obj/effect/floor_decal/corner/black/diagonal, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/galley) +"gw" = ( /obj/effect/floor_decal/corner/green/half{ dir = 8 }, -/obj/machinery/light/spot{ - dir = 8 +/obj/item/stool/bar/padded, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/mess) -"gw" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/disposalpipe/junction{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ dir = 4; - icon_state = "pipe-j2" + icon_state = "pipe-c" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/mess) "gx" = ( /obj/structure/lattice, @@ -2795,61 +2739,64 @@ /turf/simulated/open, /area/maintenance/thirddeck/aftport) "gy" = ( +/obj/structure/disposalpipe/sortjunction/flipped{ + dir = 4; + name = "Hydroponics"; + sort_type = "Hydroponics" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/dark, /area/crew_quarters/mess) "gz" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/window/reinforced, +/obj/structure/bed/chair/padded/red{ + dir = 1; + icon_state = "chair_preview" }, -/obj/effect/floor_decal/corner/green/half{ - dir = 4 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 }, -/turf/simulated/floor/tiled/dark/monotile, +/turf/simulated/floor/wood/maple, /area/crew_quarters/mess) "gA" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance{ - name = "Mess Hall Maintenance" +/obj/effect/floor_decal/corner/green, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/mess) "gB" = ( /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/maintenance/thirddeck/forestarboard) "gC" = ( +/obj/item/radio/intercom{ + dir = 4; + pixel_x = -21 + }, +/obj/effect/floor_decal/corner/black/diagonal, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/galley) +"gD" = ( /obj/structure/disposalpipe/up{ dir = 1 }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) -"gD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/thirddeck/starboard) "gE" = ( /obj/effect/shuttle_landmark/ninja/deck4{ name = "3rd Deck, Aft" @@ -3159,26 +3106,17 @@ /turf/simulated/floor/tiled, /area/hydroponics/storage) "hm" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/table/marble, +/obj/machinery/appliance/mixer/cereal{ + pixel_y = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/galleybackroom) "hn" = ( -/obj/machinery/light_switch{ - pixel_x = 24; - pixel_y = 28 - }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/galleybackroom) +/obj/effect/floor_decal/corner/black/diagonal, +/obj/machinery/appliance/cooker/stove, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/galley) "hp" = ( /obj/machinery/light/small, /obj/item/storage/secure/safe{ @@ -3201,48 +3139,26 @@ }, /turf/simulated/floor/tiled/dark, /area/chapel/office) -"hr" = ( -/obj/effect/wallframe_spawn/no_grille, -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/shutters{ - dir = 4; - id_tag = "kitchen"; - name = "Kitchen Shutters" - }, -/obj/effect/paint_stripe/common, -/turf/simulated/floor/plating, -/area/crew_quarters/galley) -"hs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/mess) "ht" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/effect/floor_decal/corner/green/half{ + dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/vending/cola, +/obj/machinery/light{ + dir = 1 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/mess) "hu" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/window/reinforced{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/window/reinforced, /obj/structure/table/woodentable/walnut, -/turf/simulated/floor/carpet, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 + }, +/turf/simulated/floor/wood/maple, /area/crew_quarters/mess) "hv" = ( /obj/structure/railing/mapped{ @@ -3251,19 +3167,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/foreport) -"hw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/green, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/mess) "hx" = ( /obj/structure/fitness/weightlifter, /turf/simulated/floor/tiled, @@ -3278,27 +3181,24 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" - }, -/obj/machinery/light, +/obj/structure/catwalk, +/obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) "hz" = ( +/obj/structure/catwalk, /obj/structure/cable/green{ - icon_state = "1-8" + icon_state = "4-8" }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/effect/floor_decal/industrial/warning{ + dir = 1; + icon_state = "warning" }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) @@ -3430,6 +3330,7 @@ /area/hallway/primary/thirddeck/aft) "hV" = ( /obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/design_database, /turf/simulated/floor/bluegrid, /area/tcommsat/chamber) "hW" = ( @@ -3550,99 +3451,56 @@ /turf/simulated/floor/plating, /area/maintenance/thirddeck/forestarboard) "ig" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, /obj/machinery/light_switch{ pixel_x = -22; pixel_y = 26 }, +/obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/tiled/white, /area/crew_quarters/galley) -"ii" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +"ij" = ( +/obj/structure/table/marble, +/obj/item/chems/condiment/small/spacespice{ + pixel_x = -8; + pixel_y = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/item/chems/condiment/small/saltshaker{ + pixel_x = -3 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/item/chems/condiment/small/peppermill{ + pixel_x = 3; + pixel_y = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/item/chems/condiment/enzyme{ + pixel_x = 9; + pixel_y = 5 }, +/obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/tiled/white, /area/crew_quarters/galley) -"ij" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/galleybackroom) "ik" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/machinery/chem_master/condimaster{ + name = "CondiMaster Neo" }, +/obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/tiled/white, /area/crew_quarters/galley) "il" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) -"im" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/table/marble, +/obj/machinery/reagent_temperature/cooler{ + pixel_x = 8; + pixel_y = 12 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/reagentgrinder/juicer{ + pixel_x = -8; + pixel_y = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/reagent_temperature{ + pixel_x = 8 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/effect/floor_decal/corner/black/diagonal, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/crew_quarters/galley) "in" = ( @@ -3658,56 +3516,46 @@ /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/fore) "ir" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/corner/green/half{ + dir = 8 }, +/obj/item/stool/bar/padded, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/mess) "is" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/structure/table/marble, +/obj/effect/floor_decal/corner/black/diagonal, +/obj/item/kitchen/rollingpin{ + pixel_x = -4 }, -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/item/knife/kitchen{ + pixel_x = 10 }, -/obj/structure/bed/chair/padded/green, -/turf/simulated/floor/carpet, -/area/crew_quarters/mess) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/galley) "it" = ( /obj/machinery/atmospherics/pipe/simple/visible/fuel, /turf/simulated/wall/r_wall/map_preset/tan, /area/thruster/d3port) "iu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/bed/chair/padded/green, -/turf/simulated/floor/carpet, -/area/crew_quarters/mess) -"iv" = ( -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 +/obj/structure/window/reinforced{ + dir = 4 }, -/obj/effect/floor_decal/corner/green/half{ +/obj/structure/table/woodentable/walnut, +/obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/turf/simulated/floor/tiled/dark/monotile, +/turf/simulated/floor/wood/maple, /area/crew_quarters/mess) +"iv" = ( +/obj/effect/wallframe_spawn/no_grille, +/obj/effect/paint_stripe/common, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/crew_quarters/galley) "ix" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -3717,6 +3565,23 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) +"iy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/corner/green/half, +/obj/machinery/camera/network/third_deck{ + c_tag = "Mess Hall - Bar Counter"; + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/mess) "iA" = ( /obj/machinery/light/small{ dir = 1 @@ -3919,6 +3784,7 @@ "iU" = ( /obj/structure/closet/secure_closet/freezer/meat, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/chems/condiment/barbecue, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/galleybackroom) "iV" = ( @@ -3934,35 +3800,33 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/thirddeck/port) "iW" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/door/airlock/freezer{ + name = "Galley Cold Room" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/galleybackroom) "iX" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/tiled/white, /area/crew_quarters/galley) -"iY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/effect/floor_decal/corner/green/half{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/mess) "ja" = ( /obj/structure/railing/mapped{ dir = 1; @@ -3982,11 +3846,11 @@ /turf/simulated/floor/tiled, /area/crew_quarters/gym) "jd" = ( -/obj/item/stool/bar/padded, -/obj/effect/floor_decal/corner/green/half{ +/obj/structure/table/woodentable/walnut, +/obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/turf/simulated/floor/tiled/dark/monotile, +/turf/simulated/floor/wood/maple, /area/crew_quarters/mess) "je" = ( /obj/effect/floor_decal/corner/green{ @@ -3996,13 +3860,20 @@ /area/hallway/primary/thirddeck/aft) "jf" = ( /obj/effect/floor_decal/corner/green/half{ - dir = 8 + dir = 4 }, -/obj/machinery/light/spot{ - dir = 1 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/item/radio/intercom{ + dir = 8; + pixel_x = 21 }, /turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/bar) +/area/crew_quarters/mess) "jh" = ( /obj/machinery/door/airlock/vault/bolted{ id_tag = "civsafedoor"; @@ -4020,13 +3891,6 @@ /obj/effect/floor_decal/corner/green/half, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/thirddeck/aft) -"jj" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) "jk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -4054,10 +3918,12 @@ /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/aft) "jn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/bed/chair/padded/red{ + dir = 1; + icon_state = "chair_preview" }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/wood/maple, /area/crew_quarters/mess) "jo" = ( /turf/simulated/floor/bluegrid, @@ -4348,71 +4214,58 @@ /turf/simulated/floor/plating, /area/maintenance/thirddeck/foreport) "jV" = ( -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/effect/floor_decal/corner/green/half{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/hologram/holopad, +/obj/structure/disposalpipe/sortjunction/flipped{ + dir = 1; + name = "Galley"; + sort_type = "Galley" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 9 }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/mess) "jW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/bed/chair/padded/green{ - dir = 1; - icon_state = "chair_preview" - }, -/turf/simulated/floor/carpet, -/area/crew_quarters/mess) -"jX" = ( -/obj/abstract/landmark{ - name = "lightsout" + dir = 10 }, /obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 10 }, -/obj/structure/bed/chair/padded/green{ - dir = 1; - icon_state = "chair_preview" +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/mess) -"jY" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/item/stool/bar/padded, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"jX" = ( +/obj/structure/bed/chair/padded/red{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 }, -/obj/effect/floor_decal/corner/green/half{ - dir = 4 +/turf/simulated/floor/wood/maple, +/area/crew_quarters/mess) +"jY" = ( +/obj/structure/bed/chair/padded/red, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 }, -/turf/simulated/floor/tiled/dark/monotile, +/turf/simulated/floor/wood/maple, /area/crew_quarters/mess) "jZ" = ( /turf/simulated/wall/r_wall/map_preset/tan, @@ -4422,14 +4275,11 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/effect/floor_decal/corner/green/half{ dir = 1 }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/mess) "kc" = ( @@ -4666,30 +4516,24 @@ /turf/simulated/wall/r_wall/map_preset/tan, /area/hallway/primary/thirddeck/center) "kN" = ( -/obj/structure/disposalpipe/sortjunction/flipped{ - dir = 4; - name = "Hydroponics"; - sort_type = "Hydroponics" - }, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/mess) -"kO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/green/mono, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 +/obj/structure/disposalpipe/junction/mirrored{ + dir = 4 }, -/turf/simulated/floor/tiled/dark/monotile, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/mess) +"kO" = ( +/obj/structure/hygiene/sink/kitchen{ + pixel_x = -32 + }, +/obj/effect/floor_decal/corner/black/diagonal, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/galley) "kP" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -4700,13 +4544,17 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/safe_room/thirddeck) "kQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/green/half{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/dark, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/noticeboard{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/mess) "kR" = ( /obj/structure/cable/green{ @@ -4737,9 +4585,8 @@ pixel_y = -4 }, /obj/effect/paint_stripe/common, -/obj/effect/paint_stripe/common, /turf/simulated/wall/map_preset/tan, -/area/crew_quarters/galley) +/area/crew_quarters/bar) "kU" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -4771,13 +4618,13 @@ /turf/simulated/floor/plating, /area/maintenance/thirddeck/foreport) "kY" = ( -/obj/machinery/button/blast_door{ - id_tag = "bar"; - name = "Bar Shutters"; - pixel_y = 24 +/obj/effect/floor_decal/corner/green/mono, +/obj/machinery/light{ + dir = 8 }, +/obj/structure/rack, /turf/simulated/floor/tiled/dark, -/area/crew_quarters/bar) +/area/storage/service) "kZ" = ( /obj/structure/railing/mapped, /obj/structure/lattice, @@ -4806,10 +4653,15 @@ /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/aft) "ld" = ( -/obj/structure/glass_tank/aquarium, -/mob/living/simple_animal/aquatic/fish/grump, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/bar) +/obj/effect/floor_decal/corner/green/half{ + dir = 8 + }, +/obj/structure/closet/chefcloset_torch, +/obj/effect/floor_decal/corner/green/mono, +/obj/machinery/light, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, +/area/storage/service) "le" = ( /obj/structure/rack, /obj/random/maintenance/solgov, @@ -4853,6 +4705,22 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel_ridged, /area/maintenance/thirddeck/aftstarboard) +"ll" = ( +/obj/effect/floor_decal/corner/green/half{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/camera/network/third_deck{ + c_tag = "Mess Hall - Dining"; + dir = 8 + }, +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/mess) "lm" = ( /obj/machinery/disposal, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -5110,6 +4978,19 @@ }, /turf/simulated/floor/tiled/dark, /area/command/disperser) +"lY" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/effect/floor_decal/corner/green{ + dir = 5 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/noticeboard{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/thirddeck/center) "ma" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -5126,9 +5007,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/machinery/atm{ - pixel_y = 32 - }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/thirddeck/center) "mc" = ( @@ -5261,56 +5139,29 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel_ridged, /area/hallway/primary/thirddeck/fore) -"ml" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/obj/structure/hygiene/sink/kitchen{ - pixel_x = -32 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) "mm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) -"mn" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/obj/machinery/appliance/cooker/stove, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) -"mo" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/sortjunction/flipped{ - dir = 1; - name = "Galley"; - sort_type = "Galley" - }, -/obj/effect/floor_decal/corner/green/half{ +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) +"mn" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/mess) -"mp" = ( -/obj/structure/bed/chair/padded/green, -/turf/simulated/floor/carpet, -/area/crew_quarters/mess) +/obj/effect/floor_decal/corner/black/diagonal, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/galley) "mr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/plating, @@ -5365,11 +5216,8 @@ /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/aft) "mF" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/obj/structure/table/marble, -/obj/machinery/appliance/mixer/cereal, +/obj/machinery/appliance/cooker/fryer, +/obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/tiled/white, /area/crew_quarters/galley) "mG" = ( @@ -5396,6 +5244,18 @@ }, /turf/simulated/floor/tiled/dark/monotile, /area/command/disperser) +"mQ" = ( +/obj/machinery/door/blast/shutters{ + dir = 4; + id_tag = "kitchen"; + name = "Kitchen Shutters" + }, +/obj/structure/table/marble, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/corner/black/diagonal, +/obj/item/bell, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/galley) "mR" = ( /obj/effect/floor_decal/industrial/hatch/red, /obj/structure/ship_munition/disperser_charge/explosive, @@ -5509,37 +5369,26 @@ /turf/simulated/floor/tiled/monotile, /area/hallway/primary/thirddeck/fore) "nc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) +/obj/effect/floor_decal/corner/green/half{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "nd" = ( -/obj/structure/table/woodentable/walnut, -/obj/item/chems/condiment/small/saltshaker, -/obj/item/chems/condiment/small/peppermill, -/turf/simulated/floor/carpet, -/area/crew_quarters/mess) -"ne" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ +/obj/structure/bed/chair/padded/red{ dir = 4 }, -/obj/structure/table/marble, -/obj/machinery/reagentgrinder/juicer{ - pixel_y = 4 - }, -/obj/item/chems/glass/beaker/large, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) -"nf" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/structure/hygiene/sink/kitchen{ - pixel_y = 32 +/obj/structure/window/reinforced, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 }, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/bar) +/turf/simulated/floor/wood/maple, +/area/crew_quarters/mess) "ng" = ( /obj/effect/floor_decal/techfloor{ dir = 5 @@ -5547,37 +5396,23 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hardstorage) "nh" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/dark, +/obj/item/stool/bar/padded, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/mess) "nj" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/obj/item/stool/bar/padded, -/obj/effect/floor_decal/corner/green/half{ - dir = 4 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 }, -/turf/simulated/floor/tiled/dark/monotile, +/turf/simulated/floor/wood/maple, /area/crew_quarters/mess) "nk" = ( -/obj/structure/table/marble, -/obj/machinery/door/blast/shutters{ - dir = 4; - id_tag = "bar"; - name = "Bar Shutters" - }, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/bar) +/obj/effect/floor_decal/corner/black/diagonal, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/galley) "nl" = ( /obj/machinery/camera/network/engineering{ c_tag = "Engineering - EVA"; @@ -5588,10 +5423,12 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hardstorage) "nm" = ( -/obj/structure/glass_tank/aquarium, -/mob/living/simple_animal/aquatic/fish, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/bar) +/obj/machinery/alarm{ + dir = 4; + pixel_x = -23 + }, +/turf/simulated/floor/carpet/blue, +/area/storage/service) "no" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1; @@ -5675,18 +5512,22 @@ /turf/simulated/wall/prepainted, /area/vacant/mess) "nD" = ( +/obj/effect/floor_decal/corner/green/mono, +/obj/machinery/door/firedoor, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/door/airlock/civilian{ + name = "Service Equipment" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/hygiene/drain, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/bar) +/turf/simulated/floor/tiled/dark, +/area/storage/service) "nE" = ( /obj/machinery/atmospherics/pipe/simple/visible/fuel{ dir = 4 @@ -5730,10 +5571,11 @@ /turf/simulated/floor/airless, /area/command/disperser) "nN" = ( -/obj/effect/paint_stripe/common, -/obj/effect/paint_stripe/common, -/turf/simulated/wall/map_preset/tan, -/area/crew_quarters/galley) +/obj/structure/glass_tank/aquarium, +/mob/living/simple_animal/aquatic/fish/grump, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/crew_quarters/bar) "nO" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -5897,7 +5739,9 @@ /obj/effect/floor_decal/corner/green{ dir = 8 }, -/obj/structure/closet/walllocker/skinsuit, +/obj/structure/hygiene/sink/kitchen{ + pixel_y = -32 + }, /turf/simulated/floor/tiled/monotile, /area/hydroponics) "oa" = ( @@ -5949,19 +5793,31 @@ /area/hallway/primary/thirddeck/fore) "og" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "2-8" }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "oh" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/hygiene/sink/kitchen{ + pixel_y = -32 + }, /obj/structure/hygiene/drain, +/obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/tiled/white, /area/crew_quarters/galley) "oi" = ( @@ -6047,11 +5903,13 @@ /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/fore) "oz" = ( -/obj/effect/floor_decal/corner/green/half{ - dir = 4 +/obj/structure/bed/chair/padded/red{ + dir = 8 }, -/obj/item/stool/bar/padded, -/turf/simulated/floor/tiled/dark/monotile, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/turf/simulated/floor/wood/maple, /area/crew_quarters/mess) "oA" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -6138,6 +5996,18 @@ /obj/random/drinkbottle, /turf/simulated/floor/wood/walnut, /area/crew_quarters/recreation) +"oP" = ( +/obj/effect/floor_decal/corner/green/half{ + dir = 1 + }, +/obj/structure/table/marble, +/obj/machinery/door/blast/shutters{ + dir = 4; + id_tag = "bar"; + name = "Bar Shutters" + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "oT" = ( /obj/structure/railing/mapped{ dir = 1; @@ -6206,14 +6076,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -32 +/obj/structure/cable/green{ + icon_state = "1-4" }, -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) +/obj/effect/floor_decal/corner/green/half, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "oZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6221,45 +6093,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/obj/machinery/light/spot, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) -"pa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/button/blast_door{ - id_tag = "kitchen"; - name = "Kitchen Shutters"; - pixel_y = -21 - }, -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) -"pb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 +/obj/effect/floor_decal/corner/green/half, +/obj/structure/window/reinforced{ + dir = 1 }, -/obj/machinery/light_switch{ - pixel_x = -4; - pixel_y = -23 +/obj/machinery/door/window/brigdoor/eastleft{ + name = "Bar" }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "pc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6267,14 +6112,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/obj/machinery/door/airlock/civilian{ - name = "Galley" +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) +/obj/effect/floor_decal/corner/green/half, +/obj/machinery/light, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/mess) "pd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6282,43 +6126,74 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/corner/green/mono, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/mess) -"pe" = ( /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/effect/floor_decal/corner/green/half, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/mess) +"pe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /obj/effect/floor_decal/corner/green/half, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/mess) "pf" = ( /obj/effect/floor_decal/corner/green/half, -/obj/machinery/light/spot, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/light, /turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/mess) "pg" = ( /obj/effect/floor_decal/corner/green/half, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/mess) "pi" = ( -/obj/structure/window/reinforced{ - dir = 1 +/obj/effect/floor_decal/corner/green/half, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/door/window/brigdoor/eastleft{ - name = "Bar" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/floor_decal/corner/green/mono, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/bar) +/area/crew_quarters/mess) "pj" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/suit_cycler/engineering/prepared/atmospheric, @@ -6417,18 +6292,32 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/thruster/d3port) +"pu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) "pv" = ( /obj/structure/table/woodentable/walnut, /turf/simulated/floor/carpet, /area/crew_quarters/sleep/dorms/one) "pw" = ( -/obj/structure/railing/mapped{ +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/industrial/warning{ dir = 8; - icon_state = "railing0-1" + icon_state = "warning" }, -/obj/structure/railing/mapped{ - dir = 1; - icon_state = "railing0-1" +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 4; + icon_state = "bulb1" }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) @@ -6586,32 +6475,21 @@ /turf/simulated/wall/r_wall/map_preset/tan, /area/hallway/primary/thirddeck/center) "pX" = ( -/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/galleybackroom) +"pY" = ( /obj/effect/wallframe_spawn/no_grille, /obj/effect/paint_stripe/common, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/crew_quarters/mess) -"pY" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, +"pZ" = ( /obj/effect/wallframe_spawn/no_grille, /obj/machinery/door/firedoor, /obj/effect/paint_stripe/common, -/obj/effect/paint_stripe/common, /turf/simulated/floor/plating, /area/crew_quarters/mess) -"pZ" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass/civilian{ - name = "Mess Hall" - }, -/obj/effect/floor_decal/corner/green/mono, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/mess) "qa" = ( /obj/machinery/camera/network/command{ c_tag = "Fire Control - Controls"; @@ -6833,14 +6711,17 @@ /turf/simulated/floor/plating, /area/maintenance/thirddeck/port) "qO" = ( -/obj/structure/disposalpipe/segment{ +/obj/effect/floor_decal/corner/green/half{ dir = 4 }, -/obj/effect/floor_decal/corner/green/half{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/bar) +/area/crew_quarters/mess) "qP" = ( /obj/effect/floor_decal/corner/green/half{ dir = 1 @@ -6855,12 +6736,13 @@ /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/center) "qR" = ( -/obj/machinery/door/firedoor, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/monotile, -/area/hallway/primary/thirddeck/center) +/obj/structure/table/woodentable/walnut, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood/maple, +/area/crew_quarters/mess) "qS" = ( -/obj/structure/disposalpipe/segment, /obj/effect/floor_decal/corner/green{ dir = 5 }, @@ -6870,26 +6752,27 @@ /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/center) "qU" = ( +/obj/effect/floor_decal/corner/green{ + dir = 5 + }, /obj/machinery/camera/network/third_deck{ c_tag = "Third Deck Hallway - Cryogenic Storage" }, /obj/machinery/light{ dir = 1 }, -/obj/effect/floor_decal/corner/green{ - dir = 5 +/obj/machinery/atm{ + pixel_y = 32 }, /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/center) "qV" = ( -/obj/effect/floor_decal/corner/green{ - dir = 5 - }, -/obj/structure/sign/double/barsign{ - pixel_y = 32 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/hallway/primary/thirddeck/center) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/galleybackroom) "qW" = ( /obj/machinery/constructable_frame/machine_frame, /obj/machinery/alarm{ @@ -7016,20 +6899,30 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/aft) -"rm" = ( -/obj/structure/table/marble, -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/obj/item/book/manual/chef_recipes, -/obj/item/sticky_pad/random, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) "rp" = ( /obj/machinery/hologram/holopad, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/thirddeck/aft) +"rq" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/catwalk_plated, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/hallway/primary/thirddeck/center) "rr" = ( /obj/machinery/power/apc{ dir = 1; @@ -7145,30 +7038,11 @@ }, /turf/simulated/floor/wood/walnut, /area/crew_quarters/head/sauna) -"rF" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/bar) "rH" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/maintenance/thirddeck/starboard) -"rM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/mess) "rP" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -7437,10 +7311,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/effect/catwalk_plated, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -7448,71 +7318,66 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + name = "Cryogenic Storage"; + sort_type = "Cryogenic Storage" + }, /turf/simulated/floor/plating, /area/hallway/primary/thirddeck/center) "so" = ( +/obj/effect/catwalk_plated, /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/item/radio/beacon, +/obj/machinery/hologram/holopad, /obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, -/obj/machinery/hologram/holopad, -/obj/effect/catwalk_plated, /turf/simulated/floor/plating, /area/hallway/primary/thirddeck/center) "sp" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/catwalk_plated, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/sortjunction{ - dir = 4; - name = "Cryogenic Storage"; - sort_type = "Cryogenic Storage" +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/effect/catwalk_plated, /turf/simulated/floor/plating, /area/hallway/primary/thirddeck/center) "sq" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/obj/machinery/appliance/cooker/oven, +/obj/machinery/appliance/cooker/stove, +/obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/tiled/white, /area/crew_quarters/galley) "sr" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/table/marble, +/obj/item/knife/kitchen{ + pixel_x = 10 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/item/kitchen/rollingpin{ + pixel_x = -4 }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/monotile, -/area/hallway/primary/thirddeck/center) +/obj/effect/floor_decal/corner/black/diagonal, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/galley) "ss" = ( /obj/effect/floor_decal/corner/green/three_quarters, /obj/machinery/status_display{ @@ -7828,6 +7693,14 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/aft) +"sY" = ( +/obj/structure/disposalpipe/sortjunction/flipped{ + dir = 1; + name = "Bar"; + sort_type = "Bar" + }, +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/mess) "sZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -7857,6 +7730,10 @@ /obj/machinery/vending/snack, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/thirddeck/aft) +"ti" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/thirddeck/starboard) "tk" = ( /obj/structure/rack, /obj/random/toy, @@ -7903,14 +7780,24 @@ /turf/simulated/floor/tiled/steel_ridged, /area/hallway/primary/thirddeck/center) "tu" = ( +/obj/effect/floor_decal/corner/green/half{ + dir = 8 + }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/bar) +/obj/machinery/light_switch{ + pixel_x = -22; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/dark, +/area/storage/service) "tv" = ( /obj/effect/floor_decal/corner/red{ dir = 10 @@ -7987,11 +7874,14 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/bar) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/storage/service) "tG" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -8000,10 +7890,21 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/safe_room/thirddeck) "tH" = ( +/obj/structure/window/reinforced, +/obj/structure/bed/chair/padded/red{ + dir = 1; + icon_state = "chair_preview" + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/turf/simulated/floor/wood/maple, +/area/crew_quarters/mess) +"tI" = ( /obj/effect/floor_decal/corner/green/half, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/thirddeck/center) -"tI" = ( +"tJ" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -8015,24 +7916,14 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/center) -"tJ" = ( -/obj/machinery/atm{ - pixel_y = -32 - }, -/obj/effect/floor_decal/corner/green{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/thirddeck/center) "tL" = ( +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/camera/network/third_deck{ c_tag = "Third Deck Hallway - Center"; dir = 1 }, -/obj/effect/floor_decal/corner/green{ - dir = 10 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/monotile, /area/hallway/primary/thirddeck/center) "tM" = ( /obj/effect/floor_decal/corner/green{ @@ -8136,6 +8027,12 @@ /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, /area/hallway/primary/thirddeck/center) +"tY" = ( +/obj/machinery/status_display, +/obj/effect/paint/eggshell, +/obj/effect/paint_stripe/common, +/turf/simulated/wall/r_wall/map_preset/tan, +/area/crew_quarters/sleep/cryo) "tZ" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -8165,15 +8062,6 @@ "ub" = ( /turf/simulated/wall/walnut, /area/vacant/cabin) -"ud" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/bar) "ue" = ( /obj/effect/floor_decal/corner/green/half, /obj/structure/cable/green{ @@ -8310,6 +8198,25 @@ /obj/machinery/hologram/holopad/longrange, /turf/simulated/floor/tiled/monotile, /area/command/disperser) +"uv" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/effect/catwalk_plated, +/turf/simulated/floor/plating, +/area/hallway/primary/thirddeck/center) "ux" = ( /obj/effect/floor_decal/corner/lime{ dir = 4 @@ -8420,6 +8327,7 @@ /obj/machinery/door/airlock/glass/civilian{ name = "Cryogenic Storage" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel_ridged, /area/crew_quarters/sleep/cryo) "uR" = ( @@ -8428,10 +8336,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/effect/wallframe_spawn/no_grille, /obj/machinery/door/firedoor, /obj/effect/paint_stripe/common, @@ -8439,10 +8343,6 @@ /area/crew_quarters/sleep/cryo) "uS" = ( /obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/door/airlock/glass/civilian{ name = "Cryogenic Storage" }, @@ -8492,13 +8392,14 @@ /turf/simulated/floor/plating, /area/maintenance/thirddeck/aftstarboard) "vd" = ( -/obj/structure/closet/secure_closet/bar_torch, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/light/spot{ +/obj/effect/floor_decal/corner/green/mono, +/obj/machinery/light{ dir = 1 }, +/obj/structure/closet/waitstaff_torch, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, -/area/crew_quarters/bar) +/area/storage/service) "ve" = ( /turf/simulated/wall/map_preset/tan, /area/maintenance/thirddeck/aftstarboard) @@ -8543,6 +8444,15 @@ }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/port) +"vl" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/sign/poster{ + pixel_x = 32 + }, +/turf/simulated/floor/carpet/blue, +/area/storage/service) "vm" = ( /obj/machinery/door/airlock/chaplain{ name = "Chapel" @@ -8595,16 +8505,14 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/aft) -"vw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/green/half{ +"vx" = ( +/obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/structure/table, -/obj/item/chems/drinks/glass2/coffeecup/britcup, -/obj/item/chems/drinks/glass2/coffeecup/britcup, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/bar) +/obj/effect/landmark/latejoin/cryo, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) "vy" = ( /turf/simulated/wall/r_wall/prepainted, /area/command/disperser) @@ -8754,7 +8662,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "vX" = ( @@ -8962,13 +8869,6 @@ }, /turf/simulated/floor/tiled/dark, /area/chapel/main) -"ww" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) "wy" = ( /obj/machinery/firealarm{ dir = 1; @@ -9003,16 +8903,6 @@ /obj/structure/window/reinforced, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/galleybackroom) -"wD" = ( -/obj/effect/wallframe_spawn/reinforced, -/obj/machinery/door/blast/shutters{ - dir = 2; - id_tag = "bar"; - name = "Bar Shutters" - }, -/obj/effect/paint_stripe/common, -/turf/simulated/floor/plating, -/area/crew_quarters/bar) "wI" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -9277,7 +9167,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/vending/hydronutrients/generic, +/obj/machinery/seed_storage/garden, /turf/simulated/floor/tiled, /area/hydroponics) "xp" = ( @@ -9315,6 +9205,19 @@ /obj/structure/bed/chair/pew/left/mahogany, /turf/simulated/floor/tiled/dark, /area/chapel/main) +"xu" = ( +/obj/effect/floor_decal/corner/green/half{ + dir = 1 + }, +/obj/structure/table, +/obj/machinery/chemical_dispenser/bar_coffee/full{ + pixel_y = 9 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "xv" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -9363,7 +9266,7 @@ /obj/machinery/atmospherics/valve/shutoff{ dir = 4 }, -/obj/structure/noticeboard{ +/obj/structure/sign/double/barsign{ pixel_y = 32 }, /turf/simulated/floor/tiled, @@ -9557,12 +9460,8 @@ /area/crew_quarters/sleep/dorms/four) "xZ" = ( /obj/structure/table, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/machinery/power/apc/super/critical{ +/obj/machinery/firealarm{ dir = 8; - name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/tiled/white/monotile, @@ -9571,15 +9470,9 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "yb" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -9589,23 +9482,17 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "yd" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "ye" = ( @@ -9662,6 +9549,22 @@ /obj/effect/floor_decal/corner/green, /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/aft) +"yn" = ( +/obj/effect/floor_decal/corner/green/half{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light/small{ + dir = 4; + icon_state = "bulb1" + }, +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/mess) "yp" = ( /obj/item/radio/intercom{ dir = 8; @@ -9799,18 +9702,27 @@ /turf/simulated/floor/tiled/steel_ridged, /area/teleporter/thirddeck) "yQ" = ( +/obj/effect/floor_decal/corner/green/half, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, -/area/crew_quarters/bar) +/area/storage/service) "yS" = ( /obj/structure/table, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/machinery/firealarm{ +/obj/random/coin, +/obj/machinery/power/apc/super/critical{ dir = 8; + name = "west bump"; pixel_x = -24 }, -/obj/random/coin, +/obj/structure/cable/green{ + icon_state = "0-4" + }, /turf/simulated/floor/tiled/white/monotile, /area/crew_quarters/sleep/cryo) "yT" = ( @@ -9818,6 +9730,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "yU" = ( @@ -9825,6 +9740,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "yV" = ( @@ -9834,37 +9752,43 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "yW" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/structure/disposalpipe/segment, /obj/item/radio/beacon, /obj/abstract/landmark{ name = "Observer-Start" }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "yX" = ( /obj/effect/floor_decal/industrial/warning/corner, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "yY" = ( @@ -9978,21 +9902,18 @@ /turf/simulated/floor/carpet/blue, /area/crew_quarters/office) "zo" = ( -/obj/machinery/hologram/holopad, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/mess) -"zp" = ( -/obj/structure/table/marble, -/obj/machinery/door/blast/shutters{ - dir = 4; - id_tag = "bar"; - name = "Bar Shutters" - }, -/obj/structure/disposalpipe/segment{ +/obj/structure/bed/chair/padded/red{ dir = 4 }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood/maple, +/area/crew_quarters/mess) +"zp" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark, -/area/crew_quarters/bar) +/area/crew_quarters/mess) "zq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -10110,6 +10031,13 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/techfloor/grid, /area/teleporter/thirddeck) +"zK" = ( +/obj/effect/floor_decal/corner/green/mono, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/curtain/black, +/turf/simulated/floor/tiled/dark, +/area/storage/service) "zL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -10194,6 +10122,16 @@ /obj/machinery/light, /turf/simulated/floor/airless, /area/command/disperser) +"Ac" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) "Ad" = ( /obj/machinery/disperser/middle{ dir = 8 @@ -10207,11 +10145,32 @@ }, /turf/simulated/floor/tiled/dark/monotile, /area/engineering/hardstorage) +"Af" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/thirddeck/starboard) "Ag" = ( /turf/simulated/floor/tiled/dark, /area/chapel/main) "Ai" = ( -/obj/effect/floor_decal/corner/green/mono, +/obj/effect/floor_decal/corner/green/half, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -22 + }, +/obj/machinery/light, /turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/mess) "Aj" = ( @@ -10227,18 +10186,6 @@ /obj/item/target/syndicate, /turf/simulated/floor/tiled/techfloor, /area/vacant/cargo) -"Am" = ( -/obj/structure/table/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/green/half{ - dir = 4 - }, -/obj/item/chems/drinks/glass2/shot, -/obj/item/chems/drinks/glass2/shot, -/obj/item/chems/drinks/glass2/shot, -/obj/item/chems/drinks/glass2/shot, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/bar) "Ao" = ( /obj/machinery/alarm/server{ dir = 4; @@ -10260,18 +10207,19 @@ /turf/simulated/floor/wood, /area/crew_quarters/gym) "Aq" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/bed/chair{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/effect/floor_decal/corner/green/half{ +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/stool/padded, -/turf/simulated/floor/tiled/dark/monotile, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/mess) "Ar" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -10280,8 +10228,14 @@ /turf/simulated/floor/tiled/dark, /area/engineering/hardstorage) "As" = ( +/obj/effect/floor_decal/corner/green/half{ + dir = 8 + }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/item/stool/bar/padded, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/mess) "At" = ( /obj/effect/floor_decal/techfloor{ @@ -10313,16 +10267,12 @@ /turf/simulated/floor/tiled/monotile, /area/crew_quarters/sleep/dorms/hallway) "AA" = ( -/obj/machinery/smartfridge/drinks{ - dir = 4 - }, -/obj/machinery/door/blast/shutters{ - dir = 4; - id_tag = "bar"; - name = "Bar Shutters" +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/bar) +/obj/structure/closet/crate/freezer, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/galleybackroom) "AB" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -10335,13 +10285,10 @@ /turf/simulated/floor/plating, /area/maintenance/thirddeck/foreport) "AC" = ( -/obj/machinery/light/spot{ - dir = 1 - }, -/obj/machinery/vending/cigarette, /obj/effect/floor_decal/corner/green/half{ dir = 1 }, +/obj/machinery/vending/coffee, /turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/mess) "AD" = ( @@ -10427,16 +10374,26 @@ }, /turf/simulated/floor/plating, /area/hallway/primary/thirddeck/aft) +"AS" = ( +/obj/effect/floor_decal/corner/green/half{ + dir = 1 + }, +/obj/structure/table, +/obj/machinery/chemical_dispenser/bar_alc/full{ + pixel_y = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) +"AU" = ( +/obj/effect/paint_stripe/common, +/turf/simulated/wall/map_preset/tan, +/area/maintenance/thirddeck/starboard) "AV" = ( /obj/structure/table/steel, /obj/random/trash, /turf/simulated/floor/plating, /area/maintenance/thirddeck/foreport) "AX" = ( -/obj/item/radio/intercom{ - dir = 4; - pixel_x = -21 - }, /obj/structure/closet/secure_closet/freezer/kitchen{ req_access = newlist() }, @@ -10635,13 +10592,6 @@ }, /turf/simulated/floor/tiled, /area/storage/tools) -"BO" = ( -/obj/structure/table, -/obj/machinery/chemical_dispenser/bar_alc/full{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/bar) "BP" = ( /obj/structure/table/woodentable_reinforced/mahogany, /turf/simulated/floor/wood/maple, @@ -10929,14 +10879,14 @@ /turf/simulated/wall/map_preset/tan, /area/crew_quarters/recreation) "CH" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "CJ" = ( /obj/machinery/light, /turf/simulated/floor/wood/maple, @@ -10979,10 +10929,12 @@ /area/chapel/office) "CO" = ( /obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" + dir = 4 }, -/obj/item/stool/padded, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/crew_quarters/mess) "CQ" = ( @@ -11087,20 +11039,16 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "Dd" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, /obj/abstract/landmark{ name = "lightsout" }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "De" = ( @@ -11383,16 +11331,16 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "DR" = ( +/obj/machinery/hologram/holopad, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/machinery/hologram/holopad, /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "DS" = ( @@ -11643,6 +11591,18 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/thirddeck/port) +"Ey" = ( +/obj/structure/table, +/obj/item/ashtray/plastic{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/structure/sign/warning/nosmoking_burned{ + pixel_x = -27 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/carpet/blue, +/area/storage/service) "Ez" = ( /turf/simulated/wall/map_preset/tan, /area/maintenance/thirddeck/port) @@ -11786,6 +11746,16 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/safe_room/thirddeck) +"ER" = ( +/obj/structure/window/reinforced, +/obj/structure/bed/chair/padded/red{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/turf/simulated/floor/wood/maple, +/area/crew_quarters/mess) "ES" = ( /obj/random/trash, /obj/structure/catwalk, @@ -11814,20 +11784,14 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "EW" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, -/obj/structure/cable/green, -/obj/structure/table/marble, -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "0-4" }, -/obj/machinery/light/spot{ - dir = 8 +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -24 }, -/obj/machinery/reagent_temperature/cooler, +/obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/tiled/white, /area/crew_quarters/galley) "EX" = ( @@ -11999,25 +11963,18 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/safe_room/thirddeck) -"Fw" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/obj/structure/table/marble, -/obj/item/kitchen/rollingpin{ - pixel_x = -4 - }, -/obj/item/knife/kitchen{ - pixel_x = 10 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) "Fx" = ( /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, -/area/crew_quarters/bar) +/area/storage/service) "Fy" = ( /obj/structure/rack, /obj/random/tech_supply, @@ -12061,30 +12018,6 @@ /obj/effect/paint_stripe/common, /turf/simulated/wall/r_wall/map_preset/tan, /area/maintenance/thirddeck/port) -"FG" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/blast/shutters{ - dir = 4; - id_tag = "kitchen"; - name = "Kitchen Shutters" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/firedoor, -/obj/effect/wallframe_spawn/no_grille, -/obj/effect/paint_stripe/common, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) "FH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12183,14 +12116,7 @@ /turf/simulated/floor/tiled/monotile, /area/crew_quarters/cryolocker) "FY" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/machinery/vending/cola, -/obj/effect/floor_decal/corner/green/half{ - dir = 1 - }, +/obj/effect/floor_decal/corner/green/mono, /turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/mess) "FZ" = ( @@ -12213,6 +12139,46 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/dark/monotile, /area/security/habcheck) +"Gb" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/monotile, +/area/hallway/primary/thirddeck/center) +"Gd" = ( +/obj/effect/floor_decal/corner/green/half, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/mess) "Ge" = ( /obj/structure/railing/mapped{ dir = 1; @@ -12266,6 +12232,15 @@ /obj/item/toy/desk/fan, /turf/simulated/floor/tiled/techfloor, /area/vacant/cargo) +"Go" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "Gp" = ( /obj/structure/undies_wardrobe, /turf/simulated/floor/tiled/dark, @@ -12500,6 +12475,22 @@ /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/maintenance/thirddeck/foreport) +"GX" = ( +/obj/effect/floor_decal/corner/green/half{ + dir = 8 + }, +/obj/structure/table, +/obj/machinery/reagentgrinder/juicer{ + pixel_y = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "GY" = ( /obj/structure/hygiene/drain, /turf/simulated/floor/tiled, @@ -12510,6 +12501,22 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/cryolocker) +"Ha" = ( +/obj/effect/floor_decal/corner/green/half{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24 + }, +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/mess) "Hb" = ( /obj/structure/bed/chair/comfy/black{ dir = 8 @@ -12775,19 +12782,22 @@ }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/foreport) +"HT" = ( +/obj/structure/table/marble, +/obj/machinery/door/blast/shutters{ + dir = 2; + id_tag = "bar"; + name = "Bar Shutters" + }, +/obj/item/bell, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "Id" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, /turf/simulated/floor/carpet, /area/crew_quarters/sleep/dorms/three) -"If" = ( -/obj/structure/table, -/obj/machinery/chemical_dispenser/bar_soft/full{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/bar) "Ik" = ( /obj/effect/floor_decal/corner/green{ dir = 10 @@ -12961,21 +12971,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/thirddeck/fore) -"IR" = ( -/obj/machinery/door/airlock/freezer{ - name = "Galley Cold Room" - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/galleybackroom) "IS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -13115,6 +13110,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/center) "Je" = ( @@ -13455,6 +13451,18 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/aft) +"JQ" = ( +/obj/effect/floor_decal/corner/green/half{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/monotile, +/area/hallway/primary/thirddeck/center) "JR" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -13570,6 +13578,16 @@ }, /turf/simulated/floor/tiled/dark/monotile, /area/security/habcheck) +"Ke" = ( +/obj/machinery/vending/snack{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/carpet/blue, +/area/storage/service) "Kf" = ( /obj/random/torchcloset, /obj/random/maintenance/solgov, @@ -13629,23 +13647,16 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/item/chems/syringe, /obj/machinery/light, -/obj/structure/hygiene/sink/kitchen{ - pixel_y = -32 - }, /obj/effect/floor_decal/corner/green, +/obj/machinery/vending/hydronutrients/generic, /turf/simulated/floor/tiled/monotile, /area/hydroponics) "Ko" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/bed/chair/padded/green{ - dir = 1; - icon_state = "chair_preview" +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/wood/maple, /area/crew_quarters/mess) "Kp" = ( /obj/structure/railing/mapped{ @@ -13699,6 +13710,13 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) +"KA" = ( +/obj/structure/bed/chair{ + dir = 8; + icon_state = "chair_preview" + }, +/turf/simulated/floor/carpet/blue, +/area/storage/service) "KI" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/floor_decal/industrial/outline/grey, @@ -13788,13 +13806,13 @@ /turf/simulated/floor/wood/walnut, /area/crew_quarters/head/sauna) "Lb" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/floor_decal/corner/green/half{ dir = 1 }, -/obj/machinery/computer/arcade, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/item/radio/intercom{ + pixel_y = 23 + }, /turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/mess) "Lg" = ( @@ -13804,7 +13822,7 @@ /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) "Lh" = ( -/obj/structure/closet/emcloset/torch, +/obj/structure/closet/emcloset, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/white/monotile, /area/crew_quarters/sleep/cryo) @@ -13845,6 +13863,17 @@ }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/aftport) +"Ls" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/carpet/blue, +/area/storage/service) +"Lv" = ( +/obj/item/stool/bar/padded, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/mess) "Lw" = ( /obj/abstract/landmark{ name = "xeno_spawn"; @@ -13863,15 +13892,12 @@ /turf/simulated/floor/plating, /area/hallway/primary/thirddeck/aft) "Lx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/stool/bar/padded, -/obj/effect/floor_decal/corner/green/half{ - dir = 4 +/obj/machinery/light/spot{ + dir = 8 }, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/mess) +/obj/effect/floor_decal/corner/black/diagonal, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/galley) "Ly" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -14147,12 +14173,17 @@ /turf/simulated/floor/plating, /area/maintenance/thirddeck/forestarboard) "Mv" = ( -/obj/structure/noticeboard{ - pixel_y = 32 +/obj/machinery/camera/network/third_deck{ + c_tag = "Mess Hall - Galley"; + dir = 4 }, -/obj/effect/paint_stripe/common, -/turf/simulated/wall/map_preset/tan, -/area/crew_quarters/galleybackroom) +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 + }, +/obj/effect/floor_decal/corner/black/diagonal, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/galley) "Mx" = ( /turf/simulated/floor/tiled, /area/hydroponics) @@ -14165,12 +14196,18 @@ /turf/simulated/floor/wood/walnut, /area/crew_quarters/recreation) "Mz" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/corner/green{ - dir = 10 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/hallway/primary/thirddeck/center) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/corner/black/diagonal, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/galley) "MA" = ( /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/airless, @@ -14187,15 +14224,8 @@ /turf/simulated/floor/plating, /area/hallway/primary/thirddeck/fore) "MC" = ( -/obj/structure/table/marble, -/obj/machinery/appliance/mixer/candy, -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 - }, +/obj/machinery/appliance/cooker/oven, +/obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/tiled/white, /area/crew_quarters/galley) "MD" = ( @@ -14259,14 +14289,16 @@ /turf/simulated/floor/wood/walnut, /area/crew_quarters/recreation) "MS" = ( -/obj/machinery/fabricator/micro/bartender, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/green/half{ - dir = 8 +/obj/effect/floor_decal/corner/green/half, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, -/obj/structure/table, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/bar) +/obj/machinery/alarm{ + dir = 1; + pixel_y = -22 + }, +/turf/simulated/floor/tiled/dark, +/area/storage/service) "MU" = ( /obj/effect/floor_decal/corner/yellow/half, /turf/simulated/floor/tiled/dark, @@ -14436,9 +14468,18 @@ /turf/simulated/floor/tiled/techfloor, /area/thruster/d3port) "Nw" = ( -/obj/effect/wallframe_spawn/no_grille, /obj/effect/paint_stripe/common, -/turf/space, +/obj/machinery/door/airlock/glass/civilian{ + name = "Mess Hall" + }, +/obj/effect/floor_decal/corner/green/mono, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/mess) "Nx" = ( /obj/machinery/light{ @@ -14512,6 +14553,11 @@ }, /turf/simulated/floor/tiled/white/monotile, /area/crew_quarters/sleep/cryo) +"NG" = ( +/obj/structure/glass_tank/aquarium, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/crew_quarters/mess) "NH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -14620,13 +14666,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/gym) -"Od" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/obj/machinery/appliance/cooker/fryer, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) "Oe" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/light{ @@ -14672,14 +14711,24 @@ /turf/simulated/floor/carpet, /area/crew_quarters/sleep/dorms/one) "Oo" = ( -/obj/effect/floor_decal/corner/green{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/status_display{ - pixel_y = -32 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/hallway/primary/thirddeck/center) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/corner/black/diagonal, +/obj/machinery/button/blast_door{ + id_tag = "kitchen"; + name = "Kitchen Shutters"; + pixel_x = 6; + pixel_y = -22 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/galley) "Op" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -14720,10 +14769,20 @@ /turf/simulated/floor/wood/maple, /area/crew_quarters/sleep/dorms/one) "Ot" = ( -/obj/structure/railing/mapped{ - dir = 8; - icon_state = "railing0-1" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1; + icon_state = "warningcorner" + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) "Ou" = ( @@ -14768,13 +14827,21 @@ /area/maintenance/thirddeck/aftstarboard) "OB" = ( /obj/effect/floor_decal/corner/green/mono, -/obj/machinery/light/spot, -/obj/machinery/light_switch{ - pixel_x = -4; - pixel_y = -23 +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, /turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/bar) +/area/crew_quarters/mess) "OC" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -14878,18 +14945,6 @@ /obj/effect/paint_stripe/common, /turf/simulated/wall/map_preset/tan, /area/crew_quarters/sleep/dorms/one) -"OX" = ( -/obj/structure/table/marble, -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/machinery/reagent_temperature, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) "OY" = ( /obj/effect/floor_decal/corner/green{ dir = 10 @@ -14993,12 +15048,17 @@ /turf/simulated/floor/tiled, /area/hydroponics) "Po" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/maintenance/thirddeck/starboard) +/obj/machinery/door/airlock/civilian{ + name = "Galley" + }, +/obj/effect/floor_decal/corner/black/diagonal, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/galley) "Pr" = ( /obj/structure/stairs/south, /turf/simulated/floor/tiled, @@ -15100,13 +15160,12 @@ /turf/simulated/floor/carpet, /area/crew_quarters/sleep/dorms/two) "PO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/green{ + dir = 1 + }, +/obj/item/stool/bar/padded, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/mess) "PP" = ( /obj/structure/cable/green{ @@ -15272,10 +15331,37 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) +"Qp" = ( +/obj/effect/floor_decal/corner/green/half, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/mess) "Qq" = ( /obj/structure/undies_wardrobe, /turf/simulated/floor/carpet, /area/crew_quarters/sleep/dorms/three) +"Qr" = ( +/obj/structure/rack, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/thirddeck/starboard) "Qs" = ( /obj/effect/floor_decal/corner/green{ dir = 5 @@ -15289,12 +15375,16 @@ /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/aft) "Qu" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/corner/green/half{ - dir = 8 +/obj/machinery/door/blast/shutters{ + dir = 4; + id_tag = "kitchen"; + name = "Kitchen Shutters" }, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/mess) +/obj/structure/table/marble, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/corner/black/diagonal, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/galley) "Qv" = ( /obj/machinery/computer/modular/preset/security, /obj/effect/floor_decal/corner/red{ @@ -15333,14 +15423,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/safe_room/thirddeck) -"QB" = ( -/obj/machinery/disposal, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/bar) "QE" = ( /obj/structure/rack, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -15396,17 +15478,15 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hardstorage) "QM" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/green/half{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/corner/green{ - dir = 5 +/obj/structure/hygiene/sink/kitchen{ + pixel_y = 32 }, -/turf/simulated/floor/tiled, -/area/hallway/primary/thirddeck/center) +/obj/structure/hygiene/drain, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "QO" = ( /obj/machinery/disposal, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -15437,15 +15517,19 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/thirddeck/forestarboard) "QT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/green/half{ - dir = 8 +/obj/structure/table, +/obj/item/storage/box/donkpockets{ + pixel_y = 6 }, -/obj/machinery/vending/boozeomat{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/bar) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/carpet/blue, +/area/storage/service) "QU" = ( /obj/structure/railing/mapped{ dir = 4; @@ -15526,14 +15610,15 @@ /turf/simulated/floor/pool, /area/crew_quarters/pool) "Ri" = ( -/obj/machinery/cryopod{ - dir = 4 +/obj/effect/floor_decal/corner/green/half{ + dir = 1 }, -/obj/machinery/status_display{ - pixel_y = 32 +/obj/structure/table, +/obj/machinery/chemical_dispenser/bar_soft/full{ + pixel_y = 9 }, -/turf/simulated/floor/tiled/techmaint, -/area/crew_quarters/sleep/cryo) +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "Rm" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -15582,10 +15667,16 @@ /turf/simulated/floor/tiled, /area/crew_quarters/gym) "Rq" = ( -/obj/machinery/status_display, -/obj/effect/paint_stripe/common, -/obj/effect/paint_stripe/common, -/turf/simulated/wall/map_preset/tan, +/obj/machinery/status_display{ + pixel_x = 32; + pixel_y = 32 + }, +/obj/effect/floor_decal/corner/black/diagonal, +/obj/structure/hygiene/drain, +/obj/structure/hygiene/sink/kitchen{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/white, /area/crew_quarters/galley) "Rr" = ( /obj/structure/cable{ @@ -15631,12 +15722,18 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/safe_room/thirddeck) "RB" = ( -/obj/structure/table, -/obj/machinery/reagentgrinder/juicer{ - pixel_y = 8 +/obj/effect/floor_decal/corner/green/half{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/machinery/camera/network/third_deck{ + c_tag = "Service Equipment Storage"; + dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/crew_quarters/bar) +/area/storage/service) "RC" = ( /obj/machinery/alarm{ dir = 4; @@ -15673,14 +15770,9 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/head) "RF" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) +/obj/machinery/vending/boozeomat, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "RG" = ( /turf/simulated/wall/map_preset/tan, /area/chapel/main) @@ -15691,12 +15783,28 @@ }, /turf/simulated/floor/tiled/techfloor, /area/thruster/d3port) -"RN" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"RL" = ( +/obj/effect/floor_decal/corner/green/half{ + dir = 1 }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/monotile, +/area/hallway/primary/thirddeck/center) +"RN" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, /area/crew_quarters/mess) +"RP" = ( +/obj/structure/glass_tank/aquarium, +/mob/living/simple_animal/aquatic/fish, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/crew_quarters/mess) "RQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -15814,13 +15922,10 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/structure/closet/emcloset/torch, +/obj/structure/closet/emcloset, /obj/effect/floor_decal/corner/green{ dir = 10 }, -/obj/machinery/status_display{ - pixel_y = -32 - }, /turf/simulated/floor/tiled, /area/hydroponics) "So" = ( @@ -15879,25 +15984,26 @@ /turf/simulated/floor/plating, /area/hallway/primary/thirddeck/aft) "Sv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/bar) +/turf/simulated/floor/carpet/blue, +/area/storage/service) "Sw" = ( /obj/structure/sign/hydro, /obj/effect/paint_stripe/common, /turf/simulated/wall/map_preset/tan, /area/hydroponics) "Sx" = ( -/obj/structure/glass_tank/aquarium, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/bar) +/obj/structure/table, +/obj/machinery/microwave{ + pixel_y = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/carpet/blue, +/area/storage/service) "SA" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/item/radio/intercom{ + dir = 8; + pixel_x = 21 }, -/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/galleybackroom) "SC" = ( @@ -16010,34 +16116,30 @@ /turf/simulated/floor/reinforced/airless, /area/space) "SP" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/obj/machinery/chem_master/condimaster{ - name = "CondiMaster Neo" - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/galley) -"SS" = ( -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/effect/floor_decal/corner/green/mono, +/obj/structure/table, +/obj/machinery/fabricator/micro/bartender{ + pixel_x = 4; + pixel_y = 3 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/light/small{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/machinery/camera/network/third_deck{ + c_tag = "Mess Hall - Bar"; + dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/crew_quarters/mess) +/area/crew_quarters/bar) "ST" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "2-4" }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/galleybackroom) @@ -16048,6 +16150,18 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/gym) +"SV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) "SW" = ( /turf/simulated/floor/wood/maple, /area/chapel/main) @@ -16077,11 +16191,11 @@ /turf/simulated/floor/tiled, /area/crew_quarters/sleep/dorms/hallway) "Tb" = ( -/obj/machinery/vending/coffee, /obj/effect/floor_decal/corner/green/half{ dir = 1 }, -/obj/machinery/light/spot{ +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/tiled/dark/monotile, @@ -16102,19 +16216,8 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "Tg" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/floor_decal/corner/black/diagonal, +/obj/structure/table/marble, /turf/simulated/floor/tiled/white, /area/crew_quarters/galley) "Th" = ( @@ -16227,17 +16330,18 @@ /turf/simulated/floor/plating, /area/maintenance/thirddeck/port) "Tx" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/bed/chair/padded/red, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/turf/simulated/floor/wood/maple, +/area/crew_quarters/mess) +"Tz" = ( +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/crew_quarters/mess) +/area/crew_quarters/bar) "TA" = ( /obj/machinery/network/mainframe/endeavour, /obj/effect/floor_decal/industrial/outline/grey, @@ -16270,7 +16374,10 @@ /area/chapel/office) "TH" = ( /obj/structure/table/woodentable/walnut, -/turf/simulated/floor/carpet, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/turf/simulated/floor/wood/maple, /area/crew_quarters/mess) "TJ" = ( /obj/random/junk, @@ -16347,17 +16454,10 @@ /turf/simulated/floor/tiled/monotile, /area/storage/tools) "TW" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/obj/machinery/camera/network/third_deck{ - c_tag = "Mess Hall - Galley"; - dir = 4 - }, -/obj/machinery/vending/dinnerware{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/table/marble, +/obj/item/book/manual/chef_recipes, +/obj/item/sticky_pad/random, +/obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/tiled/white, /area/crew_quarters/galley) "TX" = ( @@ -16413,8 +16513,8 @@ /turf/simulated/floor/reinforced/carbon_dioxide, /area/thruster/d3port) "Ug" = ( -/obj/effect/paint_stripe/common, -/turf/simulated/wall/map_preset/tan, +/obj/effect/floor_decal/corner/black/diagonal, +/turf/simulated/floor/tiled/white, /area/crew_quarters/galley) "Uh" = ( /obj/effect/wallframe_spawn/reinforced/hull, @@ -16546,13 +16646,11 @@ /turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/office) "Ux" = ( -/obj/structure/table, -/obj/item/sticky_pad, -/obj/machinery/status_display{ - pixel_x = 32 - }, +/obj/structure/closet/secure_closet/bar_torch, +/obj/effect/floor_decal/corner/green/mono, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, -/area/crew_quarters/bar) +/area/storage/service) "Uy" = ( /obj/machinery/power/apc{ dir = 1; @@ -16606,17 +16704,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/gym) -"UD" = ( -/obj/structure/table/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/green/half{ - dir = 4 - }, -/obj/item/chems/drinks/glass2/square, -/obj/item/chems/drinks/glass2/square, -/obj/item/chems/drinks/glass2/square, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/bar) "UE" = ( /obj/machinery/portable_atmospherics/powered/scrubber, /obj/effect/floor_decal/industrial/outline/grey, @@ -16664,19 +16751,14 @@ /turf/simulated/floor/wood/walnut, /area/crew_quarters/recreation) "UK" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/window/reinforced{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/bed/chair/padded/green{ - dir = 1; - icon_state = "chair_preview" +/obj/structure/table/woodentable/walnut, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/wood/maple, /area/crew_quarters/mess) "UL" = ( /obj/effect/floor_decal/techfloor{ @@ -16796,22 +16878,30 @@ /turf/simulated/floor/plating, /area/maintenance/thirddeck/port) "Vg" = ( -/obj/structure/table/marble, -/obj/machinery/door/blast/shutters{ - dir = 4; - id_tag = "kitchen"; - name = "Kitchen Shutters" - }, -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, +/obj/effect/paint_stripe/common, +/turf/simulated/wall/map_preset/tan, /area/crew_quarters/galley) "Vi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/light_switch{ + pixel_x = -21; + pixel_y = -24 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/corner/black/diagonal, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, /turf/simulated/floor/tiled/white, /area/crew_quarters/galley) @@ -16831,7 +16921,7 @@ /obj/effect/floor_decal/corner/green{ dir = 5 }, -/obj/structure/closet/emcloset/torch, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/hydroponics) "Vn" = ( @@ -16883,17 +16973,19 @@ /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) "Vv" = ( -/obj/structure/cable/green{ - icon_state = "0-2" +/obj/effect/floor_decal/corner/green/half{ + dir = 1 }, /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_y = 24; - req_access = list(list("ACCESS_ENGINE_EQUIP","ACCESS_ATMOS")) + pixel_y = 24 + }, +/obj/structure/cable/green{ + icon_state = "0-2" }, /turf/simulated/floor/tiled/dark, -/area/crew_quarters/bar) +/area/storage/service) "Vw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -16948,12 +17040,12 @@ /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/center) "VD" = ( -/obj/machinery/alarm{ - pixel_y = 24 +/obj/effect/floor_decal/corner/green/half{ + dir = 1 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/rack, /turf/simulated/floor/tiled/dark, -/area/crew_quarters/bar) +/area/storage/service) "VE" = ( /obj/effect/paint_stripe/common, /obj/structure/sign/directions/infirmary{ @@ -17043,7 +17135,16 @@ /turf/simulated/floor/plating, /area/maintenance/thirddeck/aftstarboard) "VT" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/mess) "VU" = ( @@ -17203,26 +17304,23 @@ /turf/simulated/floor/carpet, /area/crew_quarters/sleep/dorms/four) "WG" = ( -/obj/effect/paint_stripe/common, +/obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass/civilian{ name = "Mess Hall" }, /obj/effect/floor_decal/corner/green/mono, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/mess) -"WH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/disposalpipe/sortjunction/flipped{ - dir = 2; - name = "Bar"; - sort_type = "Bar" - }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/crew_quarters/mess) +"WH" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/mess) "WI" = ( /obj/structure/hygiene/faucet, /turf/simulated/floor/pool, @@ -17527,10 +17625,6 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/hardstorage) -"XE" = ( -/obj/effect/floor_decal/corner/green/half, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/bar) "XF" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -17630,6 +17724,7 @@ /obj/effect/floor_decal/corner/green{ dir = 10 }, +/obj/item/chems/syringe, /turf/simulated/floor/tiled, /area/hydroponics) "XU" = ( @@ -17710,6 +17805,12 @@ /obj/machinery/atmospherics/pipe/manifold/visible, /turf/simulated/floor/plating, /area/maintenance/thirddeck/port) +"Yi" = ( +/obj/machinery/smartfridge/drinks{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "Yj" = ( /obj/structure/railing/mapped{ dir = 8; @@ -17748,16 +17849,6 @@ /obj/effect/paint_stripe/common, /turf/simulated/floor/plating, /area/crew_quarters/recreation) -"Yu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/green/half{ - dir = 8 - }, -/obj/item/stack/material/panel/mapped/plastic/twenty, -/obj/item/stack/material/pane/mapped/glass/twenty, -/obj/structure/table, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/bar) "Yv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -17777,17 +17868,9 @@ /turf/simulated/floor/wood/maple, /area/crew_quarters/sleep/dorms/four) "Yx" = ( -/obj/structure/table/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/green/half{ - dir = 4 - }, -/obj/item/chems/drinks/glass2/rocks, -/obj/item/chems/drinks/glass2/rocks, -/obj/item/chems/drinks/glass2/rocks, -/obj/item/chems/drinks/glass2/rocks, -/turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/bar) +/obj/effect/paint_stripe/common, +/turf/simulated/wall/map_preset/tan, +/area/storage/service) "YA" = ( /obj/machinery/atmospherics/unary/engine{ dir = 8 @@ -17798,20 +17881,24 @@ /turf/simulated/wall/walnut, /area/crew_quarters/pool) "YD" = ( +/obj/effect/floor_decal/corner/green/half{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/obj/effect/floor_decal/corner/green/half{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, /turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/bar) +/area/crew_quarters/mess) "YF" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass/civilian{ @@ -18046,6 +18133,18 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) +"Zs" = ( +/obj/structure/table/marble, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/blast/shutters{ + dir = 4; + id_tag = "bar"; + name = "Bar Shutters" + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "Zt" = ( /obj/machinery/computer/modular/preset/civilian{ dir = 1; @@ -18079,14 +18178,9 @@ /turf/simulated/floor/plating, /area/hallway/primary/thirddeck/aft) "Zx" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/structure/table/marble, +/obj/machinery/appliance/mixer/candy{ + pixel_y = 8 }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/galleybackroom) @@ -18101,22 +18195,26 @@ /turf/simulated/wall/r_wall/map_preset/tan, /area/maintenance/thirddeck/port) "ZA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/vending/containers, /obj/effect/floor_decal/corner/green/half{ dir = 1 }, +/obj/structure/disposalpipe/trunk, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/disposal, /turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/mess) "ZB" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/corner/black/diagonal, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/crew_quarters/galley) "ZC" = ( @@ -18160,12 +18258,10 @@ /turf/simulated/floor/plating, /area/maintenance/thirddeck/foreport) "ZK" = ( -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24 +/obj/effect/floor_decal/corner/green/half{ + dir = 1 }, -/obj/machinery/computer/modular/preset/civilian, -/obj/effect/floor_decal/corner/green/mono, +/obj/machinery/vending/cigarette, /turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/mess) "ZL" = ( @@ -18176,10 +18272,16 @@ /area/tcommsat/chamber) "ZQ" = ( /obj/effect/floor_decal/corner/green/half{ - dir = 8 + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark/monotile, -/area/crew_quarters/bar) +/area/crew_quarters/mess) "ZS" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -18197,9 +18299,26 @@ /turf/simulated/floor/tiled/airless, /area/command/disperser) "ZV" = ( -/obj/effect/paint_stripe/common, -/turf/simulated/wall/map_preset/tan, -/area/crew_quarters/bar) +/obj/effect/floor_decal/corner/green/half{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 24 + }, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/structure/cable/green, +/obj/effect/landmark{ + name = "lightsout" + }, +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/mess) "ZW" = ( /obj/structure/table/woodentable_reinforced/mahogany, /obj/item/spirit_board, @@ -32244,7 +32363,7 @@ aa aa aa aa -aa +aO aO cK mw @@ -32446,8 +32565,8 @@ aa aa aa aa -aa -aO +Wc +aG cK mw dy @@ -32648,8 +32767,8 @@ aa aa aa aa -aO -aO +Wc +xr cK mw dy @@ -32858,9 +32977,9 @@ dy iU gs Ol -gs -Uq -PI +pX +qV +AA EX lu lu @@ -33055,7 +33174,7 @@ aa Wc Mp mi -bp +dk dy et SA @@ -33256,13 +33375,13 @@ aa aa Wc cK -bs -Fy -dy +bp dk -gs -hn -ij +dy +dy +dy +dy +dy iW dy EX @@ -33460,13 +33579,13 @@ aP cL vN vN -dy -dy +dG +gC Mv -dy -IR -dy -dy +kO +Ug +iX +Lx EX EX EX @@ -33663,15 +33782,15 @@ cb cM dA MC -rm +Ug TW -ml +Tg ik iX EW -OX +Vg SP -ml +GX cU eQ ft @@ -33865,16 +33984,16 @@ cc kc dA mF -fp -fp -fp +Ug +ij +nk il ZB Vi -Vi +Po nc mm -nc +Go og oY nN @@ -34067,19 +34186,19 @@ cc hl ca fq -fp -Od -ww -im +Ug +Ug +Ug +Ug mn oh -mn -fp +Vg +QM CH -Od +Yi RF oZ -Ug +nN Xn pr dP @@ -34269,19 +34388,19 @@ cc cN YF ig -fp -ne -Fw -ii -sq -fp -sq -fp -Fw -ne -fp -pa +hn +Ug +Tg Ug +sq +Mz +iv +Ri +Tz +HT +Lv +pd +NG qQ sk tD @@ -34470,20 +34589,20 @@ aj cd cO Qe -ew -fp -fp -jj +Ug +Tg +is +Tg Tg -fp +sr bB -fp -fp -fp -fp -fp -pb -Ug +iv +xu +Tz +dY +Lv +pd +RP mb IY tE @@ -34674,23 +34793,23 @@ cP bA Rq Ug -hr -hr -FG -hr Ug -Vg -Vg -Vg -Vg Ug -pc Ug +Ug +Oo +Vg +AS +Tz +dY +Lv +pc +fB xE IZ Jc uP -Ri +vU vU yb yU @@ -34873,34 +34992,34 @@ aW Vm ce cQ -dG +bA ey fy -iY Qu -mo Qu +Qu +mQ gv -cT -cT -cT +Vg +oP +Zs dY -gv -pd -pX +Lv +iy +fB qS sn Jd uQ -vV -vV +vx +vx yc yV -vV -vV -vV -vV -Dc +vx +vx +vx +vx +Ac DQ DL ZS @@ -35079,18 +35198,18 @@ dH ey FY gw -hs +ir ir As jV kQ PO -PO +sY nh WH pe pY -QM +Xn so YY uR @@ -35098,10 +35217,10 @@ vW vW yd yW -vW -vW -vW -vW +pu +pu +pu +pu Dd DR uP @@ -35281,20 +35400,20 @@ xn ey ZA kN -ht -is -TH -jW XO -mp -TH -Ko +XO +XO +XO +XO +XO +XO +XO RN pg pZ -qP +Xn sp -Mz +dC uS vS vS @@ -35305,7 +35424,7 @@ vS vS vS De -za +SV NF LX Hc @@ -35483,21 +35602,21 @@ Kn bA Lb CO -cs -mp -nd jX zo -mp nd +jX +zo +ER +jX Ko -RN +XO pf fB qU -sj -Oo -uP +sp +dC +tY vT vT yf @@ -35685,20 +35804,20 @@ Mn eC kb gy -SS +UK iu hu UK -XO -mp +iu +hu TH -Ko -RN -pg +jn +XO +Gd WG -qP -VM -tH +JQ +uv +dB uP vU vU @@ -35887,19 +36006,19 @@ nZ Sw Tb VT -rM -XO -XO Tx -XO -XO -XO +qR +tH +Tx +qR +tH +TH jn -RN -pg +XO +Qp Nw -qQ -sk +RL +rq tI uP vV @@ -36088,20 +36207,20 @@ wn Pn aR AC -XO -hw -iv -gz +Aq jY jd +gz +jY jd +gz oz nj -Lx +XO Ai -aG -Xn -sj +fB +lY +sk tJ uP Cj @@ -36291,18 +36410,18 @@ XT aR ZK Aq -kO -ZV -AA +XO +XO +XO dF -nk -nk -nk -nk +XO +XO +XO +XO zp pi -ZV -qV +pZ +Xn sj tC uP @@ -36491,22 +36610,22 @@ Mx wn Qn bA -fB -fB +ht +jW gA ZV jf YD -ZQ -ZQ -ZQ +ll +yn +Ha ZQ qO OB -ZV -qR -sr -qR +pZ +Xn +sj +dC uU vY jO @@ -36693,21 +36812,21 @@ TX wn Rn bA -Po -gC +AU +AU hy -ZV -nf +Yx +Yx nD -ct Yx -Am -UD -ud -XE -wD -Xn -sj +Yx +Yx +Yx +Yx +Yx +Yx +au +Gb tL uU uU @@ -36898,16 +37017,16 @@ bA fE gD hz -ZV +Yx kY tu ld -ld +Yx Sx nm fU -XE -wD +Ey +Yx Xn sj Dt @@ -37100,16 +37219,16 @@ bA fF pw Ot -ZV +Yx VD tF MS -Yu +Yx QT -vw -rF -XE -wD +Sv +Sv +KA +Yx Xn sj UQ @@ -37302,16 +37421,16 @@ bA fG Eu Eu -ZV +Yx Vv Fx yQ -yQ -yQ -yQ +zK +Ls +vl Sv -XE -wD +Ke +Yx qP RQ cV @@ -37504,16 +37623,16 @@ Eu NH dD le -ZV +Yx vd RB Ux -If -BO -dI -QB -cl -ZV +Yx +Yx +Yx +Yx +Yx +Yx Pf sj dB @@ -37706,16 +37825,16 @@ cm fH dD lx -ZV -ZV -ZV -ZV -ZV -ZV -ZV -ZV -ZV -ZV +Yx +Yx +Yx +Yx +Yx +Qr +Qr +Af +ti +AU rc cS dC @@ -37911,9 +38030,9 @@ dD OE OE OE -dD OE -dD +OE +OE OE OE OE diff --git a/maps/torch/torch4_deck2.dmm b/maps/torch/torch4_deck2.dmm index 24338c49182..435c789d21d 100644 --- a/maps/torch/torch4_deck2.dmm +++ b/maps/torch/torch4_deck2.dmm @@ -380,10 +380,21 @@ /area/medical/morgue) "aV" = ( /obj/structure/catwalk, -/obj/effect/floor_decal/industrial/warning{ - dir = 10 +/obj/structure/disposalpipe/down, +/obj/structure/lattice, +/obj/structure/railing/mapped{ + dir = 4; + icon_state = "railing0-1" }, -/turf/simulated/floor/plating, +/obj/structure/railing/mapped{ + dir = 8; + icon_state = "railing0-1" + }, +/obj/structure/railing/mapped{ + dir = 1; + icon_state = "railing0-1" + }, +/turf/simulated/open, /area/maintenance/seconddeck/central) "aW" = ( /obj/random_multi/single_item/runtime, @@ -655,21 +666,23 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/seconddeck/aftstarboard) "bD" = ( +/obj/structure/lattice, +/obj/structure/cable{ + icon_state = "2-4" + }, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 1; + icon_state = "pipe-c" }, -/obj/structure/lattice, /obj/structure/railing/mapped{ dir = 4; icon_state = "railing0-1" }, /obj/structure/railing/mapped{ - dir = 1; + dir = 8; icon_state = "railing0-1" }, -/obj/structure/cable{ - icon_state = "2-4" - }, +/obj/structure/railing/mapped, /turf/simulated/open, /area/maintenance/seconddeck/central) "bE" = ( @@ -1792,7 +1805,6 @@ dir = 2; icon_state = "pipe-c" }, -/obj/effect/floor_decal/industrial/warning/corner, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/seconddeck/central) @@ -1806,11 +1818,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning, /obj/structure/catwalk, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/plating, /area/maintenance/seconddeck/central) "ec" = ( @@ -1822,12 +1834,10 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/visible/fuel{ dir = 5 }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/maintenance/seconddeck/central) "ed" = ( @@ -2108,34 +2118,23 @@ /turf/simulated/floor/plating, /area/maintenance/seconddeck/central) "eJ" = ( -/obj/structure/cable/green{ - icon_state = "2-8" - }, /obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/structure/railing/mapped{ - dir = 1; - icon_state = "railing0-1" +/obj/structure/cable/green{ + icon_state = "4-8" }, /turf/simulated/floor/plating, /area/maintenance/seconddeck/central) "eK" = ( -/obj/structure/disposalpipe/down, -/obj/structure/lattice, -/obj/structure/railing/mapped{ - dir = 1; - icon_state = "railing0-1" +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/structure/railing/mapped{ - dir = 4; - icon_state = "railing0-1" +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "2-8" }, -/turf/simulated/open, +/turf/simulated/floor/plating, /area/maintenance/seconddeck/central) "eL" = ( /obj/machinery/camera/network/engineering{ @@ -2400,28 +2399,17 @@ /turf/simulated/floor/tiled, /area/engineering/engineering_bay) "ft" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, /obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/seconddeck/central) "fu" = ( -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, -/obj/structure/lattice, /obj/structure/cable/green{ - icon_state = "1-8" + icon_state = "1-2" }, -/turf/simulated/open, +/turf/simulated/floor/plating, /area/maintenance/seconddeck/central) "fv" = ( /obj/machinery/door/airlock/civilian{ @@ -2757,14 +2745,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/structure/cable/green{ - icon_state = "1-8" + icon_state = "1-4" + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4; + icon_state = "warningcorner" }, /obj/structure/cable/green{ - icon_state = "1-4" + icon_state = "4-8" }, /turf/simulated/floor/plating, /area/maintenance/seconddeck/central) @@ -2776,10 +2765,6 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/structure/railing/mapped{ - dir = 4; - icon_state = "railing0-1" - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -3492,10 +3477,6 @@ name = "west bump"; pixel_x = -24 }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4; - icon_state = "warningcorner" - }, /turf/simulated/floor/plating, /area/maintenance/seconddeck/central) "id" = ( @@ -9142,6 +9123,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/fuel{ dir = 10 }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/seconddeck/central) "wH" = ( @@ -15625,11 +15609,6 @@ /area/shuttle/escape_pod10/station) "Pr" = ( /obj/structure/disposalpipe/segment, -/obj/structure/railing/mapped, -/obj/structure/railing/mapped{ - dir = 4; - icon_state = "railing0-1" - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -18354,10 +18333,11 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/visible/fuel, +/obj/effect/floor_decal/industrial/warning{ + dir = 8; + icon_state = "warning" + }, /turf/simulated/floor/plating, /area/maintenance/seconddeck/central) "XJ" = ( diff --git a/maps/torch/torch5_deck1.dmm b/maps/torch/torch5_deck1.dmm index fedc5c3981b..68100bd6c37 100644 --- a/maps/torch/torch5_deck1.dmm +++ b/maps/torch/torch5_deck1.dmm @@ -25602,7 +25602,7 @@ c_tag = "Infirmary - Operating Theatre 1"; dir = 1 }, -/obj/machinery/fabricator/bioprinter, +/obj/machinery/fabricator/bioprinter/filled, /turf/simulated/floor/tiled/white, /area/medical/surgery) "xxY" = ( diff --git a/maps/torch/torch_areas.dm b/maps/torch/torch_areas.dm index 6ed04c5a62e..b6f55802b24 100644 --- a/maps/torch/torch_areas.dm +++ b/maps/torch/torch_areas.dm @@ -749,6 +749,12 @@ sound_env = SMALL_ENCLOSED req_access = list(access_research) +/area/storage/service + name = "Service Equipment Storage" + icon_state = "storage" + sound_env = SMALL_ENCLOSED + req_access = list(list(access_kitchen, access_bar)) + // Supply /area/quartermaster diff --git a/maps/torch/torch_define.dm b/maps/torch/torch_define.dm index d6a29358b68..88eddfe77c6 100644 --- a/maps/torch/torch_define.dm +++ b/maps/torch/torch_define.dm @@ -34,9 +34,9 @@ ) //These should probably be moved into the evac controller... - shuttle_docked_message = "Attention all hands: Jump preparation complete. The superluminal shunt is now spooling up, secure all stations for departure. Time to jump: approximately %ETD%." - shuttle_leaving_dock = "Attention all hands: Jump initiated, exiting shunt-space in %ETA%." - shuttle_called_message = "Attention all hands: Jump sequence initiated. Transit procedures are now in effect. Jump in %ETA%." + shuttle_docked_message = "Attention all hands: Interstellar jump preparation complete. The superluminal shunt is now spooling up, secure all stations for departure. Time to jump: approximately %ETD%." + shuttle_leaving_dock = "Attention all hands: Interstellar jump initiated, exiting shunt-space in %ETA%." + shuttle_called_message = "Attention all hands: Interstellar jump sequence initiated. Transit procedures are now in effect. Jump in %ETA%." shuttle_recall_message = "Attention all hands: Jump sequence aborted, return to normal operating conditions." evac_controller_type = /datum/evacuation_controller/starship diff --git a/maps/torch/torch_presets.dm b/maps/torch/torch_presets.dm index 4bcb718887f..f56d239776b 100644 --- a/maps/torch/torch_presets.dm +++ b/maps/torch/torch_presets.dm @@ -249,4 +249,7 @@ var/global/const/HAIL_FREQ = 1463 frequency = 1431 /obj/machinery/airlock_sensor/shuttle/opportunity - stock_part_presets = list(/decl/stock_part_preset/radio/basic_transmitter/airlock_sensor/shuttle/opportunity = 1) \ No newline at end of file + stock_part_presets = list(/decl/stock_part_preset/radio/basic_transmitter/airlock_sensor/shuttle/opportunity = 1) + +/obj/machinery/fabricator/bioprinter/filled + prefilled = TRUE \ No newline at end of file diff --git a/maps/torch/torch_security_state.dm b/maps/torch/torch_security_state.dm index 10136997b40..b5bad4aafaa 100644 --- a/maps/torch/torch_security_state.dm +++ b/maps/torch/torch_security_state.dm @@ -19,8 +19,9 @@ //Torch map alert levels. Refer to security_state.dm. /decl/security_state/default/torchdept - all_security_levels = list(/decl/security_level/default/torchdept/code_green, /decl/security_level/default/torchdept/code_violet, /decl/security_level/default/torchdept/code_orange, /decl/security_level/default/torchdept/code_blue, /decl/security_level/default/torchdept/code_red, /decl/security_level/default/torchdept/code_delta) + all_security_levels = list(/decl/security_level/default/torchdept/code_green, /decl/security_level/default/torchdept/code_violet, /decl/security_level/default/torchdept/code_orange, /decl/security_level/default/code_yellow, /decl/security_level/default/torchdept/code_blue, /decl/security_level/default/torchdept/code_red, /decl/security_level/default/torchdept/code_delta) + /decl/security_level/default/torchdept icon = 'maps/torch/icons/security_state.dmi' alarm_appearance = /datum/alarm_appearance/green @@ -67,6 +68,7 @@ /decl/security_level/default/torchdept/code_violet name = "code violet" + icon = 'icons/misc/security_state.dmi' light_color_alarm = COLOR_VIOLET light_color_status_display = COLOR_VIOLET @@ -86,6 +88,7 @@ /decl/security_level/default/torchdept/code_orange name = "code orange" + icon = 'icons/misc/security_state.dmi' light_color_alarm = COLOR_ORANGE light_color_status_display = COLOR_ORANGE diff --git a/maps/torch/torch_unit_testing.dm b/maps/torch/torch_unit_testing.dm index c61805c1788..77769b1b83e 100644 --- a/maps/torch/torch_unit_testing.dm +++ b/maps/torch/torch_unit_testing.dm @@ -35,6 +35,7 @@ /area/storage/primary = 0, /area/storage/tech = 0, /area/storage/tools = 0, + /area/storage/service = 0, /area/supply = NO_SCRUBBER|NO_VENT|NO_APC, /area/thruster = NO_SCRUBBER, /area/turbolift = NO_SCRUBBER|NO_VENT|NO_APC, diff --git a/mods/content/hearth_culture/humanity.dm b/mods/content/hearth_culture/humanity.dm index ca0f94f5a1d..4e3dd699ee9 100644 --- a/mods/content/hearth_culture/humanity.dm +++ b/mods/content/hearth_culture/humanity.dm @@ -5,6 +5,7 @@ #define LANGUAGE_RUSSIAN "Russian" #define LANGUAGE_ASIAN "Pan-Asian Intermediate" #define LANGUAGE_SPACER "Spacer" +#define LANGUAGE_FRENCH "French" //DEFINES END @@ -21,6 +22,7 @@ /decl/cultural_info/culture/human/extrasolar, /decl/cultural_info/culture/human/europa, /decl/cultural_info/culture/human/belter, + /decl/cultural_info/culture/human/forumite, /decl/cultural_info/culture/human/vatgrown, /decl/cultural_info/culture/human/aaronite, /decl/cultural_info/culture/human/oort, @@ -28,11 +30,15 @@ ), TAG_HOMEWORLD = list( /decl/cultural_info/location/sol, - /decl/cultural_info/location/proxima_centauri + /decl/cultural_info/location/proxima_centauri, + /decl/cultural_info/location/forum, + /decl/cultural_info/location/human_other ), TAG_FACTION = list( /decl/cultural_info/faction/humanity, - /decl/cultural_info/faction/humanity/dysonite + /decl/cultural_info/faction/humanity/iseo, + /decl/cultural_info/faction/humanity/ec, + /decl/cultural_info/faction/humanity/contractor, ), TAG_RELIGION = list( /decl/cultural_info/religion/other, @@ -63,14 +69,34 @@ description = "You belong to one of the many other factions that operate in the galaxy. Numerous, too numerous to list, these factions represent a variety of interests, purposes, intents and goals." subversive_potential = 25 -/decl/cultural_info/faction/humanity/dysonite - name = "Dysonite" - description = "The Dyson Hub is a burgeoning megaproject located in orbit around the Sun. As its name suggests, it is an attempt to harness the incredible power of \ - the Sun, and has been funded by a number of nations and NGOs. The project has been running since the 2150s, but as it is such a gargantuan task, the project is \ - nowhere near completion. Many scientists and engineers live here for several years, getting valuable experience and contributing to humanity in some way. \ - Similarly, it is home to a growing number of artists and wanderers, choosing to live in the Hub's residential complex and contributing to it's finances. \ - As a multinational and multicultural project, it has developed its own political system, largely considered technocratic. Highly influential scientists \ - and academics hold considerable influence, often leading to minor conflicts of interest between the civilian and scientific residents of the Hub." +/decl/cultural_info/faction/humanity/iseo + name = "ISEO" + description = "You are part of the International Stellar Exploration Organization, better known as the ISEO. It is a intergovernmental project established by the \ + various nations of Earth, and responsible for the governing of the colonial worlds of Mars and Jupiter. It is at the forefront of space exploration and colonisation. \ + Much of its history has been relatively cushy, until First Contact around a generation ago. Since then, the ISEO has been steadily expanded into all parts of life, with \ + a significant powerbase in Sol.

Maybe you're a fresh recruit, promised adventure and a plot of land in the ISEO-owned Martian district of Arcadia. Maybe you're a \ + veteran of the pre-contact days who's seen the rise of the ISEO, leading up to perhaps its most important mission yet, the Endeavour Project. Optimism runs high within the ISEO \ + and its personnel are a varied, widely divergent collection of humans, unified in the aim of an interstellar humanity." + +/decl/cultural_info/faction/humanity/ec + name = "Espatier Corps" + description = "You are part of the Espatier Corps, also known as the EC. It is comprised of various national military units from all the member states of the ISEO, \ + specially trained to handle low and zero-G missions. It serves two roles, one as a peacekeeping mission for the various colonies under direct ISEO control, and one \ + as military police for various exploration missions, such as the Endeavour. The EC have proven themselves capable of protecting both the ISEO, and Humanity's interests, \ + such as their intervention on the side of colonists against the corporations during the Jovian Riots of the mid-60s, or bringing an end to the Martian Cold War. \ +

As a member of the Espatier Corps, your loyalty is to the ISEO primarily, and your parent nation second. Members of the Espatier Corps volunteered to be \ + part of the EC, but might not have had any say in their deployment to the Endeavour. The legacy of the EC as Humanity's United Military has attracted many new recruits \ + who outnumber veteran members almost ten to one. Those that have remained in service to the EC have been rewarded with high ranking roles onboard the Endeavour project, \ + where their skills can be put to good use." + +/decl/cultural_info/faction/humanity/contractor + name = "ISEO Civilian Branch" + description = "You are a civilian member of the ISEO, who serves onboard the Endeavour either as a specialist in your specific field, or as a low-priority worker. You \ + are considered a member of the crew, but not technically part of the ISEO. For the duration of the mission, they are responsible for your wages, your shifts, and your \ + living space. Being a civilian has its perks however, with a much laxer uniform code, and a generally more tolerent atmosphere. However, contractors that fail to recognise \ + the authority of the ISEO, either from Command staff, or from an enlisted member of their department, will often be quietly dropped off home at the next shoreleave. Your \ + position on the Endeavour is one to be proud of, and something to brag about with your friends and family back home. But never forget there are likely a hundred other people \ + applying for your role. Be unreplacable." //FACTIONS END @@ -78,10 +104,16 @@ /decl/cultural_info/culture/human/ name = "Earthborn" - description = "You are from Earth, the dying cradle of Humanity. You are among the precious few who have managed to make it off Humanity's dying homeworld. \ - You were potentially born into affluence, bought your way off the planet through corruption, or are one of the precious skilled laborers so desperately required \ - for Humanity's continuing expansion into the stars. Individuals from Earth tend to be somewhat unhealthy due to pollution, lingering radiation from various conflicts\ - and potential malnutrition during childhood." + description = "You are from Earth, the scarred and battered homeworld of Humanity. Earth remains just as divided as it has ever been, with \ + many new powers taking the place of the old ones. Your parents and grandparents speak of the horrors of the Climate Catastrophe of the 21st \ + Century, and the damage it has taken is very clear no matter where you are from. However, you are also the first Earthers in a long time to \ + feel optimistic about the future, as the damage caused in the past slowly starts to heal. Earth is effectively divided into two spheres of influence, \ + the ISEO, and the Non-ISEO States (NIS). The various states of Africa are the key leaders of the ISEO's sphere, being their primary nations and effectively \ + the dominant continent on the planet. Most states on Earth are part of the ISEO, either directly contributing, or as an Observer. Some states remain outside \ + the influence of the ISEO, and lack a presence onboard the Endeavour. However, migration into ISEO territory is not uncommon, with many people fleeing \ + both North America and Europe in search of a better life in the Cradle of Civilization.

Aging Earthers will remember a time of great suffering, \ + with high child mortality rates, instability, and radioactive fallout. As such, the modern Earther effectively lives on a cocktail of gene therapy and medication, \ + which allows them to live extremely healthy lives, well into their one hundreds." default_language = /decl/language/human/common // formerly /decl/language/human/common, repath if it stops being hardcoded everywhere secondary_langs = list( /decl/language/human/russian, @@ -98,7 +130,7 @@ The planet's surface remains as lifeless as it has for millennia, with any terraforming efforts only around fifty years into a centuries long project. Instead, \ humanity lives under massive biodome structures that keeps the air in and the deadly Martian conditions out. Though these biodomes are fitted to earth atmosphere, \ Martians tend to suffer from a various medical issues stemming from lower gravity and higher ambient radiation levels. Most of these issues have been solved in the \ - modern day through living fit and active lifestyles, combating the 'void-waste', as the effects of low gravity have been termed.Mars is a disunited planet, comprised \ + modern day through living fit and active lifestyles, combating the 'void-waste', as the effects of low gravity have been termed. Mars is a disunited planet, comprised \ of districts and colonies, some loyal to their Earthly benefactor, others dismissive, some owned by corporations, and a lucky few governed by themselves. \ To prevent any sort of conflict between the colonies, the Martial Council convene every month, serving as an intranational organisation, similar to an old UN. The \ Martian Council has its own Secretary-General, General Assembly, Security Council, and Trans-Martian Court of Justice." @@ -129,11 +161,13 @@ /decl/cultural_info/culture/human/europa name = "Europan" - description = "You are from Europa, a child one of the first generations of colonists in the early 21st century. The average Europan usually has a cautious spirit \ - bolstered by their pragmatic attitudes, they also have an affinity towards enclosed spaces, a by-product of their time spent underneath the moon's ice sheets within \ - the expansive man-made underwater habitats. Europans are typically average when it comes to general intelligence, however they excel in the fields of agriculture and \ - engineering. Health-wise Europans are healthy for the most part with the exception of often suffering from severe vitamin-D deficiency, \ - leading to them acquiring a sickly pale look." + description = "You are from Europa, a child one of the first generations of colonists in the 21st century. The average Europan is extremely tolerant of genetic alterations, \ + cautious of corporate influence, and supportive of the ISEO. They have an affinity towards enclosed spaces, and are effectively comprised of countless different Earther cultures, \ + and ethnicities that migrated to Europe in search of a better life. The Jovian Riots of the 2160s are still heavily engrained in their culture, when the Europans rose up against \ + their corporate leaders after a failed anti-radiation genetherapy treatment resulted in the accidental mutation of a large number of people. The ISEO has spent a great deal of time and money \ + helping to treat these people, and many of them have since returned the favour by becoming part of the ISEO.

Europan culture is best described as reminiscent of 1960s West Germany, with \ + a widespread synthwave movement and a rejection of tradition. They wear bright colours, play strange music, and stay out all night partying. They are the first generation to live \ + without a Corporation breathing down their neck, and they live it to the fullest." /decl/cultural_info/culture/human/belter name = "Belter" @@ -190,6 +224,14 @@ Finding communication with other stations within the Belt difficult, many inhabitants looked inward, and developed a greater connection to their fellow colonists. \ Even when leaving it all behind, most Brinkers continue to place great amounts of trust and care into those they work alongside." +/decl/cultural_info/culture/human/forumite + name = "Forumite" + description = "You are a Forumite, from the alien world of Forum. Your family moved here some time after first contact, either as part of the Human ambassador mission,\ + or as an immigrant to the planet's growing Human District. Forum, also known as Fahzi to the Unathi, Qoloc’ux to the Skrell, and Ashragi to the Tajaran, is home to the \ + Galactic Community, where the many nations of the Milky Way have gathered to conduct diplomatic business. Some of these species do not yet have treaties with Humanity, \ + making Forum a unique sight to many Human visitors. The Humans on Forum have begun to slowly diverge from their original cultures, with some having adopted the traditions \ + of the various aliens they now rub shoulders with. Forum is a xenophilic melting pot, with new fashions, music, and cuisine invented almost every day." + // CULTURES END // LOCATIONS START @@ -215,6 +257,27 @@ economic_power = 1 ruling_body = "ISEO" +/decl/cultural_info/location/forum + name = "Forum" + description = "Forum, also known as Fahzi to the Unathi, Qoloc’ux to the Skrell, and Ashragi to the Tajaran, is a colonised world around 32 light years from Earth. It was first colonised \ + by the Unathi roughly 150 years ago and has since grown to become the capital of the Galactic Community, home to many species that inhabit the Milky Way. Humans first arrived here some years \ + after first contact, and many decided to stay, finding its xenophilic and tolerant nature more welcoming than Sol. Its largest city, also called Forum, has a sizeable Human District, and is \ + the location of the ISEO's Embassy to the other members of the Galactic Community. It is here that its various ambassadors to the Skrell, Unathi, and Tajaran reside." + distance = "32" + capital = "Forum" + economic_power = 1 + ruling_body = "Galactic Community" + +/decl/cultural_info/location/human_other + name = "Other" + description = "Since the first generation ships were launched almost one hundred years ago, people have been born far out in the voids of space. Being almost entirely self-sustaining, the \ + people living out here often go entirely undetected, with their existence unknown by the greater Human community. With the advent of FTL travel a generation ago, some of these vessels have \ + been reintergrated into Humanity, having developed divergent and strange cultures while in extreme isolation." + distance = "N/a" + capital = "N/a" + economic_power = 1 + ruling_body = "N/a" + // LOCATIONS END // LANGUAGES START @@ -350,4 +413,24 @@ ) colour = COLOR_ORANGE +/decl/language/human/french + name = LANGUAGE_FRENCH + desc = "The French language has existed for hundreds of years, becoming the Lingua Franca of much of Western Africa during the late 21st Century. It is considered the dominant language of \ + the ISEO, alongside English." + colour = COLOR_BLUE + key = "fr" + shorthand = "FR" + space_chance = 20 + partial_understanding = list( + LANGUAGE_ENGLISH = 20 + ) + syllables = list( + "al", "an", "ar", "as", "at", "ea", "ed", "en", "et", "es", "ha", "he", "hi", "in", "is", "it", + "le", "me", "nd", "ne", "ng", "nt", "on", "or", "ou", "re", "se", "st", "te", "th", "ti", "to", + "ve", "wa", "all", "and", "cou", "but", "ent", "era", "fou", "eve", "for", "had", "zou", "hen", "her", "hin", + "ch", "de", "ge", "be", "vous", "abe", "ich", "ein", "die", "gnou", "pou", "tout", "ber", "che", "ent", "que", + "ait", "les", "lle", "men", "ais", "ans", "mou", "ave", "con", "com", "des", "tre", "eta", "eur", "est", + "ing", "the", "ver", "was", "ith", "nous" + ) + // LANGUAGES END \ No newline at end of file diff --git a/mods/content/hearthdrinks/_hearthdrinks.dm b/mods/content/hearthdrinks/_hearthdrinks.dm new file mode 100644 index 00000000000..c40bc0e9c26 --- /dev/null +++ b/mods/content/hearthdrinks/_hearthdrinks.dm @@ -0,0 +1,6 @@ +/// A helper macro to make defining icon and state simpler. +#define DRINK_STATE(x) icon = 'mods/content/hearthdrinks/icons/drinks.dmi';\ + icon_state = x; + +/decl/modpack/hearthdrinks + name = "Hearth of Hestia Drink Content" \ No newline at end of file diff --git a/mods/content/hearthdrinks/_hearthdrinks.dme b/mods/content/hearthdrinks/_hearthdrinks.dme new file mode 100644 index 00000000000..fd46fbe290b --- /dev/null +++ b/mods/content/hearthdrinks/_hearthdrinks.dme @@ -0,0 +1,17 @@ +#ifndef CONTENT_PACK_HEARTHDRINKS +#define CONTENT_PACK_HEARTHDRINKS +// BEGIN_INCLUDE +#include "_hearthdrinks.dm" +#include "reactions.dm" +#include "cocktails.dm" +#include "drinks\dispcarts.dm" +#include "vending\vending.dm" +#include "drinks\chems_drinks.dm" +#include "drinks\chems_ethanol.dm" +#include "drinks\cartridges_presets.dm" +#include "drinks\dispenser_presets.dm" +#include "drinks\drinks.dm" +#include "drinks\cans.dm" +#include "drinks\bottle.dm" +#endif +// END_INCLUDE \ No newline at end of file diff --git a/mods/content/hearthdrinks/cocktails.dm b/mods/content/hearthdrinks/cocktails.dm new file mode 100644 index 00000000000..0023005ff44 --- /dev/null +++ b/mods/content/hearthdrinks/cocktails.dm @@ -0,0 +1,161 @@ +/decl/cocktail/bogus + name = "Bogus" + description = "A blend of gin and blackstrap, delicious." + ratios = list( + /decl/material/liquid/ethanol/blackstrap = 0.4, + /decl/material/liquid/ethanol/gin = 0.2 + ) + +/decl/cocktail/alexander + name = "Alexander" + description = "A choolatey cocktail with cognac." + ratios = list( + /decl/material/liquid/ethanol/cognac = 0.4, + /decl/material/liquid/drink/milk/cream = 0.2, + /decl/material/liquid/drink/hot_coco = 0.2 + ) + +/decl/cocktail/stag + name = "Stag" + description = "A historic mix of rum and black tea, commonly drank by sailors." + ratios = list( + /decl/material/liquid/drink/tea/black = 0.6, + /decl/material/liquid/ethanol/rum = 0.2 + ) + +/decl/cocktail/lonestarmule + name = "Lunastar Mule" + description = "The Lunestar Mule. Or was a Lonestar? Nobody's really sure anymore." + ratios = list( + /decl/material/liquid/ethanol/whiskey = 0.3, + /decl/material/liquid/drink/gingerbeer = 0.2, + /decl/material/liquid/drink/juice/lime = 0.2 + ) + +/decl/cocktail/wakeupcall + name = "Wake Up Call" + description = "A blend of coffee and rum." + ratios = list( + /decl/material/liquid/drink/coffee = 0.6, + /decl/material/liquid/ethanol/rum = 0.2 + ) + +/decl/cocktail/moscowmule + name = "Moscow Mule" + description = "Ho ho ho ho ho, hey!" + ratios = list( + /decl/material/liquid/ethanol/vodka = 0.3, + /decl/material/liquid/drink/gingerbeer = 0.2, + /decl/material/liquid/drink/juice/lime = 0.2 + ) + +/decl/cocktail/pinacolada + name = "Pina Colada" + description = "Ariba~!" + ratios = list( + /decl/material/liquid/drink/juice/coconut = 0.3, + /decl/material/liquid/ethanol/rum = 0.2, + /decl/material/liquid/drink/juice/pineapple = 0.2 + ) + +/decl/cocktail/sidecar + name = "Sidecar" + description = "A mix of cognac, lemon juice, and curacao." + ratios = list( + /decl/material/liquid/ethanol/cognac = 0.4, + /decl/material/liquid/drink/juice/lemon = 0.2, + /decl/material/liquid/ethanol/bluecuracao = 0.2 + ) + +/decl/cocktail/daiquiri + name = "Daiquiri" + description = "Rum, mixed with lime juice and syrup." + ratios = list( + /decl/material/liquid/ethanol/rum = 0.4, + /decl/material/liquid/drink/juice/lime = 0.2, + /decl/material/liquid/drink/syrup/affelerin = 0.2 + ) + +/decl/cocktail/caesar + name = "Caesar" + description = "Et tu?" + ratios = list( + /decl/material/liquid/ethanol/vodka = 0.4, + /decl/material/liquid/drink/juice/tomato = 0.2, + /decl/material/liquid/capsaicin = 0.2 + ) + +/decl/cocktail/caipirinha + name = "Caipirinha" + description = "A blend of cachaca and lime juice." + ratios = list( + /decl/material/liquid/ethanol/cachaca = 0.3, + /decl/material/liquid/drink/juice/lime = 0.3, + /decl/material/liquid/nutriment/sugar = 0.1 + ) + +/decl/cocktail/sangria + name = "Sangria" + description = "A blend of wine and oranges." + ratios = list( + /decl/material/liquid/ethanol/wine = 0.6, + /decl/material/liquid/drink/juice/orange = 0.2 + ) + +/decl/cocktail/carajillo + name = "Carajillo" + description = "A blend of coffee and kahula." + ratios = list( + /decl/material/liquid/drink/coffee = 0.4, + /decl/material/liquid/ethanol/coffee/kahlua = 0.2 + ) + +/decl/cocktail/qiiboxi + name = "Qiiboxi" + description = "A traditional Skrellian cocktail." + ratios = list( + /decl/material/liquid/ethanol/qokkhrona = 0.6, + /decl/material/liquid/drink/juice/orange = 0.2 + ) + +/decl/cocktail/sjikis + name = "Sjikis" + description = "Sjikis is a drink regularly consumed by Tajaran." + ratios = list( + /decl/material/liquid/drink/beastenergy = 0.4, + /decl/material/liquid/ethanol/beer = 0.2, + /decl/material/liquid/drink/tea/green = 0.2 + ) + +/decl/cocktail/yuenyeung + name = "Yuenyeung" + description = "A blend of tea and coffee." + ratios = list( + /decl/material/liquid/drink/coffee = 0.3, + /decl/material/liquid/drink/tea/black = 0.3 + ) + +/decl/cocktail/xuizi + name = "Xuizi" + description = "A traditional drink of the Unathi." + ratios = list( + /decl/material/liquid/drink/hrukhza = 0.5, + /decl/material/liquid/drink/sodawater = 0.2 + ) + +/decl/cocktail/springpunch + name = "Spring Punch" + description = "A classic cocktail of Vodka and lemon juice." + ratios = list( + /decl/material/liquid/ethanol/vodka = 0.5, + /decl/material/liquid/drink/juice/lemon = 0.2, + /decl/material/liquid/nutriment/sugar = 0.2 + ) + +/decl/cocktail/specialblend + name = "Special Blend Whiskey" + description = "A special blend of whiskey, spices, and coffee" + ratios = list( + /decl/material/liquid/ethanol/whiskey/mars = 0.5, + /decl/material/liquid/drink/coffee = 0.3 + ) \ No newline at end of file diff --git a/mods/content/hearthdrinks/drinks/bottle.dm b/mods/content/hearthdrinks/drinks/bottle.dm new file mode 100644 index 00000000000..aa6f6c4fabd --- /dev/null +++ b/mods/content/hearthdrinks/drinks/bottle.dm @@ -0,0 +1,273 @@ +/obj/item/chems/drinks/bottle/baijiu + name = "Hangzhou Bay Baijiu" + desc = "A large bottle of Baijiu with a beautiful looking sunset on the cover." + DRINK_STATE("baijiu") + center_of_mass = @"{'x':16,'y':6}" + +/obj/item/chems/drinks/bottle/baijiu/Initialize() + .=..() + reagents.add_reagent(/decl/material/liquid/ethanol/baijiu, 100) + +/obj/item/chems/drinks/bottle/cachaca + name = "Brazillian Cachaca" + desc = "Cachaca, distilled from fermented sugarcane. This one was bottled on Earth." + DRINK_STATE("cachaca") + center_of_mass = @"{'x':16,'y':6}" + +/obj/item/chems/drinks/bottle/cachaca/Initialize() + .=..() + reagents.add_reagent(/decl/material/liquid/ethanol/cachaca, 100) + +/obj/item/chems/drinks/bottle/soju + name = "Sol Hyonjun's Soju" + desc = "A clear, see-through bottle of Soju." + DRINK_STATE("soju") + center_of_mass = @"{'x':16,'y':6}" + +/obj/item/chems/drinks/bottle/soju/Initialize() + .=..() + reagents.add_reagent(/decl/material/liquid/ethanol/soju, 100) + +/obj/item/chems/drinks/bottle/rakia + name = "Sadmir Cumani's Rakia" + desc = "A polite looking man on the label promises you this is 100 percent fruit brandy." + DRINK_STATE("rakia") + center_of_mass = @"{'x':16,'y':6}" + +/obj/item/chems/drinks/bottle/rakia/Initialize() + .=..() + reagents.add_reagent(/decl/material/liquid/ethanol/rakia, 100) + +/obj/item/chems/drinks/bottle/arak + name = "Mo's Premium Arak" + desc = "A bottle of Mo's Premium anise arak." + DRINK_STATE("arak") + center_of_mass = @"{'x':16,'y':6}" + +/obj/item/chems/drinks/bottle/arak/Initialize() + .=..() + reagents.add_reagent(/decl/material/liquid/ethanol/arak, 100) + +/obj/item/chems/drinks/bottle/blackstrap + name = "Big Bill's Blackstrap" + desc = "A bottle of Big Bill's Blackstrap. High Quality Rum." + DRINK_STATE("blackstrap") + center_of_mass = @"{'x':16,'y':6}" + +/obj/item/chems/drinks/bottle/blackstrap/Initialize() + .=..() + reagents.add_reagent(/decl/material/liquid/ethanol/blackstrap, 100) + +/obj/item/chems/drinks/bottle/brandy + name = "Lunar Brandy" + desc = "A bottle of Lunar Brandy. It looks seriously expensive." + DRINK_STATE("brandy") + center_of_mass = @"{'x':16,'y':6}" + +/obj/item/chems/drinks/bottle/brandy/Initialize() + .=..() + reagents.add_reagent(/decl/material/liquid/ethanol/brandy, 100) + +/obj/item/chems/drinks/bottle/pink_gin + name = "Birmingham Pink" + desc = "A bottle of high quality gin, produced in the New London Space Station." + DRINK_STATE("pinkgin") + center_of_mass = @"{'x':16,'y':6}" + +/obj/item/chems/drinks/bottle/pink_gin/Initialize() + .=..() + reagents.add_reagent(/decl/material/liquid/ethanol/gin/pink, 100) + +/obj/item/chems/drinks/bottle/ogogoro + name = "Metropolitan Ogogoro" + desc = "A bottle of West Africa." + DRINK_STATE("ogogoro") + center_of_mass = @"{'x':16,'y':6}" + +/obj/item/chems/drinks/bottle/ogogoro/Initialize() + .=..() + reagents.add_reagent(/decl/material/liquid/ethanol/ogogoro, 100) + +/obj/item/chems/drinks/bottle/prosecco + name = "2020 Vintage Prosecco" + desc = "A delicious prosecco, ideal for long days after work. This one proudly advertises itself as 2020 Vintage. Must have been a special year." + DRINK_STATE("prosecco") + center_of_mass = @"{'x':16,'y':6}" + +/obj/item/chems/drinks/bottle/prosecco/Initialize() + .=..() + reagents.add_reagent(/decl/material/liquid/ethanol/prosecco, 100) + +/obj/item/chems/drinks/bottle/tej + name = "Rift Valley Tej" + desc = "Honey Wine from the heart of East Africa!" + DRINK_STATE("tej") + center_of_mass = @"{'x':16,'y':6}" + +/obj/item/chems/drinks/bottle/tej/Initialize() + .=..() + reagents.add_reagent(/decl/material/liquid/ethanol/tej, 100) + +/obj/item/chems/drinks/bottle/mars_whiskey + name = "Martian Gold Whiskey" + desc = "A premium bottle of spiced whiskey, also known as fireball." + DRINK_STATE("whiskeybottle3") + center_of_mass = @"{'x':16,'y':6}" + +/obj/item/chems/drinks/bottle/mars_whiskey/Initialize() + .=..() + reagents.add_reagent(/decl/material/liquid/ethanol/whiskey/mars, 100) + +/obj/item/chems/drinks/bottle/hrenti + name = "Hhassa's Secret Stash" + desc = "A bottle of Hrenti, shipped straight from Moghes." + DRINK_STATE("hrenti") + center_of_mass = @"{'x':16,'y':6}" + +/obj/item/chems/drinks/bottle/hrenti/Initialize() + .=..() + reagents.add_reagent(/decl/material/liquid/ethanol/hrenti, 100) + +/obj/item/chems/drinks/bottle/wasgaelhi + name = "Szikan Wasgaelhi" + desc = "A bottle of state-produced wasgaelhi." + DRINK_STATE("wasgaelhi") + center_of_mass = @"{'x':16,'y':6}" + +/obj/item/chems/drinks/bottle/wasgaelhi/Initialize() + .=..() + reagents.add_reagent(/decl/material/liquid/ethanol/wasgaelhi, 100) + +/obj/item/chems/drinks/bottle/yekala + name = "Kis'tan Yekala" + desc = "A bottle of yekala from Moghes, triple sealed. It smells very strongly of fish." + DRINK_STATE("yekala") + center_of_mass = @"{'x':16,'y':6}" + +/obj/item/chems/drinks/bottle/yekala/Initialize() + .=..() + reagents.add_reagent(/decl/material/liquid/ethanol/yekala, 100) + +/obj/item/chems/drinks/bottle/qokkhrona + name = "Qixxkalan Qokk'hrona" + desc = "A vibrant looking bottle of Qokk'hrona. There is a bright warning written in various human languages. It reads: WARNING. NOT SAFE FOR HUMAN CONSUMPTION." + DRINK_STATE("qokk") + center_of_mass = @"{'x':16,'y':6}" + +/obj/item/chems/drinks/bottle/qokkhrona/Initialize() + .=..() + reagents.add_reagent(/decl/material/liquid/ethanol/qokkhrona, 100) + +/obj/item/chems/drinks/bottle/lemonjuice + name = "Lemon Juice" + desc = "A carton of lemon juice." + DRINK_STATE("lemonjuice") + item_state = "carton" + center_of_mass = @"{'x':16,'y':7}" + isGlass = 0 + drop_sound = 'sound/foley/drop1.ogg' + pickup_sound = 'sound/foley/paperpickup2.ogg' + +/obj/item/chems/drinks/bottle/lemonjuice/Initialize() + . = ..() + reagents.add_reagent(/decl/material/liquid/drink/juice/lemon, 100) + +/obj/item/chems/drinks/bottle/pineapplejuice + name = "Pineapple Juice" + desc = "A carton of tropical pineapple juice." + DRINK_STATE("pineapplejuice") + item_state = "carton" + center_of_mass = @"{'x':16,'y':7}" + isGlass = 0 + drop_sound = 'sound/foley/drop1.ogg' + pickup_sound = 'sound/foley/paperpickup2.ogg' + +/obj/item/chems/drinks/bottle/pineapplejuice/Initialize() + . = ..() + reagents.add_reagent(/decl/material/liquid/drink/juice/pineapple, 100) + +/obj/item/chems/drinks/bottle/small/cider_apple + name = "Apple Cider" + desc = "A small bottle of delicious apple cider." + DRINK_STATE("applecider") + center_of_mass = @"{'x':16,'y':12}" +/obj/item/chems/drinks/bottle/small/cider_apple/Initialize() + . = ..() + reagents.add_reagent(/decl/material/liquid/ethanol/cider_apple, 30) + +/obj/item/chems/drinks/bottle/small/cider_pear + name = "Pear Cider" + desc = "A small bottle of delicious pear cider" + DRINK_STATE("pearcider") + center_of_mass = @"{'x':16,'y':12}" +/obj/item/chems/drinks/bottle/small/cider_pear/Initialize() + . = ..() + reagents.add_reagent(/decl/material/liquid/ethanol/cider_pear, 30) + +/obj/item/chems/drinks/bottle/small/lager + name = "Hans' Original Lager" + desc = "A bottle of premium lager. Has Hans' seal of approval, apparently." + DRINK_STATE("lager") + center_of_mass = @"{'x':16,'y':12}" +/obj/item/chems/drinks/bottle/small/lager/Initialize() + . = ..() + reagents.add_reagent(/decl/material/liquid/ethanol/lager, 30) + +/obj/item/chems/drinks/bottle/small/martianbeer + name = "Martian Pale Ale" + desc = "The best ale on Mars, according to the label." + DRINK_STATE("marsbeer") + center_of_mass = @"{'x':16,'y':12}" +/obj/item/chems/drinks/bottle/small/martianbeer/Initialize() + . = ..() + reagents.add_reagent(/decl/material/liquid/ethanol/martianbeer, 30) + +/obj/item/chems/drinks/bottle/small/alcoholfreebeer + name = "Alcohol-Free Beer" + desc = "A sad looking bottle of alcohol-free beer." + DRINK_STATE("afbeer") + center_of_mass = @"{'x':16,'y':12}" +/obj/item/chems/drinks/bottle/small/alcoholfreebeer/Initialize() + . = ..() + reagents.add_reagent(/decl/material/liquid/drink/alcoholfreebeer, 30) + +/obj/item/chems/drinks/bottle/small/eggnog + name = "Grandma's Own Eggnog" + desc = "A small bottle of eggnog, ideal for on the go." + icon_state = "" + center_of_mass = @"{'x':16,'y':12}" +/obj/item/chems/drinks/bottle/small/eggnog/Initialize() + . = ..() + reagents.add_reagent(/decl/material/liquid/drink/eggnog, 30) + +/obj/item/chems/drinks/bottle/small/rootbeer + name = "Root Beer" + desc = "A simple bottle of root beer." + DRINK_STATE("eggnog") + center_of_mass = @"{'x':16,'y':12}" +/obj/item/chems/drinks/bottle/small/rootbeer/Initialize() + . = ..() + reagents.add_reagent(/decl/material/liquid/drink/rootbeer, 30) + +/obj/item/chems/drinks/bottle/small/dnb + name = "Dandelion and Burdock" + desc = "A bottle of dandelion and burdock. Not actually made from either of the two." + DRINK_STATE("dnb") + center_of_mass = @"{'x':16,'y':12}" +/obj/item/chems/drinks/bottle/small/dnb/Initialize() + . = ..() + reagents.add_reagent(/decl/material/liquid/drink/dnb, 30) + +/obj/item/chems/drinks/bottle/hrukhza + name = "Hrukhza Extract" + desc = "A carton of Hrukhza extract, straight from Moghes." + DRINK_STATE("hrukhzaextract") + item_state = "carton" + center_of_mass = @"{'x':16,'y':7}" + isGlass = 0 + drop_sound = 'sound/foley/drop1.ogg' + pickup_sound = 'sound/foley/paperpickup2.ogg' + +/obj/item/chems/drinks/bottle/hrukhza/Initialize() + . = ..() + reagents.add_reagent(/decl/material/liquid/drink/hrukhza, 100) \ No newline at end of file diff --git a/mods/content/hearthdrinks/drinks/cans.dm b/mods/content/hearthdrinks/drinks/cans.dm new file mode 100644 index 00000000000..425e6045e5c --- /dev/null +++ b/mods/content/hearthdrinks/drinks/cans.dm @@ -0,0 +1,49 @@ +/obj/item/chems/drinks/cans/europa + name = "Europa Punch!" + desc = "A can of Europa Punch, a delicious juice made from various aquatic plants!" + DRINK_STATE("europa") + center_of_mass = @"{'x':16,'y':10}" + +/obj/item/chems/drinks/cans/europa/Initialize() + . = ..() + reagents.add_reagent(/decl/material/liquid/drink/juice/europa, 30) + +/obj/item/chems/drinks/cans/ionbru + name = "Ion-Bru" + desc = "A can of Ion-Bru, the drink of shipbuilders." + DRINK_STATE("ionbru") + center_of_mass = @"{'x':16,'y':10}" + +/obj/item/chems/drinks/cans/ionbru/Initialize() + . = ..() + reagents.add_reagent(/decl/material/liquid/drink/ionbru, 30) + +/obj/item/chems/drinks/cans/vanillacola + name = "Vanilla Cola" + desc = "A can of vanilla cola." + DRINK_STATE("vcola") + center_of_mass = @"{'x':16,'y':10}" + +/obj/item/chems/drinks/cans/vanillacola/Initialize() + . = ..() + reagents.add_reagent(/decl/material/liquid/drink/cola/vanilla, 30) + +/obj/item/chems/drinks/cans/coffeecola + name = "Coffee Cola" + desc = "A can of coffee cola." + DRINK_STATE("ccola") + center_of_mass = @"{'x':16,'y':10}" + +/obj/item/chems/drinks/cans/coffeecola/Initialize() + . = ..() + reagents.add_reagent(/decl/material/liquid/drink/cola/coffee, 30) + +/obj/item/chems/drinks/cans/zazkis + name = "Hsstik Zazkis" + desc = "A chilled can of zazkis, a Moghsian delight." + DRINK_STATE("zazkis") + center_of_mass = @"{'x':16,'y':10}" + +/obj/item/chems/drinks/cans/zazkis/Initialize() + . = ..() + reagents.add_reagent(/decl/material/liquid/drink/zazkis, 30) \ No newline at end of file diff --git a/mods/content/hearthdrinks/drinks/cartridges_presets.dm b/mods/content/hearthdrinks/drinks/cartridges_presets.dm new file mode 100644 index 00000000000..45e670f2364 --- /dev/null +++ b/mods/content/hearthdrinks/drinks/cartridges_presets.dm @@ -0,0 +1,27 @@ +/obj/item/chems/chem_disp_cartridge/baijiu + spawn_reagent = /decl/material/liquid/ethanol/baijiu +/obj/item/chems/chem_disp_cartridge/ogogoro + spawn_reagent = /decl/material/liquid/ethanol/ogogoro + +/obj/item/chems/chem_disp_cartridge/europa + spawn_reagent = /decl/material/liquid/drink/juice/europa +/obj/item/chems/chem_disp_cartridge/melon + spawn_reagent = /decl/material/liquid/drink/juice/melon +/obj/item/chems/chem_disp_cartridge/pineapple + spawn_reagent = /decl/material/liquid/drink/juice/pineapple +/obj/item/chems/chem_disp_cartridge/rootbeer + spawn_reagent = /decl/material/liquid/drink/rootbeer +/obj/item/chems/chem_disp_cartridge/afbeer + spawn_reagent = /decl/material/liquid/drink/alcoholfreebeer +/obj/item/chems/chem_disp_cartridge/skrianhi + spawn_reagent = /decl/material/liquid/drink/skrianhi +/obj/item/chems/chem_disp_cartridge/hrukhza + spawn_reagent = /decl/material/liquid/drink/hrukhza + +/obj/item/chems/chem_disp_cartridge/syrup_affelerin + spawn_reagent = /decl/material/liquid/drink/syrup/affelerin + +/obj/item/chems/chem_disp_cartridge/espresso + spawn_reagent = /decl/material/liquid/drink/espresso +/obj/item/chems/chem_disp_cartridge/decafcoffee + spawn_reagent = /decl/material/liquid/drink/decafcoffee \ No newline at end of file diff --git a/mods/content/hearthdrinks/drinks/chems_drinks.dm b/mods/content/hearthdrinks/drinks/chems_drinks.dm new file mode 100644 index 00000000000..af655c0910a --- /dev/null +++ b/mods/content/hearthdrinks/drinks/chems_drinks.dm @@ -0,0 +1,217 @@ +/decl/material/liquid/drink/juice/europa + name = "Europa Punch" + lore_text = "Delicious juice made from a blend of various alien species found on Europa." + taste_description = "syrupy fruit" + color = "#9608af" + glass_name = "star juice" + glass_desc = "A tall glass of Europa Punch." + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_drink_europa" + +/decl/material/liquid/drink/juice/melon + name = "melon juice" + lore_text = "Juice from a freshly squeezed melon" + taste_description = "tangy melon" + color = "#e9ba33" + uid = "chem_nutriment_juice_melon" + + glass_name = "melon juice" + glass_desc = "A glass of melon juice." + +/decl/material/liquid/drink/juice/pineapple + name = "pineapple juice" + lore_text = "Juice from a pineapple." + taste_description = "delicious pineapple juice" + color = "#f6e12d" + uid = "chem_nutriment_juice_pineapple" + + glass_name = "pineapple juice" + glass_desc = "A glass of tropical pineapple juice." + +/decl/material/liquid/drink/juice/coconut + name = "coconut milk" + lore_text = "Processed milk from a coconut." + taste_description = "cool coconut milk" + color = "#fcffe1" + uid = "chem_nutriment_juice_coconut" + + glass_name = "coconut milk" + glass_desc = "Delicious milk from a coconut." + +/decl/material/liquid/drink/juice/iridast + name = "iridast juice" + lore_text = "Juice from the Iridast, a plant native to Adhomai." + taste_description = "incredible sweetness" + color = "#fa68ff" + uid = "chem_nutriment_juice_iridast" + + glass_name = "iridast juice" + glass_desc = "A glass of iridast juice." + +/decl/material/liquid/drink/rootbeer + name = "Root Beer" + lore_text = "A hearty non-alcoholic drink popular all over human space." + taste_description = "carbonated ginger" + color = "#44371f" + glass_name = "ginger beer" + glass_desc = "A glass of refreshing ginger beer" + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_drink_rootbeer" + +/decl/material/liquid/drink/doogh + name = "doogh" + lore_text = "A yogurt-based drink seasoned with salt and mint." + taste_description = "savory sourness" + color = "#f7f5ca" + glass_name = "doogh" + glass_desc = "A yogurt-based drink seasoned with salt and mint." + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_drink_doogh" + +/decl/material/liquid/drink/eggnog + name = "eggnog" + lore_text = "Perfect for the holidays!" + taste_description = "eggy noggyness" + color = "#619494" + glass_name = "eggnog" + glass_desc = "A tall glass of eggnog." + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_drink_eggnog" + +/decl/material/liquid/drink/alcoholfreebeer + name = "non-alcoholic beer" + lore_text = "Invented by sadists to torture everyone everywhere." + taste_description = "alcohol free piss water" + color = "#ffd300" + glass_name = "beer" + glass_desc = "A freezing container of beer" + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_drink_alcoholfreebeer" + +/decl/material/liquid/drink/syrup/affelerin + name = "affelerin nectar" + lore_text = "A sweet, thick, syrup-like nectar from the Affelerin, native to Adhomai." + taste_description = "thick and sweet syrup" + color = "#ac43e0" + coffee_priority = 5 + uid = "chem_drink_affelerin" + + glass_name = "affelerin nectar" + glass_desc = "A glass of sweet affelerin nectar." + +/decl/material/liquid/drink/decafcoffee + name = "decaffeinated coffee" + lore_text = "Coffee without the caffeine." + taste_description = "decfeinated bitterness" + color = "#482000" + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_drink_decaf" + + glass_name = "decaf coffee" + glass_desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere." + +/decl/material/liquid/drink/espresso + name = "espresso" + lore_text = "Extra strong coffee." + taste_description = "deluxe bitterness" + taste_mult = 1.3 + color = "#482000" + adj_dizzy = -5 + adj_drowsy = -3 + adj_sleepy = -2 + adj_temp = 25 + overdose = 60 + glass_name = "espresso" + glass_desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere." + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_drink_espresso" + +/decl/material/liquid/drink/americano + name = "americano" + lore_text = "Diluted Espresso." + taste_description = "dark bitterness" + taste_mult = 1.1 + color = "#482000" + adj_dizzy = -2 + adj_drowsy = -1 + adj_sleepy = -2 + adj_temp = 25 + overdose = 60 + glass_name = "americano" + glass_desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere." + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_drink_americano" + +/decl/material/liquid/drink/cola/vanilla + taste_description = "tasty vanilla cola" + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_drink_cola_vanilla" + +/decl/material/liquid/drink/cola/coffee + taste_description = "delicious coffee cola" + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_drink_cola_coffee" + +/decl/material/liquid/drink/float + name = "cola float" + lore_text = "A delicious combination of ice cream and cola" + taste_description = "carbonated ice cream" + color = "#cfe5ae" + glass_name = "cola float" + glass_desc = "a cold looking blend of cola and ice cream." + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_drink_float" + +/decl/material/liquid/drink/ionbru + name = "Ion-Bru" + lore_text = "The official drink of many proud shipworkers." + taste_description = "sweet orangy-creamy soda" + color = "#a77718" + glass_name = "ion-bru" + glass_desc = "A tall glass of Ion-Bru." + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_drink_ionbru" + +/decl/material/liquid/drink/dnb + name = "dandelion and burdock" + lore_text = "Warning: Does not contain any Taraxacum officinale or Arctium lappa." + taste_description = "sassafras" + color = "#ff8cff" + glass_name = "dandelion and burdock" + glass_desc = "Unz. Unz. Unz. Wait, wrong DnB." + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_drink_dnb" + + + +// ALIEN DRINKS + +/decl/material/liquid/drink/hrukhza + name = "hrukhza extract" + lore_text = "A spicy extract from the hrukhza plant of Moghes. Used to make many drinks." + taste_description = "spicy bitterness" + color = "#e78108" + glass_name = "hrukhza extract" + glass_desc = "A glass of the spicy extract from a hrukhza plant." + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_drink_hrukhza" + +/decl/material/liquid/drink/skrianhi + name = "skrianhi tea" + lore_text = "A popular and refreshing tea commonly consumed on Moghes." + taste_description = "bitter, but energising tea" + color = "#0e0900" + glass_name = "skrianhi tea" + glass_desc = "A cuppa skrianhi tea." + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_drink_skrianhi" + +/decl/material/liquid/drink/zazkis + name = "zazkis" + lore_text = "A chocolate-like drink from Moghes." + taste_description = "minty bitter chocolate" + color = "#680609" + glass_name = "zazkis" + glass_desc = "A glass of chocolatey zazkis" + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_drink_zazkis" \ No newline at end of file diff --git a/mods/content/hearthdrinks/drinks/chems_ethanol.dm b/mods/content/hearthdrinks/drinks/chems_ethanol.dm new file mode 100644 index 00000000000..569b729481c --- /dev/null +++ b/mods/content/hearthdrinks/drinks/chems_ethanol.dm @@ -0,0 +1,222 @@ +/decl/material/liquid/ethanol/arak + name = "Arak" + lore_text = "Arak is a distilled anise spirit popular in the Levant." + taste_description = "licorice" + color = "#f7f6e0" + strength = 20 + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_ethanol_arak" + + glass_name = "arak" + glass_desc = "An unsweetened glass of arak." + +/decl/material/liquid/ethanol/baijiu + name = "baijiu" + lore_text = "An alcoholic drink made from rice and sorghum, then flavoured. Popular all across Earth." + taste_description = "sweet fruits and nuts" + color = "#f7f6e0" + strength = 30 + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_ethanol_baijiu" + + glass_name = "baijiu" + glass_desc = "a clear glass of sweet baijiu." + +/decl/material/liquid/ethanol/blackstrap + name = "blackstrap" + lore_text = "A dark rum, mixed with mollases. Extremely popular across Human Space." + taste_description = "strong, sweet and syrupy rum" + color = "#161612" + strength = 10 + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_ethanol_blackstrap" + + glass_name = "blackstrap rum" + glass_desc = "A dark glass of blackstrap rum." + +/decl/material/liquid/ethanol/brandy + name = "Brandy" + lore_text = "Consumed by the barrel on Luna, and the drink of choice for any wannabe aristocrat." + taste_description = "distilled wine and snobbery" + color = "#bdb6a9" + strength = 20 + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_ethanol_brandy" + + glass_name = "brandy" + glass_desc = "You feel more upper class just looking at it." + +/decl/material/liquid/ethanol/cachaca + name = "cachaca" + lore_text = "A sweet alcoholic drink made from fermented sugarcane." + taste_description = "sugary tropical juice" + color = "#d7d3b4" + strength = 30 + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_ethanol_cachaca" + + glass_name = "cachaca" + glass_desc = "A glass of delicious looking cachaca." + +/decl/material/liquid/ethanol/gin/pink + name = "pink gin" + lore_text = "Gin with red bitters creating a soft pinkish colour." + taste_description = "a pink alcoholic christmas tree" + color = "#e25963" + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_ethanol_pinkgin" + + glass_desc = "A crystal clear glass of pink gin." + +/decl/material/liquid/ethanol/lager + name = "lager" + lore_text = "A popular kind of beer found across Europe. Dark and musty." + taste_description = "smooth, crisp lager" + color = "#e0b900" + strength = 60 + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_ethanol_lager" + + glass_name = "lager" + glass_desc = "Just looking at it makes you want to order a pack of crisps and two pints." + +/decl/material/liquid/ethanol/martianbeer + name = "Martian pale ale" + lore_text = "A dark, hoppy beer produced all across Mars. It is a planetary favourite." + taste_description = "dark musty beer" + color = "#5b4e35" + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_ethanol_marsbeer" + + glass_name = "pale ale" + glass_desc = "An dark and hoppy beer." + +/decl/material/liquid/ethanol/ogogoro + name = "ogogoro" + lore_text = "A popular alcoholic drink from West Africa, distilled from palm juices." + taste_description = "sugarcane and fermented palms" + color = "#faffd2" + strength = 30 + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_ethanol_ogogoro" + + glass_name = "ogogoro" + glass_desc = "A glass of ogogoro." + +/decl/material/liquid/ethanol/prosecco + name = "prosecco" + lore_text = "A refreshing type of white wine." + taste_description = "the trials of being a young woman in a rich man's world" + color = "#e8dfc1" + strength = 35 + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_ethanol_prosecco" + + glass_name = "prosecco" + glass_desc = "A white wine native to Earth." + +/decl/material/liquid/ethanol/rakia + name = "rakia" + lore_text = "A popular fruit brandy from the Balkans." + taste_description = "dry grapes" + color = "#c2d6b7" + strength = 30 + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_ethanol_rakia" + + glass_name = "rakia" + glass_desc = "Fruit brandy. Delicious!" + +/decl/material/liquid/ethanol/soju + name = "soju" + lore_text = "Baijiu - Sake - Soju. The trilogy of rice-derived alcohols." + taste_description = "subtle, mild sweetness" + color = "#99dbdb" + strength = 30 + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_ethanol_soju" + + glass_name = "soju" + glass_desc = "A glass of soju." + +/decl/material/liquid/ethanol/tej + name = "tej" + lore_text = "Tej is also known as Honey Wine. Similar to Mead." + taste_description = "sweet and tanic alcohol" + color = "#898873" + strength = 60 + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_ethanol_tej" + + glass_name = "tej" + glass_desc = "a glass of tej, also known as honey wine." + +/decl/material/liquid/ethanol/whiskey/mars + name = "Martian Gold whiskey" + lore_text = "A blend of 99 spices found across Mars." + taste_description = "strong, spicy fireball!" + color = "#7c2b00" + strength = 20 + uid = "chem_ethanol_mars" + +/decl/material/liquid/ethanol/wine/jupiter + name = "Jovian wine" + lore_text = "There's good wine. There's bad wine. Then there's Jovian Wine. Illegal to consume on Earth due to its extreme alcohol content, it is nevertheless enjoyed by spacers everywhere." + taste_description = "regret and liver failure" + color = "#558497" + strength = 5 + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_ethanol_jovianwine" + + glass_name = "Jovian wine" + glass_desc = "Easily mistaken for toilet water, but damn it gets you drunk fast." + +// Alien Alcohol + +/decl/material/liquid/ethanol/hrenti + name = "Hrenti" + lore_text = "A curious blend of Moghsian fermented milk and grains. It produces an alcoholic, and slightly acidic drink." + taste_description = "your tastebuds quitting in protest at whatever this is" + color = "#9e5635" + strength = 25 + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_ethanol_hrenti" + + glass_name = "hrenti" + glass_desc = "An alcoholic drink from Moghes." + +/decl/material/liquid/ethanol/wasgaelhi + name = "Wasgaelhi" + lore_text = "Wasgaelhi is a type of low-alcohol wine that is frequently consumed by the northern inhabitants of Moghes." + taste_description = "warm and vaguely metallic wine" + color = "#673346" + strength = 50 + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_ethanol_wasgaelhi" + + glass_name = "wasgaelhi" + glass_desc = "Wine from the northern continent of Moghes." + +/decl/material/liquid/ethanol/yekala + name = "Yek'ala" + lore_text = "Yek'ala is a Yeosa'Unathi delicacy, made from various Moghsian fish. It is strongly alcoholic." + taste_description = "alcoholic anchovies" + color = "#7052dd" + strength = 25 + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_ethanol_yekla" + + glass_name = "yekla" + glass_desc = "Alcoholic fish guts. Tastes better than it smells." + +/decl/material/liquid/ethanol/qokkhrona + name = "Qokk'hrona" + lore_text = "Qokk'hrona is wine made from refined Qokk'loa. The Skrell still do not understand why humans smirk when hearing this." + taste_description = "a thick potion of mushroom and hard alcohol" + color = "#c76c4d" + strength = 500 + exoplanet_rarity = MAT_RARITY_NOWHERE + uid = "chem_ethanol_qokkhrona" + + glass_name = "qokk'hrona" + glass_desc = "A glass of tasty qokk." \ No newline at end of file diff --git a/mods/content/hearthdrinks/drinks/dispcarts.dm b/mods/content/hearthdrinks/drinks/dispcarts.dm new file mode 100644 index 00000000000..027fd8a31d7 --- /dev/null +++ b/mods/content/hearthdrinks/drinks/dispcarts.dm @@ -0,0 +1,13 @@ +SEC_PACK(baijiu, /obj/item/chems/chem_disp_cartridge/baijiu, "Reagent refill - Baijiu", "baijiu reagent cartridge crate", access_bar) +SEC_PACK(mead, /obj/item/chems/chem_disp_cartridge/ogogoro, "Reagent refill - Ogogoro", "ogogoro reagent cartridge crate", access_bar) + +PACK(europa, /obj/item/chems/chem_disp_cartridge/europa, "Reagent refill - Europa Punch", "europa punch reagent cartridge crate") +PACK(melon, /obj/item/chems/chem_disp_cartridge/melon, "Reagent refill - Melon", "melon reagent cartridge crate") +PACK(pineapple, /obj/item/chems/chem_disp_cartridge/pineapple, "Reagent refill - Pineapple", "pineapple reagent cartridge crate") +PACK(decafcoffee, /obj/item/chems/chem_disp_cartridge/decafcoffee, "Reagent refill - Decaf Coffee", "decaf coffee reagent cartridge crate") +PACK(espresso, /obj/item/chems/chem_disp_cartridge/espresso, "Reagent refill - Espresso", "espresso reagent cartridge crate") +PACK(rootbeer, /obj/item/chems/chem_disp_cartridge/rootbeer, "Reagent refill - Rootbeer", "root beer reagent cartridge crate") +PACK(afbeer, /obj/item/chems/chem_disp_cartridge/afbeer, "Reagent refill - Alcohol Free Beer", "alcohol free beer reagent cartridge crate") +PACK(skrianhi, /obj/item/chems/chem_disp_cartridge/skrianhi, "Reagent refill - Skrianhi Tea", "skrianhi reagent cartridge crate") + +PACK(syrup_affelerin, /obj/item/chems/chem_disp_cartridge/syrup_affelerin, "Reagent refill - Affelerin Syrup", "affelerin syrup reagent cartridge crate") \ No newline at end of file diff --git a/mods/content/hearthdrinks/drinks/dispenser_presets.dm b/mods/content/hearthdrinks/drinks/dispenser_presets.dm new file mode 100644 index 00000000000..598643786e5 --- /dev/null +++ b/mods/content/hearthdrinks/drinks/dispenser_presets.dm @@ -0,0 +1,26 @@ +/obj/machinery/chemical_dispenser/bar_alc/full/Initialize() + LAZYDISTINCTADD(spawn_cartridges, list( + /obj/item/chems/chem_disp_cartridge/baijiu, + /obj/item/chems/chem_disp_cartridge/ogogoro, + )) + . = ..() + +/obj/machinery/chemical_dispenser/bar_coffee/full/Initialize() + LAZYDISTINCTADD(spawn_cartridges, list( + /obj/item/chems/chem_disp_cartridge/skrianhi, + /obj/item/chems/chem_disp_cartridge/espresso, + /obj/item/chems/chem_disp_cartridge/syrup_affelerin, + /obj/item/chems/chem_disp_cartridge/decafcoffee + )) + . = ..() + +/obj/machinery/chemical_dispenser/bar_soft/full/Initialize() + LAZYDISTINCTADD(spawn_cartridges, list( + /obj/item/chems/chem_disp_cartridge/europa, + /obj/item/chems/chem_disp_cartridge/melon, + /obj/item/chems/chem_disp_cartridge/pineapple, + /obj/item/chems/chem_disp_cartridge/rootbeer, + /obj/item/chems/chem_disp_cartridge/afbeer, + /obj/item/chems/chem_disp_cartridge/hrukhza + )) + . = ..() \ No newline at end of file diff --git a/mods/content/hearthdrinks/drinks/drinks.dm b/mods/content/hearthdrinks/drinks/drinks.dm new file mode 100644 index 00000000000..cb1dd1dee45 --- /dev/null +++ b/mods/content/hearthdrinks/drinks/drinks.dm @@ -0,0 +1,9 @@ +/obj/item/chems/drinks/decaf + name = "\improper Robust Decaffeinated Coffee" + desc = "Careful, the beverage you're about to enjoy is extremely hot. It contains no caffeine." + DRINK_STATE("coffee") + center_of_mass = @"{'x':15,'y':10}" + +/obj/item/chems/drinks/decaf/Initialize() + . = ..() + reagents.add_reagent(/decl/material/liquid/drink/decafcoffee, 30) \ No newline at end of file diff --git a/mods/content/hearthdrinks/icons/drinks.dmi b/mods/content/hearthdrinks/icons/drinks.dmi new file mode 100644 index 00000000000..d06b047af19 Binary files /dev/null and b/mods/content/hearthdrinks/icons/drinks.dmi differ diff --git a/mods/content/hearthdrinks/reactions.dm b/mods/content/hearthdrinks/reactions.dm new file mode 100644 index 00000000000..5f2cdc48b22 --- /dev/null +++ b/mods/content/hearthdrinks/reactions.dm @@ -0,0 +1,46 @@ +/decl/chemical_reaction/recipe/jovianwine + name = "Jovian Wine" + result = /decl/material/liquid/ethanol/wine/jupiter + required_reagents = list(/decl/material/liquid/nutriment = 2, /decl/material/liquid/fuel = 1, /decl/material/liquid/cleaner = 1) + result_amount = 4 + mix_message = "The mixture ferments into a thick, wine-coloured substance." + +/decl/chemical_reaction/recipe/skrianhi + name = "Skrianhi Tea" + result = /decl/material/liquid/drink/skrianhi + required_reagents = list(/decl/material/liquid/drink/tea/green = 2, /decl/material/liquid/drink/hrukhza = 1) + result_amount = 3 + mix_message = "The tea bubbles softly as it mixes." + +/decl/chemical_reaction/recipe/eggnog + name = "Eggnog" + result = /decl/material/liquid/drink/eggnog + required_reagents = list(/decl/material/liquid/nutriment/protein/egg = 3, /decl/material/liquid/drink/milk = 5, /decl/material/liquid/nutriment/sugar = 5) + result_amount = 13 + inhibitors = list(/decl/material/liquid/nutriment/flour) + mix_message = "The mixture turns a creamy white." + +/decl/chemical_reaction/recipe/vanillacola + name = "Vanilla Cola" + result = /decl/material/liquid/drink/cola/vanilla + required_reagents = list(/decl/material/liquid/drink/syrup/vanilla = 1, /decl/material/liquid/drink/cola = 2) + result_amount = 3 + +/decl/chemical_reaction/recipe/coffeecola + name = "Coffee Cola" + result = /decl/material/liquid/drink/cola/coffee + required_reagents = list(/decl/material/liquid/drink/coffee = 1, /decl/material/liquid/drink/cola = 2) + result_amount = 3 + +/decl/chemical_reaction/recipe/doogh + name = "Doogh" + result = /decl/material/liquid/drink/doogh + required_reagents = list(/decl/material/liquid/drink/milk/cream = 2, /decl/material/liquid/drink/syrup/mint = 1) + result_amount = 3 + +/decl/chemical_reaction/recipe/americano + name = "Americano" + result = /decl/material/liquid/drink/americano + required_reagents = list(/decl/material/liquid/drink/espresso = 2, /decl/material/liquid/water = 1) + result_amount = 3 + mix_message = "The coffee frothes up nicely." \ No newline at end of file diff --git a/mods/content/hearthdrinks/vending/vending.dm b/mods/content/hearthdrinks/vending/vending.dm new file mode 100644 index 00000000000..f31acd9e582 --- /dev/null +++ b/mods/content/hearthdrinks/vending/vending.dm @@ -0,0 +1,58 @@ +/obj/machinery/vending/boozeomat/Initialize() + var/list/new_products = list( + /obj/item/chems/drinks/bottle/arak = 5, + /obj/item/chems/drinks/bottle/baijiu = 5, + /obj/item/chems/drinks/bottle/blackstrap = 5, + /obj/item/chems/drinks/bottle/cachaca = 5, + /obj/item/chems/drinks/bottle/pink_gin = 5, + /obj/item/chems/drinks/bottle/ogogoro = 5, + /obj/item/chems/drinks/bottle/prosecco = 5, + /obj/item/chems/drinks/bottle/rakia = 5, + /obj/item/chems/drinks/bottle/soju = 5, + /obj/item/chems/drinks/bottle/tej = 5, + /obj/item/chems/drinks/bottle/mars_whiskey = 5, + /obj/item/chems/drinks/bottle/hrenti = 5, + /obj/item/chems/drinks/bottle/wasgaelhi = 5, + /obj/item/chems/drinks/bottle/yekala = 5, + /obj/item/chems/drinks/bottle/qokkhrona = 2, + /obj/item/chems/drinks/bottle/small/cider_apple = 15, + /obj/item/chems/drinks/bottle/small/cider_pear = 15, + /obj/item/chems/drinks/bottle/small/lager = 15, + /obj/item/chems/drinks/bottle/small/martianbeer = 15, + /obj/item/chems/drinks/bottle/small/alcoholfreebeer = 15, + /obj/item/chems/drinks/bottle/small/rootbeer = 15, + /obj/item/chems/drinks/bottle/small/dnb = 15, + /obj/item/chems/drinks/cans/beastenergy = 15, + /obj/item/chems/drinks/bottle/small/eggnog = 15, + /obj/item/chems/drinks/bottle/hrukhza = 5, + /obj/item/chems/drinks/bottle/lemonjuice = 5, + /obj/item/chems/drinks/bottle/pineapplejuice = 5, + ) + var/list/new_contraband = list( + /obj/item/chems/drinks/bottle/brandy = 5, + ) +// TODO: CONVERT TO USE A HELPER + LAZYREMOVE(products, new_products) // clear duplicates + LAZYADD(products, new_products) + LAZYREMOVE(contraband, new_contraband) + LAZYADD(contraband, new_contraband) + . = ..() + +/obj/machinery/vending/coffee/Initialize() + var/list/new_products = list( + /obj/item/chems/drinks/decaf = 15 + ) + LAZYREMOVE(products, new_products) + LAZYADD(products, new_products) + . = ..() + +/obj/machinery/vending/cola/Initialize() + var/list/new_products = list( + /obj/item/chems/drinks/cans/coffeecola = 10, + /obj/item/chems/drinks/cans/vanillacola = 10, + /obj/item/chems/drinks/cans/ionbru = 10, + /obj/item/chems/drinks/cans/europa = 10 + ) + LAZYREMOVE(products, new_products) + LAZYADD(products, new_products) + . = ..() \ No newline at end of file diff --git a/mods/content/neural_laces/body_printer.dm b/mods/content/neural_laces/body_printer.dm index cfa3549ca70..d9e8f35b436 100644 --- a/mods/content/neural_laces/body_printer.dm +++ b/mods/content/neural_laces/body_printer.dm @@ -1,5 +1,5 @@ #define MAX_PRINTING_PASSES 5 -#define COST_PER_PRINT 15000 //in cm3 +#define COST_PER_PRINT 15000 //in cm3 #define BIOPRINTER_MAX_MATERIALS 30000 #define MATERIAL_LOW 1 #define MATERIAL_VERY_LOW 2 @@ -12,7 +12,7 @@ icon_state = "base" density = TRUE anchored = TRUE - idle_power_usage = 200 + idle_power_usage = 200 active_power_usage = 15 KILOWATTS stat_immune = 0 @@ -45,7 +45,7 @@ var/increment_delay //The time between y increments for the alpha masking of the mob icon and the print head. This is based on the printing time, hence why it is configurable. var/next_increment = 0 - var/total_passes = 0 + var/total_passes = 0 var/obj/item/disk/dna/diskette var/datum/sound_token/sound_token var/sound_id @@ -53,8 +53,8 @@ var/list/materials = list(/decl/material/solid/meat = 0, /decl/material/solid/bone = 0) var/list/technobabble_systems = list( - "microservo positioning system", - "flash-sterilization subsystem", + "microservo positioning system", + "flash-sterilization subsystem", "flash-differentiation feed system", "print laser power regulation system", "biomass circulation subsystem", @@ -151,7 +151,8 @@ D.forceMove(src) diskette = D to_chat(user, SPAN_NOTICE("You insert \the [D] into \the [src].")) - if(I.matter[1] in materials) + return TRUE + if(isitem(I) && LAZYLEN(I.matter) && (I.matter[1] in materials)) accept_materials(I, user) /obj/machinery/bioprinter/proc/accept_materials(var/obj/item/S, var/user) @@ -162,7 +163,7 @@ if(materials[S.matter[1]] == BIOPRINTER_MAX_MATERIALS) to_chat(user, SPAN_WARNING("\The [src] is full of [S]!")) - return + return if(isstack(S)) var/obj/item/stack/ST = S var/sheets_input = input(user, "How many sheets do you wish to input?", "Sheet Input", 0) as num|null @@ -173,16 +174,14 @@ sheets_input = clamp(sheets_input, 1, ST.amount) var/free_space = BIOPRINTER_MAX_MATERIALS - materials[ST.matter[1]] - - if(free_space == 0) - to_chat(user, SPAN_WARNING("\The [src] is full of [ST]!")) - return - var/max_input = round((free_space / SHEET_MATERIAL_AMOUNT)) + if(max_input == 0) + to_chat(user, SPAN_WARNING("\The [src] is too full to add \the [ST]!")) + return sheets_input = min(sheets_input, max_input) - - var/input_amt = sheets_input * SHEET_MATERIAL_AMOUNT + + var/input_amt = sheets_input * SHEET_MATERIAL_AMOUNT if((materials[ST.matter[1]] + input_amt) >= BIOPRINTER_MAX_MATERIALS) //doublecheck sanity return @@ -218,7 +217,7 @@ materials[material1] -= mat1amt materials[material2] -= mat2amt return TRUE - + /obj/machinery/bioprinter/proc/open_pod_start() animate(lid, pixel_y = 38, time = 3 SECONDS, easing = SINE_EASING) addtimer(CALLBACK(src, .proc/open_pod_finish), 3 SECONDS) @@ -269,7 +268,7 @@ add_overlay(image(icon, "reactor_low")) if(MATERIAL_FULL) add_overlay(image(icon, "reactor_full")) - + if(!printing && !cleaning) add_overlay(image(icon, "computer_standby")) if(printing && !needs_attention) @@ -333,7 +332,7 @@ .["start_print"] = cached_choices["start_print"] if(needs_attention) .["interact"] = cached_choices["interact"] - + /obj/machinery/bioprinter/proc/get_printing_increment() . = round((printing_time / MAX_PRINTING_PASSES)) @@ -462,7 +461,7 @@ /obj/machinery/bioprinter/proc/do_fakemob_animation(var/fakemob_name, var/filter_name, var/stage_name, var/fakemob_layer_increment, var/fade_out = FALSE) var/obj/structure/fake_clone_mob/fakemob = clone_mobs[fakemob_name] - + if(!fakemob) return diff --git a/nano/templates/ftl_computer.tmpl b/nano/templates/ftl_computer.tmpl index d6333cade3c..76aa98dd88c 100644 --- a/nano/templates/ftl_computer.tmpl +++ b/nano/templates/ftl_computer.tmpl @@ -102,16 +102,7 @@ Remaining Fuel:
- {{:data.fuel_joules}} MJ -
- - -
-
- Average Conversion Rate: -
-
- {{:data.fuel_conversion}} MJ/cm3 + {{:data.fuel_joules}} / {{:data.maxfuel}} Cores
@@ -139,7 +130,7 @@ Estimated Fuel Cost:
- {{:data.jumpcost}} MJ/cm + {{:data.jumpcost}} Cores
diff --git a/nebula.dme b/nebula.dme index 8501bb38ce6..a9427f7ea45 100644 --- a/nebula.dme +++ b/nebula.dme @@ -2743,6 +2743,8 @@ #include "code\modules\overmap\ftl_shunt\_shunt.dm" #include "code\modules\overmap\ftl_shunt\computer.dm" #include "code\modules\overmap\ftl_shunt\core.dm" +#include "code\modules\overmap\ftl_shunt\ftl_event.dm" +#include "code\modules\overmap\ftl_shunt\fuel_port.dm" #include "code\modules\overmap\ships\circuits.dm" #include "code\modules\overmap\ships\created.dm" #include "code\modules\overmap\ships\landable.dm" diff --git a/test/check-paths.sh b/test/check-paths.sh index 3671de951f2..a72578a69da 100755 --- a/test/check-paths.sh +++ b/test/check-paths.sh @@ -32,7 +32,7 @@ exactly 2 "/mob text paths" '"/mob' exactly 6 "/obj text paths" '"/obj' exactly 8 "/turf text paths" '"/turf' exactly 1 "world<< uses" 'world<<|world[[:space:]]<<' -exactly 89 "'in world' uses" 'in world' +exactly 90 "'in world' uses" 'in world' exactly 1 "world.log<< uses" 'world.log<<|world.log[[:space:]]<<' exactly 18 "<< uses" '(?> uses" '>>(?!>)' -P