cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 14:39:58 +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
_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm
+1 -1
View File
@@ -66,7 +66,7 @@
/obj/effect/step_trigger/sound_effect{
happens_once = 1;
name = "\proper a grave mistake";
sound = 'sound/hallucinations/i_see_you1.ogg';
sound = 'sound/effects/hallucinations/i_see_you1.ogg';
triggerer_only = 1
},
/obj/effect/step_trigger/message{
_maps/shuttles/whiteship_kilo.dmm
+2 -2
View File
@@ -403,9 +403,9 @@
dir = 4;
name = "Old Mining Turret";
lethal_projectile = /obj/projectile/kinetic/miner;
lethal_projectile_sound = 'sound/weapons/kinetic_accel.ogg';
lethal_projectile_sound = 'sound/items/weapons/kinetic_accel.ogg';
stun_projectile = /obj/projectile/kinetic/miner;
stun_projectile_sound = 'sound/weapons/kinetic_accel.ogg'
stun_projectile_sound = 'sound/items/weapons/kinetic_accel.ogg'
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned/bar)
code/__DEFINES/footsteps.dm
+16 -16
View File
@@ -84,10 +84,10 @@ GLOBAL_LIST_INIT(footstep, list(
'sound/effects/footstep/grass3.ogg',
'sound/effects/footstep/grass4.ogg'), 75, 0),
FOOTSTEP_WATER = list(list(
'sound/effects/footstep/water1.ogg',
'sound/effects/footstep/water2.ogg',
'sound/effects/footstep/water3.ogg',
'sound/effects/footstep/water4.ogg'), 100, 1),
'sound/effects/footstep/water/water1.ogg',
'sound/effects/footstep/water/water2.ogg',
'sound/effects/footstep/water/water3.ogg',
'sound/effects/footstep/water/water4.ogg'), 100, 1),
FOOTSTEP_LAVA = list(list(
'sound/effects/footstep/lava1.ogg',
'sound/effects/footstep/lava2.ogg',
@@ -134,10 +134,10 @@ GLOBAL_LIST_INIT(barefootstep, list(
'sound/effects/footstep/grass3.ogg',
'sound/effects/footstep/grass4.ogg'), 75, 0),
FOOTSTEP_WATER = list(list(
'sound/effects/footstep/water1.ogg',
'sound/effects/footstep/water2.ogg',
'sound/effects/footstep/water3.ogg',
'sound/effects/footstep/water4.ogg'), 100, 1),
'sound/effects/footstep/water/water1.ogg',
'sound/effects/footstep/water/water2.ogg',
'sound/effects/footstep/water/water3.ogg',
'sound/effects/footstep/water/water4.ogg'), 100, 1),
FOOTSTEP_LAVA = list(list(
'sound/effects/footstep/lava1.ogg',
'sound/effects/footstep/lava2.ogg',
@@ -178,10 +178,10 @@ GLOBAL_LIST_INIT(clawfootstep, list(
'sound/effects/footstep/grass3.ogg',
'sound/effects/footstep/grass4.ogg'), 75, 0),
FOOTSTEP_WATER = list(list(
'sound/effects/footstep/water1.ogg',
'sound/effects/footstep/water2.ogg',
'sound/effects/footstep/water3.ogg',
'sound/effects/footstep/water4.ogg'), 100, 1),
'sound/effects/footstep/water/water1.ogg',
'sound/effects/footstep/water/water2.ogg',
'sound/effects/footstep/water/water3.ogg',
'sound/effects/footstep/water/water4.ogg'), 100, 1),
FOOTSTEP_LAVA = list(list(
'sound/effects/footstep/lava1.ogg',
'sound/effects/footstep/lava2.ogg',
@@ -196,10 +196,10 @@ GLOBAL_LIST_INIT(heavyfootstep, list(
'sound/effects/footstep/heavy1.ogg',
'sound/effects/footstep/heavy2.ogg'), 100, 2),
FOOTSTEP_WATER = list(list(
'sound/effects/footstep/water1.ogg',
'sound/effects/footstep/water2.ogg',
'sound/effects/footstep/water3.ogg',
'sound/effects/footstep/water4.ogg'), 100, 2),
'sound/effects/footstep/water/water1.ogg',
'sound/effects/footstep/water/water2.ogg',
'sound/effects/footstep/water/water3.ogg',
'sound/effects/footstep/water/water4.ogg'), 100, 2),
FOOTSTEP_LAVA = list(list(
'sound/effects/footstep/lava1.ogg',
'sound/effects/footstep/lava2.ogg',
code/__HELPERS/honkerblast.dm
+1 -1
View File
@@ -5,7 +5,7 @@
var/list/properly_honked = list()
var/list/severely_honked = list()
playsound(origin_turf, 'sound/items/airhorn.ogg', 100, TRUE)
playsound(origin_turf, 'sound/items/airhorn/airhorn.ogg', 100, TRUE)
for(var/mob/living/carbon/victim as anything in hearers(max(light_range, medium_range, heavy_range), origin_turf))
if(!victim.can_hear())
code/__HELPERS/priority_announce.dm
+2 -2
View File
@@ -142,7 +142,7 @@
else
finalized_announcement = CHAT_ALERT_DEFAULT_SPAN(jointext(minor_announcement_strings, ""))
var/custom_sound = sound_override || (alert ? 'sound/misc/notice1.ogg' : 'sound/misc/notice2.ogg')
var/custom_sound = sound_override || (alert ? 'sound/announcer/notice/notice1.ogg' : 'sound/announcer/notice/notice2.ogg')
dispatch_announcement_to_players(finalized_announcement, players, custom_sound, should_play_sound)
/// Sends an announcement about the level changing to players. Uses the passed in datum and the subsystem's previous security level to generate the message.
@@ -186,7 +186,7 @@
/// Proc that just dispatches the announcement to our applicable audience. Only the announcement is a mandatory arg.
/proc/dispatch_announcement_to_players(announcement, list/players = GLOB.player_list, sound_override = null, should_play_sound = TRUE)
var/sound_to_play = !isnull(sound_override) ? sound_override : 'sound/misc/notice2.ogg'
var/sound_to_play = !isnull(sound_override) ? sound_override : 'sound/announcer/notice/notice2.ogg'
for(var/mob/target in players)
if(isnewplayer(target) || !target.can_hear())
code/_globalvars/lists/achievements.dm
+3 -3
View File
@@ -3,7 +3,7 @@ GLOBAL_LIST_EMPTY(commendations)
GLOBAL_LIST_INIT(achievement_categories, list("Bosses", "Jobs", "Skills", "Misc", "Mafia", "Scores"))
///A list of sounds that can be played when unlocking an achievement, set in the preferences.
GLOBAL_LIST_INIT(achievement_sounds, list(
CHEEVO_SOUND_PING = sound('sound/effects/glockenspiel_ping.ogg', volume = 70),
CHEEVO_SOUND_JINGLE = sound('sound/effects/beeps_jingle.ogg', volume = 70),
CHEEVO_SOUND_TADA = sound('sound/effects/tada_fanfare.ogg', volume = 30),
CHEEVO_SOUND_PING = sound('sound/effects/achievement/glockenspiel_ping.ogg', volume = 70),
CHEEVO_SOUND_JINGLE = sound('sound/effects/achievement/beeps_jingle.ogg', volume = 70),
CHEEVO_SOUND_TADA = sound('sound/effects/achievement/tada_fanfare.ogg', volume = 30),
))
code/_globalvars/lists/ambience.dm
+143 -143
View File
@@ -1,167 +1,167 @@
GLOBAL_LIST_INIT(generic_ambience,list(
'sound/ambience/ambigen1.ogg',
'sound/ambience/ambigen2.ogg',
'sound/ambience/ambigen3.ogg',
'sound/ambience/ambigen4.ogg',
'sound/ambience/ambigen5.ogg',
'sound/ambience/ambigen6.ogg',
'sound/ambience/ambigen7.ogg',
'sound/ambience/ambigen8.ogg',
'sound/ambience/ambigen9.ogg',
'sound/ambience/ambigen10.ogg',
'sound/ambience/ambigen11.ogg',
'sound/ambience/ambigen13.ogg',
'sound/ambience/ambigen14.ogg',
'sound/ambience/general/ambigen1.ogg',
'sound/ambience/general/ambigen2.ogg',
'sound/ambience/general/ambigen3.ogg',
'sound/ambience/general/ambigen4.ogg',
'sound/ambience/general/ambigen5.ogg',
'sound/ambience/general/ambigen6.ogg',
'sound/ambience/general/ambigen7.ogg',
'sound/ambience/general/ambigen8.ogg',
'sound/ambience/general/ambigen9.ogg',
'sound/ambience/general/ambigen10.ogg',
'sound/ambience/general/ambigen11.ogg',
'sound/ambience/general/ambigen13.ogg',
'sound/ambience/general/ambigen14.ogg',
))
GLOBAL_LIST_INIT(holy_ambience,list(
'sound/ambience/ambicha1.ogg',
'sound/ambience/ambicha2.ogg',
'sound/ambience/ambicha3.ogg',
'sound/ambience/ambicha4.ogg',
'sound/ambience/ambiholy.ogg',
'sound/ambience/ambiholy2.ogg',
'sound/ambience/ambiholy3.ogg',
'sound/ambience/holy/ambicha1.ogg',
'sound/ambience/holy/ambicha2.ogg',
'sound/ambience/holy/ambicha3.ogg',
'sound/ambience/holy/ambicha4.ogg',
'sound/ambience/holy/ambiholy.ogg',
'sound/ambience/holy/ambiholy2.ogg',
'sound/ambience/holy/ambiholy3.ogg',
))
GLOBAL_LIST_INIT(danger_ambience,list(
'sound/ambience/ambidanger.ogg',
'sound/ambience/ambidanger2.ogg',
'sound/ambience/misc/ambidanger.ogg',
'sound/ambience/misc/ambidanger2.ogg',
))
GLOBAL_LIST_INIT(ruins_ambience,list(
'sound/ambience/ambicave.ogg',
'sound/ambience/ambidanger.ogg',
'sound/ambience/ambidanger2.ogg',
'sound/ambience/ambimaint1.ogg',
'sound/ambience/ambimine.ogg',
'sound/ambience/ambimystery.ogg',
'sound/ambience/ambiruin.ogg',
'sound/ambience/ambiruin2.ogg',
'sound/ambience/ambiruin3.ogg',
'sound/ambience/ambiruin4.ogg',
'sound/ambience/ambiruin5.ogg',
'sound/ambience/ambiruin6.ogg',
'sound/ambience/ambiruin7.ogg',
'sound/ambience/ambitech3.ogg',
'sound/ambience/lavaland/ambicave.ogg',
'sound/ambience/misc/ambidanger.ogg',
'sound/ambience/misc/ambidanger2.ogg',
'sound/ambience/maintenance/ambimaint1.ogg',
'sound/ambience/ruin/ambimine.ogg',
'sound/ambience/misc/ambimystery.ogg',
'sound/ambience/ruin/ambiruin.ogg',
'sound/ambience/ruin/ambiruin2.ogg',
'sound/ambience/ruin/ambiruin3.ogg',
'sound/ambience/ruin/ambiruin4.ogg',
'sound/ambience/ruin/ambiruin5.ogg',
'sound/ambience/ruin/ambiruin6.ogg',
'sound/ambience/ruin/ambiruin7.ogg',
'sound/ambience/engineering/ambitech3.ogg',
))
GLOBAL_LIST_INIT(engi_ambience,list(
'sound/ambience/ambiatmos.ogg',
'sound/ambience/ambiatmos2.ogg',
'sound/ambience/ambisin1.ogg',
'sound/ambience/ambisin2.ogg',
'sound/ambience/ambisin3.ogg',
'sound/ambience/ambisin4.ogg',
'sound/ambience/ambitech.ogg',
'sound/ambience/ambitech2.ogg',
'sound/ambience/ambitech3.ogg',
'sound/ambience/engineering/ambiatmos.ogg',
'sound/ambience/engineering/ambiatmos2.ogg',
'sound/ambience/engineering/ambisin1.ogg',
'sound/ambience/engineering/ambisin2.ogg',
'sound/ambience/engineering/ambisin3.ogg',
'sound/ambience/engineering/ambisin4.ogg',
'sound/ambience/engineering/ambitech.ogg',
'sound/ambience/engineering/ambitech2.ogg',
'sound/ambience/engineering/ambitech3.ogg',
))
GLOBAL_LIST_INIT(mining_ambience, list(
'sound/ambience/ambicave.ogg',
'sound/ambience/ambidanger.ogg',
'sound/ambience/ambidanger2.ogg',
'sound/ambience/ambilava1.ogg',
'sound/ambience/ambilava2.ogg',
'sound/ambience/ambilava3.ogg',
'sound/ambience/ambimaint1.ogg',
'sound/ambience/ambimine.ogg',
'sound/ambience/ambiruin.ogg',
'sound/ambience/ambiruin2.ogg',
'sound/ambience/ambiruin3.ogg',
'sound/ambience/ambiruin4.ogg',
'sound/ambience/ambiruin5.ogg',
'sound/ambience/ambiruin6.ogg',
'sound/ambience/ambiruin7.ogg',
'sound/ambience/lavaland/ambicave.ogg',
'sound/ambience/misc/ambidanger.ogg',
'sound/ambience/misc/ambidanger2.ogg',
'sound/ambience/lavaland/ambilava1.ogg',
'sound/ambience/lavaland/ambilava2.ogg',
'sound/ambience/lavaland/ambilava3.ogg',
'sound/ambience/maintenance/ambimaint1.ogg',
'sound/ambience/ruin/ambimine.ogg',
'sound/ambience/ruin/ambiruin.ogg',
'sound/ambience/ruin/ambiruin2.ogg',
'sound/ambience/ruin/ambiruin3.ogg',
'sound/ambience/ruin/ambiruin4.ogg',
'sound/ambience/ruin/ambiruin5.ogg',
'sound/ambience/ruin/ambiruin6.ogg',
'sound/ambience/ruin/ambiruin7.ogg',
))
GLOBAL_LIST_INIT(icemoon_ambience,list(
'sound/ambience/ambiicetheme.ogg',
'sound/ambience/ambiicemelody1.ogg',
'sound/ambience/ambiicemelody2.ogg',
'sound/ambience/ambiicemelody3.ogg',
'sound/ambience/ambiicemelody4.ogg',
'sound/ambience/ambiicesting1.ogg',
'sound/ambience/ambiicesting2.ogg',
'sound/ambience/ambiicesting3.ogg',
'sound/ambience/ambiicesting4.ogg',
'sound/ambience/ambiicesting5.ogg',
'sound/ambience/icemoon/ambiicetheme.ogg',
'sound/ambience/icemoon/ambiicemelody1.ogg',
'sound/ambience/icemoon/ambiicemelody2.ogg',
'sound/ambience/icemoon/ambiicemelody3.ogg',
'sound/ambience/icemoon/ambiicemelody4.ogg',
'sound/ambience/icemoon/ambiicesting1.ogg',
'sound/ambience/icemoon/ambiicesting2.ogg',
'sound/ambience/icemoon/ambiicesting3.ogg',
'sound/ambience/icemoon/ambiicesting4.ogg',
'sound/ambience/icemoon/ambiicesting5.ogg',
))
GLOBAL_LIST_INIT(medical_ambience,list(
'sound/ambience/ambinice.ogg',
'sound/ambience/medical/ambinice.ogg',
))
GLOBAL_LIST_INIT(virology_ambience,list(
'sound/ambience/ambiviro.ogg',
'sound/ambience/ambiviro1.ogg',
'sound/ambience/ambiviro2.ogg',
'sound/ambience/medical/ambiviro.ogg',
'sound/ambience/medical/ambiviro1.ogg',
'sound/ambience/medical/ambiviro2.ogg',
))
GLOBAL_LIST_INIT(spooky_ambience,list(
'sound/ambience/ambimo1.ogg',
'sound/ambience/ambimo2.ogg',
'sound/ambience/ambimystery.ogg',
'sound/ambience/ambiodd.ogg',
'sound/ambience/ambiruin6.ogg',
'sound/ambience/ambiruin7.ogg',
'sound/ambience/medical/ambimo1.ogg',
'sound/ambience/medical/ambimo2.ogg',
'sound/ambience/misc/ambimystery.ogg',
'sound/ambience/misc/ambiodd.ogg',
'sound/ambience/ruin/ambiruin6.ogg',
'sound/ambience/ruin/ambiruin7.ogg',
))
GLOBAL_LIST_INIT(space_ambience,list(
'sound/ambience/ambiatmos.ogg',
'sound/ambience/ambispace.ogg',
'sound/ambience/ambispace2.ogg',
'sound/ambience/ambispace3.ogg',
'sound/ambience/ambispace4.ogg',
'sound/ambience/ambispace5.ogg',
'sound/ambience/ambispace6.ogg',
'sound/ambience/title2.ogg',
'sound/ambience/engineering/ambiatmos.ogg',
'sound/ambience/space/ambispace.ogg',
'sound/ambience/space/ambispace2.ogg',
'sound/ambience/space/ambispace3.ogg',
'sound/ambience/space/ambispace4.ogg',
'sound/ambience/space/ambispace5.ogg',
'sound/ambience/space/ambispace6.ogg',
'sound/music/lobby_music/title2.ogg',
))
GLOBAL_LIST_INIT(maint_ambience,list(
'sound/ambience/ambimaint1.ogg',
'sound/ambience/ambimaint2.ogg',
'sound/ambience/ambimaint3.ogg',
'sound/ambience/ambimaint4.ogg',
'sound/ambience/ambimaint5.ogg',
'sound/ambience/ambimaint6.ogg',
'sound/ambience/ambimaint7.ogg',
'sound/ambience/ambimaint8.ogg',
'sound/ambience/ambimaint9.ogg',
'sound/ambience/ambimaint10.ogg',
'sound/ambience/ambimaint11.ogg',
'sound/ambience/ambimaint12.ogg',
'sound/ambience/ambitech2.ogg',
'sound/voice/lowHiss1.ogg',
'sound/voice/lowHiss2.ogg',
'sound/voice/lowHiss3.ogg',
'sound/voice/lowHiss4.ogg',
'sound/ambience/maintambience.ogg',
'sound/ambience/maintenance/ambimaint1.ogg',
'sound/ambience/maintenance/ambimaint2.ogg',
'sound/ambience/maintenance/ambimaint3.ogg',
'sound/ambience/maintenance/ambimaint4.ogg',
'sound/ambience/maintenance/ambimaint5.ogg',
'sound/ambience/maintenance/ambimaint6.ogg',
'sound/ambience/maintenance/ambimaint7.ogg',
'sound/ambience/maintenance/ambimaint8.ogg',
'sound/ambience/maintenance/ambimaint9.ogg',
'sound/ambience/maintenance/ambimaint10.ogg',
'sound/ambience/maintenance/ambimaint11.ogg',
'sound/ambience/maintenance/ambimaint12.ogg',
'sound/ambience/engineering/ambitech2.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/ambience/maintenance/maintambience.ogg',
))
GLOBAL_LIST_INIT(away_ambience,list(
'sound/ambience/ambiatmos.ogg',
'sound/ambience/ambiatmos2.ogg',
'sound/ambience/ambidanger.ogg',
'sound/ambience/ambidanger2.ogg',
'sound/ambience/ambimaint.ogg',
'sound/ambience/ambiodd.ogg',
'sound/ambience/ambiruin.ogg',
'sound/ambience/ambiruin2.ogg',
'sound/ambience/ambiruin3.ogg',
'sound/ambience/ambiruin4.ogg',
'sound/ambience/ambiruin5.ogg',
'sound/ambience/ambiruin6.ogg',
'sound/ambience/ambiruin7.ogg',
'sound/ambience/ambitech.ogg',
'sound/ambience/ambitech2.ogg',
'sound/ambience/engineering/ambiatmos.ogg',
'sound/ambience/engineering/ambiatmos2.ogg',
'sound/ambience/misc/ambidanger.ogg',
'sound/ambience/misc/ambidanger2.ogg',
'sound/ambience/maintenance/ambimaint.ogg',
'sound/ambience/misc/ambiodd.ogg',
'sound/ambience/ruin/ambiruin.ogg',
'sound/ambience/ruin/ambiruin2.ogg',
'sound/ambience/ruin/ambiruin3.ogg',
'sound/ambience/ruin/ambiruin4.ogg',
'sound/ambience/ruin/ambiruin5.ogg',
'sound/ambience/ruin/ambiruin6.ogg',
'sound/ambience/ruin/ambiruin7.ogg',
'sound/ambience/engineering/ambitech.ogg',
'sound/ambience/engineering/ambitech2.ogg',
))
GLOBAL_LIST_INIT(reebe_ambience,list(
'sound/ambience/ambireebe1.ogg',
'sound/ambience/ambireebe2.ogg',
'sound/ambience/ambireebe3.ogg',
'sound/ambience/misc/ambireebe1.ogg',
'sound/ambience/misc/ambireebe2.ogg',
'sound/ambience/misc/ambireebe3.ogg',
))
GLOBAL_LIST_INIT(creepy_ambience,list(
@@ -169,25 +169,25 @@ GLOBAL_LIST_INIT(creepy_ambience,list(
'sound/effects/ghost2.ogg',
'sound/effects/heart_beat.ogg',
'sound/effects/screech.ogg',
'sound/hallucinations/behind_you1.ogg',
'sound/hallucinations/behind_you2.ogg',
'sound/hallucinations/far_noise.ogg',
'sound/hallucinations/growl1.ogg',
'sound/hallucinations/growl2.ogg',
'sound/hallucinations/growl3.ogg',
'sound/hallucinations/i_see_you1.ogg',
'sound/hallucinations/i_see_you2.ogg',
'sound/hallucinations/im_here1.ogg',
'sound/hallucinations/im_here2.ogg',
'sound/hallucinations/look_up1.ogg',
'sound/hallucinations/look_up2.ogg',
'sound/hallucinations/over_here1.ogg',
'sound/hallucinations/over_here2.ogg',
'sound/hallucinations/over_here3.ogg',
'sound/hallucinations/turn_around1.ogg',
'sound/hallucinations/turn_around2.ogg',
'sound/hallucinations/veryfar_noise.ogg',
'sound/hallucinations/wail.ogg',
'sound/effects/hallucinations/behind_you1.ogg',
'sound/effects/hallucinations/behind_you2.ogg',
'sound/effects/hallucinations/far_noise.ogg',
'sound/effects/hallucinations/growl1.ogg',
'sound/effects/hallucinations/growl2.ogg',
'sound/effects/hallucinations/growl3.ogg',
'sound/effects/hallucinations/i_see_you1.ogg',
'sound/effects/hallucinations/i_see_you2.ogg',
'sound/effects/hallucinations/im_here1.ogg',
'sound/effects/hallucinations/im_here2.ogg',
'sound/effects/hallucinations/look_up1.ogg',
'sound/effects/hallucinations/look_up2.ogg',
'sound/effects/hallucinations/over_here1.ogg',
'sound/effects/hallucinations/over_here2.ogg',
'sound/effects/hallucinations/over_here3.ogg',
'sound/effects/hallucinations/turn_around1.ogg',
'sound/effects/hallucinations/turn_around2.ogg',
'sound/effects/hallucinations/veryfar_noise.ogg',
'sound/effects/hallucinations/wail.ogg',
))
GLOBAL_LIST_INIT(ambience_assoc,list(
code/_globalvars/lists/flavor_misc.dm
+16 -16
View File
@@ -134,22 +134,22 @@ GLOBAL_LIST_EMPTY(female_clothing_icons)
GLOBAL_LIST_INIT(scarySounds, list(
'sound/effects/footstep/clownstep1.ogg',
'sound/effects/footstep/clownstep2.ogg',
'sound/effects/glassbr1.ogg',
'sound/effects/glassbr2.ogg',
'sound/effects/glassbr3.ogg',
'sound/items/welder.ogg',
'sound/items/welder2.ogg',
'sound/machines/airlock.ogg',
'sound/voice/hiss1.ogg',
'sound/voice/hiss2.ogg',
'sound/voice/hiss3.ogg',
'sound/voice/hiss4.ogg',
'sound/voice/hiss5.ogg',
'sound/voice/hiss6.ogg',
'sound/weapons/armbomb.ogg',
'sound/weapons/taser.ogg',
'sound/weapons/thudswoosh.ogg',
'sound/weapons/shove.ogg',
'sound/effects/glass/glassbr1.ogg',
'sound/effects/glass/glassbr2.ogg',
'sound/effects/glass/glassbr3.ogg',
'sound/items/tools/welder.ogg',
'sound/items/tools/welder2.ogg',
'sound/machines/airlock/airlock.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',
'sound/mobs/non-humanoids/hiss/hiss5.ogg',
'sound/mobs/non-humanoids/hiss/hiss6.ogg',
'sound/items/weapons/armbomb.ogg',
'sound/items/weapons/taser.ogg',
'sound/items/weapons/thudswoosh.ogg',
'sound/items/weapons/shove.ogg',
))
code/_onclick/hud/alert.dm
+1 -1
View File
@@ -435,7 +435,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
if(!QDELETED(rube) && !QDELETED(offerer))
offerer.visible_message(span_danger("[offerer] pulls away from [rube]'s slap at the last second, dodging the high-five entirely!"), span_nicegreen("[rube] fails to make contact with your hand, making an utter fool of [rube.p_them()]self!"), span_hear("You hear a disappointing sound of flesh not hitting flesh!"), ignored_mobs=rube)
to_chat(rube, span_userdanger("[uppertext("NO! [offerer] PULLS [offerer.p_their()] HAND AWAY FROM YOURS! YOU'RE TOO SLOW!")]"))
playsound(offerer, 'sound/weapons/thudswoosh.ogg', 100, TRUE, 1)
playsound(offerer, 'sound/items/weapons/thudswoosh.ogg', 100, TRUE, 1)
rube.Knockdown(1 SECONDS)
offerer.add_mood_event("high_five", /datum/mood_event/down_low)
rube.add_mood_event("high_five", /datum/mood_event/too_slow)
code/_onclick/item_attack.dm
+1 -1
View File
@@ -214,7 +214,7 @@
return FALSE
if(!force && !HAS_TRAIT(src, TRAIT_CUSTOM_TAP_SOUND))
playsound(src, 'sound/weapons/tap.ogg', get_clamped_volume(), TRUE, -1)
playsound(src, 'sound/items/weapons/tap.ogg', get_clamped_volume(), TRUE, -1)
else if(hitsound)
playsound(src, hitsound, get_clamped_volume(), TRUE, extrarange = stealthy_audio ? SILENCED_SOUND_EXTRARANGE : -1, falloff_distance = 0)
code/controllers/subsystem/ambience.dm
+6 -6
View File
@@ -70,16 +70,16 @@ SUBSYSTEM_DEF(ambience)
///A list of rare sound effects to fuck with players. No, it does not contain actual minecraft sounds anymore.
var/static/list/minecraft_cave_noises = list(
'sound/machines/airlock.ogg',
'sound/machines/airlock/airlock.ogg',
'sound/effects/snap.ogg',
'sound/effects/footstep/clownstep1.ogg',
'sound/effects/footstep/clownstep2.ogg',
'sound/items/welder.ogg',
'sound/items/welder2.ogg',
'sound/items/crowbar.ogg',
'sound/items/tools/welder.ogg',
'sound/items/tools/welder2.ogg',
'sound/items/tools/crowbar.ogg',
'sound/items/deconstruct.ogg',
'sound/ambience/source_holehit3.ogg',
'sound/ambience/cavesound3.ogg',
'sound/ambience/misc/source_holehit3.ogg',
'sound/ambience//misc/cavesound3.ogg',
)
/area/station/maintenance/play_ambience(mob/M, sound/override_sound, volume)
code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm
+4 -4
View File
@@ -577,7 +577,7 @@
player_mind.add_antag_datum(/datum/antagonist/nightmare)
new_nightmare.set_species(/datum/species/shadow/nightmare)
playsound(new_nightmare, 'sound/magic/ethereal_exit.ogg', 50, TRUE, -1)
playsound(new_nightmare, 'sound/effects/magic/ethereal_exit.ogg', 50, TRUE, -1)
message_admins("[ADMIN_LOOKUPFLW(new_nightmare)] has been made into a Nightmare by the midround ruleset.")
log_dynamic("[key_name(new_nightmare)] was spawned as a Nightmare by the midround ruleset.")
return new_nightmare
@@ -618,7 +618,7 @@
player_mind.transfer_to(S)
player_mind.add_antag_datum(/datum/antagonist/space_dragon)
playsound(S, 'sound/magic/ethereal_exit.ogg', 50, TRUE, -1)
playsound(S, 'sound/effects/magic/ethereal_exit.ogg', 50, TRUE, -1)
message_admins("[ADMIN_LOOKUPFLW(S)] has been made into a Space Dragon by the midround ruleset.")
log_dynamic("[key_name(S)] was spawned as a Space Dragon by the midround ruleset.")
priority_announce("A large organic energy flux has been recorded near of [station_name()], please stand-by.", "Lifesign Alert")
@@ -930,7 +930,7 @@
new_datum.original_ref = WEAKREF(clone_victim.mind)
new_datum.setup_clone()
playsound(clone, 'sound/weapons/zapbang.ogg', 30, TRUE)
playsound(clone, 'sound/items/weapons/zapbang.ogg', 30, TRUE)
new /obj/item/storage/toolbox/mechanical(clone.loc) //so they dont get stuck in maints
message_admins("[ADMIN_LOOKUPFLW(clone)] has been made into a Paradox Clone by the midround ruleset.")
@@ -995,7 +995,7 @@
player_mind.special_role = antag_flag
player_mind.add_antag_datum(antag_datum)
playsound(voidwalker, 'sound/magic/ethereal_exit.ogg', 50, TRUE, -1)
playsound(voidwalker, 'sound/effects/magic/ethereal_exit.ogg', 50, TRUE, -1)
message_admins("[ADMIN_LOOKUPFLW(voidwalker)] has been made into a Voidwalker by the midround ruleset.")
log_dynamic("[key_name(voidwalker)] was spawned as a Voidwalker by the midround ruleset.")
return voidwalker
code/controllers/subsystem/explosions.dm
+1 -1
View File
@@ -521,7 +521,7 @@ ADMIN_VERB(check_bomb_impacts, R_DEBUG, "Check Bomb Impact", "See what the effec
* - [creaking_sound][/sound]: The sound that plays when the station creaks during the explosion.
* - [hull_creaking_sound][/sound]: The sound that plays when the station creaks after the explosion.
*/
/datum/controller/subsystem/explosions/proc/shake_the_room(turf/epicenter, near_distance, far_distance, quake_factor, echo_factor, creaking, sound/near_sound = sound(get_sfx(SFX_EXPLOSION)), sound/far_sound = sound('sound/effects/explosionfar.ogg'), sound/echo_sound = sound('sound/effects/explosion_distant.ogg'), sound/creaking_sound = sound(get_sfx(SFX_EXPLOSION_CREAKING)), hull_creaking_sound = sound(get_sfx(SFX_HULL_CREAKING)))
/datum/controller/subsystem/explosions/proc/shake_the_room(turf/epicenter, near_distance, far_distance, quake_factor, echo_factor, creaking, sound/near_sound = sound(get_sfx(SFX_EXPLOSION)), sound/far_sound = sound('sound/effects/explosion/explosionfar.ogg'), sound/echo_sound = sound('sound/effects/explosion/explosion_distant.ogg'), sound/creaking_sound = sound(get_sfx(SFX_EXPLOSION_CREAKING)), hull_creaking_sound = sound(get_sfx(SFX_HULL_CREAKING)))
var/frequency = get_rand_frequency()
var/blast_z = epicenter.z
if(isnull(creaking)) // Autoset creaking.
code/controllers/subsystem/nightshift.dm
+1 -1
View File
@@ -26,7 +26,7 @@ SUBSYSTEM_DEF(nightshift)
/datum/controller/subsystem/nightshift/proc/announce(message)
priority_announce(
text = message,
sound = 'sound/misc/notice2.ogg',
sound = 'sound/announcer/notice/notice2.ogg',
sender_override = "Automated Lighting System Announcement",
color_override = "grey",
)
code/controllers/subsystem/polling.dm
+1 -1
View File
@@ -155,7 +155,7 @@ SUBSYSTEM_DEF(polling)
act_never = "[custom_link_style_start]<a href='?src=[REF(poll_alert_button)];never=1'[custom_link_style_end]>\[Never For This Round\]</a>"
if(!duplicate_message_check(alert_poll)) //Only notify people once. They'll notice if there are multiple and we don't want to spam people.
SEND_SOUND(candidate_mob, 'sound/misc/notice2.ogg')
SEND_SOUND(candidate_mob, 'sound/announcer/notice/notice2.ogg')
var/surrounding_icon
if(chat_text_border_icon)
var/image/surrounding_image
code/controllers/subsystem/shuttle.dm
+4 -4
View File
@@ -281,7 +281,7 @@ SUBSYSTEM_DEF(shuttle)
priority_announce(
text = "Emergency shuttle uplink interference detected, shuttle call disabled while the system reinitializes. Estimated restore in [DisplayTimeText(lockout_timer, round_seconds_to = 60)].",
title = "Uplink Interference",
sound = 'sound/misc/announce_dig.ogg',
sound = 'sound/announcer/announcement/announce_dig.ogg',
sender_override = "Emergency Shuttle Uplink Alert",
color_override = "grey",
)
@@ -295,7 +295,7 @@ SUBSYSTEM_DEF(shuttle)
priority_announce(
text= "Emergency shuttle uplink services are now back online.",
title = "Uplink Restored",
sound = 'sound/misc/announce_dig.ogg',
sound = 'sound/announcer/announcement/announce_dig.ogg',
sender_override = "Emergency Shuttle Uplink Alert",
color_override = "green",
)
@@ -529,7 +529,7 @@ SUBSYSTEM_DEF(shuttle)
priority_announce(
text = "Departure has been postponed indefinitely pending conflict resolution.",
title = "Hostile Environment Detected",
sound = 'sound/misc/notice1.ogg',
sound = 'sound/announcer/notice/notice1.ogg',
sender_override = "Emergency Shuttle Uplink Alert",
color_override = "grey",
)
@@ -539,7 +539,7 @@ SUBSYSTEM_DEF(shuttle)
priority_announce(
text = "You have [DisplayTimeText(emergency_dock_time)] to board the emergency shuttle.",
title = "Hostile Environment Resolved",
sound = 'sound/misc/announce_dig.ogg',
sound = 'sound/announcer/announcement/announce_dig.ogg',
sender_override = "Emergency Shuttle Uplink Alert",
color_override = "green",
)
code/controllers/subsystem/ticker.dm
+2 -2
View File
@@ -489,7 +489,7 @@ SUBSYSTEM_DEF(ticker)
list_clear_nulls(queued_players)
for (var/mob/dead/new_player/new_player in queued_players)
to_chat(new_player, span_userdanger("The alive players limit has been released!<br><a href='?src=[REF(new_player)];late_join=override'>[html_encode(">>Join Game<<")]</a>"))
SEND_SOUND(new_player, sound('sound/misc/notice1.ogg'))
SEND_SOUND(new_player, sound('sound/announcer/notice/notice1.ogg'))
GLOB.latejoin_menu.ui_interact(new_player)
queued_players.len = 0
queue_delay = 0
@@ -504,7 +504,7 @@ SUBSYSTEM_DEF(ticker)
if(living_player_count() < hard_popcap)
if(next_in_line?.client)
to_chat(next_in_line, span_userdanger("A slot has opened! You have approximately 20 seconds to join. <a href='?src=[REF(next_in_line)];late_join=override'>\>\>Join Game\<\<</a>"))
SEND_SOUND(next_in_line, sound('sound/misc/notice1.ogg'))
SEND_SOUND(next_in_line, sound('sound/announcer/notice/notice1.ogg'))
next_in_line.ui_interact(next_in_line)
return
queued_players -= next_in_line //Client disconnected, remove he
code/datums/actions/mobs/blood_warp.dm
+2 -2
View File
@@ -58,9 +58,9 @@
found_bloodpool = pick(pools)
if(found_bloodpool)
owner.visible_message("<span class='danger'>[owner] sinks into the blood...</span>")
playsound(owner_turf, 'sound/magic/enter_blood.ogg', 100, TRUE, -1)
playsound(owner_turf, 'sound/effects/magic/enter_blood.ogg', 100, TRUE, -1)
owner.forceMove(get_turf(found_bloodpool))
playsound(get_turf(owner), 'sound/magic/exit_blood.ogg', 100, TRUE, -1)
playsound(get_turf(owner), 'sound/effects/magic/exit_blood.ogg', 100, TRUE, -1)
owner.visible_message("<span class='danger'>And springs back out!</span>")
SEND_SIGNAL(owner, COMSIG_BLOOD_WARP)
return TRUE
code/datums/actions/mobs/chase_target.dm
+1 -1
View File
@@ -31,7 +31,7 @@
/// This is the proc that actually does the throwing. Charge only adds a timer for this.
/datum/action/cooldown/mob_cooldown/chase_target/proc/throw_thyself()
playsound(owner, 'sound/weapons/sonic_jackhammer.ogg', 50, TRUE)
playsound(owner, 'sound/items/weapons/sonic_jackhammer.ogg', 50, TRUE)
owner.throw_at(target, 7, 1.1, owner, FALSE, FALSE, CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), owner, 'sound/effects/meteorimpact.ogg', 50 * size, TRUE, 2), INFINITY)
/// Resets the charge buffs.
code/datums/actions/mobs/create_legion_turrets.dm
+4 -4
View File
@@ -18,7 +18,7 @@
/// Creates new legion turrets around the owner between the minimum and maximum
/datum/action/cooldown/mob_cooldown/create_legion_turrets/proc/create(atom/target)
playsound(owner, 'sound/magic/RATTLEMEBONES.ogg', 100, TRUE)
playsound(owner, 'sound/effects/magic/RATTLEMEBONES.ogg', 100, TRUE)
var/list/possible_locations = list()
for(var/turf/checked_turf in oview(owner, 4)) //Only place the turrets on open turfs
if(checked_turf.is_blocked_turf())
@@ -80,7 +80,7 @@
var/angle = get_angle(our_turf, target_turf)
var/datum/point/vector/V = new(our_turf.x, our_turf.y, our_turf.z, 0, 0, angle)
generate_tracer_between_points(V, V.return_vector_after_increments(6), /obj/effect/projectile/tracer/legion/tracer, 0, shot_delay, 0, 0, 0, null)
playsound(src, 'sound/machines/airlockopen.ogg', 100, TRUE)
playsound(src, 'sound/machines/airlock/airlockopen.ogg', 100, TRUE)
addtimer(CALLBACK(src, PROC_REF(fire_beam), angle), shot_delay)
/// Called shot_delay after the turret shot the tracer. Shoots a projectile into the same direction.
@@ -88,13 +88,13 @@
var/obj/projectile/ouchie = new projectile_type(loc)
ouchie.firer = src
ouchie.fire(angle)
playsound(src, 'sound/effects/bin_close.ogg', 100, TRUE)
playsound(src, 'sound/effects/bin/bin_close.ogg', 100, TRUE)
QDEL_IN(src, 0.5 SECONDS)
/// Used for the legion turret.
/obj/projectile/beam/legion
name = "blood pulse"
hitsound = 'sound/magic/magic_missile.ogg'
hitsound = 'sound/effects/magic/magic_missile.ogg'
damage = 19
range = 6
light_color = COLOR_SOFT_RED
code/datums/actions/mobs/dash.dm
+2 -2
View File
@@ -52,11 +52,11 @@
new /obj/effect/temp_visual/small_smoke/halfsecond(step_forward_turf)
var/obj/effect/temp_visual/decoy/fading/halfsecond/D = new (own_turf, owner)
owner.forceMove(step_back_turf)
playsound(own_turf, 'sound/weapons/punchmiss.ogg', 40, TRUE, -1)
playsound(own_turf, 'sound/items/weapons/punchmiss.ogg', 40, TRUE, -1)
owner.alpha = 0
animate(owner, alpha = 255, time = 5)
SLEEP_CHECK_DEATH(0.2 SECONDS, owner)
D.forceMove(step_forward_turf)
owner.forceMove(target_turf)
playsound(target_turf, 'sound/weapons/punchmiss.ogg', 40, TRUE, -1)
playsound(target_turf, 'sound/items/weapons/punchmiss.ogg', 40, TRUE, -1)
SLEEP_CHECK_DEATH(0.1 SECONDS, owner)
code/datums/actions/mobs/fire_breath.dm
+1 -1
View File
@@ -7,7 +7,7 @@
/// The range of the fire
var/fire_range = 15
/// The sound played when you use this ability
var/fire_sound = 'sound/magic/fireball.ogg'
var/fire_sound = 'sound/effects/magic/fireball.ogg'
/// Time to wait between spawning each fire turf
var/fire_delay = 1.5 DECISECONDS
/// How hot is our fire
code/datums/actions/mobs/projectileattack.dm
+5 -5
View File
@@ -126,7 +126,7 @@
desc = "Fires projectiles in a spiral pattern."
cooldown_time = 3 SECONDS
projectile_type = /obj/projectile/colossus
projectile_sound = 'sound/magic/clockwork/invoke_general.ogg'
projectile_sound = 'sound/effects/magic/clockwork/invoke_general.ogg'
/// Whether or not the attack is the enraged form
var/enraged = FALSE
@@ -186,7 +186,7 @@
desc = "Fires projectiles in all directions."
cooldown_time = 3 SECONDS
projectile_type = /obj/projectile/colossus
projectile_sound = 'sound/magic/clockwork/invoke_general.ogg'
projectile_sound = 'sound/effects/magic/clockwork/invoke_general.ogg'
/datum/action/cooldown/mob_cooldown/projectile_attack/random_aoe/attack_sequence(mob/living/firer, atom/target)
var/turf/U = get_turf(firer)
@@ -208,7 +208,7 @@
desc = "Fires projectiles in a shotgun pattern."
cooldown_time = 2 SECONDS
projectile_type = /obj/projectile/colossus
projectile_sound = 'sound/magic/clockwork/invoke_general.ogg'
projectile_sound = 'sound/effects/magic/clockwork/invoke_general.ogg'
var/list/shot_angles = list(12.5, 7.5, 2.5, -2.5, -7.5, -12.5)
/datum/action/cooldown/mob_cooldown/projectile_attack/shotgun_blast/attack_sequence(mob/living/firer, atom/target)
@@ -263,7 +263,7 @@
desc = "Fires projectiles in specific directions."
cooldown_time = 4 SECONDS
projectile_type = /obj/projectile/colossus
projectile_sound = 'sound/magic/clockwork/invoke_general.ogg'
projectile_sound = 'sound/effects/magic/clockwork/invoke_general.ogg'
var/list/firing_directions
/datum/action/cooldown/mob_cooldown/projectile_attack/dir_shots/New(Target)
@@ -308,7 +308,7 @@
desc = "Fires a kinetic accelerator projectile at the target."
cooldown_time = 1.5 SECONDS
projectile_type = /obj/projectile/kinetic/miner
projectile_sound = 'sound/weapons/kinetic_accel.ogg'
projectile_sound = 'sound/items/weapons/kinetic_accel.ogg'
/datum/action/cooldown/mob_cooldown/projectile_attack/kinetic_accelerator/Activate(atom/target_atom)
. = ..()
code/datums/ai/basic_mobs/basic_subtrees/speech_subtree.dm
+11 -11
View File
@@ -46,7 +46,7 @@
/datum/ai_planning_subtree/random_speech/insect
speech_chance = 5
sound = list('sound/creatures/chitter.ogg')
sound = list('sound/mobs/non-humanoids/insect/chitter.ogg')
emote_hear = list("chitters.")
/datum/ai_planning_subtree/random_speech/mothroach
@@ -56,7 +56,7 @@
/datum/ai_planning_subtree/random_speech/mouse
speech_chance = 1
speak = list("Squeak!", "SQUEAK!", "Squeak?")
sound = list('sound/creatures/mousesqueek.ogg')
sound = list('sound/mobs/non-humanoids/mouse/mousesqueek.ogg')
emote_hear = list("squeaks.")
emote_see = list("runs in a circle.", "shakes.")
@@ -72,7 +72,7 @@
/datum/ai_planning_subtree/random_speech/sheep
speech_chance = 5
speak = list("baaa","baaaAAAAAH!","baaah")
sound = list('sound/creatures/sheep1.ogg', 'sound/creatures/sheep2.ogg', 'sound/creatures/sheep3.ogg')
sound = list('sound/mobs/non-humanoids/sheep/sheep1.ogg', 'sound/mobs/non-humanoids/sheep/sheep2.ogg', 'sound/mobs/non-humanoids/sheep/sheep3.ogg')
emote_hear = list("bleats.")
emote_see = list("shakes her head.", "stares into the distance.")
@@ -101,21 +101,21 @@
/datum/ai_planning_subtree/random_speech/chicken
speech_chance = 15 // really talkative ladies
speak = list("Cluck!", "BWAAAAARK BWAK BWAK BWAK!", "Bwaak bwak.")
sound = list('sound/creatures/clucks.ogg', 'sound/creatures/bagawk.ogg')
sound = list('sound/mobs/non-humanoids/chicken/clucks.ogg', 'sound/mobs/non-humanoids/chicken/bagawk.ogg')
emote_hear = list("clucks.", "croons.")
emote_see = list("pecks at the ground.","flaps her wings viciously.")
/datum/ai_planning_subtree/random_speech/chick
speech_chance = 4
speak = list("Cherp.", "Cherp?", "Chirrup.", "Cheep!")
sound = list('sound/creatures/chick_peep.ogg')
sound = list('sound/mobs/non-humanoids/chicken/chick_peep.ogg')
emote_hear = list("cheeps.")
emote_see = list("pecks at the ground.","flaps her tiny wings.")
/datum/ai_planning_subtree/random_speech/cow
speech_chance = 1
speak = list("moo?","moo","MOOOOOO")
sound = list('sound/creatures/cow.ogg')
sound = list('sound/mobs/non-humanoids/cow/cow.ogg')
emote_hear = list("brays.")
emote_see = list("shakes her head.")
@@ -164,19 +164,19 @@
/datum/ai_planning_subtree/random_speech/pig
speech_chance = 3
speak = list("oink?","oink","snurf")
sound = list('sound/creatures/pig1.ogg', 'sound/creatures/pig2.ogg')
sound = list('sound/mobs/non-humanoids/pig/pig1.ogg', 'sound/mobs/non-humanoids/pig/pig2.ogg')
emote_hear = list("snorts.")
emote_see = list("sniffs around.")
/datum/ai_planning_subtree/random_speech/pony
speech_chance = 3
sound = list('sound/creatures/pony/whinny01.ogg', 'sound/creatures/pony/whinny02.ogg', 'sound/creatures/pony/whinny03.ogg')
sound = list('sound/mobs/non-humanoids/pony/whinny01.ogg', 'sound/mobs/non-humanoids/pony/whinny02.ogg', 'sound/mobs/non-humanoids/pony/whinny03.ogg')
emote_hear = list("whinnies!")
emote_see = list("horses around.")
/datum/ai_planning_subtree/random_speech/pony/tamed
speech_chance = 3
sound = list('sound/creatures/pony/snort.ogg')
sound = list('sound/mobs/non-humanoids/pony/snort.ogg')
emote_hear = list("snorts.")
emote_see = list("snorts.")
@@ -188,7 +188,7 @@
/datum/ai_planning_subtree/random_speech/ant
speech_chance = 1
speak = list("BZZZZT!", "CHTCHTCHT!", "Bzzz", "ChtChtCht")
sound = list('sound/creatures/chitter.ogg')
sound = list('sound/mobs/non-humanoids/insect/chitter.ogg')
emote_hear = list("buzzes.", "clacks.")
emote_see = list("shakes their head.", "twitches their antennae.")
@@ -200,7 +200,7 @@
/datum/ai_planning_subtree/random_speech/crab
speech_chance = 1
sound = list('sound/creatures/claw_click.ogg')
sound = list('sound/mobs/non-humanoids/crab/claw_click.ogg')
emote_hear = list("clicks.")
emote_see = list("clacks.")
code/datums/ai/dog/dog_behaviors.dm
+2 -2
View File
@@ -44,7 +44,7 @@
if(!SPT_PROB(20, seconds_per_tick))
return
living_pawn.do_attack_animation(target, ATTACK_EFFECT_DISARM)
playsound(target, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
playsound(target, 'sound/items/weapons/thudswoosh.ogg', 50, TRUE, -1)
target.visible_message(span_danger("[living_pawn] paws ineffectually at [target]!"), span_danger("[living_pawn] paws ineffectually at you!"))
/// Let them know we mean business
@@ -54,4 +54,4 @@
living_pawn.manual_emote("[pick("barks", "growls", "stares")] menacingly at [target]!")
if(!SPT_PROB(40, seconds_per_tick))
return
playsound(living_pawn, pick('sound/creatures/dog/growl1.ogg', 'sound/creatures/dog/growl2.ogg'), 50, TRUE, -1)
playsound(living_pawn, pick('sound/mobs/non-humanoids/dog/growl1.ogg', 'sound/mobs/non-humanoids/dog/growl2.ogg'), 50, TRUE, -1)
code/datums/announcers/default_announcer.dm
+19 -19
View File
@@ -1,20 +1,20 @@
/datum/centcom_announcer/default
welcome_sounds = list('sound/ai/default/welcome.ogg')
alert_sounds = list('sound/ai/default/attention.ogg')
command_report_sounds = list('sound/ai/default/commandreport.ogg')
event_sounds = list(ANNOUNCER_AIMALF = 'sound/ai/default/aimalf.ogg',
ANNOUNCER_ALIENS = 'sound/ai/default/aliens.ogg',
ANNOUNCER_ANIMES = 'sound/ai/default/animes.ogg',
ANNOUNCER_GRANOMALIES = 'sound/ai/default/granomalies.ogg',
ANNOUNCER_INTERCEPT = 'sound/ai/default/intercept.ogg',
ANNOUNCER_IONSTORM = 'sound/ai/default/ionstorm.ogg',
ANNOUNCER_METEORS = 'sound/ai/default/meteors.ogg',
ANNOUNCER_OUTBREAK5 = 'sound/ai/default/outbreak5.ogg',
ANNOUNCER_OUTBREAK7 = 'sound/ai/default/outbreak7.ogg',
ANNOUNCER_POWEROFF = 'sound/ai/default/poweroff.ogg',
ANNOUNCER_POWERON = 'sound/ai/default/poweron.ogg',
ANNOUNCER_RADIATION = 'sound/ai/default/radiation.ogg',
ANNOUNCER_SHUTTLECALLED = 'sound/ai/default/shuttlecalled.ogg',
ANNOUNCER_SHUTTLEDOCK = 'sound/ai/default/shuttledock.ogg',
ANNOUNCER_SHUTTLERECALLED = 'sound/ai/default/shuttlerecalled.ogg',
ANNOUNCER_SPANOMALIES = 'sound/ai/default/spanomalies.ogg')
welcome_sounds = list('sound/announcer/default/welcome.ogg')
alert_sounds = list('sound/announcer/default/attention.ogg')
command_report_sounds = list('sound/announcer/default/commandreport.ogg')
event_sounds = list(ANNOUNCER_AIMALF = 'sound/announcer/default/aimalf.ogg',
ANNOUNCER_ALIENS = 'sound/announcer/default/aliens.ogg',
ANNOUNCER_ANIMES = 'sound/announcer/default/animes.ogg',
ANNOUNCER_GRANOMALIES = 'sound/announcer/default/granomalies.ogg',
ANNOUNCER_INTERCEPT = 'sound/announcer/default/intercept.ogg',
ANNOUNCER_IONSTORM = 'sound/announcer/default/ionstorm.ogg',
ANNOUNCER_METEORS = 'sound/announcer/default/meteors.ogg',
ANNOUNCER_OUTBREAK5 = 'sound/announcer/default/outbreak5.ogg',
ANNOUNCER_OUTBREAK7 = 'sound/announcer/default/outbreak7.ogg',
ANNOUNCER_POWEROFF = 'sound/announcer/default/poweroff.ogg',
ANNOUNCER_POWERON = 'sound/announcer/default/poweron.ogg',
ANNOUNCER_RADIATION = 'sound/announcer/default/radiation.ogg',
ANNOUNCER_SHUTTLECALLED = 'sound/announcer/default/shuttlecalled.ogg',
ANNOUNCER_SHUTTLEDOCK = 'sound/announcer/default/shuttledock.ogg',
ANNOUNCER_SHUTTLERECALLED = 'sound/announcer/default/shuttlerecalled.ogg',
ANNOUNCER_SPANOMALIES = 'sound/announcer/default/spanomalies.ogg')
code/datums/announcers/intern_announcer.dm
+39 -39
View File
@@ -1,46 +1,46 @@
/datum/centcom_announcer/intern
welcome_sounds = list('sound/ai/intern/welcome/1.ogg',
'sound/ai/intern/welcome/2.ogg',
'sound/ai/intern/welcome/3.ogg',
'sound/ai/intern/welcome/4.ogg',
'sound/ai/intern/welcome/5.ogg',
'sound/ai/intern/welcome/6.ogg')
welcome_sounds = list('sound/announcer/intern/welcome/1.ogg',
'sound/announcer/intern/welcome/2.ogg',
'sound/announcer/intern/welcome/3.ogg',
'sound/announcer/intern/welcome/4.ogg',
'sound/announcer/intern/welcome/5.ogg',
'sound/announcer/intern/welcome/6.ogg')
alert_sounds = list('sound/ai/intern/alerts/1.ogg',
'sound/ai/intern/alerts/2.ogg',
'sound/ai/intern/alerts/3.ogg',
'sound/ai/intern/alerts/4.ogg',
'sound/ai/intern/alerts/5.ogg',
'sound/ai/intern/alerts/6.ogg',
'sound/ai/intern/alerts/7.ogg',
'sound/ai/intern/alerts/8.ogg',
'sound/ai/intern/alerts/9.ogg',
'sound/ai/intern/alerts/10.ogg',
'sound/ai/intern/alerts/11.ogg',
'sound/ai/intern/alerts/12.ogg',
'sound/ai/intern/alerts/13.ogg',
'sound/ai/intern/alerts/14.ogg')
alert_sounds = list('sound/announcer/intern/alerts/1.ogg',
'sound/announcer/intern/alerts/2.ogg',
'sound/announcer/intern/alerts/3.ogg',
'sound/announcer/intern/alerts/4.ogg',
'sound/announcer/intern/alerts/5.ogg',
'sound/announcer/intern/alerts/6.ogg',
'sound/announcer/intern/alerts/7.ogg',
'sound/announcer/intern/alerts/8.ogg',
'sound/announcer/intern/alerts/9.ogg',
'sound/announcer/intern/alerts/10.ogg',
'sound/announcer/intern/alerts/11.ogg',
'sound/announcer/intern/alerts/12.ogg',
'sound/announcer/intern/alerts/13.ogg',
'sound/announcer/intern/alerts/14.ogg')
command_report_sounds = list('sound/ai/intern/commandreport/1.ogg',
'sound/ai/intern/commandreport/2.ogg',
'sound/ai/intern/commandreport/3.ogg')
command_report_sounds = list('sound/announcer/intern/commandreport/1.ogg',
'sound/announcer/intern/commandreport/2.ogg',
'sound/announcer/intern/commandreport/3.ogg')
event_sounds = list(ANNOUNCER_AIMALF = 'sound/ai/default/aimalf.ogg',
ANNOUNCER_ALIENS = 'sound/ai/intern/aliens.ogg',
ANNOUNCER_ANIMES = 'sound/ai/intern/animes.ogg',
ANNOUNCER_GRANOMALIES = 'sound/ai/intern/granomalies.ogg',
ANNOUNCER_INTERCEPT = 'sound/ai/intern/intercept.ogg',
ANNOUNCER_IONSTORM = 'sound/ai/intern/ionstorm.ogg',
ANNOUNCER_METEORS = 'sound/ai/intern/meteors.ogg',
ANNOUNCER_OUTBREAK5 = 'sound/ai/intern/outbreak5.ogg',
ANNOUNCER_OUTBREAK7 = 'sound/ai/intern/outbreak7.ogg',
ANNOUNCER_POWEROFF = 'sound/ai/intern/poweroff.ogg',
ANNOUNCER_POWERON = 'sound/ai/intern/poweron.ogg',
ANNOUNCER_RADIATION = 'sound/ai/intern/radiation.ogg',
ANNOUNCER_SHUTTLECALLED = 'sound/ai/intern/shuttlecalled.ogg',
ANNOUNCER_SHUTTLEDOCK = 'sound/ai/intern/shuttledock.ogg',
ANNOUNCER_SHUTTLERECALLED = 'sound/ai/intern/shuttlerecalled.ogg',
ANNOUNCER_SPANOMALIES = 'sound/ai/intern/spanomalies.ogg')
event_sounds = list(ANNOUNCER_AIMALF = 'sound/announcer/default/aimalf.ogg',
ANNOUNCER_ALIENS = 'sound/announcer/intern/aliens.ogg',
ANNOUNCER_ANIMES = 'sound/announcer/intern/animes.ogg',
ANNOUNCER_GRANOMALIES = 'sound/announcer/intern/granomalies.ogg',
ANNOUNCER_INTERCEPT = 'sound/announcer/intern/intercept.ogg',
ANNOUNCER_IONSTORM = 'sound/announcer/intern/ionstorm.ogg',
ANNOUNCER_METEORS = 'sound/announcer/intern/meteors.ogg',
ANNOUNCER_OUTBREAK5 = 'sound/announcer/intern/outbreak5.ogg',
ANNOUNCER_OUTBREAK7 = 'sound/announcer/intern/outbreak7.ogg',
ANNOUNCER_POWEROFF = 'sound/announcer/intern/poweroff.ogg',
ANNOUNCER_POWERON = 'sound/announcer/intern/poweron.ogg',
ANNOUNCER_RADIATION = 'sound/announcer/intern/radiation.ogg',
ANNOUNCER_SHUTTLECALLED = 'sound/announcer/intern/shuttlecalled.ogg',
ANNOUNCER_SHUTTLEDOCK = 'sound/announcer/intern/shuttledock.ogg',
ANNOUNCER_SHUTTLERECALLED = 'sound/announcer/intern/shuttlerecalled.ogg',
ANNOUNCER_SPANOMALIES = 'sound/announcer/intern/spanomalies.ogg')
custom_alert_message = "<span class='alert'>Please stand by for an important message from our new intern.</span><br>"
code/datums/announcers/medbot_announcer.dm
+20 -20
View File
@@ -1,21 +1,21 @@
/datum/centcom_announcer/medbot
welcome_sounds = list('sound/ai/medbot/welcome.ogg',
'sound/ai/medbot/newAI.ogg')
alert_sounds = list('sound/ai/medbot/attention.ogg')
command_report_sounds = list('sound/ai/medbot/commandreport.ogg')
event_sounds = list(ANNOUNCER_AIMALF = 'sound/ai/default/aimalf.ogg',
ANNOUNCER_ALIENS = 'sound/ai/medbot/aliens.ogg',
ANNOUNCER_ANIMES = 'sound/ai/medbot/animes.ogg',
ANNOUNCER_GRANOMALIES = 'sound/ai/medbot/granomalies.ogg',
ANNOUNCER_INTERCEPT = 'sound/ai/medbot/intercept.ogg',
ANNOUNCER_IONSTORM = 'sound/ai/medbot/ionstorm.ogg',
ANNOUNCER_METEORS = 'sound/ai/medbot/meteors.ogg',
ANNOUNCER_OUTBREAK5 = 'sound/ai/medbot/outbreak5.ogg',
ANNOUNCER_OUTBREAK7 = 'sound/ai/medbot/outbreak7.ogg',
ANNOUNCER_POWEROFF = 'sound/ai/medbot/poweroff.ogg',
ANNOUNCER_POWERON = 'sound/ai/medbot/poweron.ogg',
ANNOUNCER_RADIATION = 'sound/ai/medbot/radiation.ogg',
ANNOUNCER_SHUTTLECALLED = 'sound/ai/medbot/shuttlecalled.ogg',
ANNOUNCER_SHUTTLEDOCK = 'sound/ai/medbot/shuttledock.ogg',
ANNOUNCER_SHUTTLERECALLED = 'sound/ai/medbot/shuttlerecalled.ogg',
ANNOUNCER_SPANOMALIES = 'sound/ai/medbot/spanomalies.ogg')
welcome_sounds = list('sound/announcer/medbot/welcome.ogg',
'sound/announcer/medbot/newAI.ogg')
alert_sounds = list('sound/announcer/medbot/attention.ogg')
command_report_sounds = list('sound/announcer/medbot/commandreport.ogg')
event_sounds = list(ANNOUNCER_AIMALF = 'sound/announcer/default/aimalf.ogg',
ANNOUNCER_ALIENS = 'sound/announcer/medbot/aliens.ogg',
ANNOUNCER_ANIMES = 'sound/announcer/medbot/animes.ogg',
ANNOUNCER_GRANOMALIES = 'sound/announcer/medbot/granomalies.ogg',
ANNOUNCER_INTERCEPT = 'sound/announcer/medbot/intercept.ogg',
ANNOUNCER_IONSTORM = 'sound/announcer/medbot/ionstorm.ogg',
ANNOUNCER_METEORS = 'sound/announcer/medbot/meteors.ogg',
ANNOUNCER_OUTBREAK5 = 'sound/announcer/medbot/outbreak5.ogg',
ANNOUNCER_OUTBREAK7 = 'sound/announcer/medbot/outbreak7.ogg',
ANNOUNCER_POWEROFF = 'sound/announcer/medbot/poweroff.ogg',
ANNOUNCER_POWERON = 'sound/announcer/medbot/poweron.ogg',
ANNOUNCER_RADIATION = 'sound/announcer/medbot/radiation.ogg',
ANNOUNCER_SHUTTLECALLED = 'sound/announcer/medbot/shuttlecalled.ogg',
ANNOUNCER_SHUTTLEDOCK = 'sound/announcer/medbot/shuttledock.ogg',
ANNOUNCER_SHUTTLERECALLED = 'sound/announcer/medbot/shuttlerecalled.ogg',
ANNOUNCER_SPANOMALIES = 'sound/announcer/medbot/spanomalies.ogg')
code/datums/brain_damage/magic.dm
+2 -2
View File
@@ -104,14 +104,14 @@
create_stalker()
if(get_dist(owner, stalker) <= 1)
playsound(owner, 'sound/magic/demon_attack1.ogg', 50)
playsound(owner, 'sound/effects/magic/demon_attack1.ogg', 50)
owner.visible_message(span_warning("[owner] is torn apart by invisible claws!"), span_userdanger("Ghostly claws tear your body apart!"))
owner.take_bodypart_damage(rand(20, 45), wound_bonus=CANT_WOUND)
else if(SPT_PROB(30, seconds_per_tick))
stalker.forceMove(get_step_towards(stalker, owner))
if(get_dist(owner, stalker) <= 8)
if(!close_stalker)
var/sound/slowbeat = sound('sound/health/slowbeat.ogg', repeat = TRUE)
var/sound/slowbeat = sound('sound/effects/health/slowbeat.ogg', repeat = TRUE)
owner.playsound_local(owner, slowbeat, 40, 0, channel = CHANNEL_HEARTBEAT, use_reverb = FALSE)
close_stalker = TRUE
else
code/datums/brain_damage/special.dm
+6 -6
View File
@@ -45,7 +45,7 @@
else
message = pick_list_replacements(BRAIN_DAMAGE_FILE, "god_neutral")
playsound(get_turf(owner), 'sound/magic/clockwork/invoke_general.ogg', 200, TRUE, 5)
playsound(get_turf(owner), 'sound/effects/magic/clockwork/invoke_general.ogg', 200, TRUE, 5)
voice_of_god(message, owner, list("colossus","yell"), 2.5, include_owner, name, TRUE)
/datum/brain_trauma/special/bluespace_prophet
@@ -218,7 +218,7 @@
linked = FALSE
return
to_chat(owner, span_warning("Your connection to [linked_target] suddenly feels extremely strong... you can feel it pulling you!"))
owner.playsound_local(owner, 'sound/magic/lightning_chargeup.ogg', 75, FALSE)
owner.playsound_local(owner, 'sound/effects/magic/lightning_chargeup.ogg', 75, FALSE)
returning = TRUE
addtimer(CALLBACK(src, PROC_REF(snapback)), 10 SECONDS)
@@ -231,7 +231,7 @@
return
to_chat(owner, span_warning("You're pulled through spacetime!"))
do_teleport(owner, get_turf(linked_target), null, channel = TELEPORT_CHANNEL_QUANTUM)
owner.playsound_local(owner, 'sound/magic/repulse.ogg', 100, FALSE)
owner.playsound_local(owner, 'sound/effects/magic/repulse.ogg', 100, FALSE)
linked_target = null
linked = FALSE
@@ -388,17 +388,17 @@
if(owner.stat != CONSCIOUS)
if(prob(20))
owner.playsound_local(beepsky, 'sound/voice/beepsky/iamthelaw.ogg', 50)
owner.playsound_local(beepsky, 'sound/mobs/non-humanoids/beepsky/iamthelaw.ogg', 50)
return
if(get_dist(owner, beepsky) <= 1)
owner.playsound_local(owner, 'sound/weapons/egloves.ogg', 50)
owner.playsound_local(owner, 'sound/items/weapons/egloves.ogg', 50)
owner.visible_message(span_warning("[owner]'s body jerks as if it was shocked."), span_userdanger("You feel the fist of the LAW."))
owner.adjustStaminaLoss(rand(40, 70))
QDEL_NULL(beepsky)
if(prob(20) && get_dist(owner, beepsky) <= 8)
owner.playsound_local(beepsky, 'sound/voice/beepsky/criminal.ogg', 40)
owner.playsound_local(beepsky, 'sound/mobs/non-humanoids/beepsky/criminal.ogg', 40)
/obj/effect/client_image_holder/securitron
name = "Securitron"
code/datums/brain_damage/split_personality.dm
+1 -1
View File
@@ -305,7 +305,7 @@
addtimer(TRAIT_CALLBACK_REMOVE(owner, TRAIT_DISCOORDINATED_TOOL_USER, TRAUMA_TRAIT), 10 SECONDS)
addtimer(CALLBACK(owner, TYPE_PROC_REF(/atom, balloon_alert), owner, "dexterity regained!"), 10 SECONDS)
if(prob(15))
playsound(owner,'sound/effects/sf_hiccup_male_01.ogg', 50)
playsound(owner,'sound/mobs/humanoids/human/hiccup/sf_hiccup_male_01.ogg', 50)
owner.emote("hiccup")
//too drunk to feel anything
//if they're to this point, they're likely dying of liver damage
code/datums/candidate_poll.dm
+1 -1
View File
@@ -74,7 +74,7 @@
if(time_left() <= 0)
if(!silent)
to_chat(candidate, span_danger("Sorry, you were too late for the consideration!"))
SEND_SOUND(candidate, 'sound/machines/buzz-sigh.ogg')
SEND_SOUND(candidate, 'sound/machines/buzz/buzz-sigh.ogg')
return FALSE
signed_up += candidate
code/datums/cinematics/malf_doomsday.dm
+1 -1
View File
@@ -5,6 +5,6 @@
flick("intro_malf", screen)
stoplag(7.6 SECONDS)
flick("station_explode_fade_red", screen)
play_cinematic_sound(sound('sound/effects/explosion_distant.ogg'))
play_cinematic_sound(sound('sound/effects/explosion/explosion_distant.ogg'))
special_callback?.Invoke()
screen.icon_state = "summary_malf"
code/datums/cinematics/narsie_summon.dm
+5 -5
View File
@@ -5,9 +5,9 @@
screen.icon_state = null
flick("intro_cult", screen)
stoplag(2.5 SECONDS)
play_cinematic_sound(sound('sound/magic/enter_blood.ogg'))
play_cinematic_sound(sound('sound/effects/magic/enter_blood.ogg'))
stoplag(2.8 SECONDS)
play_cinematic_sound(sound('sound/machines/terminal_off.ogg'))
play_cinematic_sound(sound('sound/machines/terminal/terminal_off.ogg'))
stoplag(2 SECONDS)
flick("station_corrupted", screen)
play_cinematic_sound(sound('sound/effects/ghost.ogg'))
@@ -20,10 +20,10 @@
/datum/cinematic/cult_fail/play_cinematic()
screen.icon_state = "station_intact"
stoplag(2 SECONDS)
play_cinematic_sound(sound('sound/creatures/narsie_rises.ogg'))
play_cinematic_sound(sound('sound/music/antag/bloodcult/narsie_rises.ogg'))
stoplag(6 SECONDS)
play_cinematic_sound(sound('sound/effects/explosion_distant.ogg'))
play_cinematic_sound(sound('sound/effects/explosion/explosion_distant.ogg'))
stoplag(1 SECONDS)
play_cinematic_sound(sound('sound/magic/demon_dies.ogg'))
play_cinematic_sound(sound('sound/effects/magic/demon_dies.ogg'))
stoplag(3 SECONDS)
special_callback?.Invoke()
code/datums/cinematics/nuke_cinematics.dm
+9 -9
View File
@@ -22,7 +22,7 @@
/datum/cinematic/nuke/ops_victory/play_nuke_effect()
flick("station_explode_fade_red", screen)
play_cinematic_sound(sound('sound/effects/explosion_distant.ogg'))
play_cinematic_sound(sound('sound/effects/explosion/explosion_distant.ogg'))
/// The syndicate nuclear bomb was activated, but just barely missed the station!
/datum/cinematic/nuke/ops_miss
@@ -30,7 +30,7 @@
/datum/cinematic/nuke/ops_miss/play_nuke_effect()
flick("station_intact_fade_red", screen)
play_cinematic_sound(sound('sound/effects/explosion_distant.ogg'))
play_cinematic_sound(sound('sound/effects/explosion/explosion_distant.ogg'))
/// The self destruct, or another station-destroying entity like a blob, destroyed the station!
/datum/cinematic/nuke/self_destruct
@@ -38,14 +38,14 @@
/datum/cinematic/nuke/self_destruct/play_nuke_effect()
flick("station_explode_fade_red", screen)
play_cinematic_sound(sound('sound/effects/explosion_distant.ogg'))
play_cinematic_sound(sound('sound/effects/explosion/explosion_distant.ogg'))
/// The self destruct was activated, yet somehow avoided destroying the station!
/datum/cinematic/nuke/self_destruct_miss
after_nuke_summary_state = "station_intact"
/datum/cinematic/nuke/self_destruct_miss/play_nuke_effect()
play_cinematic_sound(sound('sound/effects/explosion_distant.ogg'))
play_cinematic_sound(sound('sound/effects/explosion/explosion_distant.ogg'))
special_callback?.Invoke()
/// The syndicate nuclear bomb was activated, and the nuclear operatives failed to extract on their shuttle before it detonated on the station!
@@ -54,7 +54,7 @@
/datum/cinematic/nuke/mutual_destruction/play_nuke_effect()
flick("station_explode_fade_red", screen)
play_cinematic_sound(sound('sound/effects/explosion_distant.ogg'))
play_cinematic_sound(sound('sound/effects/explosion/explosion_distant.ogg'))
/// A blood cult summoned Nar'sie, but central command deployed a nuclear package to stop them.
/datum/cinematic/nuke/cult
@@ -62,7 +62,7 @@
/datum/cinematic/nuke/cult/play_nuke_effect()
flick("station_explode_fade_red", screen)
play_cinematic_sound(sound('sound/effects/explosion_distant.ogg'))
play_cinematic_sound(sound('sound/effects/explosion/explosion_distant.ogg'))
/// A fake version of the nuclear detonation, where it winds up, but doesn't explode.
/datum/cinematic/nuke/fake
@@ -77,7 +77,7 @@
cleanup_time = 10 SECONDS
/datum/cinematic/nuke/clown/play_nuke_effect()
play_cinematic_sound(sound('sound/items/airhorn.ogg'))
play_cinematic_sound(sound('sound/items/airhorn/airhorn.ogg'))
flick("summary_selfdes", screen) //???
/// A fake version of the nuclear detonation, where it winds up, but doesn't explode as the nuke core within was missing.
@@ -86,7 +86,7 @@
/datum/cinematic/nuke/no_core/play_nuke_effect()
flick("station_intact", screen)
play_cinematic_sound(sound('sound/ambience/signal.ogg'))
play_cinematic_sound(sound('sound/ambience/misc/signal.ogg'))
stoplag(10 SECONDS)
/// The syndicate nuclear bomb was activated, but just missed the station by a whole z-level!
@@ -96,5 +96,5 @@
/datum/cinematic/nuke/far_explosion/play_cinematic()
// This one has no intro sequence.
// It's actually just a global sound, which makes you wonder why it's a cinematic.
play_cinematic_sound(sound('sound/effects/explosion_distant.ogg'))
play_cinematic_sound(sound('sound/effects/explosion/explosion_distant.ogg'))
special_callback?.Invoke()
code/datums/communications.dm
+2 -2
View File
@@ -37,9 +37,9 @@ GLOBAL_DATUM_INIT(communications_controller, /datum/communciations_controller, n
else
var/list/message_data = user.treat_message(input)
if(syndicate)
priority_announce(html_decode(message_data["message"]), null, 'sound/misc/announce_syndi.ogg', ANNOUNCEMENT_TYPE_SYNDICATE, has_important_message = TRUE, players = players, color_override = "red")
priority_announce(html_decode(message_data["message"]), null, 'sound/announcer/announcement/announce_syndi.ogg', ANNOUNCEMENT_TYPE_SYNDICATE, has_important_message = TRUE, players = players, color_override = "red")
else
priority_announce(html_decode(message_data["message"]), null, 'sound/misc/announce.ogg', ANNOUNCEMENT_TYPE_CAPTAIN, has_important_message = TRUE, players = players)
priority_announce(html_decode(message_data["message"]), null, 'sound/announcer/announcement/announce.ogg', ANNOUNCEMENT_TYPE_CAPTAIN, has_important_message = TRUE, players = players)
COOLDOWN_START(src, nonsilicon_message_cooldown, COMMUNICATION_COOLDOWN)
user.log_talk(input, LOG_SAY, tag="priority announcement")
message_admins("[ADMIN_LOOKUPFLW(user)] has made a priority announcement.")
code/datums/components/chuunibyou.dm
+2 -2
View File
@@ -71,7 +71,7 @@
/datum/component/chuunibyou/proc/on_spell_projectile(mob/living/source, datum/action/cooldown/spell/spell, atom/cast_on, obj/projectile/to_fire)
SIGNAL_HANDLER
playsound(to_fire,'sound/magic/staff_change.ogg', 75, TRUE)
playsound(to_fire,'sound/effects/magic/staff_change.ogg', 75, TRUE)
to_fire.color = "#f825f8"
to_fire.name = "chuuni-[to_fire.name]"
to_fire.set_light(2, 2, LIGHT_COLOR_PINK, l_on = TRUE)
@@ -101,7 +101,7 @@
COOLDOWN_START(src, heal_cooldown, CHUUNIBYOU_COOLDOWN_TIME)
source.heal_overall_damage(heal_amount)
playsound(source, 'sound/magic/staff_healing.ogg', 30)
playsound(source, 'sound/effects/magic/staff_healing.ogg', 30)
to_chat(source, span_danger("You feel slightly healed by your chuuni powers."))
/datum/component/chuunibyou/no_healing
code/datums/components/crank_recharge.dm
+1 -1
View File
@@ -16,7 +16,7 @@
var/is_charging = FALSE
COOLDOWN_DECLARE(charge_sound_cooldown)
/datum/component/crank_recharge/Initialize(charging_cell, spin_to_win = FALSE, charge_amount = 500, cooldown_time = 2 SECONDS, charge_sound = 'sound/weapons/laser_crank.ogg', charge_sound_cooldown_time = 1.8 SECONDS)
/datum/component/crank_recharge/Initialize(charging_cell, spin_to_win = FALSE, charge_amount = 500, cooldown_time = 2 SECONDS, charge_sound = 'sound/items/weapons/laser_crank.ogg', charge_sound_cooldown_time = 1.8 SECONDS)
. = ..()
if(!isitem(parent))
return COMPONENT_INCOMPATIBLE
code/datums/components/cuff_n_stun.dm
+2 -2
View File
@@ -22,7 +22,7 @@
COOLDOWN_DECLARE(stun_cooldown)
/datum/component/stun_n_cuff/Initialize(list/blacklist_mobs = list(),
stun_sound = 'sound/weapons/egloves.ogg',
stun_sound = 'sound/items/weapons/egloves.ogg',
stun_timer = 8 SECONDS,
handcuff_timer = 4 SECONDS,
stun_cooldown_timer = 10 SECONDS,
@@ -75,7 +75,7 @@
living_parent.balloon_alert(human_target, "already cuffed!")
return
playsound(parent, 'sound/weapons/cablecuff.ogg', 30, TRUE)
playsound(parent, 'sound/items/weapons/cablecuff.ogg', 30, TRUE)
human_target.visible_message(span_danger("[parent] is trying to put zipties on [human_target]!"),\
span_danger("[parent] is trying to put zipties on you!"))
code/datums/components/cult_ritual_item.dm
+3 -3
View File
@@ -176,7 +176,7 @@
* cultist - the mob doing the destroying
*/
/datum/component/cult_ritual_item/proc/do_destroy_girder(obj/structure/girder/cult/cult_girder, mob/living/cultist)
playsound(cult_girder, 'sound/weapons/resonator_blast.ogg', 40, TRUE, ignore_walls = FALSE)
playsound(cult_girder, 'sound/items/weapons/resonator_blast.ogg', 40, TRUE, ignore_walls = FALSE)
cultist.visible_message(
span_warning("[cultist] strikes [cult_girder] with [parent]!"),
span_notice("You demolish [cult_girder].")
@@ -320,7 +320,7 @@
if(scribe_failed)
failed = CALLBACK(GLOBAL_PROC, scribe_failed)
SEND_SOUND(cultist, sound('sound/weapons/slice.ogg', 0, 1, 10))
SEND_SOUND(cultist, sound('sound/items/weapons/slice.ogg', 0, 1, 10))
if(!do_after(cultist, scribe_mod, target = get_turf(cultist), timed_action_flags = IGNORE_SLOWDOWNS))
cleanup_shields()
failed?.Invoke()
@@ -371,7 +371,7 @@
var/area/summon_location = get_area(cultist)
priority_announce(
text = "Figments from an eldritch god are being summoned by [cultist.real_name] into [summon_location.get_original_area_name()] from an unknown dimension. Disrupt the ritual at all costs!",
sound = 'sound/ambience/antag/bloodcult/bloodcult_scribe.ogg',
sound = 'sound/music/antag/bloodcult/bloodcult_scribe.ogg',
sender_override = "[command_name()] Higher Dimensional Affairs",
has_important_message = TRUE,
)
code/datums/components/deployable.dm
+1 -1
View File
@@ -68,7 +68,7 @@
return
new_direction = user.dir //Gets the direction for thing_to_be_deployed if there is a user
source.balloon_alert(user, "deploying...")
playsound(source, 'sound/items/ratchet.ogg', 50, TRUE)
playsound(source, 'sound/items/tools/ratchet.ogg', 50, TRUE)
if(!do_after(user, deploy_time))
return
else // If there is for some reason no user, then the location and direction are set here
code/datums/components/direct_explosive_trap.dm
+1 -1
View File
@@ -74,7 +74,7 @@
to_chat(victim, span_bolddanger("[source] was boobytrapped!"))
if (!isnull(saboteur))
to_chat(saboteur, span_bolddanger("Success! Your trap on [source] caught [victim.name]!"))
playsound(source, 'sound/effects/explosion2.ogg', 200, TRUE)
playsound(source, 'sound/effects/explosion/explosion2.ogg', 200, TRUE)
new /obj/effect/temp_visual/explosion(get_turf(source))
EX_ACT(victim, explosive_force)
qdel(src)
code/datums/components/embedded.dm
+1 -1
View File
@@ -57,7 +57,7 @@
var/damage = weapon.throwforce
if(harmful)
victim.throw_alert(ALERT_EMBEDDED_OBJECT, /atom/movable/screen/alert/embeddedobject)
playsound(victim,'sound/weapons/bladeslice.ogg', 40)
playsound(victim,'sound/items/weapons/bladeslice.ogg', 40)
if (limb.can_bleed())
weapon.add_mob_blood(victim)//it embedded itself in you, of course it's bloody!
damage += weapon.w_class * embed_data.impact_pain_mult
code/datums/components/interaction_booby_trap.dm
+1 -1
View File
@@ -26,7 +26,7 @@
/datum/component/interaction_booby_trap/Initialize(
explosion_light_range = 3,
explosion_heavy_range = 1, // So we destroy some machine components
triggered_sound = 'sound/machines/triple_beep.ogg',
triggered_sound = 'sound/machines/beep/triple_beep.ogg',
trigger_delay = 0.5 SECONDS,
sound_loop_type = /datum/looping_sound/trapped_machine_beep,
defuse_tool = TOOL_SCREWDRIVER,
code/datums/components/jukebox.dm
+1 -1
View File
@@ -400,7 +400,7 @@
// Default track supplied for testing and also because it's a banger
/datum/track/default
song_path = 'sound/ambience/title3.ogg'
song_path = 'sound/music/lobby_music/title3.ogg'
song_name = "Tintin on the Moon"
song_length = 3 MINUTES + 52 SECONDS
song_beat = 1 SECONDS
code/datums/components/mob_harvest.dm
+1 -1
View File
@@ -25,7 +25,7 @@
///how long it takes to harvest from the mob
var/item_harvest_time = 5 SECONDS
///typepath of harvest sound
var/item_harvest_sound = 'sound/items/welder2.ogg'
var/item_harvest_sound = 'sound/items/tools/welder2.ogg'
//harvest_type, produced_item_typepath and speedup_type are typepaths, not reference
/datum/component/mob_harvest/Initialize(harvest_tool, fed_item, produced_item_typepath, produced_item_desc, max_ready, item_generation_wait, item_reduction_time, item_harvest_time, item_harvest_sound)
code/datums/components/plumbing/_plumbing.dm
+1 -1
View File
@@ -343,7 +343,7 @@
parent_movable.update_appearance()
if(changer)
playsound(changer, 'sound/items/ratchet.ogg', 10, TRUE) //sound
playsound(changer, 'sound/items/tools/ratchet.ogg', 10, TRUE) //sound
//quickly disconnect and reconnect the network.
if(active)
code/datums/components/ranged_attacks.dm
+1 -1
View File
@@ -20,7 +20,7 @@
/datum/component/ranged_attacks/Initialize(
casing_type,
projectile_type,
projectile_sound = 'sound/weapons/gun/pistol/shot.ogg',
projectile_sound = 'sound/items/weapons/gun/pistol/shot.ogg',
burst_shots,
burst_intervals = 0.2 SECONDS,
cooldown_time = 3 SECONDS,
code/datums/components/regenerative_shield.dm
+3 -3
View File
@@ -59,7 +59,7 @@
if(damage >= damage_threshold || number_of_hits <= 0)
return NONE
playsound(get_turf(parent), 'sound/weapons/tap.ogg', 20)
playsound(get_turf(parent), 'sound/items/weapons/tap.ogg', 20)
new /obj/effect/temp_visual/guardian/phase/out(get_turf(parent))
number_of_hits = max(0, number_of_hits - 1)
if(number_of_hits <= 0)
@@ -71,14 +71,14 @@
for(var/obj/effect/my_effect as anything in shield_overlays)
animate(my_effect, alpha = 0, time = 3 SECONDS)
my_effect.remove_filter(SHIELD_FILTER)
playsound(parent, 'sound/mecha/mech_shield_drop.ogg', 20)
playsound(parent, 'sound/vehicles/mecha/mech_shield_drop.ogg', 20)
/datum/component/regenerative_shield/proc/enable_shield()
number_of_hits = initial(number_of_hits)
for(var/obj/effect/my_effect as anything in shield_overlays)
animate(my_effect, alpha = 255, time = 3 SECONDS)
addtimer(CALLBACK(src, PROC_REF(apply_filter_effects), my_effect), 5 SECONDS)
playsound(parent, 'sound/mecha/mech_shield_raise.ogg', 20)
playsound(parent, 'sound/vehicles/mecha/mech_shield_raise.ogg', 20)
/datum/component/regenerative_shield/proc/apply_filter_effects(obj/effect/new_effect)
if(isnull(new_effect))
code/datums/components/riding/riding_mob.dm
+1 -1
View File
@@ -389,7 +389,7 @@
if(human_user && is_clown_job(human_user.mind?.assigned_role))
// there's a new sheriff in town
playsound(movable_parent, 'sound/creatures/pony/clown_gallup.ogg', 50)
playsound(movable_parent, 'sound/mobs/non-humanoids/pony/clown_gallup.ogg', 50)
COOLDOWN_START(src, pony_trot_cooldown, 500 MILLISECONDS)
/datum/component/riding/creature/bear/handle_specials()
code/datums/components/rotation.dm
+1 -1
View File
@@ -76,7 +76,7 @@
var/obj/rotated_obj = parent
rotated_obj.setDir(turn(rotated_obj.dir, degrees))
if(rotation_flags & ROTATION_REQUIRE_WRENCH)
playsound(rotated_obj, 'sound/items/ratchet.ogg', 50, TRUE)
playsound(rotated_obj, 'sound/items/tools/ratchet.ogg', 50, TRUE)
post_rotation.Invoke(user, degrees)
code/datums/components/scope.dm
+2 -2
View File
@@ -164,7 +164,7 @@
if(HAS_TRAIT(user, TRAIT_USER_SCOPED))
user.balloon_alert(user, "already zoomed!")
return
user.playsound_local(parent, 'sound/weapons/scope.ogg', 75, TRUE)
user.playsound_local(parent, 'sound/items/weapons/scope.ogg', 75, TRUE)
tracker = user.overlay_fullscreen("scope", /atom/movable/screen/fullscreen/cursor_catcher/scope, isgun(parent))
tracker.assign_to_mob(user, range_modifier)
tracker_owner_ckey = user.ckey
@@ -210,7 +210,7 @@
))
REMOVE_TRAIT(user, TRAIT_USER_SCOPED, REF(src))
user.playsound_local(parent, 'sound/weapons/scope.ogg', 75, TRUE, frequency = -1)
user.playsound_local(parent, 'sound/items/weapons/scope.ogg', 75, TRUE, frequency = -1)
user.clear_fullscreen("scope")
// if the client has ended up in another mob, find that mob so we can fix their cursor
code/datums/components/shielded.dm
+1 -1
View File
@@ -101,7 +101,7 @@
var/obj/item/item_parent = parent
COOLDOWN_START(src, charge_add_cd, charge_increment_delay)
adjust_charge(charge_recovery) // set the number of charges to current + recovery per increment, clamped from zero to max_charges
playsound(item_parent, 'sound/magic/charge.ogg', 50, TRUE)
playsound(item_parent, 'sound/effects/magic/charge.ogg', 50, TRUE)
if(current_charges == max_charges)
playsound(item_parent, 'sound/machines/ding.ogg', 50, TRUE)
code/datums/components/sisyphus_awarder.dm
+1 -1
View File
@@ -65,4 +65,4 @@
"reverse_dropoff_coords" = list(bottom_of_the_hill.x, bottom_of_the_hill.y, bottom_of_the_hill.z),
))
SEND_SOUND(sisyphus, 'sound/ambience/music/sisyphus/sisyphus.ogg')
SEND_SOUND(sisyphus, 'sound/music/sisyphus/sisyphus.ogg')
code/datums/components/sitcomlaughter.dm
+1 -1
View File
@@ -4,7 +4,7 @@
proctype = PROC_REF(EngageInComedy)
mobtype = /mob/living
///Sounds used for when user has a sitcom action occur
var/list/comedysounds = list('sound/items/SitcomLaugh1.ogg', 'sound/items/SitcomLaugh2.ogg', 'sound/items/SitcomLaugh3.ogg')
var/list/comedysounds = list('sound/items/sitcom_laugh/sitcomLaugh1.ogg', 'sound/items/sitcom_laugh/sitcomLaugh2.ogg', 'sound/items/sitcom_laugh/sitcomLaugh3.ogg')
///Invoked in EngageInComedy is ran
var/datum/callback/post_comedy_callback
///Cooldown for inbetween laughs
code/datums/components/spin2win.dm
+3 -3
View File
@@ -84,7 +84,7 @@
if(start_spin_message)
var/message = replacetext(start_spin_message, "%USER", spinning_user)
spinning_user.visible_message(message)
playsound(spinning_user, 'sound/weapons/fwoosh.ogg', 75, FALSE)
playsound(spinning_user, 'sound/items/weapons/fwoosh.ogg', 75, FALSE)
stop_spinning_timer_id = addtimer(CALLBACK(src, PROC_REF(stop_spinning), spinning_user), spin_duration, TIMER_STOPPABLE|TIMER_DELETE_ME)
RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_spin_equipped))
RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_spin_dropped))
@@ -95,7 +95,7 @@
STOP_PROCESSING(SSprocessing, src)
UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED))
deltimer(stop_spinning_timer_id)
playsound(user, 'sound/weapons/fwoosh.ogg', 75, FALSE)
playsound(user, 'sound/items/weapons/fwoosh.ogg', 75, FALSE)
if(user && end_spin_message)
var/message = replacetext(end_spin_message, "%USER", user)
user.visible_message(message)
@@ -111,7 +111,7 @@
return PROCESS_KILL
var/mob/living/item_owner = spinning_item.loc
item_owner.emote("spin")
playsound(item_owner, 'sound/weapons/fwoosh.ogg', 75, FALSE)
playsound(item_owner, 'sound/items/weapons/fwoosh.ogg', 75, FALSE)
for(var/mob/living/victim in orange(1, item_owner))
spinning_item.attack(victim, item_owner)
code/datums/components/spirit_holding.dm
+1 -1
View File
@@ -149,7 +149,7 @@
return // just in case
var/atom/movable/exorcised_movable = parent
to_chat(exorcist, span_notice("You begin to exorcise [parent]..."))
playsound(parent, 'sound/hallucinations/veryfar_noise.ogg',40,TRUE)
playsound(parent, 'sound/effects/hallucinations/veryfar_noise.ogg',40,TRUE)
if(!do_after(exorcist, 4 SECONDS, target = exorcised_movable))
return
playsound(parent, 'sound/effects/pray_chaplain.ogg',60,TRUE)
code/datums/components/squeak.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/datum/component/squeak
var/static/list/default_squeak_sounds = list('sound/items/toysqueak1.ogg'=1, 'sound/items/toysqueak2.ogg'=1, 'sound/items/toysqueak3.ogg'=1)
var/static/list/default_squeak_sounds = list('sound/items/toy_squeak/toysqueak1.ogg'=1, 'sound/items/toy_squeak/toysqueak2.ogg'=1, 'sound/items/toy_squeak/toysqueak3.ogg'=1)
var/list/override_squeak_sounds
var/mob/holder
code/datums/components/stationloving.dm
+1 -1
View File
@@ -61,7 +61,7 @@
CRASH("Unable to find a blobstart landmark for [type] to relocate [parent].")
var/atom/movable/movable_parent = parent
playsound(movable_parent, 'sound/machines/synth_no.ogg', 5, TRUE)
playsound(movable_parent, 'sound/machines/synth/synth_no.ogg', 5, TRUE)
var/mob/holder = get(movable_parent, /mob)
if(holder)
code/datums/components/summoning.dm
+1 -1
View File
@@ -24,7 +24,7 @@
max_mobs = 3,
spawn_delay = 10 SECONDS,
spawn_text = "appears out of nowhere",
spawn_sound = 'sound/magic/summon_magic.ogg',
spawn_sound = 'sound/effects/magic/summon_magic.ogg',
list/faction,
)
if(!isitem(parent) && !ishostile(parent) && !isgun(parent) && !ismachinery(parent) && !isstructure(parent) && !isprojectilespell(parent))
code/datums/components/tackle.dm
+8 -8
View File
@@ -104,7 +104,7 @@
tackling = TRUE
RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(checkObstacle))
playsound(user, 'sound/weapons/thudswoosh.ogg', 40, TRUE, -1)
playsound(user, 'sound/items/weapons/thudswoosh.ogg', 40, TRUE, -1)
var/leap_word = isfelinid(user) ? "pounce" : "leap" //If cat, "pounce" instead of "leap".
if(can_see(user, clicked_atom, 7))
@@ -533,7 +533,7 @@
else
user.adjustBruteLoss(40, updating_health=FALSE)
user.adjustStaminaLoss(30)
playsound(user, 'sound/effects/blobattack.ogg', 60, TRUE)
playsound(user, 'sound/effects/blob/blobattack.ogg', 60, TRUE)
playsound(user, 'sound/effects/splat.ogg', 70, TRUE)
playsound(user, 'sound/effects/wounds/crack2.ogg', 70, TRUE)
user.emote("scream")
@@ -550,7 +550,7 @@
user.adjustBruteLoss(40, updating_health = FALSE)
user.adjustStaminaLoss(30)
user.gain_trauma_type(BRAIN_TRAUMA_MILD)
playsound(user, 'sound/effects/blobattack.ogg', 60, TRUE)
playsound(user, 'sound/effects/blob/blobattack.ogg', 60, TRUE)
playsound(user, 'sound/effects/splat.ogg', 70, TRUE)
user.emote("gurgle")
shake_camera(user, 7, 7)
@@ -562,7 +562,7 @@
user.adjustBruteLoss(30)
user.Unconscious(10 SECONDS)
user.gain_trauma_type(BRAIN_TRAUMA_MILD)
user.playsound_local(get_turf(user), 'sound/weapons/flashbang.ogg', 100, TRUE, 8)
user.playsound_local(get_turf(user), 'sound/items/weapons/flashbang.ogg', 100, TRUE, 8)
shake_camera(user, 6, 6)
user.flash_act(1, TRUE, TRUE, length = 3.5)
@@ -573,7 +573,7 @@
user.adjust_confusion(15 SECONDS)
if(prob(80))
user.gain_trauma(/datum/brain_trauma/mild/concussion)
user.playsound_local(get_turf(user), 'sound/weapons/flashbang.ogg', 100, TRUE, 8)
user.playsound_local(get_turf(user), 'sound/items/weapons/flashbang.ogg', 100, TRUE, 8)
user.Knockdown(4 SECONDS)
shake_camera(user, 5, 5)
user.flash_act(1, TRUE, TRUE, length = 2.5)
@@ -593,7 +593,7 @@
user.Knockdown(2 SECONDS)
shake_camera(user, 2, 2)
playsound(user, 'sound/weapons/smash.ogg', 70, TRUE)
playsound(user, 'sound/items/weapons/smash.ogg', 70, TRUE)
/datum/component/tackler/proc/resetTackle()
@@ -603,7 +603,7 @@
///A special case for splatting for handling windows
/datum/component/tackler/proc/splatWindow(mob/living/carbon/user, obj/structure/window/W)
playsound(user, 'sound/effects/Glasshit.ogg', 140, TRUE)
playsound(user, 'sound/effects/glass/Glasshit.ogg', 140, TRUE)
if(W.type in list(/obj/structure/window, /obj/structure/window/fulltile, /obj/structure/window/unanchored, /obj/structure/window/fulltile/unanchored)) // boring unreinforced windows
for(var/i in 1 to speed)
@@ -682,7 +682,7 @@
var/datum/thrownthing/tackle = tackle_ref?.resolve()
playsound(owner, 'sound/weapons/smash.ogg', 70, TRUE)
playsound(owner, 'sound/items/weapons/smash.ogg', 70, TRUE)
if(tackle)
tackle.finalize(hit=TRUE)
resetTackle()
code/datums/components/thermite.dm
+1 -1
View File
@@ -116,7 +116,7 @@
*/
/datum/component/thermite/proc/thermite_melt(mob/user)
var/turf/parent_turf = parent
playsound(parent_turf, 'sound/items/welder.ogg', 100, TRUE)
playsound(parent_turf, 'sound/items/tools/welder.ogg', 100, TRUE)
fakefire = new(parent_turf)
burn_callback = CALLBACK(src, PROC_REF(burn_parent), user)
burn_timer = addtimer(burn_callback, min(amount * 0.35 SECONDS, 20 SECONDS), TIMER_STOPPABLE)
code/datums/components/transforming.dm
+2 -2
View File
@@ -50,7 +50,7 @@
throwforce_on = 0,
throw_speed_on = 2,
sharpness_on = NONE,
hitsound_on = 'sound/weapons/blade1.ogg',
hitsound_on = 'sound/items/weapons/blade1.ogg',
w_class_on = WEIGHT_CLASS_BULKY,
clumsy_check = TRUE,
clumsy_damage = 10,
@@ -174,7 +174,7 @@
/datum/component/transforming/proc/default_transform_message(obj/item/source, mob/user)
if(user)
source.balloon_alert(user, "[active ? "enabled" : "disabled"] [source]")
playsound(source, 'sound/weapons/batonextend.ogg', 50, TRUE)
playsound(source, 'sound/items/weapons/batonextend.ogg', 50, TRUE)
/*
* Toggle active between true and false, and call
code/datums/components/trapdoor.dm
+2 -2
View File
@@ -246,7 +246,7 @@
assembly_turf.visible_message("<span class='notice'>[src] has linked up to a nearby trapdoor! \
You may now use it to check where the trapdoor is... be careful!</span>", vision_distance = SAMETILE_MESSAGE_RANGE)
else
playsound(assembly_turf, 'sound/machines/buzz-sigh.ogg', 50, FALSE)
playsound(assembly_turf, 'sound/machines/buzz/buzz-sigh.ogg', 50, FALSE)
assembly_turf.visible_message(span_warning("[src] has failed to find a trapdoor nearby to link to."), vision_distance = SAMETILE_MESSAGE_RANGE)
/**
@@ -321,7 +321,7 @@
return TRUE
user.balloon_alert(user, "trapdoor triggered")
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
playsound(src, 'sound/machines/terminal/terminal_prompt_confirm.ogg', 50, FALSE)
icon_state = "trapdoor_pressed"
addtimer(VARSET_CALLBACK(src, icon_state, initial(icon_state)), trapdoor_cooldown_time)
COOLDOWN_START(src, trapdoor_cooldown, trapdoor_cooldown_time)
code/datums/dash_weapon.dm
+2 -2
View File
@@ -11,9 +11,9 @@
/// How long does it take to get a dash charge back?
var/charge_rate = 25 SECONDS
/// What sound do we play on dash?
var/dash_sound = 'sound/magic/blink.ogg'
var/dash_sound = 'sound/effects/magic/blink.ogg'
/// What sound do we play on recharge?
var/recharge_sound = 'sound/magic/charge.ogg'
var/recharge_sound = 'sound/effects/magic/charge.ogg'
/// What effect does our beam use?
var/beam_effect = "blur"
/// How long does our beam last?
code/datums/diseases/chronic_illness.dm
+2 -2
View File
@@ -42,7 +42,7 @@
need_mob_update += affected_mob.adjustStaminaLoss(70, updating_stamina = FALSE)
if(SPT_PROB(1, seconds_per_tick))
to_chat(affected_mob, span_danger("You feel a buzzing in your brain."))
SEND_SOUND(affected_mob, sound('sound/weapons/flash_ring.ogg'))
SEND_SOUND(affected_mob, sound('sound/items/weapons/flash_ring.ogg'))
if(SPT_PROB(0.5, seconds_per_tick))
need_mob_update += affected_mob.adjustBruteLoss(1, updating_health = FALSE)
if(need_mob_update)
@@ -75,7 +75,7 @@
if(2)
to_chat(affected_mob, span_boldwarning("There is no place for you in this timeline."))
affected_mob.adjustStaminaLoss(100, forced = TRUE)
playsound(affected_mob.loc, 'sound/magic/repulse.ogg', 100, FALSE)
playsound(affected_mob.loc, 'sound/effects/magic/repulse.ogg', 100, FALSE)
affected_mob.emote("scream")
for(var/mob/living/viewers in viewers(3, affected_mob.loc))
viewers.flash_act()
code/datums/diseases/heart_failure.dm
+1 -1
View File
@@ -43,7 +43,7 @@
to_chat(affected_mob, span_warning("You feel [pick("full", "nauseated", "sweaty", "weak", "tired", "short of breath", "uneasy")]."))
if(3 to 4)
if(!sound)
affected_mob.playsound_local(affected_mob, 'sound/health/slowbeat.ogg', 40, FALSE, channel = CHANNEL_HEARTBEAT, use_reverb = FALSE)
affected_mob.playsound_local(affected_mob, 'sound/effects/health/slowbeat.ogg', 40, FALSE, channel = CHANNEL_HEARTBEAT, use_reverb = FALSE)
sound = TRUE
if(SPT_PROB(1.5, seconds_per_tick))
to_chat(affected_mob, span_danger("You feel a sharp pain in your chest!"))
code/datums/elements/bugkiller_reagent.dm
+1 -1
View File
@@ -59,7 +59,7 @@
/datum/status_effect/bugkiller_death/on_apply()
if(owner.stat == DEAD)
return FALSE
playsound(owner, 'sound/voice/human/malescream_1.ogg', 25, TRUE, extrarange = SILENCED_SOUND_EXTRARANGE, frequency = 5)
playsound(owner, 'sound/mobs/humanoids/human/scream/malescream_1.ogg', 25, TRUE, extrarange = SILENCED_SOUND_EXTRARANGE, frequency = 5)
to_chat(owner, span_userdanger("The world begins to go dark..."))
owner.spasm_animation(spasm_loops)
owner.adjust_eye_blur(duration)
code/datums/elements/corrupted_organ.dm
+1 -1
View File
@@ -41,7 +41,7 @@
)
return
var/turf/origin_turf = get_turf(organ)
playsound(organ, 'sound/magic/forcewall.ogg', vol = 100)
playsound(organ, 'sound/effects/magic/forcewall.ogg', vol = 100)
new /obj/effect/temp_visual/curse_blast(origin_turf)
organ.visible_message(span_revenwarning("[organ] explodes in a burst of dark energy!"))
for(var/mob/living/target in range(1, origin_turf))
code/datums/elements/damage_threshold.dm
+1 -1
View File
@@ -45,7 +45,7 @@
span_hear("You hear a thud."),
COMBAT_MESSAGE_RANGE,
)
playsound(source, 'sound/weapons/tap.ogg', tap_vol, TRUE, -1)
playsound(source, 'sound/items/weapons/tap.ogg', tap_vol, TRUE, -1)
return SUCCESSFUL_BLOCK
return NONE
code/datums/elements/deliver_first.dm
+1 -1
View File
@@ -80,7 +80,7 @@
if(user)
target.balloon_alert(user, "access denied until delivery!")
if(COOLDOWN_FINISHED(src, deny_cooldown))
playsound(target, 'sound/machines/buzz-two.ogg', 30, TRUE)
playsound(target, 'sound/machines/buzz/buzz-two.ogg', 30, TRUE)
COOLDOWN_START(src, deny_cooldown, DENY_SOUND_COOLDOWN)
return BLOCK_OPEN
code/datums/elements/door_pryer.dm
+1 -1
View File
@@ -60,7 +60,7 @@
message = span_warning("[attacker] starts forcing the [airlock_target] open!"),
blind_message = span_hear("You hear a metal screeching sound."),
)
playsound(airlock_target, 'sound/machines/airlock_alien_prying.ogg', 100, TRUE)
playsound(airlock_target, 'sound/machines/airlock/airlock_alien_prying.ogg', 100, TRUE)
airlock_target.balloon_alert(attacker, "prying...")
if(!do_after(attacker, pry_time, airlock_target))
airlock_target.balloon_alert(attacker, "interrupted!")
code/datums/elements/falling_hazard.dm
+2 -2
View File
@@ -12,7 +12,7 @@
/// Does the target crush and flatten whoever it falls on
var/crushes_people = FALSE
/// What sound is played when the target falls onto a mob
var/impact_sound = 'sound/magic/clockwork/fellowship_armory.ogg' //CLANG
var/impact_sound = 'sound/effects/magic/clockwork/fellowship_armory.ogg' //CLANG
/datum/element/falling_hazard/Attach(datum/target, damage, wound_bonus, hardhat_safety, crushes, impact_sound)
. = ..()
@@ -52,7 +52,7 @@
if(crushes_people)
poor_target.Knockdown(0.25 SECONDS * fall_damage) // For a piano, that would be 15 seconds
playsound(poor_target, 'sound/weapons/parry.ogg', 50, TRUE) // You PARRIED the falling object with your EPIC hardhat
playsound(poor_target, 'sound/items/weapons/parry.ogg', 50, TRUE) // You PARRIED the falling object with your EPIC hardhat
return
var/obj/item/bodypart/target_head = poor_target.get_bodypart(BODY_ZONE_HEAD)
code/datums/elements/high_fiver.dm
+1 -1
View File
@@ -54,7 +54,7 @@
taker.add_mood_event(descriptor, /datum/mood_event/high_five_full_hand) // not so successful now!
return COMPONENT_OFFER_INTERRUPT
playsound(offerer, 'sound/weapons/slap.ogg', min(50 * slappers_giver, 300), TRUE, 1)
playsound(offerer, 'sound/items/weapons/slap.ogg', min(50 * slappers_giver, 300), TRUE, 1)
offerer.add_mob_memory(/datum/memory/high_five, deuteragonist = taker, high_five_type = descriptor, high_ten = high_ten)
taker.add_mob_memory(/datum/memory/high_five, deuteragonist = offerer, high_five_type = descriptor, high_ten = high_ten)
code/datums/elements/kneejerk.dm
+3 -3
View File
@@ -51,17 +51,17 @@
var/target_brain_damage = target_brain.damage
if(target_brain_damage < BRAIN_DAMAGE_MILD) //a healthy brain produces a normal reaction
playsound(target, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
playsound(target, 'sound/items/weapons/punchmiss.ogg', 25, TRUE, -1)
target.visible_message(span_danger("[target]'s leg kicks out sharply!"), \
span_danger("Your leg kicks out sharply!"))
else if(target_brain_damage < BRAIN_DAMAGE_SEVERE) //a mildly damaged brain produces a delayed reaction
playsound(target, 'sound/weapons/punchmiss.ogg', 15, TRUE, -1)
playsound(target, 'sound/items/weapons/punchmiss.ogg', 15, TRUE, -1)
target.visible_message(span_danger("After a moment, [target]'s leg kicks out sharply!"), \
span_danger("After a moment, your leg kicks out sharply!"))
else if(target_brain_damage < BRAIN_DAMAGE_DEATH) //a severely damaged brain produces a delayed + weaker reaction
playsound(target, 'sound/weapons/punchmiss.ogg', 5, TRUE, -1)
playsound(target, 'sound/items/weapons/punchmiss.ogg', 5, TRUE, -1)
target.visible_message(span_danger("After a moment, [target]'s leg kicks out weakly!"), \
span_danger("After a moment, your leg kicks out weakly!"))
code/datums/elements/wall_tearer.dm
+1 -1
View File
@@ -51,7 +51,7 @@
var/rip_time = (istype(target, /turf/closed/wall/r_wall) ? tear_time * reinforced_multiplier : tear_time) / 3
if (rip_time > 0)
tearer.visible_message(span_warning("[tearer] begins tearing through [target]!"))
playsound(tearer, 'sound/machines/airlock_alien_prying.ogg', vol = 100, vary = TRUE)
playsound(tearer, 'sound/machines/airlock/airlock_alien_prying.ogg', vol = 100, vary = TRUE)
target.balloon_alert(tearer, "tearing...")
if (!do_after(tearer, delay = rip_time, target = target, interaction_key = do_after_key))
tearer.balloon_alert(tearer, "interrupted!")
code/datums/looping_sounds/acid.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/// Soundloop for the acid component.
/datum/looping_sound/acid
mid_sounds = list('sound/items/welder.ogg' = 1)
mid_sounds = list('sound/items/tools/welder.ogg' = 1)
mid_length = 10
volume = 150
code/datums/looping_sounds/breathing.dm
+8 -8
View File
@@ -1,13 +1,13 @@
/datum/looping_sound/breathing
mid_sounds = list(
'sound/voice/breathing/internals_breathing1.ogg' = 1,
'sound/voice/breathing/internals_breathing2.ogg' = 1,
'sound/voice/breathing/internals_breathing3.ogg' = 1,
'sound/voice/breathing/internals_breathing4.ogg' = 1,
'sound/voice/breathing/internals_breathing5.ogg' = 1,
'sound/voice/breathing/internals_breathing6.ogg' = 1,
'sound/voice/breathing/internals_breathing7.ogg' = 1,
'sound/voice/breathing/internals_breathing8.ogg' = 1,
'sound/mobs/humanoids/breathing/internals_breathing1.ogg' = 1,
'sound/mobs/humanoids/breathing/internals_breathing2.ogg' = 1,
'sound/mobs/humanoids/breathing/internals_breathing3.ogg' = 1,
'sound/mobs/humanoids/breathing/internals_breathing4.ogg' = 1,
'sound/mobs/humanoids/breathing/internals_breathing5.ogg' = 1,
'sound/mobs/humanoids/breathing/internals_breathing6.ogg' = 1,
'sound/mobs/humanoids/breathing/internals_breathing7.ogg' = 1,
'sound/mobs/humanoids/breathing/internals_breathing8.ogg' = 1,
)
//Calculated this by using the average breathing time of an adult (12 to 20 per minute, which on average is 16 per minute)
// realism is overrated, make it longer to reduce ear fatigue
code/datums/looping_sounds/choking.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/datum/looping_sound/choking
mid_sounds = list('sound/creatures/gag1.ogg' = 1, 'sound/creatures/gag2.ogg' = 1, 'sound/creatures/gag3.ogg' = 1, 'sound/creatures/gag4.ogg' = 1, 'sound/creatures/gag5.ogg' = 1)
mid_sounds = list('sound/mobs/humanoids/human/gag_vomit/gag1.ogg' = 1, 'sound/mobs/humanoids/human/gag_vomit/gag2.ogg' = 1, 'sound/mobs/humanoids/human/gag_vomit/gag3.ogg' = 1, 'sound/mobs/humanoids/human/gag_vomit/gag4.ogg' = 1, 'sound/mobs/humanoids/human/gag_vomit/gag5.ogg' = 1)
mid_length = 1.6 SECONDS
mid_length_vary = 0.3 SECONDS
each_once = TRUE
code/datums/looping_sounds/cyborg.dm
+3 -3
View File
@@ -1,10 +1,10 @@
/datum/looping_sound/wash
mid_sounds = list('sound/creatures/cyborg/wash1.ogg' = 1, 'sound/creatures/cyborg/wash2.ogg' = 1)
mid_sounds = list('sound/mobs/non-humanoids/cyborg/wash1.ogg' = 1, 'sound/mobs/non-humanoids/cyborg/wash2.ogg' = 1)
mid_length = 1.5 SECONDS // This makes them overlap slightly, which works out well for masking the fade in/out
start_volume = 100
start_sound = 'sound/creatures/cyborg/wash_start.ogg'
start_sound = 'sound/mobs/non-humanoids/cyborg/wash_start.ogg'
start_length = 3.6 SECONDS // again, slightly shorter then the real time of 4 seconds, will make the transition to midsounds more seemless
end_volume = 100
end_sound = 'sound/creatures/cyborg/wash_end.ogg'
end_sound = 'sound/mobs/non-humanoids/cyborg/wash_end.ogg'
vary = TRUE
extra_range = 5
code/datums/looping_sounds/item_sounds.dm
+7 -7
View File
@@ -5,7 +5,7 @@
/datum/looping_sound/reverse_bear_trap_beep
mid_sounds = list('sound/machines/beep.ogg' = 1)
mid_sounds = list('sound/machines/beep/beep.ogg' = 1)
mid_length = 60
volume = 10
@@ -24,7 +24,7 @@
mid_length = 1 SECONDS
/datum/looping_sound/trapped_machine_beep
mid_sounds = list('sound/machines/beep.ogg' = 1)
mid_sounds = list('sound/machines/beep/beep.ogg' = 1)
mid_length = 10 SECONDS
mid_length_vary = 5 SECONDS
falloff_exponent = 10
@@ -32,19 +32,19 @@
volume = 5
/datum/looping_sound/chainsaw
start_sound = list('sound/weapons/chainsaw_start.ogg' = 1)
start_sound = list('sound/items/weapons/chainsaw_start.ogg' = 1)
start_length = 0.85 SECONDS
mid_sounds = list('sound/weapons/chainsaw_loop.ogg' = 1)
mid_sounds = list('sound/items/weapons/chainsaw_loop.ogg' = 1)
mid_length = 0.85 SECONDS
end_sound = list('sound/weapons/chainsaw_stop.ogg' = 1)
end_sound = list('sound/items/weapons/chainsaw_stop.ogg' = 1)
end_volume = 35
volume = 40
ignore_walls = FALSE
/datum/looping_sound/beesmoke
mid_sounds = list('sound/weapons/beesmoke.ogg' = 1)
mid_sounds = list('sound/items/weapons/beesmoke.ogg' = 1)
volume = 5
/datum/looping_sound/zipline
mid_sounds = list('sound/weapons/zipline_mid.ogg' = 1)
mid_sounds = list('sound/items/weapons/zipline_mid.ogg' = 1)
volume = 5
code/datums/looping_sounds/machinery_sounds.dm
+18 -18
View File
@@ -47,7 +47,7 @@
volume = 15
/datum/looping_sound/clock
mid_sounds = list('sound/ambience/ticking_clock.ogg' = 1)
mid_sounds = list('sound/ambience/misc/ticking_clock.ogg' = 1)
mid_length = 40
volume = 50
ignore_walls = FALSE
@@ -90,7 +90,7 @@
/datum/looping_sound/jackpot
mid_length = 11
mid_sounds = list('sound/machines/roulettejackpot.ogg' = 1)
mid_sounds = list('sound/machines/roulette/roulettejackpot.ogg' = 1)
volume = 85
vary = TRUE
@@ -141,7 +141,7 @@
falloff_exponent = 20
/datum/looping_sound/firealarm
mid_sounds = list('sound/machines/FireAlarm1.ogg' = 1,'sound/machines/FireAlarm2.ogg' = 1,'sound/machines/FireAlarm3.ogg' = 1,'sound/machines/FireAlarm4.ogg' = 1)
mid_sounds = list('sound/machines/fire_alarm/FireAlarm1.ogg' = 1,'sound/machines/fire_alarm/FireAlarm2.ogg' = 1,'sound/machines/fire_alarm/FireAlarm3.ogg' = 1,'sound/machines/fire_alarm/FireAlarm4.ogg' = 1)
mid_length = 2.4 SECONDS
volume = 30
@@ -151,34 +151,34 @@
falloff_exponent = 5
/datum/looping_sound/boiling
mid_sounds = list('sound/effects/bubbles2.ogg' = 1)
mid_sounds = list('sound/effects/bubbles/bubbles2.ogg' = 1)
mid_length = 7 SECONDS
volume = 25
/datum/looping_sound/typing
mid_sounds = list(
'sound/machines/terminal_button01.ogg' = 1,
'sound/machines/terminal_button02.ogg' = 1,
'sound/machines/terminal_button03.ogg' = 1,
'sound/machines/terminal_button04.ogg' = 1,
'sound/machines/terminal_button05.ogg' = 1,
'sound/machines/terminal_button06.ogg' = 1,
'sound/machines/terminal_button07.ogg' = 1,
'sound/machines/terminal_button08.ogg' = 1,
'sound/machines/terminal/terminal_button01.ogg' = 1,
'sound/machines/terminal/terminal_button02.ogg' = 1,
'sound/machines/terminal/terminal_button03.ogg' = 1,
'sound/machines/terminal/terminal_button04.ogg' = 1,
'sound/machines/terminal/terminal_button05.ogg' = 1,
'sound/machines/terminal/terminal_button06.ogg' = 1,
'sound/machines/terminal/terminal_button07.ogg' = 1,
'sound/machines/terminal/terminal_button08.ogg' = 1,
)
mid_length = 0.3 SECONDS
/datum/looping_sound/soup
mid_sounds = list(
'sound/effects/soup_boil1.ogg' = 1,
'sound/effects/soup_boil2.ogg' = 1,
'sound/effects/soup_boil3.ogg' = 1,
'sound/effects/soup_boil4.ogg' = 1,
'sound/effects/soup_boil5.ogg' = 1,
'sound/effects/soup_boil/soup_boil1.ogg' = 1,
'sound/effects/soup_boil/soup_boil2.ogg' = 1,
'sound/effects/soup_boil/soup_boil3.ogg' = 1,
'sound/effects/soup_boil/soup_boil4.ogg' = 1,
'sound/effects/soup_boil/soup_boil5.ogg' = 1,
)
mid_length = 3 SECONDS
volume = 80
end_sound = 'sound/effects/soup_boil_end.ogg'
end_sound = 'sound/effects/soup_boil/soup_boil_end.ogg'
end_volume = 60
extra_range = MEDIUM_RANGE_SOUND_EXTRARANGE
falloff_exponent = 4
code/datums/looping_sounds/music.dm
+1 -1
View File
@@ -1,6 +1,6 @@
/datum/looping_sound/local_forecast
mid_sounds = list(
'sound/ambience/music/elevator/robocop-short.ogg' = 1,
'sound/music/elevator/robocop-short.ogg' = 1,
)
mid_length = 61 SECONDS
volume = 20
code/datums/looping_sounds/vents.dm
+3 -3
View File
@@ -1,7 +1,7 @@
/datum/looping_sound/vent_pump_overclock
start_sound = 'sound/machines/fan_start.ogg'
start_sound = 'sound/machines/fan/fan_start.ogg'
start_length = 1.5 SECONDS
end_sound = 'sound/machines/fan_stop.ogg'
end_sound = 'sound/machines/fan/fan_stop.ogg'
end_sound = 1.5 SECONDS
mid_sounds = 'sound/machines/fan_loop.ogg'
mid_sounds = 'sound/machines/fan/fan_loop.ogg'
mid_length = 2 SECONDS
code/datums/looping_sounds/weather.dm
+21 -21
View File
@@ -1,53 +1,53 @@
/datum/looping_sound/active_outside_ashstorm
mid_sounds = list(
'sound/weather/ashstorm/outside/active_mid1.ogg'=1,
'sound/weather/ashstorm/outside/active_mid1.ogg'=1,
'sound/weather/ashstorm/outside/active_mid1.ogg'=1
'sound/ambience/weather/ashstorm/outside/active_mid1.ogg'=1,
'sound/ambience/weather/ashstorm/outside/active_mid1.ogg'=1,
'sound/ambience/weather/ashstorm/outside/active_mid1.ogg'=1
)
mid_length = 80
start_sound = 'sound/weather/ashstorm/outside/active_start.ogg'
start_sound = 'sound/ambience/weather/ashstorm/outside/active_start.ogg'
start_length = 130
end_sound = 'sound/weather/ashstorm/outside/active_end.ogg'
end_sound = 'sound/ambience/weather/ashstorm/outside/active_end.ogg'
volume = 80
/datum/looping_sound/active_inside_ashstorm
mid_sounds = list(
'sound/weather/ashstorm/inside/active_mid1.ogg'=1,
'sound/weather/ashstorm/inside/active_mid2.ogg'=1,
'sound/weather/ashstorm/inside/active_mid3.ogg'=1
'sound/ambience/weather/ashstorm/inside/active_mid1.ogg'=1,
'sound/ambience/weather/ashstorm/inside/active_mid2.ogg'=1,
'sound/ambience/weather/ashstorm/inside/active_mid3.ogg'=1
)
mid_length = 80
start_sound = 'sound/weather/ashstorm/inside/active_start.ogg'
start_sound = 'sound/ambience/weather/ashstorm/inside/active_start.ogg'
start_length = 130
end_sound = 'sound/weather/ashstorm/inside/active_end.ogg'
end_sound = 'sound/ambience/weather/ashstorm/inside/active_end.ogg'
volume = 60
/datum/looping_sound/weak_outside_ashstorm
mid_sounds = list(
'sound/weather/ashstorm/outside/weak_mid1.ogg'=1,
'sound/weather/ashstorm/outside/weak_mid2.ogg'=1,
'sound/weather/ashstorm/outside/weak_mid3.ogg'=1
'sound/ambience/weather/ashstorm/outside/weak_mid1.ogg'=1,
'sound/ambience/weather/ashstorm/outside/weak_mid2.ogg'=1,
'sound/ambience/weather/ashstorm/outside/weak_mid3.ogg'=1
)
mid_length = 80
start_sound = 'sound/weather/ashstorm/outside/weak_start.ogg'
start_sound = 'sound/ambience/weather/ashstorm/outside/weak_start.ogg'
start_length = 130
end_sound = 'sound/weather/ashstorm/outside/weak_end.ogg'
end_sound = 'sound/ambience/weather/ashstorm/outside/weak_end.ogg'
volume = 50
/datum/looping_sound/weak_inside_ashstorm
mid_sounds = list(
'sound/weather/ashstorm/inside/weak_mid1.ogg'=1,
'sound/weather/ashstorm/inside/weak_mid2.ogg'=1,
'sound/weather/ashstorm/inside/weak_mid3.ogg'=1
'sound/ambience/weather/ashstorm/inside/weak_mid1.ogg'=1,
'sound/ambience/weather/ashstorm/inside/weak_mid2.ogg'=1,
'sound/ambience/weather/ashstorm/inside/weak_mid3.ogg'=1
)
mid_length = 80
start_sound = 'sound/weather/ashstorm/inside/weak_start.ogg'
start_sound = 'sound/ambience/weather/ashstorm/inside/weak_start.ogg'
start_length = 130
end_sound = 'sound/weather/ashstorm/inside/weak_end.ogg'
end_sound = 'sound/ambience/weather/ashstorm/inside/weak_end.ogg'
volume = 30
/datum/looping_sound/void_loop
mid_sounds = list('sound/ambience/VoidsEmbrace.ogg'=1)
mid_sounds = list('sound/music/antag/heretic/VoidsEmbrace.ogg'=1)
mid_length = 1669 // exact length of the music in ticks
volume = 100
extra_range = 30
code/datums/martial/cqc.dm
+8 -8
View File
@@ -104,7 +104,7 @@
attacker,
)
to_chat(attacker, span_danger("You slam [defender] into the ground!"))
playsound(attacker, 'sound/weapons/slam.ogg', 50, TRUE, -1)
playsound(attacker, 'sound/items/weapons/slam.ogg', 50, TRUE, -1)
defender.apply_damage(10, BRUTE)
defender.Paralyze(12 SECONDS)
log_combat(attacker, defender, "slammed (CQC)")
@@ -125,7 +125,7 @@
attacker,
)
to_chat(attacker, span_danger("You kick [defender]'s head, knocking [defender.p_them()] out!"))
playsound(attacker, 'sound/weapons/genhit1.ogg', 50, TRUE, -1)
playsound(attacker, 'sound/items/weapons/genhit1.ogg', 50, TRUE, -1)
var/helmet_protection = defender.run_armor_check(BODY_ZONE_HEAD, MELEE)
defender.apply_effect(20 SECONDS, EFFECT_KNOCKDOWN, helmet_protection)
@@ -141,7 +141,7 @@
attacker,
)
to_chat(attacker, span_danger("You kick [defender] back!"))
playsound(attacker, 'sound/weapons/cqchit1.ogg', 50, TRUE, -1)
playsound(attacker, 'sound/items/weapons/cqchit1.ogg', 50, TRUE, -1)
var/atom/throw_target = get_edge_target_turf(defender, attacker.dir)
defender.throw_at(throw_target, 1, 14, attacker)
defender.apply_damage(10, attacker.get_attack_type())
@@ -163,7 +163,7 @@
)
to_chat(attacker, span_danger("You punch [defender]'s neck!"))
defender.adjustStaminaLoss(60)
playsound(attacker, 'sound/weapons/cqchit1.ogg', 50, TRUE, -1)
playsound(attacker, 'sound/items/weapons/cqchit1.ogg', 50, TRUE, -1)
return TRUE
/datum/martial_art/cqc/proc/Restrain(mob/living/attacker, mob/living/defender)
@@ -201,7 +201,7 @@
attacker,
)
to_chat(attacker, span_danger("You strike [defender]'s abdomen, neck and back consecutively!"))
playsound(defender, 'sound/weapons/cqchit2.ogg', 50, TRUE, -1)
playsound(defender, 'sound/items/weapons/cqchit2.ogg', 50, TRUE, -1)
var/obj/item/held_item = defender.get_active_held_item()
if(held_item && defender.temporarilyRemoveItemFromInventory(held_item))
attacker.put_in_hands(held_item)
@@ -291,7 +291,7 @@
picked_hit_type = pick("kick", "stomp")
defender.apply_damage(bonus_damage, BRUTE)
playsound(defender, (picked_hit_type == "kick" || picked_hit_type == "stomp") ? 'sound/weapons/cqchit2.ogg' : 'sound/weapons/cqchit1.ogg', 50, TRUE, -1)
playsound(defender, (picked_hit_type == "kick" || picked_hit_type == "stomp") ? 'sound/items/weapons/cqchit2.ogg' : 'sound/items/weapons/cqchit1.ogg', 50, TRUE, -1)
defender.visible_message(
span_danger("[attacker] [picked_hit_type]ed [defender]!"),
@@ -344,7 +344,7 @@
attacker,
)
to_chat(attacker, span_danger("You strike [defender]'s jaw,[disarmed_item ? " disarming [defender.p_them()] of [disarmed_item] and" : ""] leaving [defender.p_them()] disoriented!"))
playsound(defender, 'sound/weapons/cqchit1.ogg', 50, TRUE, -1)
playsound(defender, 'sound/items/weapons/cqchit1.ogg', 50, TRUE, -1)
defender.set_jitter_if_lower(4 SECONDS)
defender.apply_damage(5, attacker.get_attack_type())
log_combat(attacker, defender, "disarmed (CQC)", addition = disarmed_item ? "(disarmed of [disarmed_item])" : null)
@@ -358,7 +358,7 @@
attacker,
)
to_chat(attacker, span_warning("You fail to disarm [defender]!"))
playsound(defender, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
playsound(defender, 'sound/items/weapons/punchmiss.ogg', 25, TRUE, -1)
log_combat(attacker, defender, "failed to disarm (CQC)")
return MARTIAL_ATTACK_FAIL
code/datums/martial/krav_maga.dm
+1 -1
View File
@@ -201,7 +201,7 @@
attacker,
)
to_chat(attacker, span_danger("You disarm [defender]!"))
playsound(defender, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
playsound(defender, 'sound/items/weapons/thudswoosh.ogg', 50, TRUE, -1)
log_combat(attacker, defender, "disarmed (Krav Maga)", addition = "(disarmed of [stuff_in_hand])")
return MARTIAL_ATTACK_INVALID // normal shove
code/datums/martial/plasma_fist.dm
+4 -4
View File
@@ -41,7 +41,7 @@
/datum/martial_art/plasma_fist/proc/Tornado(mob/living/attacker, mob/living/defender)
attacker.say("TORNADO SWEEP!", forced="plasma fist")
dance_rotate(attacker, CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), attacker, 'sound/weapons/punch1.ogg', 15, TRUE, -1))
dance_rotate(attacker, CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), attacker, 'sound/items/weapons/punch1.ogg', 15, TRUE, -1))
tornado_spell.cast(attacker)
log_combat(attacker, defender, "tornado sweeped (Plasma Fist)")
return TRUE
@@ -55,7 +55,7 @@
attacker,
)
to_chat(attacker, span_danger("You hit [defender] with Plasma Punch!"))
playsound(defender, 'sound/weapons/punch1.ogg', 50, TRUE, -1)
playsound(defender, 'sound/items/weapons/punch1.ogg', 50, TRUE, -1)
var/atom/throw_target = get_edge_target_turf(defender, get_dir(defender, get_step_away(defender, attacker)))
defender.throw_at(throw_target, 200, 4,attacker)
attacker.say("HYAH!", forced="plasma fist")
@@ -66,7 +66,7 @@
var/hasclient = !!defender.client
attacker.do_attack_animation(defender, ATTACK_EFFECT_PUNCH)
playsound(defender, 'sound/weapons/punch1.ogg', 50, TRUE, -1)
playsound(defender, 'sound/items/weapons/punch1.ogg', 50, TRUE, -1)
attacker.say("PLASMA FIST!", forced="plasma fist")
defender.visible_message(
span_danger("[attacker] hits [defender] with THE PLASMA FIST TECHNIQUE!"),
@@ -125,7 +125,7 @@
user.apply_damage(rand(50, 70), BRUTE, wound_bonus = CANT_WOUND)
addtimer(CALLBACK(src, PROC_REF(Apotheosis_end), user), 6 SECONDS)
playsound(boomspot, 'sound/weapons/punch1.ogg', 50, TRUE, -1)
playsound(boomspot, 'sound/items/weapons/punch1.ogg', 50, TRUE, -1)
explosion(user, devastation_range = plasma_power, heavy_impact_range = plasma_power*2, light_impact_range = plasma_power*4, ignorecap = TRUE, explosion_cause = src)
plasma_power = 1 //just in case there is any clever way to cause it to happen again
return TRUE
code/datums/martial/psychotic_brawl.dm
+1 -1
View File
@@ -67,7 +67,7 @@
attacker,
)
to_chat(attacker, span_danger("You [atk_verb] [defender]!"))
playsound(defender, 'sound/weapons/punch1.ogg', 40, TRUE, -1)
playsound(defender, 'sound/items/weapons/punch1.ogg', 40, TRUE, -1)
defender.apply_damage(defender_damage, attacker.get_attack_type(), BODY_ZONE_HEAD)
attacker.apply_damage(rand(5, 10), attacker.get_attack_type(), BODY_ZONE_HEAD)
if(iscarbon(defender))
code/datums/martial/sleeping_carp.dm
+5 -5
View File
@@ -53,7 +53,7 @@
attacker,
)
to_chat(attacker, span_danger("You [atk_verb] [defender]!"))
playsound(defender, 'sound/weapons/punch1.ogg', 25, TRUE, -1)
playsound(defender, 'sound/items/weapons/punch1.ogg', 25, TRUE, -1)
log_combat(attacker, defender, "strong punched (Sleeping Carp)")
defender.apply_damage(20, attacker.get_attack_type(), affecting)
return TRUE
@@ -106,7 +106,7 @@
var/grab_log_description = "grabbed"
attacker.do_attack_animation(defender, ATTACK_EFFECT_PUNCH)
playsound(defender, 'sound/weapons/punch1.ogg', 25, TRUE, -1)
playsound(defender, 'sound/items/weapons/punch1.ogg', 25, TRUE, -1)
if(defender.stat != DEAD && !defender.IsUnconscious() && defender.getStaminaLoss() >= 80) //We put our target to sleep.
defender.visible_message(
span_danger("[attacker] carefully pinch a nerve in [defender]'s neck, knocking them out cold!"),
@@ -161,7 +161,7 @@
)
to_chat(attacker, span_danger("You [atk_verb] [defender]!"))
defender.apply_damage(final_damage, attacker.get_attack_type(), affecting, wound_bonus = CANT_WOUND)
playsound(defender, 'sound/weapons/punch1.ogg', 25, TRUE, -1)
playsound(defender, 'sound/items/weapons/punch1.ogg', 25, TRUE, -1)
log_combat(attacker, defender, "punched (Sleeping Carp)")
return MARTIAL_ATTACK_SUCCESS
@@ -176,7 +176,7 @@
return MARTIAL_ATTACK_SUCCESS
attacker.do_attack_animation(defender, ATTACK_EFFECT_PUNCH)
playsound(defender, 'sound/weapons/punch1.ogg', 25, TRUE, -1)
playsound(defender, 'sound/items/weapons/punch1.ogg', 25, TRUE, -1)
defender.apply_damage(20, STAMINA)
log_combat(attacker, defender, "disarmed (Sleeping Carp)")
return MARTIAL_ATTACK_INVALID // normal disarm
@@ -204,7 +204,7 @@
span_danger("[carp_user] effortlessly swats [hitting_projectile] aside! [carp_user.p_They()] can block bullets with [carp_user.p_their()] bare hands!"),
span_userdanger("You deflect [hitting_projectile]!"),
)
playsound(carp_user, pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, TRUE)
playsound(carp_user, pick('sound/items/weapons/bulletflyby.ogg', 'sound/items/weapons/bulletflyby2.ogg', 'sound/items/weapons/bulletflyby3.ogg'), 75, TRUE)
hitting_projectile.firer = carp_user
hitting_projectile.set_angle(rand(0, 360))//SHING
return COMPONENT_BULLET_PIERCED
code/datums/mutations/body.dm
+1 -1
View File
@@ -474,7 +474,7 @@
if(prob(15))
owner.acid_act(rand(30, 50), 10)
owner.visible_message(span_warning("[owner]'s skin bubbles and pops."), span_userdanger("Your bubbling flesh pops! It burns!"))
playsound(owner,'sound/weapons/sear.ogg', 50, TRUE)
playsound(owner,'sound/items/weapons/sear.ogg', 50, TRUE)
/datum/mutation/human/spastic
name = "Spastic"
code/datums/mutations/fire_breath.dm
+1 -1
View File
@@ -29,7 +29,7 @@
name = "Fire Breath"
desc = "You breathe a cone of fire directly in front of you."
button_icon_state = "fireball0"
sound = 'sound/magic/demon_dies.ogg' //horrifying lizard noises
sound = 'sound/effects/magic/demon_dies.ogg' //horrifying lizard noises
school = SCHOOL_EVOCATION
cooldown_time = 40 SECONDS
code/datums/mutations/hulk.dm
+1 -1
View File
@@ -207,7 +207,7 @@
continue
yeeted_person.adjustBruteLoss(step*0.5)
playsound(collateral_mob,'sound/weapons/punch1.ogg',50,TRUE)
playsound(collateral_mob,'sound/items/weapons/punch1.ogg',50,TRUE)
log_combat(the_hulk, collateral_mob, "has smacked with tail swing victim")
log_combat(the_hulk, yeeted_person, "has smacked this person into someone while tail swinging") // i have no idea how to better word this
code/datums/mutations/sight.dm
+1 -1
View File
@@ -173,7 +173,7 @@
LE.def_zone = ran_zone(source.zone_selected)
LE.preparePixelProjectile(target, source, modifiers)
INVOKE_ASYNC(LE, TYPE_PROC_REF(/obj/projectile, fire))
playsound(source, 'sound/weapons/taser2.ogg', 75, TRUE)
playsound(source, 'sound/items/weapons/taser2.ogg', 75, TRUE)
///Projectile type used by laser eyes
/obj/projectile/beam/laser/laser_eyes
code/datums/mutations/touch.dm
+2 -2
View File
@@ -28,7 +28,7 @@
name = "Shock Touch"
desc = "Channel electricity to your hand to shock people with."
button_icon_state = "zap"
sound = 'sound/weapons/zapbang.ogg'
sound = 'sound/items/weapons/zapbang.ogg'
cooldown_time = 12 SECONDS
invocation_type = INVOCATION_NONE
spell_requirements = NONE
@@ -117,7 +117,7 @@
desc = "You can now lay your hands on other people to transfer a small amount of their physical injuries to yourself."
button_icon = 'icons/mob/actions/actions_genetic.dmi'
button_icon_state = "mending_touch"
sound = 'sound/magic/staff_healing.ogg'
sound = 'sound/effects/magic/staff_healing.ogg'
cooldown_time = 12 SECONDS
school = SCHOOL_RESTORATION
invocation_type = INVOCATION_NONE
code/datums/proximity_monitor/fields/timestop.dm
+2 -2
View File
@@ -45,13 +45,13 @@
/obj/effect/timestop/Destroy()
QDEL_NULL(chronofield)
if(!hidden)
playsound(src, 'sound/magic/timeparadox2.ogg', 75, TRUE, frequency = -1) //reverse!
playsound(src, 'sound/effects/magic/timeparadox2.ogg', 75, TRUE, frequency = -1) //reverse!
return ..()
/obj/effect/timestop/proc/timestop()
target = get_turf(src)
if(!hidden)
playsound(src, 'sound/magic/timeparadox2.ogg', 75, TRUE, -1)
playsound(src, 'sound/effects/magic/timeparadox2.ogg', 75, TRUE, -1)
chronofield = new (src, freezerange, TRUE, immune, antimagic_flags, channelled)
if(!channelled)
QDEL_IN(src, duration)
code/datums/quirks/neutral_quirks/monochromatic.dm
+1 -1
View File
@@ -17,7 +17,7 @@
/datum/quirk/monochromatic/post_add()
if(is_detective_job(quirk_holder.mind.assigned_role))
to_chat(quirk_holder, span_boldannounce("Mmm. Nothing's ever clear on this station. It's all shades of gray..."))
quirk_holder.playsound_local(quirk_holder, 'sound/ambience/ambidet1.ogg', 50, FALSE)
quirk_holder.playsound_local(quirk_holder, 'sound/ambience/security/ambidet1.ogg', 50, FALSE)
/datum/quirk/monochromatic/remove()
quirk_holder.remove_client_colour(/datum/client_colour/monochrome)
code/datums/station_traits/negative_traits.dm
+1 -1
View File
@@ -713,7 +713,7 @@
Every shielding unit will provide an additional [shielder_time] of protection, fully protecting the station with [max_shielders] shielding units.
"}
priority_announce(announcement, sound = 'sound/misc/notice1.ogg')
priority_announce(announcement, sound = 'sound/announcer/notice/notice1.ogg')
//Set the display screens to the radiation alert
var/datum/radio_frequency/frequency = SSradio.return_frequency(FREQ_STATUS_DISPLAYS)
code/datums/status_effects/buffs.dm
+2 -2
View File
@@ -426,7 +426,7 @@
/datum/status_effect/mayhem/on_apply()
. = ..()
to_chat(owner, "<span class='reallybig redtext'>RIP AND TEAR</span>")
SEND_SOUND(owner, sound('sound/hallucinations/veryfar_noise.ogg'))
SEND_SOUND(owner, sound('sound/effects/hallucinations/veryfar_noise.ogg'))
owner.cause_hallucination( \
/datum/hallucination/delusion/preset/demon, \
"[id] status effect", \
@@ -572,7 +572,7 @@
owner.add_stun_absorption(source = id, priority = 4)
owner.add_movespeed_mod_immunities(id, /datum/movespeed_modifier/damage_slowdown)
ADD_TRAIT(owner, TRAIT_FREE_HYPERSPACE_MOVEMENT, id)
owner.playsound_local(get_turf(owner), 'sound/chemistry/ahaha.ogg', vol = 100, vary = TRUE, use_reverb = TRUE)
owner.playsound_local(get_turf(owner), 'sound/effects/chemistry/ahaha.ogg', vol = 100, vary = TRUE, use_reverb = TRUE)
return TRUE
/datum/status_effect/blessing_of_insanity/on_remove()
code/datums/status_effects/debuffs/choke.dm
+1 -1
View File
@@ -217,7 +217,7 @@
var/obj/item/bodypart/chest = carbon_victim.get_bodypart(BODY_ZONE_CHEST)
carbon_victim.cause_wound_of_type_and_severity(WOUND_BLUNT, chest, WOUND_SEVERITY_SEVERE, wound_source = "human force to the chest")
playsound(owner, 'sound/creatures/crack_vomit.ogg', 120, extrarange = 5, falloff_exponent = 4)
playsound(owner, 'sound/mobs/humanoids/human/gag_vomit/crack_vomit.ogg', 120, extrarange = 5, falloff_exponent = 4)
vomit_up()
/datum/status_effect/choke/proc/mirror_dir(atom/source, old_dir, new_dir)

Some files were not shown because too many files have changed in this diff Show More