cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-31 00:58:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reorganizes the sound folder (#86726)

Browse Source 
## About The Pull Request

<details>

- renamed ai folder to announcer

-- announcer --
- moved vox_fem to announcer
- moved approachingTG to announcer

- separated the ambience folder into ambience and instrumental
-- ambience --

- created holy folder moved all related sounds there
- created engineering folder and moved all related sounds there
- created security folder and moved ambidet there
- created general folder and moved ambigen there
- created icemoon folder and moved all icebox-related ambience there
- created medical folder and moved all medbay-related ambi there
- created ruin folder and moves all ruins ambi there
- created beach folder and moved seag and shore there
- created lavaland folder and moved related ambi there
- created aurora_caelus folder and placed its ambi there
- created misc folder and moved the rest of the files that don't have a
specific category into it

-- instrumental --

- moved traitor folder here
- created lobby_music folder and placed our songs there (title0 not used
anywhere? - server-side modification?)

-- items --

- moved secdeath to hailer
- moved surgery to handling

-- effects --

- moved chemistry into effects
- moved hallucinations into effects
- moved health into effects
- moved magic into effects

-- vehicles --

- moved mecha into vehicles


created mobs folder

-- mobs --

- moved creatures folder into mobs
- moved voice into mobs

renamed creatures to non-humanoids
renamed voice to humanoids

-- non-humanoids--

created cyborg folder
created hiss folder
moved harmalarm.ogg to cyborg

-- humanoids --




-- misc --

moved ghostwhisper to misc
moved insane_low_laugh to misc

I give up trying to document this.

</details>

- [X] ambience
- [x] announcer
- [x] effects
- [X] instrumental
- [x] items
- [x] machines
- [x] misc 
- [X] mobs
- [X] runtime
- [X] vehicles

- [ ] attributions

## Why It's Good For The Game

This folder is so disorganized that it's vomit inducing, will make it
easier to find and add new sounds, providng a minor structure to the
sound folder.

## Changelog
🆑 grungussuss
refactor: the sound folder in the source code has been reorganized,
please report any oddities with sounds playing or not playing
server: lobby music has been repathed to sound/music/lobby_music
/🆑
This commit is contained in:
grungussuss
2024-09-23 22:24:50 -07:00
committed by GitHub
parent 8c494a4736
commit 58501dce77
3639 changed files with 5089 additions and 5093 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hallucination/battle.dm
+14 -14
View File
@@ -11,9 +11,9 @@
/// The upper end to how many shots we'll fire.
var/shots_to_fire_upper_range = 6
/// The sound effect we play when we "fire" a shot.
var/fire_sound = 'sound/weapons/gun/shotgun/shot.ogg'
var/fire_sound = 'sound/items/weapons/gun/shotgun/shot.ogg'
/// The sound we make when our shot actually "hits" "someone".
var/hit_person_sound = 'sound/weapons/pierce.ogg'
var/hit_person_sound = 'sound/items/weapons/pierce.ogg'
/// The sound we make when our shot misses someone and "hits" a "wall".
var/hit_wall_sound = SFX_RICOCHET
/// The number of successful hits required to "down" the "someone" we're firing at.
@@ -60,9 +60,9 @@
/datum/hallucination/battle/gun/disabler
shots_to_fire_lower_range = 5
shots_to_fire_upper_range = 10
fire_sound = 'sound/weapons/taser2.ogg'
hit_person_sound = 'sound/weapons/tap.ogg'
hit_wall_sound = 'sound/weapons/effects/searwall.ogg'
fire_sound = 'sound/items/weapons/taser2.ogg'
hit_person_sound = 'sound/items/weapons/tap.ogg'
hit_wall_sound = 'sound/items/weapons/effects/searwall.ogg'
number_of_hits_to_end = 3
chance_to_fall = 70
@@ -70,9 +70,9 @@
/datum/hallucination/battle/gun/laser
shots_to_fire_lower_range = 5
shots_to_fire_upper_range = 10
fire_sound = 'sound/weapons/laser.ogg'
hit_person_sound = 'sound/weapons/sear.ogg'
hit_wall_sound = 'sound/weapons/effects/searwall.ogg'
fire_sound = 'sound/items/weapons/laser.ogg'
hit_person_sound = 'sound/items/weapons/sear.ogg'
hit_wall_sound = 'sound/items/weapons/effects/searwall.ogg'
number_of_hits_to_end = 4
chance_to_fall = 70
@@ -82,7 +82,7 @@
/datum/hallucination/battle/stun_prod/start()
var/turf/source = random_far_turf()
hallucinator.playsound_local(source, 'sound/weapons/egloves.ogg', 40, TRUE)
hallucinator.playsound_local(source, 'sound/items/weapons/egloves.ogg', 40, TRUE)
hallucinator.playsound_local(source, SFX_BODYFALL, 25, TRUE)
addtimer(CALLBACK(src, PROC_REF(fake_cuff), source), 2 SECONDS)
return TRUE
@@ -92,7 +92,7 @@
if(QDELETED(src) || QDELETED(hallucinator) || !source)
return
hallucinator.playsound_local(source, 'sound/weapons/cablecuff.ogg', 15, TRUE)
hallucinator.playsound_local(source, 'sound/items/weapons/cablecuff.ogg', 15, TRUE)
qdel(src)
/// A hallucination of someone being stun batonned, and subsequently harmbatonned.
@@ -101,7 +101,7 @@
/datum/hallucination/battle/harm_baton/start()
var/turf/source = random_far_turf()
hallucinator.playsound_local(source, 'sound/weapons/egloves.ogg', 40, TRUE)
hallucinator.playsound_local(source, 'sound/items/weapons/egloves.ogg', 40, TRUE)
hallucinator.playsound_local(source, SFX_BODYFALL, 25, TRUE)
addtimer(CALLBACK(src, PROC_REF(harmbaton_loop), source, rand(5, 12)), 2 SECONDS)
@@ -126,7 +126,7 @@
/datum/hallucination/battle/e_sword/start()
var/turf/source = random_far_turf()
hallucinator.playsound_local(source, 'sound/weapons/saberon.ogg', 15, 1)
hallucinator.playsound_local(source, 'sound/items/weapons/saberon.ogg', 15, 1)
addtimer(CALLBACK(src, PROC_REF(stab_loop), source, rand(4, 8)), CLICK_CD_MELEE)
return TRUE
@@ -136,10 +136,10 @@
return
if(stabs_remaining >= 1)
hallucinator.playsound_local(source, 'sound/weapons/blade1.ogg', 50, TRUE)
hallucinator.playsound_local(source, 'sound/items/weapons/blade1.ogg', 50, TRUE)
else
hallucinator.playsound_local(source, 'sound/weapons/saberoff.ogg', 15, TRUE)
hallucinator.playsound_local(source, 'sound/items/weapons/saberoff.ogg', 15, TRUE)
qdel(src)
return
code/modules/hallucination/bolted_airlocks.dm
+2 -2
View File
@@ -102,11 +102,11 @@
/obj/effect/client_image_holder/hallucination/fake_door_lock/show_image_to(mob/show_to)
. = ..()
show_to.playsound_local(get_turf(src), 'sound/machines/boltsdown.ogg', 30, FALSE, 3)
show_to.playsound_local(get_turf(src), 'sound/machines/airlock/boltsdown.ogg', 30, FALSE, 3)
/obj/effect/client_image_holder/hallucination/fake_door_lock/hide_image_from(mob/show_to)
. = ..()
show_to.playsound_local(get_turf(src), 'sound/machines/boltsup.ogg', 30, FALSE, 3)
show_to.playsound_local(get_turf(src), 'sound/machines/airlock/boltsup.ogg', 30, FALSE, 3)
/obj/effect/client_image_holder/hallucination/fake_door_lock/proc/on_airlock_deleted(datum/source)
SIGNAL_HANDLER
code/modules/hallucination/delusions.dm
+2 -2
View File
@@ -94,7 +94,7 @@
if(play_wabbajack)
to_chat(hallucinator, span_hear("...wabbajack...wabbajack..."))
hallucinator.playsound_local(get_turf(hallucinator), 'sound/magic/staff_change.ogg', 50, TRUE)
hallucinator.playsound_local(get_turf(hallucinator), 'sound/effects/magic/staff_change.ogg', 50, TRUE)
if(duration > 0)
QDEL_IN(src, duration)
@@ -191,7 +191,7 @@
/datum/hallucination/delusion/preset/cyborg/make_delusion_image(mob/over_who)
. = ..()
hallucinator.playsound_local(get_turf(over_who), 'sound/voice/liveagain.ogg', 75, TRUE)
hallucinator.playsound_local(get_turf(over_who), 'sound/mobs/non-humanoids/cyborg/liveagain.ogg', 75, TRUE)
/datum/hallucination/delusion/preset/ghost
delusion_icon_file = 'icons/mob/simple/mob.dmi'
code/modules/hallucination/fake_sound.dm
+54 -54
View File
@@ -34,28 +34,28 @@
/datum/hallucination/fake_sound/normal/airlock
volume = 30
sound_type = 'sound/machines/airlock.ogg'
sound_type = 'sound/machines/airlock/airlock.ogg'
/datum/hallucination/fake_sound/normal/airlock_pry
volume = 100
sound_type = 'sound/machines/airlock_alien_prying.ogg'
sound_type = 'sound/machines/airlock/airlock_alien_prying.ogg'
/datum/hallucination/fake_sound/normal/airlock_pry/play_fake_sound(turf/source, sound_to_play)
. = ..()
queue_fake_sound(source, 'sound/machines/airlockforced.ogg', 50, TRUE, delay = 5 SECONDS)
queue_fake_sound(source, 'sound/machines/airlock/airlockforced.ogg', 50, TRUE, delay = 5 SECONDS)
/datum/hallucination/fake_sound/normal/console
volume = 25
sound_type = 'sound/machines/terminal_prompt.ogg'
sound_type = 'sound/machines/terminal/terminal_prompt.ogg'
/datum/hallucination/fake_sound/normal/boom
sound_type = list('sound/effects/explosion1.ogg', 'sound/effects/explosion2.ogg')
sound_type = list('sound/effects/explosion/explosion1.ogg', 'sound/effects/explosion/explosion2.ogg')
/datum/hallucination/fake_sound/normal/distant_boom
sound_type = 'sound/effects/explosionfar.ogg'
sound_type = 'sound/effects/explosion/explosionfar.ogg'
/datum/hallucination/fake_sound/normal/glass
sound_type = list('sound/effects/glassbr1.ogg', 'sound/effects/glassbr2.ogg', 'sound/effects/glassbr3.ogg')
sound_type = list('sound/effects/glass/glassbr1.ogg', 'sound/effects/glass/glassbr2.ogg', 'sound/effects/glass/glassbr3.ogg')
/datum/hallucination/fake_sound/normal/alarm
volume = 100
@@ -63,11 +63,11 @@
/datum/hallucination/fake_sound/normal/beepsky
volume = 35
sound_type = 'sound/voice/beepsky/freeze.ogg'
sound_type = 'sound/mobs/non-humanoids/beepsky/freeze.ogg'
/datum/hallucination/fake_sound/normal/mech
volume = 40
sound_type = 'sound/mecha/mechstep.ogg'
sound_type = 'sound/vehicles/mecha/mechstep.ogg'
/// The turf the mech started walking from.
var/turf/mech_source
/// What dir is the mech walking?
@@ -106,15 +106,15 @@
addtimer(CALLBACK(src, PROC_REF(mech_walk)), 1 SECONDS)
/datum/hallucination/fake_sound/normal/wall_deconstruction
sound_type = 'sound/items/welder.ogg'
sound_type = 'sound/items/tools/welder.ogg'
/datum/hallucination/fake_sound/normal/wall_deconstruction/play_fake_sound(turf/source, sound_to_play)
. = ..()
queue_fake_sound(source, 'sound/items/welder2.ogg', delay = 10.5 SECONDS)
queue_fake_sound(source, 'sound/items/ratchet.ogg', delay = 12 SECONDS)
queue_fake_sound(source, 'sound/items/tools/welder2.ogg', delay = 10.5 SECONDS)
queue_fake_sound(source, 'sound/items/tools/ratchet.ogg', delay = 12 SECONDS)
/datum/hallucination/fake_sound/normal/door_hacking
sound_type = 'sound/items/screwdriver.ogg'
sound_type = 'sound/items/tools/screwdriver.ogg'
volume = 30
/datum/hallucination/fake_sound/normal/door_hacking/play_fake_sound(turf/source, sound_to_play)
@@ -124,20 +124,20 @@
var/hacking_time = rand(4 SECONDS, 8 SECONDS)
// Multitool sound.
queue_fake_sound(source, 'sound/weapons/empty.ogg', delay = 0.8 SECONDS)
queue_fake_sound(source, 'sound/items/weapons/empty.ogg', delay = 0.8 SECONDS)
if(hacking_time > 4.5 SECONDS)
// Another multitool sound if the hacking time is long.
queue_fake_sound(source, 'sound/weapons/empty.ogg', delay = 3 SECONDS)
queue_fake_sound(source, 'sound/items/weapons/empty.ogg', delay = 3 SECONDS)
if(prob(50))
// Bonus multitool sound, rapidly after the last.
queue_fake_sound(source, 'sound/weapons/empty.ogg', delay = 3.5 SECONDS)
queue_fake_sound(source, 'sound/items/weapons/empty.ogg', delay = 3.5 SECONDS)
if(hacking_time > 5.5 SECONDS)
// A final multitool sound if the hacking time is very long.
queue_fake_sound(source, 'sound/weapons/empty.ogg', delay = 5 SECONDS)
queue_fake_sound(source, 'sound/items/weapons/empty.ogg', delay = 5 SECONDS)
// Crowbarring it open.
queue_fake_sound(source, 'sound/machines/airlockforced.ogg', delay = hacking_time)
queue_fake_sound(source, 'sound/machines/airlock/airlockforced.ogg', delay = hacking_time)
/datum/hallucination/fake_sound/normal/steam
volume = 75
@@ -146,7 +146,7 @@
/datum/hallucination/fake_sound/normal/flash
random_hallucination_weight = 2 // "it's revs"
volume = 90
sound_type = 'sound/weapons/flash.ogg'
sound_type = 'sound/items/weapons/flash.ogg'
/datum/hallucination/fake_sound/weird
abstract_hallucination_parent = /datum/hallucination/fake_sound/weird
@@ -167,24 +167,24 @@
sound_vary = FALSE
no_source = TRUE
sound_type = list(
'sound/ambience/antag/bloodcult/bloodcult_gain.ogg',
'sound/ambience/antag/clockcultalr.ogg',
'sound/ambience/antag/heretic/heretic_gain.ogg',
'sound/ambience/antag/ling_alert.ogg',
'sound/ambience/antag/malf.ogg',
'sound/ambience/antag/ops.ogg',
'sound/ambience/antag/spy.ogg',
'sound/ambience/antag/tatoralert.ogg',
'sound/music/antag/bloodcult/bloodcult_gain.ogg',
'sound/music/antag/clockcultalr.ogg',
'sound/music/antag/heretic/heretic_gain.ogg',
'sound/music/antag/ling_alert.ogg',
'sound/music/antag/malf.ogg',
'sound/music/antag/ops.ogg',
'sound/music/antag/spy.ogg',
'sound/music/antag/traitor/tatoralert.ogg',
)
/datum/hallucination/fake_sound/weird/chimp_event
volume = 90
sound_vary = FALSE
no_source = TRUE
sound_type = 'sound/ambience/antag/monkey.ogg'
sound_type = 'sound/music/antag/monkey.ogg'
/datum/hallucination/fake_sound/weird/colossus
sound_type = 'sound/magic/clockwork/invoke_general.ogg'
sound_type = 'sound/effects/magic/clockwork/invoke_general.ogg'
/datum/hallucination/fake_sound/weird/creepy
@@ -197,11 +197,11 @@
volume = 40
sound_vary = FALSE
no_source = TRUE
sound_type = 'sound/magic/curse.ogg'
sound_type = 'sound/effects/magic/curse.ogg'
/datum/hallucination/fake_sound/weird/game_over
sound_vary = FALSE
sound_type = 'sound/misc/compiler-failure.ogg'
sound_type = 'sound/machines/compiler/compiler-failure.ogg'
/datum/hallucination/fake_sound/weird/hallelujah
sound_vary = FALSE
@@ -219,15 +219,15 @@
/datum/hallucination/fake_sound/weird/laugher
sound_type = list(
'sound/voice/human/womanlaugh.ogg',
'sound/voice/human/manlaugh1.ogg',
'sound/voice/human/manlaugh2.ogg',
'sound/mobs/humanoids/human/laugh/womanlaugh.ogg',
'sound/mobs/humanoids/human/laugh/manlaugh1.ogg',
'sound/mobs/humanoids/human/laugh/manlaugh2.ogg',
)
/datum/hallucination/fake_sound/weird/phone
volume = 15
sound_vary = FALSE
sound_type = 'sound/weapons/ring.ogg'
sound_type = 'sound/items/weapons/ring.ogg'
/datum/hallucination/fake_sound/weird/phone/play_fake_sound(turf/source, sound_to_play)
for(var/next_ring in 1 to 3)
@@ -237,25 +237,25 @@
/datum/hallucination/fake_sound/weird/spell
sound_type = list(
'sound/magic/disintegrate.ogg',
'sound/magic/ethereal_enter.ogg',
'sound/magic/ethereal_exit.ogg',
'sound/magic/fireball.ogg',
'sound/magic/forcewall.ogg',
'sound/magic/teleport_app.ogg',
'sound/magic/teleport_diss.ogg',
'sound/effects/magic/disintegrate.ogg',
'sound/effects/magic/ethereal_enter.ogg',
'sound/effects/magic/ethereal_exit.ogg',
'sound/effects/magic/fireball.ogg',
'sound/effects/magic/forcewall.ogg',
'sound/effects/magic/teleport_app.ogg',
'sound/effects/magic/teleport_diss.ogg',
)
/datum/hallucination/fake_sound/weird/spell/just_jaunt // A few antags use jaunts, so this sound specifically is fun to isolate
sound_type = 'sound/magic/ethereal_enter.ogg'
sound_type = 'sound/effects/magic/ethereal_enter.ogg'
/datum/hallucination/fake_sound/weird/summon_sound // Heretic circle sound, notably
volume = 75
sound_type = 'sound/magic/castsummon.ogg'
sound_type = 'sound/effects/magic/castsummon.ogg'
/datum/hallucination/fake_sound/weird/tesloose
volume = 35
sound_type = 'sound/magic/lightningbolt.ogg'
sound_type = 'sound/effects/magic/lightningbolt.ogg'
/datum/hallucination/fake_sound/weird/tesloose/play_fake_sound(turf/source, sound_to_play)
. = ..()
@@ -266,21 +266,21 @@
random_hallucination_weight = 2 // Some of these are ambience sounds too
volume = 25
sound_type = list(
'sound/voice/lowHiss1.ogg',
'sound/voice/lowHiss2.ogg',
'sound/voice/lowHiss3.ogg',
'sound/voice/lowHiss4.ogg',
'sound/voice/hiss1.ogg',
'sound/voice/hiss2.ogg',
'sound/voice/hiss3.ogg',
'sound/voice/hiss4.ogg',
'sound/mobs/non-humanoids/hiss/lowHiss1.ogg',
'sound/mobs/non-humanoids/hiss/lowHiss2.ogg',
'sound/mobs/non-humanoids/hiss/lowHiss3.ogg',
'sound/mobs/non-humanoids/hiss/lowHiss4.ogg',
'sound/mobs/non-humanoids/hiss/hiss1.ogg',
'sound/mobs/non-humanoids/hiss/hiss2.ogg',
'sound/mobs/non-humanoids/hiss/hiss3.ogg',
'sound/mobs/non-humanoids/hiss/hiss4.ogg',
)
/datum/hallucination/fake_sound/weird/radio_static
volume = 75
no_source = TRUE
sound_vary = FALSE
sound_type = 'sound/hallucinations/radio_static.ogg'
sound_type = 'sound/effects/hallucinations/radio_static.ogg'
/datum/hallucination/fake_sound/weird/ice_crack
random_hallucination_weight = 2
code/modules/hallucination/inhand_fake_item.dm
+2 -2
View File
@@ -72,7 +72,7 @@
var/obj/item/melee/energy/sword/saber/sabre_color = pick(subtypesof(/obj/item/melee/energy/sword/saber))
// Yes this can break if someone changes esword icon stuff
hallucinated_item.icon_state = "[hallucinated_item.icon_state]_on_[initial(sabre_color.sword_color_icon)]"
hallucinator.playsound_local(get_turf(hallucinator), 'sound/weapons/saberon.ogg', 35, TRUE)
hallucinator.playsound_local(get_turf(hallucinator), 'sound/items/weapons/saberon.ogg', 35, TRUE)
return hallucinated_item
@@ -109,7 +109,7 @@
if(prob(15))
// Yes this can break if someone changse grenade icon stuff
hallucinated_item.icon_state = "[hallucinated_item.icon_state]_active"
hallucinator.playsound_local(get_turf(hallucinator), 'sound/weapons/armbomb.ogg', 60, TRUE)
hallucinator.playsound_local(get_turf(hallucinator), 'sound/items/weapons/armbomb.ogg', 60, TRUE)
to_chat(hallucinator, span_warning("You prime [hallucinated_item]! 5 seconds!"))
return hallucinated_item
code/modules/hallucination/nearby_fake_item.dm
+4 -4
View File
@@ -67,12 +67,12 @@
image_icon_state = "e_sword_on_red"
/datum/hallucination/nearby_fake_item/e_sword/generate_fake_image(mob/living/carbon/human/holder, file)
hallucinator.playsound_local(get_turf(holder), 'sound/weapons/saberon.ogg', 35, TRUE)
hallucinator.playsound_local(get_turf(holder), 'sound/items/weapons/saberon.ogg', 35, TRUE)
return ..()
/datum/hallucination/nearby_fake_item/e_sword/remove_image(mob/living/carbon/human/holder)
if(!QDELETED(holder))
hallucinator.playsound_local(get_turf(holder), 'sound/weapons/saberoff.ogg', 35, TRUE)
hallucinator.playsound_local(get_turf(holder), 'sound/items/weapons/saberoff.ogg', 35, TRUE)
return ..()
/datum/hallucination/nearby_fake_item/e_sword/double_bladed
@@ -115,12 +115,12 @@
image_icon_state = "arm_blade"
/datum/hallucination/nearby_fake_item/armblade/generate_fake_image(mob/living/carbon/human/holder, file)
hallucinator.playsound_local(get_turf(holder), 'sound/effects/blobattack.ogg', 35, TRUE)
hallucinator.playsound_local(get_turf(holder), 'sound/effects/blob/blobattack.ogg', 35, TRUE)
return ..()
/datum/hallucination/nearby_fake_item/armblade/remove_image(mob/living/carbon/human/holder)
if(!QDELETED(holder))
hallucinator.playsound_local(get_turf(holder), 'sound/effects/blobattack.ogg', 35, TRUE)
hallucinator.playsound_local(get_turf(holder), 'sound/effects/blob/blobattack.ogg', 35, TRUE)
return ..()
/datum/hallucination/nearby_fake_item/ttv
code/modules/hallucination/station_message.dm
+8 -8
View File
@@ -42,23 +42,23 @@
var/static/list/ascension_bodies = list(
list(
"text" = "Fear the blaze, for the Ashlord, %FAKENAME% has ascended! The flames shall consume all!",
"sound" = 'sound/ambience/antag/heretic/ascend_blade.ogg',
"sound" = 'sound/music/antag/heretic/ascend_blade.ogg',
),
list(
"text" = "Master of blades, the Torn Champion's disciple, %FAKENAME% has ascended! Their steel is that which will cut reality in a maelstom of silver!",
"sound" = 'sound/ambience/antag/heretic/ascend_blade.ogg',
"sound" = 'sound/music/antag/heretic/ascend_blade.ogg',
),
list(
"text" = "Ever coiling vortex. Reality unfolded. ARMS OUTREACHED, THE LORD OF THE NIGHT, %FAKENAME% has ascended! Fear the ever twisting hand!",
"sound" = 'sound/ambience/antag/heretic/ascend_flesh.ogg',
"sound" = 'sound/music/antag/heretic/ascend_flesh.ogg',
),
list(
"text" = "Fear the decay, for the Rustbringer, %FAKENAME% has ascended! None shall escape the corrosion!",
"sound" = 'sound/ambience/antag/heretic/ascend_rust.ogg',
"sound" = 'sound/music/antag/heretic/ascend_rust.ogg',
),
list(
"text" = "The nobleman of void %FAKENAME% has arrived, stepping along the Waltz that ends worlds!",
"sound" = 'sound/ambience/antag/heretic/ascend_void.ogg',
"sound" = 'sound/music/antag/heretic/ascend_void.ogg',
)
)
@@ -95,7 +95,7 @@
priority_announce(
text = "Figments from an eldritch god are being summoned by [totally_real_cult_leader.real_name] into [fake_summon_area] from an unknown dimension. Disrupt the ritual at all costs!",
title = "[command_name()] Higher Dimensional Affairs",
sound = 'sound/ambience/antag/bloodcult/bloodcult_scribe.ogg',
sound = 'sound/music/antag/bloodcult/bloodcult_scribe.ogg',
has_important_message = TRUE,
players = list(hallucinator),
)
@@ -111,7 +111,7 @@
/datum/hallucination/station_message/supermatter_delam
/datum/hallucination/station_message/supermatter_delam/start()
SEND_SOUND(hallucinator, 'sound/magic/charge.ogg')
SEND_SOUND(hallucinator, 'sound/effects/magic/charge.ogg')
to_chat(hallucinator, span_boldannounce("You feel reality distort for a moment..."))
return ..()
@@ -129,5 +129,5 @@
if(QDELETED(src))
return
hallucinator.playsound_local(get_turf(hallucinator), 'sound/effects/explosion_distant.ogg', 50, FALSE, pressure_affected = FALSE)
hallucinator.playsound_local(get_turf(hallucinator), 'sound/effects/explosion/explosion_distant.ogg', 50, FALSE, pressure_affected = FALSE)
qdel(src)
code/modules/hallucination/stray_bullet.dm
+12 -12
View File
@@ -189,7 +189,7 @@
name = "bullet"
hal_icon_state = "bullet"
hal_fire_sound = "gunshot"
hal_hitsound = 'sound/weapons/pierce.ogg'
hal_hitsound = 'sound/items/weapons/pierce.ogg'
hal_hitsound_wall = SFX_RICOCHET
hal_impact_effect = "impact_bullet"
hal_impact_effect_wall = "impact_bullet"
@@ -203,9 +203,9 @@
name = "laser"
damage_type = BURN
hal_icon_state = "laser"
hal_fire_sound = 'sound/weapons/laser.ogg'
hal_hitsound = 'sound/weapons/sear.ogg'
hal_hitsound_wall = 'sound/weapons/effects/searwall.ogg'
hal_fire_sound = 'sound/items/weapons/laser.ogg'
hal_hitsound = 'sound/items/weapons/sear.ogg'
hal_hitsound_wall = 'sound/items/weapons/effects/searwall.ogg'
hal_impact_effect = "impact_laser"
hal_impact_effect_wall = "impact_laser_wall"
hit_duration = 4
@@ -225,8 +225,8 @@
damage_type = BURN
hal_icon_state = "spark"
color = COLOR_YELLOW
hal_fire_sound = 'sound/weapons/taser.ogg'
hal_hitsound = 'sound/weapons/taserhit.ogg'
hal_fire_sound = 'sound/items/weapons/taser.ogg'
hal_hitsound = 'sound/items/weapons/taserhit.ogg'
hal_hitsound_wall = null
hal_impact_effect = null
hal_impact_effect_wall = null
@@ -250,9 +250,9 @@
name = "disabler beam"
damage_type = STAMINA
hal_icon_state = "omnilaser"
hal_fire_sound = 'sound/weapons/taser2.ogg'
hal_hitsound = 'sound/weapons/tap.ogg'
hal_hitsound_wall = 'sound/weapons/effects/searwall.ogg'
hal_fire_sound = 'sound/items/weapons/taser2.ogg'
hal_hitsound = 'sound/items/weapons/tap.ogg'
hal_hitsound_wall = 'sound/items/weapons/effects/searwall.ogg'
hal_impact_effect = "impact_laser_blue"
hal_impact_effect_wall = null
hit_duration = 4
@@ -269,7 +269,7 @@
name = "bolt"
damage_type = TOX
hal_icon_state = "cbbolt"
hal_fire_sound = 'sound/weapons/genhit.ogg'
hal_fire_sound = 'sound/items/weapons/genhit.ogg'
hal_hitsound = null
hal_hitsound_wall = null
hal_impact_effect = null
@@ -285,7 +285,7 @@
name = "bolt of change"
damage_type = BURN
hal_icon_state = "ice_1"
hal_fire_sound = 'sound/magic/staff_change.ogg'
hal_fire_sound = 'sound/effects/magic/staff_change.ogg'
hal_hitsound = null
hal_hitsound_wall = null
hal_impact_effect = null
@@ -307,7 +307,7 @@
name = "bolt of death"
damage_type = BURN
hal_icon_state = "pulse1_bl"
hal_fire_sound = 'sound/magic/wandodeath.ogg'
hal_fire_sound = 'sound/effects/magic/wandodeath.ogg'
hal_hitsound = null
hal_hitsound_wall = null
hal_impact_effect = null