cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 23:48:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Casing correction 1

Browse Source
This commit is contained in:
Aurorablade
2018-12-17 00:07:37 -05:00
parent 6247ba0cfe
commit 86d2a1634c
129 changed files with 152 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_globalvars/lists/flavor_misc.dm
+2 -2
View File
@@ -28,8 +28,8 @@ GLOBAL_LIST_INIT(socks_f, list()) //stores only socks name
GLOBAL_LIST_INIT(alt_heads_list, list()) //stores /datum/sprite_accessory/alt_heads indexed by name
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', \
'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', \
'sound/items/Welder.ogg','sound/items/Welder2.ogg','sound/machines/airlock_open.ogg','sound/effects/clownstep1.ogg','sound/effects/clownstep2.ogg'))
'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', \
'sound/items/welder.ogg','sound/items/welder2.ogg','sound/machines/airlock_open.ogg','sound/effects/clownstep1.ogg','sound/effects/clownstep2.ogg'))
// Reference list for disposal sort junctions. Set the sortType variable on disposal sort junctions to
// the index of the sort department that you want. For example, sortType set to 2 will reroute all packages
code/datums/diseases/pierrot_throat.dm
+1 -1
View File
@@ -54,7 +54,7 @@
if(3)
if(prob(10))
to_chat(affected_mob, "<span class='danger'>Your thoughts are interrupted by a loud <b>HONK!</b></span>")
affected_mob << 'sound/items/AirHorn.ogg'
affected_mob << 'sound/items/airhorn.ogg'
if(4)
if(prob(5))
affected_mob.say( pick( list("HONK!", "Honk!", "Honk.", "Honk?", "Honk!!", "Honk?!", "Honk...") ) )
code/game/area/depot-areas.dm
+1 -1
View File
@@ -263,7 +263,7 @@
var/log_msg = "[key_name(user)] has triggered the depot self destruct at [A.name] ([T.x],[T.y],[T.z])"
message_admins(log_msg)
log_game(log_msg)
playsound(user, 'sound/machines/Alarm.ogg', 100, 0, 0)
playsound(user, 'sound/machines/alarm.ogg', 100, 0, 0)
else
log_game("Depot self destruct activated.")
if(reactor)
code/game/gamemodes/blob/theblob.dm
+1 -1
View File
@@ -156,7 +156,7 @@
playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1)
visible_message("<span class='danger'>[user] has attacked the [src.name] with \the [W]!</span>")
if(W.damtype == BURN)
playsound(src.loc, 'sound/items/Welder.ogg', 100, 1)
playsound(src.loc, 'sound/items/welder.ogg', 100, 1)
take_damage(W.force, W.damtype)
/obj/structure/blob/attack_animal(mob/living/simple_animal/M as mob)
code/game/gamemodes/cult/cult_items.dm
+1 -1
View File
@@ -256,7 +256,7 @@
var/timer = SSshuttle.emergency.timeLeft(1) + cursetime
SSshuttle.emergency.setTimer(timer)
to_chat(user,"<span class='danger'>You shatter the orb! A dark essence spirals into the air, then disappears.</span>")
playsound(user.loc, 'sound/effects/Glassbr1.ogg', 50, 1)
playsound(user.loc, 'sound/effects/glassbr1.ogg', 50, 1)
curselimit++
qdel(src)
sleep(20)
code/game/gamemodes/cult/runes.dm
+1 -1
View File
@@ -728,7 +728,7 @@ var/list/teleport_runes = list()
visible_message("<span class='warning'>[src] glows blue for a moment before vanishing.</span>")
switch(invokers.len)
if(1 to 2)
playsound(E, 'sound/items/Welder2.ogg', 25, 1)
playsound(E, 'sound/items/welder2.ogg', 25, 1)
for(var/M in invokers)
to_chat(M, "<span class='warning'>You feel a minute vibration pass through you...</span>")
if(3 to 6)
code/game/gamemodes/malfunction/Malf_Modules.dm
+1 -1
View File
@@ -100,7 +100,7 @@
/obj/machinery/doomsday_device/proc/detonate(z_level = 1)
for(var/mob/M in GLOB.player_list)
M << 'sound/machines/Alarm.ogg'
M << 'sound/machines/alarm.ogg'
sleep(100)
for(var/mob/living/L in GLOB.mob_list)
var/turf/T = get_turf(L)
code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
+2 -2
View File
@@ -93,7 +93,7 @@
obj_damage = 0
environment_smash = 0
attacktext = "shocks"
attack_sound = 'sound/effects/EMPulse.ogg'
attack_sound = 'sound/effects/empulse.ogg'
friendly = "pinches"
speed = 0
faction = list("swarmer")
@@ -311,7 +311,7 @@
to_chat(S, "<span class='warning'>Destroying this machine while it is occupied would result in biological and sentient resources to be harmed. Aborting.</span>")
return
..()
/mob/living/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
S.DisperseTarget(src)
code/game/gamemodes/miniantags/guardian/types/bomb.dm
+1 -1
View File
@@ -63,7 +63,7 @@
return
to_chat(spawner, "<span class='danger'>Success! Your trap on [src] caught [user]!</span>")
stored_obj.forceMove(get_turf(loc))
playsound(get_turf(src),'sound/effects/Explosion2.ogg', 200, 1)
playsound(get_turf(src),'sound/effects/explosion2.ogg', 200, 1)
user.ex_act(2)
qdel(src)
code/game/gamemodes/miniantags/guardian/types/fire.dm
+1 -1
View File
@@ -2,7 +2,7 @@
a_intent = INTENT_HELP
melee_damage_lower = 10
melee_damage_upper = 10
attack_sound = 'sound/items/Welder.ogg'
attack_sound = 'sound/items/welder.ogg'
attacktext = "sears"
damage_transfer = 0.8
range = 10
code/game/gamemodes/nuclear/nuclearbomb.dm
+1 -1
View File
@@ -353,7 +353,7 @@ var/bomb_set
safety = 1
if(!lighthack)
icon_state = "nuclearbomb3"
playsound(src,'sound/machines/Alarm.ogg',100,0,5)
playsound(src,'sound/machines/alarm.ogg',100,0,5)
if(ticker && ticker.mode)
ticker.mode.explosion_in_progress = 1
sleep(100)
code/game/gamemodes/wizard/artefact.dm
+1 -1
View File
@@ -784,7 +784,7 @@ var/global/list/multiverse = list()
GiveHint(target)
else if(istype(I,/obj/item/bikehorn))
to_chat(target, "<span class='userdanger'>HONK</span>")
target << 'sound/items/AirHorn.ogg'
target << 'sound/items/airhorn.ogg'
target.MinimumDeafTicks(3)
GiveHint(target)
cooldown = world.time +cooldown_time
code/game/machinery/alarm.dm
+1 -1
View File
@@ -1092,4 +1092,4 @@ Just an object used in constructing air alarms
materials = list(MAT_METAL=50, MAT_GLASS=50)
origin_tech = "engineering=2;programming=1"
toolspeed = 1
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
code/game/machinery/camera/camera.dm
+1 -1
View File
@@ -31,7 +31,7 @@
var/emped = FALSE //Number of consecutive EMP's on this camera
var/in_use_lights = 0 // TO BE IMPLEMENTED
var/toggle_sound = 'sound/items/Wirecutter.ogg'
var/toggle_sound = 'sound/items/wirecutter.ogg'
/obj/machinery/camera/New()
code/game/machinery/computer/Operating.dm
+1 -1
View File
@@ -221,6 +221,6 @@
if(crit && victim.health <= -50 )
playsound(src.loc, 'sound/machines/defib_success.ogg', 50, 0)
if(oxy && victim.getOxyLoss()>oxyAlarm)
playsound(src.loc, 'sound/machines/defib_saftyOff.ogg', 50, 0)
playsound(src.loc, 'sound/machines/defib_saftyoff.ogg', 50, 0)
if(healthAnnounce && victim.health <= healthAlarm)
atom_say("[round(victim.health)]")
code/game/machinery/computer/arcade.dm
+12 -12
View File
@@ -114,7 +114,7 @@
blocked = 1
var/attackamt = rand(2,6)
temp = "You attack for [attackamt] damage!"
playsound(src.loc, 'sound/arcade/Hit.ogg', 20, 1, extrarange = -6, falloff = 10)
playsound(src.loc, 'sound/arcade/hit.ogg', 20, 1, extrarange = -6, falloff = 10)
updateUsrDialog()
if(turtle > 0)
turtle--
@@ -128,7 +128,7 @@
var/pointamt = rand(1,3)
var/healamt = rand(6,8)
temp = "You use [pointamt] magic to heal for [healamt] damage!"
playsound(src.loc, 'sound/arcade/Heal.ogg', 20, 1, extrarange = -6, falloff = 10)
playsound(src.loc, 'sound/arcade/heal.ogg', 20, 1, extrarange = -6, falloff = 10)
updateUsrDialog()
turtle++
@@ -143,7 +143,7 @@
blocked = 1
var/chargeamt = rand(4,7)
temp = "You regain [chargeamt] points"
playsound(src.loc, 'sound/arcade/Mana.ogg', 20, 1, extrarange = -6, falloff = 10)
playsound(src.loc, 'sound/arcade/mana.ogg', 20, 1, extrarange = -6, falloff = 10)
player_mp += chargeamt
if(turtle > 0)
turtle--
@@ -178,7 +178,7 @@
if(!gameover)
gameover = 1
temp = "[enemy_name] has fallen! Rejoice!"
playsound(src.loc, 'sound/arcade/Win.ogg', 20, 1, extrarange = -6, falloff = 10)
playsound(src.loc, 'sound/arcade/win.ogg', 20, 1, extrarange = -6, falloff = 10)
if(emagged)
feedback_inc("arcade_win_emagged")
@@ -196,13 +196,13 @@
else if(emagged && (turtle >= 4))
var/boomamt = rand(5,10)
temp = "[enemy_name] throws a bomb, exploding you for [boomamt] damage!"
playsound(src.loc, 'sound/arcade/Boom.ogg', 20, 1, extrarange = -6, falloff = 10)
playsound(src.loc, 'sound/arcade/boom.ogg', 20, 1, extrarange = -6, falloff = 10)
player_hp -= boomamt
else if((enemy_mp <= 5) && (prob(70)))
var/stealamt = rand(2,3)
temp = "[enemy_name] steals [stealamt] of your power!"
playsound(src.loc, 'sound/arcade/Steal.ogg', 20, 1, extrarange = -6, falloff = 10)
playsound(src.loc, 'sound/arcade/steal.ogg', 20, 1, extrarange = -6, falloff = 10)
player_mp -= stealamt
updateUsrDialog()
@@ -210,7 +210,7 @@
gameover = 1
sleep(10)
temp = "You have been drained! GAME OVER"
playsound(src.loc, 'sound/arcade/Lose.ogg', 20, 1, extrarange = -6, falloff = 10)
playsound(src.loc, 'sound/arcade/lose.ogg', 20, 1, extrarange = -6, falloff = 10)
if(emagged)
feedback_inc("arcade_loss_mana_emagged")
usr.gib()
@@ -219,20 +219,20 @@
else if((enemy_hp <= 10) && (enemy_mp > 4))
temp = "[enemy_name] heals for 4 health!"
playsound(src.loc, 'sound/arcade/Heal.ogg', 20, 1, extrarange = -6, falloff = 10)
playsound(src.loc, 'sound/arcade/heal.ogg', 20, 1, extrarange = -6, falloff = 10)
enemy_hp += 4
enemy_mp -= 4
else
var/attackamt = rand(3,6)
temp = "[enemy_name] attacks for [attackamt] damage!"
playsound(src.loc, 'sound/arcade/Hit.ogg', 20, 1, extrarange = -6, falloff = 10)
playsound(src.loc, 'sound/arcade/hit.ogg', 20, 1, extrarange = -6, falloff = 10)
player_hp -= attackamt
if((player_mp <= 0) || (player_hp <= 0))
gameover = 1
temp = "You have been crushed! GAME OVER"
playsound(src.loc, 'sound/arcade/Lose.ogg', 20, 1, extrarange = -6, falloff = 10)
playsound(src.loc, 'sound/arcade/lose.ogg', 20, 1, extrarange = -6, falloff = 10)
if(emagged)
feedback_inc("arcade_loss_hp_emagged")
usr.gib()
@@ -497,7 +497,7 @@
atom_say("Something slams into the floor around [src] - luckily, it didn't get through!")
playsound(src.loc, 'sound/effects/bang.ogg', 20, 1)
if(ORION_TRAIL_MALFUNCTION)
playsound(src.loc, 'sound/effects/EMPulse.ogg', 20, 1)
playsound(src.loc, 'sound/effects/empulse.ogg', 20, 1)
visible_message("<span class='danger'>[src] malfunctions, randomizing in-game stats!</span>")
var/oldfood = food
var/oldfuel = fuel
@@ -998,7 +998,7 @@
to_chat(user, "<span class='warning'>You flip the switch on the underside of [src].</span>")
active = 1
visible_message("<span class='notice'>[src] softly beeps and whirs to life!</span>")
playsound(src.loc, 'sound/machines/defib_saftyOn.ogg', 25, 1)
playsound(src.loc, 'sound/machines/defib_saftyon.ogg', 25, 1)
atom_say("This is ship ID #[rand(1,1000)] to Orion Port Authority. We're coming in for landing, over.")
sleep(20)
visible_message("<span class='warning'>[src] begins to vibrate...</span>")
code/game/machinery/computer/buildandrepair.dm
+1 -1
View File
@@ -28,7 +28,7 @@
var/frame_desc = null
var/contain_parts = 1
toolspeed = 1
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
/obj/item/circuitboard/computer
board_type = "computer"
code/game/machinery/dance_machine.dm
+2 -2
View File
@@ -148,7 +148,7 @@
selection = available[selected]
updateUsrDialog()
if("horn")
deejay('sound/items/Airhorn2.ogg')
deejay('sound/items/airhorn2.ogg')
if("alert")
deejay('sound/misc/notice1.ogg')
if("siren")
@@ -162,7 +162,7 @@
if("saber")
deejay('sound/weapons/saberon.ogg')
if("harm")
deejay('sound/ai/harmalarm.ogg')
deejay('sound/AI/harmalarm.ogg')
/obj/machinery/disco/proc/deejay(S)
if(QDELETED(src) || !active || charge < 5)
code/game/machinery/doors/airlock.dm
+4 -4
View File
@@ -89,9 +89,9 @@ var/list/airlock_overlays = list()
var/doorOpen = 'sound/machines/airlock_open.ogg'
var/doorClose = 'sound/machines/airlock_close.ogg'
var/doorDeni = 'sound/machines/DeniedBeep.ogg' // i'm thinkin' Deni's
var/boltUp = 'sound/machines/BoltsUp.ogg'
var/boltDown = 'sound/machines/BoltsDown.ogg'
var/doorDeni = 'sound/machines/deniedbeep.ogg' // i'm thinkin' Deni's
var/boltUp = 'sound/machines/boltsup.ogg'
var/boltDown = 'sound/machines/boltsdown.ogg'
var/is_special = 0
/obj/machinery/door/airlock/welded
@@ -1324,7 +1324,7 @@ About the new airlock wires panel:
else return FALSE
else
user.visible_message("<span class='notice'>[user] cuts down [note] from [src].</span>", "<span class='notice'>You remove [note] from [src].</span>")
playsound(src, 'sound/items/Wirecutter.ogg', 50, 1)
playsound(src, 'sound/items/wirecutter.ogg', 50, 1)
note.forceMove(get_turf(user))
note = null
update_icon()
code/game/machinery/doors/airlock_electronics.dm
+1 -1
View File
@@ -7,7 +7,7 @@
origin_tech = "engineering=2;programming=1"
req_access = list(access_engine)
toolspeed = 1
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
var/list/conf_access = null
var/one_access = 0 //if set to 1, door would receive req_one_access instead of req_access
var/const/max_brain_damage = 60 // Maximum brain damage a mob can have until it can't use the electronics
code/game/machinery/doors/firedoor.dm
+1 -1
View File
@@ -275,7 +275,7 @@
materials = list(MAT_METAL=50, MAT_GLASS=50)
origin_tech = "engineering=2;programming=1"
toolspeed = 1
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
/obj/structure/firelock_frame
name = "firelock frame"
code/game/machinery/firealarm.dm
+1 -1
View File
@@ -268,7 +268,7 @@ Just a object used in constructing fire alarms
materials = list(MAT_METAL=50, MAT_GLASS=50)
origin_tech = "engineering=2;programming=1"
toolspeed = 1
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
/obj/machinery/partyalarm
name = "\improper PARTY BUTTON"
code/game/machinery/newscaster.dm
+2 -2
View File
@@ -595,7 +595,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
return
if(W.force < 15)
visible_message("<span class='danger'>[user.name] hits the [name] with the [W.name] with no visible effect.</span>", null , 5)
playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1)
playsound(loc, 'sound/effects/glasshit.ogg', 100, 1)
else
hitstaken++
if(hitstaken == 3)
@@ -604,7 +604,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
playsound(loc, 'sound/effects/Glassbr3.ogg', 100, 1)
else
visible_message("<span class='danger'>[user.name] forcefully slams the [name] with the [I.name]!</span>", null, 5)
playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1)
playsound(loc, 'sound/effects/glasshit.ogg', 100, 1)
else
to_chat(user, "<span class='notice'>This does nothing.</span>")
update_icon()
code/game/machinery/recycler.dm
+1 -1
View File
@@ -158,7 +158,7 @@ var/const/SAFETY_COOLDOWN = 100
L.loc = loc
if(issilicon(L))
playsound(loc, 'sound/items/Welder.ogg', 50, 1)
playsound(loc, 'sound/items/welder.ogg', 50, 1)
else
playsound(loc, 'sound/effects/splat.ogg', 50, 1)
code/game/machinery/shieldgen.dm
+2 -2
View File
@@ -47,7 +47,7 @@
health -= aforce
//Play a fitting sound
playsound(loc, 'sound/effects/EMPulse.ogg', 75, 1)
playsound(loc, 'sound/effects/empulse.ogg', 75, 1)
if(health <= 0)
visible_message("<span class='notice'>The [src] dissipates</span>")
@@ -109,7 +109,7 @@
health -= tforce
//This seemed to be the best sound for hitting a force field.
playsound(loc, 'sound/effects/EMPulse.ogg', 100, 1)
playsound(loc, 'sound/effects/empulse.ogg', 100, 1)
//Handle the destruction of the shield
if(health <= 0)
code/game/machinery/syndicatebomb.dm
+1 -1
View File
@@ -457,7 +457,7 @@
reactants += S.reagents
if(!chem_splash(get_turf(src), spread_range, reactants, temp_boost))
playsound(loc, 'sound/items/Screwdriver2.ogg', 50, 1)
playsound(loc, 'sound/items/screwdriver2.ogg', 50, 1)
return // The Explosion didn't do anything. No need to log, or disappear.
if(adminlog)
code/game/machinery/transformer.dm
+2 -2
View File
@@ -59,7 +59,7 @@
playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
return
playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
playsound(src.loc, 'sound/items/welder.ogg', 50, 1)
H.emote("scream") // It is painful
H.adjustBruteLoss(max(0, 80 - H.getBruteLoss())) // Hurt the human, don't try to kill them though.
@@ -146,7 +146,7 @@
if(cooldown == 1)
return
playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
playsound(src.loc, 'sound/items/welder.ogg', 50, 1)
// Sleep for a couple of ticks to allow the human to see the pain
sleep(5)
use_power(5000) // Use a lot of power.
code/game/mecha/equipment/tools/work_tools.dm
+1 -1
View File
@@ -195,7 +195,7 @@
var/mode = 0 //0 - deconstruct, 1 - wall or floor, 2 - airlock.
var/canRwall = 0
toolspeed = 1
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
/obj/item/mecha_parts/mecha_equipment/rcd/New()
GLOB.rcd_list += src
code/game/mecha/equipment/weapons/weapons.dm
+1 -1
View File
@@ -202,7 +202,7 @@
if(!equip_ready)
return 0
playsound(chassis, 'sound/items/AirHorn.ogg', 100, 1)
playsound(chassis, 'sound/items/airhorn.ogg', 100, 1)
chassis.occupant_message("<font color='red' size='5'>HONK</font>")
for(var/mob/living/carbon/M in ohearers(6, chassis))
if(istype(M, /mob/living/carbon/human))
code/game/mecha/mecha.dm
+1 -1
View File
@@ -232,7 +232,7 @@
if(M.damtype =="brute")
playsound(src, 'sound/weapons/punch4.ogg', 50, 1)
else if(M.damtype == "fire")
playsound(src, 'sound/items/Welder.ogg', 50, 1)
playsound(src, 'sound/items/welder.ogg', 50, 1)
else
return
M.occupant_message("<span class='danger'>You hit [src].</span>")
code/game/objects/empulse.dm
+1 -1
View File
@@ -15,7 +15,7 @@
light_range = heavy_range
for(var/mob/M in range(heavy_range, epicenter))
M << 'sound/effects/EMPulse.ogg'
M << 'sound/effects/empulse.ogg'
for(var/atom/T in range(light_range, epicenter))
var/distance = get_dist(epicenter, T)
if(distance < 0)
code/game/objects/items/devices/radio/intercom.dm
+1 -1
View File
@@ -236,7 +236,7 @@
materials = list(MAT_METAL=50, MAT_GLASS=50)
origin_tech = "engineering=2;programming=1"
toolspeed = 1
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
/obj/item/radio/intercom/locked
var/locked_frequency
code/game/objects/items/devices/scanners.dm
+2 -2
View File
@@ -296,7 +296,7 @@ REAGENT SCANNER
desc = "An upgrade unit that can be installed on a health analyzer for expanded functionality."
w_class = WEIGHT_CLASS_TINY
origin_tech = "magnets=2;biotech=2"
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
/obj/item/analyzer
desc = "A hand-held environmental scanner which reports current gas levels."
@@ -581,7 +581,7 @@ REAGENT SCANNER
/obj/item/bodyanalyzer/proc/setReady()
ready = TRUE
playsound(src, 'sound/machines/defib_saftyOn.ogg', 50, 0)
playsound(src, 'sound/machines/defib_saftyon.ogg', 50, 0)
update_icon()
/obj/item/bodyanalyzer/update_icon(printing = FALSE)
code/game/objects/items/mountable_frames/frames.dm
+1 -1
View File
@@ -5,7 +5,7 @@
var/sheets_refunded = 2
var/list/mount_reqs = list() //can contain simfloor, nospace. Used in try_build to see if conditions are needed, then met
toolspeed = 1
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
/obj/item/mounted/frame/attackby(obj/item/W, mob/user)
..()
code/game/objects/items/stacks/rods.dm
+1 -1
View File
@@ -20,7 +20,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \
attack_verb = list("hit", "bludgeoned", "whacked")
hitsound = 'sound/weapons/grenadelaunch.ogg'
toolspeed = 1
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
/obj/item/stack/rods/cyborg
materials = list()
code/game/objects/items/stacks/sheets/sheets.dm
+1 -1
View File
@@ -11,7 +11,7 @@
var/sheettype = null //this is used for girders in the creation of walls/false walls
var/created_window = null //apparently glass sheets don't share a base type for glass specifically, so each had to define these vars individually
var/full_window = null //moving the var declaration to here so this can be checked cleaner until someone is willing to make them share a base type properly
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
toolspeed = 1
var/wall_allowed = TRUE //determines if sheet can be used in wall construction or not.
code/game/objects/items/toys.dm
+1 -1
View File
@@ -775,7 +775,7 @@ obj/item/toy/cards/deck/syndicate/black
user.visible_message("<span class='warning'>[user] presses a button on [src]</span>", "<span class='notice'>You activate [src], it plays a loud noise!</span>", "<span class='notice'>You hear the click of a button.</span>")
spawn(5) //gia said so
icon_state = "nuketoy"
playsound(src, 'sound/machines/Alarm.ogg', 100, 0, 0)
playsound(src, 'sound/machines/alarm.ogg', 100, 0, 0)
sleep(135)
icon_state = "nuketoycool"
sleep(cooldown - world.time)
code/game/objects/items/weapons/RCD.dm
+1 -1
View File
@@ -46,7 +46,7 @@ GLOBAL_LIST_INIT(rcd_door_types, list(
materials = list(MAT_METAL = 30000)
origin_tech = "engineering=4;materials=2"
toolspeed = 1
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
flags_2 = NO_MAT_REDEMPTION_2
req_access = list(access_engine)
code/game/objects/items/weapons/clown_items.dm
+1 -1
View File
@@ -32,7 +32,7 @@
desc = "Damn son, where'd you find this?"
icon_state = "air_horn"
origin_tech = "materials=4;engineering=4"
honk_sounds = list('sound/items/Airhorn2.ogg' = 1)
honk_sounds = list('sound/items/airhorn2.ogg' = 1)
/obj/item/bikehorn/golden
name = "golden bike horn"
code/game/objects/items/weapons/cosmetics.dm
+1 -1
View File
@@ -100,7 +100,7 @@
icon_state = "razor"
flags = CONDUCT
w_class = WEIGHT_CLASS_TINY
usesound = 'sound/items/Welder2.ogg'
usesound = 'sound/items/welder2.ogg'
toolspeed = 1
/obj/item/razor/attack(mob/living/carbon/M as mob, mob/user as mob)
code/game/objects/items/weapons/defib.dm
+2 -2
View File
@@ -118,11 +118,11 @@
if(safety)
safety = 0
src.visible_message("<span class='notice'>[src] beeps: Safety protocols disabled!</span>")
playsound(get_turf(src), 'sound/machines/defib_saftyOff.ogg', 50, 0)
playsound(get_turf(src), 'sound/machines/defib_saftyoff.ogg', 50, 0)
else
safety = 1
src.visible_message("<span class='notice'>[src] beeps: Safety protocols enabled!</span>")
playsound(get_turf(src), 'sound/machines/defib_saftyOn.ogg', 50, 0)
playsound(get_turf(src), 'sound/machines/defib_saftyon.ogg', 50, 0)
update_icon()
..()
code/game/objects/items/weapons/grenades/chem_grenade.dm
+2 -2
View File
@@ -11,7 +11,7 @@
var/payload_name = null // used for spawned grenades
w_class = WEIGHT_CLASS_SMALL
force = 2
var/prime_sound = 'sound/items/Screwdriver2.ogg'
var/prime_sound = 'sound/items/screwdriver2.ogg'
var/stage = EMPTY
var/list/beakers = list()
var/list/allowed_containers = list(/obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle)
@@ -275,7 +275,7 @@
reactants += G.reagents
if(!chem_splash(get_turf(src), affected_area, reactants, ignition_temp, threatscale) && !no_splash)
playsound(loc, 'sound/items/Screwdriver2.ogg', 50, 1)
playsound(loc, 'sound/items/screwdriver2.ogg', 50, 1)
if(beakers.len)
for(var/obj/O in beakers)
O.forceMove(get_turf(src))
code/game/objects/items/weapons/lighters.dm
+2 -2
View File
@@ -43,7 +43,7 @@
attack_verb = list("burnt", "singed")
if(istype(src, /obj/item/lighter/zippo) )
user.visible_message("<span class='rose'>Without even breaking stride, [user] flips open and lights [src] in one smooth movement.</span>")
playsound(src.loc, 'sound/items/ZippoLight.ogg', 25, 1)
playsound(src.loc, 'sound/items/zippolight.ogg', 25, 1)
else
if(prob(75))
user.visible_message("<span class='notice'>After a few attempts, [user] manages to light the [src].</span>")
@@ -69,7 +69,7 @@
attack_verb = null //human_defense.dm takes care of it
if(istype(src, /obj/item/lighter/zippo) )
user.visible_message("<span class='rose'>You hear a quiet click, as [user] shuts off [src] without even looking at what [user.p_theyre()] doing. Wow.")
playsound(src.loc, 'sound/items/ZippoClose.ogg', 25, 1)
playsound(src.loc, 'sound/items/zippoclose.ogg', 25, 1)
else
user.visible_message("<span class='notice'>[user] quietly shuts off the [src].")
code/game/objects/items/weapons/scissors.dm
+2 -2
View File
@@ -79,7 +79,7 @@
species_hair = GLOB.hair_styles_public_list
var/h_new_style = input(user, "Select a hair style", "Grooming") as null|anything in species_hair
user.visible_message("<span class='notice'>[user] starts cutting [M]'s hair!</span>", "<span class='notice'>You start cutting [M]'s hair!</span>") //arguments for this are: 1. what others see 2. what the user sees. --Fixed grammar, (TGameCo)
playsound(loc, 'sound/goonstation/misc/Scissor.ogg', 100, 1)
playsound(loc, 'sound/goonstation/misc/scissor.ogg', 100, 1)
if(do_after(user, 50 * toolspeed, target = H)) //this is the part that adds a delay. delay is in deciseconds. --Made it 5 seconds, because hair isn't cut in one second in real life, and I want at least a little bit longer time, (TGameCo)
if(!(M in view(1))) //Adjacency test
user.visible_message("<span class='notice'>[user] stops cutting [M]'s hair.</span>", "<span class='notice'>You stop cutting [M]'s hair.</span>")
@@ -111,7 +111,7 @@
if(!is_cutting)
is_cutting = 1
user.visible_message("<span class='notice'>[user] starts cutting [M]'s hair!</span>", "<span class='notice'>You start cutting [M]'s hair!</span>")
playsound(loc, 'sound/goonstation/misc/Scissor.ogg', 100, 1)
playsound(loc, 'sound/goonstation/misc/scissor.ogg', 100, 1)
if(do_after(user, 50 * toolspeed, target = H))
playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
user.visible_message("<span class='danger'>[user] abruptly stops cutting [M]'s hair and slices [M.p_their()] throat!</span>", "<span class='danger'>You stop cutting [M]'s hair and slice [M.p_their()] throat!</span>") //Just a little off the top.
code/game/objects/items/weapons/stock_parts.dm
+4 -4
View File
@@ -40,9 +40,9 @@
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 800
works_from_distance = 1
primary_sound = 'sound/items/PSHOOM.ogg'
alt_sound = 'sound/items/PSHOOM_2.ogg'
usesound = 'sound/items/PSHOOM.ogg'
primary_sound = 'sound/items/pshoom.ogg'
alt_sound = 'sound/items/pshoom_2.ogg'
usesound = 'sound/items/pshoom.ogg'
toolspeed = 0.5
/obj/item/storage/part_replacer/proc/play_rped_sound()
@@ -65,7 +65,7 @@
w_class = WEIGHT_CLASS_SMALL
var/rating = 1
toolspeed = 1
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
/obj/item/stock_parts/New()
src.pixel_x = rand(-5.0, 5)
code/game/objects/items/weapons/tools.dm
+10 -10
View File
@@ -22,7 +22,7 @@
slot_flags = SLOT_BELT
force = 5
throwforce = 7
usesound = 'sound/items/Ratchet.ogg'
usesound = 'sound/items/ratchet.ogg'
w_class = WEIGHT_CLASS_SMALL
materials = list(MAT_METAL=150)
origin_tech = "materials=1;engineering=1"
@@ -50,7 +50,7 @@
desc = "A polarized wrench. It causes anything placed between the jaws to turn."
icon = 'icons/obj/abductor.dmi'
icon_state = "wrench"
usesound = 'sound/effects/EMPulse.ogg'
usesound = 'sound/effects/empulse.ogg'
toolspeed = 0.1
origin_tech = "materials=5;engineering=5;abductor=3"
@@ -131,7 +131,7 @@
materials = list(MAT_METAL=75)
attack_verb = list("stabbed")
hitsound = 'sound/weapons/bladeslice.ogg'
usesound = 'sound/items/Screwdriver.ogg'
usesound = 'sound/items/screwdriver.ogg'
toolspeed = 1
var/random_color = TRUE //if the screwdriver uses random coloring
@@ -176,7 +176,7 @@
desc = "An ultrasonic screwdriver."
icon = 'icons/obj/abductor.dmi'
icon_state = "screwdriver"
usesound = 'sound/items/PSHOOM.ogg'
usesound = 'sound/items/pshoom.ogg'
toolspeed = 0.1
random_color = FALSE
@@ -229,8 +229,8 @@
materials = list(MAT_METAL=80)
origin_tech = "materials=1;engineering=1"
attack_verb = list("pinched", "nipped")
hitsound = 'sound/items/Wirecutter.ogg'
usesound = 'sound/items/Wirecutter.ogg'
hitsound = 'sound/items/wirecutter.ogg'
usesound = 'sound/items/wirecutter.ogg'
sharp = 1
toolspeed = 1
var/random_color = TRUE
@@ -322,9 +322,9 @@
throw_speed = 3
throw_range = 5
hitsound = "swing_hit"
usesound = 'sound/items/Welder.ogg'
var/acti_sound = 'sound/items/WelderActivate.ogg'
var/deac_sound = 'sound/items/WelderDeactivate.ogg'
usesound = 'sound/items/welder.ogg'
var/acti_sound = 'sound/items/welderactivate.ogg'
var/deac_sound = 'sound/items/welderdeactivate.ogg'
w_class = WEIGHT_CLASS_SMALL
materials = list(MAT_METAL=70, MAT_GLASS=30)
origin_tech = "engineering=1;plasmatech=1"
@@ -672,7 +672,7 @@ obj/item/weldingtool/experimental/process()
icon = 'icons/obj/tools.dmi'
icon_state = "crowbar"
item_state = "crowbar"
usesound = 'sound/items/Crowbar.ogg'
usesound = 'sound/items/crowbar.ogg'
flags = CONDUCT
slot_flags = SLOT_BELT
force = 5
code/game/objects/items/weapons/twohanded.dm
+1 -1
View File
@@ -175,7 +175,7 @@
force_wielded = 24
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
usesound = 'sound/items/Crowbar.ogg'
usesound = 'sound/items/crowbar.ogg'
/obj/item/twohanded/fireaxe/update_icon() //Currently only here to fuck with the on-mob icons.
icon_state = "fireaxe[wielded]"
code/game/objects/items/weapons/whetstone.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon_state = "whetstone"
desc = "A block of stone used to sharpen things."
w_class = WEIGHT_CLASS_SMALL
usesound = 'sound/items/Screwdriver.ogg'
usesound = 'sound/items/screwdriver.ogg'
var/used = 0
var/increment = 4
var/max = 30
code/game/objects/structures/crates_lockers/closets/fireaxe.dm
+1 -1
View File
@@ -48,7 +48,7 @@
else
src.hitstaken++
if(src.hitstaken == 4)
playsound(user, 'sound/effects/Glassbr3.ogg', 100, 1) //Break cabinet, receive goodies. Cabinet's fucked for life after that.
playsound(user, 'sound/effects/glassbr3.ogg', 100, 1) //Break cabinet, receive goodies. Cabinet's fucked for life after that.
src.smashed = 1
src.locked = 0
src.localopened = 1
code/game/objects/structures/depot.dm
+1 -1
View File
@@ -64,7 +64,7 @@
depotarea.activate_self_destruct("Fusion reactor cracked open. Core loose!", TRUE)
var/obj/effect/overload/O = new /obj/effect/overload(get_turf(src))
if(containment_failure)
playsound(loc, 'sound/machines/Alarm.ogg', 100, 0, 0)
playsound(loc, 'sound/machines/alarm.ogg', 100, 0, 0)
O.deliberate = TRUE
O.max_cycles = 6
if(!skip_qdel)
code/game/objects/structures/false_walls.dm
+2 -2
View File
@@ -136,7 +136,7 @@
var/P = text2path("/obj/item/stack/sheet/mineral/[mineral]")
new P(loc)
new P(loc)
playsound(src, 'sound/items/Welder.ogg', 100, 1)
playsound(src, 'sound/items/welder.ogg', 100, 1)
qdel(src)
/*
@@ -243,7 +243,7 @@
..()
/obj/structure/falsewall/plasma/proc/burnbabyburn(user)
playsound(src, 'sound/items/Welder.ogg', 100, 1)
playsound(src, 'sound/items/welder.ogg', 100, 1)
atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 400)
new /obj/structure/girder/displaced(loc)
qdel(src)
code/game/objects/structures/guillotine.dm
+1 -1
View File
@@ -162,7 +162,7 @@
user.visible_message("<span class='notice'>[user] sharpens the large blade of the guillotine.</span>",
"<span class='notice'>You sharpen the large blade of the guillotine.</span>")
blade_sharpness += 1
playsound(src, 'sound/items/Screwdriver.ogg', 100, 1)
playsound(src, 'sound/items/screwdriver.ogg', 100, 1)
return
else
blade_status = GUILLOTINE_BLADE_RAISED
code/game/objects/structures/morgue.dm
+2 -2
View File
@@ -27,7 +27,7 @@
"The tray contains a body that might be responsive."
)
anchored = 1.0
var/open_sound = 'sound/items/Deconstruct.ogg'
var/open_sound = 'sound/items/deconstruct.ogg'
/obj/structure/morgue/Initialize()
. = ..()
@@ -248,7 +248,7 @@
var/cremating = 0
var/id = 1
var/locked = 0
var/open_sound = 'sound/items/Deconstruct.ogg'
var/open_sound = 'sound/items/deconstruct.ogg'
/obj/structure/crematorium/proc/update()
if(connected)
code/game/objects/structures/window.dm
+3 -3
View File
@@ -218,7 +218,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
playsound(src, WT.usesound, 40, 1)
if(do_after(user, 40*I.toolspeed, target = src))
obj_integrity = max_integrity
playsound(src, 'sound/items/Welder2.ogg', 50, 1)
playsound(src, 'sound/items/welder2.ogg', 50, 1)
update_nearby_icons()
to_chat(user, "<span class='notice'>You repair [src].</span>")
else
@@ -292,7 +292,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
if(do_after(user, decon_speed*I.toolspeed, target = src, extra_checks = CALLBACK(src, .proc/check_state_and_anchored, state, anchored)))
var/obj/item/stack/sheet/G = new glass_type(user.loc, glass_amount)
G.add_fingerprint(user)
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
playsound(src, 'sound/items/deconstruct.ogg', 50, 1)
to_chat(user, "<span class='notice'>You successfully disassemble [src].</span>")
qdel(src)
return
@@ -335,7 +335,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
else
playsound(src, 'sound/weapons/tap.ogg', 50, 1)
if(BURN)
playsound(src, 'sound/items/Welder.ogg', 100, 1)
playsound(src, 'sound/items/welder.ogg', 100, 1)
/obj/structure/window/deconstruct(disassembled = TRUE)
if(QDELETED(src))
code/game/sound.dm
+2 -2
View File
@@ -113,9 +113,9 @@
if(istext(soundin))
switch(soundin)
if("shatter")
soundin = pick('sound/effects/Glassbr1.ogg','sound/effects/Glassbr2.ogg','sound/effects/Glassbr3.ogg')
soundin = pick('sound/effects/glassbr1.ogg','sound/effects/glassbr2.ogg','sound/effects/glassbr3.ogg')
if("explosion")
soundin = pick('sound/effects/Explosion1.ogg','sound/effects/Explosion2.ogg')
soundin = pick('sound/effects/explosion1.ogg','sound/effects/explosion2.ogg')
if("sparks")
soundin = pick('sound/effects/sparks1.ogg','sound/effects/sparks2.ogg','sound/effects/sparks3.ogg','sound/effects/sparks4.ogg')
if("rustle")
code/game/turfs/simulated/walls.dm
+1 -1
View File
@@ -127,7 +127,7 @@
if(devastated)
devastate_wall()
else
playsound(src, 'sound/items/Welder.ogg', 100, 1)
playsound(src, 'sound/items/welder.ogg', 100, 1)
var/newgirder = break_wall()
if(newgirder) //maybe we don't /want/ a girder!
transfer_fingerprints_to(newgirder)
code/modules/antagonists/_common/antag_spawner.dm
+1 -1
View File
@@ -95,7 +95,7 @@
spawn_antag(C, get_turf(src.loc), initial(demon_type.name), user)
to_chat(user, "[shatter_msg]")
to_chat(user, "[veil_msg]")
playsound(user.loc, 'sound/effects/Glassbr1.ogg', 100, 1)
playsound(user.loc, 'sound/effects/glassbr1.ogg', 100, 1)
qdel(src)
else
used = FALSE
code/modules/arcade/claw_game.dm
+1 -1
View File
@@ -57,7 +57,7 @@
else
atom_say("WINNER!")
new /obj/item/toy/prizeball(get_turf(src))
playsound(src.loc, 'sound/arcade/Win.ogg', 50, 1, extrarange = -3, falloff = 10)
playsound(src.loc, 'sound/arcade/win.ogg', 50, 1, extrarange = -3, falloff = 10)
addtimer(CALLBACK(src, .update_icon), 10)
/obj/machinery/arcade/claw/start_play(mob/user as mob)
code/modules/assembly/assembly.dm
+1 -1
View File
@@ -11,7 +11,7 @@
throw_range = 10
origin_tech = "magnets=1;engineering=1"
toolspeed = 1
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
var/bomb_name = "bomb" // used for naming bombs / mines
code/modules/awaymissions/mission_code/spacehotel.dm
+1 -1
View File
@@ -94,7 +94,7 @@
autoclose = 1
var/doorOpen = 'sound/machines/airlock_open.ogg'
var/doorClose = 'sound/machines/airlock_close.ogg'
var/doorDeni = 'sound/machines/DeniedBeep.ogg'
var/doorDeni = 'sound/machines/deniedbeep.ogg'
var/id // the room number, eg 101
var/obj/item/card/hotel_card/card// room's key card
var/mob/living/occupant = null // the current room occupant
code/modules/clothing/head/helmet.dm
+2 -2
View File
@@ -103,7 +103,7 @@
actions_types = list(/datum/action/item_action/toggle_helmet_light)
can_toggle = 1
toggle_cooldown = 20
active_sound = 'sound/items/WEEOO1.ogg'
active_sound = 'sound/items/weeoo1.ogg'
/obj/item/clothing/head/helmet/justice/escape
name = "alarm helmet"
@@ -173,7 +173,7 @@
actions_types = list(/datum/action/item_action/toggle_helmet_mode)
can_toggle = 1
toggle_cooldown = 20
toggle_sound = 'sound/items/ZippoClose.ogg'
toggle_sound = 'sound/items/zippoclose.ogg'
obj/item/clothing/head/helmet/redtaghelm
name = "red laser tag helmet"
code/modules/customitems/item_defines.dm
+2 -2
View File
@@ -27,7 +27,7 @@
var/tattoo_g = 1
var/tattoo_b = 1
toolspeed = 1
usesound = 'sound/items/Welder2.ogg'
usesound = 'sound/items/welder2.ogg'
/obj/item/fluff/tattoo_gun/attack(mob/living/carbon/M as mob, mob/user as mob)
if(user.a_intent == INTENT_HARM)
@@ -552,7 +552,7 @@
sallet.add_fingerprint(H)
target.transfer_fingerprints_to(sallet)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
playsound(src.loc, 'sound/items/screwdriver.ogg', 50, 1)
to_chat(user, "<span class='notice'>You modify [target] with [src].</span>")
H.update_inv_head()
qdel(target)
code/modules/events/radiation_storm.dm
+1 -1
View File
@@ -4,7 +4,7 @@
announceWhen = 1
/datum/event/radiation_storm/announce()
priority_announcement.Announce("High levels of radiation detected near the station. Maintenance is best shielded from radiation.", "Anomaly Alert", 'sound/ai/radiation.ogg')
priority_announcement.Announce("High levels of radiation detected near the station. Maintenance is best shielded from radiation.", "Anomaly Alert", 'sound/AI/radiation.ogg')
//sound not longer matches the text, but an audible warning is probably good
/datum/event/radiation_storm/start()
code/modules/fish/fishtank.dm
+1 -1
View File
@@ -547,7 +547,7 @@
else
playsound(src, 'sound/weapons/tap.ogg', 50, 1)
if(BURN)
playsound(src, 'sound/items/Welder.ogg', 100, 1)
playsound(src, 'sound/items/welder.ogg', 100, 1)
/obj/machinery/fishtank/deconstruct(disassembled = TRUE)
if(QDELETED(src))
code/modules/flufftext/Hallucination.dm
+12 -12
View File
@@ -698,13 +698,13 @@ var/list/non_fakeattack_weapons = list(/obj/item/gun/projectile, /obj/item/ammo_
doors += I
if(target.client)
target.client.images |= I
target.playsound_local(get_turf(A), 'sound/machines/BoltsDown.ogg',30,0,3)
target.playsound_local(get_turf(A), 'sound/machines/boltsdown.ogg',30,0,3)
sleep(rand(6,12))
sleep(100)
for(var/image/B in doors)
if(target.client)
target.client.images.Remove(B)
target.playsound_local(get_turf(B), 'sound/machines/BoltsUp.ogg',30,0,3)
target.playsound_local(get_turf(B), 'sound/machines/boltsup.ogg',30,0,3)
sleep(rand(6,12))
qdel(src)
@@ -797,13 +797,13 @@ var/list/non_fakeattack_weapons = list(/obj/item/gun/projectile, /obj/item/ammo_
playsound_local(null,'sound/machines/airlock_open.ogg', 15, 1)
if(2)
if(prob(50))
playsound_local(null,'sound/effects/Explosion1.ogg', 50, 1)
playsound_local(null,'sound/effects/explosion1.ogg', 50, 1)
else
playsound_local(null, 'sound/effects/Explosion2.ogg', 50, 1)
playsound_local(null, 'sound/effects/explosion2.ogg', 50, 1)
if(3)
playsound_local(null, 'sound/effects/explosionfar.ogg', 50, 1)
if(4)
playsound_local(null, pick('sound/effects/Glassbr1.ogg','sound/effects/Glassbr2.ogg','sound/effects/Glassbr3.ogg'), 50, 1)
playsound_local(null, pick('sound/effects/glassbr1.ogg','sound/effects/glassbr2.ogg','sound/effects/glassbr3.ogg'), 50, 1)
if(5)
playsound_local(null, 'sound/weapons/ring.ogg', 35)
for(var/i in 0 to 2)
@@ -812,7 +812,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/gun/projectile, /obj/item/ammo_
if(6)
playsound_local(null, 'sound/magic/Summon_guns.ogg', 50, 1)
if(7)
playsound_local(null, 'sound/machines/Alarm.ogg', 100, 0)
playsound_local(null, 'sound/machines/alarm.ogg', 100, 0)
if(8)
playsound_local(null, 'sound/voice/bfreeze.ogg', 35, 0)
if(9)
@@ -832,7 +832,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/gun/projectile, /obj/item/ammo_
//Rare audio
if(12)
//These sounds are (mostly) taken from Hidden: Source
var/list/creepyasssounds = list('sound/effects/ghost.ogg', 'sound/effects/ghost2.ogg', 'sound/effects/Heart Beat.ogg', 'sound/effects/screech.ogg',\
var/list/creepyasssounds = list('sound/effects/ghost.ogg', 'sound/effects/ghost2.ogg', 'sound/effects/heartbeat.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/im_here1.ogg', 'sound/hallucinations/im_here2.ogg', 'sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.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',\
@@ -845,13 +845,13 @@ var/list/non_fakeattack_weapons = list(/obj/item/gun/projectile, /obj/item/ammo_
to_chat(src, "<br><br><span class='alert'>The Emergency Shuttle has docked with the station. You have 3 minutes to board the Emergency Shuttle.</span><br><br>")
playsound_local(null, 'sound/AI/shuttledock.ogg', 100)
if(15)
playsound_local(null, 'sound/items/Welder.ogg', 15, 1)
playsound_local(null, 'sound/items/welder.ogg', 15, 1)
sleep(105)
playsound_local(null, 'sound/items/Welder2.ogg', 15, 1)
playsound_local(null, 'sound/items/welder2.ogg', 15, 1)
sleep(15)
playsound_local(null, 'sound/items/Ratchet.ogg', 15, 1)
playsound_local(null, 'sound/items/ratchet.ogg', 15, 1)
if(16)
playsound_local(null, 'sound/items/Screwdriver.ogg', 15, 1)
playsound_local(null, 'sound/items/screwdriver.ogg', 15, 1)
sleep(rand(10,30))
for(var/i in 0 to rand(1,3))
playsound_local(null, 'sound/weapons/empty.ogg', 15, 1)
@@ -993,7 +993,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/gun/projectile, /obj/item/ammo_
halimage = image('icons/turf/floors/Chasms.dmi',target,"smooth",TURF_LAYER)
if(4)
halimage = image('icons/obj/assemblies.dmi',target,"plastic-explosive2",OBJ_LAYER+0.01)
if(client)
client.images += halimage
sleep(rand(40,60)) //Only seen for a brief moment.
code/modules/food_and_drinks/drinks/drinks/cans.dm
+1 -1
View File
@@ -21,7 +21,7 @@
crushed_can.is_glass = is_glass
crushed_can.is_plastic = is_plastic
if(is_glass)
playsound(user.loc, 'sound/effects/Glassbr3.ogg', rand(10, 50), 1)
playsound(user.loc, 'sound/effects/glassbr3.ogg', rand(10, 50), 1)
crushed_can.name = "broken bottle"
else
playsound(user.loc, 'sound/weapons/pierce.ogg', rand(10, 50), 1)
code/modules/mining/lavaland/loot/bubblegum_loot.dm
+5 -5
View File
@@ -11,9 +11,9 @@
new /obj/item/blood_contract(src)
if(3)
new /obj/item/gun/magic/staff/spellblade(src)
// Mayhem
/obj/item/mayhem
name = "mayhem in a bottle"
desc = "A magically infused bottle of blood, the scent of which will drive anyone nearby into a murderous frenzy."
@@ -26,9 +26,9 @@
var/obj/effect/mine/pickup/bloodbath/B = new(H)
B.mineEffect(H)
to_chat(user, "<span class='notice'>You shatter the bottle!</span>")
playsound(user.loc, 'sound/effects/Glassbr1.ogg', 100, 1)
playsound(user.loc, 'sound/effects/glassbr1.ogg', 100, 1)
qdel(src)
// Blood Contract
/obj/item/blood_contract
@@ -42,7 +42,7 @@
/obj/item/blood_contract/attack_self(mob/user)
if(used)
return
used = TRUE
var/choice = input(user,"Who do you want dead?","Choose Your Victim") as null|anything in GLOB.player_list
code/modules/mining/lavaland/loot/tendril_loot.dm
+1 -1
View File
@@ -171,7 +171,7 @@
/obj/item/ship_in_a_bottle/attack_self(mob/user)
to_chat(user, "You're not sure how they get the ships in these things, but you're pretty sure you know how to get it out.")
playsound(user.loc, 'sound/effects/Glassbr1.ogg', 100, 1)
playsound(user.loc, 'sound/effects/glassbr1.ogg', 100, 1)
new /obj/vehicle/lavaboat/dragon(get_turf(src))
qdel(src)
code/modules/mob/living/carbon/human/human_defense.dm
+1 -1
View File
@@ -472,7 +472,7 @@ emp_act
playsound(src, 'sound/weapons/punch4.ogg', 50, 1)
if("fire")
update |= affecting.receive_damage(0, rand(M.force/2, M.force))
playsound(src, 'sound/items/Welder.ogg', 50, 1)
playsound(src, 'sound/items/welder.ogg', 50, 1)
if("tox")
M.mech_toxin_damage(src)
else
code/modules/mob/living/living_defense.dm
+1 -1
View File
@@ -117,7 +117,7 @@
playsound(src, 'sound/weapons/punch4.ogg', 50, 1)
if("fire")
take_overall_damage(0, rand(M.force/2, M.force))
playsound(src, 'sound/items/Welder.ogg', 50, 1)
playsound(src, 'sound/items/welder.ogg', 50, 1)
if("tox")
M.mech_toxin_damage(src)
else
code/modules/mob/living/simple_animal/hostile/hivebot.dm
+1 -1
View File
@@ -80,7 +80,7 @@
smoke.set_up(5, 0, src.loc)
smoke.start()
visible_message("<span class='danger'>The [src] warps in!</span>")
playsound(src.loc, 'sound/effects/EMPulse.ogg', 25, 1)
playsound(src.loc, 'sound/effects/empulse.ogg', 25, 1)
/mob/living/simple_animal/hostile/hivebot/tele/warpbots()
icon_state = "def_radar"
code/modules/mob/living/simple_animal/tribbles.dm
+1 -1
View File
@@ -176,7 +176,7 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
playsound(src, "shatter", 70, 1)
Break()
else
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
playsound(src.loc, 'sound/effects/glasshit.ogg', 75, 1)
return
/obj/structure/tribble_cage/update_icon()
code/modules/paperwork/frames.dm
+1 -1
View File
@@ -3,7 +3,7 @@
desc = "Its patented design allows it to be folded larger or smaller to accommodate standard paper, photo, and poster, and canvas sizes."
icon = 'icons/obj/bureaucracy.dmi'
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
var/icon_base
var/obj/displayed
code/modules/paperwork/photography.dm
+1 -1
View File
@@ -560,7 +560,7 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
///hauntings, like hallucinations but more spooky
/obj/item/camera/proc/handle_haunt(mob/user as mob)
var/list/creepyasssounds = list('sound/effects/ghost.ogg', 'sound/effects/ghost2.ogg', 'sound/effects/Heart Beat.ogg', 'sound/effects/screech.ogg',\
var/list/creepyasssounds = list('sound/effects/ghost.ogg', 'sound/effects/ghost2.ogg', 'sound/effects/heartbeat.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/im_here1.ogg', 'sound/hallucinations/im_here2.ogg', 'sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.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',\
code/modules/power/apc.dm
+1 -1
View File
@@ -130,7 +130,7 @@
origin_tech = "engineering=2;programming=1"
item_state = "electronic"
flags = CONDUCT
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
toolspeed = 1
/obj/machinery/power/apc/connect_to_network()
code/modules/power/cable.dm
+1 -1
View File
@@ -496,7 +496,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list(
slot_flags = SLOT_BELT
item_state = "coil"
attack_verb = list("whipped", "lashed", "disciplined", "flogged")
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
toolspeed = 1
/obj/item/stack/cable_coil/suicide_act(mob/user)
code/modules/power/gravitygenerator.dm
+1 -1
View File
@@ -331,7 +331,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
charge_count -= 2
if(charge_count % 4 == 0 && prob(75)) // Let them know it is charging/discharging.
playsound(src.loc, 'sound/effects/EMPulse.ogg', 100, 1)
playsound(src.loc, 'sound/effects/empulse.ogg', 100, 1)
updateDialog()
if(prob(25)) // To help stop "Your clothes feel warm" spam.
code/modules/power/lighting.dm
+3 -3
View File
@@ -359,7 +359,7 @@
else
user.visible_message("<span class='danger'>[user.name] hits the light.</span>")
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
playsound(src.loc, 'sound/effects/glasshit.ogg', 75, 1)
// attempt to stick weapon into light socket
else if(status == LIGHT_EMPTY)
@@ -536,7 +536,7 @@
if(!skip_sound_and_sparks)
if(status == LIGHT_OK || status == LIGHT_BURNED)
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
playsound(src.loc, 'sound/effects/glasshit.ogg', 75, 1)
if(on || overloaded)
do_sparks(3, 1, src)
status = LIGHT_BROKEN
@@ -719,7 +719,7 @@
status = LIGHT_BROKEN
force = 5
sharp = 1
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
playsound(src.loc, 'sound/effects/glasshit.ogg', 75, 1)
update()
/obj/item/light/suicide_act(mob/living/carbon/human/user)
code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+1 -1
View File
@@ -231,7 +231,7 @@
origin_tech = "programming=2;materials=2;magnets=4"
require_module = 1
module_type = /obj/item/robot_module/miner
usesound = 'sound/items/Screwdriver.ogg'
usesound = 'sound/items/screwdriver.ogg'
var/denied_type = null
var/maximum_of_type = 1
var/cost = 30
code/modules/projectiles/guns/energy/special.dm
+1 -1
View File
@@ -141,7 +141,7 @@
origin_tech = "combat=1;materials=3;magnets=2;plasmatech=3;engineering=1"
ammo_type = list(/obj/item/ammo_casing/energy/plasma)
fire_sound = 'sound/weapons/Laser.ogg'
usesound = 'sound/items/Welder.ogg'
usesound = 'sound/items/welder.ogg'
toolspeed = 1
container_type = OPENCONTAINER
flags = CONDUCT
code/modules/projectiles/guns/magic/staff.dm
+1 -1
View File
@@ -60,7 +60,7 @@
item_state = "honker"
max_charges = 4
recharge_rate = 8
fire_sound = 'sound/items/Airhorn.ogg'
fire_sound = 'sound/items/airhorn.ogg'
/obj/item/gun/magic/staff/focus
name = "mental focus"
code/modules/projectiles/guns/projectile/launchers.dm
+1 -1
View File
@@ -34,7 +34,7 @@
name = "gyrojet pistol"
desc = "A prototype pistol designed to fire self propelled rockets."
icon_state = "gyropistol"
fire_sound = 'sound/effects/Explosion1.ogg'
fire_sound = 'sound/effects/explosion1.ogg'
origin_tech = "combat=5"
mag_type = /obj/item/ammo_box/magazine/m75
burst_size = 1
code/modules/projectiles/projectile/special.dm
+1 -1
View File
@@ -311,7 +311,7 @@
/obj/item/projectile/ornament
name = "ornament"
icon_state = "ornament-1"
hitsound = 'sound/effects/Glasshit.ogg'
hitsound = 'sound/effects/glasshit.ogg'
damage = 7
damage_type = BRUTE
code/modules/shuttle/assault_pod.dm
+1 -1
View File
@@ -13,7 +13,7 @@
/obj/docking_port/mobile/assault_pod/dock(obj/docking_port/stationary/S1)
..()
if(!istype(S1, /obj/docking_port/stationary/transit))
playsound(get_turf(src.loc), 'sound/effects/Explosion1.ogg',50,1)
playsound(get_turf(src.loc), 'sound/effects/explosion1.ogg',50,1)
code/modules/surgery/organs/organ_internal.dm
+1 -1
View File
@@ -254,7 +254,7 @@
owner.Stuttering(20)
owner.MinimumDeafTicks(30)
owner.Weaken(3)
owner << 'sound/items/AirHorn.ogg'
owner << 'sound/items/airhorn.ogg'
if(prob(30))
owner.Stun(10)
owner.Paralyse(4)
code/modules/telesci/bscrystal.dm
+2 -2
View File
@@ -11,7 +11,7 @@
var/blink_range = 8 // The teleport range when crushed/thrown at someone.
refined_type = /obj/item/stack/sheet/bluespace_crystal
toolspeed = 1
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
/obj/item/stack/ore/bluespace_crystal/New()
..()
@@ -65,7 +65,7 @@ var/global/list/datum/stack_recipe/bluespace_crystal_recipes = list(new/datum/st
materials = list(MAT_BLUESPACE = MINERAL_MATERIAL_AMOUNT)
attack_verb = list("bluespace polybashed", "bluespace polybattered", "bluespace polybludgeoned", "bluespace polythrashed", "bluespace polysmashed")
toolspeed = 1
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
/obj/item/stack/sheet/bluespace_crystal/New()
..()
code/modules/vehicle/ambulance.dm
+4 -4
View File
@@ -20,11 +20,11 @@
var/toggle_cooldown = 40
var/cooldown = 0
/datum/action/ambulance_alarm/Trigger()
if(!..())
return FALSE
var/obj/vehicle/ambulance/A = target
if(!istype(A) || !A.soundloop)
@@ -42,10 +42,10 @@
A.soundloop.stop()
A.set_light(0)
/datum/looping_sound/ambulance_alarm
start_length = 0
mid_sounds = list('sound/items/WEEOO1.ogg' = 1)
mid_sounds = list('sound/items/weeoo1.ogg' = 1)
mid_length = 14
volume = 100
sound/AI/newAI.ogg → sound/AI/newai.ogg
View File
sound/arcade/Boom.ogg → sound/arcade/boom.ogg
View File
sound/arcade/Heal.ogg → sound/arcade/heal.ogg
View File
sound/arcade/Hit.ogg → sound/arcade/hit.ogg
View File
sound/arcade/Lose.ogg → sound/arcade/lose.ogg
View File
sound/arcade/Mana.ogg → sound/arcade/mana.ogg
View File
sound/arcade/Steal.ogg → sound/arcade/steal.ogg
View File
sound/arcade/Win.ogg → sound/arcade/win.ogg
View File
sound/effects/EMPulse.ogg → sound/effects/empulse.ogg
View File
sound/effects/Explosion1.ogg → sound/effects/explosion1.ogg
View File
sound/effects/Explosion2.ogg → sound/effects/explosion2.ogg
View File
sound/effects/Glassbr1.ogg → sound/effects/glassbr1.ogg
View File
sound/effects/Glassbr2.ogg → sound/effects/glassbr2.ogg
View File

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