diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 113f50c15f9..8721249bb52 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -306,7 +306,6 @@ if (A && A:client && !A:client:ambience_playing && !A:client:no_ambi) // Ambience goes down here -- make sure to list each area seperately for ease of adding things in later, thanks! Note: areas adjacent to each other should have the same sounds to prevent cutoff when possible.- LastyScratch A:client:ambience_playing = 1 - A:client:no_ambi = 0 A << sound('shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = 2) switch(src.name) @@ -315,9 +314,8 @@ if ("Space") sound = pick('ambispace.ogg','title2.ogg',) if ("Engine Control", "Engineering", "Engineering SMES") sound = pick('ambisin1.ogg','ambisin2.ogg','ambisin3.ogg','ambisin4.ogg') if ("AI Satellite Teleporter Room") sound = pick('ambimalf.ogg') - if ("Bar") sound = pick('null.ogg') - if ("AI Upload Foyer") sound = pick('ambimalf.ogg', 'null.ogg') - if ("AI Upload Chamber") sound = pick('ambimalf.ogg','null.ogg') + if ("AI Upload Foyer") sound = pick('ambimalf.ogg') + if ("AI Upload Chamber") sound = pick('ambimalf.ogg') if ("Mine") sound = pick('ambimine.ogg') musVolume = 25 diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index 63e83c5d219..b63b1b10ad0 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -154,6 +154,7 @@ ticker.mode:malf_mode_declared = 1 for(var/datum/mind/AI_mind in ticker.mode:malf_ai) AI_mind.current.verbs -= /datum/game_mode/malfunction/proc/takeover + world << sound('aimalf.ogg') /datum/game_mode/malfunction/proc/ai_win() diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 217cd1cfc61..b5b667bfca3 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1046,7 +1046,10 @@ About the new airlock wires panel: if(src.welded || src.locked || (!src.arePowerSystemsOn()) || (stat & NOPOWER) || src.isWireCut(AIRLOCK_WIRE_OPEN_DOOR)) return 0 use_power(50) - playsound(src.loc, 'airlock.ogg', 30, 1) + if(istype(src, /obj/machinery/door/airlock/glass)) + playsound(src.loc, 'windowdoor.ogg', 30, 1) + else + playsound(src.loc, 'airlock.ogg', 30, 1) if(src.closeOther != null && istype(src.closeOther, /obj/machinery/door/airlock/) && !src.closeOther.density) src.closeOther.close() return ..() diff --git a/code/game/sound.dm b/code/game/sound.dm index 4bc0f74b6ed..ce16ee5b67f 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -65,14 +65,14 @@ src << S -client/verb/Toggle_Soundscape() +client/verb/Toggle_Soundscape() //All new ambience should be added here so it works with this verb until someone better at things comes up with a fix that isn't awful set category = "Special Verbs" set name = "Toggle Ambience" usr:client:no_ambi = !usr:client:no_ambi if(usr:client:no_ambi) - usr << sound('shipambience.ogg', repeat = 0, wait = 0, volume = 0, channel = 2) + usr << sound('shipambience.ogg','ambigen1.ogg','ambigen3.ogg','ambigen4.ogg','ambigen5.ogg','ambigen6.ogg','ambigen7.ogg','ambigen8.ogg','ambigen9.ogg','ambigen10.ogg','ambigen11.ogg','ambigen12.ogg','ambigen14.ogg','ambicha1.ogg','ambicha2.ogg','ambicha3.ogg','ambicha4.ogg','ambimalf.ogg','ambispace.ogg','ambimine.ogg','title2.ogg', repeat = 0, wait = 0, volume = 0, channel = 2) else - usr << sound('shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = 2) + usr << sound('shipambience.ogg','ambigen1.ogg','ambigen3.ogg','ambigen4.ogg','ambigen5.ogg','ambigen6.ogg','ambigen7.ogg','ambigen8.ogg','ambigen9.ogg','ambigen10.ogg','ambigen11.ogg','ambigen12.ogg','ambigen14.ogg','ambicha1.ogg','ambicha2.ogg','ambicha3.ogg','ambicha4.ogg','ambimalf.ogg','ambispace.ogg','ambimine.ogg','title2.ogg', repeat = 1, wait = 0, volume = 35, channel = 2) usr << "Toggled ambience sound." return diff --git a/code/modules/mob/simple_animal/cat.dm b/code/modules/mob/simple_animal/cat.dm index bf15a6b6fc5..d962fab1e20 100644 --- a/code/modules/mob/simple_animal/cat.dm +++ b/code/modules/mob/simple_animal/cat.dm @@ -3,9 +3,9 @@ name = "cat" desc = "Kitty!!" icon = 'mob.dmi' - icon_state = "tempcat" - icon_living = "tempcat" - icon_dead = "catdeath" + icon_state = "cat" + icon_living = "cat" + icon_dead = "cat_dead" speak = list("Meow!","Esp!","Purr!","HSSSSS") speak_emote = list("purrs", "meows") emote_hear = list("meows","mews") @@ -17,7 +17,7 @@ response_disarm = "gently pushes aside the" response_harm = "kicks the" -//RUNTIME! SQUEEEEEEEE~ +//RUNTIME IS ALIVE! SQUEEEEEEEE~ /mob/living/simple_animal/cat/Runtime name = "Runtime" desc = "" diff --git a/html/changelog.html b/html/changelog.html index eaadb1e525d..0ff9d4a9d47 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -99,6 +99,13 @@ should be listed in the changelog upon commit tho. Thanks. -->
  • MMIs/pAIs no longer lip read, and thus can now hear in the dark.
  • Borg rechargers are no longer Faraday cages, and thus can now receive radio while they're recharging.
    • +

    LastyScratch updated:

    + diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi index a41fbadf748..ec724c5e584 100644 Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index 60b7d584764..498f5f4783c 100644 --- a/maps/tgstation.2.0.8.dmm +++ b/maps/tgstation.2.0.8.dmm @@ -3064,7 +3064,7 @@ "bgV" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/condiment/peppermill,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "bgW" = (/obj/structure/closet/extinguisher{pixel_x = 27; pixel_y = 0},/obj/machinery/camera{c_tag = "Bar East"; dir = 8; network = "SS13"},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "bgX" = (/obj/structure/table,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = -32; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) -"bgY" = (/obj/item/weapon/reagent_containers/food/drinks/britcup{desc = "Kingston's personal cup."},/obj/structure/table,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) +"bgY" = (/obj/item/weapon/reagent_containers/food/drinks/britcup{desc = "Kingston's personal cup."},/obj/structure/table,/mob/living/simple_animal/cat/Runtime,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bgZ" = (/obj/item/weapon/pen,/obj/structure/table,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bha" = (/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/structure/table,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bhb" = (/obj/item/device/radio/intercom{broadcasting = 1; freerange = 0; frequency = 1485; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 30},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) @@ -4282,7 +4282,7 @@ "bEr" = (/turf/simulated/floor/plating,/area/toxins/mixing) "bEs" = (/obj/machinery/door/poddoor{id = "toxinsdriver"; name = "Toxins Launcher Bay Door"},/turf/simulated/floor/plating,/area/toxins/mixing) "bEt" = (/obj/machinery/door/poddoor{id = "toxinsdriver"; name = "Toxins Launcher Bay Door"},/turf/space,/area/toxins/test_area) -"bEu" = (/obj/item/device/radio/beacon,/turf/simulated/floor/airless{icon_state = "bot"},/area/toxins/test_area) +"bEu" = (/obj/item/device/radio/beacon,/mob/living/simple_animal/crab/Coffee,/turf/simulated/floor/airless{icon_state = "bot"},/area/toxins/test_area) "bEv" = (/obj/machinery/camera{c_tag = "Test Area East"; dir = 8; network = "Toxins"},/obj/machinery/camera{c_tag = "Explosives Testing Area"; dir = 8; network = "RD"; pixel_x = 0; pixel_y = -22},/obj/machinery/light/spot{dir = 4; layer = 2.8},/turf/simulated/floor/airless,/area/toxins/test_area) "bEw" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s5"; icon_state = "swall_s5"; dir = 2},/area/shuttle/mining/station) "bEx" = (/obj/structure/shuttle/engine/propulsion/burst,/turf/space,/area/shuttle/mining/station) diff --git a/sound/announcer/aliens.ogg b/sound/announcer/aliens.ogg deleted file mode 100644 index f7d1746247f..00000000000 Binary files a/sound/announcer/aliens.ogg and /dev/null differ diff --git a/sound/announcer/animes.ogg b/sound/announcer/animes.ogg deleted file mode 100644 index a46a207edc4..00000000000 Binary files a/sound/announcer/animes.ogg and /dev/null differ diff --git a/sound/announcer/commandreport.ogg b/sound/announcer/commandreport.ogg deleted file mode 100644 index 82e4ca425de..00000000000 Binary files a/sound/announcer/commandreport.ogg and /dev/null differ diff --git a/sound/announcer/granomalies.ogg b/sound/announcer/granomalies.ogg deleted file mode 100644 index 89b368d596a..00000000000 Binary files a/sound/announcer/granomalies.ogg and /dev/null differ diff --git a/sound/announcer/intercept.ogg b/sound/announcer/intercept.ogg deleted file mode 100644 index 040b4e4f8db..00000000000 Binary files a/sound/announcer/intercept.ogg and /dev/null differ diff --git a/sound/announcer/ionstorm.ogg b/sound/announcer/ionstorm.ogg deleted file mode 100644 index 9f39713de6e..00000000000 Binary files a/sound/announcer/ionstorm.ogg and /dev/null differ diff --git a/sound/announcer/meteors.ogg b/sound/announcer/meteors.ogg deleted file mode 100644 index 8f1c3aeacbb..00000000000 Binary files a/sound/announcer/meteors.ogg and /dev/null differ diff --git a/sound/announcer/newAI.ogg b/sound/announcer/newAI.ogg deleted file mode 100644 index 35aba34564f..00000000000 Binary files a/sound/announcer/newAI.ogg and /dev/null differ diff --git a/sound/announcer/newroundsexy.ogg b/sound/announcer/newroundsexy.ogg deleted file mode 100644 index afe5630f04d..00000000000 Binary files a/sound/announcer/newroundsexy.ogg and /dev/null differ diff --git a/sound/announcer/newroundsexy2.ogg b/sound/announcer/newroundsexy2.ogg deleted file mode 100644 index 531bba10014..00000000000 Binary files a/sound/announcer/newroundsexy2.ogg and /dev/null differ diff --git a/sound/announcer/outbreak5.ogg b/sound/announcer/outbreak5.ogg deleted file mode 100644 index 39c79c920fd..00000000000 Binary files a/sound/announcer/outbreak5.ogg and /dev/null differ diff --git a/sound/announcer/outbreak7.ogg b/sound/announcer/outbreak7.ogg deleted file mode 100644 index f21d4fca443..00000000000 Binary files a/sound/announcer/outbreak7.ogg and /dev/null differ diff --git a/sound/announcer/poweroff.ogg b/sound/announcer/poweroff.ogg deleted file mode 100644 index 1c6377c9d8d..00000000000 Binary files a/sound/announcer/poweroff.ogg and /dev/null differ diff --git a/sound/announcer/poweron.ogg b/sound/announcer/poweron.ogg deleted file mode 100644 index 9d18797d6ea..00000000000 Binary files a/sound/announcer/poweron.ogg and /dev/null differ diff --git a/sound/announcer/radiation.ogg b/sound/announcer/radiation.ogg deleted file mode 100644 index ef395af3101..00000000000 Binary files a/sound/announcer/radiation.ogg and /dev/null differ diff --git a/sound/announcer/shuttlecalled.ogg b/sound/announcer/shuttlecalled.ogg deleted file mode 100644 index 716bf824654..00000000000 Binary files a/sound/announcer/shuttlecalled.ogg and /dev/null differ diff --git a/sound/announcer/shuttledock.ogg b/sound/announcer/shuttledock.ogg deleted file mode 100644 index 0f70bebc751..00000000000 Binary files a/sound/announcer/shuttledock.ogg and /dev/null differ diff --git a/sound/announcer/shuttlerecalled.ogg b/sound/announcer/shuttlerecalled.ogg deleted file mode 100644 index 5f6db404b87..00000000000 Binary files a/sound/announcer/shuttlerecalled.ogg and /dev/null differ diff --git a/sound/announcer/spanomalies.ogg b/sound/announcer/spanomalies.ogg deleted file mode 100644 index 7680726f153..00000000000 Binary files a/sound/announcer/spanomalies.ogg and /dev/null differ diff --git a/sound/announcer/welcome.ogg b/sound/announcer/welcome.ogg deleted file mode 100644 index c7013dcbd5f..00000000000 Binary files a/sound/announcer/welcome.ogg and /dev/null differ diff --git a/sound/misc/clownstep1.ogg b/sound/effects/clownstep1.ogg similarity index 100% rename from sound/misc/clownstep1.ogg rename to sound/effects/clownstep1.ogg diff --git a/sound/misc/clownstep2.ogg b/sound/effects/clownstep2.ogg similarity index 100% rename from sound/misc/clownstep2.ogg rename to sound/effects/clownstep2.ogg diff --git a/sound/misc/glass_step.ogg b/sound/effects/glass_step.ogg similarity index 100% rename from sound/misc/glass_step.ogg rename to sound/effects/glass_step.ogg diff --git a/sound/misc/meteorimpact.ogg b/sound/effects/meteorimpact.ogg similarity index 100% rename from sound/misc/meteorimpact.ogg rename to sound/effects/meteorimpact.ogg diff --git a/sound/misc/rustle1.ogg b/sound/effects/rustle1.ogg similarity index 100% rename from sound/misc/rustle1.ogg rename to sound/effects/rustle1.ogg diff --git a/sound/misc/rustle2.ogg b/sound/effects/rustle2.ogg similarity index 100% rename from sound/misc/rustle2.ogg rename to sound/effects/rustle2.ogg diff --git a/sound/misc/rustle3.ogg b/sound/effects/rustle3.ogg similarity index 100% rename from sound/misc/rustle3.ogg rename to sound/effects/rustle3.ogg diff --git a/sound/misc/rustle4.ogg b/sound/effects/rustle4.ogg similarity index 100% rename from sound/misc/rustle4.ogg rename to sound/effects/rustle4.ogg diff --git a/sound/misc/rustle5.ogg b/sound/effects/rustle5.ogg similarity index 100% rename from sound/misc/rustle5.ogg rename to sound/effects/rustle5.ogg diff --git a/sound/items/bubblewrap.ogg b/sound/items/bubblewrap.ogg new file mode 100644 index 00000000000..5ea4726ecc4 Binary files /dev/null and b/sound/items/bubblewrap.ogg differ diff --git a/sound/effects/syringeproj.ogg b/sound/items/syringeproj.ogg similarity index 100% rename from sound/effects/syringeproj.ogg rename to sound/items/syringeproj.ogg diff --git a/sound/misc/lockenable.ogg b/sound/machines/lockenable.ogg similarity index 100% rename from sound/misc/lockenable.ogg rename to sound/machines/lockenable.ogg diff --git a/sound/misc/lockreset.ogg b/sound/machines/lockreset.ogg similarity index 100% rename from sound/misc/lockreset.ogg rename to sound/machines/lockreset.ogg diff --git a/sound/bots/EDPlaceholder.ogg b/sound/voice/EDPlaceholder.ogg similarity index 100% rename from sound/bots/EDPlaceholder.ogg rename to sound/voice/EDPlaceholder.ogg diff --git a/sound/bots/ed209_20sec.ogg b/sound/voice/ed209_20sec.ogg similarity index 100% rename from sound/bots/ed209_20sec.ogg rename to sound/voice/ed209_20sec.ogg diff --git a/sound/misc/liveagain.ogg b/sound/voice/liveagain.ogg similarity index 100% rename from sound/misc/liveagain.ogg rename to sound/voice/liveagain.ogg diff --git a/tgstation.dme b/tgstation.dme index fa423606f6d..9eed26c0120 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -163,11 +163,9 @@ #define FILE_DIR "icons/vending_icons" #define FILE_DIR "interface" #define FILE_DIR "maps" -#define FILE_DIR "maps/backup" #define FILE_DIR "sound" +#define FILE_DIR "sound/AI" #define FILE_DIR "sound/ambience" -#define FILE_DIR "sound/announcer" -#define FILE_DIR "sound/bots" #define FILE_DIR "sound/effects" #define FILE_DIR "sound/items" #define FILE_DIR "sound/machines"