From 3a9e4c1f13fd617dfc927ebe8127ca9bab3c7183 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Wed, 6 Nov 2019 23:11:15 +0100 Subject: [PATCH] Unmodularizing 2/3 of the sounds folder. --- modular_citadel/code/datums/components/souldeath.dm | 2 +- .../code/modules/clothing/glasses/phantomthief.dm | 2 +- modular_citadel/code/modules/clothing/neck.dm | 2 +- .../code/modules/mob/living/carbon/carbon.dm | 4 ++-- .../mob/living/carbon/human/human_movement.dm | 4 ++-- .../code/modules/projectiles/guns/pumpenergy.dm | 12 ++++++------ .../code/modules/projectiles/guns/toys.dm | 4 ++-- .../sound => sound}/misc/adrenalinject.ogg | Bin .../sound => sound}/misc/cheekibreeki.ogg | Bin {modular_citadel/sound => sound}/misc/cyka1.ogg | Bin {modular_citadel/sound => sound}/misc/manup.ogg | Bin {modular_citadel/sound => sound}/misc/souldeath.ogg | Bin .../sound => sound}/misc/sprintactivate.ogg | Bin .../sound => sound}/misc/sprintdeactivate.ogg | Bin {modular_citadel/sound => sound}/misc/ui_toggle.ogg | Bin .../sound => sound}/misc/ui_toggleoff.ogg | Bin .../sound => sound}/weapons/LaserSlugv3.ogg | Bin .../sound => sound}/weapons/ParticleBlaster.ogg | Bin .../sound => sound}/weapons/laserPump.ogg | Bin .../sound => sound}/weapons/laserPumpEmpty.ogg | Bin 20 files changed, 15 insertions(+), 15 deletions(-) rename {modular_citadel/sound => sound}/misc/adrenalinject.ogg (100%) rename {modular_citadel/sound => sound}/misc/cheekibreeki.ogg (100%) rename {modular_citadel/sound => sound}/misc/cyka1.ogg (100%) rename {modular_citadel/sound => sound}/misc/manup.ogg (100%) rename {modular_citadel/sound => sound}/misc/souldeath.ogg (100%) rename {modular_citadel/sound => sound}/misc/sprintactivate.ogg (100%) rename {modular_citadel/sound => sound}/misc/sprintdeactivate.ogg (100%) rename {modular_citadel/sound => sound}/misc/ui_toggle.ogg (100%) rename {modular_citadel/sound => sound}/misc/ui_toggleoff.ogg (100%) rename {modular_citadel/sound => sound}/weapons/LaserSlugv3.ogg (100%) rename {modular_citadel/sound => sound}/weapons/ParticleBlaster.ogg (100%) rename {modular_citadel/sound => sound}/weapons/laserPump.ogg (100%) rename {modular_citadel/sound => sound}/weapons/laserPumpEmpty.ogg (100%) diff --git a/modular_citadel/code/datums/components/souldeath.dm b/modular_citadel/code/datums/components/souldeath.dm index 5beddf3529..ab45210a46 100644 --- a/modular_citadel/code/datums/components/souldeath.dm +++ b/modular_citadel/code/datums/components/souldeath.dm @@ -29,7 +29,7 @@ if(!wearer) return //idfk new/obj/effect/temp_visual/souldeath(wearer.loc, wearer) - playsound(wearer, 'modular_citadel/sound/misc/souldeath.ogg', 100, FALSE) + playsound(wearer, 'sound/misc/souldeath.ogg', 100, FALSE) /datum/component/souldeath/neck equip_slot = SLOT_NECK diff --git a/modular_citadel/code/modules/clothing/glasses/phantomthief.dm b/modular_citadel/code/modules/clothing/glasses/phantomthief.dm index 5e488b9837..353b0afb14 100644 --- a/modular_citadel/code/modules/clothing/glasses/phantomthief.dm +++ b/modular_citadel/code/modules/clothing/glasses/phantomthief.dm @@ -27,7 +27,7 @@ if(istype(user) && combatmodestate && world.time >= nextadrenalinepop) nextadrenalinepop = world.time + 5 MINUTES user.reagents.add_reagent("syndicateadrenals", 5) - user.playsound_local(user, 'modular_citadel/sound/misc/adrenalinject.ogg', 100, 0, pressure_affected = FALSE) + user.playsound_local(user, 'sound/misc/adrenalinject.ogg', 100, 0, pressure_affected = FALSE) /obj/item/clothing/glasses/phantomthief/syndicate/equipped(mob/user, slot) . = ..() diff --git a/modular_citadel/code/modules/clothing/neck.dm b/modular_citadel/code/modules/clothing/neck.dm index 8d7d4747b7..20324516f6 100644 --- a/modular_citadel/code/modules/clothing/neck.dm +++ b/modular_citadel/code/modules/clothing/neck.dm @@ -15,7 +15,7 @@ /datum/action/item_action/zanderlocket/Trigger() new/obj/effect/temp_visual/souldeath(owner.loc, owner) - playsound(owner, 'modular_citadel/sound/misc/souldeath.ogg', 100, FALSE) + playsound(owner, 'sound/misc/souldeath.ogg', 100, FALSE) /obj/item/clothing/neck/undertale/Initialize() diff --git a/modular_citadel/code/modules/mob/living/carbon/carbon.dm b/modular_citadel/code/modules/mob/living/carbon/carbon.dm index 02b98bdbf2..4cc8edac1b 100644 --- a/modular_citadel/code/modules/mob/living/carbon/carbon.dm +++ b/modular_citadel/code/modules/mob/living/carbon/carbon.dm @@ -29,9 +29,9 @@ if(voremode) toggle_vore_mode() if(combatmode) - playsound_local(src, 'modular_citadel/sound/misc/ui_toggle.ogg', 50, FALSE, pressure_affected = FALSE) //Sound from interbay! + playsound_local(src, 'sound/misc/ui_toggle.ogg', 50, FALSE, pressure_affected = FALSE) //Sound from interbay! else - playsound_local(src, 'modular_citadel/sound/misc/ui_toggleoff.ogg', 50, FALSE, pressure_affected = FALSE) //Slightly modified version of the above! + playsound_local(src, 'sound/misc/ui_toggleoff.ogg', 50, FALSE, pressure_affected = FALSE) //Slightly modified version of the above! if(client) client.show_popup_menus = !combatmode // So we can right-click for alternate actions and all that other good shit. Also moves examine to shift+rightclick to make it possible to attack while sprinting if(hud_used && hud_used.static_inventory) diff --git a/modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm b/modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm index 409864c900..badda6b239 100644 --- a/modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm +++ b/modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm @@ -24,9 +24,9 @@ sprinting = !sprinting if(!resting && m_intent == MOVE_INTENT_RUN && canmove) if(sprinting) - playsound_local(src, 'modular_citadel/sound/misc/sprintactivate.ogg', 50, FALSE, pressure_affected = FALSE) + playsound_local(src, 'sound/misc/sprintactivate.ogg', 50, FALSE, pressure_affected = FALSE) else - playsound_local(src, 'modular_citadel/sound/misc/sprintdeactivate.ogg', 50, FALSE, pressure_affected = FALSE) + playsound_local(src, 'sound/misc/sprintdeactivate.ogg', 50, FALSE, pressure_affected = FALSE) if(hud_used && hud_used.static_inventory) for(var/obj/screen/sprintbutton/selector in hud_used.static_inventory) selector.insert_witty_toggle_joke_here(src) diff --git a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm index fa0e64032c..aef47a648e 100644 --- a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm +++ b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm @@ -75,9 +75,9 @@ /obj/item/gun/energy/pumpaction/proc/pump(mob/M) //pumping proc. Checks if the gun is empty and plays a different sound if it is. var/obj/item/ammo_casing/energy/shot = ammo_type[select] if(cell.charge < shot.e_cost) - playsound(M, 'modular_citadel/sound/weapons/laserPumpEmpty.ogg', 100, 1) //Ends with three beeps made from highly processed knife honing noises + playsound(M, 'sound/weapons/laserPumpEmpty.ogg', 100, 1) //Ends with three beeps made from highly processed knife honing noises else - playsound(M, 'modular_citadel/sound/weapons/laserPump.ogg', 100, 1) //Ends with high pitched charging noise + playsound(M, 'sound/weapons/laserPump.ogg', 100, 1) //Ends with high pitched charging noise recharge_newshot() //try to charge a new shot update_icon() return 1 @@ -152,14 +152,14 @@ e_cost = 150 pellets = 4 variance = 30 - fire_sound = 'modular_citadel/sound/weapons/ParticleBlaster.ogg' + fire_sound = 'sound/weapons/ParticleBlaster.ogg' select_name = "disable" /obj/item/ammo_casing/energy/disabler/slug projectile_type = /obj/item/projectile/beam/disabler/slug select_name = "overdrive" e_cost = 200 - fire_sound = 'modular_citadel/sound/weapons/LaserSlugv3.ogg' + fire_sound = 'sound/weapons/LaserSlugv3.ogg' /obj/item/ammo_casing/energy/laser/pump projectile_type = /obj/item/projectile/beam/weak @@ -167,12 +167,12 @@ select_name = "kill" pellets = 3 variance = 15 - fire_sound = 'modular_citadel/sound/weapons/ParticleBlaster.ogg' + fire_sound = 'sound/weapons/ParticleBlaster.ogg' /obj/item/ammo_casing/energy/electrode/pump projectile_type = /obj/item/projectile/energy/electrode/pump select_name = "stun" - fire_sound = 'modular_citadel/sound/weapons/LaserSlugv3.ogg' + fire_sound = 'sound/weapons/LaserSlugv3.ogg' e_cost = 300 pellets = 3 variance = 20 diff --git a/modular_citadel/code/modules/projectiles/guns/toys.dm b/modular_citadel/code/modules/projectiles/guns/toys.dm index 18d174d677..731f990cfb 100644 --- a/modular_citadel/code/modules/projectiles/guns/toys.dm +++ b/modular_citadel/code/modules/projectiles/guns/toys.dm @@ -39,7 +39,7 @@ projectile_type = /obj/item/projectile/beam/lasertag/wavemotion select_name = "overdrive" e_cost = 300 - fire_sound = 'modular_citadel/sound/weapons/LaserSlugv3.ogg' + fire_sound = 'sound/weapons/LaserSlugv3.ogg' /obj/item/ammo_casing/energy/laser/dispersal projectile_type = /obj/item/projectile/beam/lasertag/dispersal @@ -47,7 +47,7 @@ pellets = 5 variance = 25 e_cost = 200 - fire_sound = 'modular_citadel/sound/weapons/ParticleBlaster.ogg' + fire_sound = 'sound/weapons/ParticleBlaster.ogg' ////////////////////////////////////////////////////////////////////////////////////////////////////////////// //TOY REVOLVER diff --git a/modular_citadel/sound/misc/adrenalinject.ogg b/sound/misc/adrenalinject.ogg similarity index 100% rename from modular_citadel/sound/misc/adrenalinject.ogg rename to sound/misc/adrenalinject.ogg diff --git a/modular_citadel/sound/misc/cheekibreeki.ogg b/sound/misc/cheekibreeki.ogg similarity index 100% rename from modular_citadel/sound/misc/cheekibreeki.ogg rename to sound/misc/cheekibreeki.ogg diff --git a/modular_citadel/sound/misc/cyka1.ogg b/sound/misc/cyka1.ogg similarity index 100% rename from modular_citadel/sound/misc/cyka1.ogg rename to sound/misc/cyka1.ogg diff --git a/modular_citadel/sound/misc/manup.ogg b/sound/misc/manup.ogg similarity index 100% rename from modular_citadel/sound/misc/manup.ogg rename to sound/misc/manup.ogg diff --git a/modular_citadel/sound/misc/souldeath.ogg b/sound/misc/souldeath.ogg similarity index 100% rename from modular_citadel/sound/misc/souldeath.ogg rename to sound/misc/souldeath.ogg diff --git a/modular_citadel/sound/misc/sprintactivate.ogg b/sound/misc/sprintactivate.ogg similarity index 100% rename from modular_citadel/sound/misc/sprintactivate.ogg rename to sound/misc/sprintactivate.ogg diff --git a/modular_citadel/sound/misc/sprintdeactivate.ogg b/sound/misc/sprintdeactivate.ogg similarity index 100% rename from modular_citadel/sound/misc/sprintdeactivate.ogg rename to sound/misc/sprintdeactivate.ogg diff --git a/modular_citadel/sound/misc/ui_toggle.ogg b/sound/misc/ui_toggle.ogg similarity index 100% rename from modular_citadel/sound/misc/ui_toggle.ogg rename to sound/misc/ui_toggle.ogg diff --git a/modular_citadel/sound/misc/ui_toggleoff.ogg b/sound/misc/ui_toggleoff.ogg similarity index 100% rename from modular_citadel/sound/misc/ui_toggleoff.ogg rename to sound/misc/ui_toggleoff.ogg diff --git a/modular_citadel/sound/weapons/LaserSlugv3.ogg b/sound/weapons/LaserSlugv3.ogg similarity index 100% rename from modular_citadel/sound/weapons/LaserSlugv3.ogg rename to sound/weapons/LaserSlugv3.ogg diff --git a/modular_citadel/sound/weapons/ParticleBlaster.ogg b/sound/weapons/ParticleBlaster.ogg similarity index 100% rename from modular_citadel/sound/weapons/ParticleBlaster.ogg rename to sound/weapons/ParticleBlaster.ogg diff --git a/modular_citadel/sound/weapons/laserPump.ogg b/sound/weapons/laserPump.ogg similarity index 100% rename from modular_citadel/sound/weapons/laserPump.ogg rename to sound/weapons/laserPump.ogg diff --git a/modular_citadel/sound/weapons/laserPumpEmpty.ogg b/sound/weapons/laserPumpEmpty.ogg similarity index 100% rename from modular_citadel/sound/weapons/laserPumpEmpty.ogg rename to sound/weapons/laserPumpEmpty.ogg