From 2f92e8e4caa36a01681f73fdbcc07c4db30c22fc Mon Sep 17 00:00:00 2001 From: SandPoot Date: Thu, 8 Sep 2022 02:31:20 -0300 Subject: [PATCH] removes defunct code --- code/__DEFINES/sound.dm | 5 +---- .../hostile/megafauna/king_of_goats.dm | 13 ------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm index aa3d4708c3..33a3aa65c4 100644 --- a/code/__DEFINES/sound.dm +++ b/code/__DEFINES/sound.dm @@ -16,9 +16,6 @@ #define CHANNEL_DIGEST 1009 #define CHANNEL_PREYLOOP 1008 -//MODULAR_SAND CHANNELS - SEND HELP -#define CHANNEL_BOSSMUSIC 1007 - ///Default range of a sound. #define SOUND_RANGE 17 ///default extra range for sounds considered to be quieter @@ -37,7 +34,7 @@ //THIS SHOULD ALWAYS BE THE LOWEST ONE! //KEEP IT UPDATED -#define CHANNEL_HIGHEST_AVAILABLE 1007 //CIT CHANGE - COMPENSATES FOR VORESOUND CHANNELS(oopsie, modular_sand mod) +#define CHANNEL_HIGHEST_AVAILABLE 1008 //CIT CHANGE - COMPENSATES FOR VORESOUND CHANNELS #define MAX_INSTRUMENT_CHANNELS (128 * 6) 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 db23f47ea2..f3980bc9fd 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 @@ -260,11 +260,6 @@ Difficulty: Insanely Hard qdel(src) /mob/living/simple_animal/hostile/megafauna/king/phase2/OnDeath() - for(var/mob/L in rangers) - rangers -= L - if(!L || !L.client) - continue - L.stop_sound_channel(CHANNEL_BOSSMUSIC) if(phase3) visible_message("\The [src] shrieks as the seal on his power breaks and he starts to break apart!") new /obj/structure/ladder/unbreakable/goat(loc) @@ -275,14 +270,6 @@ Difficulty: Insanely Hard ..() OnDeath() -/mob/living/simple_animal/hostile/megafauna/king/phase2/Destroy() - for(var/mob/L in rangers) - rangers -= L - if(!L || !L.client) - continue - L.stop_sound_channel(CHANNEL_BOSSMUSIC) - . = ..() - /mob/living/simple_animal/hostile/megafauna/king/AttackingTarget() . = ..() if(isliving(target))