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

Gonna have to clean some files after this.

Browse Source
This commit is contained in:
Aurorablade
2019-01-19 22:38:47 -05:00
parent 86d2a1634c
commit 4fc35a68b1
138 changed files with 184 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_globalvars/lists/flavor_misc.dm
+1 -1
View File
@@ -27,7 +27,7 @@ GLOBAL_LIST_INIT(socks_f, list()) //stores only socks name
//Alt Heads
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', \
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'))
code/datums/spells/area_teleport.dm
+5 -5
View File
@@ -2,13 +2,13 @@
name = "Area teleport"
desc = "This spell teleports you to a type of area of your selection."
nonabstract_req = 1
var/randomise_selection = 0 //if it lets the usr choose the teleport loc or picks it from the list
var/invocation_area = 1 //if the invocation appends the selected area
var/sound1 = 'sound/weapons/ZapBang.ogg'
var/sound2 = 'sound/weapons/ZapBang.ogg'
var/sound1 = 'sound/weapons/zapbang.ogg'
var/sound2 = 'sound/weapons/zapbang.ogg'
/obj/effect/proc_holder/spell/targeted/area_teleport/perform(list/targets, recharge = 1, mob/living/user = usr)
var/thearea = before_cast(targets)
if(!thearea || !cast_check(1))
code/datums/spells/ethereal_jaunt.dm
+2 -2
View File
@@ -21,7 +21,7 @@
action_icon_state = "jaunt"
/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/cast(list/targets, mob/user = usr) //magnets, so mostly hardcoded
playsound(get_turf(user), 'sound/magic/Ethereal_Enter.ogg', 50, 1, -1)
playsound(get_turf(user), 'sound/magic/ethereal_enter.ogg', 50, 1, -1)
for(var/mob/living/target in targets)
if(!target.can_safely_leave_loc()) // No more brainmobs hopping out of their brains
to_chat(target, "<span class='warning'>You are somehow too bound to your current location to abandon it.</span>")
@@ -48,7 +48,7 @@
jaunt_steam(mobloc)
target.canmove = 0
holder.reappearing = 1
playsound(get_turf(target), 'sound/magic/Ethereal_Exit.ogg', 50, 1, -1)
playsound(get_turf(target), 'sound/magic/ethereal_exit.ogg', 50, 1, -1)
sleep(25 - jaunt_in_time)
new jaunt_in_type(mobloc, holder.dir)
target.setDir(holder.dir)
code/datums/spells/horsemask.dm
+1 -1
View File
@@ -45,4 +45,4 @@
qdel(target.wear_mask)
target.equip_to_slot_if_possible(magichead, slot_wear_mask, 1, 1)
target.flash_eyes()
target.flash_eyes()
code/datums/spells/knock.dm
+1 -1
View File
@@ -11,7 +11,7 @@
cooldown_min = 20 //20 deciseconds reduction per rank
action_icon_state = "knock"
sound = 'sound/magic/Knock.ogg'
sound = 'sound/magic/knock.ogg'
/obj/effect/proc_holder/spell/aoe_turf/knock/cast(list/targets, mob/user = usr)
for(var/turf/T in targets)
code/datums/spells/lightning.dm
+2 -2
View File
@@ -96,7 +96,7 @@ obj/effect/proc_holder/spell/targeted/lightning/proc/Reset(mob/user = usr)
current.Slowed(3)
spawn(20)
current.AdjustJitter(-1000, bound_lower = 10) //Still jittery, but vastly less
playsound(get_turf(current), 'sound/magic/LightningShock.ogg', 50, 1, -1)
playsound(get_turf(current), 'sound/magic/lightningshock.ogg', 50, 1, -1)
else
if(damaging)
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)
current.Slowed(3)
spawn(20)
current.AdjustJitter(-1000, bound_lower = 10) //Still jittery, but vastly less
playsound(get_turf(current), 'sound/magic/LightningShock.ogg', 50, 1, -1)
playsound(get_turf(current), 'sound/magic/lightningshock.ogg', 50, 1, -1)
var/list/possible_targets = new
for(var/mob/living/M in view_or_range(range,target,"view"))
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
View File
@@ -96,7 +96,7 @@
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!
break
item_to_retrive = item_to_retrive.loc
infinite_recursion += 1
if(!item_to_retrive)
@@ -116,10 +116,10 @@
if(butterfingers)
item_to_retrive.loc = target.loc
item_to_retrive.loc.visible_message("<span class='caution'>The [item_to_retrive.name] suddenly appears!</span>")
playsound(get_turf(target),'sound/magic/SummonItems_generic.ogg',50,1)
playsound(get_turf(target),'sound/magic/summonitems_generic.ogg',50,1)
else
item_to_retrive.loc.visible_message("<span class='caution'>The [item_to_retrive.name] suddenly appears in [target]'s hand!</span>")
playsound(get_turf(target),'sound/magic/SummonItems_generic.ogg',50,1)
playsound(get_turf(target),'sound/magic/summonitems_generic.ogg',50,1)
if(message)
to_chat(target, message)
code/datums/spells/turf_teleport.dm
+3 -3
View File
@@ -8,9 +8,9 @@
var/include_space = 0 //whether it includes space tiles in possible teleport locations
var/include_dense = 0 //whether it includes dense tiles in possible teleport locations
var/sound1 = 'sound/weapons/ZapBang.ogg'
var/sound2 = 'sound/weapons/ZapBang.ogg'
var/sound1 = 'sound/weapons/zapbang.ogg'
var/sound2 = 'sound/weapons/zapbang.ogg'
/obj/effect/proc_holder/spell/targeted/turf_teleport/cast(list/targets,mob/living/user = usr)
playsound(get_turf(user), sound1, 50,1)
code/datums/spells/wizard.dm
+16 -16
View File
@@ -26,11 +26,11 @@
action_icon_state = "magicm"
sound = 'sound/magic/MAGIC_MISSILE.ogg'
sound = 'sound/magic/magic_missile.ogg'
/obj/effect/proc_holder/spell/targeted/inflict_handler/magic_missile
amt_weakened = 3
sound = 'sound/magic/MM_Hit.ogg'
sound = 'sound/magic/mm_hit.ogg'
/obj/effect/proc_holder/spell/noclothes
name = "No Clothes"
@@ -55,7 +55,7 @@
cooldown_min = 300 //25 deciseconds reduction per rank
action_icon_state = "mutate"
sound = 'sound/magic/Mutate.ogg'
sound = 'sound/magic/mutate.ogg'
/obj/effect/proc_holder/spell/targeted/genetic/mutate/cast(list/targets, mob/user = usr)
for(var/mob/living/target in targets)
@@ -98,7 +98,7 @@
emp_heavy = 6
emp_light = 10
sound = 'sound/magic/Disable_Tech.ogg'
sound = 'sound/magic/disable_tech.ogg'
/obj/effect/proc_holder/spell/targeted/turf_teleport/blink
name = "Blink"
@@ -145,8 +145,8 @@
action_icon_state = "spell_teleport"
sound1 = 'sound/magic/Teleport_diss.ogg'
sound2 = 'sound/magic/Teleport_app.ogg'
sound1 = 'sound/magic/teleport_diss.ogg'
sound2 = 'sound/magic/teleport_app.ogg'
/obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall
name = "Forcewall"
@@ -164,7 +164,7 @@
summon_lifespan = 300
action_icon_state = "shield"
cast_sound = 'sound/magic/ForceWall.ogg'
cast_sound = 'sound/magic/forcewall.ogg'
/obj/effect/proc_holder/spell/targeted/forcewall
name = "Greater Forcewall"
@@ -175,7 +175,7 @@
clothes_req = FALSE
invocation = "TARCOL MINTI ZHERI"
invocation_type = "shout"
sound = 'sound/magic/ForceWall.ogg'
sound = 'sound/magic/forcewall.ogg'
action_icon_state = "shield"
range = -1
include_user = TRUE
@@ -219,7 +219,7 @@
summon_type = list(/mob/living/simple_animal/hostile/carp)
cast_sound = 'sound/magic/Summon_Karp.ogg'
cast_sound = 'sound/magic/summon_karp.ogg'
/obj/effect/proc_holder/spell/aoe_turf/conjure/construct
name = "Artificer"
@@ -235,7 +235,7 @@
summon_type = list(/obj/structure/constructshell)
action_icon_state = "artificer"
cast_sound = 'sound/magic/SummonItems_generic.ogg'
cast_sound = 'sound/magic/summonitems_generic.ogg'
/obj/effect/proc_holder/spell/aoe_turf/conjure/creature
name = "Summon Creature Swarm"
@@ -250,7 +250,7 @@
range = 3
summon_type = list(/mob/living/simple_animal/hostile/creature)
cast_sound = 'sound/magic/SummonItems_generic.ogg'
cast_sound = 'sound/magic/summonitems_generic.ogg'
/obj/effect/proc_holder/spell/targeted/trigger/blind
name = "Blind"
@@ -271,12 +271,12 @@
/obj/effect/proc_holder/spell/targeted/inflict_handler/blind
amt_eye_blind = 10
amt_eye_blurry = 20
sound = 'sound/magic/Blind.ogg'
sound = 'sound/magic/blind.ogg'
/obj/effect/proc_holder/spell/targeted/genetic/blind
disabilities = BLIND
duration = 300
sound = 'sound/magic/Blind.ogg'
sound = 'sound/magic/blind.ogg'
/obj/effect/proc_holder/spell/fireball
name = "Fireball"
@@ -291,7 +291,7 @@
cooldown_min = 20 //10 deciseconds reduction per rank
var/fireball_type = /obj/item/projectile/magic/fireball
action_icon_state = "fireball0"
sound = 'sound/magic/Fireball.ogg'
sound = 'sound/magic/fireball.ogg'
active = FALSE
@@ -362,7 +362,7 @@
var/maxthrow = 5
var/sparkle_path = /obj/effect/temp_visual/gravpush
action_icon_state = "repulse"
sound = 'sound/magic/Repulse.ogg'
sound = 'sound/magic/repulse.ogg'
/obj/effect/proc_holder/spell/aoe_turf/repulse/cast(list/targets, mob/user = usr)
var/list/thrownatoms = list()
@@ -407,7 +407,7 @@
include_user = 1
selection_type = "view"
action_icon_state = "sacredflame"
sound = 'sound/magic/Fireball.ogg'
sound = 'sound/magic/fireball.ogg'
/obj/effect/proc_holder/spell/targeted/sacred_flame/cast(list/targets, mob/user = usr)
for(var/mob/living/L in targets)
code/game/gamemodes/cult/runes.dm
+1 -1
View File
@@ -471,7 +471,7 @@ var/list/teleport_runes = list()
playsound(T, 'sound/effects/EMPulse.ogg', 100, 1)
T.dust() //To prevent the MMI from remaining
else
playsound(T, 'sound/magic/Disintegrate.ogg', 100, 1)
playsound(T, 'sound/magic/disintegrate.ogg', 100, 1)
T.gib()
rune_in_use = 0
code/game/gamemodes/cult/talisman.dm
+2 -2
View File
@@ -340,7 +340,7 @@
if(target.use(25))
new /obj/structure/constructshell(T)
to_chat(user, "<span class='warning'>The talisman clings to the metal and twists it into a construct shell!</span>")
user << sound('sound/magic/Staff_Chaos.ogg',0,1,25)
user << sound('sound/magic/staff_chaos.ogg',0,1,25)
qdel(src)
return
if(istype(target, /obj/item/stack/sheet/plasteel))
@@ -350,7 +350,7 @@
new /obj/item/stack/sheet/runed_metal(T,quantity)
target.use(quantity)
to_chat(user, "<span class='warning'>The talisman clings to the plasteel, transforming it into runed metal!</span>")
user << sound('sound/magic/Staff_Chaos.ogg',0,1,25)
user << sound('sound/magic/staff_chaos.ogg',0,1,25)
invoke(user, 1)
if(uses <= 0)
qdel(src)
code/game/gamemodes/gameticker.dm
+3 -3
View File
@@ -43,9 +43,9 @@ var/round_start_time = 0
login_music = pick(\
'sound/music/THUNDERDOME.ogg',\
'sound/music/space.ogg',\
'sound/music/Title1.ogg',\
'sound/music/Title2.ogg',\
'sound/music/Title3.ogg',)
'sound/music/title1.ogg',\
'sound/music/title2.ogg',\
'sound/music/title3.ogg',)
do
pregame_timeleft = config.pregame_timestart
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
View File
@@ -457,7 +457,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
if(ishuman(L))
var/mob/living/carbon/human/H = L
if(H.check_shields(0, "[user]'s [name]", src, MELEE_ATTACK))
playsound(L, 'sound/weapons/Genhit.ogg', 50, 1)
playsound(L, 'sound/weapons/genhit.ogg', 50, 1)
return 0
switch(mode)
@@ -487,7 +487,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
L.visible_message("<span class='danger'>[user] has stunned [L] with [src]!</span>", \
"<span class='userdanger'>[user] has stunned you with [src]!</span>")
playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
if(ishuman(L))
var/mob/living/carbon/human/H = L
@@ -499,7 +499,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
if(L.stunned || L.sleeping)
L.visible_message("<span class='danger'>[user] has induced sleep in [L] with [src]!</span>", \
"<span class='userdanger'>You suddenly feel very drowsy!</span>")
playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
L.Sleeping(60)
add_attack_logs(user, L, "Put to sleep with [src]")
else
code/game/gamemodes/miniantags/morph/morph_event.dm
+1 -1
View File
@@ -23,7 +23,7 @@
player_mind.special_role = SPECIAL_ROLE_MORPH
ticker.mode.traitors |= player_mind
to_chat(S, S.playstyle_string)
S << 'sound/magic/Mutate.ogg'
S << 'sound/magic/mutate.ogg'
message_admins("[key_of_morph] has been made into morph by an event.")
log_game("[key_of_morph] was spawned as a morph by an event.")
return 1
code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm
+1 -1
View File
@@ -64,7 +64,7 @@
var/mob/living/simple_animal/slaughter/SD = src
sound = SD.feast_sound
else
sound = 'sound/misc/Demon_consume.ogg'
sound = 'sound/misc/demon_consume.ogg'
for(var/i in 1 to 3)
playsound(get_turf(src), sound, 100, 1)
code/game/gamemodes/miniantags/slaughter/slaughter.dm
+2 -2
View File
@@ -18,7 +18,7 @@
stop_automated_movement = 1
status_flags = CANPUSH
attack_sound = 'sound/misc/demon_attack1.ogg'
var/feast_sound = 'sound/misc/Demon_consume.ogg'
var/feast_sound = 'sound/misc/demon_consume.ogg'
death_sound = 'sound/misc/demon_dies.ogg'
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)
minbodytemp = 0
@@ -248,7 +248,7 @@
/obj/item/organ/internal/heart/demon/attack_self(mob/living/user)
user.visible_message("<span class='warning'>[user] raises [src] to [user.p_their()] mouth and tears into it with [user.p_their()] teeth!</span>", \
"<span class='danger'>An unnatural hunger consumes you. You raise [src] to your mouth and devour it!</span>")
playsound(user, 'sound/misc/Demon_consume.ogg', 50, 1)
playsound(user, 'sound/misc/demon_consume.ogg', 50, 1)
for(var/obj/effect/proc_holder/spell/knownspell in user.mind.spell_list)
if(knownspell.type == /obj/effect/proc_holder/spell/bloodcrawl)
qdel(src)
code/game/gamemodes/shadowling/shadowling.dm
+1 -1
View File
@@ -249,7 +249,7 @@ Made by Xhuis
return
M.visible_message("<span class='warning'>[M] suddenly bloats and explodes!</span>", \
"<span class='warning'><b>AAAAAAAAA<font size=3>AAAAAAAAAAAAA</font><font size=4>AAAAAAAAAAAA----</font></span>")
playsound(M, 'sound/magic/Disintegrate.ogg', 100, 1)
playsound(M, 'sound/magic/disintegrate.ogg', 100, 1)
M.gib()
/datum/game_mode/shadowling/proc/check_shadow_victory()
code/game/gamemodes/shadowling/shadowling_abilities.dm
+5 -5
View File
@@ -638,7 +638,7 @@
return
to_chat(user, "<span class='shadowling'><b><i>You release a massive surge of power into [thrallToRevive]!</b></i></span>")
user.visible_message("<span class='boldannounce'><i>Red lightning surges into [thrallToRevive]'s face!</i></span>")
playsound(thrallToRevive, 'sound/weapons/Egloves.ogg', 50, 1)
playsound(thrallToRevive, 'sound/weapons/egloves.ogg', 50, 1)
playsound(thrallToRevive, 'sound/machines/defib_zap.ogg', 50, 1)
user.Beam(thrallToRevive,icon_state="red_lightning",icon='icons/effects/effects.dmi',time=1)
thrallToRevive.Weaken(5)
@@ -670,7 +670,7 @@
return
to_chat(user, "<span class='shadowling'><b><i>You release a massive surge of power into [thrallToRevive]!</b></i></span>")
user.visible_message("<span class='boldannounce'><i>Red lightning surges from [user]'s hands into [thrallToRevive]'s chest!</i></span>")
playsound(thrallToRevive, 'sound/weapons/Egloves.ogg', 50, 1)
playsound(thrallToRevive, 'sound/weapons/egloves.ogg', 50, 1)
playsound(thrallToRevive, 'sound/machines/defib_zap.ogg', 50, 1)
user.Beam(thrallToRevive,icon_state="red_lightning",icon='icons/effects/effects.dmi',time=1)
sleep(10)
@@ -750,7 +750,7 @@
charge_counter = charge_max
return
playsound(user.loc, 'sound/magic/Staff_Chaos.ogg', 100, 1)
playsound(user.loc, 'sound/magic/staff_chaos.ogg', 100, 1)
for(var/mob/living/boom in targets)
if(is_shadow(boom)) //Used to not work on thralls. Now it does so you can PUNISH THEM LIKE THE WRATHFUL GOD YOU ARE.
to_chat(user, "<span class='warning'>Making an ally explode seems unwise.</span>")
@@ -760,7 +760,7 @@
"<span class='shadowling'>You direct a lance of telekinetic energy at [boom].</span>")
sleep(4)
if(iscarbon(boom))
playsound(boom, 'sound/magic/Disintegrate.ogg', 100, 1)
playsound(boom, 'sound/magic/disintegrate.ogg', 100, 1)
boom.visible_message("<span class='userdanger'>[boom] explodes!</span>")
boom.gib()
@@ -859,7 +859,7 @@
if(is_shadow_or_thrall(target))
continue
to_chat(target, "<span class='userdanger'>You are struck by a bolt of lightning!</span>")
playsound(target, 'sound/magic/LightningShock.ogg', 50, 1)
playsound(target, 'sound/magic/lightningshock.ogg', 50, 1)
target.Weaken(8)
target.take_organ_damage(0,50)
user.Beam(target,icon_state="red_lightning",icon='icons/effects/effects.dmi',time=1)
code/game/gamemodes/vampire/vampire_powers.dm
+1 -1
View File
@@ -550,7 +550,7 @@
range = 3
cooldown_min = 20
action_icon_state = "revive_thrall"
sound = 'sound/magic/WandODeath.ogg'
sound = 'sound/magic/wandodeath.ogg'
/obj/effect/proc_holder/spell/targeted/raise_vampires/cast(list/targets, mob/user = usr)
new /obj/effect/temp_visual/cult/sparks(user.loc)
code/game/gamemodes/wizard/godhand.dm
+3 -3
View File
@@ -40,7 +40,7 @@
name = "disintegrating touch"
desc = "This hand of mine glows with an awesome power!"
catchphrase = "EI NATH!!"
on_use_sound = 'sound/magic/Disintegrate.ogg'
on_use_sound = 'sound/magic/disintegrate.ogg'
icon_state = "disintegrate"
item_state = "disintegrate"
@@ -56,7 +56,7 @@
name = "petrifying touch"
desc = "That's the bottom line, because flesh to stone said so!"
catchphrase = "STAUN EI!!"
on_use_sound = 'sound/magic/FleshToStone.ogg'
on_use_sound = 'sound/magic/fleshtostone.ogg'
icon_state = "fleshtostone"
item_state = "fleshtostone"
@@ -75,7 +75,7 @@
name = "toy plastic hand"
desc = "This hand of mine glows with an awesome power! Ok, maybe just batteries."
catchphrase = "EI NATH!!"
on_use_sound = 'sound/magic/Disintegrate.ogg'
on_use_sound = 'sound/magic/disintegrate.ogg'
icon_state = "disintegrate"
item_state = "disintegrate"
code/game/gamemodes/wizard/rightandwrong.dm
+4 -4
View File
@@ -88,8 +88,8 @@
new /obj/item/gun/projectile/revolver/grenadelauncher(get_turf(H))
if("medibeam")
new /obj/item/gun/medbeam(get_turf(H))
playsound(get_turf(H), 'sound/magic/Summon_guns.ogg', 50, 1)
playsound(get_turf(H), 'sound/magic/summon_guns.ogg', 50, 1)
else
switch(randomizemagic)
if("fireball")
@@ -157,5 +157,5 @@
if("necromantic")
new /obj/item/necromantic_stone(get_turf(H))
to_chat(H, "<span class='notice'>You suddenly feel lucky.</span>")
playsound(get_turf(H), 'sound/magic/Summon_Magic.ogg', 50, 1)
playsound(get_turf(H), 'sound/magic/summon_magic.ogg', 50, 1)
code/game/machinery/computer/arcade.dm
+3 -3
View File
@@ -476,7 +476,7 @@
M.Weaken(3)
atom_say("A sudden gust of powerful wind slams [M] into the floor!")
M.take_organ_damage(25)
playsound(src.loc, 'sound/weapons/Genhit.ogg', 100, 1)
playsound(src.loc, 'sound/weapons/genhit.ogg', 100, 1)
else
to_chat(M, "<span class='userdanger'>A violent gale blows past you, and you barely manage to stay standing!</span>")
if(ORION_TRAIL_COLLISION) //by far the most damaging event
@@ -489,7 +489,7 @@
if(hull)
sleep(10)
atom_say("A new floor suddenly appears around [src]. What the hell?")
playsound(src.loc, 'sound/weapons/Genhit.ogg', 100, 1)
playsound(src.loc, 'sound/weapons/genhit.ogg', 100, 1)
var/turf/space/T
for(T in orange(1, src))
T.ChangeTurf(/turf/simulated/floor/plating/)
@@ -573,7 +573,7 @@
else if(href_list["killcrew"]) //shoot a crewmember
var/sheriff = remove_crewmember() //I shot the sheriff
playsound(loc,'sound/weapons/Gunshot.ogg', 100, 1)
playsound(loc,'sound/weapons/gunshot.ogg', 100, 1)
if(settlers.len == 0 || alive == 0)
atom_say("The last crewmember [sheriff], shot themselves, GAME OVER!")
code/game/machinery/portable_turret.dm
+6 -6
View File
@@ -140,21 +140,21 @@
if(/obj/item/gun/energy/taser)
eprojectile = /obj/item/projectile/beam
eshot_sound = 'sound/weapons/Laser.ogg'
eshot_sound = 'sound/weapons/laser.ogg'
if(/obj/item/gun/energy/gun)
eprojectile = /obj/item/projectile/beam //If it has, going to kill mode
eshot_sound = 'sound/weapons/Laser.ogg'
eshot_sound = 'sound/weapons/laser.ogg'
egun = 1
if(/obj/item/gun/energy/gun/nuclear)
eprojectile = /obj/item/projectile/beam //If it has, going to kill mode
eshot_sound = 'sound/weapons/Laser.ogg'
eshot_sound = 'sound/weapons/laser.ogg'
egun = 1
if(/obj/item/gun/energy/gun/turret)
eprojectile = /obj/item/projectile/beam //If it has, going to copypaste mode
eshot_sound = 'sound/weapons/Laser.ogg'
eshot_sound = 'sound/weapons/laser.ogg'
egun = 1
if(/obj/item/gun/energy/pulse/turret)
@@ -986,8 +986,8 @@ var/list/turret_icons
// So, nothing, not even emagging them, makes them switch bullet type.
// So, its best to always have their projectile and eprojectile settings be the same. That way, you know what they will shoot.
// Otherwise, you end up with situations where one of the two bullet types will never be used.
shot_sound = 'sound/weapons/Gunshot.ogg'
eshot_sound = 'sound/weapons/Gunshot.ogg'
shot_sound = 'sound/weapons/gunshot.ogg'
eshot_sound = 'sound/weapons/gunshot.ogg'
icon_state = "syndieturret0"
var/icon_state_initial = "syndieturret0"
code/game/machinery/turntable.dm
+4 -4
View File
@@ -1,5 +1,5 @@
/sound/turntable/test
file = 'sound/turntable/TestLoop1.ogg'
file = 'sound/turntable/testloop1.ogg'
falloff = 2
repeat = 1
@@ -44,7 +44,7 @@
if( href_list["on1"] )
if(src.playing == 0)
// to_chat(world, "Should be working...")
var/sound/S = sound('sound/turntable/TestLoop1.ogg')
var/sound/S = sound('sound/turntable/testloop1.ogg')
S.repeat = 1
S.channel = 10
S.falloff = 2
@@ -76,7 +76,7 @@
if( href_list["on2"] )
if(src.playing == 0)
// to_chat(world, "Should be working...")
var/sound/S = sound('sound/turntable/TestLoop2.ogg')
var/sound/S = sound('sound/turntable/testloop2.ogg')
S.repeat = 1
S.channel = 10
S.falloff = 2
@@ -107,7 +107,7 @@
if( href_list["on3"] )
if(src.playing == 0)
// to_chat(world, "Should be working...")
var/sound/S = sound('sound/turntable/TestLoop3.ogg')
var/sound/S = sound('sound/turntable/testloop3.ogg')
S.repeat = 1
S.channel = 10
S.falloff = 2
code/game/mecha/equipment/weapons/weapons.dm
+8 -8
View File
@@ -76,7 +76,7 @@
origin_tech = "magnets=3;combat=3;engineering=3"
energy_drain = 30
projectile = /obj/item/projectile/beam
fire_sound = 'sound/weapons/Laser.ogg'
fire_sound = 'sound/weapons/laser.ogg'
/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/disabler
name = "CH-PD Disabler"
@@ -101,7 +101,7 @@
origin_tech = "materials=4;combat=5;magnets=4"
energy_drain = 120
projectile = /obj/item/projectile/ion
fire_sound = 'sound/weapons/Laser.ogg'
fire_sound = 'sound/weapons/laser.ogg'
/obj/item/mecha_parts/mecha_equipment/weapon/energy/tesla
equip_cooldown = 35
@@ -178,7 +178,7 @@
energy_drain = 20
equip_cooldown = 8
projectile = /obj/item/projectile/energy/electrode
fire_sound = 'sound/weapons/Taser.ogg'
fire_sound = 'sound/weapons/taser.ogg'
size = 1
/obj/item/mecha_parts/mecha_equipment/weapon/honker
@@ -276,13 +276,13 @@
origin_tech = "materials=4;combat=4"
equip_cooldown = 5
projectile = /obj/item/projectile/bullet/incendiary/shell/dragonsbreath
fire_sound = 'sound/weapons/Gunshot.ogg'
fire_sound = 'sound/weapons/gunshot.ogg'
projectiles = 24
projectile_energy_cost = 15
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine/silenced
name = "\improper S.H.H. \"Quietus\" Carbine"
fire_sound = 'sound/weapons/Gunshot_silenced.ogg'
fire_sound = 'sound/weapons/gunshot_silenced.ogg'
icon_state = "mecha_mime"
equip_cooldown = 15
projectile = /obj/item/projectile/bullet/mime
@@ -301,7 +301,7 @@
origin_tech = "combat=4"
equip_cooldown = 20
projectile = /obj/item/projectile/bullet/midbullet
fire_sound = 'sound/weapons/Gunshot.ogg'
fire_sound = 'sound/weapons/gunshot.ogg'
projectiles = 40
projectile_energy_cost = 25
projectiles_per_shot = 4
@@ -313,7 +313,7 @@
origin_tech = "combat=4"
equip_cooldown = 10
projectile = /obj/item/projectile/bullet/weakbullet3
fire_sound = 'sound/weapons/Gunshot.ogg'
fire_sound = 'sound/weapons/gunshot.ogg'
projectiles = 300
projectile_energy_cost = 20
projectiles_per_shot = 3
@@ -516,7 +516,7 @@
energy_drain = 30
origin_tech = "materials=3;plasmatech=4;engineering=3"
projectile = /obj/item/projectile/plasma/adv/mech
fire_sound = 'sound/weapons/Laser.ogg'
fire_sound = 'sound/weapons/laser.ogg'
/obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma/can_attach(obj/mecha/M as obj)
if(istype(M, /obj/mecha/working))
code/game/objects/items/cardboard_cutouts.dm
+2 -2
View File
@@ -18,7 +18,7 @@
if(user.a_intent == INTENT_HELP || pushed_over)
return ..()
user.visible_message("<span class='warning'>[user] pushes over [src]!</span>", "<span class='danger'>You push over [src]!</span>")
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
push_over()
/obj/item/cardboard_cutout/proc/push_over()
@@ -85,7 +85,7 @@
return
if(pushed_over)
to_chat(user, "<span class='warning'>Right [src] first!</span>")
return
return
if(!new_appearance || !crayon)
return
if(!do_after(user, 10, FALSE, src, TRUE))
code/game/objects/items/latexballoon.dm
+1 -1
View File
@@ -28,7 +28,7 @@
/obj/item/latexballon/proc/burst()
if(!air_contents || icon_state != "latexballon_blow")
return
playsound(src, 'sound/weapons/Gunshot.ogg', 100, 1)
playsound(src, 'sound/weapons/gunshot.ogg', 100, 1)
icon_state = "latexballon_bursted"
item_state = "lgloves"
if(isliving(loc))
code/game/objects/items/robot/robot_items.dm
+2 -2
View File
@@ -13,7 +13,7 @@
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.check_shields(0, "[M]'s [name]", src, MELEE_ATTACK))
playsound(M, 'sound/weapons/Genhit.ogg', 50, 1)
playsound(M, 'sound/weapons/genhit.ogg', 50, 1)
return 0
if(isrobot(user))
@@ -28,7 +28,7 @@
M.visible_message("<span class='danger'>[user] has prodded [M] with [src]!</span>", \
"<span class='userdanger'>[user] has prodded you with [src]!</span>")
playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
add_attack_logs(user, M, "Stunned with [src] (INTENT: [uppertext(user.a_intent)])")
/obj/item/borg/overdrive
code/game/objects/items/toys.dm
+2 -2
View File
@@ -1344,7 +1344,7 @@ obj/item/toy/cards/deck/syndicate/black
/obj/item/toy/russian_revolver/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] quickly loads six bullets into [src]'s cylinder and points it at [user.p_their()] head before pulling the trigger! It looks like [user.p_theyre()] trying to commit suicide.</span>")
playsound(loc, 'sound/weapons/Gunshot.ogg', 50, 1)
playsound(loc, 'sound/weapons/gunshot.ogg', 50, 1)
return (BRUTELOSS)
/obj/item/toy/russian_revolver/New()
@@ -1378,7 +1378,7 @@ obj/item/toy/cards/deck/syndicate/black
return
else
bullet_position = null
playsound(src, 'sound/weapons/Gunshot.ogg', 50, 1)
playsound(src, 'sound/weapons/gunshot.ogg', 50, 1)
user.visible_message("<span class='danger'>[src] goes off!</span>")
user.apply_damage(200, BRUTE, "head", sharp = 1, used_weapon = "Self-inflicted gunshot wound to the head.")
user.death()
code/game/objects/items/weapons/stunbaton.dm
+2 -2
View File
@@ -169,7 +169,7 @@
if(check_martial_counter(L, user))
return
if(H.check_shields(0, "[user]'s [name]", src, MELEE_ATTACK)) //No message; check_shields() handles that
playsound(L, 'sound/weapons/Genhit.ogg', 50, 1)
playsound(L, 'sound/weapons/genhit.ogg', 50, 1)
return
L.Stun(stunforce)
@@ -182,7 +182,7 @@
L.visible_message("<span class='danger'>[user] has stunned [L] with [src]!</span>", \
"<span class='userdanger'>[user] has stunned you with [src]!</span>")
add_attack_logs(user, L, "stunned")
playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
deductcharge(hitcost)
code/game/objects/items/weapons/twohanded.dm
+1 -1
View File
@@ -405,7 +405,7 @@
/obj/structure/headspear/attack_hand(mob/living/user)
user.visible_message("<span class='warning'>[user] kicks over [src]!</span>", "<span class='danger'>You kick down [src]!</span>")
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
var/turf/T = get_turf(src)
if(contained_spear)
contained_spear.forceMove(T)
code/game/objects/items/weapons/weaponry.dm
+1 -1
View File
@@ -191,7 +191,7 @@ obj/item/wirerod/attackby(obj/item/I, mob/user, params)
user.visible_message("<span class='userdanger'>It's a home run!</span>")
target.throw_at(throw_target, rand(8,10), 14, user)
target.ex_act(2)
playsound(get_turf(src), 'sound/weapons/HOMERUN.ogg', 100, 1)
playsound(get_turf(src), 'sound/weapons/homerun.ogg', 100, 1)
homerun_ready = 0
return
else
code/game/objects/structures/grille.dm
+1 -1
View File
@@ -272,7 +272,7 @@
var/turf/T = get_turf(src)
var/obj/structure/cable/C = T.get_cable_node()
if(C)
playsound(loc, 'sound/magic/LightningShock.ogg', 100, 1, extrarange = 5)
playsound(loc, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5)
tesla_zap(src, 3, C.powernet.avail * 0.01) //Zap for 1/100 of the amount of power. At a million watts in the grid, it will be as powerful as a tesla revolver shot.
C.powernet.load += C.powernet.avail * 0.0375 // you can gain up to 3.5 via the 4x upgrades power is halved by the pole so thats 2x then 1X then .5X for 3.5x the 3 bounces shock.
return ..()
code/game/sound.dm
+1 -1
View File
@@ -135,7 +135,7 @@
if("pageturn")
soundin = pick('sound/effects/pageturn1.ogg', 'sound/effects/pageturn2.ogg','sound/effects/pageturn3.ogg')
if("gunshot")
soundin = pick('sound/weapons/Gunshot.ogg', 'sound/weapons/Gunshot2.ogg','sound/weapons/Gunshot3.ogg','sound/weapons/Gunshot4.ogg')
soundin = pick('sound/weapons/gunshot.ogg', 'sound/weapons/gunshot2.ogg','sound/weapons/gunshot3.ogg','sound/weapons/gunshot4.ogg')
if("computer_ambience")
soundin = pick('sound/goonstation/machines/ambicomp1.ogg', 'sound/goonstation/machines/ambicomp2.ogg', 'sound/goonstation/machines/ambicomp3.ogg')
if("ricochet")
code/game/turfs/simulated/floor/plating.dm
+1 -1
View File
@@ -51,7 +51,7 @@
if(!W.use(1))
return
ChangeTurf(W.turf_type)
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
else
to_chat(user, "<span class='warning'>This section is too damaged to support a tile! Use a welder to fix the damage.</span>")
return 1
code/game/turfs/simulated/walls.dm
+1 -1
View File
@@ -268,7 +268,7 @@
return
to_chat(user, "<span class='notice'>You push the wall but nothing happens!</span>")
playsound(src, 'sound/weapons/Genhit.ogg', 25, 1)
playsound(src, 'sound/weapons/genhit.ogg', 25, 1)
add_fingerprint(user)
return ..()
code/game/turfs/space/space.dm
+4 -4
View File
@@ -19,7 +19,7 @@
if(!istype(src, /turf/space/transit))
icon_state = SPACE_ICON_STATE
if(update_starlight() && is_station_level(z))
// before you ask: Yes, this is fucking stupid, but looping through turf/space in world is how you make the server freeze
// before you ask: Yes, this is fucking stupid, but looping through turf/space in world is how you make the server freeze
// so I don't see a better way of doing this
LAZYADD(GLOB.station_level_space_turfs, src)
@@ -61,7 +61,7 @@
if(L)
if(R.use(1))
to_chat(user, "<span class='notice'>You begin constructing catwalk...</span>")
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
qdel(L)
ChangeTurf(/turf/simulated/floor/plating/airless/catwalk)
else
@@ -69,7 +69,7 @@
return
if(R.use(1))
to_chat(user, "<span class='notice'>Constructing support lattice...</span>")
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
ReplaceWithLattice()
else
to_chat(user, "<span class='warning'>You need one rod to build a lattice.</span>")
@@ -81,7 +81,7 @@
var/obj/item/stack/tile/plasteel/S = C
if(S.use(1))
qdel(L)
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
to_chat(user, "<span class='notice'>You build a floor.</span>")
ChangeTurf(/turf/simulated/floor/plating)
else
code/modules/admin/admin_verbs.dm
+2 -2
View File
@@ -987,7 +987,7 @@ var/list/admin_verbs_ticket = list(
to_chat(T, "<span class='notice'><b><font size=3>Man up and deal with it.</font></b></span>")
to_chat(T, "<span class='notice'>Move on.</span>")
T << 'sound/voice/ManUp1.ogg'
T << 'sound/voice/manup1.ogg'
log_admin("[key_name(usr)] told [key_name(T)] to man up and deal with it.")
message_admins("[key_name_admin(usr)] told [key_name(T)] to man up and deal with it.")
@@ -1005,7 +1005,7 @@ var/list/admin_verbs_ticket = list(
if(confirm == "Yes")
for(var/mob/T as mob in GLOB.mob_list)
to_chat(T, "<br><center><span class='notice'><b><font size=4>Man up.<br> Deal with it.</font></b><br>Move on.</span></center><br>")
T << 'sound/voice/ManUp1.ogg'
T << 'sound/voice/manup1.ogg'
log_admin("[key_name(usr)] told everyone to man up and deal with it.")
message_admins("[key_name_admin(usr)] told everyone to man up and deal with it.")
code/modules/admin/topic.dm
+1 -1
View File
@@ -1890,7 +1890,7 @@
switch(punishment)
if("Lightning bolt")
M.electrocute_act(5, "Lightning Bolt", safety=1)
playsound(get_turf(M), 'sound/magic/LightningShock.ogg', 50, 1, -1)
playsound(get_turf(M), 'sound/magic/lightningshock.ogg', 50, 1, -1)
M.adjustFireLoss(75)
M.Weaken(5)
to_chat(M, "<span class='userdanger'>The gods have punished you for your sins!</span>")
code/modules/admin/verbs/onlyone.dm
+2 -2
View File
@@ -55,7 +55,7 @@
message_admins("[key_name_admin(usr)] used THERE CAN BE ONLY ONE! -NO ATTACK LOGS WILL BE SENT TO ADMINS FROM THIS POINT FORTH-", 1)
log_admin("[key_name(usr)] used there can be only one.")
nologevent = 1
world << sound('sound/music/THUNDERDOME.ogg')
world << sound('sound/music/thunderdome.ogg')
/client/proc/only_me()
if(!ticker)
@@ -101,4 +101,4 @@
message_admins("[key_name_admin(usr)] used THERE CAN BE ONLY ME! -NO ATTACK LOGS WILL BE SENT TO ADMINS FROM THIS POINT FORTH-", 1)
log_admin("[key_name(usr)] used there can be only me.")
nologevent = 1
world << sound('sound/music/THUNDERDOME.ogg')
world << sound('sound/music/thunderdome.ogg')
code/modules/clothing/spacesuits/hardsuit.dm
+2 -2
View File
@@ -339,7 +339,7 @@
linkedsuit = loc
/obj/item/clothing/head/helmet/space/hardsuit/syndi/attack_self(mob/user)
if(!linkedsuit)
to_chat(user, "<span class='notice'>You must attach the helmet to a syndicate hardsuit to toggle combat mode!</span>")
return
@@ -634,7 +634,7 @@
/obj/item/clothing/suit/space/hardsuit/shielded/process()
if(world.time > recharge_cooldown && current_charges < max_charges)
current_charges = Clamp((current_charges + recharge_rate), 0, max_charges)
playsound(loc, 'sound/magic/Charge.ogg', 50, 1)
playsound(loc, 'sound/magic/charge.ogg', 50, 1)
if(current_charges == max_charges)
playsound(loc, 'sound/machines/ding.ogg', 50, 1)
processing_objects.Remove(src)
code/modules/flufftext/Hallucination.dm
+7 -7
View File
@@ -357,7 +357,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
switch(rand(1,5))
if(1) //Laser fight
for(var/i in 0 to hits)
target.playsound_local(null, 'sound/weapons/Laser.ogg', 25, 1)
target.playsound_local(null, 'sound/weapons/laser.ogg', 25, 1)
if(prob(75))
addtimer(CALLBACK(target, /mob/.proc/playsound_local, null, 'sound/weapons/sear.ogg', 25, 1), rand(10,20))
else
@@ -506,7 +506,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
A.override = 1
if(target.client)
to_chat(target, "<span class='italics'>...wabbajack...wabbajack...</span>")
target.playsound_local(target,'sound/magic/Staff_Change.ogg', 50, 1, -1)
target.playsound_local(target,'sound/magic/staff_change.ogg', 50, 1, -1)
delusion = A
target.client.images |= A
sleep(duration)
@@ -810,24 +810,24 @@ var/list/non_fakeattack_weapons = list(/obj/item/gun/projectile, /obj/item/ammo_
sleep(15)
playsound_local(null, 'sound/weapons/ring.ogg', 35)
if(6)
playsound_local(null, 'sound/magic/Summon_guns.ogg', 50, 1)
playsound_local(null, 'sound/magic/summon_guns.ogg', 50, 1)
if(7)
playsound_local(null, 'sound/machines/alarm.ogg', 100, 0)
if(8)
playsound_local(null, 'sound/voice/bfreeze.ogg', 35, 0)
if(9)
//To make it more realistic, I added two gunshots (enough to kill)
playsound_local(null, 'sound/weapons/Gunshot.ogg', 25, 1)
playsound_local(null, 'sound/weapons/gunshot.ogg', 25, 1)
var/timer_pause = rand(10,30)
addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound_local, null, 'sound/weapons/Gunshot.ogg', 25, 1), timer_pause)
addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound_local, null, 'sound/weapons/gunshot.ogg', 25, 1), timer_pause)
addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound_local, null, sound(get_sfx("bodyfall"), 25), 25, 1), timer_pause+rand(5,10))
if(10)
playsound_local(null, 'sound/effects/pray_chaplain.ogg', 50)
if(11)
//Same as above, but with tasers.
playsound_local(null, 'sound/weapons/Taser.ogg', 25, 1)
playsound_local(null, 'sound/weapons/taser.ogg', 25, 1)
var/timer_pause = rand(10,30)
addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound_local, null, 'sound/weapons/Taser.ogg', 25, 1), timer_pause)
addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound_local, null, 'sound/weapons/taser.ogg', 25, 1), timer_pause)
addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound_local, null, sound(get_sfx("bodyfall"), 25), 25, 1), timer_pause+rand(5,10))
//Rare audio
if(12)
code/modules/mining/equipment_locker.dm
+1 -1
View File
@@ -1104,7 +1104,7 @@
var/def_check = L.getarmor(type = "bomb")
if(backstab == FACING_INIT_FACING_TARGET_TARGET_FACING_PERPENDICULAR || backstab == FACING_SAME_DIR)
L.apply_damage(80, BRUTE, blocked = def_check)
playsound(user, 'sound/weapons/Kenetic_accel.ogg', 100, 1) //Seriously who spelled it wrong
playsound(user, 'sound/weapons/kenetic_accel.ogg', 100, 1) //Seriously who spelled it wrong
else
L.apply_damage(50, BRUTE, blocked = def_check)
code/modules/mining/lavaland/loot/ashdragon_loot.dm
+1 -1
View File
@@ -209,7 +209,7 @@
user.visible_message("<span class='danger'>[user] turns \the [T] into [reset_string]!</span>")
T.ChangeTurf(reset_turf_type)
timer = world.time + reset_cooldown
playsound(T,'sound/magic/Fireball.ogg', 200, 1)
playsound(T,'sound/magic/fireball.ogg', 200, 1)
/obj/effect/temp_visual/lavastaff
icon_state = "lavastaff_warn"
code/modules/mining/lavaland/loot/colossus_loot.dm
+1 -1
View File
@@ -377,7 +377,7 @@
/obj/machinery/anomalous_crystal/refresher //Deletes and recreates a copy of the item, "refreshing" it.
activation_method = "touch"
cooldown_add = 50
activation_sound = 'sound/magic/TIMEPARADOX2.ogg'
activation_sound = 'sound/magic/timeparadox2.ogg'
var/list/banned_items_typecache = list(/obj/item/storage, /obj/item/implant, /obj/item/implanter, /obj/item/disk/nuclear, /obj/item/projectile, /obj/item/spellbook)
/obj/machinery/anomalous_crystal/refresher/New()
code/modules/mining/lavaland/loot/hierophant_loot.dm
+2 -2
View File
@@ -62,7 +62,7 @@
timer = world.time + 51
if(do_after(user, 50, target = user))
var/turf/T = get_turf(user)
playsound(T,'sound/magic/Blind.ogg', 200, 1, -4)
playsound(T,'sound/magic/blind.ogg', 200, 1, -4)
new /obj/effect/temp_visual/hierophant/telegraph/teleport(T, user)
var/obj/effect/hierophant/H = new/obj/effect/hierophant(T)
rune = H
@@ -96,7 +96,7 @@
new /obj/effect/temp_visual/hierophant/telegraph(T, user)
new /obj/effect/temp_visual/hierophant/telegraph(source, user)
playsound(T,'sound/magic/blink.ogg', 200, 1)
//playsound(T,'sound/magic/Wand_Teleport.ogg', 200, 1)
//playsound(T,'sound/magic/wand_teleport.ogg', 200, 1)
playsound(source,'sound/magic/blink.ogg', 200, 1)
//playsound(source,'sound/machines/AirlockOpen.ogg', 200, 1)
if(!do_after(user, 3, target = user) || !rune) //no walking away shitlord
code/modules/mining/minebot.dm
+2 -2
View File
@@ -34,7 +34,7 @@
ranged_message = "shoots"
ranged_cooldown_time = 30
projectiletype = /obj/item/projectile/kinetic
projectilesound = 'sound/weapons/Gunshot4.ogg'
projectilesound = 'sound/weapons/gunshot4.ogg'
speak_emote = list("states")
wanted_objects = list(/obj/item/stack/ore/diamond, /obj/item/stack/ore/gold, /obj/item/stack/ore/silver,
/obj/item/stack/ore/plasma, /obj/item/stack/ore/uranium, /obj/item/stack/ore/iron,
@@ -111,7 +111,7 @@
var/pressure = environment.return_pressure()
if(pressure > 50)
K.name = "weakened [K.name]"
K.damage *= K.pressure_decrease
/mob/living/simple_animal/hostile/mining_drone/attack_hand(mob/living/carbon/human/M)
code/modules/mob/living/carbon/human/emote.dm
+1 -1
View File
@@ -172,7 +172,7 @@
var/M = handle_emote_param(param)
message = "<B>[src]</B> [M ? "drones at [M]" : "rumbles"]."
playsound(loc, 'sound/voice/DraskTalk.ogg', 50, 0)
playsound(loc, 'sound/voice/drasktalk.ogg', 50, 0)
m_type = 2
if("squish", "squishes")
code/modules/mob/living/carbon/human/species/drask.dm
+7 -7
View File
@@ -6,14 +6,14 @@
language = "Orluum"
eyes = "drask_eyes_s"
speech_sounds = list('sound/voice/DraskTalk.ogg')
speech_sounds = list('sound/voice/drasktalk.ogg')
speech_chance = 20
male_scream_sound = 'sound/voice/DraskTalk2.ogg'
female_scream_sound = 'sound/voice/DraskTalk2.ogg'
male_cough_sounds = 'sound/voice/DraskCough.ogg'
female_cough_sounds = 'sound/voice/DraskCough.ogg'
male_sneeze_sound = 'sound/voice/DraskSneeze.ogg'
female_sneeze_sound = 'sound/voice/DraskSneeze.ogg'
male_scream_sound = 'sound/voice/drasktalk2.ogg'
female_scream_sound = 'sound/voice/drasktalk2.ogg'
male_cough_sounds = 'sound/voice/draskcough.ogg'
female_cough_sounds = 'sound/voice/draskcough.ogg'
male_sneeze_sound = 'sound/voice/drasksneeze.ogg'
female_sneeze_sound = 'sound/voice/drasksneeze.ogg'
burn_mod = 2
//exotic_blood = "cryoxadone"
code/modules/mob/living/living.dm
+1 -1
View File
@@ -206,7 +206,7 @@
return TRUE
A.visible_message("<span class='danger'>[src] points [hand_item] at [A]!</span>",
"<span class='userdanger'>[src] points [hand_item] at you!</span>")
A << 'sound/weapons/TargetOn.ogg'
A << 'sound/weapons/targeton.ogg'
return TRUE
visible_message("<b>[src]</b> points to [A]")
return TRUE
code/modules/mob/living/simple_animal/bot/ed209bot.dm
+4 -4
View File
@@ -40,7 +40,7 @@
var/check_records = 1 //Does it check security records?
var/arrest_type = 0 //If true, don't handcuff
var/projectile = /obj/item/projectile/energy/electrode //Holder for projectile type
var/shoot_sound = 'sound/weapons/Taser.ogg'
var/shoot_sound = 'sound/weapons/taser.ogg'
allow_pai = 0
@@ -353,7 +353,7 @@
target = C
oldtarget_name = C.name
speak("Level [threatlevel] infraction alert!")
playsound(loc, pick('sound/voice/ed209_20sec.ogg', 'sound/voice/EDPlaceholder.ogg'), 50, 0)
playsound(loc, pick('sound/voice/ed209_20sec.ogg', 'sound/voice/edplaceholder.ogg'), 50, 0)
visible_message("<b>[src]</b> points at [C.name]!")
mode = BOT_HUNT
spawn(0)
@@ -412,7 +412,7 @@
..()
/mob/living/simple_animal/bot/ed209/proc/set_weapon() //used to update the projectile type and firing sound
shoot_sound = 'sound/weapons/Laser.ogg'
shoot_sound = 'sound/weapons/laser.ogg'
if(emagged == 2)
if(lasercolor)
projectile = /obj/item/projectile/beam/disabler
@@ -420,7 +420,7 @@
projectile = /obj/item/projectile/beam
else
if(!lasercolor)
shoot_sound = 'sound/weapons/Taser.ogg'
shoot_sound = 'sound/weapons/taser.ogg'
projectile = /obj/item/projectile/energy/electrode
else if(lasercolor == "b")
projectile = /obj/item/projectile/beam/lasertag/bluetag
code/modules/mob/living/simple_animal/hostile/hivebot.dm
+1 -1
View File
@@ -15,7 +15,7 @@
melee_damage_upper = 3
attacktext = "claws"
attack_sound = 'sound/weapons/bladeslice.ogg'
projectilesound = 'sound/weapons/Gunshot.ogg'
projectilesound = 'sound/weapons/gunshot.ogg'
projectiletype = /obj/item/projectile/hivebotbullet
faction = list("hivebot")
check_friendly_fire = 1
code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
+2 -2
View File
@@ -128,7 +128,7 @@ Difficulty: Medium
/obj/effect/temp_visual/target/proc/fall()
var/turf/T = get_turf(src)
playsound(T,'sound/magic/Fireball.ogg', 200, 1)
playsound(T,'sound/magic/fireball.ogg', 200, 1)
new /obj/effect/temp_visual/fireball(T)
sleep(12)
explosion(T, 0, 0, 1, 0, 0, 0, 1)
@@ -164,7 +164,7 @@ Difficulty: Medium
new /obj/effect/temp_visual/target(turf)
/mob/living/simple_animal/hostile/megafauna/dragon/proc/fire_walls()
playsound(get_turf(src),'sound/magic/Fireball.ogg', 200, 1)
playsound(get_turf(src),'sound/magic/fireball.ogg', 200, 1)
for(var/d in cardinal)
spawn(0)
code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+4 -4
View File
@@ -69,7 +69,7 @@ Difficulty: Hard
medal_type = MEDAL_PREFIX
score_type = BIRD_SCORE
del_on_death = TRUE
death_sound = 'sound/magic/Repulse.ogg'
death_sound = 'sound/magic/repulse.ogg'
/mob/living/simple_animal/hostile/megafauna/hierophant/New()
..()
@@ -342,7 +342,7 @@ Difficulty: Hard
new /obj/effect/temp_visual/hierophant/telegraph(T, src)
new /obj/effect/temp_visual/hierophant/telegraph(source, src)
playsound(T,'sound/magic/blink.ogg', 200, 1)
//playsound(T,'sound/magic/Wand_Teleport.ogg', 200, 1)
//playsound(T,'sound/magic/wand_teleport.ogg', 200, 1)
playsound(source,'sound/magic/blink.ogg', 200, 1)
//playsound(source,'sound/machines/AirlockOpen.ogg', 200, 1)
blinking = TRUE
@@ -520,7 +520,7 @@ Difficulty: Hard
var/turf/T = get_turf(src)
if(!T)
return
playsound(T,'sound/magic/Blind.ogg', 125, 1, -5) //make a sound
playsound(T,'sound/magic/blind.ogg', 125, 1, -5) //make a sound
sleep(6) //wait a little
bursting = TRUE
do_damage(T) //do damage and mark us as bursting
@@ -572,7 +572,7 @@ Difficulty: Hard
to_chat(user, "<span class='notice'>You start removing your hierophant rune...</span>")
H.timer = world.time + 51
if(do_after(user, 50, target = src))
playsound(src,'sound/magic/Blind.ogg', 200, 1, -4)
playsound(src,'sound/magic/blind.ogg', 200, 1, -4)
new /obj/effect/temp_visual/hierophant/telegraph/teleport(get_turf(src), user)
to_chat(user, "<span class='hierophant_warning'>You touch the rune with the staff, dispelling it!</span>")
H.rune = null
code/modules/mob/living/simple_animal/hostile/pirate.dm
+1 -1
View File
@@ -34,7 +34,7 @@
icon_state = "pirateranged"
icon_living = "pirateranged"
icon_dead = "piratemelee_dead"
projectilesound = 'sound/weapons/Laser.ogg'
projectilesound = 'sound/weapons/laser.ogg'
ranged = 1
rapid = 1
retreat_distance = 5
code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon_state = "shuriken"
item_state = null
icon = 'icons/obj/ninjaobjects.dmi'
fire_sound = 'sound/weapons/Genhit.ogg'
fire_sound = 'sound/weapons/genhit.ogg'
cell_type = "/obj/item/stock_parts/cell/infinite"
projectile_type = "/obj/item/projectile/energy/shuriken"
charge_cost = 0
code/modules/power/supermatter/supermatter.dm
+1 -1
View File
@@ -470,5 +470,5 @@
post_status("shuttle")
/obj/machinery/power/supermatter_shard/proc/supermatter_zap()
playsound(src.loc, 'sound/magic/LightningShock.ogg', 100, 1, extrarange = 5)
playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5)
tesla_zap(src, 10, max(1000,power * damage / explosion_point))
code/modules/power/tesla/coil.dm
+2 -2
View File
@@ -64,7 +64,7 @@
var/power_produced = powernet ? power / power_loss : power
add_avail(power_produced*input_power_multiplier)
flick("coilhit", src)
playsound(src.loc, 'sound/magic/LightningShock.ogg', 100, 1, extrarange = 5)
playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5)
tesla_zap(src, 5, power_produced)
addtimer(CALLBACK(src, .proc/reset_shocked), 10)
else
@@ -78,7 +78,7 @@
coeff = max(coeff, 10)
var/power = (powernet.avail/2)
draw_power(power)
playsound(src.loc, 'sound/magic/LightningShock.ogg', 100, 1, extrarange = 5)
playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5)
tesla_zap(src, 10, power/(coeff/2))
/obj/machinery/power/grounding_rod
code/modules/projectiles/ammunition/energy.dm
+6 -6
View File
@@ -5,7 +5,7 @@
projectile_type = /obj/item/projectile/energy
var/e_cost = 100 //The amount of energy a cell needs to expend to create this shot.
var/select_name = "energy"
fire_sound = 'sound/weapons/Laser.ogg'
fire_sound = 'sound/weapons/laser.ogg'
/obj/item/ammo_casing/energy/laser
projectile_type = /obj/item/projectile/beam/laser
@@ -96,7 +96,7 @@
/obj/item/ammo_casing/energy/ion
projectile_type = /obj/item/projectile/ion
select_name = "ion"
fire_sound = 'sound/weapons/IonRifle.ogg'
fire_sound = 'sound/weapons/ionrifle.ogg'
/obj/item/ammo_casing/energy/declone
projectile_type = /obj/item/projectile/energy/declone
@@ -106,7 +106,7 @@
/obj/item/ammo_casing/energy/mindflayer
projectile_type = /obj/item/projectile/beam/mindflayer
select_name = "MINDFUCK"
fire_sound = 'sound/weapons/Laser.ogg'
fire_sound = 'sound/weapons/laser.ogg'
/obj/item/ammo_casing/energy/flora
fire_sound = 'sound/effects/stealthoff.ogg'
@@ -174,7 +174,7 @@
projectile_type = /obj/item/projectile/energy/bolt
select_name = "bolt"
e_cost = 500
fire_sound = 'sound/weapons/Genhit.ogg'
fire_sound = 'sound/weapons/genhit.ogg'
/obj/item/ammo_casing/energy/bolt/large
projectile_type = /obj/item/projectile/energy/bolt/large
@@ -182,7 +182,7 @@
/obj/item/ammo_casing/energy/dart
projectile_type = /obj/item/projectile/energy/dart
fire_sound = 'sound/weapons/Genhit.ogg'
fire_sound = 'sound/weapons/genhit.ogg'
e_cost = 500
select_name = "toxic dart"
@@ -218,7 +218,7 @@
/obj/item/ammo_casing/energy/clown
projectile_type = /obj/item/projectile/clown
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
fire_sound = 'sound/weapons/gunshot_smg.ogg'
select_name = "clown"
/obj/item/ammo_casing/energy/sniper
code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+1 -1
View File
@@ -145,7 +145,7 @@
projectile_type = /obj/item/projectile/kinetic
select_name = "kinetic"
e_cost = 500
fire_sound = 'sound/weapons/Kenetic_accel.ogg' // fine spelling there chap
fire_sound = 'sound/weapons/kenetic_accel.ogg' // fine spelling there chap
/obj/item/ammo_casing/energy/kinetic/ready_proj(atom/target, mob/living/user, quiet, zone_override = "")
..()
code/modules/projectiles/guns/energy/special.dm
+2 -2
View File
@@ -3,7 +3,7 @@
desc = "A man portable anti-armor weapon designed to disable mechanical threats"
icon_state = "ionrifle"
item_state = null //so the human update icon uses the icon_state instead.
fire_sound = 'sound/weapons/IonRifle.ogg'
fire_sound = 'sound/weapons/ionrifle.ogg'
origin_tech = "combat=4;magnets=4"
w_class = WEIGHT_CLASS_HUGE
flags = CONDUCT
@@ -140,7 +140,7 @@
modifystate = -1
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'
fire_sound = 'sound/weapons/laser.ogg'
usesound = 'sound/items/welder.ogg'
toolspeed = 1
container_type = OPENCONTAINER
code/modules/projectiles/guns/magic/staff.dm
+5 -5
View File
@@ -17,7 +17,7 @@
ammo_type = /obj/item/ammo_casing/magic/animate
icon_state = "staffofanimation"
item_state = "staffofanimation"
fire_sound = 'sound/magic/Staff_animation.ogg'
fire_sound = 'sound/magic/staff_animation.ogg'
/obj/item/gun/magic/staff/healing
name = "staff of healing"
@@ -25,7 +25,7 @@
ammo_type = /obj/item/ammo_casing/magic/heal
icon_state = "staffofhealing"
item_state = "staffofhealing"
fire_sound = 'sound/magic/Staff_Healing.ogg'
fire_sound = 'sound/magic/staff_healing.ogg'
/obj/item/gun/magic/staff/healing/handle_suicide() //Stops people trying to commit suicide to heal themselves
return
@@ -39,7 +39,7 @@
max_charges = 10
recharge_rate = 2
no_den_usage = 1
fire_sound = 'sound/magic/Staff_Chaos.ogg'
fire_sound = 'sound/magic/staff_chaos.ogg'
/obj/item/gun/magic/staff/door
name = "staff of door creation"
@@ -50,7 +50,7 @@
max_charges = 10
recharge_rate = 2
no_den_usage = 1
fire_sound = 'sound/magic/Staff_Door.ogg'
fire_sound = 'sound/magic/staff_door.ogg'
/obj/item/gun/magic/staff/honk
name = "staff of the honkmother"
@@ -73,7 +73,7 @@
/obj/item/gun/magic/staff/spellblade
name = "spellblade"
desc = "A deadly combination of laziness and boodlust, this blade allows the user to dismember their enemies without all the hard work of actually swinging the sword."
fire_sound = 'sound/magic/Fireball.ogg'
fire_sound = 'sound/magic/fireball.ogg'
ammo_type = /obj/item/ammo_casing/magic/spellblade
icon_state = "spellblade"
item_state = "spellblade"
code/modules/projectiles/guns/magic/wand.dm
+6 -6
View File
@@ -59,7 +59,7 @@
/obj/item/gun/magic/wand/death
name = "wand of death"
desc = "This deadly wand overwhelms the victim's body with pure energy, slaying them without fail."
fire_sound = 'sound/magic/WandoDeath.ogg'
fire_sound = 'sound/magic/wandodeath.ogg'
ammo_type = /obj/item/ammo_casing/magic/death
icon_state = "deathwand"
max_charges = 3 //3, 2, 2, 1
@@ -80,7 +80,7 @@
name = "wand of resurrection"
desc = "This wand uses healing magics to heal and revive. They are rarely utilized within the Wizard Federation for some reason."
ammo_type = /obj/item/ammo_casing/magic/heal
fire_sound = 'sound/magic/Staff_Healing.ogg'
fire_sound = 'sound/magic/staff_healing.ogg'
icon_state = "revivewand"
max_charges = 3 //3, 2, 2, 1
@@ -98,7 +98,7 @@
name = "wand of polymorph"
desc = "This wand is attuned to chaos and will radically alter the victim's form."
ammo_type = /obj/item/ammo_casing/magic/change
fire_sound = 'sound/magic/Staff_Change.ogg'
fire_sound = 'sound/magic/staff_change.ogg'
icon_state = "polywand"
max_charges = 10 //10, 5, 5, 4
@@ -118,7 +118,7 @@
icon_state = "telewand"
max_charges = 10 //10, 5, 5, 4
no_den_usage = 1
fire_sound = 'sound/magic/Wand_Teleport.ogg'
fire_sound = 'sound/magic/wand_teleport.ogg'
/obj/item/gun/magic/wand/teleport/zap_self(mob/living/user)
do_teleport(user, user, 10)
@@ -136,7 +136,7 @@
name = "wand of door creation"
desc = "This particular wand can create doors in any wall for the unscrupulous wizard who shuns teleportation magics."
ammo_type = /obj/item/ammo_casing/magic/door
fire_sound = 'sound/magic/Staff_Door.ogg'
fire_sound = 'sound/magic/staff_door.ogg'
icon_state = "doorwand"
max_charges = 20 //20, 10, 10, 7
@@ -152,7 +152,7 @@
/obj/item/gun/magic/wand/fireball
name = "wand of fireball"
desc = "This wand shoots scorching balls of fire that explode into destructive flames."
fire_sound = 'sound/magic/Fireball.ogg'
fire_sound = 'sound/magic/fireball.ogg'
ammo_type = /obj/item/ammo_casing/magic/fireball
icon_state = "firewand"
max_charges = 8 //8, 4, 4, 3
code/modules/projectiles/guns/projectile.dm
+1 -1
View File
@@ -76,7 +76,7 @@
suppressed = A
S.oldsound = fire_sound
S.initial_w_class = w_class
fire_sound = 'sound/weapons/Gunshot_silenced.ogg'
fire_sound = 'sound/weapons/gunshot_silenced.ogg'
w_class = WEIGHT_CLASS_NORMAL //so pistols do not fit in pockets when suppressed
A.loc = src
update_icon()
code/modules/projectiles/guns/projectile/automatic.dm
+5 -5
View File
@@ -89,7 +89,7 @@
item_state = "c20r"
origin_tech = "combat=5;materials=2;syndicate=6"
mag_type = /obj/item/ammo_box/magazine/smgm45
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
fire_sound = 'sound/weapons/gunshot_smg.ogg'
fire_delay = 2
burst_size = 2
@@ -135,7 +135,7 @@
item_state = "m90-4"
origin_tech = "combat=5;materials=2;syndicate=6"
mag_type = /obj/item/ammo_box/magazine/m556
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
fire_sound = 'sound/weapons/gunshot_smg.ogg'
can_suppress = 0
var/obj/item/gun/projectile/revolver/grenadelauncher/underbarrel
burst_size = 3
@@ -207,7 +207,7 @@
slot_flags = 0
origin_tech = "combat=5;materials=1;syndicate=3"
mag_type = /obj/item/ammo_box/magazine/tommygunm45
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
fire_sound = 'sound/weapons/gunshot_smg.ogg'
can_suppress = 0
burst_size = 4
fire_delay = 1
@@ -220,7 +220,7 @@
slot_flags = 0
origin_tech = "combat=6;engineering=4"
mag_type = /obj/item/ammo_box/magazine/m556
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
fire_sound = 'sound/weapons/gunshot_smg.ogg'
can_suppress = 0
burst_size = 3
fire_delay = 1
@@ -234,7 +234,7 @@
w_class = WEIGHT_CLASS_NORMAL
origin_tech = "combat=6;materials=4;syndicate=6"
mag_type = /obj/item/ammo_box/magazine/m12g
fire_sound = 'sound/weapons/Gunshot4.ogg'
fire_sound = 'sound/weapons/gunshot4.ogg'
can_suppress = 0
burst_size = 1
fire_delay = 0
code/modules/projectiles/guns/projectile/revolver.dm
+1 -1
View File
@@ -420,7 +420,7 @@
mag_type = /obj/item/ammo_box/magazine/internal/shot/improvised
sawn_desc = "I'm sorry, but why did you saw your cane in the first place?"
attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
fire_sound = 'sound/weapons/Gunshot_silenced.ogg'
fire_sound = 'sound/weapons/gunshot_silenced.ogg'
suppressed = 1
needs_permit = 0 //its just a cane beepsky.....
code/modules/projectiles/guns/projectile/saw.dm
+1 -1
View File
@@ -8,7 +8,7 @@
origin_tech = "combat=6;engineering=3;syndicate=6"
mag_type = /obj/item/ammo_box/magazine/mm556x45
weapon_weight = WEAPON_MEDIUM
fire_sound = 'sound/weapons/Gunshot3.ogg'
fire_sound = 'sound/weapons/gunshot3.ogg'
var/cover_open = 0
can_suppress = 0
burst_size = 3
code/modules/projectiles/guns/projectile/toy.dm
+2 -2
View File
@@ -5,7 +5,7 @@
icon_state = "saber"
item_state = "gun"
mag_type = /obj/item/ammo_box/magazine/toy/smg
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
fire_sound = 'sound/weapons/gunshot_smg.ogg'
force = 0
throwforce = 0
burst_size = 3
@@ -22,7 +22,7 @@
icon_state = "pistol"
w_class = WEIGHT_CLASS_SMALL
mag_type = /obj/item/ammo_box/magazine/toy/pistol
fire_sound = 'sound/weapons/Gunshot.ogg'
fire_sound = 'sound/weapons/gunshot.ogg'
can_suppress = 0
burst_size = 1
fire_delay = 0
code/modules/research/xenobiology/xenobiology.dm
+1 -1
View File
@@ -492,7 +492,7 @@
/obj/effect/timestop/proc/timestop()
playsound(get_turf(src), 'sound/magic/TIMEPARADOX2.ogg', 100, 1, -1)
playsound(get_turf(src), 'sound/magic/timeparadox2.ogg', 100, 1, -1)
for(var/i in 1 to duration-1)
for(var/A in orange (freezerange, loc))
if(isliving(A))
code/modules/spacepods/equipment.dm
+6 -6
View File
@@ -90,7 +90,7 @@
icon_state = "weapon_taser"
projectile_type = /obj/item/projectile/beam/disabler
shot_cost = 400
fire_sound = 'sound/weapons/Taser.ogg'
fire_sound = 'sound/weapons/taser.ogg'
/obj/item/spacepod_equipment/weaponry/burst_taser
name = "burst taser system"
@@ -99,7 +99,7 @@
projectile_type = /obj/item/projectile/beam/disabler
shot_cost = 1200
shots_per = 3
fire_sound = 'sound/weapons/Taser.ogg'
fire_sound = 'sound/weapons/taser.ogg'
fire_delay = 30
/obj/item/spacepod_equipment/weaponry/laser
@@ -108,7 +108,7 @@
icon_state = "weapon_laser"
projectile_type = /obj/item/projectile/beam
shot_cost = 600
fire_sound = 'sound/weapons/Laser.ogg'
fire_sound = 'sound/weapons/laser.ogg'
// MINING LASERS
/obj/item/spacepod_equipment/weaponry/mining_laser_basic
@@ -119,7 +119,7 @@
projectile_type = /obj/item/projectile/kinetic/pod
shot_cost = 300
fire_delay = 14
fire_sound = 'sound/weapons/Kenetic_accel.ogg'
fire_sound = 'sound/weapons/kenetic_accel.ogg'
/obj/item/spacepod_equipment/weaponry/mining_laser
name = "mining laser system"
@@ -129,7 +129,7 @@
projectile_type = /obj/item/projectile/kinetic/pod/regular
shot_cost = 250
fire_delay = 10
fire_sound = 'sound/weapons/Kenetic_accel.ogg'
fire_sound = 'sound/weapons/kenetic_accel.ogg'
/obj/item/spacepod_equipment/weaponry/mining_laser_hyper
name = "enhanced mining laser system"
@@ -139,7 +139,7 @@
projectile_type = /obj/item/projectile/kinetic/pod/enhanced
shot_cost = 200
fire_delay = 8
fire_sound = 'sound/weapons/Kenetic_accel.ogg'
fire_sound = 'sound/weapons/kenetic_accel.ogg'
/*
///////////////////////////////////////
sound/magic/Blind.ogg → sound/magic/blind.ogg
View File
sound/magic/CastSummon.ogg → sound/magic/castsummon.ogg
View File
sound/magic/Charge.ogg → sound/magic/charge.ogg
View File
sound/magic/Disable_Tech.ogg → sound/magic/disable_tech.ogg
View File
sound/magic/Disintegrate.ogg → sound/magic/disintegrate.ogg
View File
sound/magic/Ethereal_Enter.ogg → sound/magic/ethereal_enter.ogg
View File
sound/magic/Ethereal_Exit.ogg → sound/magic/ethereal_exit.ogg
View File
sound/magic/Fireball.ogg → sound/magic/fireball.ogg
View File
sound/magic/FleshToStone.ogg → sound/magic/fleshtostone.ogg
View File
sound/magic/ForceWall.ogg → sound/magic/forcewall.ogg
View File
sound/magic/HorseHead_curse.ogg → sound/magic/horsehead_curse.ogg
View File
sound/magic/knock.ogg
BIN
View File
Binary file not shown.
sound/magic/lightningshock.ogg
BIN
View File
Binary file not shown.
sound/magic/magic_missile.ogg
BIN
View File
Binary file not shown.
sound/magic/mindswap.ogg
BIN
View File
Binary file not shown.
sound/magic/mm_hit.ogg
BIN
View File
Binary file not shown.
sound/magic/mutate.ogg
BIN
View File
Binary file not shown.
sound/magic/repulse.ogg
BIN
View File
Binary file not shown.
sound/magic/smoke.ogg
BIN
View File
Binary file not shown.
sound/magic/staff_animation.ogg
BIN
View File
Binary file not shown.
sound/magic/staff_change.ogg
BIN
View File
Binary file not shown.
sound/magic/staff_chaos.ogg
BIN
View File
Binary file not shown.
sound/magic/staff_door.ogg
BIN
View File
Binary file not shown.
sound/magic/staff_healing.ogg
BIN
View File
Binary file not shown.
sound/magic/summon_guns.ogg
BIN
View File
Binary file not shown.
sound/magic/summon_karp.ogg
BIN
View File
Binary file not shown.
sound/magic/summon_magic.ogg
BIN
View File
Binary file not shown.
sound/magic/summonitems_generic.ogg
BIN
View File
Binary file not shown.
sound/magic/tail_swing.ogg
BIN
View File
Binary file not shown.
sound/magic/teleport_app.ogg
BIN
View File
Binary file not shown.

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