cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2043 316c924e-a436-60f5-8080-3fe189b3f50e

Browse Source
This commit is contained in:
LastBattaWolf@hotmail.com
2011-08-23 20:51:20 +00:00
parent ccf2162e73
commit 163f1fc216
52 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/spell.dm
+2 -2
View File
@@ -80,9 +80,9 @@ var/list/spells = typesof(/obj/proc_holder/spell) //needed for the badmin verb f
if("shout")
usr.say(invocation)
if(usr.gender=="male")
playsound(usr.loc, pick('vs_chant_conj_hm.wav','vs_chant_conj_lm.wav','vs_chant_ench_hm.wav','vs_chant_ench_lm.wav','vs_chant_evoc_hm.wav','vs_chant_evoc_lm.wav','vs_chant_illu_hm.wav','vs_chant_illu_lm.wav','vs_chant_necr_hm.wav','vs_chant_necr_lm.wav'), 100, 1)
playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1)
else
playsound(usr.loc, pick('vs_chant_conj_hf.wav','vs_chant_conj_lf.wav','vs_chant_ench_hf.wav','vs_chant_ench_lf.wav','vs_chant_evoc_hf.wav','vs_chant_evoc_lf.wav','vs_chant_illu_hf.wav','vs_chant_illu_lf.wav','vs_chant_necr_hf.wav','vs_chant_necr_lf.wav'), 100, 1)
playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1)
if("whisper")
usr.whisper(invocation)
code/datums/spells/area_teleport.dm
+2 -2
View File
@@ -54,9 +54,9 @@
if("shout")
usr.say("[invocation] [uppertext(chosenarea.name)]")
if(usr.gender=="male")
playsound(usr.loc, pick('vs_chant_conj_hm.wav','vs_chant_conj_lm.wav','vs_chant_ench_hm.wav','vs_chant_ench_lm.wav','vs_chant_evoc_hm.wav','vs_chant_evoc_lm.wav','vs_chant_illu_hm.wav','vs_chant_illu_lm.wav','vs_chant_necr_hm.wav','vs_chant_necr_lm.wav'), 100, 1)
playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1)
else
playsound(usr.loc, pick('vs_chant_conj_hf.wav','vs_chant_conj_lf.wav','vs_chant_ench_hf.wav','vs_chant_ench_lf.wav','vs_chant_evoc_hf.wav','vs_chant_evoc_lf.wav','vs_chant_illu_hf.wav','vs_chant_illu_lf.wav','vs_chant_necr_hf.wav','vs_chant_necr_lf.wav'), 100, 1)
playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1)
if("whisper")
usr.whisper("[invocation] [uppertext(chosenarea.name)]")
code/defines/obj/closet.dm
+2 -2
View File
@@ -79,7 +79,7 @@
if (isrobot(usr) || src.locked)
if(istype(O, /obj/item/device/multitool))
user << "\red Resetting circuitry..."
playsound(user, 'lockreset.wav', 50, 1)
playsound(user, 'lockreset.ogg', 50, 1)
sleep(50) // Sleeping time~
src.locked = 0
user << "\blue You disable the locking modules."
@@ -137,7 +137,7 @@
sleep(50)
src.locked = 1
user << "\blue You re-enable the locking modules."
playsound(user, 'lockenable.wav', 50, 1)
playsound(user, 'lockenable.ogg', 50, 1)
return
else
localopened = !localopened
code/game/cellautomata.dm
+9 -9
View File
@@ -122,15 +122,15 @@
//Crispy fullban
/world/Reboot(var/reason)
spawn(0)
world << sound(pick('newroundsexy.ogg','newroundsexy2.ogg')) // Skie
//if(prob(40))
// for(var/mob/M in world)
// if(M.client)
// M << sound('NewRound2.ogg')
//else
// for(var/mob/M in world)
// if(M.client)
// M << sound('NewRound.ogg')
world << sound(pick('newroundsexy.ogg','apcdestroyed.ogg')) // random end sounds!! - LastyBatsy
if(prob(40))
for(var/mob/M in world)
if(M.client)
M << sound('newroundsexy.ogg')
else
for(var/mob/M in world)
if(M.client)
M << sound('apcdestroyed.ogg')
for(var/client/C)
if (config.server) //if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite
code/game/gamemodes/wizard/wizard.dm
+2 -2
View File
@@ -663,9 +663,9 @@ Made a proc here so it's not repeated several times.*/
/mob/proc/spellvoice()
// if(!usr.miming)No longer necessary.
if(usr.gender=="male")
playsound(usr.loc, pick('vs_chant_conj_hm.wav','vs_chant_conj_lm.wav','vs_chant_ench_hm.wav','vs_chant_ench_lm.wav','vs_chant_evoc_hm.wav','vs_chant_evoc_lm.wav','vs_chant_illu_hm.wav','vs_chant_illu_lm.wav','vs_chant_necr_hm.wav','vs_chant_necr_lm.wav'), 100, 1)
playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1)
else
playsound(usr.loc, pick('vs_chant_conj_hf.wav','vs_chant_conj_lf.wav','vs_chant_ench_hf.wav','vs_chant_ench_lf.wav','vs_chant_evoc_hf.wav','vs_chant_evoc_lf.wav','vs_chant_illu_hf.wav','vs_chant_illu_lf.wav','vs_chant_necr_hf.wav','vs_chant_necr_lf.wav'), 100, 1)
playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1)
code/game/machinery/bots/ed209bot.dm
+1 -1
View File
@@ -592,7 +592,7 @@ Auto Patrol: []"},
src.target = C
src.oldtarget_name = C.name
src.speak("Level [src.threatlevel] infraction alert!")
playsound(src.loc, pick('ed209_20sec.ogg', 'ed209_15sec.ogg'), 50, 0)
playsound(src.loc, pick('ed209_20sec.ogg', 'EDPlaceholder.ogg'), 50, 0)
src.visible_message("<b>[src]</b> points at [C.name]!")
mode = SECBOT_HUNT
spawn(0)
code/game/objects/items/weapons/guns_new.dm
+2 -2
View File
@@ -1078,7 +1078,7 @@
desc = "A heavy-duty laser cannon."
icon_state = "lasercannon"
force = 15
fire_sound = 'lasercannonfire.wav'
fire_sound = 'lasercannonfire.ogg'
origin_tech = "combat=4;materials=3;powerstorage=3"
load_into_chamber()
if(in_chamber)
@@ -1098,7 +1098,7 @@
switch(mode)
if(0)
user << "\red [src.name] is now set to laser cannon."
fire_sound = 'lasercannonfire.wav'
fire_sound = 'lasercannonfire.ogg'
charge_cost = 100
if(1)
user << "\red [src.name] is now set to laser."
code/game/objects/items/weapons/kitchen.dm
+4 -4
View File
@@ -98,10 +98,10 @@ KNIFE
M.weakened += 1
user.take_organ_damage(2)
if(prob(50))
playsound(M, 'trayhit1.wav', 50, 1)
playsound(M, 'trayhit1.ogg', 50, 1)
return
else
playsound(M, 'trayhit2.wav', 50, 1) //sound playin'
playsound(M, 'trayhit2.ogg', 50, 1) //sound playin'
return //it always returns, but I feel like adding an extra return just for safety's sakes. EDIT; Oh well I won't :3
var/mob/living/carbon/human/H = M ///////////////////////////////////// /Let's have this ready for later.
@@ -175,11 +175,11 @@ KNIFE
location.add_blood(H)
if(prob(50))
// playsound(M, 'trayhit1.wav', 50, 1)
// playsound(M, 'trayhit1.ogg', 50, 1)
for(var/mob/O in viewers(M, null))
O.show_message(text("\red <B>[] slams [] in the face with the tray!</B>", user, M), 1)
else
//playsound(M, 'trayhit2.wav', 50, 1) //sound playin' again
//playsound(M, 'trayhit2.ogg', 50, 1) //sound playin' again
for(var/mob/O in viewers(M, null))
O.show_message(text("\red <B>[] slams [] in the face with the tray!</B>", user, M), 1)
if(prob(30))
code/game/objects/mineral_doors.dm
+2 -2
View File
@@ -69,7 +69,7 @@
proc/Open()
isSwitchingStates = 1
playsound(loc, 'stonedoor_openclose.wav', 100, 1)
playsound(loc, 'stonedoor_openclose.ogg', 100, 1)
flick("[mineralType]opening",src)
sleep(10)
density = 0
@@ -80,7 +80,7 @@
proc/Close()
isSwitchingStates = 1
playsound(loc, 'stonedoor_openclose.wav', 100, 1)
playsound(loc, 'stonedoor_openclose.ogg', 100, 1)
flick("[mineralType]closing",src)
sleep(10)
density = 1
code/game/sound.dm
+1 -1
View File
@@ -87,7 +87,7 @@ client/verb/Toggle_Soundscape()
if ("Engine Control") sound = pick('ambisin1.ogg','ambisin2.ogg','ambisin3.ogg','ambisin4.ogg')
if ("Atmospherics") sound = pick('ambiatm1.ogg')
if ("Mine")
sound = pick('ambimine1.ogg','ambimine2.ogg')
sound = pick('null.ogg','null.ogg')
musVolume = 60
else sound = pick('ambigen1.ogg','ambigen3.ogg','ambigen4.ogg','ambigen5.ogg','ambigen6.ogg','ambigen7.ogg','ambigen8.ogg','ambigen9.ogg','ambigen10.ogg','ambigen11.ogg','ambigen12.ogg','ambigen14.ogg')