Makes all playsounds use bools for vary (#26183)

* Makes all playsounds use `TRUE` for vary

* Same but for `FALSE`
This commit is contained in:
DGamerL
2024-07-08 23:54:38 +00:00
committed by GitHub
parent c1e97f712c
commit 4cf6595d12
136 changed files with 233 additions and 233 deletions
+1 -1
View File
@@ -70,7 +70,7 @@
return
if(!force)
playsound(loc, 'sound/weapons/tap.ogg', get_clamped_volume(), 1, -1)
playsound(loc, 'sound/weapons/tap.ogg', get_clamped_volume(), TRUE, -1)
else
SEND_SIGNAL(M, COMSIG_ITEM_ATTACK)
add_attack_logs(user, M, "Attacked with [name] ([uppertext(user.a_intent)]) ([uppertext(damtype)])", (M.ckey && force > 0 && damtype != STAMINA) ? null : ATKLOG_ALMOSTALL)
+3 -3
View File
@@ -226,7 +226,7 @@
set_cooldown(cooldown)
user.visible_message("<span class='boldnotice'>[defib_ref] pings: Cardiac arrhythmia corrected.</span>")
target.visible_message("<span class='warning'>[target]'s body convulses a bit.</span>", "<span class='userdanger'>You feel a jolt, and your heartbeat seems to steady.</span>")
playsound(get_turf(defib_ref), 'sound/machines/defib_zap.ogg', 50, 1, -1)
playsound(get_turf(defib_ref), 'sound/machines/defib_zap.ogg', 50, TRUE, -1)
playsound(get_turf(defib_ref), "bodyfall", 50, 1)
playsound(get_turf(defib_ref), 'sound/machines/defib_success.ogg', 50, 0)
busy = FALSE
@@ -240,7 +240,7 @@
target.visible_message("<span class='warning'>[target]'s body convulses a bit.</span>")
playsound(get_turf(defib_ref), "bodyfall", 50, 1)
playsound(get_turf(defib_ref), 'sound/machines/defib_zap.ogg', 50, 1, -1)
playsound(get_turf(defib_ref), 'sound/machines/defib_zap.ogg', 50, TRUE, -1)
ghost = target.get_ghost(TRUE) // We have to double check whether the dead guy has entered their body during the above
// Run through some quick failure states after shocking.
@@ -340,7 +340,7 @@
"<span class='userdanger'>[user] touches you with [parent], and you feel a strong jolt!</span>")
target.apply_damage(60, STAMINA)
target.KnockDown(10 SECONDS)
playsound(get_turf(parent), 'sound/machines/defib_zap.ogg', 50, 1, -1)
playsound(get_turf(parent), 'sound/machines/defib_zap.ogg', 50, TRUE, -1)
target.emote("gasp")
if(combat && prob(heart_attack_chance))
target.set_heartattack(TRUE)
+1 -1
View File
@@ -27,5 +27,5 @@
current_paint = colour
var/atom/A = parent
A.add_atom_colour(colour, FIXED_COLOUR_PRIORITY)
playsound(spraycan, 'sound/effects/spray.ogg', 5, 1, 5)
playsound(spraycan, 'sound/effects/spray.ogg', 5, TRUE, 5)
to_chat(user, "<span class='notice'>You spray [spraycan] on [A], painting it.</span>")
+2 -2
View File
@@ -47,9 +47,9 @@
continue
var/damage = rand(1, 5)
if(prob(80))
playsound(affected_mob.loc, "punch", 25, 1, -1)
playsound(affected_mob.loc, "punch", 25, TRUE, -1)
affected_mob.visible_message("<span class='danger'>[affected_mob] hits [M] with [affected_mob.p_their()] thrashing!</span>")
M.adjustBruteLoss(damage)
else
playsound(affected_mob.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
playsound(affected_mob.loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
affected_mob.visible_message("<span class='danger'>[affected_mob] fails to hit [M] with [affected_mob.p_their()] thrashing!</span>")
+1 -1
View File
@@ -57,7 +57,7 @@
create_beam(origin, target)
apply_bounce_effect(origin, target, energy, user)
add_attack_logs(user, target, "Bounce spell '[src]' bounced on")
playsound(get_turf(target), bounce_hit_sound, 50, 1, -1)
playsound(get_turf(target), bounce_hit_sound, 50, TRUE, -1)
if(bounces >= 1)
var/list/possible_targets = list()
+1 -1
View File
@@ -53,7 +53,7 @@
jaunt_steam(mobloc)
ADD_TRAIT(target, TRAIT_IMMOBILIZED, "jaunt")
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, TRUE, -1)
sleep(jaunt_in_time * 4)
new jaunt_in_type(mobloc, holder.dir)
target.setDir(holder.dir)
+1 -1
View File
@@ -146,7 +146,7 @@
new /obj/effect/temp_visual/bleed/explode(T)
for(var/d in GLOB.alldirs)
new /obj/effect/temp_visual/dir_setting/bloodsplatter(T, d)
playsound(T, "desceration", 200, 1, -1)
playsound(T, "desceration", 200, TRUE, -1)
owner.adjustBruteLoss(bleed_damage)
else
new /obj/effect/temp_visual/bleed(get_turf(owner))
+1 -1
View File
@@ -286,7 +286,7 @@
var/log_msg = "[key_name(user)] has triggered the depot self destruct at [A.name] ([T.x],[T.y],[T.z])"
message_admins(log_msg)
log_game(log_msg)
playsound(user, 'sound/machines/alarm.ogg', 100, 0, 0)
playsound(user, 'sound/machines/alarm.ogg', 100, FALSE, 0)
else
log_game("Depot self destruct activated.")
if(reactor)
@@ -332,7 +332,7 @@ CONTENTS:
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, TRUE, -1)
add_attack_logs(user, L, "Stunned with [src]")
@@ -340,7 +340,7 @@ CONTENTS:
if(L.IsStunned() || L.IsSleeping())
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, TRUE, -1)
L.Sleeping(120 SECONDS)
add_attack_logs(user, L, "Put to sleep with [src]")
else
@@ -354,7 +354,7 @@ CONTENTS:
return
var/mob/living/carbon/C = L
if(!C.handcuffed)
playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2)
playsound(loc, 'sound/weapons/cablecuff.ogg', 30, TRUE, -2)
C.visible_message("<span class='danger'>[user] begins restraining [C] with [src]!</span>", \
"<span class='userdanger'>[user] begins shaping an energy field around your hands!</span>")
if(do_mob(user, C, 30))
@@ -297,7 +297,7 @@
/mob/living/simple_animal/demon/slaughter/laughter/release_consumed(mob/living/M)
if(M.revive())
M.grab_ghost(force = TRUE)
playsound(get_turf(src), feast_sound, 50, 1, -1)
playsound(get_turf(src), feast_sound, 50, TRUE, -1)
to_chat(M, "<span class='clown'>You leave [src]'s warm embrace, and feel ready to take on the world.</span>")
..(M)
@@ -21,10 +21,10 @@
visible_message("<span class='danger'>[src] punches [target]!</span>")
else
say("[battlecry][battlecry][battlecry][battlecry][battlecry]", TRUE)
playsound(loc, attack_sound, 50, 1, 1)
playsound(loc, attack_sound, 50, 1, 1)
playsound(loc, attack_sound, 50, 1, 1)
playsound(loc, attack_sound, 50, 1, 1)
playsound(loc, attack_sound, 50, TRUE, 1)
playsound(loc, attack_sound, 50, TRUE, 1)
playsound(loc, attack_sound, 50, TRUE, 1)
playsound(loc, attack_sound, 50, TRUE, 1)
/mob/living/simple_animal/hostile/guardian/punch/sealpunch
name = "Seal Sprit"
+1 -1
View File
@@ -174,7 +174,7 @@
if(storedpda)
storedpda.icon_state = preview_icon_state
storedpda.desc = colorlist[preview_icon_state][2]
playsound(loc, 'sound/effects/spray.ogg', 5, 1, 5)
playsound(loc, 'sound/effects/spray.ogg', 5, TRUE, 5)
update_pda_cache()
/obj/machinery/pdapainter/proc/update_pda_cache()
+3 -3
View File
@@ -616,7 +616,7 @@ GLOBAL_LIST_EMPTY(airlock_emissive_underlays)
if("deny")
if(stat == CONSCIOUS)
update_icon(AIRLOCK_DENY)
playsound(src,doorDeni,50,0,3)
playsound(src, doorDeni, 50, FALSE, 3)
sleep(6)
update_icon(AIRLOCK_CLOSED)
@@ -1358,7 +1358,7 @@ GLOBAL_LIST_EMPTY(airlock_emissive_underlays)
return 0
locked = TRUE
playsound(src, boltDown, 30, 0, 3)
playsound(src, boltDown, 30, FALSE, 3)
update_icon()
return 1
@@ -1371,7 +1371,7 @@ GLOBAL_LIST_EMPTY(airlock_emissive_underlays)
return
locked = FALSE
playsound(src,boltUp, 30, 0, 3)
playsound(src,boltUp, 30, FALSE, 3)
update_icon()
return 1
+1 -1
View File
@@ -94,7 +94,7 @@
. = ..()
if(!.) // ..() will return 0 if we didn't actually move anywhere.
return
playsound(loc, pick('sound/items/cartwheel1.ogg', 'sound/items/cartwheel2.ogg'), 100, 1, ignore_walls = FALSE)
playsound(loc, pick('sound/items/cartwheel1.ogg', 'sound/items/cartwheel2.ogg'), 100, TRUE, ignore_walls = FALSE)
#undef IV_TAKING
#undef IV_INJECTING
+1 -1
View File
@@ -416,7 +416,7 @@ GLOBAL_LIST_EMPTY(turret_icons)
M.changeNext_move(CLICK_CD_MELEE)
M.do_attack_animation(src)
if(!(stat & BROKEN))
playsound(src.loc, 'sound/weapons/slash.ogg', 25, 1, -1)
playsound(src.loc, 'sound/weapons/slash.ogg', 25, TRUE, -1)
visible_message("<span class='danger'>[M] has slashed at [src]!</span>")
take_damage(15)
else
+1 -1
View File
@@ -522,7 +522,7 @@
message_admins(adminlog)
log_game(adminlog)
playsound(loc, 'sound/effects/bamf.ogg', 75, 1, 5)
playsound(loc, 'sound/effects/bamf.ogg', 75, TRUE, 5)
if(loc && istype(loc, /obj/machinery/syndicatebomb))
qdel(loc)
@@ -147,10 +147,10 @@
var/obj/structure/reagent_dispensers/watertank/WT = target
WT.reagents.trans_to(src, 1000)
occupant_message("<span class='notice'>Extinguisher refilled.</span>")
playsound(chassis, 'sound/effects/refill.ogg', 50, 1, -6)
playsound(chassis, 'sound/effects/refill.ogg', 50, TRUE, -6)
else
if(reagents.total_volume > 0)
playsound(chassis, 'sound/effects/extinguish.ogg', 75, 1, -3)
playsound(chassis, 'sound/effects/extinguish.ogg', 75, TRUE, -3)
var/direction = get_dir(chassis,target)
var/turf/T = get_turf(target)
var/turf/T1 = get_step(T,turn(direction, 90))
+2 -2
View File
@@ -421,7 +421,7 @@
L.buckled = 0
L.Weaken(10 SECONDS)
L.apply_effect(STUTTER, 10 SECONDS)
playsound(src, pick(hit_sound), 50, 0, 0)
playsound(src, pick(hit_sound), 50, FALSE, 0)
breakthrough = TRUE
else
@@ -555,7 +555,7 @@
/obj/mecha/attack_hand(mob/living/user)
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
playsound(loc, 'sound/weapons/tap.ogg', 40, 1, -1)
playsound(loc, 'sound/weapons/tap.ogg', 40, TRUE, -1)
user.visible_message("<span class='notice'>[user] hits [name]. Nothing happens</span>", "<span class='notice'>You hit [name] with no visible effect.</span>")
log_message("Attack by hand/paw. Attacker - [user].")
+1 -1
View File
@@ -625,7 +625,7 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
src.add_fingerprint(user)
playsound(loc, src.hitsound, 30, 1, -1)
playsound(loc, src.hitsound, 30, TRUE, -1)
user.do_attack_animation(M)
+2 -2
View File
@@ -47,9 +47,9 @@
if(I.flags & NOBLUDGEON)
return
if(!I.force)
playsound(loc, 'sound/weapons/tap.ogg', 20, 1, -1)
playsound(loc, 'sound/weapons/tap.ogg', 20, TRUE, -1)
else if(I.hitsound)
playsound(loc, I.hitsound, 20, 1, -1)
playsound(loc, I.hitsound, 20, TRUE, -1)
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src)
@@ -27,7 +27,7 @@
return
if(dummy_active || !isitem(target))
return
playsound(get_turf(src), 'sound/weapons/flash.ogg', 100, 1, -6)
playsound(get_turf(src), 'sound/weapons/flash.ogg', 100, TRUE, -6)
to_chat(user, "<span class='notice'>Scanned [target].</span>")
saved_name = target.name
saved_desc = target.desc
@@ -43,7 +43,7 @@
/obj/item/chameleon_counterfeiter/proc/matter_toggle(mob/living/user)
if(!can_use || !saved_name)
return
playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6)
playsound(get_turf(src), 'sound/effects/pop.ogg', 100, TRUE, -6)
if(dummy_active)
matter_deactivate()
to_chat(user, "<span class='notice'>You deactivate [src].</span>")
@@ -39,7 +39,7 @@
return
if(!active_dummy)
if(isitem(target) && !istype(target, /obj/item/disk/nuclear))
playsound(get_turf(src), 'sound/weapons/flash.ogg', 100, 1, -6)
playsound(get_turf(src), 'sound/weapons/flash.ogg', 100, TRUE, -6)
to_chat(user, "<span class='notice'>Scanned [target].</span>")
saved_item = target.type
saved_icon = target.icon
@@ -55,7 +55,7 @@
return
if(active_dummy)
eject_all()
playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6)
playsound(get_turf(src), 'sound/effects/pop.ogg', 100, TRUE, -6)
QDEL_NULL(active_dummy)
to_chat(usr, "<span class='notice'>You deactivate [src].</span>")
var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src))
@@ -64,7 +64,7 @@
spawn(8)
qdel(T)
else
playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6)
playsound(get_turf(src), 'sound/effects/pop.ogg', 100, TRUE, -6)
var/obj/O = new saved_item(src)
if(!O)
return
+1 -1
View File
@@ -141,7 +141,7 @@
if(!admins_warned)
admins_warned = TRUE
message_admins("Power sink at ([x],[y],[z] - <A href='byond://?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>) is 95% full. Explosion imminent.")
playsound(src, 'sound/effects/screech.ogg', 100, 1, 1)
playsound(src, 'sound/effects/screech.ogg', 100, TRUE, 1)
if(power_drained >= max_power)
STOP_PROCESSING(SSobj, src)
@@ -59,7 +59,7 @@
if(user)
to_chat(user, "<span class='notice'>Locked In</span>")
new /obj/machinery/power/singularity_beacon/syndicate( user.loc )
playsound(src, 'sound/effects/pop.ogg', 100, 1, 1)
playsound(src, 'sound/effects/pop.ogg', 100, TRUE, 1)
user.drop_item()
qdel(src)
@@ -132,7 +132,7 @@
if(user)
to_chat(user, "<span class='notice'>Locked In</span>")
new bomb(user.loc)
playsound(src, 'sound/effects/pop.ogg', 100, 1, 1)
playsound(src, 'sound/effects/pop.ogg', 100, TRUE, 1)
user.drop_item()
qdel(src)
+2 -2
View File
@@ -17,10 +17,10 @@
return
if(emagged)
playsound(get_turf(src), 'sound/voice/binsult.ogg', 100, 1, vary = 0)//hueheuheuheuheuheuhe
playsound(get_turf(src), 'sound/voice/binsult.ogg', 100, TRUE, vary = 0)//hueheuheuheuheuheuhe
user.visible_message("<span class='warning'>[user]'s [name] gurgles, \"FUCK YOUR CUNT YOU SHIT EATING CUNT TILL YOU ARE A MASS EATING SHIT CUNT. EAT PENISES IN YOUR FUCK FACE AND SHIT OUT ABORTIONS TO FUCK UP SHIT IN YOUR ASS YOU COCK FUCK SHIT MONKEY FROM THE DEPTHS OF SHIT\"</span>")
else
playsound(get_turf(src), 'sound/voice/halt.ogg', 100, 1, vary = 0)
playsound(get_turf(src), 'sound/voice/halt.ogg', 100, TRUE, vary = 0)
user.visible_message("<span class='warning'>[user]'s [name] rasps, \"Halt! Security!\"</span>")
next_use_time = world.time + USE_COOLDOWN
+1 -1
View File
@@ -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, TRUE, -1)
add_attack_logs(user, M, "Stunned with [src] ([uppertext(user.a_intent)])")
#define CYBORG_HUGS 0
@@ -491,7 +491,7 @@ GLOBAL_LIST_INIT(cardboard_recipes, list (
if(istype(I, /obj/item/stamp/clown) && !isstorage(loc))
var/atom/droploc = drop_location()
if(use(1))
playsound(I, 'sound/items/bikehorn.ogg', 50, 1, -1)
playsound(I, 'sound/items/bikehorn.ogg', 50, TRUE, -1)
to_chat(user, "<span class='notice'>You stamp the cardboard! It's a clown box! Honk!</span>")
new/obj/item/storage/box/clown(droploc) //bugfix
else
+1 -1
View File
@@ -128,7 +128,7 @@
/obj/item/crowbar/power/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is putting [user.p_their()] head in [src]. It looks like [user.p_theyre()] trying to commit suicide!</span>")
playsound(loc, 'sound/items/jaws_pry.ogg', 50, 1, -1)
playsound(loc, 'sound/items/jaws_pry.ogg', 50, TRUE, -1)
return BRUTELOSS
/obj/item/crowbar/power/attack_self(mob/user)
+1 -1
View File
@@ -44,7 +44,7 @@
/obj/item/wirecutters/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is cutting at [user.p_their()] [is_robotic_suicide(user) ? "wiring" : "arteries"] with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
playsound(loc, usesound, 50, 1, -1)
playsound(loc, usesound, 50, TRUE, -1)
return BRUTELOSS
/obj/item/wirecutters/proc/is_robotic_suicide(mob/user)
+1 -1
View File
@@ -107,7 +107,7 @@
// Immobilize stops them from wandering off and dropping the wrench
user.Immobilize(10 SECONDS)
playsound(loc, 'sound/effects/pray.ogg', 50, 1, -1)
playsound(loc, 'sound/effects/pray.ogg', 50, TRUE, -1)
// Let the sound effect finish playing
sleep(20)
+3 -3
View File
@@ -372,7 +372,7 @@
user.visible_message("<span class='warning'>[user] presses a button on [src]</span>", "<span class='notice'>You activate [src], it plays a loud noise!</span>", "<span class='notice'>You hear the click of a button.</span>")
spawn(5) //gia said so
icon_state = "nuketoy"
playsound(src, 'sound/machines/alarm.ogg', 100, 0, 0)
playsound(src, 'sound/machines/alarm.ogg', 100, FALSE, 0)
sleep(135)
icon_state = "nuketoycool"
sleep(cooldown - world.time)
@@ -546,10 +546,10 @@
if(has_stuffing || grenade)
var/cuddle_verb = pick("hugs", "cuddles", "snugs")
user.visible_message("<span class='notice'>[user] [cuddle_verb] [src].</span>")
playsound(get_turf(src), poof_sound, 50, 1, -1)
playsound(get_turf(src), poof_sound, 50, TRUE, -1)
if(grenade && !grenade.active)
add_attack_logs(user, user, "activated a hidden grenade in [src].", ATKLOG_MOST)
playsound(loc, 'sound/weapons/armbomb.ogg', 10, 1, -3)
playsound(loc, 'sound/weapons/armbomb.ogg', 10, TRUE, -3)
//We call with grenade as argument, so cutting the grenade out doesn't magically defuse it
addtimer(CALLBACK(src, PROC_REF(explosive_betrayal), grenade), rand(1, 3) SECONDS)
else
@@ -53,7 +53,7 @@
else if(istype(I, /obj/item/reagent_containers/spray/pestspray))
bees_left = max(0, (bees_left - 6))
to_chat(user, "You spray [I] into [src].")
playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6)
playsound(loc, 'sound/effects/spray3.ogg', 50, TRUE, -6)
/obj/item/bee_briefcase/attack_self(mob/user)
var/bees_released
+1 -1
View File
@@ -15,7 +15,7 @@
/obj/item/gavelhammer/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] has sentenced [user.p_themselves()] to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
playsound(loc, 'sound/items/gavel.ogg', 50, 1, -1)
playsound(loc, 'sound/items/gavel.ogg', 50, TRUE, -1)
return BRUTELOSS
/obj/item/gavelblock
+1 -1
View File
@@ -345,7 +345,7 @@
/obj/item/shockpaddles/suicide_act(mob/user)
user.visible_message("<span class='danger'>[user] is putting the live paddles on [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide!</span>")
defib.deductcharge(revivecost)
playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, TRUE, -1)
return OXYLOSS
/obj/item/shockpaddles/dropped(mob/user)
+2 -2
View File
@@ -105,7 +105,7 @@
strangling = M
update_icon(UPDATE_ICON_STATE)
playsound(loc, 'sound/weapons/cablecuff.ogg', 15, 1, -10, ignore_walls = FALSE)
playsound(loc, 'sound/weapons/cablecuff.ogg', 15, TRUE, -10, ignore_walls = FALSE)
M.visible_message("<span class='danger'>[U] comes from behind and begins garroting [M] with [src]!</span>", \
"<span class='userdanger'>[U] begins garroting you with [src]![improvised ? "" : " You are unable to speak!"]</span>", \
@@ -174,5 +174,5 @@
/obj/item/garrote/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is wrapping [src] around [user.p_their()] neck and pulling the handles! It looks like [user.p_theyre()] trying to commit suicide!</span>")
playsound(loc, 'sound/weapons/cablecuff.ogg', 15, 1, -10, ignore_walls = FALSE)
playsound(loc, 'sound/weapons/cablecuff.ogg', 15, TRUE, -10, ignore_walls = FALSE)
return OXYLOSS
@@ -24,7 +24,7 @@
new /obj/effect/payload_spawner(loc, payload, numspawned)//Launches payload
playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
playsound(loc, 'sound/weapons/armbomb.ogg', 75, TRUE, -3)
qdel(src)
@@ -52,7 +52,7 @@
new /obj/effect/payload_spawner(loc, payload, rand(4,8))
playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
playsound(loc, 'sound/weapons/armbomb.ogg', 75, TRUE, -3)
qdel(src)
@@ -26,7 +26,7 @@
to_chat(user, "<span class='warning'>Huh? How does this thing work?</span>")
active = TRUE
icon_state = initial(icon_state) + "_active"
playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
playsound(loc, 'sound/weapons/armbomb.ogg', 75, TRUE, -3)
spawn(5)
if(user)
user.drop_item()
@@ -42,7 +42,7 @@
to_chat(user, "<span class='warning'>You prime the [name]! [det_time/10] seconds!</span>")
active = TRUE
icon_state = initial(icon_state) + "_active"
playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
playsound(loc, 'sound/weapons/armbomb.ogg', 75, TRUE, -3)
spawn(det_time)
prime()
return
@@ -18,7 +18,7 @@
return ..()
/obj/item/grenade/smokebomb/prime()
playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
playsound(src.loc, 'sound/effects/smoke.ogg', 50, TRUE, -3)
smoke.set_up(10, FALSE)
spawn(0)
src.smoke.start()
+1 -1
View File
@@ -91,7 +91,7 @@
C.visible_message("<span class='danger'>[user] is trying to put [src.name] on [C]!</span>", \
"<span class='userdanger'>[user] is trying to put [src.name] on [C]!</span>")
playsound(loc, cuffsound, 15, 1, -10)
playsound(loc, cuffsound, 15, TRUE, -10)
if(do_mob(user, C, 30))
apply_cuffs(C, user, remove_src)
to_chat(user, "<span class='notice'>You handcuff [C].</span>")
@@ -53,7 +53,7 @@
user.unEquip(src, 1)
user.visible_message("<span class='warning'>[src] slips out of the grip of [user] as they try to pick it up, bouncing upwards and smacking [user.p_them()] in the face!</span>", \
"<span class='warning'>[src] slips out of your grip as you pick it up, bouncing upwards and smacking you in the face!</span>")
playsound(get_turf(user), 'sound/effects/hit_punch.ogg', 50, 1, -1)
playsound(get_turf(user), 'sound/effects/hit_punch.ogg', 50, TRUE, -1)
throw_at(get_edge_target_turf(user, pick(GLOB.alldirs)), rand(1, 3), 5)
+1 -1
View File
@@ -36,7 +36,7 @@
/obj/item/restraints/legcuffs/beartrap/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is sticking [user.p_their()] head in [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/bladeslice.ogg', 50, TRUE, -1)
return BRUTELOSS
/obj/item/restraints/legcuffs/beartrap/attack_self(mob/user)
@@ -76,7 +76,7 @@
/obj/item/storage/bag/trash/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] puts [src] over [user.p_their()] head and starts chomping at the insides! Disgusting!</span>")
playsound(loc, 'sound/items/eatfood.ogg', 50, 1, -1)
playsound(loc, 'sound/items/eatfood.ogg', 50, TRUE, -1)
return TOXLOSS
/obj/item/storage/bag/trash/update_icon_state()
@@ -101,15 +101,15 @@
bless(H)
H.visible_message("<span class='danger'>[user] heals [H == user ? "[user.p_themselves()]" : "[H]"] with the power of [deity_name]!</span>",
"<span class='danger'>May the power of [deity_name] compel you to be healed!</span>")
playsound(loc, "punch", 25, 1, -1)
playsound(loc, "punch", 25, TRUE, -1)
else
M.adjustBrainLoss(10)
to_chat(M, "<span class='warning'>You feel dumber.</span>")
H.visible_message("<span class='danger'>[user] beats [H == user ? "[user.p_themselves()]" : "[H]"] over the head with [src]!</span>")
playsound(src.loc, "punch", 25, 1, -1)
playsound(src.loc, "punch", 25, TRUE, -1)
else
M.visible_message("<span class='danger'>[user] smacks [M]'s lifeless corpse with [src].</span>")
playsound(src.loc, "punch", 25, 1, -1)
playsound(src.loc, "punch", 25, TRUE, -1)
/obj/item/storage/bible/afterattack(atom/target, mob/user, proximity, params)
@@ -1130,7 +1130,7 @@
/obj/item/storage/box/hug/attack_self(mob/user)
..()
user.changeNext_move(CLICK_CD_MELEE)
playsound(loc, "rustle", 50, 1, -5)
playsound(loc, "rustle", 50, TRUE, -5)
user.visible_message("<span class='notice'>[user] hugs \the [src].</span>","<span class='notice'>You hug \the [src].</span>")
/obj/item/storage/box/wizard
+1 -1
View File
@@ -513,7 +513,7 @@
/obj/item/butcher_chainsaw/attack(mob/living/target, mob/living/user)
. = ..()
if(HAS_TRAIT(src, TRAIT_WIELDED))
playsound(loc, 'sound/weapons/chainsaw.ogg', 100, 1, -1) //incredibly loud; you ain't goin' for stealth with this thing. Credit to Lonemonk of Freesound for this sound.
playsound(loc, 'sound/weapons/chainsaw.ogg', 100, TRUE, -1) //incredibly loud; you ain't goin' for stealth with this thing. Credit to Lonemonk of Freesound for this sound.
if(isnull(.)) //necessary check, successful attacks return null, without it target will drop any shields they may have before they get a chance to block
target.KnockDown(8 SECONDS)
+2 -2
View File
@@ -226,7 +226,7 @@
return TRUE
else if(prob(30))
visible_message("<span class='warning'>[owner] swings! And [p_they()] miss[p_es()]! How embarassing.</span>", "<span class='warning'>You swing! You miss! Oh no!</span>")
playsound(get_turf(owner), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
playsound(get_turf(owner), 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
do_attack_animation(get_step(owner, pick(GLOB.alldirs)), ATTACK_EFFECT_DISARM)
deflectmode = FALSE
if(!istype(I, /obj/item/beach_ball))
@@ -234,7 +234,7 @@
return FALSE
else
visible_message("<span class='warning'>[owner] swings and deflects [I]!</span>", "<span class='warning'>You swing and deflect [I]!</span>")
playsound(get_turf(owner), 'sound/weapons/baseball_hit.ogg', 50, 1, -1)
playsound(get_turf(owner), 'sound/weapons/baseball_hit.ogg', 50, TRUE, -1)
do_attack_animation(I, ATTACK_EFFECT_DISARM)
I.throw_at(get_edge_target_turf(owner, pick(GLOB.cardinal)), rand(8,10), 14, owner)
deflectmode = FALSE
+1 -1
View File
@@ -16,7 +16,7 @@
opacity = FALSE
/obj/structure/curtain/attack_hand(mob/user)
playsound(get_turf(loc), "rustle", 15, 1, -5)
playsound(get_turf(loc), "rustle", 15, TRUE, -5)
toggle()
..()
@@ -60,7 +60,7 @@
depotarea.activate_self_destruct("Fusion reactor cracked open. Core loose!", TRUE)
var/obj/effect/overload/O = new /obj/effect/overload(get_turf(src))
if(containment_failure)
playsound(loc, 'sound/machines/alarm.ogg', 100, 0, 0)
playsound(loc, 'sound/machines/alarm.ogg', 100, FALSE, 0)
O.deliberate = TRUE
O.max_cycles = 6
if(!skip_qdel)
@@ -263,7 +263,7 @@
buckled_mob.Weaken(12 SECONDS)
buckled_mob.Stuttering(12 SECONDS)
buckled_mob.take_organ_damage(10)
playsound(loc, 'sound/weapons/punch1.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/punch1.ogg', 50, TRUE, -1)
buckled_mob.visible_message("<span class='danger'>[buckled_mob] crashed into [A]!</span>")
/obj/structure/chair/office/light
@@ -545,7 +545,7 @@
if(C.health < C.maxHealth*0.5)
C.Weaken(12 SECONDS)
C.Stuttering(12 SECONDS)
playsound(src.loc, 'sound/weapons/punch1.ogg', 50, 1, -1)
playsound(src.loc, 'sound/weapons/punch1.ogg', 50, TRUE, -1)
smash(user)
/obj/item/chair/stool/attack(mob/M as mob, mob/user as mob)
@@ -87,7 +87,7 @@
occupant.Weaken(12 SECONDS)
occupant.Stuttering(12 SECONDS)
playsound(src.loc, 'sound/weapons/punch1.ogg', 50, 1, -1)
playsound(src.loc, 'sound/weapons/punch1.ogg', 50, TRUE, -1)
if(isliving(A))
var/mob/living/victim = A
victim.Weaken(12 SECONDS)
+2 -2
View File
@@ -247,7 +247,7 @@
if(slippery)
step_away(I, user)
visible_message("<span class='warning'>[I] slips right off [src]!</span>")
playsound(loc, 'sound/misc/slip.ogg', 50, 1, -1)
playsound(loc, 'sound/misc/slip.ogg', 50, TRUE, -1)
else //Don't want slippery moving tables to have the item attached to them if it slides off.
item_placed(I)
else
@@ -805,7 +805,7 @@
if(direct & (direct - 1)) // This represents a diagonal movement, which is split into multiple cardinal movements. We'll handle moving the items on the cardinals only.
return
playsound(loc, pick('sound/items/cartwheel1.ogg', 'sound/items/cartwheel2.ogg'), 100, 1, ignore_walls = FALSE)
playsound(loc, pick('sound/items/cartwheel1.ogg', 'sound/items/cartwheel2.ogg'), 100, TRUE, ignore_walls = FALSE)
var/atom/movable/held
for(var/held_uid in held_items)
+1 -1
View File
@@ -405,7 +405,7 @@
M.visible_message("<span class='notice'>[M] nudges \the [src].</span>")
else
if(M.attack_sound)
playsound(loc, M.attack_sound, 50, 1, 1)
playsound(loc, M.attack_sound, 50, TRUE, 1)
M.visible_message("<span class='danger'>\The [M] [M.attacktext] [src]!</span>")
smash(src)
+1 -1
View File
@@ -2089,7 +2089,7 @@
// These smiting types are valid for all living mobs
if("Lightning bolt")
M.electrocute_act(5, "Lightning Bolt", flags = SHOCK_NOGLOVES)
playsound(get_turf(M), 'sound/magic/lightningshock.ogg', 50, 1, -1)
playsound(get_turf(M), 'sound/magic/lightningshock.ogg', 50, TRUE, -1)
M.adjustFireLoss(75)
M.Weaken(10 SECONDS)
to_chat(M, "<span class='userdanger'>The gods have punished you for your sins!</span>")
+1 -1
View File
@@ -56,7 +56,7 @@ GLOBAL_LIST_EMPTY(sounds_cache)
log_admin("[key_name(src)] played a local sound [S]")
message_admins("[key_name_admin(src)] played a local sound [S]", 1)
playsound(get_turf(src.mob), S, 50, 0, 0)
playsound(get_turf(src.mob), S, 50, FALSE, 0)
SSblackbox.record_feedback("tally", "admin_verb", 1, "Play Local Sound") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/play_server_sound()
@@ -21,7 +21,7 @@
user.visible_message("<span class='warning'>[user] suddenly hits [M] in the face and slips out of their grab!</span>")
M.Stun(2 SECONDS) //Drops the grab
M.apply_damage(5, BRUTE, "head", M.run_armor_check("head", "melee"))
playsound(user.loc, 'sound/weapons/punch1.ogg', 25, 1, -1)
playsound(user.loc, 'sound/weapons/punch1.ogg', 25, TRUE, -1)
user.revive()
user.updatehealth("revive sting")
user.update_blind_effects()
+2 -2
View File
@@ -29,7 +29,7 @@
update_icon()
if(usr)
playsound(usr.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3)
playsound(usr.loc, 'sound/weapons/handcuffs.ogg', 30, TRUE, -3)
/obj/item/assembly/mousetrap/update_icon_state()
@@ -94,7 +94,7 @@
armed = !armed
update_icon()
playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3)
playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, TRUE, -3)
/obj/item/assembly/mousetrap/attack_hand(mob/living/user)
if(armed)
@@ -331,7 +331,7 @@ Pipelines + Other Objects -> Pipe network
user.forceMove(target_move)
if(world.time - user.last_played_vent > VENT_SOUND_DELAY)
user.last_played_vent = world.time
playsound(src, 'sound/machines/ventcrawl.ogg', 50, 1, -3)
playsound(src, 'sound/machines/ventcrawl.ogg', 50, TRUE, -3)
else
if((direction & initialize_directions) || is_type_in_list(src, GLOB.ventcrawl_machinery)) //if we move in a way the pipe can connect, but doesn't - or we're in a vent
user.remove_ventcrawl()
+1 -1
View File
@@ -152,7 +152,7 @@
var/mob/living/carbon/C = A
if(cell.use(stun_cost))
do_sparks(5, 0, loc)
playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/egloves.ogg', 50, TRUE, -1)
H.do_attack_animation(C)
visible_message("<span class='danger'>[C] has been touched with [src] by [H]!</span>")
add_attack_logs(H, C, "Touched with stun gloves")
+2 -2
View File
@@ -33,10 +33,10 @@
if(active_sound)
while(up)
playsound(src.loc, "[active_sound]", 100, 0, 4)
playsound(src.loc, "[active_sound]", 100, FALSE, 4)
sleep(15)
if(toggle_sound)
playsound(src.loc, "[toggle_sound]", 100, 0, 4)
playsound(src.loc, "[toggle_sound]", 100, FALSE, 4)
/obj/item/clothing/head/helmet/visor
name = "visor helmet"
+2 -2
View File
@@ -415,12 +415,12 @@
if(!safety)
message = "FUCK YOUR CUNT YOU SHIT EATING COCKSUCKER MAN EAT A DONG FUCKING ASS RAMMING SHIT FUCK EAT PENISES IN YOUR FUCK FACE AND SHIT OUT ABORTIONS OF FUCK AND DO SHIT IN YOUR ASS YOU COCK FUCK SHIT MONKEY FUCK ASS WANKER FROM THE DEPTHS OF SHIT."
usr.visible_message("[usr]'s Compli-o-Nator: <font color='red' size='4'><b>[message]</b></font>")
playsound(src.loc, 'sound/voice/binsult.ogg', 100, 0, 4)
playsound(src.loc, 'sound/voice/binsult.ogg', 100, FALSE, 4)
cooldown = world.time
return
usr.visible_message("[usr]'s Compli-o-Nator: <font color='red' size='4'><b>[message]</b></font>")
playsound(src.loc, "sound/voice/complionator/[key].ogg", 100, 0, 4)
playsound(src.loc, "sound/voice/complionator/[key].ogg", 100, FALSE, 4)
cooldown = world.time
+1 -1
View File
@@ -326,7 +326,7 @@
user.flying = TRUE
do_callback = TRUE
if(user.throw_at(target, jumpdistance, jumpspeed, spin = FALSE, diagonals_first = TRUE, callback = do_callback ? VARSET_CALLBACK(user, flying, FALSE) : null))
playsound(src, 'sound/effects/stealthoff.ogg', 50, 1, 1)
playsound(src, 'sound/effects/stealthoff.ogg', 50, TRUE, 1)
user.visible_message("<span class='warning'>[usr] dashes forward into the air!</span>")
recharging_time = world.time + recharging_rate
cell.use(dash_cost)
+1 -1
View File
@@ -445,7 +445,7 @@
user.flying = TRUE
do_callback = TRUE
if(user.throw_at(target, jumpdistance, jumpspeed, spin = FALSE, diagonals_first = TRUE, callback = do_callback ? VARSET_CALLBACK(user, flying, FALSE) : null))
playsound(src, 'sound/effects/stealthoff.ogg', 50, 1, 1)
playsound(src, 'sound/effects/stealthoff.ogg', 50, TRUE, 1)
user.visible_message("<span class='warning'>[usr] dashes forward into the air!</span>")
recharging_time = world.time + recharging_rate
else
+1 -1
View File
@@ -625,7 +625,7 @@
continue
owner.Beam(M,icon_state="lightning[rand(1, 12)]",icon='icons/effects/effects.dmi',time=5)
M.adjustFireLoss(20)
playsound(M, 'sound/machines/defib_zap.ogg', 50, 1, -1)
playsound(M, 'sound/machines/defib_zap.ogg', 50, TRUE, -1)
add_attack_logs(owner, M, "[M] was shocked by [owner]'s [src]", ATKLOG_ALMOSTALL)
disable(rand(2, 5)) // let's not have buckshot set it off 4 times and do 80 burn damage.
return TRUE
@@ -31,7 +31,7 @@
H.visible_message("<span class='warning'>[H]'s suit automatically extinguishes [H.p_them()]!</span>","<span class='warning'>Your suit automatically extinguishes you.</span>")
if(!extinguishes_left)
to_chat(H, "<span class='warning'>Onboard auto-extinguisher depleted, refill with a cartridge.</span>")
playsound(H.loc, 'sound/effects/spray.ogg', 10, 1, -3)
playsound(H.loc, 'sound/effects/spray.ogg', 10, TRUE, -3)
H.ExtinguishMob()
new /obj/effect/particle_effect/water(get_turf(H))
return FALSE
+1 -1
View File
@@ -738,7 +738,7 @@
icon_state = new_state["icon_state"]
state = choice
to_chat(user, "You adjust the helmet.")
playsound(src.loc, "[toggle_sound]", 100, 0, 4)
playsound(src.loc, "[toggle_sound]", 100, FALSE, 4)
user.update_inv_head()
return 1
+1 -1
View File
@@ -9,7 +9,7 @@
var/turf/T = get_turf(pick(GLOB.xeno_spawn))
var/mob/living/simple_animal/hostile/floor_cluwne/S = new(T)
playsound(S, 'sound/spookoween/scary_horn.ogg', 50, 1, -1)
playsound(S, 'sound/spookoween/scary_horn.ogg', 50, TRUE, -1)
message_admins("A floor cluwne has been spawned at [COORD(T)][ADMIN_JMP(T)]")
log_game("A floor cluwne has been spawned at [COORD(T)]")
return 1
+1 -1
View File
@@ -34,6 +34,6 @@
var/datum/effect_system/smoke_spread/chem/smoke = new
smoke.set_up(R, vent, TRUE)
playsound(vent.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
playsound(vent.loc, 'sound/effects/smoke.ogg', 50, TRUE, -3)
smoke.start(3)
qdel(R)
@@ -548,7 +548,7 @@
var/chosen_wire = tgui_input_list(user, "OH GOD OH GOD", "WHAT WIRE?!", wires)
if(!in_range(src, user) || issilicon(usr) || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || user.restrained() || !chosen_wire)
return
playsound(src, I.usesound, 50, 1, 1)
playsound(src, I.usesound, 50, TRUE, 1)
user.visible_message("<span class='warning'>[user] cuts the [chosen_wire] wire!</span>", "<span class='danger'>You cut the [chosen_wire] wire!</span>")
sleep(5)
if(chosen_wire == correct_wire)
@@ -570,7 +570,7 @@
return
user.visible_message("<span class='notice'>[user] starts removing the payload and wires from [src].</span>")
if(do_after(user, 40 * I.toolspeed, target = src))
playsound(src, I.usesound, 50, 1, 1)
playsound(src, I.usesound, 50, TRUE, 1)
user.unEquip(src)
user.visible_message("<span class='notice'>[user] removes the insides of [src]!</span>")
var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(src.loc)
+2 -2
View File
@@ -32,7 +32,7 @@
/obj/item/food/snacks/grown/banana/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is aiming [src] at [user.p_themselves()]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1)
playsound(loc, 'sound/items/bikehorn.ogg', 50, TRUE, -1)
sleep(25)
if(!user)
return OXYLOSS
@@ -70,7 +70,7 @@
/obj/item/grown/bananapeel/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is deliberately slipping on [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
playsound(loc, 'sound/misc/slip.ogg', 50, 1, -1)
playsound(loc, 'sound/misc/slip.ogg', 50, TRUE, -1)
return BRUTELOSS
+1 -1
View File
@@ -124,7 +124,7 @@
var/mob/living/carbon/C = user
C.throw_mode_on()
icon_state = "firelemon_active"
playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
playsound(loc, 'sound/weapons/armbomb.ogg', 75, TRUE, -3)
addtimer(CALLBACK(src, PROC_REF(prime)), rand(10, 60))
/obj/item/food/snacks/grown/firelemon/burn()
+2 -2
View File
@@ -122,7 +122,7 @@
/obj/item/hatchet/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is chopping at [user.p_themselves()] with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/bladeslice.ogg', 50, TRUE, -1)
return BRUTELOSS
/obj/item/hatchet/unathiknife
@@ -172,7 +172,7 @@
var/obj/item/organ/external/affecting = H.get_organ("head")
if(affecting)
affecting.droplimb(1, DROPLIMB_SHARP)
playsound(loc, pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg'), 50, 1, -1)
playsound(loc, pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg'), 50, TRUE, -1)
return BRUTELOSS
/obj/item/scythe/pre_attack(atom/A, mob/living/user, params)
@@ -92,7 +92,7 @@
AddComponent(/datum/component/spooky)
/obj/item/instrument/trumpet/spectral/attack(mob/living/carbon/C, mob/user)
playsound(src, 'sound/instruments/trombone/En4.mid', 100, 1, -1)
playsound(src, 'sound/instruments/trombone/En4.mid', 100, TRUE, -1)
..()
/obj/item/instrument/saxophone
@@ -115,7 +115,7 @@
AddComponent(/datum/component/spooky)
/obj/item/instrument/saxophone/spectral/attack(mob/living/carbon/C, mob/user)
playsound(src, 'sound/instruments/saxophone/En4.mid', 100,1,-1)
playsound(src, 'sound/instruments/saxophone/En4.mid', 100, TRUE,-1)
..()
/obj/item/instrument/trombone
@@ -148,7 +148,7 @@
attack_verb = list("Wahed", "Waahed", "Waaahed", "Honked")
/obj/item/instrument/trombone/sad/attack(mob/living/carbon/C, mob/user)
playsound(loc, 'sound/misc/sadtrombone.ogg', 50, 1, -1)
playsound(loc, 'sound/misc/sadtrombone.ogg', 50, TRUE, -1)
..()
/obj/item/instrument/recorder
+4 -4
View File
@@ -18,7 +18,7 @@
var/damage = rand(5, 8) + A.dna.species.punchdamagelow
if(!damage)
playsound(D.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
playsound(D.loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
D.visible_message("<span class='warning'>[A] has attempted to hit [D] with a [atk_verb]!</span>")
add_attack_logs(A, D, "Melee attacked with [src] (miss/block)", ATKLOG_ALL)
return 0
@@ -27,7 +27,7 @@
var/obj/item/organ/external/affecting = D.get_organ(ran_zone(A.zone_selected))
var/armor_block = D.run_armor_check(affecting, MELEE)
playsound(D.loc, 'sound/weapons/punch1.ogg', 25, 1, -1)
playsound(D.loc, 'sound/weapons/punch1.ogg', 25, TRUE, -1)
D.visible_message("<span class='danger'>[A] has hit [D] with a [atk_verb]!</span>", \
"<span class='userdanger'>[A] has hit [D] with a [atk_verb]!</span>")
@@ -76,14 +76,14 @@
damage = 0
if(!damage)
playsound(D.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
playsound(D.loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
D.visible_message("<span class='warning'>[A] has attempted to hit [D] with a [atk_verb]!</span>")
return 1 //returns 1 so that they actually miss and don't switch to attackhand damage
var/obj/item/organ/external/affecting = D.get_organ(ran_zone(A.zone_selected))
var/armor_block = D.run_armor_check(affecting, MELEE)
playsound(D.loc, 'sound/weapons/punch1.ogg', 25, 1, -1)
playsound(D.loc, 'sound/weapons/punch1.ogg', 25, TRUE, -1)
D.visible_message("<span class='danger'>[A] has hit [D] with a [atk_verb]!</span>", \
@@ -7,7 +7,7 @@
if(!target.stat)
target.visible_message("<span class='warning'>[user] strikes [target]'s abdomen, neck and back consecutively</span>", \
"<span class='userdanger'>[user] strikes your abdomen, neck and back consecutively!</span>")
playsound(get_turf(target), 'sound/weapons/cqchit2.ogg', 50, 1, -1)
playsound(get_turf(target), 'sound/weapons/cqchit2.ogg', 50, TRUE, -1)
target.apply_damage(70, STAMINA)
target.apply_damage(20, BRUTE)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Consecutive", ATKLOG_ALL)
+2 -2
View File
@@ -8,7 +8,7 @@
if(!IS_HORIZONTAL(target) && user != target)
target.visible_message("<span class='warning'>[user] kicks [target] back!</span>", \
"<span class='userdanger'>[user] kicks you back!</span>")
playsound(get_turf(user), 'sound/weapons/cqchit1.ogg', 25, 1, -1)
playsound(get_turf(user), 'sound/weapons/cqchit1.ogg', 25, TRUE, -1)
var/atom/throw_target = get_edge_target_turf(target, user.dir)
target.throw_at(throw_target, 1, 14, user)
target.apply_damage(25, STAMINA)
@@ -18,7 +18,7 @@
else if(IS_HORIZONTAL(target) && user != target)
target.visible_message("<span class='warning'>[user] kicks [target]'s head, disorienting [target.p_them()]!</span>", \
"<span class='userdanger'>[user] kicks your head, disorienting you!</span>")
playsound(get_turf(user), 'sound/weapons/genhit1.ogg', 25, 1, -1)
playsound(get_turf(user), 'sound/weapons/genhit1.ogg', 25, TRUE, -1)
var/atom/throw_target = get_edge_target_turf(target, user.dir)
target.throw_at(throw_target, 1, 8, user)
target.apply_damage(40, STAMINA)
@@ -9,6 +9,6 @@
if(I && target.drop_item())
user.put_in_hands(I)
target.apply_damage(40, STAMINA)
playsound(get_turf(user), 'sound/weapons/cqchit1.ogg', 5, 1, -1)
playsound(get_turf(user), 'sound/weapons/cqchit1.ogg', 5, TRUE, -1)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Pressure", ATKLOG_ALL)
return MARTIAL_COMBO_DONE
+1 -1
View File
@@ -9,7 +9,7 @@
return MARTIAL_COMBO_FAIL
target.visible_message("<span class='warning'>[user] slams [target] into the ground!</span>", \
"<span class='userdanger'>[user] slams you into the ground!</span>")
playsound(get_turf(user), 'sound/weapons/slam.ogg', 40, 1, -1)
playsound(get_turf(user), 'sound/weapons/slam.ogg', 40, TRUE, -1)
target.apply_damage(50, STAMINA)
target.KnockDown(7 SECONDS)
target.SetConfused(12 SECONDS)
@@ -14,7 +14,7 @@
user.do_attack_animation(target, ATTACK_EFFECT_KICK)
target.visible_message("<span class='warning'>[user] leg sweeps [target]!</span>", \
"<span class='userdanger'>[user] leg sweeps you!</span>")
playsound(get_turf(user), 'sound/effects/hit_kick.ogg', 50, 1, -1)
playsound(get_turf(user), 'sound/effects/hit_kick.ogg', 50, TRUE, -1)
target.apply_damage(5, BRUTE)
target.KnockDown(4 SECONDS)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Leg Sweep", ATKLOG_ALL)
@@ -6,7 +6,7 @@
user.do_attack_animation(target, ATTACK_EFFECT_PUNCH)
target.visible_message("<span class='warning'>[user] pounds [target] on the chest!</span>", \
"<span class='userdanger'>[user] slams your chest! You can't breathe!</span>")
playsound(get_turf(user), 'sound/effects/hit_punch.ogg', 50, 1, -1)
playsound(get_turf(user), 'sound/effects/hit_punch.ogg', 50, TRUE, -1)
target.AdjustLoseBreath(10 SECONDS)
target.apply_damage(30, STAMINA)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Lung Punch", ATKLOG_ALL)
@@ -6,7 +6,7 @@
user.do_attack_animation(target, ATTACK_EFFECT_PUNCH)
target.visible_message("<span class='warning'>[user] karate chops [target]'s neck!</span>", \
"<span class='userdanger'>[user] karate chops your neck, rendering you unable to speak for a short time!</span>")
playsound(get_turf(user), 'sound/effects/hit_punch.ogg', 50, 1, -1)
playsound(get_turf(user), 'sound/effects/hit_punch.ogg', 50, TRUE, -1)
target.apply_damage(5, BRUTE, BODY_ZONE_HEAD)
target.AdjustSilence(20 SECONDS)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Neck Chop", ATKLOG_ALL)
@@ -7,7 +7,7 @@
if(!target.stat && !target.IsStunned() && !target.IsWeakened())
var/damage = rand(5, 8) + user.dna.species.punchdamagelow
if(!damage)
playsound(target.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
playsound(target.loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
target.visible_message("<span class='warning'>[user] swings invisible nunchcuks at [target]..and misses?</span>")
return MARTIAL_COMBO_DONE
@@ -17,7 +17,7 @@
target.visible_message("<span class='danger'>[user] has hit [target] with invisible nunchucks!</span>", \
"<span class='userdanger'>[user] has hit [target] with a with invisible nunchuck!</span>")
playsound(get_turf(user), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
playsound(get_turf(user), 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
target.apply_damage(damage, STAMINA, affecting, armor_block)
add_attack_logs(user, target, "Melee attacked with [src] (mimechuck)")
@@ -5,7 +5,7 @@
/datum/martial_combo/plasma_fist/plasma_fist/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
user.do_attack_animation(target, ATTACK_EFFECT_PUNCH)
playsound(target.loc, 'sound/weapons/punch1.ogg', 50, 1, -1)
playsound(target.loc, 'sound/weapons/punch1.ogg', 50, TRUE, -1)
user.say("PLASMA FIST!")
target.visible_message("<span class='danger'>[user] has hit [target] with THE PLASMA FIST TECHNIQUE!</span>", \
"<span class='userdanger'>[user] has hit [target] with THE PLASMA FIST TECHNIQUE!</span>")
@@ -6,7 +6,7 @@
/datum/martial_combo/plasma_fist/throwback/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
target.visible_message("<span class='danger'>[user] has hit [target] with Plasma Punch!</span>", \
"<span class='userdanger'>[user] has hit [target] with Plasma Punch!</span>")
playsound(target.loc, 'sound/weapons/punch1.ogg', 50, 1, -1)
playsound(target.loc, 'sound/weapons/punch1.ogg', 50, TRUE, -1)
var/atom/throw_target = get_edge_target_turf(target, get_dir(target, get_step_away(target, user)))
target.throw_at(throw_target, 200, 4, user)
user.say("HYAH!")
@@ -16,5 +16,5 @@
/datum/martial_combo/plasma_fist/tornado_sweep/proc/do_tornado_effect(mob/living/carbon/human/user)
for(var/i in list(NORTH,SOUTH,EAST,WEST,EAST,SOUTH,NORTH,SOUTH,EAST,WEST,EAST,SOUTH))
user.dir = i
playsound(user.loc, 'sound/weapons/punch1.ogg', 15, 1, -1)
playsound(user.loc, 'sound/weapons/punch1.ogg', 15, TRUE, -1)
sleep(1)
+4 -4
View File
@@ -100,16 +100,16 @@
picked_hit_type = "stomps on"
D.apply_damage(bonus_damage, STAMINA)
if(picked_hit_type == "kicks" || picked_hit_type == "stomps on")
playsound(get_turf(D), 'sound/weapons/cqchit2.ogg', 10, 1, -1)
playsound(get_turf(D), 'sound/weapons/cqchit2.ogg', 10, TRUE, -1)
else
playsound(get_turf(D), 'sound/weapons/cqchit1.ogg', 10, 1, -1)
playsound(get_turf(D), 'sound/weapons/cqchit1.ogg', 10, TRUE, -1)
D.visible_message("<span class='danger'>[A] [picked_hit_type] [D]!</span>", \
"<span class='userdanger'>[A] [picked_hit_type] you!</span>")
add_attack_logs(A, D, "Melee attacked with martial-art [src] : [picked_hit_type]", ATKLOG_ALL)
if(IS_HORIZONTAL(A) && !IS_HORIZONTAL(D))
D.visible_message("<span class='warning'>[A] leg sweeps [D]!", \
"<span class='userdanger'>[A] leg sweeps you!</span>")
playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 10, 1, -1)
playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 10, TRUE, -1)
D.KnockDown(5 SECONDS)
A.SetKnockDown(0 SECONDS)
A.resting = FALSE
@@ -134,7 +134,7 @@
D.apply_damage(15, STAMINA)
else
D.visible_message("<span class='danger'>[A] attempted to disarm [D]!</span>", "<span class='userdanger'>[A] attempted to disarm [D]!</span>")
playsound(D, 'sound/weapons/punchmiss.ogg', 5, 1, -1)
playsound(D, 'sound/weapons/punchmiss.ogg', 5, TRUE, -1)
add_attack_logs(A, D, "Disarmed with martial-art [src]", ATKLOG_ALL)
return TRUE
+1 -1
View File
@@ -11,7 +11,7 @@
bonus_damage = 15
picked_hit_type = "stomps on"
A.do_attack_animation(D, ATTACK_EFFECT_KICK)
playsound(get_turf(D), 'sound/effects/hit_kick.ogg', 50, 1, -1)
playsound(get_turf(D), 'sound/effects/hit_kick.ogg', 50, TRUE, -1)
D.apply_damage(bonus_damage, BRUTE)
D.visible_message("<span class='danger'>[A] [picked_hit_type] [D]!</span>", \
"<span class='userdanger'>[A] [picked_hit_type] you!</span>")
+3 -3
View File
@@ -131,14 +131,14 @@
A.do_attack_animation(D, attack.animation_type)
if(!damage)
playsound(D.loc, attack.miss_sound, 25, 1, -1)
playsound(D.loc, attack.miss_sound, 25, TRUE, -1)
D.visible_message("<span class='warning'>[A] has attempted to [atk_verb] [D]!</span>")
return FALSE
var/obj/item/organ/external/affecting = D.get_organ(ran_zone(A.zone_selected))
var/armor_block = D.run_armor_check(affecting, MELEE)
playsound(D.loc, attack.attack_sound, 25, 1, -1)
playsound(D.loc, attack.attack_sound, 25, TRUE, -1)
D.visible_message("<span class='danger'>[A] has [atk_verb]ed [D]!</span>", \
"<span class='userdanger'>[A] has [atk_verb]ed [D]!</span>")
@@ -420,7 +420,7 @@
"[user] twirls and slams [H] with [src]!")
H.visible_message("<span class='warning'>[pick(fluffmessages)]</span>", \
"<span class='userdanger'>[pick(fluffmessages)]</span>")
playsound(get_turf(user), 'sound/effects/woodhit.ogg', 75, 1, -1)
playsound(get_turf(user), 'sound/effects/woodhit.ogg', 75, TRUE, -1)
H.apply_damage(rand(13,20), STAMINA)
if(prob(10))
H.visible_message("<span class='warning'>[H] collapses!</span>", \
@@ -105,7 +105,7 @@
return
if(user.has_status_effect(STATUS_EFFECT_DASH) && user.a_intent == INTENT_HELP)
if(user.throw_at(target, range = 3, speed = 3, spin = FALSE, diagonals_first = TRUE))
playsound(src, 'sound/effects/stealthoff.ogg', 50, 1, 1)
playsound(src, 'sound/effects/stealthoff.ogg', 50, TRUE, 1)
user.visible_message("<span class='warning'>[user] dashes!</span>")
else
to_chat(user, "<span class='warning'>Something prevents you from dashing!</span>")
+2 -2
View File
@@ -91,7 +91,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', 50, 1, -3)
playsound(holder_obj.loc, 'sound/items/fultext_deploy.ogg', 50, TRUE, -3)
animate(holder_obj, pixel_z = 10, time = 20)
sleep(20)
animate(holder_obj, pixel_z = 15, time = 10)
@@ -102,7 +102,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
sleep(10)
animate(holder_obj, pixel_z = 10, time = 10)
sleep(10)
playsound(holder_obj.loc, 'sound/items/fultext_launch.ogg', 50, 1, -3)
playsound(holder_obj.loc, 'sound/items/fultext_launch.ogg', 50, TRUE, -3)
animate(holder_obj, pixel_z = 1000, time = 30)
if(ishuman(A))
var/mob/living/carbon/human/L = A
@@ -69,6 +69,6 @@
if(!gibbed)
if(death_sound)
playsound(loc, death_sound, 80, 1, 1)
playsound(loc, death_sound, 80, TRUE, 1)
visible_message("<B>[src]</B> [death_message]")
update_icons()
@@ -26,7 +26,7 @@ This code could certainly use with a touch of TLC, but it functions alright. Bit
else
if(health > 0)
M.do_attack_animation(src, ATTACK_EFFECT_BITE)
playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/bite.ogg', 50, TRUE, -1)
visible_message("<span class='danger'>[M.name] bites [src]!</span>", \
"<span class='userdanger'>[M.name] bites [src]!</span>")
adjustBruteLoss(1)
@@ -88,7 +88,7 @@
else if(A.density && !A.CanPass(src))
visible_message("<span class ='danger'>[src] smashes into [A]!</span>", "<span class ='alertalien'>[src] smashes into [A]!</span>")
Weaken(2 SECONDS, TRUE)
playsound(get_turf(src), 'sound/effects/bang.ogg', 50, 0, 0) // owwie
playsound(get_turf(src), 'sound/effects/bang.ogg', 50, FALSE, 0) // owwie
..()
if(leaping)
leaping = FALSE
@@ -77,7 +77,7 @@ GLOBAL_LIST_INIT(strippable_alien_humanoid_items, create_strippable_list(list(
. += alien_movement_delay
/mob/living/carbon/alien/humanoid/resist_restraints(attempt_breaking)
playsound(src, 'sound/voice/hiss5.ogg', 40, 1, 1) //Alien roars when starting to break free
playsound(src, 'sound/voice/hiss5.ogg', 40, TRUE, 1) //Alien roars when starting to break free
attempt_breaking = TRUE
return ..()
@@ -10,7 +10,7 @@
Stun(2 SECONDS)
throw_at(get_edge_target_turf(user, get_dir(user, src)), 3, 7)
hitverb = "slammed"
playsound(loc, "punch", 25, 1, -1)
playsound(loc, "punch", 25, TRUE, -1)
visible_message("<span class='danger'>[user] has [hitverb] [src]!</span>", "<span class='userdanger'>[user] has [hitverb] [src]!</span>")
return TRUE
@@ -20,7 +20,7 @@
if(INTENT_HARM)
var/damage = rand(1, 9)
if(prob(90))
playsound(loc, "punch", 25, 1, -1)
playsound(loc, "punch", 25, TRUE, -1)
visible_message("<span class='danger'>[M] has punched [src]!</span>", \
"<span class='userdanger'>[M] has punched [src]!</span>")
if((stat != DEAD) && (damage > 9||prob(5)))//Regular humans have a very small chance of weakening an alien.
@@ -31,25 +31,25 @@
adjustBruteLoss(damage)
add_attack_logs(M, src, "Melee attacked with fists")
else
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
visible_message("<span class='danger'>[M] has attempted to punch [src]!</span>")
if(INTENT_DISARM)
if(!IS_HORIZONTAL(src))
if(prob(5))//Very small chance to push an alien down.
Paralyse(4 SECONDS)
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
add_attack_logs(M, src, "Pushed over")
visible_message("<span class='danger'>[M] has pushed down [src]!</span>", \
"<span class='userdanger'>[M] has pushed down [src]!</span>")
else
if(prob(50))
drop_item()
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
visible_message("<span class='danger'>[M] has disarmed [src]!</span>", \
"<span class='userdanger'>[M] has disarmed [src]!</span>")
else
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
visible_message("<span class='danger'>[M] has attempted to disarm [src]!</span>")
/mob/living/carbon/alien/humanoid/do_attack_animation(atom/A, visual_effect_icon, obj/item/used_item, no_effect)
@@ -2,7 +2,7 @@
if(..())
var/damage = rand(1, 9)
if(prob(90))
playsound(loc, "punch", 25, 1, -1)
playsound(loc, "punch", 25, TRUE, -1)
add_attack_logs(M, src, "Melee attacked with fists")
visible_message("<span class='danger'>[M] has kicked [src]!</span>", \
"<span class='userdanger'>[M] has kicked [src]!</span>")
@@ -12,7 +12,7 @@
adjustBruteLoss(damage)
updatehealth()
else
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
visible_message("<span class='danger'>[M] has attempted to kick [src]!</span>", \
"<span class='userdanger'>[M] has attempted to kick [src]!</span>")
@@ -223,7 +223,7 @@
adjustStaminaLoss(-10)
resting = FALSE
stand_up() // help them up if possible
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
if(!player_logged)
M.visible_message( \
"<span class='notice'>[M] shakes [src] trying to wake [p_them()] up!</span>",\
@@ -236,7 +236,7 @@
M.apply_status_effect(effect.type)
return
// BEGIN HUGCODE - N3X
playsound(get_turf(src), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
playsound(get_turf(src), 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
if(M.zone_selected == "head")
M.visible_message(\
"<span class='notice'>[M] pats [src] on the head.</span>",\
@@ -1067,7 +1067,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
stop_pulling()
to_chat(src, "<span class='notice'>You [slipVerb]ped on [description]!</span>")
playsound(loc, 'sound/misc/slip.ogg', 50, 1, -3)
playsound(loc, 'sound/misc/slip.ogg', 50, TRUE, -3)
// Something something don't run with scissors
moving_diagonally = 0 //If this was part of diagonal move slipping will stop it.
KnockDown(knockdown)
@@ -698,10 +698,10 @@ emp_act
if(M.a_intent == INTENT_DISARM) //If not absorbed, you get disarmed, knocked down, and hit with stamina damage.
if(absorb_stun(0))
visible_message("<span class='warning'>[src] is not affected by [M]'s disarm attempt!</span>")
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
return FALSE
var/obj/item/organ/external/affecting = get_organ(ran_zone(M.zone_selected))
playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
playsound(loc, 'sound/weapons/pierce.ogg', 25, TRUE, -1)
apply_effect(10 SECONDS, KNOCKDOWN, run_armor_check(affecting, MELEE))
M.changeNext_move(1.6 SECONDS)
apply_damage(M.alien_disarm_damage, STAMINA)
@@ -443,4 +443,4 @@
return
if(thing && equipped_item.can_be_inserted(thing)) // put thing in belt or bag
equipped_item.handle_item_insertion(thing, src)
playsound(loc, "rustle", 50, 1, -5)
playsound(loc, "rustle", 50, TRUE, -5)
@@ -807,7 +807,7 @@
if(!src.xylophone)
visible_message("<span class='warning'>[src] begins playing [p_their()] ribcage like a xylophone. It's quite spooky.</span>","<span class='notice'>You begin to play a spooky refrain on your ribcage.</span>","<span class='warning'>You hear a spooky xylophone melody.</span>")
var/song = pick('sound/effects/xylophone1.ogg','sound/effects/xylophone2.ogg','sound/effects/xylophone3.ogg')
playsound(loc, song, 50, 1, -1)
playsound(loc, song, 50, TRUE, -1)
xylophone = 1
spawn(1200)
xylophone=0
@@ -574,7 +574,7 @@
if(target.absorb_stun(0))
target.visible_message("<span class='warning'>[target] is not affected by [user]'s disarm attempt!</span>")
user.do_attack_animation(target, ATTACK_EFFECT_DISARM)
playsound(target.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
playsound(target.loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
return FALSE
if(attacker_style && attacker_style.disarm_act(user, target) == MARTIAL_ARTS_ACT_SUCCESS)
return TRUE
@@ -590,7 +590,7 @@
var/shove_dir = get_dir(user.loc, target.loc)
var/turf/shove_to = get_step(target.loc, shove_dir)
playsound(shove_to, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
playsound(shove_to, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
if(shove_to == user.loc)
return FALSE

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