diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index 26c79849c0..a20bbb28ee 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -17,7 +17,6 @@ #define COMBOHUD_LIGHTING (1<<14) #define VERB_CONSENT (1<<15) // Skyrat - ERP Mechanic Addition #define LEWD_VERB_SOUNDS (1<<16) // Skyrat - ERP Mechanic Addition -#define SOUND_MEGAFAUNA (1<<17) // Skyrat - Megafauna boss music #define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|MEMBER_PUBLIC|INTENT_STYLE|MIDROUND_ANTAG|SOUND_INSTRUMENTS|SOUND_SHIP_AMBIENCE|SOUND_PRAYERS|SOUND_ANNOUNCEMENTS) diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 0b412b9ec4..4b54acaa83 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -422,7 +422,9 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( if(holder) add_admin_verbs() - to_chat(src, get_message_output("memo")) + var/admin_memo = get_message_output("memo") + if(admin_memo) + to_chat(src, admin_memo) adminGreet() add_verbs_from_config() @@ -466,7 +468,9 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( if(CONFIG_GET(flag/autoconvert_notes)) convert_notes_sql(ckey) - to_chat(src, get_message_output("message", ckey)) + var/player_message_output = get_message_output("message", ckey) + if(player_message_output) + to_chat(src, player_message_output) if(!winexists(src, "asset_cache_browser")) // The client is using a custom skin, tell them. to_chat(src, "Unable to access asset cache browser, if you are using a custom skin file, please allow DS to download the updated version, if you are not, then make a bug report. This is not a critical issue but can cause issues with resource downloading, as it is impossible to know when extra resources arrived to you.") diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index a340ec772f..11e570e080 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -982,9 +982,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Ghost PDA: [(chat_toggles & CHAT_GHOSTPDA) ? "All Messages" : "Nearest Creatures"]
" dat += "Window Flashing: [(windowflashing) ? "Enabled":"Disabled"]
" dat += "
" - //SKYRAT CHANGES BEGIN - dat += "Play Megafauna Music: [(toggles & SOUND_MEGAFAUNA) ? "Enabled":"Disabled"]
" - //SKYRAT CHANGES END dat += "Play Admin MIDIs: [(toggles & SOUND_MIDI) ? "Enabled":"Disabled"]
" dat += "Play Lobby Music: [(toggles & SOUND_LOBBY) ? "Enabled":"Disabled"]
" dat += "See Pull Requests: [(chat_toggles & CHAT_PULLR) ? "Enabled":"Disabled"]
" @@ -3185,11 +3182,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("hear_midis") toggles ^= SOUND_MIDI - //SKYRAT CHANGES BEGIN - Megafauna music - if("hear_megafauna") - toggles ^= SOUND_MEGAFAUNA - //SKYRAT CHANGES END - if("verb_consent") // Skyrat - ERP Mechanic Addition toggles ^= VERB_CONSENT // Skyrat - ERP Mechanic Addition diff --git a/modular_sand/code/modules/client/preferences_toggles.dm b/modular_sand/code/modules/client/preferences_toggles.dm deleted file mode 100644 index 20428017a6..0000000000 --- a/modular_sand/code/modules/client/preferences_toggles.dm +++ /dev/null @@ -1,12 +0,0 @@ -TOGGLE_CHECKBOX(/datum/verbs/menu/Settings, megafauna_music)() - set name = "Toggle Megafauna Music" - set category = "Preferences" - set desc = "Turn megafauna music on/off" - - usr.client.prefs.toggles ^= SOUND_MEGAFAUNA - usr.client.prefs.save_preferences() - to_chat(usr, "You [(usr.client.prefs.toggles & SOUND_MEGAFAUNA) ? "turn on" : "turn off"] the playback of megafauna music.") - SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Megafauna Music", "[usr.client.prefs.toggles & SOUND_MEGAFAUNA ? "Yes" : "No"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - -/datum/verbs/menu/Settings/megafauna_music/Get_checked(client/C) - return C.prefs.toggles & SOUND_MEGAFAUNA diff --git a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm index abb7de9b12..e6fcf3980c 100644 --- a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm +++ b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm @@ -1,7 +1,6 @@ /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner crusher_loot = list(/obj/item/melee/transforming/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator/premiumka/bdminer, /obj/item/borg/upgrade/modkit/lifesteal/miner, /obj/item/crusher_trophy/miner_eye) loot = list(/obj/item/melee/transforming/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator/premiumka/bdminer, /obj/item/borg/upgrade/modkit/lifesteal/miner) - songs = list("2360" = sound(file = 'modular_sand/sound/ambience/igneon-system-and-death-machine-sins.ogg', repeat = 0, wait = 0, volume = 70, channel = CHANNEL_BOSSMUSIC), "2440" = sound(file = 'modular_sand/sound/ambience/machinegirl_excruciatingdeath.ogg', repeat = 0, wait = 0, volume = 70, channel = CHANNEL_BOSSMUSIC)) // I don't actually know if any of this is copyright free or CC. Fuck. glorymessageshand = list("grabs the blood-drunk's arm, flips their cleaving saw with the other hand, and forcefully makes them chop off their own head with it!", "grabs blood-drunk by their PKA, aims it at their head and then shoots, splattering his brains out!", "rips out both of the blood-drunk's arms, then kicks their limp torso on the groundd and curbstomps their head in so hard it explodes!") glorymessagescrusher = list("chops off the blood-drunk's cleaving saw arm in one swift move, then grabs the saw and swings it against their head, chopping their skull vertically in half!", "bashes the miner to the ground with the hilt of their crusher, then elbow drops their skull so hard it explodes in gore!", "chops the blood-drunk diagonally with their crusher, not quite cutting through but getting their crusher halfway stuck and killing the moaning fiend!") glorymessagespka = list("grabs the blood-drunk by the neck and flips them, shooting through their guts with a PKA blast!", "shoots at the blood-drunk's shoulder, exploding their arm! To finish the fiend off, they grab their PKA and bonk the blood-drunk's head inside their torso!", "doesn't bother with being fancy, and simply shoots at the blood-drunk's head with their PKA, exploding it in one violent blast!") diff --git a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index dfcdffc432..5b36fe97ad 100644 --- a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -8,7 +8,6 @@ Removes slaughterlings (because they are bullshit), instead replacing them with /mob/living/simple_animal/hostile/megafauna/bubblegum death_sound = 'modular_sand/sound/misc/gorenest.ogg' //fuck it - songs = list("1860" = sound(file = 'modular_sand/sound/ambience/bfgdivision.ogg', repeat = 0, wait = 0, volume = 70, channel = CHANNEL_BOSSMUSIC), "2070" = sound(file = 'modular_sand/sound/ambience/theonlythingtheyfearisyou.ogg', repeat = 0, wait = 0, volume = 70, channel = CHANNEL_BOSSMUSIC)) //Thanks Mr. Infringio! glorymessageshand = list("grabs bubblegum by the leg, and pulls them down! While downed, they climb on their torso and punch through it, smashing their demonic heart!", "goes around bubblegum and climbs them by their back, once on top of their head they punch right through the demon's skull, ripping out brain matter and killing it as it limply falls on the ground!") glorymessagescrusher = list("jumps and chops off both of bubblegum's legs in one swift move with their crusher! To finish off the now wheelchair-bound demon, they chop at the torso vertically, getting the crusher stuck in the process but killing the demonic fiend!", "goes around bubblegum and climbs them by their back, once on the top they chop their head off with the crusher!") glorymessagespka = list("shoots the weakened demon in the chest, opening a hole and exposing their inner core! With another blast, the demon's heart explodes, and they fall dead and limp on the ground!", "shoots the weakened demon's head, stunning them and revealing their brain! Another PKA blast finishes off what little brainmatter they had!") diff --git a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index fabd0e5c3d..090e2cf2e7 100644 --- a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -1,5 +1,4 @@ /mob/living/simple_animal/hostile/megafauna/colossus - songs = list("1170" = sound(file = 'modular_sand/sound/ambience/theopenedway.ogg', repeat = 0, wait = 0, volume = 70, channel = CHANNEL_BOSSMUSIC)) //Shadow of the colossus OST glorymessageshand = list("grabs the colossus by the leg, and pulls them down! While downed, they climb on his neck and violently rip off their vocal cords!", "goes around the colossus and climbs them by their back, once on top of their shoulder they grab it's arm and aim the blaster at the creature's head, which finishes itself off with a penetrating death bolt that blasts off their head!") glorymessagescrusher = list("throws their crusher at the colossus' head, which surprisingly works! Humiliated, the angelic creature dies with a big fucking axe stuck on their skull!", "chops off one of the colossus' legs with the crusher, as it falls down they grab the leg and use it as a makeshift club on the creature's head, which explodes in differently-sized giblets on impact!") glorymessagespka = list("somehow parries a death bolt with a PKA blast, which goes right back to it's owner's torso, opening a hole on them and killing them!") diff --git a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm index b47eb722ac..1b23f6abe4 100644 --- a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm +++ b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm @@ -1,5 +1,4 @@ /mob/living/simple_animal/hostile/megafauna/demonic_frost_miner - songs = list("1530" = sound(file = 'modular_sand/sound/ambience/lisapebbleman.ogg', repeat = 0, wait = 0, volume = 70, channel = CHANNEL_BOSSMUSIC)) // Doubt the creator would care lol deathsound = "bodyfall" glorymessageshand = list("grabs the demonic miner's arm, flips their cleaving saw with the other hand, and forcefully makes them chop off their own head with it!", "grabs demonic miner by their PKA, aims it at their head and then shoots, splattering his brains out!", "rips out both of the demonic miner's arms, then kicks their limp torso on the groundd and curbstomps their head in so hard it explodes!") glorymessagescrusher = list("chops off the demonic miner's cleaving saw arm in one swift move, then grabs the saw and swings it against their head, chopping their skull vertically in half!", "bashes the miner to the ground with the hilt of their crusher, then elbow drops their skull so hard it explodes in gore!", "chops the demonic miner diagonally with their crusher, not quite cutting through but getting their crusher halfway stuck and killing the moaning fiend!") diff --git a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm index 268a996bb1..426697085c 100644 --- a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm +++ b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm @@ -1,5 +1,4 @@ /mob/living/simple_animal/hostile/megafauna/dragon - songs = list("1860" = sound(file = 'modular_sand/sound/ambience/duskcreations.ogg', repeat = 0, wait = 0, volume = 70, channel = CHANNEL_BOSSMUSIC), "2350" = sound(file = 'modular_sand/sound/ambience/dragonborn.ogg', repeat = 0, wait = 0, volume = 70, channel = CHANNEL_BOSSMUSIC)) // Andrew is a nice guy, he'll let it slide. Taken from the DUSK OST. Not sure about the skyrim theme though... glorymessageshand = list("climbs atop the drake's head as it dangles weakly near the ground, ripping its left horn off and jumping down before swinging it at the drake's face full force, cracking its maw!", "goes around the dragon and rips off their tail, using it's spiked end to beat the dragon's bloodied face until it cracks open and it dies!") glorymessagescrusher = list("chops off the dragon's head by the neck, and it falls down with a strong thud!", "rams into the dragon's skull with the hilt of their crusher repeatedly and cracking holes into their skull each time, turning it's brain into mush!") glorymessagespka = list("shoots at the dragon's wings with their PKA, exploding them into bizarre giblets! They then finish the poor creature off with a point-blank blast to the head, exploding it!") diff --git a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/gladiator.dm b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/gladiator.dm index cae8f07e81..7ac60c6691 100644 --- a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/gladiator.dm +++ b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/gladiator.dm @@ -49,7 +49,6 @@ They deal 35 brute (armor is considered). var/stunned = FALSE var/stunduration = 15 var/move_to_charge = 1.5 - songs = list("3850" = sound(file = 'modular_sand/sound/ambience/gladiator.ogg', repeat = 0, wait = 0, volume = 70, channel = CHANNEL_BOSSMUSIC)) loot = list(/obj/structure/closet/crate/necropolis/gladiator) crusher_loot = list(/obj/structure/closet/crate/necropolis/gladiator/crusher) glorymessageshand = list("grabs the gladiator's arm, flips their zweihander with the other hand, and forcefully makes them chop off their own head with it!", "grabs the gladiator by their zweihander, and mark detonate them into a shower of gibs!", "rips out both of the gladiator's arms, then kicks their limp torso on the groundd and curbstomps their head in so hard it explodes!") diff --git a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/glaurung.dm b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/glaurung.dm index 5a7ef8a404..1c00b67a25 100644 --- a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/glaurung.dm +++ b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/glaurung.dm @@ -54,7 +54,6 @@ Difficulty: Medium guaranteed_butcher_results = list(/obj/item/stack/sheet/animalhide/ashdrake = 10) deathmessage = "collapses into a pile of bones, its flesh sloughing away." death_sound = 'sound/magic/demon_dies.ogg' - songs = null move_force = MOVE_FORCE_NORMAL move_resist = MOVE_FORCE_NORMAL pull_force = MOVE_FORCE_NORMAL diff --git a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm index b214f1b07d..2327e24daf 100644 --- a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -1,7 +1,6 @@ /mob/living/simple_animal/hostile/megafauna/hierophant loot = list(/obj/item/hierophant_club, /obj/item/borg/upgrade/modkit/wall) crusher_loot = list(/obj/item/hierophant_club, /obj/item/borg/upgrade/modkit/wall) - songs = list("2610" = sound(file = 'modular_sand/sound/ambience/dummyremix.ogg', repeat = 0, wait = 0, volume = 70, channel = CHANNEL_BOSSMUSIC), "1680" = sound(file = 'modular_sand/sound/ambience/rollermobster.ogg', repeat = 0, wait = 0, volume = 70, channel = CHANNEL_BOSSMUSIC)) //Dummy originally made by Toby Fox, remix by Emsdache. Roller Mobster by Carpenter Brut. glorymessageshand = list("grabs the floating club by the hilt, and violently smashes it onto the ground, killing it!", "jumps onto the hierophant and rips off their beacon with one hand as it crackles and explodes!") glorymessagescrusher = list("violently chops the floating club with seemingly no effect, until it falls onto the ground limply!") glorymessagespka = list("shoots at the floating club in the middle of it's 'face', which seemingly overloads it until it explodes!") diff --git a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/king_of_goats.dm b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/king_of_goats.dm index 7e59015c49..cfae2520b3 100644 --- a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/king_of_goats.dm +++ b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/king_of_goats.dm @@ -96,8 +96,6 @@ Difficulty: Insanely Hard var/sound_id = "goat" var/special_attacks = 0 var/list/rangers = list() - var/current_song = 'modular_sand/sound/ambience/Visager-Battle.ogg' - var/current_song_length = 1200 stun_chance = 7 /mob/living/simple_animal/hostile/megafauna/king/phase2/Initialize() @@ -225,15 +223,6 @@ Difficulty: Insanely Hard spellscast = 0 maxHealth = 750 revive(TRUE) - current_song = 'modular_sand/sound/ambience/Visager-Miniboss_Fight.ogg' - current_song_length = 1759 - var/sound/song_played = sound(current_song) - for(var/mob/M in rangers) - if(!M.client || !(M.client.prefs.toggles & SOUND_MEGAFAUNA)) - continue - M.stop_sound_channel(CHANNEL_BOSSMUSIC) - rangers[M] = world.time + current_song_length - M.playsound_local(null, null, 30, channel = CHANNEL_BOSSMUSIC, S = song_played) stun_chance = 10 update_icon() visible_message("\The [src]' wounds close with a flash, and when he emerges, he's even larger than before!") @@ -252,28 +241,6 @@ Difficulty: Insanely Hard /mob/living/simple_animal/hostile/megafauna/king/phase2/Life() . = ..() - if(stat != DEAD) - var/sound/song_played = sound(current_song) - - for(var/mob/M in range(10, src)) - if(!M.client || !(M.client.prefs.toggles & SOUND_MEGAFAUNA)) - continue - if(!(M in rangers) || world.time > rangers[M]) - M.stop_sound_channel(CHANNEL_BOSSMUSIC) - rangers[M] = world.time + current_song_length - M.playsound_local(null, null, 30, channel = CHANNEL_BOSSMUSIC, S = song_played) - for(var/mob/L in rangers) - if(get_dist(src, L) > 10) - rangers -= L - if(!L || !L.client) - continue - L.stop_sound_channel(CHANNEL_BOSSMUSIC) - else - for(var/mob/L in rangers) - rangers -= L - if(!L || !L.client) - continue - L.stop_sound_channel(CHANNEL_BOSSMUSIC) if(move_to_delay < 3) move_to_delay += 0.2 if(!phase3 && ((health <= 150 && spellscast == 5) || stat == DEAD)) //begin phase 3, reset spell limit and heal diff --git a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm index d84ede4418..f671e2f9eb 100644 --- a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -1,6 +1,5 @@ /mob/living/simple_animal/hostile/megafauna/legion loot = list(/obj/item/stack/sheet/bone = 3) - songs = list("3550" = sound(file = 'modular_sand/sound/ambience/mastermind.ogg', repeat = 0, wait = 0, volume = 70, channel = CHANNEL_BOSSMUSIC), "1360" = sound(file = 'modular_sand/sound/ambience/terrariaboss1.ogg', repeat = 0, wait = 0, volume = 70, channel = CHANNEL_BOSSMUSIC), "1560" = sound('modular_sand/sound/ambience/megalovania.ogg', repeat = 0, wait = 0, volume = 70, channel = CHANNEL_BOSSMUSIC)) //Threading on some lines here with the DOOM 16 OST. But terraria should be fine, megalovania too. glorymessageshand = list("punches into the Legion's maw and rips off a floating skull, which they then proceed to use to bash the Legion until it dies!", "punches through both of the Legion's eyeholes with both hands, ripping out a bunch of tiny skulls and killing it!") glorymessagescrusher = list("slashes the Legion's maw, which falls on the ground as it dies!") glorymessagespka = list("parries a floating legion skulls with a pka shoot, which goes flying violently into the Legion, bursting through them and killing them in the process!") diff --git a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm index e8da379a53..490cd2f5d4 100644 --- a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm +++ b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm @@ -6,11 +6,6 @@ var/list/glorymessagespkabayonet = list() //SAME AS ABOVE BUT WITH A HONKING KNIFE ON THE FUCKING THING var/gloryhealth = 200 var/glorythreshold = 100 - var/list/songs = list() - var/sound/chosensong - var/chosenlength - var/chosenlengthstring - var/songend var/retaliated = FALSE var/retaliatedcooldowntime = 6000 var/retaliatedcooldown @@ -52,14 +47,6 @@ var/mob/living/M = A if((faction_check_mob(M) && attack_same) || (!faction_check_mob(M)) || (!ismegafauna(M))) enemies |= M - chosenlengthstring = pick(songs) - chosenlength = text2num(chosenlengthstring) - chosensong = songs[chosenlengthstring] - if(chosensong && !songend) - if(M?.client?.prefs?.toggles & SOUND_MEGAFAUNA) - M.stop_sound_channel(CHANNEL_BOSSMUSIC) - songend = chosenlength + world.time - SEND_SOUND(M, chosensong) // so silence boss music will mute moosic for people who don't want that, or it just doesn't play at all if prefs disable it if(!retaliated) src.visible_message("[src] seems pretty pissed off at [M]!") retaliated = TRUE @@ -69,11 +56,6 @@ if(M.occupant && M.occupant.client) enemies |= M enemies |= M.occupant - var/mob/living/O = M.occupant - if(O?.client?.prefs?.toggles & SOUND_MEGAFAUNA) - O.stop_sound_channel(CHANNEL_BOSSMUSIC) - songend = chosenlength + world.time - SEND_SOUND(O, chosensong) if(!retaliated) src.visible_message("[src] seems pretty pissed off at [M]!") retaliated = TRUE @@ -91,14 +73,6 @@ /mob/living/simple_animal/hostile/megafauna/Life() ..() - if(songend) - if(world.time >= songend) - for(var/mob/living/M in view(src, vision_range)) - if(client) - if(M?.client?.prefs?.toggles & SOUND_MEGAFAUNA) - M.stop_sound_channel(CHANNEL_BOSSMUSIC) - songend = chosenlength + world.time - SEND_SOUND(M, chosensong) if(health <= glorythreshold && !glorykill && stat != DEAD) glorykill = TRUE glory() @@ -114,9 +88,6 @@ if(health > 0) return else - for(var/mob/living/M in view(src, vision_range)) - if(M?.client?.prefs?.toggles & SOUND_MEGAFAUNA) - M.stop_sound_channel(CHANNEL_BOSSMUSIC) animate(src, color = initial(color), time = 3) desc = initial(desc) var/datum/status_effect/crusher_damage/crusher_dmg = has_status_effect(STATUS_EFFECT_CRUSHERDAMAGETRACKING) @@ -174,7 +145,5 @@ "You feast on [L], restoring your health!") if(!is_station_level(z) || client) //NPC monsters won't heal while on station adjustBruteLoss(-L.maxHealth/2) - if(L?.client?.prefs?.toggles & SOUND_MEGAFAUNA) - L.stop_sound_channel(CHANNEL_BOSSMUSIC) L.gib() ..() diff --git a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/rogueprocess.dm b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/rogueprocess.dm index a7acb1803e..6c9f86ce9b 100644 --- a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/rogueprocess.dm +++ b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/rogueprocess.dm @@ -29,7 +29,6 @@ anger_modifier = 0 footstep_type = FOOTSTEP_MOB_HEAVY mob_biotypes = MOB_ROBOTIC - songs = list("2930" = sound(file = 'modular_sand/sound/ambience/mbrsystemshock.ogg', repeat = 0, wait = 0, volume = 70, channel = CHANNEL_BOSSMUSIC)) //System shock theme remix by Master Boot Record var/special = FALSE wander = FALSE faction = list("mining", "boss") diff --git a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/sif.dm b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/sif.dm index 2737f21c07..a46ac1edf1 100644 --- a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/sif.dm +++ b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/sif.dm @@ -85,7 +85,6 @@ Difficulty: Medium var/stageThree = FALSE var/currentPower = 0 //Every few seconds this variable gets higher, when it gets high //enough it will use a special attack then reset the variable to 0w - songs = list("2670" = sound(file = 'modular_sand/sound/ambience/furidanger802.ogg', repeat = 0, wait = 0, volume = 100, channel = CHANNEL_BOSSMUSIC)) glorymessageshand = list("climbs atop the wolf's head as it dangles weakly near the ground, ripping its left eye off and jumping down before punching through it's cranium!", "goes around the wolf and rips off their tail, using it as whip on the fiend") glorymessagescrusher = list("chops off the wolf's head by it's neck!") glorymessagespka = list("shoots at the wolf's eyes with their PKA, exploding them into giblets!") diff --git a/modular_sand/sound/ambience/Visager-Battle.ogg b/modular_sand/sound/ambience/Visager-Battle.ogg deleted file mode 100644 index addce3c309..0000000000 Binary files a/modular_sand/sound/ambience/Visager-Battle.ogg and /dev/null differ diff --git a/modular_sand/sound/ambience/Visager-Miniboss_Fight.ogg b/modular_sand/sound/ambience/Visager-Miniboss_Fight.ogg deleted file mode 100644 index c2eeca0a11..0000000000 Binary files a/modular_sand/sound/ambience/Visager-Miniboss_Fight.ogg and /dev/null differ diff --git a/modular_sand/sound/ambience/bfgdivision.ogg b/modular_sand/sound/ambience/bfgdivision.ogg deleted file mode 100644 index 88dc8e604e..0000000000 Binary files a/modular_sand/sound/ambience/bfgdivision.ogg and /dev/null differ diff --git a/modular_sand/sound/ambience/dragonborn.ogg b/modular_sand/sound/ambience/dragonborn.ogg deleted file mode 100644 index f9bf25aa67..0000000000 Binary files a/modular_sand/sound/ambience/dragonborn.ogg and /dev/null differ diff --git a/modular_sand/sound/ambience/dummyremix.ogg b/modular_sand/sound/ambience/dummyremix.ogg deleted file mode 100644 index ee39b39126..0000000000 Binary files a/modular_sand/sound/ambience/dummyremix.ogg and /dev/null differ diff --git a/modular_sand/sound/ambience/duskcreations.ogg b/modular_sand/sound/ambience/duskcreations.ogg deleted file mode 100644 index fc0b6a9d6f..0000000000 Binary files a/modular_sand/sound/ambience/duskcreations.ogg and /dev/null differ diff --git a/modular_sand/sound/ambience/furidanger802.ogg b/modular_sand/sound/ambience/furidanger802.ogg deleted file mode 100644 index 14e6f3b639..0000000000 Binary files a/modular_sand/sound/ambience/furidanger802.ogg and /dev/null differ diff --git a/modular_sand/sound/ambience/gladiator.ogg b/modular_sand/sound/ambience/gladiator.ogg deleted file mode 100644 index 7d15031ecb..0000000000 Binary files a/modular_sand/sound/ambience/gladiator.ogg and /dev/null differ diff --git a/modular_sand/sound/ambience/igneon-system-and-death-machine-sins.ogg b/modular_sand/sound/ambience/igneon-system-and-death-machine-sins.ogg deleted file mode 100644 index acd290aea9..0000000000 Binary files a/modular_sand/sound/ambience/igneon-system-and-death-machine-sins.ogg and /dev/null differ diff --git a/modular_sand/sound/ambience/lisapebbleman.ogg b/modular_sand/sound/ambience/lisapebbleman.ogg deleted file mode 100644 index ba5057ad3a..0000000000 Binary files a/modular_sand/sound/ambience/lisapebbleman.ogg and /dev/null differ diff --git a/modular_sand/sound/ambience/machinegirl_excruciatingdeath.ogg b/modular_sand/sound/ambience/machinegirl_excruciatingdeath.ogg deleted file mode 100644 index 1d6c7017c3..0000000000 Binary files a/modular_sand/sound/ambience/machinegirl_excruciatingdeath.ogg and /dev/null differ diff --git a/modular_sand/sound/ambience/mastermind.ogg b/modular_sand/sound/ambience/mastermind.ogg deleted file mode 100644 index cc732f9bc1..0000000000 Binary files a/modular_sand/sound/ambience/mastermind.ogg and /dev/null differ diff --git a/modular_sand/sound/ambience/mbrsystemshock.ogg b/modular_sand/sound/ambience/mbrsystemshock.ogg deleted file mode 100644 index d6923097f4..0000000000 Binary files a/modular_sand/sound/ambience/mbrsystemshock.ogg and /dev/null differ diff --git a/modular_sand/sound/ambience/megalovania.ogg b/modular_sand/sound/ambience/megalovania.ogg deleted file mode 100644 index 56f49c8b3e..0000000000 Binary files a/modular_sand/sound/ambience/megalovania.ogg and /dev/null differ diff --git a/modular_sand/sound/ambience/oblivion.ogg b/modular_sand/sound/ambience/oblivion.ogg deleted file mode 100644 index 51862fb677..0000000000 Binary files a/modular_sand/sound/ambience/oblivion.ogg and /dev/null differ diff --git a/modular_sand/sound/ambience/rollermobster.ogg b/modular_sand/sound/ambience/rollermobster.ogg deleted file mode 100644 index 3096d1adb6..0000000000 Binary files a/modular_sand/sound/ambience/rollermobster.ogg and /dev/null differ diff --git a/modular_sand/sound/ambience/terrariaboss1.ogg b/modular_sand/sound/ambience/terrariaboss1.ogg deleted file mode 100644 index 8970afa844..0000000000 Binary files a/modular_sand/sound/ambience/terrariaboss1.ogg and /dev/null differ diff --git a/modular_sand/sound/ambience/theonlythingtheyfearisyou.ogg b/modular_sand/sound/ambience/theonlythingtheyfearisyou.ogg deleted file mode 100644 index 3cf3674388..0000000000 Binary files a/modular_sand/sound/ambience/theonlythingtheyfearisyou.ogg and /dev/null differ diff --git a/modular_sand/sound/ambience/theopenedway.ogg b/modular_sand/sound/ambience/theopenedway.ogg deleted file mode 100644 index ada6688947..0000000000 Binary files a/modular_sand/sound/ambience/theopenedway.ogg and /dev/null differ