cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-17 10:03:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes all playsounds use bools for vary (#26183)

Browse Source 
* Makes all playsounds use `TRUE` for vary

* Same but for `FALSE`
This commit is contained in:
DGamerL
2024-07-09 01:54:38 +02:00
committed by GitHub
parent c1e97f712c
commit 4cf6595d12
136 changed files with 233 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
+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>")
code/modules/admin/verbs/playsound.dm
+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()
code/modules/antagonists/changeling/powers/revive.dm
+1 -1
View File
@@ -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()
code/modules/assembly/mousetrap.dm
+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)
code/modules/atmospherics/machinery/atmospherics.dm
+1 -1
View File
@@ -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()
code/modules/clothing/gloves/misc_gloves.dm
+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")
code/modules/clothing/head/helmet.dm
+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"
code/modules/clothing/masks/gasmask.dm
+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
code/modules/clothing/shoes/magboots.dm
+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)
code/modules/clothing/shoes/misc_shoes.dm
+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
code/modules/clothing/suits/armor_suits.dm
+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
code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm
+1 -1
View File
@@ -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
code/modules/customitems/item_defines.dm
+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
code/modules/events/floorcluwne_event.dm
+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
code/modules/events/vent_clog.dm
+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)
code/modules/food_and_drinks/food/foods/pizza.dm
+2 -2
View File
@@ -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)
code/modules/hydroponics/grown/banana.dm
+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
code/modules/hydroponics/grown/citrus.dm
+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()
code/modules/hydroponics/hydroitemdefines.dm
+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)
code/modules/instruments/objs/items/instrument_items.dm
+3 -3
View File
@@ -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
code/modules/martial_arts/brawling.dm
+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>", \
code/modules/martial_arts/combos/cqc/consecutive.dm
+1 -1
View File
@@ -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)
code/modules/martial_arts/combos/cqc/kick.dm
+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)
code/modules/martial_arts/combos/cqc/pressure.dm
+1 -1
View File
@@ -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
code/modules/martial_arts/combos/cqc/slam.dm
+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)
code/modules/martial_arts/combos/krav_maga/leg_sweep.dm
+1 -1
View File
@@ -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)
code/modules/martial_arts/combos/krav_maga/lung_punch.dm
+1 -1
View File
@@ -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)
code/modules/martial_arts/combos/krav_maga/neck_chop.dm
+1 -1
View File
@@ -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)
code/modules/martial_arts/combos/mimejutsu/mimechucks.dm
+2 -2
View File
@@ -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)")
code/modules/martial_arts/combos/plasma_fist/the_plasma_fist.dm
+1 -1
View File
@@ -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>")
code/modules/martial_arts/combos/plasma_fist/throwback.dm
+1 -1
View File
@@ -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!")
code/modules/martial_arts/combos/plasma_fist/tornado_sweep.dm
+1 -1
View File
@@ -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)
code/modules/martial_arts/cqc.dm
+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
code/modules/martial_arts/grav_stomp.dm
+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>")
code/modules/martial_arts/martial.dm
+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>", \
code/modules/mining/equipment/kinetic_crusher.dm
+1 -1
View File
@@ -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>")
code/modules/mining/fulton.dm
+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
code/modules/mob/living/carbon/alien/alien_death.dm
+1 -1
View File
@@ -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()
code/modules/mob/living/carbon/alien/alien_defense.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
+1 -1
View File
@@ -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
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+1 -1
View File
@@ -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 ..()
code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
+6 -6
View File
@@ -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)
code/modules/mob/living/carbon/alien/larva/larva_defense.dm
+2 -2
View File
@@ -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>")
code/modules/mob/living/carbon/carbon_procs.dm
+3 -3
View File
@@ -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)
code/modules/mob/living/carbon/human/human_defense.dm
+2 -2
View File
@@ -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)
code/modules/mob/living/carbon/human/human_inventory.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/carbon/human/human_mob.dm
+1 -1
View File
@@ -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
code/modules/mob/living/carbon/human/species/_species.dm
+2 -2
View File
@@ -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
code/modules/mob/living/living_defense.dm
+4 -4
View File
@@ -96,7 +96,7 @@
"<span class='danger'>[src] was arc flashed by \the [source]!</span>",
"<span class='userdanger'>\The [source] arc flashes and electrocutes you!</span>",
"<span class='italics'>You hear a lightning-like crack!</span>")
playsound(loc, 'sound/effects/eleczap.ogg', 50, 1, -1)
playsound(loc, 'sound/effects/eleczap.ogg', 50, TRUE, -1)
explosion(loc, -1, 0, 2, 2)
else
apply_damage(shock_damage, STAMINA)
@@ -311,7 +311,7 @@
G.synch()
LAssailant = user
playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
/*if(user.dir == src.dir)
G.state = GRAB_AGGRESSIVE
G.last_upgrade = world.time
@@ -353,7 +353,7 @@
return FALSE
if(M.attack_sound)
playsound(loc, M.attack_sound, 50, 1, 1)
playsound(loc, M.attack_sound, 50, TRUE, 1)
M.do_attack_animation(src)
visible_message("<span class='danger'>\The [M] [M.attacktext] [src]!</span>", \
"<span class='userdanger'>\The [M] [M.attacktext] [src]!</span>")
@@ -376,7 +376,7 @@
add_attack_logs(L, src, "Larva attacked")
visible_message("<span class='danger'>[L.name] bites [src]!</span>", \
"<span class='userdanger'>[L.name] bites [src]!</span>")
playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/bite.ogg', 50, TRUE, -1)
return 1
else
visible_message("<span class='danger'>[L.name] has attempted to bite [src]!</span>", \
code/modules/mob/living/silicon/pai/pai.dm
+1 -1
View File
@@ -320,7 +320,7 @@
return
if(user.a_intent == INTENT_HELP)
user.visible_message("<span class='notice'>[user] pets [src].</span>")
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
else
visible_message("<span class='danger'>[user.name] boops [src] on the head.</span>")
spawn(1)
code/modules/mob/living/silicon/silicon_defense.dm
+4 -4
View File
@@ -5,7 +5,7 @@
if(..()) //if harm or disarm intent
var/damage = 20
if(prob(90))
playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1)
playsound(loc, 'sound/weapons/slash.ogg', 25, TRUE, -1)
visible_message("<span class='danger'>[M] has slashed at [src]!</span>", "<span class='userdanger'>[M] has slashed at [src]!</span>")
if(prob(8))
flash_eyes(affect_silicon = 1)
@@ -14,7 +14,7 @@
adjustBruteLoss(damage)
updatehealth()
else
playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
playsound(loc, 'sound/weapons/slashmiss.ogg', 25, TRUE, -1)
visible_message("<span class='danger'>[M] took a swipe at [src]!</span>", \
"<span class='userdanger'>[M] took a swipe at [src]!</span>")
return
@@ -50,7 +50,7 @@
return FALSE
..(user, TRUE)
adjustBruteLoss(run_armor(rand(10, 15), BRUTE, MELEE))
playsound(loc, "punch", 25, 1, -1)
playsound(loc, "punch", 25, TRUE, -1)
visible_message("<span class='danger'>[user] has punched [src]!</span>", "<span class='userdanger'>[user] has punched [src]!</span>")
return TRUE
return FALSE
@@ -60,7 +60,7 @@
if(INTENT_HELP)
M.visible_message("<span class='notice'>[M] pets [src]!</span>", \
"<span class='notice'>You pet [src]!</span>")
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
if("grab")
grabbedby(M)
else
code/modules/mob/living/simple_animal/animal_defense.dm
+4 -4
View File
@@ -12,7 +12,7 @@
if(INTENT_HELP)
if(health > 0)
visible_message("<span class='notice'>[M] [response_help] [src].</span>", "<span class='notice'>[M] [response_help] you.</span>")
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
if(INTENT_GRAB)
grabbedby(M)
@@ -23,7 +23,7 @@
return
M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
visible_message("<span class='danger'>[M] [response_harm] [src]!</span>", "<span class='userdanger'>[M] [response_harm] you!</span>")
playsound(loc, attacked_sound, 25, 1, -1)
playsound(loc, attacked_sound, 25, TRUE, -1)
attack_threshold_check(harm_intent_damage)
add_attack_logs(M, src, "Melee attacked with fists")
updatehealth()
@@ -35,7 +35,7 @@
to_chat(user, "<span class='warning'>You don't want to hurt [src]!</span>")
return FALSE
..(user, TRUE)
playsound(loc, "punch", 25, 1, -1)
playsound(loc, "punch", 25, TRUE, -1)
visible_message("<span class='danger'>[user] has punched [src]!</span>", "<span class='userdanger'>[user] has punched [src]!</span>")
adjustBruteLoss(15)
return TRUE
@@ -50,7 +50,7 @@
var/damage = rand(15, 30)
visible_message("<span class='danger'>[M] has slashed at [src]!</span>", \
"<span class='userdanger'>[M] has slashed at [src]!</span>")
playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
playsound(loc, 'sound/weapons/slice.ogg', 25, TRUE, -1)
add_attack_logs(M, src, "Alien attacked")
attack_threshold_check(damage)
return TRUE
code/modules/mob/living/simple_animal/bot/bot.dm
+1 -1
View File
@@ -363,7 +363,7 @@
user.do_attack_animation(src)
apply_damage(rand(15,30), BRUTE)
visible_message("<span class='danger'>[user] has slashed [src]!</span>")
playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
playsound(loc, 'sound/weapons/slice.ogg', 25, TRUE, -1)
if(prob(10))
new /obj/effect/decal/cleanable/blood/oil(loc)
code/modules/mob/living/simple_animal/bot/ed209bot.dm
+1 -1
View File
@@ -575,7 +575,7 @@
/mob/living/simple_animal/bot/ed209/proc/cuff(mob/living/carbon/C)
mode = BOT_ARREST
playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2)
playsound(loc, 'sound/weapons/cablecuff.ogg', 30, TRUE, -2)
C.visible_message("<span class='danger'>[src] is trying to put zipties on [C]!</span>",\
"<span class='userdanger'>[src] is trying to put zipties on you!</span>")
code/modules/mob/living/simple_animal/bot/griefsky.dm
+5 -5
View File
@@ -42,7 +42,7 @@
/mob/living/simple_animal/bot/secbot/griefsky/back_to_idle()
..()
playsound(loc, 'sound/weapons/saberoff.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/saberoff.ogg', 50, TRUE, -1)
/mob/living/simple_animal/bot/secbot/griefsky/emag_act(mob/user)
..()
@@ -74,13 +74,13 @@
retaliate(P.firer)
if((icon_state == spin_icon) && (prob(block_chance_ranged))) //only when the eswords are on
visible_message("[src] deflects [P] with its energy swords!")
playsound(loc, 'sound/weapons/blade1.ogg', 50, 1, 0)
playsound(loc, 'sound/weapons/blade1.ogg', 50, TRUE, 0)
else
..()
/mob/living/simple_animal/bot/secbot/griefsky/proc/sword_attack(mob/living/carbon/C) // esword attack
do_attack_animation(C)
playsound(loc, 'sound/weapons/blade1.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/blade1.ogg', 50, TRUE, -1)
addtimer(CALLBACK(src, PROC_REF(do_sword_attack), C), 2)
/mob/living/simple_animal/bot/secbot/griefsky/proc/do_sword_attack(mob/living/carbon/C)
@@ -119,7 +119,7 @@
mode = BOT_START_PATROL // switch to patrol mode
if(BOT_HUNT) // hunting for perp
icon_state = spin_icon
playsound(loc,'sound/effects/spinsabre.ogg',50,1,-1)
playsound(loc,'sound/effects/spinsabre.ogg',50, TRUE,-1)
if(frustration >= frustration_number) // general beepsky doesn't give up so easily, jedi scum
walk_to(src,0)
set_path(null)
@@ -211,7 +211,7 @@
retaliate(P.firer)
if((icon_state == spin_icon) && (prob(block_chance_ranged))) //only when the eswords are on
visible_message("[src] deflects [P] with its energy swords!")
playsound(loc, 'sound/weapons/blade1.ogg', 50, 1, 0)
playsound(loc, 'sound/weapons/blade1.ogg', 50, TRUE, 0)
else
..()
code/modules/mob/living/simple_animal/bot/honkbot.dm
+3 -3
View File
@@ -127,7 +127,7 @@
to_chat(user, "<span class='warning'>You short out [src]'s target assessment circuits. It gives out an evil laugh!!</span>")
oldtarget_name = user.name
audible_message("<span class='danger'>[src] gives out an evil laugh!</span>")
playsound(src, 'sound/machines/honkbot_evil_laugh.ogg', 75, 1, -1) // evil laughter
playsound(src, 'sound/machines/honkbot_evil_laugh.ogg', 75, TRUE, -1) // evil laughter
update_icon()
/mob/living/simple_animal/bot/honkbot/cmag_act(mob/user)
@@ -270,7 +270,7 @@
// if can't reach perp for long enough, go idle
if(frustration >= 5) //gives up easier than beepsky
walk_to(src, 0)
playsound(loc, 'sound/misc/sadtrombone.ogg', 25, 1, -1)
playsound(loc, 'sound/misc/sadtrombone.ogg', 25, TRUE, -1)
back_to_idle()
return
@@ -386,7 +386,7 @@
"[C] topples over [src]!", \
"[C] leaps out of [src]'s way!")]</span>")
C.KnockDown(10 SECONDS)
playsound(loc, 'sound/misc/sadtrombone.ogg', 50, 1, -1)
playsound(loc, 'sound/misc/sadtrombone.ogg', 50, TRUE, -1)
if(!client)
speak("Honk!")
sensor_blink()
code/modules/mob/living/simple_animal/bot/secbot.dm
+1 -1
View File
@@ -241,7 +241,7 @@
/mob/living/simple_animal/bot/secbot/proc/cuff(mob/living/carbon/C)
mode = BOT_ARREST
playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2)
playsound(loc, 'sound/weapons/cablecuff.ogg', 30, TRUE, -2)
C.visible_message("<span class='danger'>[src] is trying to put zipties on [C]!</span>",\
"<span class='userdanger'>[src] is trying to put zipties on you!</span>")
INVOKE_ASYNC(src, PROC_REF(cuff_callback), C)
code/modules/mob/living/simple_animal/friendly/diona_nymph.dm
+1 -1
View File
@@ -219,7 +219,7 @@
else
if(do_after_once(src, 20, target = G))
visible_message("[src] ravenously consumes [G].", "You ravenously devour [G].")
playsound(loc, 'sound/items/eatfood.ogg', 30, 0, frequency = 1.5)
playsound(loc, 'sound/items/eatfood.ogg', 30, FALSE, frequency = 1.5)
if(G.reagents.get_reagent_amount("nutriment") + G.reagents.get_reagent_amount("plantmatter") < 1)
adjust_nutrition(2)
else
code/modules/mob/living/simple_animal/hostile/floorcluwne.dm
+2 -2
View File
@@ -338,7 +338,7 @@
if(do_after(src, 10, target = H))
step_towards(H, src)
playsound(H, pick('sound/effects/bodyscrape-01.ogg', 'sound/effects/bodyscrape-02.ogg'), 20, 1, -4)
playsound(H, pick('sound/effects/bodyscrape-01.ogg', 'sound/effects/bodyscrape-02.ogg'), 20, TRUE, -4)
H.emote("scream")
if(prob(25))
playsound(src, pick('sound/hallucinations/growl1.ogg', 'sound/hallucinations/growl2.ogg', 'sound/items/bikehorn.ogg'), 50, 1)
@@ -402,7 +402,7 @@
if(prob(2))
switch_stage = max(switch_stage * 0.75, switch_stage_min) //he gets a chance to be faster after each feast
if(smiting)
playsound(loc, 'sound/spookoween/scary_horn2.ogg', 100, 0, -4)
playsound(loc, 'sound/spookoween/scary_horn2.ogg', 100, FALSE, -4)
qdel(src)
else
Acquire_Victim()
code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm
+1 -1
View File
@@ -487,7 +487,7 @@ Difficulty: Hard
say(pick("OTZKMXOZE LGORAXK, YKRL JKYZXAIZ GIZOBK", "RUYY IKXZGOT, KTMGMKOTM XKIUBKXE JKTOGR", "VUCKX IUXKY 8-12 HXKGINKJ, UBKXRUGJOTM XKSGOTOTM IUXKY", "KXXUX KXXUX KXXUX KXXUX KXX-", "-ROQK ZKGXY OT XGOT- - -ZOSK ZU JOK"))
visible_message("<span class='biggerdanger'>[src] begins to overload it's core. It is going to explode!</span>")
walk(src, 0)
playsound(src,'sound/machines/alarm.ogg',100,0,5)
playsound(src,'sound/machines/alarm.ogg', 100, FALSE, 5)
addtimer(CALLBACK(src, PROC_REF(kaboom)), 10 SECONDS)
/mob/living/simple_animal/hostile/megafauna/ancient_robot/proc/kaboom()
code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
+2 -2
View File
@@ -265,14 +265,14 @@ Difficulty: Medium
new /obj/effect/temp_visual/small_smoke/halfsecond(step_forward_turf)
var/obj/effect/temp_visual/decoy/fading/halfsecond/D = new (own_turf, src)
forceMove(step_back_turf)
playsound(own_turf, 'sound/weapons/punchmiss.ogg', 40, 1, -1)
playsound(own_turf, 'sound/weapons/punchmiss.ogg', 40, TRUE, -1)
dashing = TRUE
alpha = 0
animate(src, alpha = 255, time = 5)
SLEEP_CHECK_DEATH(2)
D.forceMove(step_forward_turf)
forceMove(target_turf)
playsound(target_turf, 'sound/weapons/punchmiss.ogg', 40, 1, -1)
playsound(target_turf, 'sound/weapons/punchmiss.ogg', 40, TRUE, -1)
SLEEP_CHECK_DEATH(1)
dashing = FALSE
return TRUE
code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm
+6 -6
View File
@@ -232,7 +232,7 @@ While using this makes the system rely on OnFire, it still gives options for tim
var/selectedspawn = pick(potentialspawns)
mychild = new selectedspawn(loc)
visible_message("<span class='userdanger'>[mychild] emerges from [src]!</span>")
playsound(loc,'sound/effects/phasein.ogg', 200, 0, 50, TRUE, TRUE)
playsound(loc,'sound/effects/phasein.ogg', 200, FALSE, 50, TRUE, TRUE)
if(boosted)
mychild.key = elitemind.key
mychild.sentience_act()
@@ -246,7 +246,7 @@ While using this makes the system rely on OnFire, it still gives options for tim
/obj/structure/elite_tumor/proc/return_elite()
mychild.forceMove(loc)
visible_message("<span class='userdanger'>[mychild] emerges from [src]!</span>")
playsound(loc,'sound/effects/phasein.ogg', 200, 0, 50, TRUE, TRUE)
playsound(loc,'sound/effects/phasein.ogg', 200, FALSE, 50, TRUE, TRUE)
mychild.revive()
if(boosted)
mychild.maxHealth = mychild.maxHealth * 2.5
@@ -339,11 +339,11 @@ While using this makes the system rely on OnFire, it still gives options for tim
if(activator != null && get_dist(src, activator) >= ARENA_RADIUS)
activator.forceMove(loc)
visible_message("<span class='warning'>[activator] suddenly reappears above [src]!</span>")
playsound(loc,'sound/effects/phasein.ogg', 200, 0, 50, TRUE, TRUE)
playsound(loc,'sound/effects/phasein.ogg', 200, FALSE, 50, TRUE, TRUE)
if(mychild != null && get_dist(src, mychild) >= ARENA_RADIUS)
mychild.forceMove(loc)
visible_message("<span class='warning'>[mychild] suddenly reappears above [src]!</span>")
playsound(loc,'sound/effects/phasein.ogg', 200, 0, 50, TRUE, TRUE)
playsound(loc,'sound/effects/phasein.ogg', 200, FALSE, 50, TRUE, TRUE)
/obj/structure/elite_tumor/HasProximity(atom/movable/AM)
if(!ishuman(AM) && !isrobot(AM))
@@ -360,11 +360,11 @@ While using this makes the system rely on OnFire, it still gives options for tim
invaders += M
var/list/valid_turfs = RANGE_EDGE_TURFS(ARENA_RADIUS + 2, src) // extra safety
M.forceMove(pick(valid_turfs)) //Doesn't check for lava. Don't cheese it.
playsound(M, 'sound/effects/phasein.ogg', 200, 0, 50, TRUE, TRUE)
playsound(M, 'sound/effects/phasein.ogg', 200, FALSE, 50, TRUE, TRUE)
/obj/structure/elite_tumor/proc/onEliteLoss()
playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, 0, 50, TRUE, TRUE)
playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, FALSE, 50, TRUE, TRUE)
visible_message("<span class='warning'>[src] begins to convulse violently before beginning to dissipate.</span>")
visible_message("<span class='warning'>As [src] closes, something is forced up from down below.</span>")
var/obj/structure/closet/crate/necropolis/tendril/lootbox = new /obj/structure/closet/crate/necropolis/tendril(loc)
code/modules/mob/mob_grab.dm
+1 -1
View File
@@ -402,7 +402,7 @@
if(istype(hat))
damage += hat.force * 3
affecting.apply_damage(damage*rand(90, 110)/100, BRUTE, "head", affected.run_armor_check(affecting, MELEE))
playsound(assailant.loc, "swing_hit", 25, 1, -1)
playsound(assailant.loc, "swing_hit", 25, TRUE, -1)
add_attack_logs(assailant, affecting, "Headbutted")
return
code/modules/ninja/energy_katana.dm
+1 -1
View File
@@ -13,7 +13,7 @@
/obj/item/katana/energy/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
playsound(user, 'sound/weapons/blade1.ogg', 50, 1, -1)
playsound(user, 'sound/weapons/blade1.ogg', 50, TRUE, -1)
return ..()
/obj/item/katana/energy/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
code/modules/paperwork/photography.dm
+3 -3
View File
@@ -144,7 +144,7 @@
var/mob/M = usr
if(!is_screen_atom(over_object))
return ..()
playsound(loc, "rustle", 50, 1, -5)
playsound(loc, "rustle", 50, TRUE, -5)
if((!M.restrained() && !M.stat && M.back == src))
switch(over_object.name)
if("r_hand")
@@ -369,7 +369,7 @@ GLOBAL_LIST_INIT(SpookyGhosts, list("ghost","shade","shade2","ghost-narsie","hor
return
captureimage(target, user, flag)
playsound(loc, pick('sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg'), 75, 1, -3)
playsound(loc, pick('sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg'), 75, TRUE, -3)
set_light(3, 2, LIGHT_COLOR_TUNGSTEN)
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, set_light), 0), 2)
pictures_left--
@@ -500,7 +500,7 @@ GLOBAL_LIST_INIT(SpookyGhosts, list("ghost","shade","shade2","ghost-narsie","hor
return
captureimage(target, user, flag)
playsound(loc, pick('sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg'), 75, 1, -3)
playsound(loc, pick('sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg'), 75, TRUE, -3)
icon_state = icon_off
on = FALSE
code/modules/projectiles/guns/energy_guns.dm
+2 -2
View File
@@ -211,7 +211,7 @@
sleep(25)
if(user.is_holding(src))
user.visible_message("<span class='suicide'>[user] melts [user.p_their()] face off with [src]!</span>")
playsound(loc, fire_sound, 50, 1, -1)
playsound(loc, fire_sound, 50, TRUE, -1)
var/obj/item/ammo_casing/energy/shot = ammo_type[select]
cell.use(shot.e_cost)
update_icon()
@@ -221,7 +221,7 @@
return OXYLOSS
else
user.visible_message("<span class='suicide'>[user] is pretending to blow [user.p_their()] brains out with [src]! It looks like [user.p_theyre()] trying to commit suicide!</b></span>")
playsound(loc, 'sound/weapons/empty.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/empty.ogg', 50, TRUE, -1)
return OXYLOSS
/obj/item/gun/energy/vv_edit_var(var_name, var_value)
code/modules/projectiles/guns/grenade_launcher.dm
+1 -1
View File
@@ -52,6 +52,6 @@
log_game("[key_name(user)] fired a grenade ([F.name]) from a grenade launcher ([name]).")
F.active = TRUE
F.icon_state = initial(icon_state) + "_active"
playsound(user.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
playsound(user.loc, 'sound/weapons/armbomb.ogg', 75, TRUE, -3)
spawn(15)
F.prime()
code/modules/projectiles/guns/magic.dm
+1 -1
View File
@@ -87,5 +87,5 @@
/obj/item/gun/magic/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is twisting [src] above [user.p_their()] head, releasing a magical blast! It looks like [user.p_theyre()] trying to commit suicide!</span>")
playsound(loc, fire_sound, 50, 1, -1)
playsound(loc, fire_sound, 50, TRUE, -1)
return FIRELOSS
code/modules/projectiles/guns/projectile_gun.dm
+1 -1
View File
@@ -207,7 +207,7 @@
return OXYLOSS
else
user.visible_message("<span class='suicide'>[user] is pretending to blow [user.p_their()] brains out with [src]! It looks like [user.p_theyre()] trying to commit suicide!</b></span>")
playsound(loc, 'sound/weapons/empty.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/empty.ogg', 50, TRUE, -1)
return OXYLOSS
/obj/item/gun/projectile/proc/sawoff(mob/user)
code/modules/projectiles/guns/syringe_gun.dm
+1 -1
View File
@@ -279,7 +279,7 @@
// Running out of syringes is just handled by *click*
to_chat(user, "<span class='[alarmed ? "danger" : "userdanger"]'>[src] [alarmed ? "beeps" : "whines"]: Internal chemical reservoir empty!</span>")
if(!alarmed)
playsound(loc, 'sound/weapons/smg_empty_alarm.ogg', 25, 1, frequency = 60000)
playsound(loc, 'sound/weapons/smg_empty_alarm.ogg', 25, TRUE, frequency = 60000)
alarmed = TRUE
// always send the to_chat so there's still feedback if the gun tries to fire
code/modules/projectiles/projectile_base.dm
+3 -3
View File
@@ -210,12 +210,12 @@
if(L.has_limbs)
organ_hit_text = " in \the [parse_zone(def_zone)]"
if(suppressed)
playsound(loc, hitsound, 5, 1, -1)
playsound(loc, hitsound, 5, TRUE, -1)
to_chat(L, "<span class='userdanger'>You're shot by \a [src][organ_hit_text]!</span>")
else
if(hitsound)
var/volume = vol_by_damage()
playsound(loc, hitsound, volume, 1, -1)
playsound(loc, hitsound, volume, TRUE, -1)
L.visible_message("<span class='danger'>[L] is hit by \a [src][organ_hit_text]!</span>", \
"<span class='userdanger'>[L] is hit by \a [src][organ_hit_text]!</span>") //X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter
if(immolate)
@@ -288,7 +288,7 @@
var/volume = clamp(vol_by_damage() + 20, 0, 100)
if(suppressed)
volume = 5
playsound(loc, hitsound_wall, volume, 1, -1)
playsound(loc, hitsound_wall, volume, TRUE, -1)
else if(ishuman(A))
var/mob/living/carbon/human/H = A
var/obj/item/organ/external/organ = H.get_organ(check_zone(def_zone))
code/modules/reagents/chemistry/reagents/food_reagents.dm
+1 -1
View File
@@ -763,7 +763,7 @@
/datum/reagent/consumable/meatslurry/reaction_turf(turf/T, volume)
if(prob(10) && volume >= 5 && !isspaceturf(T))
new /obj/effect/decal/cleanable/blood/gibs/cleangibs(T)
playsound(T, 'sound/effects/splat.ogg', 50, 1, -3)
playsound(T, 'sound/effects/splat.ogg', 50, TRUE, -3)
/datum/reagent/consumable/mashedpotatoes
name = "Mashed potatoes"
code/modules/reagents/chemistry/reagents/medicine.dm
+1 -1
View File
@@ -325,7 +325,7 @@
/datum/reagent/medicine/heal_on_apply/synthflesh/reaction_turf(turf/T, volume) //let's make a mess!
if(volume >= 5 && !isspaceturf(T))
new /obj/effect/decal/cleanable/blood/gibs/cleangibs(T)
playsound(T, 'sound/effects/splat.ogg', 50, 1, -3)
playsound(T, 'sound/effects/splat.ogg', 50, TRUE, -3)
/datum/reagent/medicine/heal_on_apply/styptic_powder
name = "Styptic Powder"
code/modules/reagents/chemistry/reagents/misc_reagents.dm
+1 -1
View File
@@ -436,7 +436,7 @@
continue
if(!C.stat)
M.visible_message("<span class='notice'>[M] gives [C] a [pick("hug","warm embrace")].</span>")
playsound(get_turf(M), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
playsound(get_turf(M), 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
break
return ..()
code/modules/reagents/chemistry/reagents/water.dm
+1 -1
View File
@@ -426,7 +426,7 @@
/datum/reagent/liquidgibs/reaction_turf(turf/T, volume) //yes i took it from synthflesh...
if(volume >= 5 && !isspaceturf(T))
new /obj/effect/decal/cleanable/blood/gibs/cleangibs(T)
playsound(T, 'sound/effects/splat.ogg', 50, 1, -3)
playsound(T, 'sound/effects/splat.ogg', 50, TRUE, -3)
/datum/reagent/lye
name = "Lye"
code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+1 -1
View File
@@ -267,7 +267,7 @@
holder.del_reagent(f_reagent)
var/location = get_turf(holder.my_atom)
var/datum/effect_system/smoke_spread/chem/S = new
playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3)
playsound(location, 'sound/effects/smoke.ogg', 50, TRUE, -3)
if(S)
S.set_up(holder, location)
if(created_volume < 5)
code/modules/reagents/reagent_containers/spray.dm
+1 -1
View File
@@ -52,7 +52,7 @@
var/contents_log = reagents.reagent_list.Join(", ")
INVOKE_ASYNC(src, PROC_REF(spray), A)
playsound(loc, 'sound/effects/spray2.ogg', 50, 1, -6)
playsound(loc, 'sound/effects/spray2.ogg', 50, TRUE, -6)
user.changeNext_move(delay)
user.newtonian_move(get_dir(A, user))
code/modules/recycling/disposal.dm
+10 -10
View File
@@ -161,7 +161,7 @@
gripper.gripped_item.forceMove(src)
user.visible_message(
"<span class='notice'>[user] places [gripper.gripped_item] into the disposal unit.</span>",
"<span class='notice'>[user] places [gripper.gripped_item] into the disposal unit.</span>",
"<span class='notice'>You place [gripper.gripped_item] into the disposal unit.</span>",
"<span class='notice'>You hear someone dropping something into a disposal unit.</span>"
)
@@ -216,11 +216,11 @@
. = TRUE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
if(length(contents) > 0)
to_chat(user, "<span class='warning'>You need to empty the contents of the disposal unit first!</span>")
return
if(mode == DISPOSALS_OFF) // It's off but still not unscrewed
mode = DISPOSALS_UNSCREWED
else if(mode == DISPOSALS_UNSCREWED)
@@ -558,7 +558,7 @@
sleep(10)
if(last_sound + DISPOSAL_SOUND_COOLDOWN < world.time)
playsound(src, 'sound/machines/disposalflush.ogg', 50, 0, 0)
playsound(src, 'sound/machines/disposalflush.ogg', 50, FALSE, 0)
last_sound = world.time
sleep(5) // wait for animation to finish
@@ -593,7 +593,7 @@
var/turf/target
if(last_sound + DISPOSAL_SOUND_COOLDOWN < world.time)
playsound(src, 'sound/machines/hiss.ogg', 50, 0, FALSE)
playsound(src, 'sound/machines/hiss.ogg', 50, FALSE, FALSE)
last_sound = world.time
if(H) // Somehow, someone managed to flush a window which broke mid-transit and caused the disposal to go in an infinite loop trying to expel null, hopefully this fixes it
@@ -816,7 +816,7 @@
for(var/mob/M in hearers(loc.loc))
to_chat(M, "<FONT size=[max(0, 5 - get_dist(src, M))]>CLONG, clong!</FONT>")
playsound(loc, 'sound/effects/clang.ogg', 50, 0, 0)
playsound(loc, 'sound/effects/clang.ogg', 50, FALSE, 0)
// called to vent all gas in holder to a location
/obj/structure/disposalholder/proc/vent_gas(turf/location)
@@ -960,7 +960,7 @@
target = get_ranged_target_turf(T, direction, 10)
if(last_sound + DISPOSAL_SOUND_COOLDOWN < world.time)
playsound(src, 'sound/machines/hiss.ogg', 50, 0, FALSE)
playsound(src, 'sound/machines/hiss.ogg', 50, FALSE, FALSE)
last_sound = world.time
if(H)
@@ -978,7 +978,7 @@
else // no specified direction, so throw in random direction
if(last_sound + DISPOSAL_SOUND_COOLDOWN < world.time)
playsound(src, 'sound/machines/hiss.ogg', 50, 0, FALSE)
playsound(src, 'sound/machines/hiss.ogg', 50, FALSE, FALSE)
last_sound = world.time
if(H)
for(var/atom/movable/AM in H)
@@ -1540,10 +1540,10 @@
play_sound = TRUE
last_sound = world.time
if(play_sound)
playsound(src, 'sound/machines/warning-buzzer.ogg', 50, 0, FALSE)
playsound(src, 'sound/machines/warning-buzzer.ogg', 50, FALSE, FALSE)
sleep(20) //wait until correct animation frame
if(play_sound)
playsound(src, 'sound/machines/hiss.ogg', 50, 0, FALSE)
playsound(src, 'sound/machines/hiss.ogg', 50, FALSE, FALSE)
for(var/atom/movable/AM in contents)
AM.forceMove(loc)
AM.pipe_eject(dir)
code/modules/recycling/sortingmachinery.dm
+1 -1
View File
@@ -332,7 +332,7 @@
sleep(10)
if(last_sound + DISPOSAL_SOUND_COOLDOWN < world.time)
playsound(src, 'sound/machines/disposalflush.ogg', 50, 0, FALSE)
playsound(src, 'sound/machines/disposalflush.ogg', 50, FALSE, FALSE)
last_sound = world.time
sleep(5) // wait for animation to finish
code/modules/research/experimentor.dm
+5 -5
View File
@@ -308,7 +308,7 @@
investigate_log("Experimentor has released [chosenchem] smoke.", "experimentor")
var/datum/effect_system/smoke_spread/chem/smoke = new
smoke.set_up(R, src, TRUE)
playsound(loc, 'sound/effects/smoke.ogg', 50, 1, -3)
playsound(loc, 'sound/effects/smoke.ogg', 50, TRUE, -3)
smoke.start()
qdel(R)
ejectItem(TRUE)
@@ -320,7 +320,7 @@
R.add_reagent(chosenchem , 15)
var/datum/effect_system/smoke_spread/chem/smoke = new
smoke.set_up(R, src, TRUE)
playsound(loc, 'sound/effects/smoke.ogg', 50, 1, -3)
playsound(loc, 'sound/effects/smoke.ogg', 50, TRUE, -3)
smoke.start()
qdel(R)
ejectItem(TRUE)
@@ -399,7 +399,7 @@
investigate_log("Experimentor has released frostoil gas.", "experimentor")
var/datum/effect_system/smoke_spread/chem/smoke = new
smoke.set_up(R, src, TRUE)
playsound(loc, 'sound/effects/smoke.ogg', 50, 1, -3)
playsound(loc, 'sound/effects/smoke.ogg', 50, TRUE, -3)
smoke.start()
qdel(R)
ejectItem(TRUE)
@@ -427,7 +427,7 @@
linked_materials.insert_amount( min((linked_materials.max_amount - linked_materials.total_amount), (exp_on.materials[material])), material)
if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
visible_message("<span class='danger'>[src]'s crusher goes way too many levels too high, crushing right through space-time!</span>")
playsound(loc, 'sound/effects/supermatter.ogg', 50, 1, -3)
playsound(loc, 'sound/effects/supermatter.ogg', 50, TRUE, -3)
investigate_log("Experimentor has triggered the 'throw things' reaction.", "experimentor")
for(var/atom/movable/AM in oview(7,src))
if(!AM.anchored)
@@ -436,7 +436,7 @@
if(prob(EFFECT_PROB_LOW-badThingCoeff))
visible_message("<span class='danger'>[src]'s crusher goes one level too high, crushing right into space-time!</span>")
playsound(loc, 'sound/effects/supermatter.ogg', 50, 1, -3)
playsound(loc, 'sound/effects/supermatter.ogg', 50, TRUE, -3)
investigate_log("Experimentor has triggered the 'minor throw things' reaction.", "experimentor")
var/list/throwAt = list()
for(var/atom/movable/AM in oview(7,src))
code/modules/ruins/objects_and_mobs/gym.dm
+1 -1
View File
@@ -14,7 +14,7 @@
if(.)
return
flick("[icon_state]2", src)
playsound(loc, pick(hit_sounds), 25, 1, -1)
playsound(loc, pick(hit_sounds), 25, TRUE, -1)
/obj/structure/weightmachine
code/modules/surgery/organs/organ_external.dm
+1 -1
View File
@@ -711,7 +711,7 @@ Note that amputating the affected organ does in fact remove the infection from t
if(!length(contents))
to_chat(user, "<span class='warning'>There is nothing left inside [src]!</span>")
return
playsound(loc, 'sound/weapons/slice.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/slice.ogg', 50, TRUE, -1)
user.visible_message("<span class='warning'>[user] begins to cut open [src].</span>",\
"<span class='notice'>You begin to cut open [src]...</span>")
if(do_after(user, 5.4 SECONDS, target = src))
code/modules/telesci/telepad.dm
+1 -1
View File
@@ -108,6 +108,6 @@
if(user)
to_chat(user, "<span class = 'caution'> Locked In</span>")
new /obj/machinery/telepad_cargo(user.loc)
playsound(src, 'sound/effects/pop.ogg', 100, 1, 1)
playsound(src, 'sound/effects/pop.ogg', 100, TRUE, 1)
qdel(src)
return
code/modules/vehicle/vehicle.dm
+1 -1
View File
@@ -185,7 +185,7 @@
if(issimulatedturf(loc))
var/turf/simulated/T = loc
if(T.wet == TURF_WET_LUBE) //Lube! Fall off!
playsound(src, 'sound/misc/slip.ogg', 50, 1, -3)
playsound(src, 'sound/misc/slip.ogg', 50, TRUE, -3)
for(var/m in buckled_mobs)
var/mob/living/buckled_mob = m
buckled_mob.KnockDown(10 SECONDS)