mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-20 20:45:28 +01:00
Reorganizes the sound folder (#86726)
## About The Pull Request <details> - renamed ai folder to announcer -- announcer -- - moved vox_fem to announcer - moved approachingTG to announcer - separated the ambience folder into ambience and instrumental -- ambience -- - created holy folder moved all related sounds there - created engineering folder and moved all related sounds there - created security folder and moved ambidet there - created general folder and moved ambigen there - created icemoon folder and moved all icebox-related ambience there - created medical folder and moved all medbay-related ambi there - created ruin folder and moves all ruins ambi there - created beach folder and moved seag and shore there - created lavaland folder and moved related ambi there - created aurora_caelus folder and placed its ambi there - created misc folder and moved the rest of the files that don't have a specific category into it -- instrumental -- - moved traitor folder here - created lobby_music folder and placed our songs there (title0 not used anywhere? - server-side modification?) -- items -- - moved secdeath to hailer - moved surgery to handling -- effects -- - moved chemistry into effects - moved hallucinations into effects - moved health into effects - moved magic into effects -- vehicles -- - moved mecha into vehicles created mobs folder -- mobs -- - moved creatures folder into mobs - moved voice into mobs renamed creatures to non-humanoids renamed voice to humanoids -- non-humanoids-- created cyborg folder created hiss folder moved harmalarm.ogg to cyborg -- humanoids -- -- misc -- moved ghostwhisper to misc moved insane_low_laugh to misc I give up trying to document this. </details> - [X] ambience - [x] announcer - [x] effects - [X] instrumental - [x] items - [x] machines - [x] misc - [X] mobs - [X] runtime - [X] vehicles - [ ] attributions ## Why It's Good For The Game This folder is so disorganized that it's vomit inducing, will make it easier to find and add new sounds, providng a minor structure to the sound folder. ## Changelog 🆑 grungussuss refactor: the sound folder in the source code has been reorganized, please report any oddities with sounds playing or not playing server: lobby music has been repathed to sound/music/lobby_music /🆑
This commit is contained in:
grungussuss
@@ -262,7 +262,7 @@
|
||||
if(!COOLDOWN_FINISHED(src, sound_cooldown))
|
||||
return ITEM_INTERACT_BLOCKING
|
||||
COOLDOWN_START(src, sound_cooldown, 1.5 SECONDS)
|
||||
playsound(src, 'sound/machines/buzz-sigh.ogg', 30, FALSE)
|
||||
playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 30, FALSE)
|
||||
return ITEM_INTERACT_BLOCKING
|
||||
|
||||
var/obj/item/card/id/id_card = tool
|
||||
|
||||
@@ -127,7 +127,7 @@
|
||||
process_speed = override_speed_multiplier
|
||||
else
|
||||
process_speed = INATE_BOULDER_SPEED_MULTIPLIER
|
||||
playsound(src, 'sound/effects/rocktap1.ogg', 50)
|
||||
playsound(src, 'sound/effects/rock/rocktap1.ogg', 50)
|
||||
if(!continued)
|
||||
to_chat(user, span_notice("You scrape away at \the [src]..."))
|
||||
else
|
||||
@@ -142,7 +142,7 @@
|
||||
if(durability <= 0)
|
||||
convert_to_ore()
|
||||
to_chat(user, span_notice("You finish working on \the [src], and it crumbles into ore."))
|
||||
playsound(src, 'sound/effects/rock_break.ogg', 50)
|
||||
playsound(src, 'sound/effects/rock/rock_break.ogg', 50)
|
||||
user.mind?.adjust_experience(/datum/skill/mining, MINING_SKILL_BOULDER_SIZE_XP * 0.2)
|
||||
qdel(src)
|
||||
return
|
||||
@@ -171,7 +171,7 @@
|
||||
if(length(contents))
|
||||
var/list/quips = list("Clang!", "Crack!", "Bang!", "Clunk!", "Clank!")
|
||||
visible_message(span_notice("[pick(quips)] Something falls out of \the [src]!"))
|
||||
playsound(loc, 'sound/effects/picaxe1.ogg', 60, FALSE)
|
||||
playsound(loc, 'sound/effects/pickaxe/picaxe1.ogg', 60, FALSE)
|
||||
for(var/obj/item/content as anything in contents)
|
||||
content.forceMove(get_turf(src))
|
||||
qdel(src)
|
||||
|
||||
@@ -284,7 +284,7 @@
|
||||
//no more boulders
|
||||
if(!SSore_generation.available_boulders.len)
|
||||
if(feedback)
|
||||
playsound(loc, 'sound/machines/synth_no.ogg', 30 , TRUE)
|
||||
playsound(loc, 'sound/machines/synth/synth_no.ogg', 30 , TRUE)
|
||||
balloon_alert_to_viewers("no boulders to collect!")
|
||||
batch_processing = FALSE
|
||||
return FALSE
|
||||
|
||||
@@ -332,7 +332,7 @@
|
||||
COOLDOWN_START(src, effect_cooldown, effect_cooldown_time) //This needs to happen first, otherwise there's an infinite loop
|
||||
user.heal_ordered_damage(heal_amount, damage_heal_order)
|
||||
user.visible_message(span_notice("[user] suddenly revives, as their armor swirls with demonic energy!"), span_notice("You suddenly feel invigorated!"))
|
||||
playsound(user.loc, 'sound/magic/clockwork/ratvar_attack.ogg', 50)
|
||||
playsound(user.loc, 'sound/effects/magic/clockwork/ratvar_attack.ogg', 50)
|
||||
|
||||
/obj/item/clothing/suit/hooded/explorer/syndicate
|
||||
name = "syndicate explorer suit"
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
if(user.CanReach(attacked_atom))
|
||||
return ITEM_INTERACT_BLOCKING
|
||||
|
||||
var/atom/bullet = fire_projectile(/obj/projectile/grapple_hook, attacked_atom, 'sound/weapons/zipline_fire.ogg')
|
||||
var/atom/bullet = fire_projectile(/obj/projectile/grapple_hook, attacked_atom, 'sound/items/weapons/zipline_fire.ogg')
|
||||
zipline = user.Beam(bullet, icon_state = "zipline_hook", maxdistance = 9, layer = BELOW_MOB_LAYER)
|
||||
hooked = FALSE
|
||||
RegisterSignal(bullet, COMSIG_PROJECTILE_SELF_ON_HIT, PROC_REF(on_grapple_hit))
|
||||
@@ -181,6 +181,6 @@
|
||||
range = 9
|
||||
speed = 0.1
|
||||
can_hit_turfs = TRUE
|
||||
hitsound = 'sound/weapons/zipline_hit.ogg'
|
||||
hitsound = 'sound/items/weapons/zipline_hit.ogg'
|
||||
|
||||
#undef DAMAGE_ON_IMPACT
|
||||
|
||||
@@ -42,13 +42,13 @@
|
||||
if(!(slot & ITEM_SLOT_GLOVES))
|
||||
return
|
||||
on_wrist = TRUE
|
||||
playsound(loc, 'sound/weapons/handcuffs.ogg', 30, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
|
||||
playsound(loc, 'sound/items/weapons/handcuffs.ogg', 30, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
|
||||
connect_kheiral_network(user)
|
||||
|
||||
/obj/item/kheiral_cuffs/dropped(mob/user, silent)
|
||||
. = ..()
|
||||
if(on_wrist)
|
||||
playsound(loc, 'sound/weapons/handcuffs.ogg', 30, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
|
||||
playsound(loc, 'sound/items/weapons/handcuffs.ogg', 30, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
|
||||
on_wrist = FALSE
|
||||
remove_kheiral_network(user)
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
throw_speed = 4
|
||||
armour_penetration = 10
|
||||
custom_materials = list(/datum/material/iron=HALF_SHEET_MATERIAL_AMOUNT*1.15, /datum/material/glass=HALF_SHEET_MATERIAL_AMOUNT*2.075)
|
||||
hitsound = 'sound/weapons/bladeslice.ogg'
|
||||
hitsound = 'sound/items/weapons/bladeslice.ogg'
|
||||
attack_verb_continuous = list("smashes", "crushes", "cleaves", "chops", "pulps")
|
||||
attack_verb_simple = list("smash", "crush", "cleave", "chop", "pulp")
|
||||
sharpness = SHARP_EDGED
|
||||
@@ -126,7 +126,7 @@
|
||||
if((user.dir & backstab_dir) && (target.dir & backstab_dir) || boosted_mark)
|
||||
backstabbed = TRUE
|
||||
combined_damage += backstab_bonus
|
||||
playsound(user, 'sound/weapons/kinetic_accel.ogg', 100, TRUE) //Seriously who spelled it wrong
|
||||
playsound(user, 'sound/items/weapons/kinetic_accel.ogg', 100, TRUE) //Seriously who spelled it wrong
|
||||
if(!QDELETED(crusher_damage_effect))
|
||||
crusher_damage_effect.total_damage += combined_damage
|
||||
SEND_SIGNAL(user, COMSIG_LIVING_CRUSHER_DETONATE, target, src, backstabbed)
|
||||
@@ -157,7 +157,7 @@
|
||||
attached_trophy.on_projectile_fire(destabilizer, user)
|
||||
destabilizer.preparePixelProjectile(target, user, modifiers)
|
||||
destabilizer.firer = user
|
||||
playsound(user, 'sound/weapons/plasma_cutter.ogg', 100, TRUE)
|
||||
playsound(user, 'sound/items/weapons/plasma_cutter.ogg', 100, TRUE)
|
||||
destabilizer.fire()
|
||||
charged = FALSE
|
||||
update_appearance()
|
||||
@@ -167,17 +167,17 @@
|
||||
if(!charged)
|
||||
charged = TRUE
|
||||
update_appearance()
|
||||
playsound(src.loc, 'sound/weapons/kinetic_reload.ogg', 60, TRUE)
|
||||
playsound(src.loc, 'sound/items/weapons/kinetic_reload.ogg', 60, TRUE)
|
||||
|
||||
/obj/item/kinetic_crusher/ui_action_click(mob/user, actiontype)
|
||||
set_light_on(!light_on)
|
||||
playsound(user, 'sound/weapons/empty.ogg', 100, TRUE)
|
||||
playsound(user, 'sound/items/weapons/empty.ogg', 100, TRUE)
|
||||
update_appearance()
|
||||
|
||||
/obj/item/kinetic_crusher/on_saboteur(datum/source, disrupt_duration)
|
||||
. = ..()
|
||||
set_light_on(FALSE)
|
||||
playsound(src, 'sound/weapons/empty.ogg', 100, TRUE)
|
||||
playsound(src, 'sound/items/weapons/empty.ogg', 100, TRUE)
|
||||
return TRUE
|
||||
|
||||
/obj/item/kinetic_crusher/update_icon_state()
|
||||
@@ -362,7 +362,7 @@
|
||||
for(var/mob/living/living_target in oview(2, user))
|
||||
if(user.faction_check_atom(living_target) || living_target.stat == DEAD)
|
||||
continue
|
||||
playsound(living_target, 'sound/magic/fireball.ogg', 20, TRUE)
|
||||
playsound(living_target, 'sound/effects/magic/fireball.ogg', 20, TRUE)
|
||||
new /obj/effect/temp_visual/fire(living_target.loc)
|
||||
addtimer(CALLBACK(src, PROC_REF(pushback), living_target, user), 1) //no free backstabs, we push AFTER module stuff is done
|
||||
living_target.adjustFireLoss(bonus_value, forced = TRUE)
|
||||
|
||||
@@ -148,7 +148,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sort_list(list(
|
||||
var/obj/effect/decal/cleanable/ash/A = new /obj/effect/decal/cleanable/ash(drop_location())
|
||||
A.desc += "\nLooks like this used to be \a [src] some time ago."
|
||||
visible_message(span_danger("[src] is disintegrated by [I]!"))
|
||||
playsound(src, 'sound/items/welder.ogg', 50, TRUE)
|
||||
playsound(src, 'sound/items/tools/welder.ogg', 50, TRUE)
|
||||
qdel(src)
|
||||
return
|
||||
return ..()
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT)
|
||||
tool_behaviour = TOOL_MINING
|
||||
toolspeed = 1
|
||||
usesound = list('sound/effects/picaxe1.ogg', 'sound/effects/picaxe2.ogg', 'sound/effects/picaxe3.ogg')
|
||||
usesound = list('sound/effects/pickaxe/picaxe1.ogg', 'sound/effects/pickaxe/picaxe2.ogg', 'sound/effects/pickaxe/picaxe3.ogg')
|
||||
attack_verb_continuous = list("hits", "pierces", "slices", "attacks")
|
||||
attack_verb_simple = list("hit", "pierce", "slice", "attack")
|
||||
|
||||
@@ -67,8 +67,8 @@
|
||||
inhand_icon_state = "handdrill"
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
toolspeed = 0.6 //available from roundstart, faster than a pickaxe.
|
||||
usesound = 'sound/weapons/drill.ogg'
|
||||
hitsound = 'sound/weapons/drill.ogg'
|
||||
usesound = 'sound/items/weapons/drill.ogg'
|
||||
hitsound = 'sound/items/weapons/drill.ogg'
|
||||
desc = "An electric mining drill for the especially scrawny."
|
||||
|
||||
/obj/item/pickaxe/drill/cyborg
|
||||
@@ -98,8 +98,8 @@
|
||||
icon_state = "jackhammer"
|
||||
inhand_icon_state = "jackhammer"
|
||||
toolspeed = 0.1 //the epitome of powertools. extremely fast mining
|
||||
usesound = 'sound/weapons/sonic_jackhammer.ogg'
|
||||
hitsound = 'sound/weapons/sonic_jackhammer.ogg'
|
||||
usesound = 'sound/items/weapons/sonic_jackhammer.ogg'
|
||||
hitsound = 'sound/items/weapons/sonic_jackhammer.ogg'
|
||||
desc = "Cracks rocks with sonic blasts."
|
||||
|
||||
/obj/item/pickaxe/improvised
|
||||
@@ -213,7 +213,7 @@
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
tool_behaviour = TOOL_WRENCH
|
||||
toolspeed = 0.75
|
||||
usesound = 'sound/items/ratchet.ogg'
|
||||
usesound = 'sound/items/tools/ratchet.ogg'
|
||||
attack_verb_continuous = list("bashes", "bludgeons", "thrashes", "whacks")
|
||||
attack_verb_simple = list("bash", "bludgeon", "thrash", "whack")
|
||||
wound_bonus = 10
|
||||
@@ -260,7 +260,7 @@
|
||||
sharpness = NONE
|
||||
toolspeed = 0.75
|
||||
update_weight_class(WEIGHT_CLASS_SMALL)
|
||||
usesound = 'sound/items/ratchet.ogg'
|
||||
usesound = 'sound/items/tools/ratchet.ogg'
|
||||
attack_verb_continuous = list("bashes", "bludgeons", "thrashes", "whacks")
|
||||
attack_verb_simple = list("bash", "bludgeon", "thrash", "whack")
|
||||
if("Shovel")
|
||||
@@ -276,10 +276,10 @@
|
||||
sharpness = SHARP_POINTY
|
||||
toolspeed = 0.5
|
||||
update_weight_class(WEIGHT_CLASS_NORMAL)
|
||||
usesound = 'sound/effects/picaxe1.ogg'
|
||||
usesound = 'sound/effects/pickaxe/picaxe1.ogg'
|
||||
attack_verb_continuous = list("hits", "pierces", "slices", "attacks")
|
||||
attack_verb_simple = list("hit", "pierce", "slice", "attack")
|
||||
playsound(src, 'sound/items/ratchet.ogg', 50, vary = TRUE)
|
||||
playsound(src, 'sound/items/tools/ratchet.ogg', 50, vary = TRUE)
|
||||
update_appearance(UPDATE_ICON)
|
||||
|
||||
/obj/item/trench_tool/proc/check_menu(mob/user)
|
||||
@@ -312,10 +312,10 @@
|
||||
wound_bonus = -10
|
||||
attack_verb_continuous = list("bonks", "bludgeons", "pounds")
|
||||
attack_verb_simple = list("bonk", "bludgeon", "pound")
|
||||
drop_sound = 'sound/weapons/sonic_jackhammer.ogg'
|
||||
pickup_sound = 'sound/items/handling/crowbar_pickup.ogg'
|
||||
hitsound = 'sound/weapons/sonic_jackhammer.ogg'
|
||||
block_sound = 'sound/weapons/sonic_jackhammer.ogg'
|
||||
drop_sound = 'sound/items/weapons/sonic_jackhammer.ogg'
|
||||
pickup_sound = 'sound/items/handling/tools/crowbar_pickup.ogg'
|
||||
hitsound = 'sound/items/weapons/sonic_jackhammer.ogg'
|
||||
block_sound = 'sound/items/weapons/sonic_jackhammer.ogg'
|
||||
item_flags = SLOWS_WHILE_IN_HAND | IMMUTABLE_SLOW
|
||||
slowdown = 3
|
||||
attack_speed = 1.2 SECONDS
|
||||
@@ -355,7 +355,7 @@
|
||||
/obj/item/shovel/giant_wrench/proc/on_transform(obj/item/source, mob/user, active)
|
||||
SIGNAL_HANDLER
|
||||
|
||||
usesound = (active ? 'sound/items/ratchet.ogg' : initial(usesound))
|
||||
usesound = (active ? 'sound/items/tools/ratchet.ogg' : initial(usesound))
|
||||
block_chance = (active ? 0 : initial(block_chance))
|
||||
recoil_factor = (active ? 2 : initial(recoil_factor))
|
||||
do_launch = (active ? FALSE : initial(do_launch))
|
||||
@@ -363,7 +363,7 @@
|
||||
armour_penetration = (active ? 30 : initial(armour_penetration))
|
||||
if(user)
|
||||
balloon_alert(user, "folded Big Slappy [active ? "open" : "closed"]")
|
||||
playsound(src, 'sound/items/ratchet.ogg', 50, TRUE)
|
||||
playsound(src, 'sound/items/tools/ratchet.ogg', 50, TRUE)
|
||||
return COMPONENT_NO_DEFAULT_MESSAGE
|
||||
|
||||
/obj/item/shovel/giant_wrench/attack(mob/living/target_mob, mob/living/user)
|
||||
|
||||
@@ -87,7 +87,7 @@
|
||||
if(parent_resonator)
|
||||
parent_resonator.fields += src
|
||||
adding_failure = set_failure
|
||||
playsound(src,'sound/weapons/resonator_fire.ogg',50,TRUE)
|
||||
playsound(src,'sound/items/weapons/resonator_fire.ogg',50,TRUE)
|
||||
if(mode == RESONATOR_MODE_AUTO)
|
||||
transform = matrix()*0.75
|
||||
animate(src, transform = matrix()*1.5, time = duration)
|
||||
@@ -123,7 +123,7 @@
|
||||
var/turf/closed/mineral/mineral_turf = src_turf
|
||||
mineral_turf.gets_drilled(creator)
|
||||
check_pressure(src_turf)
|
||||
playsound(src_turf, 'sound/weapons/resonator_blast.ogg', 50, TRUE)
|
||||
playsound(src_turf, 'sound/items/weapons/resonator_blast.ogg', 50, TRUE)
|
||||
for(var/mob/living/attacked_living in src_turf)
|
||||
if(creator)
|
||||
log_combat(creator, attacked_living, "used a resonator field on", "resonator")
|
||||
|
||||
@@ -107,7 +107,7 @@
|
||||
. = ..()
|
||||
if(.)
|
||||
// KERPLUNK
|
||||
playsound(M,'sound/weapons/resonator_blast.ogg',50,TRUE)
|
||||
playsound(M,'sound/items/weapons/resonator_blast.ogg',50,TRUE)
|
||||
if(iscarbon(M))
|
||||
var/mob/living/carbon/L = M
|
||||
L.Paralyze(60)
|
||||
|
||||
@@ -80,7 +80,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
|
||||
balloon_alert(user, "too heavy!")
|
||||
return .
|
||||
balloon_alert_to_viewers("attaching...")
|
||||
playsound(thing, 'sound/items/zip.ogg', vol = 50, vary = TRUE)
|
||||
playsound(thing, 'sound/items/zip/zip.ogg', vol = 50, vary = TRUE)
|
||||
if(isliving(thing))
|
||||
var/mob/living/creature = thing
|
||||
if(creature.mind)
|
||||
@@ -124,7 +124,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
|
||||
balloon.appearance_flags = RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM
|
||||
holder_obj.cut_overlay(balloon2)
|
||||
holder_obj.add_overlay(balloon)
|
||||
playsound(holder_obj.loc, 'sound/items/fultext_deploy.ogg', vol = 50, vary = TRUE, extrarange = -3)
|
||||
playsound(holder_obj.loc, 'sound/items/fulton/fultext_deploy.ogg', vol = 50, vary = TRUE, extrarange = -3)
|
||||
|
||||
animate(holder_obj, pixel_z = 10, time = 2 SECONDS, flags = ANIMATION_RELATIVE)
|
||||
animate(pixel_z = 5, time = 1 SECONDS, flags = ANIMATION_RELATIVE)
|
||||
@@ -134,7 +134,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
|
||||
|
||||
sleep(6 SECONDS)
|
||||
|
||||
playsound(holder_obj.loc, 'sound/items/fultext_launch.ogg', vol = 50, vary = TRUE, extrarange = -3)
|
||||
playsound(holder_obj.loc, 'sound/items/fulton/fultext_launch.ogg', vol = 50, vary = TRUE, extrarange = -3)
|
||||
animate(holder_obj, pixel_z = 1000, time = 3 SECONDS, flags = ANIMATION_RELATIVE)
|
||||
|
||||
if(ishuman(thing))
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
force = 15
|
||||
attack_verb_continuous = list("clubs", "beats", "pummels")
|
||||
attack_verb_simple = list("club", "beat", "pummel")
|
||||
hitsound = 'sound/weapons/sonic_jackhammer.ogg'
|
||||
hitsound = 'sound/items/weapons/sonic_jackhammer.ogg'
|
||||
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
|
||||
actions_types = list(/datum/action/item_action/vortex_recall)
|
||||
/// Linked teleport beacon for the group teleport functionality.
|
||||
@@ -85,7 +85,7 @@
|
||||
say("Xverwpsgexmrk...", forced = "hierophant club suicide")
|
||||
user.visible_message(span_suicide("[user] holds [src] into the air! It looks like [user.p_theyre()] trying to commit suicide!"))
|
||||
new/obj/effect/temp_visual/hierophant/telegraph(get_turf(user))
|
||||
playsound(user,'sound/machines/airlockopen.ogg', 75, TRUE)
|
||||
playsound(user,'sound/machines/airlock/airlockopen.ogg', 75, TRUE)
|
||||
user.visible_message(span_hierophant_warning("[user] fades out, leaving [user.p_their()] belongings behind!"))
|
||||
for(var/obj/item/user_item in user)
|
||||
if(user_item != src)
|
||||
@@ -128,7 +128,7 @@
|
||||
span_notice("You start detaching the hierophant beacon..."))
|
||||
if(do_after(user, 5 SECONDS, target = user) && !beacon)
|
||||
var/turf/user_turf = get_turf(user)
|
||||
playsound(user_turf,'sound/magic/blind.ogg', 200, TRUE, -4)
|
||||
playsound(user_turf,'sound/effects/magic/blind.ogg', 200, TRUE, -4)
|
||||
new /obj/effect/temp_visual/hierophant/telegraph/teleport(user_turf, user)
|
||||
beacon = new/obj/effect/hierophant(user_turf)
|
||||
user.update_mob_action_buttons()
|
||||
@@ -166,8 +166,8 @@
|
||||
return
|
||||
new /obj/effect/temp_visual/hierophant/telegraph(destination, user)
|
||||
new /obj/effect/temp_visual/hierophant/telegraph(source, user)
|
||||
playsound(destination,'sound/magic/wand_teleport.ogg', 200, TRUE)
|
||||
playsound(source,'sound/machines/airlockopen.ogg', 200, TRUE)
|
||||
playsound(destination,'sound/effects/magic/wand_teleport.ogg', 200, TRUE)
|
||||
playsound(source,'sound/machines/airlock/airlockopen.ogg', 200, TRUE)
|
||||
if(!do_after(user, 0.3 SECONDS, target = user) || !user || !beacon || QDELETED(beacon)) //no walking away shitlord
|
||||
teleporting = FALSE
|
||||
if(user)
|
||||
@@ -251,7 +251,7 @@
|
||||
for(var/mob/living/carbon/human/target in range(7,user))
|
||||
target.apply_status_effect(/datum/status_effect/mayhem)
|
||||
to_chat(user, span_notice("You shatter the bottle!"))
|
||||
playsound(user.loc, 'sound/effects/glassbr1.ogg', 100, TRUE)
|
||||
playsound(user.loc, 'sound/effects/glass/glassbr1.ogg', 100, TRUE)
|
||||
message_admins(span_adminnotice("[ADMIN_LOOKUPFLW(user)] has activated a bottle of mayhem!"))
|
||||
user.log_message("activated a bottle of mayhem", LOG_ATTACK)
|
||||
qdel(src)
|
||||
@@ -368,7 +368,7 @@
|
||||
righthand_file = 'icons/mob/inhands/64x64_righthand.dmi'
|
||||
attack_verb_continuous = list("chops", "slices", "cuts", "reaps")
|
||||
attack_verb_simple = list("chop", "slice", "cut", "reap")
|
||||
hitsound = 'sound/weapons/bladeslice.ogg'
|
||||
hitsound = 'sound/items/weapons/bladeslice.ogg'
|
||||
inhand_x_dimension = 64
|
||||
inhand_y_dimension = 64
|
||||
force = 20
|
||||
@@ -557,7 +557,7 @@
|
||||
projectile.firer = src
|
||||
projectile.fire(null, attacked_atom)
|
||||
visible_message(span_danger("[src] fires at [attacked_atom]!"), span_notice("You fire at [attacked_atom]!"))
|
||||
playsound(src, 'sound/magic/fireball.ogg', 50, TRUE)
|
||||
playsound(src, 'sound/effects/magic/fireball.ogg', 50, TRUE)
|
||||
|
||||
/obj/item/soulscythe/proc/slash_target(atom/attacked_atom)
|
||||
if(isliving(attacked_atom) && use_blood(10))
|
||||
@@ -576,7 +576,7 @@
|
||||
SpinAnimation(5)
|
||||
addtimer(CALLBACK(src, PROC_REF(reset_spin)), 1 SECONDS)
|
||||
visible_message(span_danger("[src] slashes [attacked_atom]!"), span_notice("You slash [attacked_atom]!"))
|
||||
playsound(src, 'sound/weapons/bladeslice.ogg', 50, TRUE)
|
||||
playsound(src, 'sound/items/weapons/bladeslice.ogg', 50, TRUE)
|
||||
do_attack_animation(attacked_atom, ATTACK_EFFECT_SLASH)
|
||||
|
||||
/obj/item/soulscythe/proc/charge_target(atom/attacked_atom)
|
||||
@@ -592,7 +592,7 @@
|
||||
return
|
||||
visible_message(span_danger("[src] charges at [attacked_atom]!"), span_notice("You charge at [attacked_atom]!"))
|
||||
new /obj/effect/temp_visual/mook_dust(get_turf(src))
|
||||
playsound(src, 'sound/weapons/thudswoosh.ogg', 50, TRUE)
|
||||
playsound(src, 'sound/items/weapons/thudswoosh.ogg', 50, TRUE)
|
||||
SpinAnimation(1)
|
||||
throwforce *= 2
|
||||
throw_at(attacked_atom, 10, 3, soul, FALSE)
|
||||
@@ -657,7 +657,7 @@
|
||||
force = 1
|
||||
throwforce = 1
|
||||
hitsound = 'sound/effects/ghost2.ogg'
|
||||
block_sound = 'sound/weapons/parry.ogg'
|
||||
block_sound = 'sound/items/weapons/parry.ogg'
|
||||
attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "rends")
|
||||
attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "rend")
|
||||
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
|
||||
@@ -794,7 +794,7 @@
|
||||
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
|
||||
attack_verb_continuous = list("sears", "clubs", "burn")
|
||||
attack_verb_simple = list("sear", "club", "burn")
|
||||
hitsound = 'sound/weapons/sear.ogg'
|
||||
hitsound = 'sound/items/weapons/sear.ogg'
|
||||
var/turf_type = /turf/open/lava/smooth/weak
|
||||
var/transform_string = "lava"
|
||||
var/reset_turf_type = /turf/open/misc/asteroid/basalt
|
||||
@@ -833,7 +833,7 @@
|
||||
message_admins("[ADMIN_LOOKUPFLW(user)] fired the lava staff at [ADMIN_VERBOSEJMP(T)]")
|
||||
user.log_message("fired the lava staff at [AREACOORD(T)].", LOG_ATTACK)
|
||||
timer = world.time + create_cooldown
|
||||
playsound(T,'sound/magic/fireball.ogg', 200, TRUE)
|
||||
playsound(T,'sound/effects/magic/fireball.ogg', 200, TRUE)
|
||||
else
|
||||
timer = world.time
|
||||
qdel(L)
|
||||
@@ -842,7 +842,7 @@
|
||||
if(T.TerraformTurf(reset_turf_type, flags = CHANGETURF_INHERIT_AIR))
|
||||
user.visible_message(span_danger("[user] turns \the [old_name] into [reset_string]!"))
|
||||
timer = world.time + reset_cooldown
|
||||
playsound(T,'sound/magic/fireball.ogg', 200, TRUE)
|
||||
playsound(T,'sound/effects/magic/fireball.ogg', 200, TRUE)
|
||||
return ITEM_INTERACT_SUCCESS
|
||||
|
||||
/obj/effect/temp_visual/lavastaff
|
||||
@@ -873,7 +873,7 @@
|
||||
inhand_x_dimension = 64
|
||||
inhand_y_dimension = 64
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
hitsound = 'sound/weapons/bladeslice.ogg'
|
||||
hitsound = 'sound/items/weapons/bladeslice.ogg'
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
sharpness = SHARP_EDGED
|
||||
/// List of factions we deal bonus damage to
|
||||
@@ -975,7 +975,7 @@
|
||||
user.changeNext_move(CLICK_CD_MELEE * 0.25)
|
||||
if(user)
|
||||
balloon_alert(user, "[active ? "opened" : "closed"] [src]")
|
||||
playsound(src, 'sound/magic/clockwork/fellowship_armory.ogg', 35, TRUE, frequency = 90000 - (active * 30000))
|
||||
playsound(src, 'sound/effects/magic/clockwork/fellowship_armory.ogg', 35, TRUE, frequency = 90000 - (active * 30000))
|
||||
return COMPONENT_NO_DEFAULT_MESSAGE
|
||||
|
||||
//Legion: Staff of Storms
|
||||
@@ -992,7 +992,7 @@
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
force = 20
|
||||
damtype = BURN
|
||||
hitsound = 'sound/weapons/taserhit.ogg'
|
||||
hitsound = 'sound/items/weapons/taserhit.ogg'
|
||||
wound_bonus = -30
|
||||
bare_wound_bonus = 20
|
||||
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
|
||||
@@ -1034,7 +1034,7 @@
|
||||
return
|
||||
user.visible_message(span_warning("[user] holds [src] skywards as an orange beam travels into the sky!"), \
|
||||
span_notice("You hold [src] skyward, dispelling the storm!"))
|
||||
playsound(user, 'sound/magic/staff_change.ogg', 200, FALSE)
|
||||
playsound(user, 'sound/effects/magic/staff_change.ogg', 200, FALSE)
|
||||
var/old_color = user.color
|
||||
user.color = list(340/255, 240/255, 0,0, 0,0,0,0, 0,0,0,0, 0,0,0,1, 0,0,0,0)
|
||||
var/old_transform = user.transform
|
||||
@@ -1071,7 +1071,7 @@
|
||||
if((target_turf.z in weather.impacted_z_levels) && ispath(target_area.type, weather.area_type))
|
||||
power_boosted = TRUE
|
||||
break
|
||||
playsound(src, 'sound/magic/lightningshock.ogg', 10, TRUE, extrarange = SILENCED_SOUND_EXTRARANGE, falloff_distance = 0)
|
||||
playsound(src, 'sound/effects/magic/lightningshock.ogg', 10, TRUE, extrarange = SILENCED_SOUND_EXTRARANGE, falloff_distance = 0)
|
||||
targeted_turfs += target_turf
|
||||
balloon_alert(user, "you aim at [target_turf]...")
|
||||
new /obj/effect/temp_visual/telegraphing/thunderbolt(target_turf)
|
||||
@@ -1083,7 +1083,7 @@
|
||||
|
||||
/obj/item/storm_staff/proc/recharge(mob/user)
|
||||
thunder_charges = min(thunder_charges + 1, max_thunder_charges)
|
||||
playsound(src, 'sound/magic/charge.ogg', 10, TRUE, extrarange = SILENCED_SOUND_EXTRARANGE, falloff_distance = 0)
|
||||
playsound(src, 'sound/effects/magic/charge.ogg', 10, TRUE, extrarange = SILENCED_SOUND_EXTRARANGE, falloff_distance = 0)
|
||||
|
||||
/obj/item/storm_staff/proc/throw_thunderbolt(turf/target, boosted)
|
||||
targeted_turfs -= target
|
||||
@@ -1103,6 +1103,6 @@
|
||||
|
||||
for(var/obj/hit_thing in turf)
|
||||
hit_thing.take_damage(20, BURN, ENERGY, FALSE)
|
||||
playsound(target, 'sound/magic/lightningbolt.ogg', 100, TRUE)
|
||||
playsound(target, 'sound/effects/magic/lightningbolt.ogg', 100, TRUE)
|
||||
target.visible_message(span_danger("A thunderbolt strikes [target]!"))
|
||||
explosion(target, light_impact_range = (boosted ? 1 : 0), flame_range = (boosted ? 2 : 1), silent = TRUE)
|
||||
|
||||
@@ -202,13 +202,13 @@
|
||||
guardian.locked = TRUE
|
||||
guardian.forceMove(src)
|
||||
to_chat(guardian, span_userdanger("You have been locked away in your summoner's pendant!"))
|
||||
guardian.playsound_local(get_turf(guardian), 'sound/magic/summonitems_generic.ogg', 50, TRUE)
|
||||
guardian.playsound_local(get_turf(guardian), 'sound/effects/magic/summonitems_generic.ogg', 50, TRUE)
|
||||
|
||||
/obj/item/clothing/neck/necklace/memento_mori/proc/regurgitate_guardian(mob/living/basic/guardian/guardian)
|
||||
guardian.locked = FALSE
|
||||
guardian.recall(forced = TRUE)
|
||||
to_chat(guardian, span_notice("You have been returned back from your summoner's pendant!"))
|
||||
guardian.playsound_local(get_turf(guardian), 'sound/magic/repulse.ogg', 50, TRUE)
|
||||
guardian.playsound_local(get_turf(guardian), 'sound/effects/magic/repulse.ogg', 50, TRUE)
|
||||
|
||||
/datum/action/item_action/hands_free/memento_mori
|
||||
check_flags = NONE
|
||||
@@ -555,7 +555,7 @@
|
||||
var/obj/item/organ/external/wings/functional/wings = get_wing_choice(exposed_human, chest)
|
||||
wings = new wings()
|
||||
wings.Insert(exposed_human)
|
||||
playsound(exposed_human.loc, 'sound/items/poster_ripped.ogg', 50, TRUE, -1)
|
||||
playsound(exposed_human.loc, 'sound/items/poster/poster_ripped.ogg', 50, TRUE, -1)
|
||||
exposed_human.apply_damage(20, def_zone = BODY_ZONE_CHEST, forced = TRUE, wound_bonus = CANT_WOUND)
|
||||
exposed_human.emote("scream")
|
||||
|
||||
@@ -769,7 +769,7 @@
|
||||
/// Starts berserk, reducing incoming brute by 50%, doubled attacking speed, NOGUNS trait, adding a color and giving them the berserk movespeed modifier
|
||||
/obj/item/clothing/head/hooded/berserker/proc/berserk_mode(mob/living/carbon/human/user)
|
||||
to_chat(user, span_warning("You enter berserk mode."))
|
||||
playsound(user, 'sound/magic/staff_healing.ogg', 50)
|
||||
playsound(user, 'sound/effects/magic/staff_healing.ogg', 50)
|
||||
user.add_movespeed_modifier(/datum/movespeed_modifier/berserk)
|
||||
user.physiology.brute_mod *= 0.5
|
||||
user.next_move_modifier *= BERSERK_ATTACK_SPEED_MODIFIER
|
||||
@@ -787,7 +787,7 @@
|
||||
if(QDELETED(user))
|
||||
return
|
||||
to_chat(user, span_warning("You exit berserk mode."))
|
||||
playsound(user, 'sound/magic/summonitems_generic.ogg', 50)
|
||||
playsound(user, 'sound/effects/magic/summonitems_generic.ogg', 50)
|
||||
user.remove_movespeed_modifier(/datum/movespeed_modifier/berserk)
|
||||
user.physiology.brute_mod *= 2
|
||||
user.next_move_modifier /= BERSERK_ATTACK_SPEED_MODIFIER
|
||||
@@ -903,7 +903,7 @@
|
||||
|
||||
healthscan(living_owner, living_scanned, 1, TRUE)
|
||||
|
||||
owner.playsound_local(get_turf(owner), 'sound/magic/smoke.ogg', 50, TRUE)
|
||||
owner.playsound_local(get_turf(owner), 'sound/effects/magic/smoke.ogg', 50, TRUE)
|
||||
owner.balloon_alert(owner, "[living_scanned] scanned")
|
||||
addtimer(CALLBACK(src, PROC_REF(send_cooldown_end_message), cooldown_time))
|
||||
|
||||
@@ -939,7 +939,7 @@
|
||||
/obj/item/organ/internal/cyberimp/arm/shard/attack_self(mob/user, modifiers)
|
||||
. = ..()
|
||||
to_chat(user, span_userdanger("The mass goes up your arm and goes inside it!"))
|
||||
playsound(user, 'sound/magic/demon_consume.ogg', 50, TRUE)
|
||||
playsound(user, 'sound/effects/magic/demon_consume.ogg', 50, TRUE)
|
||||
var/index = user.get_held_index_of_item(src)
|
||||
zone = (index == LEFT_HANDS ? BODY_ZONE_L_ARM : BODY_ZONE_R_ARM)
|
||||
SetSlotFromZone()
|
||||
@@ -960,7 +960,7 @@
|
||||
return FALSE
|
||||
if(!katana.drew_blood)
|
||||
to_chat(owner, span_userdanger("[katana] lashes out at you in hunger!"))
|
||||
playsound(owner, 'sound/magic/demon_attack1.ogg', 50, TRUE)
|
||||
playsound(owner, 'sound/effects/magic/demon_attack1.ogg', 50, TRUE)
|
||||
var/obj/item/bodypart/part = owner.get_holding_bodypart_of_item(katana)
|
||||
if(part)
|
||||
part.receive_damage(brute = 25, wound_bonus = 10, sharpness = SHARP_EDGED)
|
||||
@@ -986,12 +986,12 @@
|
||||
force = 15
|
||||
armour_penetration = 30
|
||||
block_chance = 30
|
||||
block_sound = 'sound/weapons/parry.ogg'
|
||||
block_sound = 'sound/items/weapons/parry.ogg'
|
||||
sharpness = SHARP_EDGED
|
||||
w_class = WEIGHT_CLASS_HUGE
|
||||
attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
|
||||
attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
|
||||
hitsound = 'sound/weapons/bladeslice.ogg'
|
||||
hitsound = 'sound/items/weapons/bladeslice.ogg'
|
||||
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | FREEZE_PROOF
|
||||
var/shattered = FALSE
|
||||
var/drew_blood = FALSE
|
||||
@@ -1043,7 +1043,7 @@
|
||||
user.visible_message(span_warning("[user] strikes [target] with [src]'s hilt!"),
|
||||
span_notice("You hilt strike [target]!"))
|
||||
to_chat(target, span_userdanger("You've been struck by [user]!"))
|
||||
playsound(src, 'sound/weapons/genhit3.ogg', 50, TRUE)
|
||||
playsound(src, 'sound/items/weapons/genhit3.ogg', 50, TRUE)
|
||||
RegisterSignal(target, COMSIG_MOVABLE_IMPACT, PROC_REF(strike_throw_impact))
|
||||
var/atom/throw_target = get_edge_target_turf(target, user.dir)
|
||||
target.throw_at(throw_target, 5, 3, user, FALSE, gentle = TRUE)
|
||||
@@ -1068,7 +1068,7 @@
|
||||
/obj/item/cursed_katana/proc/slice(mob/living/target, mob/user)
|
||||
user.visible_message(span_warning("[user] does a wide slice!"),
|
||||
span_notice("You do a wide slice!"))
|
||||
playsound(src, 'sound/weapons/bladeslice.ogg', 50, TRUE)
|
||||
playsound(src, 'sound/items/weapons/bladeslice.ogg', 50, TRUE)
|
||||
var/turf/user_turf = get_turf(user)
|
||||
var/dir_to_target = get_dir(user_turf, get_turf(target))
|
||||
var/static/list/cursed_katana_slice_angles = list(0, -45, 45, -90, 90) //so that the animation animates towards the target clicked and not towards a side target
|
||||
@@ -1088,7 +1088,7 @@
|
||||
user.visible_message(span_warning("[user] vanishes into thin air!"),
|
||||
span_notice("You enter the dark cloak."))
|
||||
new /obj/effect/temp_visual/mook_dust(get_turf(src))
|
||||
playsound(src, 'sound/magic/smoke.ogg', 50, TRUE)
|
||||
playsound(src, 'sound/effects/magic/smoke.ogg', 50, TRUE)
|
||||
if(ishostile(target))
|
||||
var/mob/living/simple_animal/hostile/hostile_target = target
|
||||
if(hostile_target.target == user)
|
||||
@@ -1101,7 +1101,7 @@
|
||||
user.clear_sight(SEE_SELF)
|
||||
user.visible_message(span_warning("[user] appears from thin air!"),
|
||||
span_notice("You exit the dark cloak."))
|
||||
playsound(src, 'sound/magic/summonitems_generic.ogg', 50, TRUE)
|
||||
playsound(src, 'sound/effects/magic/summonitems_generic.ogg', 50, TRUE)
|
||||
new /obj/effect/temp_visual/mook_dust(get_turf(src))
|
||||
|
||||
/obj/item/cursed_katana/proc/cut(mob/living/target, mob/user)
|
||||
@@ -1110,7 +1110,7 @@
|
||||
to_chat(target, span_userdanger("Your tendons have been cut by [user]!"))
|
||||
target.apply_damage(damage = 15, sharpness = SHARP_EDGED, wound_bonus = 15)
|
||||
user.do_attack_animation(target, ATTACK_EFFECT_DISARM)
|
||||
playsound(src, 'sound/weapons/rapierhit.ogg', 50, TRUE)
|
||||
playsound(src, 'sound/items/weapons/rapierhit.ogg', 50, TRUE)
|
||||
var/datum/status_effect/stacking/saw_bleed/bloodletting/status = target.has_status_effect(/datum/status_effect/stacking/saw_bleed/bloodletting)
|
||||
if(!status)
|
||||
target.apply_status_effect(/datum/status_effect/stacking/saw_bleed/bloodletting, 6)
|
||||
@@ -1121,7 +1121,7 @@
|
||||
user.visible_message(span_warning("[user] dashes through [target]!"),
|
||||
span_notice("You dash through [target]!"))
|
||||
to_chat(target, span_userdanger("[user] dashes through you!"))
|
||||
playsound(src, 'sound/magic/blink.ogg', 50, TRUE)
|
||||
playsound(src, 'sound/effects/magic/blink.ogg', 50, TRUE)
|
||||
target.apply_damage(damage = 17, sharpness = SHARP_POINTY, bare_wound_bonus = 10)
|
||||
var/turf/dash_target = get_turf(target)
|
||||
for(var/distance in 0 to 8)
|
||||
@@ -1141,7 +1141,7 @@
|
||||
to_chat(target, span_userdanger("[user] shatters [src] over you!"))
|
||||
target.apply_damage(damage = ishostile(target) ? 75 : 35, wound_bonus = 20)
|
||||
user.do_attack_animation(target, ATTACK_EFFECT_SMASH)
|
||||
playsound(src, 'sound/effects/glassbr3.ogg', 100, TRUE)
|
||||
playsound(src, 'sound/effects/glass/glassbr3.ogg', 100, TRUE)
|
||||
shattered = TRUE
|
||||
moveToNullspace()
|
||||
balloon_alert(user, "katana shattered")
|
||||
@@ -1150,7 +1150,7 @@
|
||||
/obj/item/cursed_katana/proc/coagulate(mob/user)
|
||||
balloon_alert(user, "katana coagulated")
|
||||
shattered = FALSE
|
||||
playsound(src, 'sound/magic/demon_consume.ogg', 50, TRUE)
|
||||
playsound(src, 'sound/effects/magic/demon_consume.ogg', 50, TRUE)
|
||||
|
||||
#undef ATTACK_STRIKE
|
||||
#undef ATTACK_SLICE
|
||||
|
||||
@@ -321,7 +321,7 @@
|
||||
return
|
||||
update_rail_state(FALSE)
|
||||
Move(new_destination)
|
||||
var/sound/thud_sound = sound('sound/weapons/thudswoosh.ogg')
|
||||
var/sound/thud_sound = sound('sound/items/weapons/thudswoosh.ogg')
|
||||
thud_sound.pitch = 0.5
|
||||
playsound(src, thud_sound, 50, TRUE)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user