diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 82f6898c..56a4119f 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -3403,7 +3403,7 @@ "bnw" = (/turf/open/floor/wood,/area/crew_quarters/heads/captain/private) "bnx" = (/obj/effect/landmark/start/captain,/obj/machinery/airalarm{dir = 1; pixel_y = -22},/turf/open/floor/wood,/area/crew_quarters/heads/captain/private) "bny" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/disposalpipe/segment,/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel,/area/hallway/primary/central) -"bnz" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=13.1-Engineering-Enter"; location = "12-Central-Starboard"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/camera{c_tag = "Theatre - Stage"; dir = 8},/turf/open/floor/plasteel,/area/hallway/primary/central) +"bnz" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=13.1-Engineering-Enter"; location = "12-Central-Starboard"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/hallway/primary/central) "bnA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment,/obj/effect/turf_decal/tile/yellow,/turf/open/floor/plasteel,/area/hallway/primary/central) "bnB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/public/glass{dir = 8; name = "Starboard Primary Hallway"},/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel,/area/hallway/primary/starboard) "bnC" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel,/area/hallway/primary/starboard) @@ -8170,6 +8170,7 @@ "fqe" = (/obj/structure/chair/sofa{dir = 8},/turf/open/floor/wood,/area/crew_quarters/bar) "khd" = (/obj/effect/turf_decal/bot_white/left,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/gateway{dir = 10},/turf/open/floor/plasteel/dark,/area/gateway) "kie" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plating,/area/maintenance/starboard) +"kRU" = (/obj/structure/chair/sofa/right{dir = 4},/obj/machinery/camera{c_tag = "Theatre - Stage"; dir = 1},/turf/open/floor/wood,/area/crew_quarters/bar) "omF" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/command{dir = 4; name = "Captain's Quarters"; req_access_txt = "20"},/turf/open/floor/plasteel/dark,/area/crew_quarters/heads/captain/private) "oDK" = (/obj/effect/turf_decal/bot_white,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/gateway{dir = 4},/turf/open/floor/plasteel/dark,/area/gateway) "sKK" = (/obj/machinery/door/airlock/maintenance{dir = 8; req_one_access_txt = "12;25;46"},/obj/structure/cable/yellow{icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plating,/area/maintenance/starboard) @@ -8308,7 +8309,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabHibHjbHkbHlbezbHmbwwbHnbHobHpbCgbHqbDWbDXbDWbDWbHrbCgbyqbHsbyqbEdbHtbHubyqbHvbHwbwybHxbEibHybHzbHAbHBbHCbFNbFNbFNbFNbFPbwCbHDbHEbHFbHGbHHbHGbHIbHJbHKbHLbHMbHNbHObHPbHQbHRbHQbHSbHSbHTbHUbHSbHVbHWbHXbHYbHZbIabIbbIcbIdbIebIfbIgbHZbIhbIibIjbIkbIlbImbInbIobIpbIqbIrbIsbInbItbGzbGAbGBbzpbGCbzpbGDbGEbIubIvbIwbIxbprbIFbpsbIGbIHbIIbIJbIKbILbILbIMbILbINbIObIPbIQbIRbISbITbIUbIVbIWbIXbIYbIZbJabJbbJcbJdbFubJebDGaafaaabBPaaabBOaaabeuaoEaoEaoEaoEaaibeubeuaoEaoEaaiaoEbeuaoEaaiaoEaagaoEaMdaQNaMiaaaaTAbJfbJgbJhbFwbJibFwbJhbJgbJjaTAaaaaMdaQNaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXQaXQaXQbezbJkbwwbJlbwwbwwbCgbJmbDWbDXbDWbDWbDWbCgbJnbJobyqbJpbyqbyqbyqbCmbClbJqbCobCobyxbJrbJsbJtbJubCobJvbCobCobEobwCbdtbJwbJxbJybJzbJAbJBbJybJybJCbJCbJDbJEbJCbJFbCCbJGbJHbJIbJJbJKbJHbJLbCCbJFbJMbJNbJObJPbJMbJMbJQbJRbJSbJMbJTbJUbJVbJWbJXbJYbJZbKabJZbKbbKcbBbbBbbBhbENbBgbIybGAbKfbKebBnbIzbIAbGAbICbEQbprbpvbpsbKmbKnbKobzKbKpbKqbKqbKqbKqbKrbKsbKtbDCbKubGQbKvbKwbKxbKybKzbKAbKBbGYbetbDGbDGbDGbDGbDGaafaaabBPaaabBOaaabBPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEbKCbKDaMiaaaaTAbKEbJgbJgbKFbKGbKHbJgbJgbKIaTAaaaaMdaQNaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaXQbKJbezbKKbwwbKLbvSbKMbCgbKNbKObKPbDWbDWbDWbCgbKQbKRbyqbKSbKTbKUbyqbKVbKWbwybKXbKXbyxbyybKYbKYbEjbKZbLabLbbwybwybLcbLdbJwbJybLebLfbLgbLhbLibLjbLkbLlbLmbLnbJCaafbEqbLobJHbJHbLpbJHbJHbLqbLraafbJMbLsbLtbLubLvbJMbJMbJMbJMbJMbLwbeYbJVbLxbLybprbLzbLAbEKbLBbLCbEKbEKbETbENbLDbIBbDgbtMbIEfqebIDbKdbKgbKhbKisKKbLJbpsbLKbLLbLMbzGbLNbLObLPbLQbFdbLRbLSbLTbLUbLVbLWbLXbLYbLZbMabMbbMcbMdbFqbMebMfbMgbMhbMhbDGaafaafbMiaafbMjaafbBPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaMdbKDaMiaaaaTAbMkbMlbMmbJgbMnbMobMpbMqbMraTAaaaaMdaQNaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaXQaXQaSdaXQbbnaXQaSdaXQaXQaXQaSdaXQaSdaSdaSdbMsbMtbMubMvbMwbMwbCgbMxbMybMzbMAbMBbMCbCgbyqbyqbyqbyqbyqbyqbyqbClbAwbwybMDbMEbyxbyybCobCobMFbCobMGbMHbwybMIbwCbdtbMJbJybMKbMLbMMbMNbMObLjbMPbMQbMRbMSbMTaafbEqbMUbMVbMWbMXbMVbMWbMYbLraafbMZbNabNbbNcbNdbNebNfbNgbNhbJMbNibeYbNjbzfbNkbNlbNmbNmbNnbNobNpbNqbNrbNmbNsbNmbKjbNubKkbLEbLFbprbprbNybprbprbprkiebNzbNAbNBbNzbzBaaObNCbNDbNEbzDbNFbNGbNHbNIbNJbNKbNLbNKbNKbNMbNNbNObNPbGYbetbGZbNQbNRbNSbDGaafaaabBPaaabBOaaabNTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaMdbNUbNVaWoaTAaTAbNWbNXbJgbNYbMobNZbOaaTAaTAaWoaWsbObaPsaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaXQaXQaSdaXQbbnaXQaSdaXQaXQaXQaSdaXQaSdaSdaSdbMsbMtbMubMvbMwbMwbCgbMxbMybMzbMAbMBbMCbCgbyqbyqbyqbyqbyqbyqbyqbClbAwbwybMDbMEbyxbyybCobCobMFbCobMGbMHbwybMIbwCbdtbMJbJybMKbMLbMMbMNbMObLjbMPbMQbMRbMSbMTaafbEqbMUbMVbMWbMXbMVbMWbMYbLraafbMZbNabNbbNcbNdbNebNfbNgbNhbJMbNibeYbNjbzfbNkbNlbNmbNmbNnbNobNpbNqbNrbNmbNsbNmbKjbNukRUbLEbLFbprbprbNybprbprbprkiebNzbNAbNBbNzbzBaaObNCbNDbNEbzDbNFbNGbNHbNIbNJbNKbNLbNKbNKbNMbNNbNObNPbGYbetbGZbNQbNRbNSbDGaafaaabBPaaabBOaaabNTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaMdbNUbNVaWoaTAaTAbNWbNXbJgbNYbMobNZbOaaTAaTAaWoaWsbObaPsaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaXQaXRbOcbxWbOdbxWaXSaXSbOeaXSbOcaXSbOfbOcaXSbOgbOhbwwbKLbCmbMwbCgbOibKPbOjbOkbOlbOmbCgbOnbOobOpbOqbOrbOsbwwbClbOtbwybOubOvbyxbyybOwbOwbOxbCobCobOybwybOzbwCbfebJwbJybOAbOBbOCbODbOEbLjbOFbOGbOHbOIbJCbOJbOKbOJbOKbOKbOLbOKbOKbOJbOKbOJbJMbOMbONbOObOPbOQbORbOSoDKbJMbOTbeYbOUaYFbLybNmbOVbOWbOXbOYbOZbPabPabPbbPcbNmbNmbNmbNmbNmbNmbNmbzvbPdbPebPfbPgbAtbPibPjbPkbPlbNzaZgaZgaZgaZgbzBbPmbPnbPobIUbPpbPqbPqbPqbPrbPsbMabPtbPubJabJbbJcbPvbMhbPwbDGaafaaabBPaaabBOaaabBPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaMdbKDaMiaaabxVaTAbPxbJgbJgbPybPzbPAbPBaTAbxVaaaaMdbKDaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaXQaZuaZvaZvaZvaZvaZvbPCbPDbzZbzWbzWbPEbPFbPGbPHbPIbwwbKLbPJbMwbCgbDYbPLbDWbPMbPLbPNbCgbPObPPbPQbPRbPSbOrbwwbClbPTbwybPUbPVbPWbPXbCobPYbPZbQabQbbQcbwyaYwbwCbdtbQdbJybQebQfbQgbQhbLjbLjbQibQjbQkbQlbJCbQmbQnbQobQpbQqbQrbQsbQpbQtbQubQvbQwbQxbONbQybQzbJMkhdbQAwdcbJMbQBbeYbQCaYFbQDbQEbQFbQGbQHbQIbQJbQKbOXbQLbQMbNmbQNbQObQPbQObQQbNmbQRbQSbQTbQUbzvbKlbNzbQVbQWbQXbNzbQYbQZbRabRbbzBbPmbRcbRdbRebRfbIUbIUbIUbRgbRhbRhbRibRjbRkbRlbDGbDGbDGbDGbDGaafaaaaaiaaabBOaaabBPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaMdbKDaMiaaabxVaTAbRmbRnbRobRpbRqbRrbRsaTAbxVaaaaMdbKDaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaXQaXQbRtbRtaXQaXQaXQaSdaXQaSdaXQaSdaSdbwwbRubwwbwwbwwbKLbOtbMwbCgbPNbRvbRwbPMbRwbRxbCgbRybRzbMwbFLbRAbRBbwwbClbCmbwybwybwybRCbRDbwybwybwybwybwybREbwybwybACbgIbRFbJybRGbRHbRIbRJbRKbLjbRLbRMbQkbRNbRObRPbRQbRRbRSbRTbRRbRUbRVbRWbRXbRYbQwbRZbONbSabSbbScbSdbSebSfbJMbSgbeYbShaYFbLybSibSjbSkbSlbSmbSnbSobSpbQLbSqbNmbSrbSsbStbSubQQbNmbSvbSwbSxbSybSzbSAbNzbSBbSCbSDbNzbSEbSFbSGbSHbzBbSIbSJbSKbIUbIUbIUbIUbIUbIUbIUbIUbSLbSMbFqbSNbMfbSObSPbSQbDGaafaaabBPaaabBOaaabBPaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEbKCbKDaMiaaaaaaaTAaTAaTAaTAaTBaTAaTAaTAaTAaaaaaaaMdbKDaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/icons/emoji.dmi b/icons/emoji.dmi index 505f42fb..3670c0bb 100644 Binary files a/icons/emoji.dmi and b/icons/emoji.dmi differ diff --git a/icons/obj/smooth_structures/plasma_window.dmi b/icons/obj/smooth_structures/plasma_window.dmi index 5014c2a6..941d332a 100644 Binary files a/icons/obj/smooth_structures/plasma_window.dmi and b/icons/obj/smooth_structures/plasma_window.dmi differ diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index 740f6545..ff32462e 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ diff --git a/sound/music/PigstepSilva.ogg b/sound/music/PigstepSilva.ogg new file mode 100644 index 00000000..755ff5a5 Binary files /dev/null and b/sound/music/PigstepSilva.ogg differ diff --git a/sound/music/Sam.ogg b/sound/music/Sam.ogg new file mode 100644 index 00000000..7c1d069f Binary files /dev/null and b/sound/music/Sam.ogg differ diff --git a/sound/music/credits.ogg b/sound/music/credits.ogg new file mode 100644 index 00000000..0c002904 Binary files /dev/null and b/sound/music/credits.ogg differ diff --git a/strings/round_start_sounds.txt b/strings/round_start_sounds.txt index 7b7cf498..8dcec030 100644 --- a/strings/round_start_sounds.txt +++ b/strings/round_start_sounds.txt @@ -28,3 +28,6 @@ sound/music/rocketridersprayer.ogg sound/music/thewizard.ogg sound/music/thesettler.ogg sound/music/thelessImichael.ogg +sound/music/PigstepSilva.ogg +sound/music/Sam.ogg +sound/music/credits.ogg \ No newline at end of file