diff --git a/baystation12.dme b/baystation12.dme index a0103743e27..16343fcf623 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -4,51 +4,6 @@ // BEGIN_INTERNALS // END_INTERNALS // BEGIN_FILE_DIR -#define FILE_DIR . -#define FILE_DIR "code" -#define FILE_DIR "code/TriDimension" -#define FILE_DIR "code/WorkInProgress" -#define FILE_DIR "code/WorkInProgress/Cael_Aislinn" -#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust" -#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter" -#define FILE_DIR "code/WorkInProgress/Susan" -#define FILE_DIR "html" -#define FILE_DIR "icons" -#define FILE_DIR "icons/48x48" -#define FILE_DIR "icons/effects" -#define FILE_DIR "icons/mecha" -#define FILE_DIR "icons/misc" -#define FILE_DIR "icons/mob" -#define FILE_DIR "icons/mob/human_races" -#define FILE_DIR "icons/obj" -#define FILE_DIR "icons/obj/assemblies" -#define FILE_DIR "icons/obj/atmospherics" -#define FILE_DIR "icons/obj/clothing" -#define FILE_DIR "icons/obj/doors" -#define FILE_DIR "icons/obj/flora" -#define FILE_DIR "icons/obj/machines" -#define FILE_DIR "icons/obj/pipes" -#define FILE_DIR "icons/pda_icons" -#define FILE_DIR "icons/spideros_icons" -#define FILE_DIR "icons/Testing" -#define FILE_DIR "icons/turf" -#define FILE_DIR "icons/vehicles" -#define FILE_DIR "icons/vending_icons" -#define FILE_DIR "maps" -#define FILE_DIR "sound" -#define FILE_DIR "sound/AI" -#define FILE_DIR "sound/ambience" -#define FILE_DIR "sound/effects" -#define FILE_DIR "sound/effects/wind" -#define FILE_DIR "sound/hallucinations" -#define FILE_DIR "sound/items" -#define FILE_DIR "sound/machines" -#define FILE_DIR "sound/mecha" -#define FILE_DIR "sound/misc" -#define FILE_DIR "sound/piano" -#define FILE_DIR "sound/violin" -#define FILE_DIR "sound/voice" -#define FILE_DIR "sound/weapons" // END_FILE_DIR // BEGIN_PREFERENCES diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index c8481e53a24..32eda4be3de 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -37,10 +37,9 @@ var/global/datum/controller/gameticker/ticker var/triai = 0//Global holder for Triumvirate /datum/controller/gameticker/proc/pregame() - login_music = pick('sound/ambience/title1.ogg','sound/ambience/title2.ogg') // choose title music! - for(var/mob/new_player/M in mob_list) - if(M.client) M.client.playtitlemusic() - + login_music = pick('sound/ambience/title1.ogg','sound/ambience/title2.ogg','sound/ambience/b12_combined_start.ogg') // choose title music! +/* for(var/mob/new_player/M in mob_list) + if(M.client) M.client.playtitlemusic()*/ do pregame_timeleft = 180 world << "Welcome to the pre-game lobby!" diff --git a/code/modules/mining/mine_areas.dm b/code/modules/mining/mine_areas.dm index 8e02f5a19b5..0a8b01bb194 100644 --- a/code/modules/mining/mine_areas.dm +++ b/code/modules/mining/mine_areas.dm @@ -2,16 +2,15 @@ /area/mine icon_state = "mining" + music = 'sound/ambience/song_game.ogg' /area/mine/explored name = "Mine" icon_state = "explored" - music = null /area/mine/unexplored name = "Mine" icon_state = "unexplored" - music = null /area/mine/lobby name = "Mining station" diff --git a/maps/tgstation.2.0.9.1.dmm b/maps/tgstation.2.0.9.1.dmm index 5dcbb60cd7a..2affd7964ab 100644 --- a/maps/tgstation.2.0.9.1.dmm +++ b/maps/tgstation.2.0.9.1.dmm @@ -7231,7 +7231,7 @@ "cJc" = (/obj/item/weapon/wrench,/turf/unsimulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) "cJd" = (/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/disposal,/turf/unsimulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) "cJe" = (/turf/unsimulated/beach/sand,/area/beach) -"cJf" = (/obj/effect/signpost,/turf/unsimulated/beach/sand,/area/beach) +"cJf" = (/obj/structure/signpost,/turf/unsimulated/beach/sand,/area/beach) "cJg" = (/obj/structure/closet,/turf/unsimulated/beach/sand,/area/beach) "cJh" = (/obj/structure/stool/bed/chair,/turf/unsimulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) "cJi" = (/obj/effect/overlay/palmtree_l,/turf/unsimulated/beach/sand,/area/beach) @@ -7340,7 +7340,7 @@ "cLh" = (/obj/structure/rack,/obj/item/weapon/kitchenknife/ritual,/turf/unsimulated/floor{icon_state = "chapel"},/area/wizard_station) "cLi" = (/obj/item/weapon/reagent_containers/food/snacks/grown/banana,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown) "cLj" = (/obj/structure/table/woodentable,/obj/item/weapon/stamp/clown,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown) -"cLk" = (/obj/effect/signpost,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown) +"cLk" = (/obj/structure/signpost,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown) "cLl" = (/obj/effect/landmark{name = "Clown Land"},/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown) "cLm" = (/obj/item/weapon/shovel,/turf/unsimulated/floor{icon_state = "asteroid"; name = "dust"},/area/planet/clown) "cLn" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s6"; icon_state = "swall_s6"; dir = 2},/area/derelict/ship) diff --git a/sound/ambience/b12_combined_start.ogg b/sound/ambience/b12_combined_start.ogg new file mode 100644 index 00000000000..d3898aa4d08 Binary files /dev/null and b/sound/ambience/b12_combined_start.ogg differ diff --git a/sound/ambience/song_game.ogg b/sound/ambience/song_game.ogg new file mode 100644 index 00000000000..16b85f662f1 Binary files /dev/null and b/sound/ambience/song_game.ogg differ