Skip to content

Commit 4fc35a6

Browse files
committed
Gonna have to clean some files after this.
1 parent 86d2a16 commit 4fc35a6

File tree

138 files changed

+184
-184
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+184
-184
lines changed

code/_globalvars/lists/flavor_misc.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ GLOBAL_LIST_INIT(socks_f, list()) //stores only socks name
2727
//Alt Heads
2828
GLOBAL_LIST_INIT(alt_heads_list, list()) //stores /datum/sprite_accessory/alt_heads indexed by name
2929

30-
GLOBAL_LIST_INIT(scarySounds, list('sound/weapons/thudswoosh.ogg','sound/weapons/Taser.ogg','sound/weapons/armbomb.ogg','sound/voice/hiss1.ogg','sound/voice/hiss2.ogg', \
30+
GLOBAL_LIST_INIT(scarySounds, list('sound/weapons/thudswoosh.ogg','sound/weapons/taser.ogg','sound/weapons/armbomb.ogg','sound/voice/hiss1.ogg','sound/voice/hiss2.ogg', \
3131
'sound/voice/hiss3.ogg','sound/voice/hiss4.ogg','sound/voice/hiss5.ogg','sound/voice/hiss6.ogg','sound/effects/glassbr1.ogg','sound/effects/glassbr2.ogg','sound/effects/glassbr3.ogg', \
3232
'sound/items/welder.ogg','sound/items/welder2.ogg','sound/machines/airlock_open.ogg','sound/effects/clownstep1.ogg','sound/effects/clownstep2.ogg'))
3333

code/datums/spells/area_teleport.dm

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
name = "Area teleport"
33
desc = "This spell teleports you to a type of area of your selection."
44
nonabstract_req = 1
5-
5+
66
var/randomise_selection = 0 //if it lets the usr choose the teleport loc or picks it from the list
77
var/invocation_area = 1 //if the invocation appends the selected area
8-
9-
var/sound1 = 'sound/weapons/ZapBang.ogg'
10-
var/sound2 = 'sound/weapons/ZapBang.ogg'
11-
8+
9+
var/sound1 = 'sound/weapons/zapbang.ogg'
10+
var/sound2 = 'sound/weapons/zapbang.ogg'
11+
1212
/obj/effect/proc_holder/spell/targeted/area_teleport/perform(list/targets, recharge = 1, mob/living/user = usr)
1313
var/thearea = before_cast(targets)
1414
if(!thearea || !cast_check(1))

code/datums/spells/ethereal_jaunt.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
action_icon_state = "jaunt"
2222

2323
/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/cast(list/targets, mob/user = usr) //magnets, so mostly hardcoded
24-
playsound(get_turf(user), 'sound/magic/Ethereal_Enter.ogg', 50, 1, -1)
24+
playsound(get_turf(user), 'sound/magic/ethereal_enter.ogg', 50, 1, -1)
2525
for(var/mob/living/target in targets)
2626
if(!target.can_safely_leave_loc()) // No more brainmobs hopping out of their brains
2727
to_chat(target, "<span class='warning'>You are somehow too bound to your current location to abandon it.</span>")
@@ -48,7 +48,7 @@
4848
jaunt_steam(mobloc)
4949
target.canmove = 0
5050
holder.reappearing = 1
51-
playsound(get_turf(target), 'sound/magic/Ethereal_Exit.ogg', 50, 1, -1)
51+
playsound(get_turf(target), 'sound/magic/ethereal_exit.ogg', 50, 1, -1)
5252
sleep(25 - jaunt_in_time)
5353
new jaunt_in_type(mobloc, holder.dir)
5454
target.setDir(holder.dir)

code/datums/spells/horsemask.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@
4545
qdel(target.wear_mask)
4646
target.equip_to_slot_if_possible(magichead, slot_wear_mask, 1, 1)
4747

48-
target.flash_eyes()
48+
target.flash_eyes()

code/datums/spells/knock.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
cooldown_min = 20 //20 deciseconds reduction per rank
1212

1313
action_icon_state = "knock"
14-
sound = 'sound/magic/Knock.ogg'
14+
sound = 'sound/magic/knock.ogg'
1515

1616
/obj/effect/proc_holder/spell/aoe_turf/knock/cast(list/targets, mob/user = usr)
1717
for(var/turf/T in targets)

code/datums/spells/lightning.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ obj/effect/proc_holder/spell/targeted/lightning/proc/Reset(mob/user = usr)
9696
current.Slowed(3)
9797
spawn(20)
9898
current.AdjustJitter(-1000, bound_lower = 10) //Still jittery, but vastly less
99-
playsound(get_turf(current), 'sound/magic/LightningShock.ogg', 50, 1, -1)
99+
playsound(get_turf(current), 'sound/magic/lightningshock.ogg', 50, 1, -1)
100100
else
101101
if(damaging)
102102
current.electrocute_act(bolt_energy,"Lightning Bolt",safety=1)
@@ -107,7 +107,7 @@ obj/effect/proc_holder/spell/targeted/lightning/proc/Reset(mob/user = usr)
107107
current.Slowed(3)
108108
spawn(20)
109109
current.AdjustJitter(-1000, bound_lower = 10) //Still jittery, but vastly less
110-
playsound(get_turf(current), 'sound/magic/LightningShock.ogg', 50, 1, -1)
110+
playsound(get_turf(current), 'sound/magic/lightningshock.ogg', 50, 1, -1)
111111
var/list/possible_targets = new
112112
for(var/mob/living/M in view_or_range(range,target,"view"))
113113
if(user == M || target == M && los_check(current,M)) // || origin == M ? Not sure double shockings is good or not

code/datums/spells/summonitem.dm

+3-3
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
if(istype(item_to_retrive.loc, /obj/structure/disposalholder) || istype(item_to_retrive.loc, /obj/machinery/disposal))//fixes the breaking of disposals. No more bluespace connected disposal bins!
9797
break
9898
item_to_retrive = item_to_retrive.loc
99-
99+
100100
infinite_recursion += 1
101101

102102
if(!item_to_retrive)
@@ -116,10 +116,10 @@
116116
if(butterfingers)
117117
item_to_retrive.loc = target.loc
118118
item_to_retrive.loc.visible_message("<span class='caution'>The [item_to_retrive.name] suddenly appears!</span>")
119-
playsound(get_turf(target),'sound/magic/SummonItems_generic.ogg',50,1)
119+
playsound(get_turf(target),'sound/magic/summonitems_generic.ogg',50,1)
120120
else
121121
item_to_retrive.loc.visible_message("<span class='caution'>The [item_to_retrive.name] suddenly appears in [target]'s hand!</span>")
122-
playsound(get_turf(target),'sound/magic/SummonItems_generic.ogg',50,1)
122+
playsound(get_turf(target),'sound/magic/summonitems_generic.ogg',50,1)
123123

124124
if(message)
125125
to_chat(target, message)

code/datums/spells/turf_teleport.dm

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
var/include_space = 0 //whether it includes space tiles in possible teleport locations
1010
var/include_dense = 0 //whether it includes dense tiles in possible teleport locations
11-
12-
var/sound1 = 'sound/weapons/ZapBang.ogg'
13-
var/sound2 = 'sound/weapons/ZapBang.ogg'
11+
12+
var/sound1 = 'sound/weapons/zapbang.ogg'
13+
var/sound2 = 'sound/weapons/zapbang.ogg'
1414

1515
/obj/effect/proc_holder/spell/targeted/turf_teleport/cast(list/targets,mob/living/user = usr)
1616
playsound(get_turf(user), sound1, 50,1)

code/datums/spells/wizard.dm

+16-16
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626

2727
action_icon_state = "magicm"
2828

29-
sound = 'sound/magic/MAGIC_MISSILE.ogg'
29+
sound = 'sound/magic/magic_missile.ogg'
3030

3131
/obj/effect/proc_holder/spell/targeted/inflict_handler/magic_missile
3232
amt_weakened = 3
33-
sound = 'sound/magic/MM_Hit.ogg'
33+
sound = 'sound/magic/mm_hit.ogg'
3434

3535
/obj/effect/proc_holder/spell/noclothes
3636
name = "No Clothes"
@@ -55,7 +55,7 @@
5555
cooldown_min = 300 //25 deciseconds reduction per rank
5656

5757
action_icon_state = "mutate"
58-
sound = 'sound/magic/Mutate.ogg'
58+
sound = 'sound/magic/mutate.ogg'
5959

6060
/obj/effect/proc_holder/spell/targeted/genetic/mutate/cast(list/targets, mob/user = usr)
6161
for(var/mob/living/target in targets)
@@ -98,7 +98,7 @@
9898
emp_heavy = 6
9999
emp_light = 10
100100

101-
sound = 'sound/magic/Disable_Tech.ogg'
101+
sound = 'sound/magic/disable_tech.ogg'
102102

103103
/obj/effect/proc_holder/spell/targeted/turf_teleport/blink
104104
name = "Blink"
@@ -145,8 +145,8 @@
145145

146146
action_icon_state = "spell_teleport"
147147

148-
sound1 = 'sound/magic/Teleport_diss.ogg'
149-
sound2 = 'sound/magic/Teleport_app.ogg'
148+
sound1 = 'sound/magic/teleport_diss.ogg'
149+
sound2 = 'sound/magic/teleport_app.ogg'
150150

151151
/obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall
152152
name = "Forcewall"
@@ -164,7 +164,7 @@
164164
summon_lifespan = 300
165165

166166
action_icon_state = "shield"
167-
cast_sound = 'sound/magic/ForceWall.ogg'
167+
cast_sound = 'sound/magic/forcewall.ogg'
168168

169169
/obj/effect/proc_holder/spell/targeted/forcewall
170170
name = "Greater Forcewall"
@@ -175,7 +175,7 @@
175175
clothes_req = FALSE
176176
invocation = "TARCOL MINTI ZHERI"
177177
invocation_type = "shout"
178-
sound = 'sound/magic/ForceWall.ogg'
178+
sound = 'sound/magic/forcewall.ogg'
179179
action_icon_state = "shield"
180180
range = -1
181181
include_user = TRUE
@@ -219,7 +219,7 @@
219219

220220
summon_type = list(/mob/living/simple_animal/hostile/carp)
221221

222-
cast_sound = 'sound/magic/Summon_Karp.ogg'
222+
cast_sound = 'sound/magic/summon_karp.ogg'
223223

224224
/obj/effect/proc_holder/spell/aoe_turf/conjure/construct
225225
name = "Artificer"
@@ -235,7 +235,7 @@
235235
summon_type = list(/obj/structure/constructshell)
236236

237237
action_icon_state = "artificer"
238-
cast_sound = 'sound/magic/SummonItems_generic.ogg'
238+
cast_sound = 'sound/magic/summonitems_generic.ogg'
239239

240240
/obj/effect/proc_holder/spell/aoe_turf/conjure/creature
241241
name = "Summon Creature Swarm"
@@ -250,7 +250,7 @@
250250
range = 3
251251

252252
summon_type = list(/mob/living/simple_animal/hostile/creature)
253-
cast_sound = 'sound/magic/SummonItems_generic.ogg'
253+
cast_sound = 'sound/magic/summonitems_generic.ogg'
254254

255255
/obj/effect/proc_holder/spell/targeted/trigger/blind
256256
name = "Blind"
@@ -271,12 +271,12 @@
271271
/obj/effect/proc_holder/spell/targeted/inflict_handler/blind
272272
amt_eye_blind = 10
273273
amt_eye_blurry = 20
274-
sound = 'sound/magic/Blind.ogg'
274+
sound = 'sound/magic/blind.ogg'
275275

276276
/obj/effect/proc_holder/spell/targeted/genetic/blind
277277
disabilities = BLIND
278278
duration = 300
279-
sound = 'sound/magic/Blind.ogg'
279+
sound = 'sound/magic/blind.ogg'
280280

281281
/obj/effect/proc_holder/spell/fireball
282282
name = "Fireball"
@@ -291,7 +291,7 @@
291291
cooldown_min = 20 //10 deciseconds reduction per rank
292292
var/fireball_type = /obj/item/projectile/magic/fireball
293293
action_icon_state = "fireball0"
294-
sound = 'sound/magic/Fireball.ogg'
294+
sound = 'sound/magic/fireball.ogg'
295295

296296
active = FALSE
297297

@@ -362,7 +362,7 @@
362362
var/maxthrow = 5
363363
var/sparkle_path = /obj/effect/temp_visual/gravpush
364364
action_icon_state = "repulse"
365-
sound = 'sound/magic/Repulse.ogg'
365+
sound = 'sound/magic/repulse.ogg'
366366

367367
/obj/effect/proc_holder/spell/aoe_turf/repulse/cast(list/targets, mob/user = usr)
368368
var/list/thrownatoms = list()
@@ -407,7 +407,7 @@
407407
include_user = 1
408408
selection_type = "view"
409409
action_icon_state = "sacredflame"
410-
sound = 'sound/magic/Fireball.ogg'
410+
sound = 'sound/magic/fireball.ogg'
411411

412412
/obj/effect/proc_holder/spell/targeted/sacred_flame/cast(list/targets, mob/user = usr)
413413
for(var/mob/living/L in targets)

code/game/gamemodes/cult/runes.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ var/list/teleport_runes = list()
471471
playsound(T, 'sound/effects/EMPulse.ogg', 100, 1)
472472
T.dust() //To prevent the MMI from remaining
473473
else
474-
playsound(T, 'sound/magic/Disintegrate.ogg', 100, 1)
474+
playsound(T, 'sound/magic/disintegrate.ogg', 100, 1)
475475
T.gib()
476476
rune_in_use = 0
477477

code/game/gamemodes/cult/talisman.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@
340340
if(target.use(25))
341341
new /obj/structure/constructshell(T)
342342
to_chat(user, "<span class='warning'>The talisman clings to the metal and twists it into a construct shell!</span>")
343-
user << sound('sound/magic/Staff_Chaos.ogg',0,1,25)
343+
user << sound('sound/magic/staff_chaos.ogg',0,1,25)
344344
qdel(src)
345345
return
346346
if(istype(target, /obj/item/stack/sheet/plasteel))
@@ -350,7 +350,7 @@
350350
new /obj/item/stack/sheet/runed_metal(T,quantity)
351351
target.use(quantity)
352352
to_chat(user, "<span class='warning'>The talisman clings to the plasteel, transforming it into runed metal!</span>")
353-
user << sound('sound/magic/Staff_Chaos.ogg',0,1,25)
353+
user << sound('sound/magic/staff_chaos.ogg',0,1,25)
354354
invoke(user, 1)
355355
if(uses <= 0)
356356
qdel(src)

code/game/gamemodes/gameticker.dm

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ var/round_start_time = 0
4343
login_music = pick(\
4444
'sound/music/THUNDERDOME.ogg',\
4545
'sound/music/space.ogg',\
46-
'sound/music/Title1.ogg',\
47-
'sound/music/Title2.ogg',\
48-
'sound/music/Title3.ogg',)
46+
'sound/music/title1.ogg',\
47+
'sound/music/title2.ogg',\
48+
'sound/music/title3.ogg',)
4949
do
5050
pregame_timeleft = config.pregame_timestart
5151
to_chat(world, "<B><FONT color='blue'>Welcome to the pre-game lobby!</FONT></B>")

code/game/gamemodes/miniantags/abduction/abduction_gear.dm

+3-3
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
457457
if(ishuman(L))
458458
var/mob/living/carbon/human/H = L
459459
if(H.check_shields(0, "[user]'s [name]", src, MELEE_ATTACK))
460-
playsound(L, 'sound/weapons/Genhit.ogg', 50, 1)
460+
playsound(L, 'sound/weapons/genhit.ogg', 50, 1)
461461
return 0
462462

463463
switch(mode)
@@ -487,7 +487,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
487487

488488
L.visible_message("<span class='danger'>[user] has stunned [L] with [src]!</span>", \
489489
"<span class='userdanger'>[user] has stunned you with [src]!</span>")
490-
playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
490+
playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
491491

492492
if(ishuman(L))
493493
var/mob/living/carbon/human/H = L
@@ -499,7 +499,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
499499
if(L.stunned || L.sleeping)
500500
L.visible_message("<span class='danger'>[user] has induced sleep in [L] with [src]!</span>", \
501501
"<span class='userdanger'>You suddenly feel very drowsy!</span>")
502-
playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
502+
playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
503503
L.Sleeping(60)
504504
add_attack_logs(user, L, "Put to sleep with [src]")
505505
else

code/game/gamemodes/miniantags/morph/morph_event.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
player_mind.special_role = SPECIAL_ROLE_MORPH
2424
ticker.mode.traitors |= player_mind
2525
to_chat(S, S.playstyle_string)
26-
S << 'sound/magic/Mutate.ogg'
26+
S << 'sound/magic/mutate.ogg'
2727
message_admins("[key_of_morph] has been made into morph by an event.")
2828
log_game("[key_of_morph] was spawned as a morph by an event.")
2929
return 1

code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
var/mob/living/simple_animal/slaughter/SD = src
6565
sound = SD.feast_sound
6666
else
67-
sound = 'sound/misc/Demon_consume.ogg'
67+
sound = 'sound/misc/demon_consume.ogg'
6868

6969
for(var/i in 1 to 3)
7070
playsound(get_turf(src), sound, 100, 1)

code/game/gamemodes/miniantags/slaughter/slaughter.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
stop_automated_movement = 1
1919
status_flags = CANPUSH
2020
attack_sound = 'sound/misc/demon_attack1.ogg'
21-
var/feast_sound = 'sound/misc/Demon_consume.ogg'
21+
var/feast_sound = 'sound/misc/demon_consume.ogg'
2222
death_sound = 'sound/misc/demon_dies.ogg'
2323
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
2424
minbodytemp = 0
@@ -248,7 +248,7 @@
248248
/obj/item/organ/internal/heart/demon/attack_self(mob/living/user)
249249
user.visible_message("<span class='warning'>[user] raises [src] to [user.p_their()] mouth and tears into it with [user.p_their()] teeth!</span>", \
250250
"<span class='danger'>An unnatural hunger consumes you. You raise [src] to your mouth and devour it!</span>")
251-
playsound(user, 'sound/misc/Demon_consume.ogg', 50, 1)
251+
playsound(user, 'sound/misc/demon_consume.ogg', 50, 1)
252252
for(var/obj/effect/proc_holder/spell/knownspell in user.mind.spell_list)
253253
if(knownspell.type == /obj/effect/proc_holder/spell/bloodcrawl)
254254
qdel(src)

code/game/gamemodes/shadowling/shadowling.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ Made by Xhuis
249249
return
250250
M.visible_message("<span class='warning'>[M] suddenly bloats and explodes!</span>", \
251251
"<span class='warning'><b>AAAAAAAAA<font size=3>AAAAAAAAAAAAA</font><font size=4>AAAAAAAAAAAA----</font></span>")
252-
playsound(M, 'sound/magic/Disintegrate.ogg', 100, 1)
252+
playsound(M, 'sound/magic/disintegrate.ogg', 100, 1)
253253
M.gib()
254254

255255
/datum/game_mode/shadowling/proc/check_shadow_victory()

0 commit comments

Comments
 (0)