mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 03:57:13 +01:00
Makes all playsounds use bools for vary (#26183)
* Makes all playsounds use `TRUE` for vary * Same but for `FALSE`
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user