diff --git a/aurorastation.dme b/aurorastation.dme index 58aa86c0943..a58d02e72c7 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1479,6 +1479,7 @@ #include "code\game\objects\structures\crates_lockers\closets\secure\security.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\service.dm" #include "code\game\objects\structures\crates_lockers\crates\gear_loadout.dm" +#include "code\game\objects\structures\fluff\engineering\maintenance.dm" #include "code\game\objects\structures\gore\core.dm" #include "code\game\objects\structures\gore\nest.dm" #include "code\game\objects\structures\gore\tendrils.dm" diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm index 5eb6c328956..35a19115667 100644 --- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm +++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm @@ -36,3 +36,6 @@ /// Called on [/atom/SpinAnimation()] : (speed, loops, segments, angle) #define COMSIG_ATOM_SPIN_ANIMATION "atom_spin_animation" + +/// Called when certain atoms are deconstructed, currently implemented on walls and floors +#define COMSIG_ATOM_DECONSTRUCTED "atom_deconstructed" diff --git a/code/game/objects/structures/fluff/engineering/maintenance.dm b/code/game/objects/structures/fluff/engineering/maintenance.dm new file mode 100644 index 00000000000..2331e37a223 --- /dev/null +++ b/code/game/objects/structures/fluff/engineering/maintenance.dm @@ -0,0 +1,230 @@ +#define PANEL_LOCATION_FLOOR "floor" +#define PANEL_LOCATION_WALL "wall" +#define PANEL_TYPE_PIPE "pipe" +#define PANEL_TYPE_ELECTRIC "electric" + +ABSTRACT_TYPE(/obj/structure/engineer_maintenance) + name = "abstract engineering maintenance" + desc = "You shouldn't be able to read this." + icon = 'icons/obj/engineering_fluff.dmi' + anchored = TRUE + density = FALSE + + /// Whether the panel is currently open or not + var/panel_open = FALSE + + /// Indicates where this maintenance panel can be found: floor | wall + var/panel_location + + /// Indicates what type of maintenance panel this is: pipe | electric + var/panel_type + + /// The randomly generated icon number to display, see the DMI for the sprites associated with each number + var/icon_number + + /// A key-value list of icons numbers and their descriptions, the icon_number is pick()'d from this list. The key is the icon_number, while the value is the description + var/list/icon_numbers_and_descriptions + + /// The detailed description shown only when the panel is opened, determined by the icon_number chosen above + var/detailed_desc + + /// The key-value list of tools that can be used on the panel once it's been opened. The key is the typepath of the item, and the value is a singleton which holds some data to be used + var/list/panel_tools + + /// The list of tool names that can be used on the panel once it's open, but in name format, to be used in get_examine_text + var/list/panel_tool_names = list() + +/obj/structure/engineer_maintenance/Initialize(mapload) + . = ..() + name = panel_location == PANEL_LOCATION_FLOOR ? "maintenance panel" : "large maintenance panel" // floor panels are smaller than the wall mounted ones + icon_number = pick(icon_numbers_and_descriptions) + detailed_desc = icon_numbers_and_descriptions[icon_number] + for(var/tool_type in panel_tools) + var/atom/tool = tool_type + panel_tool_names += initial(tool.name) + + var/turf/target_turf = panel_location == PANEL_LOCATION_FLOOR ? get_turf(src) : get_step(src, NORTH) + RegisterSignal(target_turf, COMSIG_ATOM_DECONSTRUCTED, PROC_REF(remove_self)) + +/obj/structure/engineer_maintenance/proc/remove_self() + SIGNAL_HANDLER + qdel(src) + +/obj/structure/engineer_maintenance/get_examine_text(mob/user, distance, is_adjacent, infix, suffix, get_extended) + . = ..() + if(panel_open) + . += SPAN_NOTICE("---") + . += SPAN_NOTICE(detailed_desc) + . += SPAN_NOTICE("---") + . += SPAN_NOTICE("An impact wrench with the wrenchbit selected can be used to open/close the panel.") + if(panel_open) + . += SPAN_NOTICE("---") + . += SPAN_NOTICE("The following tools can be used to interact with the panel:") + for(var/tool_name in panel_tool_names) + . += SPAN_NOTICE("- [tool_name]") + . += SPAN_ITALIC("OOC NOTE: This object is purely a fluff item, and has no mechanical effect.") + + +/obj/structure/engineer_maintenance/update_icon() + if(!panel_open) + icon_state = initial(icon_state) + return + icon_state = "[panel_location]_[panel_type]_[icon_number]" + +/obj/structure/engineer_maintenance/attackby(obj/item/attacking_item, mob/user, params) + if(istype(attacking_item, /obj/item/powerdrill)) // these will always open the panel + if(!attacking_item.iswrench()) + to_chat(user, SPAN_WARNING("\The [attacking_item] must have its wrenchbit inserted to remove \the [src]'s bolts!")) + return + user.visible_message("[SPAN_BOLD("[user]")] starts [panel_open ? "closing" : "opening"] \the [src]...", SPAN_NOTICE("You start [panel_open ? "closing" : "opening"] \the [src]..."), SPAN_NOTICE("You hear the whirr of an impact wrench...")) + if(attacking_item.usesound) + playsound(get_turf(src), attacking_item.usesound, 30, TRUE) + if(!do_after(user, rand(2, 3) SECONDS, src)) + return + user.visible_message("[SPAN_BOLD("[user]")] [panel_open ? "closes" : "opens"] \the [src]!", SPAN_NOTICE("You [panel_open ? "close" : "open"] \the [src]!")) + panel_open = !panel_open + update_icon() + playsound(get_turf(src), panel_open ? /singleton/sound_category/hatch_open : /singleton/sound_category/hatch_close, 30, TRUE) + return + if(panel_open) + for(var/tool_type in panel_tools) + if(istype(attacking_item, tool_type)) + var/singleton/engineer_maintenance_tool/tool_usage = GET_SINGLETON(panel_tools[tool_type]) + tool_usage.perform_action(user, attacking_item, src) + return + return ..() + +/obj/structure/engineer_maintenance/pipe + desc = "A metal cover, surrounded by yellow warning stripes around the edges. The warning on the cover reads: 'DANGER! RISK OF INJURY.' as well as 'Utility maintenance hatch. To be used only for maintenance by trained engineering personnel.'" + icon_state = "floor_pipe_cover" + panel_location = PANEL_LOCATION_FLOOR + panel_type = PANEL_TYPE_PIPE + icon_numbers_and_descriptions = list( + "1" = "The hatch contains three pipes, from different loops, going around the place. Water, steam, any utility used are going through these pipes. There is also a large equalization valve right next to the red and the blue pipe, hinting that this might equalize pressure or maybe heat.", + "2" = "You can see three pipes, a manifold with a meter and valve merging together. These kinds of pipes carry around all kinds of utility or gases around the place. The valve and connected meter allow the user to merge the currently unconnected white loop with the cyan one, while also showing the flow rate.", + "3" = "Three pipes, crossing each other, next to a metal grate are located in this hatch. Behind the little grate you can spot more of the pipe network, before giving way to the darkness. There is not much else in here.", + "4" = "A high-pressure pipe, together with an electrical flow meter and a keypad can be seen in this hatch. High pressure pipes like these usually carry gases around the place. Probably in higher quantities than usual. The interface allows the user to adjust the flow rate or to close the pipe completely." + ) + panel_tools = list( + /obj/item/wrench = /singleton/engineer_maintenance_tool/steam_pipe, + /obj/item/pipewrench = /singleton/engineer_maintenance_tool/steam_pipe, + /obj/item/hammer = /singleton/engineer_maintenance_tool/steam_pipe, + /obj/item/device/multitool = /singleton/engineer_maintenance_tool/steam_pipe + ) + +/obj/structure/engineer_maintenance/pipe/wall + icon_state = "wall_pipe_cover" + pixel_y = 16 + panel_location = PANEL_LOCATION_WALL + icon_numbers_and_descriptions = list( + "1" = "A large maintenance hatch, containing two pipes, belonging to the same loop that carries a lot of utility around, be it water, gasses or maybe even steam. On the left there are more pipes, further back. You probably need to stick your head into the opening to see more.", + "2" = "A large maintenance hatch, containing a large user interface for the surrounding pipe networks. It contains flow meters for different loops, a keypad interface, as well as a port for multitool port. Almost all parameters of this section's pipe network can be adjusted with this.", + "3" = "A big hatch, containing some high-capacity pipes. These larger pipes are also more maintenance intensive - due to increased wear. Behind the pipes you see even more pipes, belonging to different loops, as well as some labels and warning signs.", + "4" = "A seemingly end section of two pipe loops, leading further into the hull, out of sight. There is a lever on the right, to open, close or flush the loop. 'WARNING: CHECK PRESSURE BEFORE FLUSHING.' is written in red letters above said lever." + ) + +/obj/structure/engineer_maintenance/electric + desc = "A metal cover, surrounded by orange warning stripes around the edges. The warning on the cover reads: 'DANGER. RISK OF ELECTROCUTION.' as well as 'Electrical maintenance hatch. To be used only for maintenance by trained engineering personnel.'" + icon_state = "floor_electric_cover" + panel_location = PANEL_LOCATION_FLOOR + panel_type = PANEL_TYPE_ELECTRIC + icon_numbers_and_descriptions = list( + "1" = "This hatch contains a little breaker box and accompanying buttons. There are numbers and labels, all relating to surrounding equipment and lights. It is hard to differentiate between all these without the appropiate circuit diagram.", + "2" = "Within this hatch there is a control power meter interface, making it possible to deduce the amount of electrical power going through this spot, as well as where it goes and what exactly uses it. Mostly used to monitor power consumption, as APCs can be unreliable in fringe cases, this interface here allows connection with different tools, for maintenance and data collection purposes.", + "3" = "In this maintenance hatch you can see an enormous amount of loose wires, some neatly placed, some entangled, some all over the place, together with some high voltage connection ports.", + "4" = "This hatch contains an interface, showing this area's power consumption, distribution and eventual voltage peaks. Contains some firmly secured data storage devices to collect usage data, most likely. Also has connection ports for multitools and debuggers for troubleshooting.", + "5" = "In this hatch, firmly secured, you can see a heavy industrial voltage meter, with six industrial electrical connections. Used to connect different types of machinery or electrical equipment together and protect said equipment against short circuits." + ) + panel_tools = list( + /obj/item/wirecutters = /singleton/engineer_maintenance_tool/electrical_spark, + /obj/item/stack/cable_coil = /singleton/engineer_maintenance_tool/electrical_spark, + /obj/item/device/multitool = /singleton/engineer_maintenance_tool/electrical_hum + ) + +/obj/structure/engineer_maintenance/electric/wall + icon_state = "wall_electric_cover" + pixel_y = 16 + panel_location = PANEL_LOCATION_WALL + icon_numbers_and_descriptions = list( + "1" = "A large hatch, containing a relay, with controlling circuits, as well as multiple terminal blocks of equipment connections from the surrounding area. On the right you can see some space to give the cooling fans and filters some room to circulate air.", + "2" = "A maintenance hatch, containing big busbars, contactors and appropiate surge protectors. Labels and warning signs warn the user about power spikes, overload and damage to the area, if handled inappropiately. Multiple indicators and the seperate human machine interface allow for manipulation with a debugger, multitool or more for maintenance reasons.", + "3" = "A hatch containing a large emergency battery backup system, integrated within a SCADA System. SCADA stands for Supervisory Control And Data Acquisition, meaning this is one of the control units for the surrounding area. It comes with multiple control panels, grounding strips for its wiring, ground fault circuit interrupters, and many more safety systems. The wiring diagram looks very complex and the attached maintenance log on the inside of the hatch is almost full. A large warning is printed above the user interface: 'Attention: Hephaestus Industries GATEKEEPER Anti-Tamper System enclosed. Maintenance only through authorized engineering personnel. All access will be logged and documented.'", + "4" = "A hatch, containing multiple conduit junctions, relays and circuit breakers, coming with a user interface for maintenance. A lot of cables surround this hatch on all sides, mostly tucked behind some cable trays and cable tunnels. Will need a lot of fiddling to fix or repair any of this." + ) + +#undef PANEL_LOCATION_FLOOR +#undef PANEL_LOCATION_WALL +#undef PANEL_TYPE_PIPE +#undef PANEL_TYPE_ELECTRIC + +/singleton/engineer_maintenance_tool + /// The message displayed to the people around when the user starts using the tool + var/action_message_start = "%USER% starts fiddling on the %TARGET% with the %TOOL%..." + + /// The message displayed to the person performing the action when the user starts using the tool + var/self_action_message_start = "You start fiddling on the %TARGET% with the %TOOL%..." + + /// The message displayed to the people around when the user finishes using the tool + var/action_message_end = "%USER% finishes fiddling on the %TARGET% with the %TOOL%!" + + /// The message displayed to the person performing the action when the user finishes using the tool + var/self_action_message_end = "You finish fiddling on the %TARGET% with the %TOOL%!" + + /// The sound played when the user starts using the tool + var/usage_sound + + /// Whether we should use the tool's sound if no usage_sound is available + var/use_tool_sound_if_no_usage_sound = TRUE + + /// Sound to play when the action finishes + var/finish_sound + +/singleton/engineer_maintenance_tool/proc/perform_action(var/mob/user, var/obj/item/tool, var/obj/structure/engineer_maintenance/target) + var/message_start = action_message_start + message_start = replacetext(message_start, "%USER%", SPAN_BOLD("[user]")) + message_start = replacetext(message_start, "%TOOL%", tool.name) + message_start = replacetext(message_start, "%TARGET%", target.name) + + var/self_message_start = self_action_message_start + self_message_start = replacetext(self_message_start, "%TOOL%", tool.name) + self_message_start = replacetext(self_message_start, "%TARGET%", target.name) + + user.visible_message(message_start, SPAN_NOTICE(self_message_start)) + + if(usage_sound) + playsound(get_turf(target), usage_sound, 30, TRUE) + else if(use_tool_sound_if_no_usage_sound && tool.usesound) + playsound(get_turf(target), tool.usesound, 30, TRUE) + + if(!do_after(user, rand(5, 10) SECONDS, target)) + return + + var/message_end = action_message_end + message_end = replacetext(message_end, "%USER%", SPAN_BOLD("[user]")) + message_end = replacetext(message_end, "%TOOL%", tool.name) + message_end = replacetext(message_end, "%TARGET%", target.name) + + var/self_message_end = self_action_message_end + self_message_end = replacetext(self_message_end, "%TOOL%", tool.name) + self_message_end = replacetext(self_message_end, "%TARGET%", target.name) + + user.visible_message(message_end, SPAN_NOTICE(self_message_end)) + + if(finish_sound) + playsound(get_turf(target), finish_sound, 30, TRUE) + + +/singleton/engineer_maintenance_tool/steam_pipe + finish_sound = /singleton/sound_category/steam_pipe + + +/singleton/engineer_maintenance_tool/electrical_hum + finish_sound = /singleton/sound_category/electrical_hum + + +/singleton/engineer_maintenance_tool/electrical_spark + finish_sound = /singleton/sound_category/electrical_spark + +/singleton/engineer_maintenance_tool/electrical_spark/perform_action(mob/user, obj/item/tool, obj/structure/engineer_maintenance/target) + . = ..() + spark(get_turf(target), 2) diff --git a/code/game/sound.dm b/code/game/sound.dm index 42a19b493a9..6c681eb277f 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -993,3 +993,36 @@ 'sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg' ) + +/singleton/sound_category/hatch_open + sounds = list( + 'sound/machines/hatch_open1.ogg', + 'sound/machines/hatch_open2.ogg', + 'sound/machines/hatch_open3.ogg', + 'sound/machines/hatch_open4.ogg' + ) + +/singleton/sound_category/hatch_close + sounds = list( + 'sound/machines/hatch_close1.ogg', + 'sound/machines/hatch_close2.ogg' + ) + +/singleton/sound_category/electrical_hum + sounds = list( + 'sound/machines/electrical_hum1.ogg', + 'sound/machines/electrical_hum2.ogg' + ) + +/singleton/sound_category/electrical_spark + sounds = list( + 'sound/machines/electrical_spark1.ogg' + ) + +/singleton/sound_category/steam_pipe + sounds = list( + 'sound/machines/steam_pipe1.ogg', + 'sound/machines/steam_pipe2.ogg', + 'sound/machines/steam_pipe3.ogg', + 'sound/machines/steam_pipe4.ogg' + ) diff --git a/code/game/turfs/simulated/floor_acts.dm b/code/game/turfs/simulated/floor_acts.dm index 8a238d850a0..68a4f8d5c27 100644 --- a/code/game/turfs/simulated/floor_acts.dm +++ b/code/game/turfs/simulated/floor_acts.dm @@ -53,3 +53,7 @@ for(var/obj/structure/window/W in src) if(W.dir == dir_to || W.is_fulltile()) //Same direction or diagonal (full tile) W.fire_act(adj_temp, adj_volume) + +/turf/simulated/floor/ChangeTurf(path, tell_universe, force_lighting_update, ignore_override, mapload) + SEND_SIGNAL(src, COMSIG_ATOM_DECONSTRUCTED) + return ..() diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index d3b25c98e26..b4a74460932 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -135,9 +135,10 @@ INVOKE_ASYNC(src, TYPE_PROC_REF(/obj/effect/plant, update_neighbors)) /turf/simulated/wall/ChangeTurf(path, tell_universe = TRUE, force_lighting_update = FALSE, ignore_override = FALSE, mapload = FALSE) + SEND_SIGNAL(src, COMSIG_ATOM_DECONSTRUCTED) clear_plants() clear_bulletholes() - ..() + return ..() //Appearance /turf/simulated/wall/get_examine_text(mob/user, distance, is_adjacent, infix, suffix) diff --git a/html/changelogs/geeves-engineering_fluff.yml b/html/changelogs/geeves-engineering_fluff.yml new file mode 100644 index 00000000000..73f9cf012d0 --- /dev/null +++ b/html/changelogs/geeves-engineering_fluff.yml @@ -0,0 +1,6 @@ +author: Geeves, KingOfThePing, Kyres1, Wowzewow (Wezzy), PrefabQuasar, hazelmouse + +delete-after: True + +changes: + - rscadd: "Added maintenance and large maintenance panels to various areas around the ship. These are fluff objects that have no mechanical impact, but serve as RP tools engineers can use to go to and interact with departments." diff --git a/icons/obj/engineering_fluff.dmi b/icons/obj/engineering_fluff.dmi new file mode 100644 index 00000000000..0f9436448ef Binary files /dev/null and b/icons/obj/engineering_fluff.dmi differ diff --git a/maps/runtime/runtime.dmm b/maps/runtime/runtime.dmm index f0ed0700600..868f0923b32 100644 --- a/maps/runtime/runtime.dmm +++ b/maps/runtime/runtime.dmm @@ -2786,6 +2786,10 @@ temperature = 278 }, /area/tcommsat/computer) +"Cd" = ( +/obj/structure/engineer_maintenance/pipe/wall, +/turf/simulated/floor/tiled, +/area/storage/primary) "Ct" = ( /obj/machinery/door/airlock/glass{ dir = 4 @@ -2830,6 +2834,10 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/construction/storage) +"CI" = ( +/obj/structure/engineer_maintenance/electric, +/turf/simulated/floor/tiled, +/area/storage/primary) "CZ" = ( /obj/machinery/atmospherics/unary/vent_pump{ dir = 8; @@ -3009,6 +3017,10 @@ /obj/machinery/recharge_station, /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_one) +"Gb" = ( +/obj/structure/engineer_maintenance/pipe, +/turf/simulated/floor/tiled, +/area/storage/primary) "Go" = ( /obj/structure/cable{ d1 = 1; @@ -3189,6 +3201,10 @@ }, /turf/simulated/floor/tiled, /area/construction/storage) +"JB" = ( +/obj/structure/engineer_maintenance/electric/wall, +/turf/simulated/floor/tiled, +/area/storage/primary) "JC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11117,8 +11133,8 @@ da tr dm Sz -da -da +dm +Gb cP ae ac @@ -11374,8 +11390,8 @@ sf da Fw da -da -da +dm +Cd cP ae ac @@ -11631,8 +11647,8 @@ LF FU ZU da -da -da +dm +CI cP ae ac @@ -11888,8 +11904,8 @@ eY da dm da -da -da +dm +JB cP ae ac diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index e96b1fcf5d0..2923beb8d0d 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -4137,15 +4137,21 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_room/turbine) "aDm" = ( +/obj/item/device/radio/intercom/south, +/obj/effect/floor_decal/corner/purple/full{ + dir = 4 + }, +/obj/structure/engineer_maintenance/pipe{ + dir = 1 + }, +/obj/structure/engineer_maintenance/electric{ + dir = 4 + }, /obj/structure/sink/kitchen{ dir = 8; name = "sink"; pixel_x = 21 }, -/obj/item/device/radio/intercom/south, -/obj/effect/floor_decal/corner/purple/full{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/horizon/custodial) "aDn" = ( @@ -4551,6 +4557,7 @@ "aGe" = ( /obj/structure/platform/ledge, /obj/effect/decal/cleanable/blood/oil, +/obj/structure/engineer_maintenance/electric/wall, /turf/simulated/floor/carpet/rubber, /area/operations/lower/machinist) "aGj" = ( @@ -4987,10 +4994,10 @@ /obj/effect/floor_decal/corner/green/diagonal, /obj/structure/bed/stool, /obj/structure/curtain/open, -/obj/structure/window/reinforced, /obj/machinery/light{ dir = 4 }, +/obj/structure/window/reinforced, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/fitness/changing) "aJu" = ( @@ -5869,6 +5876,7 @@ /obj/machinery/door/firedoor{ dir = 4 }, +/obj/structure/engineer_maintenance/pipe/wall, /turf/simulated/floor/tiled, /area/bridge) "aPA" = ( @@ -5889,6 +5897,7 @@ /obj/structure/bed/stool/chair/plastic{ dir = 4 }, +/obj/structure/engineer_maintenance/pipe/wall, /turf/simulated/floor/tiled/white, /area/medical/ward/isolation) "aPY" = ( @@ -6948,6 +6957,9 @@ c_tag = "Second Deck - Dinner Entrance 1"; dir = 4 }, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "aWI" = ( @@ -7101,6 +7113,7 @@ pixel_x = 13 }, /obj/effect/floor_decal/corner/green/diagonal, +/obj/structure/engineer_maintenance/electric/wall, /turf/simulated/floor/tiled/white, /area/horizon/security/brig) "aXB" = ( @@ -7505,6 +7518,10 @@ /obj/effect/floor_decal/corner/brown{ dir = 9 }, +/obj/structure/engineer_maintenance/electric{ + dir = 8 + }, +/obj/structure/engineer_maintenance/pipe, /turf/simulated/floor/tiled, /area/operations/office) "aZW" = ( @@ -8392,6 +8409,9 @@ /obj/machinery/light{ dir = 4 }, +/obj/structure/engineer_maintenance/pipe{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology) "bgG" = ( @@ -9401,6 +9421,9 @@ /obj/structure/platform{ dir = 4 }, +/obj/structure/closet/walllocker/medical/firstaid{ + pixel_x = -32 + }, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "bnG" = ( @@ -10984,6 +11007,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/engineer_maintenance/pipe/wall, /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_room) "bAh" = ( @@ -11887,6 +11911,12 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 }, +/obj/structure/engineer_maintenance/electric{ + dir = 8 + }, +/obj/structure/engineer_maintenance/pipe{ + dir = 1 + }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hor) "bGv" = ( @@ -12151,6 +12181,10 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 7 }, +/obj/structure/engineer_maintenance/electric, +/obj/structure/engineer_maintenance/pipe{ + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop/xo) "bHL" = ( @@ -13450,6 +13484,7 @@ /obj/machinery/door/firedoor{ dir = 4 }, +/obj/structure/engineer_maintenance/electric/wall, /turf/simulated/floor/tiled, /area/bridge/upperdeck) "bQQ" = ( @@ -13996,6 +14031,12 @@ dir = 4; pixel_x = 23 }, +/obj/structure/engineer_maintenance/pipe{ + dir = 1 + }, +/obj/structure/engineer_maintenance/electric{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/rnd/conference) "bUc" = ( @@ -15900,7 +15941,9 @@ /obj/machinery/power/emitter{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, /turf/simulated/floor/plating, /area/engineering/bluespace_drive) "cij" = ( @@ -16196,6 +16239,14 @@ "ckB" = ( /turf/simulated/floor/reinforced/phoron, /area/engineering/atmos) +"ckC" = ( +/obj/effect/floor_decal/spline/plain, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/structure/engineer_maintenance/pipe/wall, +/turf/simulated/floor/carpet/rubber, +/area/tcommsat/chamber) "ckL" = ( /obj/structure/closet/excavation, /obj/effect/floor_decal/corner/mauve{ @@ -16965,6 +17016,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/extinguisher_cabinet/west, /turf/simulated/floor/tiled/dark/full, /area/engineering/atmos) "cpz" = ( @@ -18087,6 +18139,10 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 + }, +/obj/structure/engineer_maintenance/electric, /turf/simulated/floor/wood, /area/chapel/office) "czo" = ( @@ -18930,10 +18986,10 @@ /turf/simulated/floor/exoplanet/snow, /area/centcom/shared_dream) "cHc" = ( +/obj/machinery/alarm/south, /obj/structure/bed/stool/bar/padded/red{ dir = 8 }, -/obj/machinery/alarm/south, /turf/simulated/floor/tiled/dark, /area/horizon/bar) "cHi" = ( @@ -20997,6 +21053,12 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, +/obj/structure/engineer_maintenance/electric{ + dir = 8 + }, +/obj/structure/engineer_maintenance/electric{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_one) "cWy" = ( @@ -23766,6 +23828,10 @@ "dqO" = ( /obj/effect/floor_decal/corner/dark_green/full, /obj/machinery/firealarm/south, +/obj/structure/engineer_maintenance/electric, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/lobby) "dqR" = ( @@ -24126,13 +24192,6 @@ /obj/effect/floor_decal/spline/plain{ dir = 5 }, -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "shutters_deck3_engibreakwindows"; - name = "Viewing Shutters"; - pixel_x = 25; - pixel_y = 25 - }, /turf/simulated/floor/tiled/dark, /area/engineering/break_room) "dtm" = ( @@ -24399,6 +24458,10 @@ /area/centcom/control) "duG" = ( /obj/machinery/newscaster/south, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 + }, +/obj/structure/engineer_maintenance/electric, /turf/simulated/floor/lino, /area/horizon/security/investigators_office) "duH" = ( @@ -25449,6 +25512,7 @@ }, /obj/machinery/firealarm/west, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/engineer_maintenance/pipe/wall, /turf/simulated/floor/tiled, /area/engineering/break_room) "dCP" = ( @@ -26535,9 +26599,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/power/apc/super/critical/north, +/obj/structure/engineer_maintenance/pipe/wall, /obj/structure/cable/green{ - icon_state = "0-4" + icon_state = "4-8" }, /turf/simulated/floor/tiled, /area/hangar/operations) @@ -26969,6 +27033,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/structure/engineer_maintenance/electric/wall, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion/starboard) "dOG" = ( @@ -28081,10 +28146,14 @@ /area/hangar/auxiliary) "dYz" = ( /obj/effect/floor_decal/corner/brown/full, +/obj/machinery/firealarm/west, +/obj/structure/engineer_maintenance/electric{ + dir = 8 + }, +/obj/structure/engineer_maintenance/pipe, /obj/structure/bed/stool/chair/office/dark{ dir = 1 }, -/obj/machinery/firealarm/west, /obj/item/device/radio/intercom/north{ dir = 2; pixel_y = 0 @@ -28130,6 +28199,12 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 + }, +/obj/structure/engineer_maintenance/electric{ + dir = 1 + }, /turf/simulated/floor/wood, /area/lawoffice/representative) "dZd" = ( @@ -29659,6 +29734,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/extinguisher_cabinet/east, /turf/simulated/floor/tiled, /area/bridge) "eiy" = ( @@ -30649,6 +30725,7 @@ dir = 6 }, /obj/structure/platform, +/obj/structure/engineer_maintenance/pipe, /turf/simulated/floor/tiled/dark, /area/bridge/controlroom) "equ" = ( @@ -31576,6 +31653,16 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/maintenance/research_port) +"exB" = ( +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/structure/engineer_maintenance/pipe{ + dir = 1 + }, +/obj/structure/engineer_maintenance/electric{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/aibunker) "exC" = ( /obj/structure/bed/stool/padded, /obj/effect/decal/cleanable/dirt, @@ -32151,6 +32238,10 @@ dir = 8 }, /obj/random/pottedplant, +/obj/structure/engineer_maintenance/electric, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 + }, /turf/simulated/floor/wood, /area/medical/psych) "eCh" = ( @@ -34424,6 +34515,7 @@ /area/shuttle/legion) "eSt" = ( /obj/effect/floor_decal/industrial/warning, +/obj/structure/engineer_maintenance/pipe/wall, /turf/simulated/floor/tiled/dark, /area/horizon/security/firing_range) "eSv" = ( @@ -35216,7 +35308,6 @@ /obj/structure/bed/stool/chair/padded/red{ dir = 4 }, -/obj/item/device/radio/intercom/north, /obj/structure/platform{ dir = 4 }, @@ -35224,6 +35315,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, +/obj/structure/engineer_maintenance/pipe/wall, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "eYR" = ( @@ -37120,6 +37212,13 @@ /obj/item/material/ashtray/glass, /turf/simulated/floor/wood/walnut, /area/medical/smoking) +"fle" = ( +/obj/effect/floor_decal/industrial/outline/security, +/obj/structure/sign/nosmoking_2{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/security/firing_range) "fll" = ( /obj/machinery/light{ dir = 8 @@ -37163,12 +37262,19 @@ dir = 8 }, /obj/machinery/alarm/west, -/obj/structure/extinguisher_cabinet/north, +/obj/structure/engineer_maintenance/pipe/wall, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "flH" = ( /turf/simulated/floor/beach/water/alt, /area/horizon/hallway/deck_three/primary/starboard) +"flN" = ( +/obj/structure/engineer_maintenance/pipe/wall, +/turf/simulated/floor/tiled/freezer{ + name = "cooled tiles"; + temperature = 278.15 + }, +/area/medical/morgue/lower) "flR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -38845,6 +38951,7 @@ "fAU" = ( /obj/structure/bed/stool/padded/red, /obj/effect/floor_decal/corner/brown/diagonal, +/obj/structure/engineer_maintenance/electric/wall, /turf/simulated/floor/tiled/dark, /area/horizon/holodeck_control) "fAZ" = ( @@ -42056,6 +42163,13 @@ }, /turf/simulated/floor/lino, /area/horizon/cafeteria) +"fYz" = ( +/obj/structure/engineer_maintenance/electric/wall, +/turf/simulated/floor/tiled/freezer{ + name = "cooled tiles"; + temperature = 278.15 + }, +/area/medical/morgue/lower) "fYH" = ( /obj/machinery/atmospherics/unary/cryo_cell, /turf/simulated/floor/tiled, @@ -42163,6 +42277,15 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/mercenary) +"fZp" = ( +/obj/effect/floor_decal/corner/green/diagonal, +/obj/item/bedsheet/medical{ + icon_state = "sheet-roll" + }, +/obj/structure/bed/padded, +/obj/machinery/newscaster/north, +/turf/simulated/floor/tiled/white, +/area/medical/ward/isolation) "fZr" = ( /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning{ @@ -42590,6 +42713,10 @@ dir = 9 }, /obj/structure/coatrack, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 + }, +/obj/structure/engineer_maintenance/electric, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "gbY" = ( @@ -42735,6 +42862,7 @@ "gdF" = ( /obj/structure/bed/stool/chair/sofa/right/red, /obj/effect/floor_decal/corner/brown/diagonal, +/obj/structure/engineer_maintenance/electric/wall, /turf/simulated/floor/tiled/dark, /area/horizon/holodeck_control/beta) "gdH" = ( @@ -43582,6 +43710,7 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/structure/engineer_maintenance/electric/wall, /turf/simulated/floor/tiled, /area/operations/storage) "gks" = ( @@ -44849,9 +44978,6 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "gsR" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/machinery/recharge_station, /obj/effect/floor_decal/corner/dark_blue{ dir = 5 @@ -45676,6 +45802,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/engineer_maintenance/pipe/wall, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion) "gyT" = ( @@ -46577,6 +46704,10 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/engineer_maintenance/electric{ + dir = 8 + }, +/obj/structure/engineer_maintenance/pipe, /turf/simulated/floor/tiled/white, /area/operations/lower/machinist/surgicalbay) "gFD" = ( @@ -47733,6 +47864,7 @@ pixel_x = 11; pixel_y = 2 }, +/obj/machinery/alarm/north, /turf/simulated/floor/tiled/dark, /area/horizon/holodeck_control/beta) "gNQ" = ( @@ -51708,6 +51840,10 @@ /obj/effect/floor_decal/corner/dark_blue/full{ dir = 8 }, +/obj/structure/engineer_maintenance/pipe, +/obj/structure/engineer_maintenance/electric{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/horizon/security/evidence_storage) "hsj" = ( @@ -52585,6 +52721,12 @@ }, /obj/machinery/light/small, /obj/machinery/firealarm/south, +/obj/structure/engineer_maintenance/electric{ + dir = 4 + }, +/obj/structure/engineer_maintenance/pipe{ + dir = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/storage/shields) "hxJ" = ( @@ -55306,6 +55448,11 @@ pixel_y = 16 }, /obj/machinery/power/outlet, +/obj/machinery/power/apc/north, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "hSU" = ( @@ -58463,6 +58610,10 @@ /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 + }, +/obj/structure/engineer_maintenance/electric, /turf/simulated/floor/tiled, /area/horizon/security/holding_cell_a) "irA" = ( @@ -60934,8 +61085,9 @@ /area/maintenance/engineering_ladder) "iKV" = ( /obj/machinery/alarm/freezer/west, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/structure/engineer_maintenance/pipe, +/obj/structure/engineer_maintenance/electric{ + dir = 8 }, /turf/simulated/floor/tiled/freezer{ name = "cooled tiles"; @@ -60970,6 +61122,7 @@ pixel_x = 5; pixel_y = -2 }, +/obj/structure/extinguisher_cabinet/east, /turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "iKZ" = ( @@ -61292,6 +61445,10 @@ /obj/structure/closet/walllocker/firecloset/medical{ pixel_x = -32 }, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 + }, +/obj/structure/engineer_maintenance/electric, /turf/simulated/floor/tiled, /area/medical/paramedic) "iMW" = ( @@ -61421,6 +61578,9 @@ dir = 6 }, /obj/effect/floor_decal/industrial/outline/emergency_closet, +/obj/structure/sign/nosmoking_1{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion) "iOb" = ( @@ -62415,6 +62575,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/engineer_maintenance/electric/wall, /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_room/rust) "iVV" = ( @@ -63206,6 +63367,9 @@ dir = 10 }, /obj/effect/floor_decal/industrial/outline/emergency_closet, +/obj/structure/sign/nosmoking_1{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion/starboard) "jaR" = ( @@ -65386,6 +65550,13 @@ }, /turf/simulated/floor/tiled/dark, /area/hangar/intrepid) +"jqL" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/plating, +/area/engineering/bluespace_drive) "jqS" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 9 @@ -66036,6 +66207,10 @@ /obj/effect/floor_decal/spline/fancy/wood/cee{ dir = 8 }, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 + }, +/obj/structure/engineer_maintenance/electric, /turf/simulated/floor/wood, /area/bridge/meeting_room) "jvl" = ( @@ -66701,6 +66876,7 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 4 }, +/obj/structure/engineer_maintenance/electric/wall, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "jzN" = ( @@ -66722,7 +66898,8 @@ /area/bridge/minibar) "jzV" = ( /obj/structure/coatrack{ - pixel_x = -10 + pixel_x = 7; + pixel_y = 2 }, /obj/machinery/newscaster/east{ dir = 8; @@ -66731,6 +66908,10 @@ /obj/machinery/light_switch{ pixel_y = -19 }, +/obj/structure/engineer_maintenance/electric, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/heads/chief) "jzW" = ( @@ -67909,12 +68090,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/washroom/central) "jJw" = ( @@ -68175,6 +68356,17 @@ /obj/machinery/light, /turf/simulated/floor/grass, /area/centcom/spawning) +"jLA" = ( +/obj/effect/floor_decal/corner/dark_blue{ + dir = 9 + }, +/obj/machinery/alarm/west, +/obj/structure/engineer_maintenance/electric, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/storage/eva) "jLD" = ( /obj/effect/floor_decal/corner/yellow{ dir = 10 @@ -68479,7 +68671,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/machinery/alarm/north, +/obj/structure/engineer_maintenance/electric/wall, /turf/simulated/floor/tiled, /area/hangar/operations) "jOp" = ( @@ -69468,6 +69660,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/engineer_maintenance/electric/wall, /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_room) "jVX" = ( @@ -71717,7 +71910,9 @@ /obj/machinery/power/emitter{ dir = 8 }, -/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, /turf/simulated/floor/plating, /area/engineering/bluespace_drive) "kkY" = ( @@ -72666,6 +72861,7 @@ dir = 9 }, /obj/random/loot, +/obj/structure/engineer_maintenance/pipe/wall, /turf/simulated/floor/tiled/dark/full, /area/operations/lower/machinist) "ksl" = ( @@ -72829,6 +73025,15 @@ dir = 4 }, /area/shuttle/skipjack) +"ktx" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/engineering/bluespace_drive) "ktz" = ( /obj/machinery/light{ dir = 8 @@ -73634,6 +73839,9 @@ dir = 6 }, /obj/structure/platform, +/obj/structure/engineer_maintenance/electric{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/bridge/controlroom) "kzo" = ( @@ -74697,6 +74905,10 @@ dir = 4 }, /obj/machinery/firealarm/south, +/obj/structure/engineer_maintenance/electric, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/washroom/central) "kHe" = ( @@ -75134,6 +75346,7 @@ /obj/effect/floor_decal/corner/brown/full{ dir = 1 }, +/obj/machinery/alarm/north, /turf/simulated/floor/tiled, /area/hangar/operations) "kKc" = ( @@ -78064,6 +78277,9 @@ /obj/effect/floor_decal/corner_wide/lime{ dir = 9 }, +/obj/structure/engineer_maintenance/electric{ + dir = 8 + }, /obj/structure/bed/stool/chair{ dir = 4 }, @@ -79073,6 +79289,10 @@ icon_state = "0-2" }, /obj/machinery/power/apc/west, +/obj/structure/engineer_maintenance/electric{ + dir = 8 + }, +/obj/structure/engineer_maintenance/pipe, /turf/simulated/floor/tiled/white, /area/rnd/test_range) "lqx" = ( @@ -79083,6 +79303,12 @@ department = "Morgue"; departmentType = 5 }, +/obj/structure/engineer_maintenance/electric{ + dir = 8 + }, +/obj/structure/engineer_maintenance/pipe{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/horizon/security/autopsy_laboratory) "lqB" = ( @@ -79169,9 +79395,6 @@ /turf/simulated/floor/tiled, /area/hallway/engineering) "lrd" = ( -/obj/structure/sign/nosmoking_1{ - pixel_y = 32 - }, /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 10 }, @@ -79181,6 +79404,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 5 }, +/obj/structure/engineer_maintenance/pipe/wall, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion/starboard) "lrf" = ( @@ -79738,6 +79962,12 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/structure/engineer_maintenance/electric{ + dir = 4 + }, +/obj/structure/engineer_maintenance/pipe{ + dir = 1 + }, /turf/simulated/floor/bluegrid{ name = "cooled mainframe floor"; temperature = 278 @@ -81392,6 +81622,12 @@ /obj/effect/floor_decal/corner/dark_blue/full{ dir = 4 }, +/obj/structure/engineer_maintenance/pipe{ + dir = 1 + }, +/obj/structure/engineer_maintenance/electric{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/horizon/security/lobby) "lHh" = ( @@ -83321,6 +83557,12 @@ /turf/simulated/floor/plating, /area/engineering/bluespace_drive) "lUr" = ( +/obj/structure/engineer_maintenance/electric{ + dir = 1 + }, +/obj/structure/engineer_maintenance/pipe{ + dir = 4 + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "lUu" = ( @@ -83389,6 +83631,12 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 + }, +/obj/structure/engineer_maintenance/electric{ + dir = 1 + }, /turf/simulated/floor/wood, /area/lawoffice/consular_two) "lUT" = ( @@ -84408,9 +84656,6 @@ /turf/simulated/floor/plating, /area/engineering/engine_room/rust) "mcp" = ( -/obj/structure/bed/stool/chair/office/dark{ - dir = 1 - }, /obj/effect/floor_decal/corner/purple{ dir = 5 }, @@ -84428,6 +84673,9 @@ pixel_y = 25; req_access = list(26) }, +/obj/structure/bed/stool/chair/office/dark{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/horizon/custodial/auxiliary) "mcC" = ( @@ -84701,6 +84949,9 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/emergency_closet, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/horizon/security/brig) "mfh" = ( @@ -85813,6 +86064,12 @@ /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/structure/engineer_maintenance/electric{ + dir = 8 + }, +/obj/structure/engineer_maintenance/pipe{ + dir = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/security/armoury) "mmV" = ( @@ -86897,6 +87154,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/engineer_maintenance/electric, /turf/simulated/floor/tiled/white, /area/medical/ors) "mve" = ( @@ -87829,9 +88087,6 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/tiled/freezer{ name = "cooled tiles"; temperature = 253.15 @@ -88406,8 +88661,12 @@ /obj/effect/floor_decal/corner/brown{ dir = 10 }, -/obj/machinery/power/apc/south, /obj/structure/cable/green, +/obj/structure/engineer_maintenance/pipe, +/obj/structure/engineer_maintenance/electric{ + dir = 4 + }, +/obj/machinery/power/apc/south, /turf/simulated/floor/tiled, /area/operations/lobby) "mHN" = ( @@ -90903,6 +91162,12 @@ /obj/effect/floor_decal/corner/mauve/full{ dir = 4 }, +/obj/structure/engineer_maintenance/electric{ + dir = 1 + }, +/obj/structure/engineer_maintenance/pipe{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/rnd/chemistry) "ncB" = ( @@ -91228,7 +91493,6 @@ /obj/structure/platform_deco{ icon_state = "ledge_deco" }, -/obj/structure/extinguisher_cabinet/east, /turf/simulated/floor/tiled, /area/bridge) "nfj" = ( @@ -91458,6 +91722,16 @@ /obj/effect/floor_decal/corner/red/full, /turf/simulated/floor/holofloor/tiled, /area/template_noop) +"ngN" = ( +/obj/effect/floor_decal/corner_wide/lime{ + dir = 9 + }, +/obj/structure/engineer_maintenance/pipe, +/obj/structure/bed/stool/chair{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/reception) "ngP" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -93923,6 +94197,12 @@ /obj/structure/noticeboard{ pixel_y = 32 }, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 + }, +/obj/structure/engineer_maintenance/electric{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/engineering/lobby) "nyL" = ( @@ -95463,6 +95743,10 @@ /obj/effect/floor_decal/corner/mauve{ dir = 10 }, +/obj/structure/engineer_maintenance/electric, +/obj/structure/engineer_maintenance/pipe{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) "nKf" = ( @@ -96206,6 +96490,12 @@ icon_state = "0-2" }, /obj/machinery/power/apc/north, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 + }, +/obj/structure/engineer_maintenance/electric{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "nQr" = ( @@ -96943,10 +97233,6 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/obj/structure/sign/radiation{ - pixel_x = -32; - pixel_y = -32 - }, /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_room) "nVH" = ( @@ -98844,6 +99130,19 @@ }, /turf/simulated/floor/wood, /area/bridge/upperdeck) +"ojE" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/machinery/disposal/small/west, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/horizon/security/head_of_security) "ojG" = ( /obj/effect/floor_decal/corner/black/full{ dir = 1 @@ -99782,6 +100081,10 @@ /obj/effect/floor_decal/corner/brown{ dir = 9 }, +/obj/structure/engineer_maintenance/pipe, +/obj/structure/engineer_maintenance/electric{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/operations/mail_room) "orp" = ( @@ -100524,6 +100827,16 @@ /obj/structure/window/shuttle/scc_space_ship/cardinal, /turf/simulated/floor/plating, /area/shuttle/merchant) +"owE" = ( +/obj/effect/floor_decal/corner/dark_blue{ + dir = 10 + }, +/obj/structure/engineer_maintenance/electric, +/obj/structure/engineer_maintenance/pipe{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/horizon/security/hallway) "owH" = ( /obj/effect/floor_decal/spline/plain, /obj/effect/floor_decal/spline/fancy{ @@ -101782,15 +102095,21 @@ /turf/simulated/floor/tiled, /area/horizon/security/equipment) "oGp" = ( -/obj/effect/floor_decal/industrial/warning/corner{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/sign/radiation{ - pixel_x = 32; - pixel_y = 32 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/dark/full, -/area/engineering/engine_room) +/obj/effect/floor_decal/corner/brown{ + dir = 5 + }, +/obj/machinery/power/apc/super/critical/north, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled, +/area/hangar/operations) "oGu" = ( /obj/structure/bed/stool/chair/padded/red, /obj/effect/floor_decal/spline/fancy/wood{ @@ -102175,6 +102494,15 @@ /obj/machinery/telecomms/processor/preset_four, /turf/simulated/floor/bluegrid, /area/tcommsat/chamber) +"oJS" = ( +/obj/effect/floor_decal/corner/dark_green{ + dir = 5 + }, +/obj/structure/engineer_maintenance/electric{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/horizon/hallway/deck_three/primary/central) "oJU" = ( /obj/structure/table/rack, /obj/item/clothing/under/color/red, @@ -102390,6 +102718,12 @@ /obj/structure/cable/green{ icon_state = "0-8" }, +/obj/structure/engineer_maintenance/electric{ + dir = 4 + }, +/obj/structure/engineer_maintenance/pipe{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/medical/gen_treatment) "oLD" = ( @@ -102474,6 +102808,7 @@ /obj/structure/platform{ dir = 4 }, +/obj/item/device/radio/intercom/west, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "oLX" = ( @@ -105724,6 +106059,7 @@ c_tag = "Service - Chapel Port"; dir = 1 }, +/obj/structure/engineer_maintenance/electric, /turf/simulated/floor/lino, /area/chapel/main) "plD" = ( @@ -106539,6 +106875,9 @@ /area/horizon/cafeteria) "prY" = ( /obj/machinery/firealarm/north, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 + }, /turf/simulated/floor/lino, /area/chapel/main) "psc" = ( @@ -108947,10 +109286,10 @@ /area/rnd/test_range) "pHW" = ( /obj/effect/floor_decal/spline/fancy/wood/cee, -/obj/machinery/disposal/small/west, -/obj/structure/disposalpipe/trunk{ - dir = 1 +/obj/structure/engineer_maintenance/pipe{ + dir = 4 }, +/obj/structure/engineer_maintenance/electric, /turf/simulated/floor/wood, /area/horizon/security/head_of_security) "pHZ" = ( @@ -109293,6 +109632,9 @@ /obj/effect/floor_decal/corner/dark_green/full{ dir = 1 }, +/obj/structure/engineer_maintenance/electric{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "pLq" = ( @@ -109444,6 +109786,12 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/structure/engineer_maintenance/electric{ + dir = 1 + }, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 + }, /turf/simulated/floor/wood, /area/lawoffice/consular) "pMq" = ( @@ -110078,9 +110426,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/freezer{ name = "cooled tiles"; temperature = 253.15 @@ -110255,6 +110601,10 @@ /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, /obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/engineer_maintenance/pipe/wall, /turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "pSb" = ( @@ -111227,6 +111577,17 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) +"pZB" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/effect/floor_decal/spline/plain, +/obj/structure/engineer_maintenance/electric/wall, +/turf/simulated/floor/carpet/rubber, +/area/tcommsat/chamber) "pZC" = ( /obj/effect/floor_decal/corner/dark_blue/full{ dir = 8 @@ -111837,6 +112198,7 @@ pixel_x = 14; pixel_y = 6 }, +/obj/machinery/alarm/north, /turf/simulated/floor/tiled/dark, /area/horizon/holodeck_control) "qdA" = ( @@ -112259,6 +112621,13 @@ /obj/effect/floor_decal/industrial/warning/cee{ dir = 4 }, +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "intrepid_dock"; + name = "\improper Intrepid docking port controller"; + pixel_y = 28; + req_one_access = list(74) + }, /turf/simulated/floor/plating, /area/hangar/intrepid) "qgq" = ( @@ -113412,6 +113781,9 @@ /obj/effect/floor_decal/corner/mauve/full{ dir = 8 }, +/obj/structure/engineer_maintenance/electric{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology) "qpA" = ( @@ -117443,12 +117815,16 @@ dir = 9 }, /obj/machinery/power/apc/west, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 + }, +/obj/structure/engineer_maintenance/electric, /turf/simulated/floor/tiled/dark, /area/horizon/custodial/disposals) "qSP" = ( /obj/structure/bed/stool/chair/sofa/red, /obj/effect/floor_decal/corner/brown/diagonal, -/obj/machinery/alarm/north, +/obj/structure/engineer_maintenance/pipe/wall, /turf/simulated/floor/tiled/dark, /area/horizon/holodeck_control/beta) "qST" = ( @@ -118430,7 +118806,13 @@ /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) "qZv" = ( -/obj/effect/floor_decal/spline/fancy/wood, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 + }, +/obj/structure/engineer_maintenance/pipe{ + dir = 4 + }, +/obj/structure/engineer_maintenance/electric, /turf/simulated/floor/wood, /area/bridge/minibar) "qZx" = ( @@ -119869,6 +120251,12 @@ c_tag = "Medical - Chemistry Lab Bravo"; dir = 8 }, +/obj/structure/engineer_maintenance/pipe{ + dir = 4 + }, +/obj/structure/engineer_maintenance/electric{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/medical/pharmacy) "rjy" = ( @@ -120796,6 +121184,12 @@ /obj/effect/floor_decal/spline/plain/corner{ dir = 4 }, +/obj/structure/engineer_maintenance/electric{ + dir = 8 + }, +/obj/structure/engineer_maintenance/pipe{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "rqN" = ( @@ -121498,11 +121892,14 @@ /turf/unsimulated/floor, /area/antag/actor) "rvM" = ( -/obj/machinery/light/floor{ - dir = 4 +/obj/effect/floor_decal/corner/dark_green{ + dir = 5 }, -/turf/simulated/floor/wood, -/area/bridge/minibar) +/obj/structure/engineer_maintenance/pipe{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/horizon/hallway/deck_three/primary/central) "rvQ" = ( /obj/effect/floor_decal/corner/mauve{ dir = 10 @@ -121571,6 +121968,10 @@ dir = 6 }, /obj/machinery/newscaster/east, +/obj/structure/engineer_maintenance/electric, +/obj/structure/engineer_maintenance/pipe{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/horizon/security/brig) "rwl" = ( @@ -121939,6 +122340,12 @@ /obj/effect/floor_decal/corner/grey/diagonal{ dir = 8 }, +/obj/structure/engineer_maintenance/electric{ + dir = 4 + }, +/obj/structure/engineer_maintenance/pipe{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/horizon/cafeteria) "rzQ" = ( @@ -123460,8 +123867,14 @@ icon_state = "4-8" }, /obj/structure/coatrack{ - pixel_x = 10; - pixel_y = 25 + pixel_x = 8; + pixel_y = 9 + }, +/obj/structure/engineer_maintenance/pipe{ + dir = 1 + }, +/obj/structure/engineer_maintenance/electric{ + dir = 8 }, /turf/simulated/floor/wood, /area/horizon/library) @@ -125103,7 +125516,7 @@ /obj/effect/floor_decal/corner/green/diagonal, /obj/structure/table/standard, /obj/item/deck/cards, -/obj/machinery/newscaster/north, +/obj/structure/engineer_maintenance/electric/wall, /turf/simulated/floor/tiled/white, /area/medical/ward/isolation) "rZV" = ( @@ -125143,14 +125556,11 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet/north, /obj/structure/table/stone/marble, /obj/item/device/destTagger, /obj/item/stack/packageWrap, /obj/item/device/hand_labeler, +/obj/structure/engineer_maintenance/electric/wall, /turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "san" = ( @@ -126713,7 +127123,7 @@ /area/horizon/exterior) "slg" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 + dir = 6 }, /turf/simulated/floor/wood, /area/bridge/minibar) @@ -127103,6 +127513,12 @@ /obj/effect/floor_decal/spline/plain/cee{ dir = 1 }, +/obj/structure/engineer_maintenance/electric{ + dir = 8 + }, +/obj/structure/engineer_maintenance/pipe{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "spN" = ( @@ -128355,9 +128771,6 @@ dir = 10 }, /obj/structure/table/glass, -/obj/structure/sign/nosmoking_2{ - pixel_y = -32 - }, /obj/item/storage/box/fancy/vials{ pixel_x = 4; pixel_y = 6 @@ -129093,6 +129506,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/engineer_maintenance/electric{ + dir = 4 + }, +/obj/structure/engineer_maintenance/pipe, /obj/machinery/power/apc/critical/south, /turf/simulated/floor/tiled, /area/horizon/stairwell/central) @@ -130667,6 +131084,10 @@ /obj/machinery/power/apc/south, /obj/structure/cable/green, /obj/machinery/light, +/obj/structure/engineer_maintenance/pipe, +/obj/structure/engineer_maintenance/electric{ + dir = 4 + }, /turf/simulated/floor/wood, /area/lawoffice/representative_two) "sRr" = ( @@ -132255,6 +132676,12 @@ icon_state = "0-8" }, /obj/machinery/power/apc/east, +/obj/structure/engineer_maintenance/electric{ + dir = 4 + }, +/obj/structure/engineer_maintenance/pipe{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/horizon/security/holding_cell_b) "teL" = ( @@ -133791,10 +134218,11 @@ dir = 1 }, /obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" + icon_state = "4-8"; + d1 = 4; + d2 = 8 }, -/obj/machinery/power/apc/north, +/obj/structure/engineer_maintenance/electric/wall, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "tqT" = ( @@ -137250,6 +137678,7 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/structure/engineer_maintenance/pipe/wall, /turf/simulated/floor/tiled, /area/operations/storage) "tPH" = ( @@ -137978,6 +138407,10 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 }, +/obj/structure/engineer_maintenance/electric{ + dir = 8 + }, +/obj/structure/engineer_maintenance/pipe, /turf/simulated/floor/wood, /area/crew_quarters/captain) "tUZ" = ( @@ -138579,12 +139012,20 @@ "tZs" = ( /obj/structure/table/steel, /obj/item/material/ashtray/bronze{ - pixel_x = -9 + pixel_x = -8; + pixel_y = -5 }, /obj/random/pottedplant_small{ pixel_x = 9; pixel_y = 3 }, +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "shutters_deck3_engibreakwindows"; + name = "Viewing Shutters"; + pixel_x = -7; + pixel_y = 7 + }, /turf/simulated/floor/tiled/dark, /area/engineering/break_room) "tZv" = ( @@ -141417,6 +141858,12 @@ /obj/effect/floor_decal/corner/mauve{ dir = 5 }, +/obj/structure/engineer_maintenance/pipe{ + dir = 1 + }, +/obj/structure/engineer_maintenance/electric{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "utV" = ( @@ -145195,6 +145642,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/engineer_maintenance/pipe, +/obj/structure/engineer_maintenance/electric{ + dir = 8 + }, /turf/simulated/floor/tiled/dark/full, /area/storage/secure) "uXr" = ( @@ -147094,6 +147545,10 @@ /obj/item/modular_computer/console/preset/command/teleporter/ninja, /turf/unsimulated/floor, /area/antag/ninja) +"vlm" = ( +/obj/effect/floor_decal/spline/fancy/wood/corner, +/turf/simulated/floor/wood, +/area/bridge/minibar) "vlp" = ( /obj/machinery/door/airlock/highsecurity{ dir = 1; @@ -147747,6 +148202,9 @@ /obj/machinery/light{ dir = 4 }, +/obj/structure/engineer_maintenance/pipe{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/ors) "vpZ" = ( @@ -148177,10 +148635,6 @@ /area/horizon/holodeck_control/beta) "vty" = ( /obj/effect/floor_decal/industrial/warning/corner, -/obj/structure/sign/radiation{ - pixel_x = 32; - pixel_y = -32 - }, /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_room) "vtE" = ( @@ -149296,6 +149750,7 @@ "vBN" = ( /obj/effect/floor_decal/industrial/outline/emergency_closet, /obj/structure/closet/emcloset, +/obj/structure/engineer_maintenance/pipe/wall, /turf/simulated/floor/plating, /area/hangar/intrepid) "vBP" = ( @@ -149766,8 +150221,12 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 10 }, -/obj/machinery/power/apc/south, /obj/structure/cable/green, +/obj/structure/engineer_maintenance/pipe{ + dir = 4 + }, +/obj/structure/engineer_maintenance/electric, +/obj/machinery/power/apc/south, /turf/simulated/floor/tiled, /area/horizon/security/equipment) "vFg" = ( @@ -150597,6 +151056,7 @@ /area/hallway/primary/central_two) "vNk" = ( /obj/effect/floor_decal/corner/green/diagonal, +/obj/structure/engineer_maintenance/pipe/wall, /turf/simulated/floor/tiled/white, /area/horizon/security/brig) "vNF" = ( @@ -151702,15 +152162,9 @@ /turf/unsimulated/floor/plating, /area/centcom/specops) "vVx" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "intrepid_dock"; - name = "\improper Intrepid docking port controller"; - pixel_y = 28; - req_one_access = list(74) - }, /obj/effect/floor_decal/industrial/outline/emergency_closet, /obj/structure/closet/emcloset, +/obj/structure/engineer_maintenance/electric/wall, /turf/simulated/floor/plating, /area/hangar/intrepid) "vVB" = ( @@ -152195,6 +152649,11 @@ }, /turf/simulated/floor/plating, /area/engineering/atmos/air) +"vZq" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/structure/engineer_maintenance/electric/wall, +/turf/simulated/floor/tiled/dark, +/area/horizon/security/firing_range) "vZr" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 6 @@ -158096,6 +158555,7 @@ dir = 8 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/engineer_maintenance/electric/wall, /turf/simulated/floor/tiled, /area/engineering/break_room) "wOH" = ( @@ -161123,6 +161583,10 @@ dir = 9 }, /obj/machinery/power/apc/super/critical/west, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 + }, +/obj/structure/engineer_maintenance/electric, /turf/simulated/floor/tiled, /area/hangar/auxiliary) "xjR" = ( @@ -161792,9 +162256,6 @@ /turf/unsimulated/floor, /area/centcom/spawning) "xoH" = ( -/obj/structure/sign/nosmoking_1{ - pixel_y = 32 - }, /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 6 }, @@ -161804,6 +162265,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, +/obj/structure/engineer_maintenance/electric/wall, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion) "xoM" = ( @@ -162410,6 +162872,12 @@ dir = 1 }, /obj/machinery/power/apc/low/east, +/obj/structure/engineer_maintenance/pipe{ + dir = 1 + }, +/obj/structure/engineer_maintenance/electric{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) "xtJ" = ( @@ -163243,14 +163711,12 @@ /turf/simulated/floor/grass, /area/centcom/bar) "xzb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/turf/simulated/floor/tiled/freezer{ - name = "cooled tiles"; - temperature = 253.15 - }, -/area/horizon/kitchen/freezer) +/obj/structure/engineer_maintenance/pipe/wall, +/turf/simulated/floor/tiled/dark/full, +/area/engineering/engine_room/rust) "xzc" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -163594,10 +164060,6 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, -/obj/structure/sign/radiation{ - pixel_x = -32; - pixel_y = 32 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -163957,6 +164419,10 @@ /area/horizon/crew_quarters/lounge/bar) "xEC" = ( /obj/structure/platform, +/obj/structure/engineer_maintenance/electric{ + dir = 4 + }, +/obj/structure/engineer_maintenance/pipe, /turf/simulated/floor/tiled/dark, /area/rnd/lab) "xED" = ( @@ -165985,7 +166451,7 @@ "xSC" = ( /obj/structure/bed/stool/padded/red, /obj/effect/floor_decal/corner/brown/diagonal, -/obj/machinery/alarm/north, +/obj/structure/engineer_maintenance/pipe/wall, /turf/simulated/floor/tiled/dark, /area/horizon/holodeck_control) "xSJ" = ( @@ -166966,6 +167432,12 @@ /obj/structure/cable/green{ icon_state = "0-8" }, +/obj/structure/engineer_maintenance/pipe{ + dir = 1 + }, +/obj/structure/engineer_maintenance/pipe{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/horizon/security/investigations_hallway) "xZK" = ( @@ -167095,6 +167567,13 @@ }, /turf/simulated/floor/wood, /area/horizon/security/meeting_room) +"yaF" = ( +/obj/structure/engineer_maintenance/electric, +/obj/structure/engineer_maintenance/pipe{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/full, +/area/engineering/bluespace_drive) "yaG" = ( /obj/machinery/deployable/barrier, /obj/machinery/light{ @@ -168681,8 +169160,9 @@ /obj/effect/floor_decal/corner/grey/full{ dir = 4 }, -/obj/structure/closet/walllocker/medical/firstaid{ - pixel_y = -32 +/obj/structure/engineer_maintenance/electric, +/obj/structure/engineer_maintenance/pipe{ + dir = 4 }, /turf/simulated/floor/lino, /area/horizon/bar) @@ -191327,7 +191807,7 @@ xhz gWj bMT gWj -gWj +jqL kkT nuo aav @@ -191584,8 +192064,8 @@ gVm idz eGC teb -teb eAN +yaF vGp asB gRf @@ -191841,7 +192321,7 @@ vBt gWj vNb gWj -gWj +ktx cif lhS tdl @@ -193649,7 +194129,7 @@ nVz wZi wVV lIg -rPO +fYz rPO hQO prF @@ -194442,7 +194922,7 @@ fbu fpy eDa gvZ -iHE +oGp jWJ paB mwO @@ -194677,7 +195157,7 @@ saH nNE mTZ lIg -rPO +flN rPO hQO skq @@ -204968,7 +205448,7 @@ gJN wRE ocJ wtl -veU +jLA hzK eQH wRE @@ -260961,7 +261441,7 @@ elf wKC elf rHD -oGp +pEQ sbP avS ncS @@ -264341,7 +264821,7 @@ kvJ wRN fGX rKl -lix +ngN aVi lix jkC @@ -271056,7 +271536,7 @@ fll mjQ fPL kph -xzb +pxl qnM pxl pxl @@ -271551,7 +272031,7 @@ krw bHt frK bHt -bHt +ojE pHW ciz aZM @@ -273554,7 +274034,7 @@ syL rZG evN odF -iVU +xzb vbM hpB sKS @@ -276440,7 +276920,7 @@ gku vYm fst bOj -kRs +owE sfw cKu cKu @@ -327804,7 +328284,7 @@ jQM ltr qmZ frb -iOI +fZp lZz iOI onb @@ -328300,7 +328780,7 @@ yjQ yjQ yjQ war -hdO +pZB uSp eIr soR @@ -329842,7 +330322,7 @@ yjQ yjQ yjQ war -lbW +ckC sSk oJN xYS @@ -333733,7 +334213,7 @@ egW lOa jKM pZT -qdj +rvM caW caW caW @@ -334247,7 +334727,7 @@ tcQ svt okQ lSR -qdj +oJS caW caW caW @@ -335824,7 +336304,7 @@ owI tzh vFm vFm -vFm +vlm qZv rtp dAc @@ -336080,8 +336560,8 @@ rkg kDy gBY gYu -vFm -rvM +vlm +slg jBw dYe ycn @@ -337553,7 +338033,7 @@ oec oec mIb xIL -oHk +exB oHk oHk cVd @@ -342715,7 +343195,7 @@ lRV tLB vPd vPd -vPd +fle olj oYm tOO @@ -343483,7 +343963,7 @@ hQW frv sAh lRV -eSt +vZq vPd vPd vPd diff --git a/sound/attributions.txt b/sound/attributions.txt index cb9baea42e6..e862bb37e03 100644 --- a/sound/attributions.txt +++ b/sound/attributions.txt @@ -115,3 +115,19 @@ ATTRIBUTIONS SECTION END ATTRIBUTIONS SECTOR START sound/voice/bugrattle.ogg - https://pixabay.com/sound-effects/snake-rattle-sound-hq-240150/ ATTRIBUTIONS SECTION END + +ATTRIBUTIONS SECTOR START +sound/machines/hatch_open1.ogg - "Metal_Hatch_Small_Open_03" by Rudmer Rotteveel, licensed under CC0. Obtained from https://freesound.org/people/Rudmer_Rotteveel/sounds/718445/ +sound/machines/hatch_open2.ogg - "Opening and closing a small metal hatch" by Irolan, licensed under CC0. Obtained from https://freesound.org/people/Irolan/sounds/488221/ +sound/machines/hatch_open3.ogg - "Opening and closing a small metal hatch" by Irolan, licensed under CC0. Obtained from https://freesound.org/people/Irolan/sounds/488221/ +sound/machines/hatch_open4.ogg - by PRIMEVAL, licensed under CC0. Obtained from https://freesound.org/people/PRIMEVAL/sounds/393822/ +sound/machines/hatch_close1.ogg - "Hatch Seal.wav" by paul368. Licensed under CC0. Obtained from https://freesound.org/people/Paul368/sounds/264063/ +sound/machines/hatch_close2.ogg - "SFX Door Open.wav" by paul368. Licensed under CC0. Obtained from https://freesound.org/people/Paul368/sounds/264061/ +sound/machines/electrical_hum1.ogg - "EDF_Electrical_substation.wav" by nicotep. Licensed under CC0. Obtained from https://freesound.org/people/nicotep/sounds/547900/ +sound/machines/electrical_hum2.ogg - "electrical box.wav" by keweldog. Licensed under CC0. Obtained from https://freesound.org/people/keweldog/sounds/181131/ +sound/machines/electrical_spark1.ogg - "Electricity Sound" by NachtmahrTV. Licensed under CC0. Obtained from https://freesound.org/people/NachtmahrTV/sounds/556717/ +sound/machines/steam_pipe1.ogg - "steam.flac" by tim.kahn. Licensed under CC-BY 4.0. Obtained from https://freesound.org/people/tim.kahn/sounds/27975/ +sound/machines/steam_pipe2.ogg - "Steam Leaking" by PatrickLieberkind. Licensed under CC-BY 4.0. Obtained from https://freesound.org/people/PatrickLieberkind/sounds/213083/ +sound/machines/steam_pipe3.ogg - "file0571_air_hiss_weak.wav" by beerbelly38. Licensed under CC-BY NC 4.0. Obtained from https://freesound.org/people/beerbelly38/sounds/277360/ +sound/machines/steam_pipe4.ogg - "Steam Sewer Ambient" by Geoff-Bremner-Audio. Licensed under CC0. Obtained from https://freesound.org/people/Geoff-Bremner-Audio/sounds/724892/ +ATTRIBUTIONS SECTION END diff --git a/sound/machines/electrical_hum1.ogg b/sound/machines/electrical_hum1.ogg new file mode 100644 index 00000000000..4f4a281f8a7 Binary files /dev/null and b/sound/machines/electrical_hum1.ogg differ diff --git a/sound/machines/electrical_hum2.ogg b/sound/machines/electrical_hum2.ogg new file mode 100644 index 00000000000..6122a3c5ed1 Binary files /dev/null and b/sound/machines/electrical_hum2.ogg differ diff --git a/sound/machines/electrical_spark1.ogg b/sound/machines/electrical_spark1.ogg new file mode 100644 index 00000000000..78b5c742ae4 Binary files /dev/null and b/sound/machines/electrical_spark1.ogg differ diff --git a/sound/machines/hatch_close1.ogg b/sound/machines/hatch_close1.ogg new file mode 100644 index 00000000000..f5d30503322 Binary files /dev/null and b/sound/machines/hatch_close1.ogg differ diff --git a/sound/machines/hatch_close2.ogg b/sound/machines/hatch_close2.ogg new file mode 100644 index 00000000000..e418818e135 Binary files /dev/null and b/sound/machines/hatch_close2.ogg differ diff --git a/sound/machines/hatch_open1.ogg b/sound/machines/hatch_open1.ogg new file mode 100644 index 00000000000..7887e57dfb4 Binary files /dev/null and b/sound/machines/hatch_open1.ogg differ diff --git a/sound/machines/hatch_open2.ogg b/sound/machines/hatch_open2.ogg new file mode 100644 index 00000000000..89eff343c8c Binary files /dev/null and b/sound/machines/hatch_open2.ogg differ diff --git a/sound/machines/hatch_open3.ogg b/sound/machines/hatch_open3.ogg new file mode 100644 index 00000000000..8e4ea211b5d Binary files /dev/null and b/sound/machines/hatch_open3.ogg differ diff --git a/sound/machines/hatch_open4.ogg b/sound/machines/hatch_open4.ogg new file mode 100644 index 00000000000..6713735d1dd Binary files /dev/null and b/sound/machines/hatch_open4.ogg differ diff --git a/sound/machines/steam_pipe1.ogg b/sound/machines/steam_pipe1.ogg new file mode 100644 index 00000000000..9bea1537138 Binary files /dev/null and b/sound/machines/steam_pipe1.ogg differ diff --git a/sound/machines/steam_pipe2.ogg b/sound/machines/steam_pipe2.ogg new file mode 100644 index 00000000000..abcaa536c92 Binary files /dev/null and b/sound/machines/steam_pipe2.ogg differ diff --git a/sound/machines/steam_pipe3.ogg b/sound/machines/steam_pipe3.ogg new file mode 100644 index 00000000000..e0d518f23db Binary files /dev/null and b/sound/machines/steam_pipe3.ogg differ diff --git a/sound/machines/steam_pipe4.ogg b/sound/machines/steam_pipe4.ogg new file mode 100644 index 00000000000..af98be3f5a0 Binary files /dev/null and b/sound/machines/steam_pipe4.ogg differ