[MIRROR] Kitchen Sink PR (#10745)

Co-authored-by: Cameron Lennox <killer65311@gmail.com>

modular_chomp/code/modules/mob/living/carbon/human/species/station/station.dm

@@ -1,10 +1,6 @@
 //Any species commented out here must be made restricted elsewhere. They are kept here for easy reference of what we disabled.
 //Note that at the time of this PR we are simply disabling everything new to discuss keeping versus scrapping later.
 
-/datum/species
-	var/pain_verb_1p = list("shout", "growl", "grunt", "gasp")
-	var/pain_verb_3p = list("shouts", "growls", "grunts", "gasps")
-
 ///datum/species/zaddat
 //	spawn_flags = SPECIES_IS_RESTRICTED //Species has been enabled elsewhere.
 

modular_chomp/code/modules/mob/living/living.dm

@@ -1,24 +1,3 @@
-/mob/living
-	// var/ear_deaf_loop = FALSE // Are we already playing our deafened loop? Checked for safety so we don't deafen our players. (Not sure if we need this bc looping sounds datums have protection for starts being called repeatedly, commented out)
-	var/datum/looping_sound/mob/deafened/deaf_loop
-	/* TL;DR - the following is a lot of copypasta, but allows us to give simplemobs pain and death sounds.
-	 * Different from carbons, where we check species, here we just check on the mob itself.
-	 * TBD: Maybe port over from species to mob?
-	*/
-	var/can_pain_emote = TRUE
-	var/pain_emote_1p = null
-	var/pain_emote_3p = null
-	var/species_sounds = "None" // By default, we have nothing.
-	var/death_sound_override = null
-	var/datum/looping_sound/mob/on_fire/firesoundloop
-	// var/datum/looping_sound/mob/stunned/stunnedloop
-	/* // Not sure if needed, screams aren't a carbon thing rn.
-	var/scream_sound = null
-	var/female_scream_sound = null
-	var/male_scream_sound = null
-	var/scream_emote = null
-	*/
-
 /mob/living/Initialize(mapload)
 	. = ..()
 

modular_chomp/code/modules/mob/living/simple_mob/subtypes/horror/Master.dm

@@ -4,7 +4,7 @@
 	ai_holder_type = /datum/ai_holder/simple_mob/ranged/kiting/horrormaster //The final boss of every Gradius game
 
 /datum/say_list/cyber_horror/master
-	threaten_sound = 'modular_chomp/sound/mob/robots/MasterSee.ogg'
+	threaten_sound = 'sound/mob/robots/MasterSee.ogg'
 
 /datum/ai_holder/simple_mob/ranged/kiting/horrormaster
 	threaten = TRUE

modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/disbot.dm

@@ -4,7 +4,7 @@
 
 
 /datum/say_list/disbot
-	threaten_sound = 'modular_chomp/sound/mob/robots/infector.ogg'
+	threaten_sound = 'sound/mob/robots/infector.ogg'
 
 /datum/ai_holder/simple_mob/melee/disbot
 	threaten = TRUE

modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm

@@ -18,8 +18,8 @@
 	say_threaten = list("This area is condemned by Vir System Authority. Please leave immediately. You have 20 seconds to comply.")
 	say_stand_down = list("Visual lost.", "Error: Target not found.")
 	say_escalate = list("Intruder is tresspassing. Maximum force authorized by Vir System Suthority.")
-	threaten_sound = 'modular_chomp/sound/mob/robots/DroneFreezeLong.ogg'
-	stand_down_sound = 'modular_chomp/sound/mob/robots/DroneLostTarget.ogg'
+	threaten_sound = 'sound/mob/robots/DroneFreezeLong.ogg'
+	stand_down_sound = 'sound/mob/robots/DroneLostTarget.ogg'
 
 /datum/ai_holder/simple_mob/ranged/kiting/threatening/drone_aerostat
 	threaten_delay = 10 SECOND

modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/gygax.dm

@@ -21,8 +21,8 @@
 	say_threaten = list("This area is condemned by Vir System Authority. Please leave immediately. You have 20 seconds to comply.")
 	say_stand_down = list("Visual lost.", "Error: Target not found.")
 	say_escalate = list("Intruder is tresspassing. Maximum force authorized by Vir System Suthority.")
-	threaten_sound = 'modular_chomp/sound/mob/robots/GygaxIntruder4.ogg'
-	stand_down_sound = 'modular_chomp/sound/mob/robots/GygaxDanger.ogg'
+	threaten_sound = 'sound/mob/robots/GygaxIntruder4.ogg'
+	stand_down_sound = 'sound/mob/robots/GygaxDanger.ogg'
 
 /datum/ai_holder/simple_mob/ranged/kiting/threatening/drone_aerostat
 	threaten_delay = 20 SECOND

modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/blackholemobs.dm

@@ -548,7 +548,7 @@
 	pixel_x = -16
 	pixel_y = 0
 
-	movement_sound = 'modular_chomp/sound/effects/carrev.ogg'
+	movement_sound = 'sound/effects/carrev.ogg'
 
 	min_oxy = 0
 	max_oxy = 0
@@ -803,7 +803,7 @@ GLOBAL_LIST_INIT(obelisk_lure_messages, list(
 				return
 
 /datum/looping_sound/obelisk ///thanks to BM for helpin' me make this work <3
-	mid_sounds = 'modular_chomp/sound/effects/monolith_ambience.ogg'
+	mid_sounds = 'sound/effects/monolith_ambience.ogg'
 	mid_length = 50
 	chance = 100
 	volume = 35
@@ -843,7 +843,7 @@ GLOBAL_LIST_INIT(obelisk_lure_messages, list(
 /mob/living/simple_mob/vore/blackhole_obelisk/death()
 	..()
 	visible_message("[src] flashes brightly, crumbling as its psychic influence suddenly vanishes from the minds of those nearby...")
-	playsound(src, 'modular_chomp/sound/effects/monolith_death.ogg', 100)
+	playsound(src, 'sound/effects/monolith_death.ogg', 100)
 
 #undef OBELISK_LURE