[MIRROR] Kitchen Sink PR (#10745)

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

modular_chomp/code/coalesce_ch.dm

@@ -1,5 +0,0 @@
-/proc/coalesce(...)
-	for (var/arg in args)
-		if (arg)
-			return arg
-	return null

modular_chomp/code/modules/admin/verbs/randomverbs.dm

@@ -1,15 +0,0 @@
-GLOBAL_VAR_INIT(global_vantag_hud, 0)
-
-/client/proc/toggle_vantag_hud_global(mob/target as mob)
-	set category = "Fun.Event Kit"
-	set name = "Toggle Global Event HUD"
-	set desc = "Give everyone the Event HUD."
-
-	GLOB.global_vantag_hud = !GLOB.global_vantag_hud
-	if(GLOB.global_vantag_hud)
-		for(var/mob/living/L in living_mob_list)
-			if(L.ckey)
-				L.vantag_hud = TRUE
-				L.recalculate_vis()
-
-	to_chat(src, span_warning("Global Event HUD has been turned [GLOB.global_vantag_hud ? "on" : "off"]."))

modular_chomp/code/modules/clothing/shoes/miscellaneous.dm

@@ -22,13 +22,13 @@
 /obj/item/clothing/shoes/mech_shoes/heavy
 	name = "heavy mech shoes"
 	desc = "Thud thud, but heavy."
-	squeak_sound = list('modular_chomp/sound/mob/footstep_large.ogg'=1,'modular_chomp/sound/mob/footstep_large2.ogg'=1)
+	squeak_sound = list('sound/mob/footstep_large.ogg'=1,'sound/mob/footstep_large2.ogg'=1)
 	step_volume_mod = 4
 
 /obj/item/clothing/shoes/mech_shoes/mister_x
 	name = "concealed extra large jackboots"
 	desc = "Lets hope there's no evil in this residence."
-	squeak_sound = list('modular_chomp/sound/mob/heavy_boots.ogg'=1)
+	squeak_sound = list('sound/mob/heavy_boots.ogg'=1)
 	step_volume_mod = 5
 
 /obj/item/clothing/shoes/mech_shoes/mister_x/visible

modular_chomp/code/modules/emotes/definitions/audiable.dm

@@ -1,5 +1,5 @@
 /decl/emote/audible/wheeze
-	emote_sound = 'modular_chomp/sound/voice/wheeze.ogg'
+	emote_sound = 'sound/voice/wheeze.ogg'
 
 /decl/emote/audible/prbt2
 	key = "prbt2"
@@ -33,7 +33,7 @@
 	emote_message_3p = "mgeows."
 	emote_message_1p_target = "You mgeow at TARGET."
 	emote_message_3p_target = "mgeow at TARGET."
-	emote_sound = 'modular_chomp/sound/voice/mgeow.ogg'
+	emote_sound = 'sound/voice/mgeow.ogg'
 
 /decl/emote/audible/xenogrowl
 	key = "xenogrowl"
@@ -41,7 +41,7 @@
 	emote_message_3p = "growls unnervingly."
 	emote_message_1p_target = "You growl unnervingly at TARGET."
 	emote_message_3p_target = "growls unnervingly at TARGET."
-	emote_sound = 'modular_chomp/sound/voice/emotes/xenogrowl.ogg'
+	emote_sound = 'sound/voice/emotes/xenogrowl.ogg'
 
 /decl/emote/audible/xenohiss
 	key = "xenohiss"
@@ -49,7 +49,7 @@
 	emote_message_3p = "hisses unnervingly."
 	emote_message_1p_target = "You hiss unnervingly at TARGET."
 	emote_message_3p_target = "hisses unnervingly at TARGET."
-	emote_sound = 'modular_chomp/sound/voice/emotes/xenohiss.ogg'
+	emote_sound = 'sound/voice/emotes/xenohiss.ogg'
 
 /decl/emote/audible/xenopurr
 	key = "xenopurr"
@@ -57,7 +57,7 @@
 	emote_message_3p = "purrs unnervingly."
 	emote_message_1p_target = "You purr unnervingly at TARGET."
 	emote_message_3p_target = "purrs unnervingly at TARGET."
-	emote_sound = 'modular_chomp/sound/voice/emotes/xenopurr.ogg'
+	emote_sound = 'sound/voice/emotes/xenopurr.ogg'
 
 /decl/emote/audible/gwah
 	key = "gwah"
@@ -65,7 +65,7 @@
 	emote_message_3p = "gwahs."
 	emote_message_1p_target = "You gwah at TARGET."
 	emote_message_3p_target = "gwahs at TARGET."
-	emote_sound = 'modular_chomp/sound/voice/emotes/gwah.ogg'
+	emote_sound = 'sound/voice/emotes/gwah.ogg'
 
 /decl/emote/audible/caw
 	key = "caw"
@@ -73,7 +73,7 @@
 	emote_message_3p = "caws!"
 	emote_message_1p_target = "You caw at TARGET."
 	emote_message_3p_target = "caws at TARGET."
-	emote_sound = 'modular_chomp/sound/voice/emotes/caw.ogg' // Copyright Sampling+ 1.0 Vixuxx (freesound.org) for the source audio.
+	emote_sound = 'sound/voice/emotes/caw.ogg' // Copyright Sampling+ 1.0 Vixuxx (freesound.org) for the source audio.
 
 /decl/emote/audible/wawa
 	key = "wawa"
@@ -81,7 +81,7 @@
 	emote_message_3p = "wawas."
 	emote_message_1p_target = "You wawa at TARGET."
 	emote_message_3p_target = "wawas at TARGET."
-	emote_sound = 'modular_chomp/sound/voice/emotes/wawa.ogg'
+	emote_sound = 'sound/voice/emotes/wawa.ogg'
 
 /decl/emote/audible/scientist //placeholder, do not use in anything
 	key = "hlscientist"
@@ -94,11 +94,11 @@
 	emote_message_1p_target = "You scream at TARGET."
 	emote_message_3p_target = "screams at TARGET."
 	emote_sound = list (
-		'modular_chomp/sound/voice/scream/scientist/scream01.ogg',
-		'modular_chomp/sound/voice/scream/scientist/scream02.ogg',
-		'modular_chomp/sound/voice/scream/scientist/scream06.ogg',
-		'modular_chomp/sound/voice/scream/scientist/scream08.ogg',
-		'modular_chomp/sound/voice/scream/scientist/scream25.ogg',
+		'sound/voice/scream/scientist/scream01.ogg',
+		'sound/voice/scream/scientist/scream02.ogg',
+		'sound/voice/scream/scientist/scream06.ogg',
+		'sound/voice/scream/scientist/scream08.ogg',
+		'sound/voice/scream/scientist/scream25.ogg',
 	)
 
 /decl/emote/audible/scientist/pain
@@ -108,9 +108,9 @@
 	emote_message_1p_target = "You shout in pain at TARGET."
 	emote_message_3p_target = "shouts in pain at TARGET."
 	emote_sound = list (
-		'modular_chomp/sound/voice/pain/scientist/sci_pain1.ogg',
-		'modular_chomp/sound/voice/pain/scientist/sci_pain4.ogg',
-		'modular_chomp/sound/voice/pain/scientist/sci_pain5.ogg',
+		'sound/voice/pain/scientist/sci_pain1.ogg',
+		'sound/voice/pain/scientist/sci_pain4.ogg',
+		'sound/voice/pain/scientist/sci_pain5.ogg',
 	)
 
 /decl/emote/audible/scientist/get_emote_sound(var/atom/user)
@@ -124,9 +124,9 @@
 	emote_message_1p_target = "You yip at TARGET!"
 	emote_message_3p_target = "yips at TARGET!"
 	emote_sound = list (
-		'modular_chomp/sound/voice/emotes/yip1.ogg',
-		'modular_chomp/sound/voice/emotes/yip2.ogg',
-		'modular_chomp/sound/voice/emotes/yip3.ogg',
+		'sound/voice/emotes/yip1.ogg',
+		'sound/voice/emotes/yip2.ogg',
+		'sound/voice/emotes/yip3.ogg',
 	)
 
 /decl/emote/audible/squeal // Sound sourced from: https://github.com/Baystation12/Baystation12/blob/bd2f0bd5e38cf2bb0888e3ae879708bed20243b4/sound/voice/LizardSqueal.ogg, licensed Creative Commons 3.0 BY-SA.
@@ -135,7 +135,7 @@
 	emote_message_3p = "squeals."
 	emote_message_1p_target = "You squeal at TARGET."
 	emote_message_3p_target = "squeals at TARGET."
-	emote_sound = 'modular_chomp/sound/voice/emotes/squealemote.ogg'
+	emote_sound = 'sound/voice/emotes/squealemote.ogg'
 
 /decl/emote/audible/tailthump // Sound sourced from https://freesound.org/s/389665/ Licensed Creative Commons 0
 	key = "tailthump"
@@ -143,4 +143,4 @@
 	emote_message_3p = "thumps their tail."
 	emote_message_1p_target = "You thump your tail at TARGET."
 	emote_message_3p_target = "thumps their tail at TARGET."
-	emote_sound = 'modular_chomp/sound/voice/emotes/tailthumpemote.ogg'
+	emote_sound = 'sound/voice/emotes/tailthumpemote.ogg'

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
 

modular_chomp/code/modules/projectiles/clockwork/clockwork_guns_ch.dm

@@ -32,10 +32,10 @@
 		return
 	recharging = 1
 	update_icon()
-	playsound(src,'modular_chomp/sound/weapons/clockwork/clockwork_cock.ogg',25,1)
+	playsound(src,'sound/weapons/clockwork/clockwork_cock.ogg',25,1)
 	user.visible_message(span_notice("[user] pulls the charging handle on \the [src] and it whirrs to life!"), \
 						span_notice("You pull the charging handle on \the [src] and begin the reloading sequence."))
-	playsound(src,'modular_chomp/sound/weapons/clockwork/cwc_rifle_fabricate.ogg',25,5)
+	playsound(src,'sound/weapons/clockwork/cwc_rifle_fabricate.ogg',25,5)
 	while(recharging)
 		if(!do_after(user, 50, src))
 			break
@@ -48,13 +48,13 @@
 	user.hud_used.update_ammo_hud(user, src) // Update one last time once we're finished!
 
 /obj/item/projectile/bullet/rifle/clockwork
-	fire_sound = 'modular_chomp/sound/weapons/clockwork/cwc_rifle_fire.ogg'
+	fire_sound = 'sound/weapons/clockwork/cwc_rifle_fire.ogg'
 	damage = 20 //Old 10
 	hud_state = "rifle_heavy"
 
 /obj/item/projectile/beam/shock/clockwork
 	name = "shock beam"
-	fire_sound = 'modular_chomp/sound/weapons/clockwork/voltbeam_fire.ogg'
+	fire_sound = 'sound/weapons/clockwork/voltbeam_fire.ogg'
 	icon_state = "lightning"
 	damage_type = ELECTROCUTE
 
@@ -66,7 +66,7 @@
 	agony = 15
 	eyeblur = 2
 	hitsound = 'sound/effects/lightningshock.ogg'
-	hitsound_wall = 'modular_chomp/sound/weapons/clockwork/voltbeamsearwall.ogg'
+	hitsound_wall = 'sound/weapons/clockwork/voltbeamsearwall.ogg'
 	hud_state = "taser"
 
 /obj/effect/projectile/muzzle/voltbeam

modular_chomp/code/modules/projectiles/guns/projectile/revolver.dm

@@ -7,7 +7,7 @@
 	icon_state = "ukr"
 	item_state = "ukr"
 	icon = 'modular_chomp/icons/obj/guns/altmarksman/altmarksman.dmi'
-	fire_sound = 'modular_chomp/sound/weapons/marksmanalt.ogg'
+	fire_sound = 'sound/weapons/marksmanalt.ogg'
 	item_icons = list(
 		slot_l_hand_str = 'modular_chomp/icons/obj/guns/altmarksman/lefthand_guns.dmi',
 		slot_r_hand_str = 'modular_chomp/icons/obj/guns/altmarksman/righthand_guns.dmi',

modular_chomp/code/modules/reagents/machinery/dispenser/chem_synthesizer_ch.dm

@@ -644,7 +644,7 @@
 	// After all this mess of code, we reach the line where the magic happens.
 	C.reagents.trans_to_holder(src.reagents, quantity)
 	update_icon() // Update underlays.
-	playsound(src, 'modular_chomp/sound/machines/HPLC_binary_pump.ogg', 15, 1)
+	playsound(src, 'sound/machines/HPLC_binary_pump.ogg', 15, 1)
 
 	// Advance to the next step in the recipe. If this is outside of the recipe's index, we're finished. Otherwise, proceed to next step.
 	step += 2

modular_chomp/code/modules/salvage/salvage.dm

@@ -6,8 +6,8 @@
 	throwforce = 5
 	throw_speed = 1
 	throw_speed = 4
-	hitsound = 'modular_chomp/sound/items/salvage/salvagepickup.ogg'
-	drop_sound = 'modular_chomp/sound/items/salvage/salvagedrop.ogg'
+	hitsound = 'sound/items/salvage/salvagepickup.ogg'
+	drop_sound = 'sound/items/salvage/salvagedrop.ogg'
 	w_class = ITEMSIZE_NORMAL
 	var/worth = 100
 
@@ -63,9 +63,9 @@
 	name = "stolen jewellery"
 	desc = "A collection of stolen jewellery, fashioned from pilfered bluespace crystals and gems. Rumour has it, local pirates have been known to use these accessories to avoid capture."
 	icon_state = "pirate_treasure"
-	hitsound = 'modular_chomp/sound/items/taperecorder_drop.ogg'
-	pickup_sound = 'modular_chomp/sound/items/taperecorder_pickup.ogg'
-	drop_sound = 'modular_chomp/sound/items/taperecorder_drop.ogg'
+	hitsound = 'sound/items/taperecorder_drop.ogg'
+	pickup_sound = 'sound/items/taperecorder_pickup.ogg'
+	drop_sound = 'sound/items/taperecorder_drop.ogg'
 
 /obj/item/salvage/loot/russian
 	name = "siosp manual"