diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 64d7d669..967c6508 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -2081,6 +2081,7 @@ "aOa" = (/obj/structure/cable{icon_state = "0-2"},/obj/machinery/power/apc{areastring = "/area/hallway/primary/port"; dir = 1; name = "Port Hall APC"; pixel_y = 26},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/port) "aOb" = (/obj/structure/disposalpipe/segment,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/port) "aOc" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/machinery/light{dir = 8},/turf/open/floor/carpet/red,/area/crew_quarters/bar) +"aOd" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue{dir = 4},/obj/machinery/door/airlock/medical/glass{basecolor = ""; bound_width = 64; doorOpen = 'sound/machines/bigairlockopen.ogg'; icon = 'icons/obj/doors/airlocks/station/medbaydouble.dmi'; id_tag = "MedbayFoyer"; name = "Medbay"; note_overlay_file = 'icons/obj/doors/airlocks/station/overlaysdouble.dmi'; overlays_file = 'icons/obj/doors/airlocks/station/overlaysdouble.dmi'; req_access_txt = "5"; stripcolor = ""},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "aOe" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/central) "aOf" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel,/area/hallway/primary/port) "aOg" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/port) @@ -2089,6 +2090,7 @@ "aOj" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/cable{icon_state = "1-8"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/port) "aOk" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel,/area/hallway/primary/port) "aOl" = (/obj/structure/cable{icon_state = "2-8"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/port) +"aOm" = (/obj/machinery/door/airlock/medical/glass{basecolor = ""; bound_width = 64; doorOpen = 'sound/machines/bigairlockopen.ogg'; icon = 'icons/obj/doors/airlocks/station/medbaydouble.dmi'; id_tag = "MedbayFoyer2"; name = "Medbay"; note_overlay_file = 'icons/obj/doors/airlocks/station/overlaysdouble.dmi'; overlays_file = 'icons/obj/doors/airlocks/station/overlaysdouble.dmi'; req_access_txt = "5"; stripcolor = ""},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "aOn" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/public/glass{dir = 4; name = "Central Access"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/hallway/primary/central) "aOo" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel,/area/hallway/primary/central) "aOp" = (/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=QM"; location = "CHW"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/open/floor/plasteel,/area/hallway/primary/central) @@ -2097,6 +2099,7 @@ "aOs" = (/obj/machinery/light,/obj/structure/sign/warning/electricshock{pixel_y = -32},/obj/machinery/door/firedoor,/obj/effect/turf_decal/tile/blue{dir = 8},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/central) "aOt" = (/obj/effect/turf_decal/tile/blue{dir = 8},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/central) "aOu" = (/obj/structure/grille,/turf/open/floor/plating,/area/maintenance/starboard/fore) +"aOv" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/medical/glass{name = "Chemistry Lab"; req_access_txt = "5; 33"; stripcolor = "#ff944d"},/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel/white,/area/medical/chemistry) "aOz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/table/wood,/turf/open/floor/wood,/area/library) "aOA" = (/obj/structure/kitchenspike,/turf/open/floor/plasteel/showroomfloor,/area/crew_quarters/kitchen) "aOB" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/open/floor/plasteel/showroomfloor,/area/crew_quarters/kitchen) @@ -3478,12 +3481,10 @@ "bpS" = (/obj/structure/table/glass,/obj/item/grenade/chem_grenade,/obj/item/grenade/chem_grenade,/obj/item/grenade/chem_grenade,/obj/item/grenade/chem_grenade,/obj/item/screwdriver{pixel_x = -2; pixel_y = 6},/obj/machinery/light{dir = 8},/turf/open/floor/plasteel/white,/area/medical/chemistry) "bpT" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/plasteel/white,/area/medical/chemistry) "bpU" = (/obj/structure/table,/obj/item/folder/white,/obj/item/radio/headset/headset_med,/turf/open/floor/plasteel/white,/area/medical/chemistry) -"bpV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue{dir = 4},/obj/machinery/door/airlock/medical/glass{bound_width = 64; doorOpen = 'sound/machines/bigairlockopen.ogg'; icon = 'icons/obj/doors/airlocks/station/medbaydouble.dmi'; id_tag = "MedbayFoyer"; name = "Medbay"; note_overlay_file = 'icons/obj/doors/airlocks/station/overlaysdouble.dmi'; overlays_file = 'icons/obj/doors/airlocks/station/overlaysdouble.dmi'; req_access_txt = "5"},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "bpW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/medbay/central) "bpX" = (/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/medical/medbay/central) "bpY" = (/obj/machinery/computer/med_data{dir = 1},/obj/item/radio/intercom{frequency = 1485; name = "Station Intercom (Medbay)"; pixel_y = -30},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "bpZ" = (/obj/machinery/light,/obj/machinery/computer/crew{dir = 1},/turf/open/floor/plasteel/white,/area/medical/medbay/central) -"bqa" = (/obj/machinery/door/airlock/medical/glass{bound_width = 64; doorOpen = 'sound/machines/bigairlockopen.ogg'; icon = 'icons/obj/doors/airlocks/station/medbaydouble.dmi'; id_tag = "MedbayFoyer2"; name = "Medbay"; note_overlay_file = 'icons/obj/doors/airlocks/station/overlaysdouble.dmi'; overlays_file = 'icons/obj/doors/airlocks/station/overlaysdouble.dmi'; req_access_txt = "5"},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "bqb" = (/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "bqc" = (/obj/machinery/door/airlock/security/glass{name = "Security Office"; req_access_txt = "63"},/obj/structure/cable{icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/open/floor/plasteel/white,/area/security/checkpoint/medical) "bqd" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/closed/wall,/area/security/checkpoint/medical) @@ -3626,7 +3627,6 @@ "bsK" = (/obj/machinery/door/airlock/maintenance{name = "Teleporter Maintenance"; req_access_txt = "17"},/obj/structure/sign/warning/securearea{pixel_x = -32},/obj/structure/cable{icon_state = "1-2"},/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 1},/turf/open/floor/plating,/area/maintenance/central/secondary) "bsL" = (/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment,/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/central) "bsM" = (/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/central) -"bsN" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/medical/glass{name = "Chemistry Lab"; req_access_txt = "5; 33"},/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel/white,/area/medical/chemistry) "bsO" = (/obj/structure/disposalpipe/segment,/obj/effect/spawner/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plating,/area/medical/chemistry) "bsP" = (/obj/structure/table/reinforced,/obj/machinery/door/window/southleft{dir = 1; name = "Chemistry Desk"; req_access_txt = "33"},/obj/machinery/door/firedoor,/turf/open/floor/plating,/area/medical/chemistry) "bsQ" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/open/floor/plasteel/white,/area/medical/medbay/central) @@ -7331,9 +7331,9 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabkAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoBaaabdrbkBbkCbkDbkEbkEbkFbkGbkHbASaPjbkJbkKbkLbkLbkLbkMbkMbkMbkMbkMbkMbkNbkObhYbkPbkQbkRbkSbkTbkUbkXbkWbhYblfbkYbkZbeVbeVblabpvblcblbbldblebxQblgbbZblhblibljblkbllaZybgJblmaZvaZvaadaAxcGEaBsboabpHaBvaAxaadaZDaZDbipbpdbiqbaWbjebjfbjgaZDbjoaIPbjDbfvblsbisbltblublvblwbhcblxblyblzblAblBblCblCblDbhcbixbfDblEblFblGbpobkabhibhibkbbkabkcblHbfBblIblJbjWblKblLblMblNblKbkkblOblPbkmbkmbkmbkmblQbfLblRblSblTbfSbkvbgRbgRbkwbkxbkybfSbkzbnwbnxbnybnzbnAaaeaaeaaeaaeaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdrblZbdrbmabmbbmbbxBbdrbmdbmdaPjbmebmfbmebmebmebmfbmeaPjaPjbhYbhYbmgbmhbhYbmibmibmibmibmibmibmjbmkbmlbmmbmnbmobmpbmqbmrrJHbmsbiebmucWYbjCbmvbzhbmxbmybmzbmAbmBaZybpIbpJaZvaadaadaAxcGFaCSbpKaFzcGGaAxaadaadaZDbmHbmIaZDaZDaZDaZDbmJaZDbmKaIPbmLbfvbmMbmNbmObitbiubmPbhcblxbmQbmRbmSbmTbmUbmVbmWbmXbixberbmYbmZbnabpzbkabhibhibkbbkacHvbncbfBbndblJbjWbnebkgbnfbkibngbkkbnhbnibnjbnkbnlbnmbnnbfLbnoblSbnpbfSbnqbnrbnsblnbtIblpbfSbkzbnwbANblYblYblYatJaaaaaaaaeaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJbdrbnBbkCbnCbmbbnDbnEbdraaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaabnFbnGbnHbnIbnJbnKbmibmibmibnLbmibmibnMbnNbnOblbbnQbnRblbbnTkjTeDbbiebqIbeVbAObnWbbfblhbnXbnYbnYbnYbnYbnZbrdbobaadaaaaAxaEnaHbaEobqgaEqaAxaaaaadaZDbntbnubnvbojbokaZDbreaZDbjiaIPbombfvbonboobopboqborbfvbosblxbmQbotboubhcbovbotbmWbowboxberboybozboAboBboCboCboDboEboHcIoboHboIboJboKbjWboLboMboNboOboPboQboRboSboTboUboVboWaRhbfLboXboYboZbfSbpabpbbpcblqbgRblrbfSbpebpfcEfblYcEgblYatJatJaaajXDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJbdrbpjbkCbkCbkCbdrbdrbdraaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaabnFbpkbplbpmbpnbpnbpnbpnbpnbpnbpnbpnbqJbhYbppbpqbprbpsbptbpubeVviwbiebpybeVbjCbpAbjDblhblhbobbpCbpDbpEbpFbpGbobaaaaaaaAxaFybrccGBcGLaFCaAxaaaaaaaZDboibpdbpxaZDbpOaZDcGHaZDbjiaIPbpQbpRbpSboobpTbitbpUbfvbjEbpVbpWbpXbpYbhcbpZbpXbqabqbbjEberberbqcbqPbqdbqebqfbqfbqfbqfbqhbqibqibqibqjbqkbfIbfIbfIbfIbfIbqlbqmbkmbqnboWboWbvAbqpbqlbATbAUbBQbqtblUblVblWblXbogbohbfScEqbfScEpbphbphbphbphbphbphbpiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJbdrbpjbkCbkCbkCbdrbdrbdraaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaabnFbpkbplbpmbpnbpnbpnbpnbpnbpnbpnbpnbqJbhYbppbpqbprbpsbptbpubeVviwbiebpybeVbjCbpAbjDblhblhbobbpCbpDbpEbpFbpGbobaaaaaaaAxaFybrccGBcGLaFCaAxaaaaaaaZDboibpdbpxaZDbpOaZDcGHaZDbjiaIPbpQbpRbpSboobpTbitbpUbfvbjEaOdbpWbpXbpYbhcbpZbpXaOmbqbbjEberberbqcbqPbqdbqebqfbqfbqfbqfbqhbqibqibqibqjbqkbfIbfIbfIbfIbfIbqlbqmbkmbqnboWboWbvAbqpbqlbATbAUbBQbqtblUblVblWblXbogbohbfScEqbfScEpbphbphbphbphbphbphbpiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJatJaaaatJaaaaaaatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaabqFbnFbnFbqGbplbkVbmibqHbqHbqHbqHbmibmibmibsmbhYbihbmwbqLbqMbqNbeVbeVbqQaZJbeVbeVbBVbqSbqTbqUbqVbqWbqXbpLbpMbpNbrbbobaadaaaaAxaAxcGUaHccGVaAxaAxaaaaadaZDbqxbqybDUaZDbriaZDbolaZDbjiaIPbpQbfvbrjboobrkbrlbrmbfvbrnblxbrobpXbjEbrpbjEbpXbrqbrrbrsbrtbrubrvbrwbrxbrybrzbrAbrBbrCbrDbrEbrFbrGblJbrHbrIbrJbrKbrLbrMbrNbrObrPbrQbrRbrSboWbrTbrUbrVbrWaSxbqtbqubqvbqwbqYbgRbqZbsccEscEtbqCbqDbqDbqDbqDbqDbqEbhIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaajXDaaaaaaaaaaaajXDaaaaaaaaaaaaaaaaaaaaabsfbsgbsfbshbsibsjbskbslbmibmibmibmibzKbmibvlbhYbqKbvmcEOcEPcEQcERbsqbsnbtHbDubxPbzAbpAbjDasFbsxbsybszbrabrfbpNbsCbobaaaaaaaTBbmCcIpaIPcIqcGJaTBaaaaaabsHbsIbsJbsHbsHbsHbsHbsKbsHbsLaLzbsMbfvbfvbsNbsObsPbfvbfvbhcbsQbsRbsSbsTbsSbsUbsSbsWbqbbhcbhcbhcbqbbhcbhbbrybrzbsXbsYbsZbtabtbbtcbrGbtdbtebtfbtgbtgbtgbthbtibtjbtkbtlbtmbtnbtobtpbtqbtrblSbtsbqtbqtbttbtubtvbttbqtbScbScbScbScbScbScbScbScbScbtBbhIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaajXDaaaaaaaaaaaajXDaaaaaaaaaaaaaaaaaaaaabsfbsgbsfbshbsibsjbskbslbmibmibmibmibzKbmibvlbhYbqKbvmcEOcEPcEQcERbsqbsnbtHbDubxPbzAbpAbjDasFbsxbsybszbrabrfbpNbsCbobaaaaaaaTBbmCcIpaIPcIqcGJaTBaaaaaabsHbsIbsJbsHbsHbsHbsHbsKbsHbsLaLzbsMbfvbfvaOvbsObsPbfvbfvbhcbsQbsRbsSbsTbsSbsUbsSbsWbqbbhcbhcbhcbqbbhcbhbbrybrzbsXbsYbsZbtabtbbtcbrGbtdbtebtfbtgbtgbtgbthbtibtjbtkbtlbtmbtnbtobtpbtqbtrblSbtsbqtbqtbttbtubtvbttbqtbScbScbScbScbScbScbScbScbScbtBbhIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJatJatJjXDatJjXDjXDatJjXDaaaaaaaaaaaaaaaaaaaaabtCbtDbtEbtFbmibkVbmibqHbqHbtGbqHbmibmibvgbhYbhYbxRbxYbzqbzwbzxbzxbpwbzybtLbDwbDxbzAbpAbjDasJbtMbtNbtObrgbrgbrhbtRbobaadaadaTBcGKcGWcIrcIscGNaTBaadaadbsHbuabubbucbudbuebufbugbsHbjoaIPbMmbujbukbulbumbunbuobupbuqburbusbutbutbutbutbutbuubuvbutbutbutbuwblCbuxbuybrzbuzbuAbuBbuBbuCbuDbrGblJbrHbuEbuFbuGbuHbuIbuJbuKbkmbuLbkmbkmbkmbuMbqlbuNbuObuPbuQbuRbuSbuTbuUbuVbuWbuXbuYbuZbvabvbbvabtwbvcbvdbvebhIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaajXDaaaaaaaaaaaajXDaaaaaaaaaaaaaaaaaaaaabqFbnFbnFbvfbmibkVbmibmibmibmibmibmibmibwEbwWbxTbxRbvibvjbvkbvnbvnbvnbvobAwbDwbDxbzAbpAbjDctHbsxbobbvrbvsbvtbvubvvbobaaaaaaaTBcGMcGWcItcIucGOaTBaaaaaabsHbvybvzbALbvBbvCbvCbvDbvEbvFbvGbWxbvHbvIbvJbvKbvLbvMbvNbvMbvMbvObvPbvQbvRbvRbvRbvSbvTbhcbhcbvUbvVbvVbvWbrzbrzbrzbvXbvYbvZbtbbuDbrGbwabrHbfLbqlbqlbqlbqlbqlbqlbqlbqlbqlbwbbwcbwbbqlbwdbwebwfbwgbwgbwgbwhbwibwjbwkbwlbwmbwnbwqbwpbwqbwrbwsbwtbwubwvblYbwwbwwblYaadaadaadaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaajXDaaaaaaaaaaaajXDaaaaaaaaaaaaaaaaaabwxbtCbtDbtEbpkbwybmjbwzbnKbmibwybmibmibmibwEbxUbxVbxRbAybsobwCbpwbpwbpwbAzbpwbDwbDxbzAbpAbjDctIbwGbobbwHbwIbwJbwKbpGbobaaaaaaaTBcGPcIvaMZbiLcGQaTBaaaaaabsHbwPbwQbwRbwSbwTbwUbwVbsHcHwaIPbjDbjEbjEbwXbwYbsWbwZbxabxbbxcbxcbxbbxabxbbxabxbbxabxbbxabfzbfzbvVbxdbuBbxebxfbrzbvXbxgbxhbxibxjbrGbxkbxlbxmbxnbxobwgbwgbxpbwgbwgbxqbxrbxsbxtbxubwgbxvbxwbxxbxybxybxybxzbxzbxzbxzbXybxAbzgbzjbxDbzjbxEbtxbScbxFbxGbxHbxIbxJblYaadaaaaaaaaaaaaaaaaaaaadaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 84b2e732..1173bd6a 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -43,7 +43,7 @@ /obj/machinery/door/airlock name = "airlock" - icon = 'icons/obj/doors/airlocks/station/public.dmi' + icon = 'icons/obj/doors/airlocks/station/base.dmi' icon_state = "closed" max_integrity = 300 var/normal_integrity = AIRLOCK_INTEGRITY_N @@ -86,6 +86,12 @@ var/airlock_material //material of inner filling; if its an airlock with glass, this should be set to "glass" var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi' var/note_overlay_file = 'icons/obj/doors/airlocks/station/overlays.dmi' //Used for papers and photos pinned to the airlock + var/color_overlay_file = 'icons/obj/doors/airlocks/station/color.dmi' + var/strip_overlay_file = 'icons/obj/doors/airlocks/station/strip.dmi' + + //colours! modular wow! + var/basecolor = "" + var/stripcolor = rgb(130,160,90) var/cyclelinkeddir = 0 var/obj/machinery/door/airlock/cyclelinkedairlock @@ -452,11 +458,17 @@ var/mutable_appearance/damag_overlay var/mutable_appearance/sparks_overlay var/mutable_appearance/note_overlay + var/mutable_appearance/strip_overlay + var/mutable_appearance/color_overlay var/notetype = note_type() switch(state) if(AIRLOCK_CLOSED) frame_overlay = get_airlock_overlay("closed", icon) + color_overlay = get_airlock_overlay("closed", color_overlay_file) + strip_overlay = get_airlock_overlay("closed", strip_overlay_file) + color_overlay.color = basecolor + strip_overlay.color = stripcolor if(airlock_material) filling_overlay = get_airlock_overlay("[airlock_material]_closed", overlays_file) else @@ -485,6 +497,10 @@ if(!hasPower()) return frame_overlay = get_airlock_overlay("closed", icon) + color_overlay = get_airlock_overlay("closed", color_overlay_file) + strip_overlay = get_airlock_overlay("closed", strip_overlay_file) + color_overlay.color = basecolor + strip_overlay.color = stripcolor if(airlock_material) filling_overlay = get_airlock_overlay("[airlock_material]_closed", overlays_file) else @@ -527,6 +543,10 @@ if(AIRLOCK_CLOSING) frame_overlay = get_airlock_overlay("closing", icon) + color_overlay = get_airlock_overlay("closing", color_overlay_file) + strip_overlay = get_airlock_overlay("closing", strip_overlay_file) + color_overlay.color = basecolor + strip_overlay.color = stripcolor if(airlock_material) filling_overlay = get_airlock_overlay("[airlock_material]_closing", overlays_file) else @@ -543,6 +563,10 @@ if(AIRLOCK_OPEN) frame_overlay = get_airlock_overlay("open", icon) + color_overlay = get_airlock_overlay("open", color_overlay_file) + strip_overlay = get_airlock_overlay("open", strip_overlay_file) + color_overlay.color = basecolor + strip_overlay.color = stripcolor if(airlock_material) filling_overlay = get_airlock_overlay("[airlock_material]_open", overlays_file) else @@ -559,6 +583,10 @@ if(AIRLOCK_OPENING) frame_overlay = get_airlock_overlay("opening", icon) + strip_overlay = get_airlock_overlay("opening", strip_overlay_file) + color_overlay = get_airlock_overlay("opening", color_overlay_file) + color_overlay.color = basecolor + strip_overlay.color = stripcolor if(airlock_material) filling_overlay = get_airlock_overlay("[airlock_material]_opening", overlays_file) else @@ -575,6 +603,10 @@ cut_overlays() add_overlay(frame_overlay) + if (basecolor) + add_overlay(color_overlay) + if (stripcolor) + add_overlay(strip_overlay) add_overlay(filling_overlay) add_overlay(lights_overlay) add_overlay(panel_overlay) @@ -582,6 +614,7 @@ add_overlay(sparks_overlay) add_overlay(damag_overlay) add_overlay(note_overlay) + check_unres() /proc/get_airlock_overlay(icon_state, icon_file, targetlayer = FLOAT_LAYER, targetplane = FLOAT_PLANE) diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 3968e3ef..6a65cede 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -6,29 +6,32 @@ abandoned = TRUE /obj/machinery/door/airlock/command - icon = 'icons/obj/doors/airlocks/station/command.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_com normal_integrity = 450 + basecolor = rgb(0,110,200) + stripcolor = rgb(115,200,255) /obj/machinery/door/airlock/security - icon = 'icons/obj/doors/airlocks/station/security.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_sec normal_integrity = 450 + basecolor = rgb(235,50,50) + stripcolor = "" /obj/machinery/door/airlock/engineering - icon = 'icons/obj/doors/airlocks/station/engineering.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_eng + basecolor = rgb(235,190,0) + stripcolor = rgb(50,50,50) /obj/machinery/door/airlock/engineering/abandoned abandoned = TRUE /obj/machinery/door/airlock/medical - icon = 'icons/obj/doors/airlocks/station/medical.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_med + basecolor = rgb(250,250,250) + stripcolor = rgb(0,255,255) /obj/machinery/door/airlock/maintenance name = "maintenance access" - icon = 'icons/obj/doors/airlocks/station/maintenance.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_mai normal_integrity = 250 @@ -37,39 +40,43 @@ /obj/machinery/door/airlock/maintenance/external name = "external airlock access" - icon = 'icons/obj/doors/airlocks/station/maintenanceexternal.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_extmai /obj/machinery/door/airlock/mining name = "mining airlock" - icon = 'icons/obj/doors/airlocks/station/mining.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_min + basecolor = rgb(150,112,50) + stripcolor = rgb(95,53,11) /obj/machinery/door/airlock/atmos name = "atmospherics airlock" - icon = 'icons/obj/doors/airlocks/station/atmos.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_atmo + basecolor = rgb(131,163,93) + stripcolor = "" /obj/machinery/door/airlock/atmos/abandoned abandoned = TRUE /obj/machinery/door/airlock/research - icon = 'icons/obj/doors/airlocks/station/science.dmi' //icon = 'icons/obj/doors/airlocks/station/research.dmi' this is the old version assemblytype = /obj/structure/door_assembly/door_assembly_research + basecolor = rgb(250,250,250) + stripcolor = rgb(150,30,255) /obj/machinery/door/airlock/freezer name = "freezer airlock" - icon = 'icons/obj/doors/airlocks/station/freezer.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_fre /obj/machinery/door/airlock/science - icon = 'icons/obj/doors/airlocks/station/science.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_science + basecolor = rgb(250,250,250) + stripcolor = rgb(150,30,255) /obj/machinery/door/airlock/virology - icon = 'icons/obj/doors/airlocks/station/virology.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_viro + basecolor = rgb(250,250,250) + stripcolor = rgb(0,255,255) + ////////////////////////////////// /* @@ -79,6 +86,8 @@ /obj/machinery/door/airlock/glass opacity = 0 glass = TRUE + basecolor = "" + stripcolor = "" /obj/machinery/door/airlock/glass/incinerator autoclose = FALSE @@ -308,9 +317,9 @@ */ /obj/machinery/door/airlock/public - icon = 'icons/obj/doors/airlocks/station2/glass.dmi' - overlays_file = 'icons/obj/doors/airlocks/station2/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_public + basecolor = rgb(255,255,255) + stripcolor = 0 /obj/machinery/door/airlock/public/glass opacity = 0 diff --git a/icons/obj/doors/airlocks/station/base.dmi b/icons/obj/doors/airlocks/station/base.dmi new file mode 100644 index 00000000..4d62d12f Binary files /dev/null and b/icons/obj/doors/airlocks/station/base.dmi differ diff --git a/icons/obj/doors/airlocks/station/color.dmi b/icons/obj/doors/airlocks/station/color.dmi new file mode 100644 index 00000000..fd4de10a Binary files /dev/null and b/icons/obj/doors/airlocks/station/color.dmi differ diff --git a/icons/obj/doors/airlocks/station/overlays.dmi b/icons/obj/doors/airlocks/station/overlays.dmi index 299adf3c..0d128d91 100644 Binary files a/icons/obj/doors/airlocks/station/overlays.dmi and b/icons/obj/doors/airlocks/station/overlays.dmi differ diff --git a/icons/obj/doors/airlocks/station/strip.dmi b/icons/obj/doors/airlocks/station/strip.dmi new file mode 100644 index 00000000..0a148076 Binary files /dev/null and b/icons/obj/doors/airlocks/station/strip.dmi differ