playsound vary boolean define conversion (#46254)

About The Pull Request

Converts every single usage of playsound's vary parameter to use the boolean define instead of 1 or 0. I'm tired of people copypasting the incorrect usage.
Also changes a couple of places where a list was picked from instead of using get_sfx internal calls

This was done via regex:
(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\)) to match 1
(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\)) to match 0
full sed commands:
/(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\))/\1TRUE\2/ 1 to TRUE
/(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\))/\1FALSE\2/ 0 to FALSE

I'm not very good with regex and these could probably be optimized, but they worked.
Why It's Good For The Game

Code usability
This commit is contained in:
Rob Bailey
2019-08-29 23:45:20 -07:00
committed by oranges
parent 3bd71a9c44
commit 2029163d33
515 changed files with 1537 additions and 1538 deletions

View File

@@ -54,9 +54,9 @@
return return
if(!force) 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 if(hitsound) else if(hitsound)
playsound(loc, hitsound, get_clamped_volume(), 1, -1) playsound(loc, hitsound, get_clamped_volume(), TRUE, -1)
M.lastattacker = user.real_name M.lastattacker = user.real_name
M.lastattackerckey = user.ckey M.lastattackerckey = user.ckey
@@ -104,7 +104,7 @@
/mob/living/simple_animal/attacked_by(obj/item/I, mob/living/user) /mob/living/simple_animal/attacked_by(obj/item/I, mob/living/user)
if(I.force < force_threshold || I.damtype == STAMINA) if(I.force < force_threshold || I.damtype == STAMINA)
playsound(loc, 'sound/weapons/tap.ogg', I.get_clamped_volume(), 1, -1) playsound(loc, 'sound/weapons/tap.ogg', I.get_clamped_volume(), TRUE, -1)
else else
return ..() return ..()

View File

@@ -44,7 +44,7 @@
else else
message = pick_list_replacements(BRAIN_DAMAGE_FILE, "god_neutral") message = pick_list_replacements(BRAIN_DAMAGE_FILE, "god_neutral")
playsound(get_turf(owner), 'sound/magic/clockwork/invoke_general.ogg', 200, 1, 5) playsound(get_turf(owner), 'sound/magic/clockwork/invoke_general.ogg', 200, TRUE, 5)
voice_of_god(message, owner, list("colossus","yell"), 2.5, include_owner, FALSE) voice_of_god(message, owner, list("colossus","yell"), 2.5, include_owner, FALSE)
/datum/brain_trauma/special/bluespace_prophet /datum/brain_trauma/special/bluespace_prophet

View File

@@ -25,5 +25,5 @@
current_paint = colour current_paint = colour
var/atom/A = parent var/atom/A = parent
A.add_atom_colour(colour, FIXED_COLOUR_PRIORITY) 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>") to_chat(user, "<span class='notice'>You spray [spraycan] on [A], painting it.</span>")

View File

@@ -42,9 +42,9 @@
/datum/component/squeak/proc/play_squeak() /datum/component/squeak/proc/play_squeak()
if(prob(squeak_chance)) if(prob(squeak_chance))
if(!override_squeak_sounds) if(!override_squeak_sounds)
playsound(parent, pickweight(default_squeak_sounds), volume, 1, -1) playsound(parent, pickweight(default_squeak_sounds), volume, TRUE, -1)
else else
playsound(parent, pickweight(override_squeak_sounds), volume, 1, -1) playsound(parent, pickweight(override_squeak_sounds), volume, TRUE, -1)
/datum/component/squeak/proc/step_squeak() /datum/component/squeak/proc/step_squeak()
if(steps > step_delay) if(steps > step_delay)

View File

@@ -15,7 +15,7 @@
return return
to_chat(user, "<span class='danger'>The Bluespace interfaces of the two devices catastrophically malfunction!</span>") to_chat(user, "<span class='danger'>The Bluespace interfaces of the two devices catastrophically malfunction!</span>")
qdel(W) qdel(W)
playsound(loccheck,'sound/effects/supermatter.ogg', 200, 1) playsound(loccheck,'sound/effects/supermatter.ogg', 200, TRUE)
message_admins("[ADMIN_LOOKUPFLW(user)] detonated a bag of holding at [ADMIN_VERBOSEJMP(loccheck)].") message_admins("[ADMIN_LOOKUPFLW(user)] detonated a bag of holding at [ADMIN_VERBOSEJMP(loccheck)].")
log_game("[key_name(user)] detonated a bag of holding at [loc_name(loccheck)].") log_game("[key_name(user)] detonated a bag of holding at [loc_name(loccheck)].")

View File

@@ -12,12 +12,12 @@
if(destT && bagT && bagT.z == destT.z && get_dist(M, dumping_location) < dumping_range) if(destT && bagT && bagT.z == destT.z && get_dist(M, dumping_location) < dumping_range)
if(dumping_location.storage_contents_dump_act(src, M)) if(dumping_location.storage_contents_dump_act(src, M))
if(alt_sound && prob(1)) if(alt_sound && prob(1))
playsound(src, alt_sound, 40, 1) playsound(src, alt_sound, 40, TRUE)
else else
playsound(src, dumping_sound, 40, 1) playsound(src, dumping_sound, 40, TRUE)
M.Beam(dumping_location, icon_state="rped_upgrade", time=5) M.Beam(dumping_location, icon_state="rped_upgrade", time=5)
return TRUE return TRUE
to_chat(M, "The [A.name] buzzes.") to_chat(M, "The [A.name] buzzes.")
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0) playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE)
return FALSE return FALSE

View File

@@ -486,7 +486,7 @@
to_chat(M, "<span class='warning'>[parent] seems to be locked!</span>") to_chat(M, "<span class='warning'>[parent] seems to be locked!</span>")
return FALSE return FALSE
if(dump_destination.storage_contents_dump_act(src, M)) if(dump_destination.storage_contents_dump_act(src, M))
playsound(A, "rustle", 50, 1, -5) playsound(A, "rustle", 50, TRUE, -5)
return TRUE return TRUE
return FALSE return FALSE
@@ -554,7 +554,7 @@
return return
if(A.loc != M) if(A.loc != M)
return return
playsound(A, "rustle", 50, 1, -5) playsound(A, "rustle", 50, TRUE, -5)
if(istype(over_object, /obj/screen/inventory/hand)) if(istype(over_object, /obj/screen/inventory/hand))
var/obj/screen/inventory/hand/H = over_object var/obj/screen/inventory/hand/H = over_object
M.putItemFromInventoryInHandIfPossible(A, H.held_index) M.putItemFromInventoryInHandIfPossible(A, H.held_index)
@@ -658,7 +658,7 @@
if(silent && !override) if(silent && !override)
return return
if(rustle_sound) if(rustle_sound)
playsound(parent, "rustle", 50, 1, -5) playsound(parent, "rustle", 50, TRUE, -5)
for(var/mob/viewing in viewers(user, null)) for(var/mob/viewing in viewers(user, null))
if(M == viewing) if(M == viewing)
to_chat(usr, "<span class='notice'>You put [I] [insert_preposition]to [parent].</span>") to_chat(usr, "<span class='notice'>You put [I] [insert_preposition]to [parent].</span>")
@@ -733,7 +733,7 @@
return return
if(rustle_sound) if(rustle_sound)
playsound(A, "rustle", 50, 1, -5) playsound(A, "rustle", 50, TRUE, -5)
if(ishuman(user)) if(ishuman(user))
var/mob/living/carbon/human/H = user var/mob/living/carbon/human/H = user
@@ -784,7 +784,7 @@
if(!quickdraw) if(!quickdraw)
A.add_fingerprint(user) A.add_fingerprint(user)
user_show_to_mob(user) user_show_to_mob(user)
playsound(A, "rustle", 50, 1, -5) playsound(A, "rustle", 50, TRUE, -5)
return return
if(!user.incapacitated()) if(!user.incapacitated())

View File

@@ -61,7 +61,7 @@
if(faction != null) if(faction != null)
L.faction = faction L.faction = faction
RegisterSignal(L, COMSIG_MOB_DEATH, .proc/on_spawned_death) // so we can remove them from the list, etc (for mobs with corpses) RegisterSignal(L, COMSIG_MOB_DEATH, .proc/on_spawned_death) // so we can remove them from the list, etc (for mobs with corpses)
playsound(spawn_location,spawn_sound, 50, 1) playsound(spawn_location,spawn_sound, 50, TRUE)
spawn_location.visible_message("<span class='danger'>[L] [spawn_text].</span>") spawn_location.visible_message("<span class='danger'>[L] [spawn_text].</span>")
/datum/component/summoning/proc/on_spawned_death(mob/killed, gibbed) /datum/component/summoning/proc/on_spawned_death(mob/killed, gibbed)

View File

@@ -63,7 +63,7 @@
/datum/component/thermite/proc/thermite_melt(mob/user) /datum/component/thermite/proc/thermite_melt(mob/user)
var/turf/master = parent var/turf/master = parent
master.cut_overlay(overlay) master.cut_overlay(overlay)
playsound(master, 'sound/items/welder.ogg', 100, 1) playsound(master, 'sound/items/welder.ogg', 100, TRUE)
var/obj/effect/overlay/thermite/fakefire = new(master) var/obj/effect/overlay/thermite/fakefire = new(master)
addtimer(CALLBACK(src, .proc/burn_parent, fakefire, user), min(amount * 0.35 SECONDS, 20 SECONDS)) addtimer(CALLBACK(src, .proc/burn_parent, fakefire, user), min(amount * 0.35 SECONDS, 20 SECONDS))
UnregisterFromParent() UnregisterFromParent()

View File

@@ -35,7 +35,7 @@
if(target in view(user.client.view, user)) if(target in view(user.client.view, user))
var/obj/spot1 = new phaseout(get_turf(user), user.dir) var/obj/spot1 = new phaseout(get_turf(user), user.dir)
user.forceMove(T) user.forceMove(T)
playsound(T, dash_sound, 25, 1) playsound(T, dash_sound, 25, TRUE)
var/obj/spot2 = new phasein(get_turf(user), user.dir) var/obj/spot2 = new phasein(get_turf(user), user.dir)
spot1.Beam(spot2,beam_effect,time=20) spot1.Beam(spot2,beam_effect,time=20)
current_charges-- current_charges--
@@ -46,5 +46,5 @@
current_charges = CLAMP(current_charges + 1, 0, max_charges) current_charges = CLAMP(current_charges + 1, 0, max_charges)
holder.update_action_buttons_icon() holder.update_action_buttons_icon()
if(recharge_sound) if(recharge_sound)
playsound(dashing_item, recharge_sound, 50, 1) playsound(dashing_item, recharge_sound, 50, TRUE)
to_chat(holder, "<span class='notice'>[src] now has [current_charges]/[max_charges] charges.</span>") to_chat(holder, "<span class='notice'>[src] now has [current_charges]/[max_charges] charges.</span>")

View File

@@ -89,7 +89,7 @@
/proc/tele_play_specials(atom/movable/teleatom, atom/location, datum/effect_system/effect, sound) /proc/tele_play_specials(atom/movable/teleatom, atom/location, datum/effect_system/effect, sound)
if (location && !isobserver(teleatom)) if (location && !isobserver(teleatom))
if (sound) if (sound)
playsound(location, sound, 60, 1) playsound(location, sound, 60, TRUE)
if (effect) if (effect)
effect.attach(location) effect.attach(location)
effect.start() effect.start()

View File

@@ -52,7 +52,7 @@
A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
if(!damage) if(!damage)
playsound(D.loc, A.dna.species.miss_sound, 25, 1, -1) playsound(D.loc, A.dna.species.miss_sound, 25, TRUE, -1)
D.visible_message("<span class='warning'>[A]'s [atk_verb] misses [D]!</span>", \ D.visible_message("<span class='warning'>[A]'s [atk_verb] misses [D]!</span>", \
"<span class='userdanger'>[A]'s [atk_verb] misses you!</span>", null, COMBAT_MESSAGE_RANGE) "<span class='userdanger'>[A]'s [atk_verb] misses you!</span>", null, COMBAT_MESSAGE_RANGE)
log_combat(A, D, "attempted to [atk_verb]") log_combat(A, D, "attempted to [atk_verb]")
@@ -61,7 +61,7 @@
var/obj/item/bodypart/affecting = D.get_bodypart(ran_zone(A.zone_selected)) var/obj/item/bodypart/affecting = D.get_bodypart(ran_zone(A.zone_selected))
var/armor_block = D.run_armor_check(affecting, "melee") var/armor_block = D.run_armor_check(affecting, "melee")
playsound(D.loc, A.dna.species.attack_sound, 25, 1, -1) playsound(D.loc, A.dna.species.attack_sound, 25, TRUE, -1)
D.visible_message("<span class='danger'>[A] [atk_verb]ed [D]!</span>", \ D.visible_message("<span class='danger'>[A] [atk_verb]ed [D]!</span>", \
"<span class='userdanger'>[A] [atk_verb]ed you!</span>", null, COMBAT_MESSAGE_RANGE) "<span class='userdanger'>[A] [atk_verb]ed you!</span>", null, COMBAT_MESSAGE_RANGE)

View File

@@ -18,7 +18,7 @@
var/damage = rand(5, 8) + A.dna.species.punchdamagelow var/damage = rand(5, 8) + A.dna.species.punchdamagelow
if(!damage) if(!damage)
playsound(D.loc, A.dna.species.miss_sound, 25, 1, -1) playsound(D.loc, A.dna.species.miss_sound, 25, TRUE, -1)
D.visible_message("<span class='warning'>[A]'s [atk_verb] misses [D]!</span>", \ D.visible_message("<span class='warning'>[A]'s [atk_verb] misses [D]!</span>", \
"<span class='userdanger'>[A]'s [atk_verb] misses you!</span>", null, COMBAT_MESSAGE_RANGE) "<span class='userdanger'>[A]'s [atk_verb] misses you!</span>", null, COMBAT_MESSAGE_RANGE)
log_combat(A, D, "attempted to hit", atk_verb) log_combat(A, D, "attempted to hit", atk_verb)
@@ -28,7 +28,7 @@
var/obj/item/bodypart/affecting = D.get_bodypart(ran_zone(A.zone_selected)) var/obj/item/bodypart/affecting = D.get_bodypart(ran_zone(A.zone_selected))
var/armor_block = D.run_armor_check(affecting, "melee") var/armor_block = D.run_armor_check(affecting, "melee")
playsound(D.loc, A.dna.species.attack_sound, 25, 1, -1) playsound(D.loc, A.dna.species.attack_sound, 25, TRUE, -1)
D.visible_message("<span class='danger'>[A] [atk_verb]ed [D]!</span>", \ D.visible_message("<span class='danger'>[A] [atk_verb]ed [D]!</span>", \
"<span class='userdanger'>[A] [atk_verb]ed you!</span>", null, COMBAT_MESSAGE_RANGE) "<span class='userdanger'>[A] [atk_verb]ed you!</span>", null, COMBAT_MESSAGE_RANGE)

View File

@@ -46,7 +46,7 @@
if(D.mobility_flags & MOBILITY_STAND) if(D.mobility_flags & MOBILITY_STAND)
D.visible_message("<span class='warning'>[A] slams [D] into the ground!</span>", \ D.visible_message("<span class='warning'>[A] slams [D] into the ground!</span>", \
"<span class='userdanger'>[A] slams you into the ground!</span>") "<span class='userdanger'>[A] slams you into the ground!</span>")
playsound(get_turf(A), 'sound/weapons/slam.ogg', 50, 1, -1) playsound(get_turf(A), 'sound/weapons/slam.ogg', 50, TRUE, -1)
D.apply_damage(10, BRUTE) D.apply_damage(10, BRUTE)
D.Paralyze(120) D.Paralyze(120)
log_combat(A, D, "slammed (CQC)") log_combat(A, D, "slammed (CQC)")
@@ -58,7 +58,7 @@
if(!D.stat || !D.IsParalyzed()) if(!D.stat || !D.IsParalyzed())
D.visible_message("<span class='warning'>[A] kicks [D] back!</span>", \ D.visible_message("<span class='warning'>[A] kicks [D] back!</span>", \
"<span class='userdanger'>[A] kicks you back!</span>", null, COMBAT_MESSAGE_RANGE) "<span class='userdanger'>[A] kicks you back!</span>", null, COMBAT_MESSAGE_RANGE)
playsound(get_turf(A), 'sound/weapons/cqchit1.ogg', 50, 1, -1) playsound(get_turf(A), 'sound/weapons/cqchit1.ogg', 50, TRUE, -1)
var/atom/throw_target = get_edge_target_turf(D, A.dir) var/atom/throw_target = get_edge_target_turf(D, A.dir)
D.throw_at(throw_target, 1, 14, A) D.throw_at(throw_target, 1, 14, A)
D.apply_damage(10, A.dna.species.attack_type) D.apply_damage(10, A.dna.species.attack_type)
@@ -67,7 +67,7 @@
log_combat(A, D, "knocked out (Head kick)(CQC)") log_combat(A, D, "knocked out (Head kick)(CQC)")
D.visible_message("<span class='warning'>[A] kicks [D]'s head, knocking [D.p_them()] out!</span>", \ D.visible_message("<span class='warning'>[A] kicks [D]'s head, knocking [D.p_them()] out!</span>", \
"<span class='userdanger'>[A] kicks your head, knocking you out!</span>") "<span class='userdanger'>[A] kicks your head, knocking you out!</span>")
playsound(get_turf(A), 'sound/weapons/genhit1.ogg', 50, 1, -1) playsound(get_turf(A), 'sound/weapons/genhit1.ogg', 50, TRUE, -1)
D.SetSleeping(300) D.SetSleeping(300)
D.adjustOrganLoss(ORGAN_SLOT_BRAIN, 15, 150) D.adjustOrganLoss(ORGAN_SLOT_BRAIN, 15, 150)
return TRUE return TRUE
@@ -79,7 +79,7 @@
D.visible_message("<span class='danger'>[A] punches [D]'s neck!</span>", \ D.visible_message("<span class='danger'>[A] punches [D]'s neck!</span>", \
"<span class='userdanger'>[A] punches your neck!</span>", null, COMBAT_MESSAGE_RANGE) "<span class='userdanger'>[A] punches your neck!</span>", null, COMBAT_MESSAGE_RANGE)
D.adjustStaminaLoss(60) D.adjustStaminaLoss(60)
playsound(get_turf(A), 'sound/weapons/cqchit1.ogg', 50, 1, -1) playsound(get_turf(A), 'sound/weapons/cqchit1.ogg', 50, TRUE, -1)
return TRUE return TRUE
/datum/martial_art/cqc/proc/Restrain(mob/living/carbon/human/A, mob/living/carbon/human/D) /datum/martial_art/cqc/proc/Restrain(mob/living/carbon/human/A, mob/living/carbon/human/D)
@@ -104,7 +104,7 @@
log_combat(A, D, "consecutive CQC'd (CQC)") log_combat(A, D, "consecutive CQC'd (CQC)")
D.visible_message("<span class='warning'>[A] strikes [D]'s abdomen, neck and back consecutively</span>", \ D.visible_message("<span class='warning'>[A] strikes [D]'s abdomen, neck and back consecutively</span>", \
"<span class='userdanger'>[A] strikes your abdomen, neck and back consecutively!</span>", null, COMBAT_MESSAGE_RANGE) "<span class='userdanger'>[A] strikes your abdomen, neck and back consecutively!</span>", null, COMBAT_MESSAGE_RANGE)
playsound(get_turf(D), 'sound/weapons/cqchit2.ogg', 50, 1, -1) playsound(get_turf(D), 'sound/weapons/cqchit2.ogg', 50, TRUE, -1)
var/obj/item/I = D.get_active_held_item() var/obj/item/I = D.get_active_held_item()
if(I && D.temporarilyRemoveItemFromInventory(I)) if(I && D.temporarilyRemoveItemFromInventory(I))
A.put_in_hands(I) A.put_in_hands(I)
@@ -144,16 +144,16 @@
picked_hit_type = "stomps on" picked_hit_type = "stomps on"
D.apply_damage(bonus_damage, BRUTE) D.apply_damage(bonus_damage, BRUTE)
if(picked_hit_type == "kicks" || picked_hit_type == "stomps on") if(picked_hit_type == "kicks" || picked_hit_type == "stomps on")
playsound(get_turf(D), 'sound/weapons/cqchit2.ogg', 50, 1, -1) playsound(get_turf(D), 'sound/weapons/cqchit2.ogg', 50, TRUE, -1)
else else
playsound(get_turf(D), 'sound/weapons/cqchit1.ogg', 50, 1, -1) playsound(get_turf(D), 'sound/weapons/cqchit1.ogg', 50, TRUE, -1)
D.visible_message("<span class='danger'>[A] [picked_hit_type] [D]!</span>", \ D.visible_message("<span class='danger'>[A] [picked_hit_type] [D]!</span>", \
"<span class='userdanger'>[A] [picked_hit_type] you!</span>", null, COMBAT_MESSAGE_RANGE) "<span class='userdanger'>[A] [picked_hit_type] you!</span>", null, COMBAT_MESSAGE_RANGE)
log_combat(A, D, "[picked_hit_type] (CQC)") log_combat(A, D, "[picked_hit_type] (CQC)")
if(A.resting && !D.stat && !D.IsParalyzed()) if(A.resting && !D.stat && !D.IsParalyzed())
D.visible_message("<span class='warning'>[A] leg sweeps [D]!", \ D.visible_message("<span class='warning'>[A] leg sweeps [D]!", \
"<span class='userdanger'>[A] leg sweeps you!</span>") "<span class='userdanger'>[A] leg sweeps you!</span>")
playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, 1, -1) playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, TRUE, -1)
D.apply_damage(10, BRUTE) D.apply_damage(10, BRUTE)
D.Paralyze(60) D.Paralyze(60)
log_combat(A, D, "sweeped (CQC)") log_combat(A, D, "sweeped (CQC)")
@@ -171,7 +171,7 @@
I = D.get_active_held_item() I = D.get_active_held_item()
D.visible_message("<span class='warning'>[A] strikes [D]'s jaw with their hand!</span>", \ D.visible_message("<span class='warning'>[A] strikes [D]'s jaw with their hand!</span>", \
"<span class='userdanger'>[A] strikes your jaw, disorienting you!</span>", null, COMBAT_MESSAGE_RANGE) "<span class='userdanger'>[A] strikes your jaw, disorienting you!</span>", null, COMBAT_MESSAGE_RANGE)
playsound(get_turf(D), 'sound/weapons/cqchit1.ogg', 50, 1, -1) playsound(get_turf(D), 'sound/weapons/cqchit1.ogg', 50, TRUE, -1)
if(I && D.temporarilyRemoveItemFromInventory(I)) if(I && D.temporarilyRemoveItemFromInventory(I))
A.put_in_hands(I) A.put_in_hands(I)
D.Jitter(2) D.Jitter(2)
@@ -179,7 +179,7 @@
else else
D.visible_message("<span class='danger'>[A] fails to disarm [D]!</span>", \ D.visible_message("<span class='danger'>[A] fails to disarm [D]!</span>", \
"<span class='userdanger'>[A] fails to disarm you!</span>", null, COMBAT_MESSAGE_RANGE) "<span class='userdanger'>[A] fails to disarm you!</span>", null, COMBAT_MESSAGE_RANGE)
playsound(D, 'sound/weapons/punchmiss.ogg', 25, 1, -1) playsound(D, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
log_combat(A, D, "disarmed (CQC)", "[I ? " grabbing \the [I]" : ""]") log_combat(A, D, "disarmed (CQC)", "[I ? " grabbing \the [I]" : ""]")
if(restraining && A.pulling == D) if(restraining && A.pulling == D)
log_combat(A, D, "knocked out (Chokehold)(CQC)") log_combat(A, D, "knocked out (Chokehold)(CQC)")

View File

@@ -91,7 +91,7 @@
return 0 return 0
D.visible_message("<span class='warning'>[A] leg sweeps [D]!</span>", \ D.visible_message("<span class='warning'>[A] leg sweeps [D]!</span>", \
"<span class='userdanger'>[A] leg sweeps you!</span>") "<span class='userdanger'>[A] leg sweeps you!</span>")
playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, 1, -1) playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, TRUE, -1)
D.apply_damage(5, BRUTE) D.apply_damage(5, BRUTE)
D.Paralyze(40) D.Paralyze(40)
log_combat(A, D, "leg sweeped") log_combat(A, D, "leg sweeped")
@@ -100,7 +100,7 @@
/datum/martial_art/krav_maga/proc/quick_choke(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)//is actually lung punch /datum/martial_art/krav_maga/proc/quick_choke(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)//is actually lung punch
D.visible_message("<span class='warning'>[A] pounds [D] on the chest!</span>", \ D.visible_message("<span class='warning'>[A] pounds [D] on the chest!</span>", \
"<span class='userdanger'>[A] slams your chest! You can't breathe!</span>", null, COMBAT_MESSAGE_RANGE) "<span class='userdanger'>[A] slams your chest! You can't breathe!</span>", null, COMBAT_MESSAGE_RANGE)
playsound(get_turf(A), 'sound/effects/hit_punch.ogg', 50, 1, -1) playsound(get_turf(A), 'sound/effects/hit_punch.ogg', 50, TRUE, -1)
if(D.losebreath <= 10) if(D.losebreath <= 10)
D.losebreath = CLAMP(D.losebreath + 5, 0, 10) D.losebreath = CLAMP(D.losebreath + 5, 0, 10)
D.adjustOxyLoss(10) D.adjustOxyLoss(10)
@@ -110,7 +110,7 @@
/datum/martial_art/krav_maga/proc/neck_chop(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) /datum/martial_art/krav_maga/proc/neck_chop(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
D.visible_message("<span class='warning'>[A] karate chops [D]'s neck!</span>", \ D.visible_message("<span class='warning'>[A] karate chops [D]'s neck!</span>", \
"<span class='userdanger'>[A] karate chops your neck, rendering you unable to speak!</span>", null, COMBAT_MESSAGE_RANGE) "<span class='userdanger'>[A] karate chops your neck, rendering you unable to speak!</span>", null, COMBAT_MESSAGE_RANGE)
playsound(get_turf(A), 'sound/effects/hit_punch.ogg', 50, 1, -1) playsound(get_turf(A), 'sound/effects/hit_punch.ogg', 50, TRUE, -1)
D.apply_damage(5, A.dna.species.attack_type) D.apply_damage(5, A.dna.species.attack_type)
if(D.silent <= 10) if(D.silent <= 10)
D.silent = CLAMP(D.silent + 10, 0, 10) D.silent = CLAMP(D.silent + 10, 0, 10)
@@ -135,10 +135,10 @@
D.apply_damage(bonus_damage, A.dna.species.attack_type) D.apply_damage(bonus_damage, A.dna.species.attack_type)
if(picked_hit_type == "kicks" || picked_hit_type == "stomps on") if(picked_hit_type == "kicks" || picked_hit_type == "stomps on")
A.do_attack_animation(D, ATTACK_EFFECT_KICK) 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)
else else
A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
playsound(get_turf(D), 'sound/effects/hit_punch.ogg', 50, 1, -1) playsound(get_turf(D), 'sound/effects/hit_punch.ogg', 50, TRUE, -1)
D.visible_message("<span class='danger'>[A] [picked_hit_type] [D]!</span>", \ D.visible_message("<span class='danger'>[A] [picked_hit_type] [D]!</span>", \
"<span class='userdanger'>[A] [picked_hit_type] you!</span>", null, COMBAT_MESSAGE_RANGE) "<span class='userdanger'>[A] [picked_hit_type] you!</span>", null, COMBAT_MESSAGE_RANGE)
log_combat(A, D, "[picked_hit_type] with [name]") log_combat(A, D, "[picked_hit_type] with [name]")
@@ -155,11 +155,11 @@
A.put_in_hands(I) A.put_in_hands(I)
D.visible_message("<span class='danger'>[A] disarms [D]!</span>", \ D.visible_message("<span class='danger'>[A] disarms [D]!</span>", \
"<span class='userdanger'>[A] disarms you!</span>", null, COMBAT_MESSAGE_RANGE) "<span class='userdanger'>[A] disarms you!</span>", null, COMBAT_MESSAGE_RANGE)
playsound(D, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) playsound(D, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
else else
D.visible_message("<span class='danger'>[A] fails to disarm [D]!</span>", \ D.visible_message("<span class='danger'>[A] fails to disarm [D]!</span>", \
"<span class='userdanger'>[A] fails to disarm you!</span>", null, COMBAT_MESSAGE_RANGE) "<span class='userdanger'>[A] fails to disarm you!</span>", null, COMBAT_MESSAGE_RANGE)
playsound(D, 'sound/weapons/punchmiss.ogg', 25, 1, -1) playsound(D, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
log_combat(A, D, "disarmed (Krav Maga)", "[I ? " removing \the [I]" : ""]") log_combat(A, D, "disarmed (Krav Maga)", "[I ? " removing \the [I]" : ""]")
return 1 return 1

View File

@@ -13,7 +13,7 @@
D.visible_message("<span class='danger'>[A] [atk_verb] [D] with inhuman strength, sending [D.p_them()] flying backwards!</span>", \ D.visible_message("<span class='danger'>[A] [atk_verb] [D] with inhuman strength, sending [D.p_them()] flying backwards!</span>", \
"<span class='userdanger'>[A] [atk_verb] you with inhuman strength, sending you flying backwards!</span>") "<span class='userdanger'>[A] [atk_verb] you with inhuman strength, sending you flying backwards!</span>")
D.apply_damage(rand(15,30), A.dna.species.attack_type) D.apply_damage(rand(15,30), A.dna.species.attack_type)
playsound(D, 'sound/effects/meteorimpact.ogg', 25, 1, -1) playsound(D, 'sound/effects/meteorimpact.ogg', 25, TRUE, -1)
var/throwtarget = get_edge_target_turf(A, get_dir(A, get_step_away(D, A))) var/throwtarget = get_edge_target_turf(A, get_dir(A, get_step_away(D, A)))
D.throw_at(throwtarget, 4, 2, A)//So stuff gets tossed around at the same time. D.throw_at(throwtarget, 4, 2, A)//So stuff gets tossed around at the same time.
D.Paralyze(20) D.Paralyze(20)

View File

@@ -29,7 +29,7 @@
if(!A) if(!A)
break break
A.setDir(i) A.setDir(i)
playsound(A.loc, 'sound/weapons/punch1.ogg', 15, 1, -1) playsound(A.loc, 'sound/weapons/punch1.ogg', 15, TRUE, -1)
sleep(1) sleep(1)
/datum/martial_art/plasma_fist/proc/Tornado(mob/living/carbon/human/A, mob/living/carbon/human/D) /datum/martial_art/plasma_fist/proc/Tornado(mob/living/carbon/human/A, mob/living/carbon/human/D)
@@ -46,7 +46,7 @@
/datum/martial_art/plasma_fist/proc/Throwback(mob/living/carbon/human/A, mob/living/carbon/human/D) /datum/martial_art/plasma_fist/proc/Throwback(mob/living/carbon/human/A, mob/living/carbon/human/D)
D.visible_message("<span class='danger'>[A] hits [D] with Plasma Punch!</span>", \ D.visible_message("<span class='danger'>[A] hits [D] with Plasma Punch!</span>", \
"<span class='userdanger'>[A] hits you with Plasma Punch!</span>") "<span class='userdanger'>[A] hits you with Plasma Punch!</span>")
playsound(D.loc, 'sound/weapons/punch1.ogg', 50, 1, -1) playsound(D.loc, 'sound/weapons/punch1.ogg', 50, TRUE, -1)
var/atom/throw_target = get_edge_target_turf(D, get_dir(D, get_step_away(D, A))) var/atom/throw_target = get_edge_target_turf(D, get_dir(D, get_step_away(D, A)))
D.throw_at(throw_target, 200, 4,A) D.throw_at(throw_target, 200, 4,A)
A.say("HYAH!", forced="plasma fist") A.say("HYAH!", forced="plasma fist")
@@ -55,7 +55,7 @@
/datum/martial_art/plasma_fist/proc/Plasma(mob/living/carbon/human/A, mob/living/carbon/human/D) /datum/martial_art/plasma_fist/proc/Plasma(mob/living/carbon/human/A, mob/living/carbon/human/D)
A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
playsound(D.loc, 'sound/weapons/punch1.ogg', 50, 1, -1) playsound(D.loc, 'sound/weapons/punch1.ogg', 50, TRUE, -1)
A.say("PLASMA FIST!", forced="plasma fist") A.say("PLASMA FIST!", forced="plasma fist")
D.visible_message("<span class='danger'>[A] hits [D] with THE PLASMA FIST TECHNIQUE!</span>", \ D.visible_message("<span class='danger'>[A] hits [D] with THE PLASMA FIST TECHNIQUE!</span>", \
"<span class='userdanger'>[A] hits you with THE PLASMA FIST TECHNIQUE!</span>") "<span class='userdanger'>[A] hits you with THE PLASMA FIST TECHNIQUE!</span>")

View File

@@ -42,7 +42,7 @@
atk_verb = "headbutts" atk_verb = "headbutts"
D.visible_message("<span class='danger'>[A] [atk_verb] [D]!</span>", \ D.visible_message("<span class='danger'>[A] [atk_verb] [D]!</span>", \
"<span class='userdanger'>[A] [atk_verb] you!</span>") "<span class='userdanger'>[A] [atk_verb] you!</span>")
playsound(get_turf(D), 'sound/weapons/punch1.ogg', 40, 1, -1) playsound(get_turf(D), 'sound/weapons/punch1.ogg', 40, TRUE, -1)
D.apply_damage(rand(5,10), A.dna.species.attack_type, BODY_ZONE_HEAD) D.apply_damage(rand(5,10), A.dna.species.attack_type, BODY_ZONE_HEAD)
A.apply_damage(rand(5,10), A.dna.species.attack_type, BODY_ZONE_HEAD) A.apply_damage(rand(5,10), A.dna.species.attack_type, BODY_ZONE_HEAD)
if(!istype(D.head,/obj/item/clothing/head/helmet/) && !istype(D.head,/obj/item/clothing/head/hardhat)) if(!istype(D.head,/obj/item/clothing/head/helmet/) && !istype(D.head,/obj/item/clothing/head/hardhat))
@@ -55,7 +55,7 @@
D.visible_message("<span class='danger'>[A] [atk_verb] [D] with inhuman strength, sending [D.p_them()] flying backwards!</span>", \ D.visible_message("<span class='danger'>[A] [atk_verb] [D] with inhuman strength, sending [D.p_them()] flying backwards!</span>", \
"<span class='userdanger'>[A] [atk_verb] you with inhuman strength, sending you flying backwards!</span>") "<span class='userdanger'>[A] [atk_verb] you with inhuman strength, sending you flying backwards!</span>")
D.apply_damage(rand(15,30), A.dna.species.attack_type) D.apply_damage(rand(15,30), A.dna.species.attack_type)
playsound(get_turf(D), 'sound/effects/meteorimpact.ogg', 25, 1, -1) playsound(get_turf(D), 'sound/effects/meteorimpact.ogg', 25, TRUE, -1)
var/throwtarget = get_edge_target_turf(A, get_dir(A, get_step_away(D, A))) var/throwtarget = get_edge_target_turf(A, get_dir(A, get_step_away(D, A)))
D.throw_at(throwtarget, 4, 2, A)//So stuff gets tossed around at the same time. D.throw_at(throwtarget, 4, 2, A)//So stuff gets tossed around at the same time.
D.Paralyze(60) D.Paralyze(60)

View File

@@ -40,7 +40,7 @@
A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
D.visible_message("<span class='warning'>[A] grabs [D]'s wrist and wrenches it sideways!</span>", \ D.visible_message("<span class='warning'>[A] grabs [D]'s wrist and wrenches it sideways!</span>", \
"<span class='userdanger'>[A] grabs your wrist and violently wrenches it to the side!</span>") "<span class='userdanger'>[A] grabs your wrist and violently wrenches it to the side!</span>")
playsound(get_turf(A), 'sound/weapons/thudswoosh.ogg', 50, 1, -1) playsound(get_turf(A), 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
D.emote("scream") D.emote("scream")
D.dropItemToGround(D.get_active_held_item()) D.dropItemToGround(D.get_active_held_item())
D.apply_damage(5, BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)) D.apply_damage(5, BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
@@ -58,7 +58,7 @@
"<span class='userdanger'>[A] kicks you in the back, making you stumble and fall!</span>") "<span class='userdanger'>[A] kicks you in the back, making you stumble and fall!</span>")
step_to(D,get_step(D,D.dir),1) step_to(D,get_step(D,D.dir),1)
D.Paralyze(80) D.Paralyze(80)
playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1) playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, TRUE, -1)
return TRUE return TRUE
else else
log_combat(A, D, "missed a back-kick (Sleeping Carp) on") log_combat(A, D, "missed a back-kick (Sleeping Carp) on")
@@ -75,7 +75,7 @@
D.audible_message("<b>[D]</b> gags!") D.audible_message("<b>[D]</b> gags!")
D.losebreath += 3 D.losebreath += 3
D.Stun(40) D.Stun(40)
playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1) playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, TRUE, -1)
return TRUE return TRUE
return basic_hit(A,D) return basic_hit(A,D)
@@ -87,7 +87,7 @@
"<span class='userdanger'>[A] kicks you in the jaw!</span>") "<span class='userdanger'>[A] kicks you in the jaw!</span>")
D.apply_damage(20, A.dna.species.attack_type, BODY_ZONE_HEAD) D.apply_damage(20, A.dna.species.attack_type, BODY_ZONE_HEAD)
D.drop_all_held_items() D.drop_all_held_items()
playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1) playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, TRUE, -1)
D.Stun(80) D.Stun(80)
return TRUE return TRUE
return basic_hit(A,D) return basic_hit(A,D)
@@ -101,7 +101,7 @@
if(D.stat) if(D.stat)
D.death() //FINISH HIM! D.death() //FINISH HIM!
D.apply_damage(50, A.dna.species.attack_type, BODY_ZONE_CHEST) D.apply_damage(50, A.dna.species.attack_type, BODY_ZONE_CHEST)
playsound(get_turf(D), 'sound/weapons/punch1.ogg', 75, 1, -1) playsound(get_turf(D), 'sound/weapons/punch1.ogg', 75, TRUE, -1)
return TRUE return TRUE
return basic_hit(A,D) return basic_hit(A,D)
@@ -131,7 +131,7 @@
D.visible_message("<span class='danger'>[A] [atk_verb] [D]!</span>", \ D.visible_message("<span class='danger'>[A] [atk_verb] [D]!</span>", \
"<span class='userdanger'>[A] [atk_verb] you!</span>") "<span class='userdanger'>[A] [atk_verb] you!</span>")
D.apply_damage(rand(10,15), BRUTE) D.apply_damage(rand(10,15), BRUTE)
playsound(get_turf(D), 'sound/weapons/punch1.ogg', 25, 1, -1) playsound(get_turf(D), 'sound/weapons/punch1.ogg', 25, TRUE, -1)
if(prob(D.getBruteLoss()) && (D.mobility_flags & MOBILITY_STAND)) if(prob(D.getBruteLoss()) && (D.mobility_flags & MOBILITY_STAND))
D.visible_message("<span class='warning'>[D] stumbles and falls!</span>", "<span class='userdanger'>The blow sends you to the ground!</span>") D.visible_message("<span class='warning'>[D] stumbles and falls!</span>", "<span class='userdanger'>The blow sends you to the ground!</span>")
D.Paralyze(80) D.Paralyze(80)
@@ -156,7 +156,7 @@
if(!isturf(A.loc)) //NO MOTHERFLIPPIN MECHS! if(!isturf(A.loc)) //NO MOTHERFLIPPIN MECHS!
return BULLET_ACT_HIT return BULLET_ACT_HIT
A.visible_message("<span class='danger'>[A] deflects the projectile; [A.p_they()] can't be hit with ranged weapons!</span>", "<span class='userdanger'>You deflect the projectile!</span>") A.visible_message("<span class='danger'>[A] deflects the projectile; [A.p_they()] can't be hit with ranged weapons!</span>", "<span class='userdanger'>You deflect the projectile!</span>")
playsound(src, pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, 1) playsound(src, pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, TRUE)
P.firer = A P.firer = A
P.setAngle(rand(0, 360))//SHING P.setAngle(rand(0, 360))//SHING
return BULLET_ACT_FORCE_PIERCE return BULLET_ACT_FORCE_PIERCE
@@ -239,7 +239,7 @@
"[user] twirls and slams [H] with [src]!") "[user] twirls and slams [H] with [src]!")
H.visible_message("<span class='warning'>[pick(fluffmessages)]</span>", \ H.visible_message("<span class='warning'>[pick(fluffmessages)]</span>", \
"<span class='userdanger'>[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.adjustStaminaLoss(rand(13,20)) H.adjustStaminaLoss(rand(13,20))
if(prob(10)) if(prob(10))
H.visible_message("<span class='warning'>[H] collapses!</span>", \ H.visible_message("<span class='warning'>[H] collapses!</span>", \

View File

@@ -189,7 +189,7 @@
D.visible_message("<span class='danger'><B>[A] throws [D]!</B></span>", \ D.visible_message("<span class='danger'><B>[A] throws [D]!</B></span>", \
"<span class='userdanger'>[A] throws you!</span>") "<span class='userdanger'>[A] throws you!</span>")
playsound(A.loc, "swing_hit", 50, 1) playsound(A.loc, "swing_hit", 50, TRUE)
var/turf/T = get_edge_target_turf(A, A.dir) var/turf/T = get_edge_target_turf(A, A.dir)
if (T && isturf(T)) if (T && isturf(T))
if (!D.stat) if (!D.stat)
@@ -289,7 +289,7 @@
D.visible_message("<span class='danger'><B>[A] [fluff] [D]!</B></span>", \ D.visible_message("<span class='danger'><B>[A] [fluff] [D]!</B></span>", \
"<span class='userdanger'>[A] [fluff] you!</span>", null, COMBAT_MESSAGE_RANGE) "<span class='userdanger'>[A] [fluff] you!</span>", null, COMBAT_MESSAGE_RANGE)
playsound(A.loc, "swing_hit", 50, 1) playsound(A.loc, "swing_hit", 50, TRUE)
if (!D.stat) if (!D.stat)
D.emote("scream") D.emote("scream")
D.Paralyze(40) D.Paralyze(40)
@@ -334,7 +334,7 @@
D.visible_message("<span class='danger'><B>[A] headbutts [D]!</B></span>", \ D.visible_message("<span class='danger'><B>[A] headbutts [D]!</B></span>", \
"<span class='userdanger'>[A] headbutts you!</span>", null, COMBAT_MESSAGE_RANGE) "<span class='userdanger'>[A] headbutts you!</span>", null, COMBAT_MESSAGE_RANGE)
D.adjustBruteLoss(rand(10,20)) D.adjustBruteLoss(rand(10,20))
playsound(A.loc, "swing_hit", 50, 1) playsound(A.loc, "swing_hit", 50, TRUE)
D.Unconscious(20) D.Unconscious(20)
log_combat(A, D, "headbutted") log_combat(A, D, "headbutted")
@@ -347,7 +347,7 @@
D.visible_message("<span class='danger'><B>[A] roundhouse-kicks [D]!</B></span>", \ D.visible_message("<span class='danger'><B>[A] roundhouse-kicks [D]!</B></span>", \
"<span class='userdanger'>[A] roundhouse-kicks you!</span>", null, COMBAT_MESSAGE_RANGE) "<span class='userdanger'>[A] roundhouse-kicks you!</span>", null, COMBAT_MESSAGE_RANGE)
playsound(A.loc, "swing_hit", 50, 1) playsound(A.loc, "swing_hit", 50, TRUE)
D.adjustBruteLoss(rand(10,20)) D.adjustBruteLoss(rand(10,20))
var/turf/T = get_edge_target_turf(A, get_dir(A, get_step_away(D, A))) var/turf/T = get_edge_target_turf(A, get_dir(A, get_step_away(D, A)))
@@ -412,7 +412,7 @@
D.visible_message("<span class='danger'><B>[A] leg-drops [D]!</B></span>", \ D.visible_message("<span class='danger'><B>[A] leg-drops [D]!</B></span>", \
"<span class='userdanger'>[A] leg-drops you!</span>") "<span class='userdanger'>[A] leg-drops you!</span>")
playsound(A.loc, "swing_hit", 50, 1) playsound(A.loc, "swing_hit", 50, TRUE)
A.emote("scream") A.emote("scream")
if (falling == 1) if (falling == 1)

View File

@@ -318,7 +318,7 @@
if(prob(15)) if(prob(15))
owner.acid_act(rand(30,50), 10) owner.acid_act(rand(30,50), 10)
owner.visible_message("<span class='warning'>[owner]'s skin bubbles and pops.</span>", "<span class='userdanger'>Your bubbling flesh pops! It burns!</span>") owner.visible_message("<span class='warning'>[owner]'s skin bubbles and pops.</span>", "<span class='userdanger'>Your bubbling flesh pops! It burns!</span>")
playsound(owner,'sound/weapons/sear.ogg', 50, 1) playsound(owner,'sound/weapons/sear.ogg', 50, TRUE)
/datum/mutation/human/gigantism /datum/mutation/human/gigantism
name = "Gigantism"//negative version of dwarfism name = "Gigantism"//negative version of dwarfism

View File

@@ -12,7 +12,7 @@
/datum/status_effect/shadow_mend/on_apply() /datum/status_effect/shadow_mend/on_apply()
owner.visible_message("<span class='notice'>Violet light wraps around [owner]'s body!</span>", "<span class='notice'>Violet light wraps around your body!</span>") owner.visible_message("<span class='notice'>Violet light wraps around [owner]'s body!</span>", "<span class='notice'>Violet light wraps around your body!</span>")
playsound(owner, 'sound/magic/teleport_app.ogg', 50, 1) playsound(owner, 'sound/magic/teleport_app.ogg', 50, TRUE)
return ..() return ..()
/datum/status_effect/shadow_mend/tick() /datum/status_effect/shadow_mend/tick()
@@ -21,7 +21,7 @@
/datum/status_effect/shadow_mend/on_remove() /datum/status_effect/shadow_mend/on_remove()
owner.visible_message("<span class='warning'>The violet light around [owner] glows black!</span>", "<span class='warning'>The tendrils around you cinch tightly and reap their toll...</span>") owner.visible_message("<span class='warning'>The violet light around [owner] glows black!</span>", "<span class='warning'>The tendrils around you cinch tightly and reap their toll...</span>")
playsound(owner, 'sound/magic/teleport_diss.ogg', 50, 1) playsound(owner, 'sound/magic/teleport_diss.ogg', 50, TRUE)
owner.apply_status_effect(STATUS_EFFECT_VOID_PRICE) owner.apply_status_effect(STATUS_EFFECT_VOID_PRICE)
@@ -131,14 +131,14 @@
owner.status_flags |= GODMODE owner.status_flags |= GODMODE
animate(owner, color = oldcolor, time = 150, easing = EASE_IN) animate(owner, color = oldcolor, time = 150, easing = EASE_IN)
addtimer(CALLBACK(owner, /atom/proc/update_atom_colour), 150) addtimer(CALLBACK(owner, /atom/proc/update_atom_colour), 150)
playsound(owner, 'sound/magic/ethereal_enter.ogg', 50, 1) playsound(owner, 'sound/magic/ethereal_enter.ogg', 50, TRUE)
return ..() return ..()
/datum/status_effect/inathneqs_endowment/on_remove() /datum/status_effect/inathneqs_endowment/on_remove()
owner.log_message("lost Inath-neq's invulnerability", LOG_ATTACK) owner.log_message("lost Inath-neq's invulnerability", LOG_ATTACK)
owner.visible_message("<span class='warning'>The light around [owner] flickers and dissipates!</span>", "<span class='boldwarning'>You feel Inath-neq's power fade from your body!</span>") owner.visible_message("<span class='warning'>The light around [owner] flickers and dissipates!</span>", "<span class='boldwarning'>You feel Inath-neq's power fade from your body!</span>")
owner.status_flags &= ~GODMODE owner.status_flags &= ~GODMODE
playsound(owner, 'sound/magic/ethereal_exit.ogg', 50, 1) playsound(owner, 'sound/magic/ethereal_exit.ogg', 50, TRUE)
/datum/status_effect/cyborg_power_regen /datum/status_effect/cyborg_power_regen
@@ -162,7 +162,7 @@
if(!istype(cyborg) || !cyborg.cell) if(!istype(cyborg) || !cyborg.cell)
qdel(src) qdel(src)
return return
playsound(cyborg, 'sound/effects/light_flicker.ogg', 50, 1) playsound(cyborg, 'sound/effects/light_flicker.ogg', 50, TRUE)
cyborg.cell.give(power_to_give) cyborg.cell.give(power_to_give)
/datum/status_effect/his_grace /datum/status_effect/his_grace
@@ -405,12 +405,12 @@
owner.spin(duration,1) owner.spin(duration,1)
animate(owner, color = oldcolor, time = duration, easing = EASE_IN) animate(owner, color = oldcolor, time = duration, easing = EASE_IN)
addtimer(CALLBACK(owner, /atom/proc/update_atom_colour), duration) addtimer(CALLBACK(owner, /atom/proc/update_atom_colour), duration)
playsound(owner, 'sound/weapons/fwoosh.ogg', 75, 0) playsound(owner, 'sound/weapons/fwoosh.ogg', 75, FALSE)
return ..() return ..()
/datum/status_effect/sword_spin/tick() /datum/status_effect/sword_spin/tick()
playsound(owner, 'sound/weapons/fwoosh.ogg', 75, 0) playsound(owner, 'sound/weapons/fwoosh.ogg', 75, FALSE)
var/obj/item/slashy var/obj/item/slashy
slashy = owner.get_active_held_item() slashy = owner.get_active_held_item()
for(var/mob/living/M in orange(1,owner)) for(var/mob/living/M in orange(1,owner))
@@ -591,7 +591,7 @@
owner.visible_message("<span class='notice'>[owner] is coated with a dull aura!</span>") owner.visible_message("<span class='notice'>[owner] is coated with a dull aura!</span>")
ADD_TRAIT(owner, TRAIT_ANTIMAGIC, MAGIC_TRAIT) ADD_TRAIT(owner, TRAIT_ANTIMAGIC, MAGIC_TRAIT)
//glowing wings overlay //glowing wings overlay
playsound(owner, 'sound/weapons/fwoosh.ogg', 75, 0) playsound(owner, 'sound/weapons/fwoosh.ogg', 75, FALSE)
return ..() return ..()
/datum/status_effect/antimagic/on_remove() /datum/status_effect/antimagic/on_remove()

View File

@@ -470,7 +470,7 @@
wasting_effect.transform = owner.transform //if the owner has been stunned the overlay should inherit that position wasting_effect.transform = owner.transform //if the owner has been stunned the overlay should inherit that position
wasting_effect.alpha = 255 wasting_effect.alpha = 255
animate(wasting_effect, alpha = 0, time = 32) animate(wasting_effect, alpha = 0, time = 32)
playsound(owner, 'sound/effects/curse5.ogg', 20, 1, -1) playsound(owner, 'sound/effects/curse5.ogg', 20, TRUE, -1)
owner.adjustFireLoss(0.75) owner.adjustFireLoss(0.75)
if(effect_last_activation <= world.time) if(effect_last_activation <= world.time)
effect_last_activation = world.time + effect_cooldown effect_last_activation = world.time + effect_cooldown
@@ -493,7 +493,7 @@
/datum/status_effect/necropolis_curse/proc/grasp(turf/spawn_turf) /datum/status_effect/necropolis_curse/proc/grasp(turf/spawn_turf)
set waitfor = FALSE set waitfor = FALSE
new/obj/effect/temp_visual/dir_setting/curse/grasp_portal(spawn_turf, owner.dir) new/obj/effect/temp_visual/dir_setting/curse/grasp_portal(spawn_turf, owner.dir)
playsound(spawn_turf, 'sound/effects/curse2.ogg', 80, 1, -1) playsound(spawn_turf, 'sound/effects/curse2.ogg', 80, TRUE, -1)
var/turf/ownerloc = get_turf(owner) var/turf/ownerloc = get_turf(owner)
var/obj/item/projectile/curse_hand/C = new (spawn_turf) var/obj/item/projectile/curse_hand/C = new (spawn_turf)
C.preparePixelProjectile(ownerloc, spawn_turf) C.preparePixelProjectile(ownerloc, spawn_turf)

View File

@@ -97,7 +97,7 @@
/datum/status_effect/bounty/on_apply() /datum/status_effect/bounty/on_apply()
to_chat(owner, "<span class='boldnotice'>You hear something behind you talking...</span> <span class='notice'>You have been marked for death by [rewarded]. If you die, they will be rewarded.</span>") to_chat(owner, "<span class='boldnotice'>You hear something behind you talking...</span> <span class='notice'>You have been marked for death by [rewarded]. If you die, they will be rewarded.</span>")
playsound(owner, 'sound/weapons/shotgunpump.ogg', 75, 0) playsound(owner, 'sound/weapons/shotgunpump.ogg', 75, FALSE)
return ..() return ..()
/datum/status_effect/bounty/tick() /datum/status_effect/bounty/tick()
@@ -108,7 +108,7 @@
/datum/status_effect/bounty/proc/rewards() /datum/status_effect/bounty/proc/rewards()
if(rewarded && rewarded.mind && rewarded.stat != DEAD) if(rewarded && rewarded.mind && rewarded.stat != DEAD)
to_chat(owner, "<span class='boldnotice'>You hear something behind you talking...</span> <span class='notice'>Bounty claimed.</span>") to_chat(owner, "<span class='boldnotice'>You hear something behind you talking...</span> <span class='notice'>Bounty claimed.</span>")
playsound(owner, 'sound/weapons/shotgunshot.ogg', 75, 0) playsound(owner, 'sound/weapons/shotgunshot.ogg', 75, FALSE)
to_chat(rewarded, "<span class='greentext'>You feel a surge of mana flow into you!</span>") to_chat(rewarded, "<span class='greentext'>You feel a surge of mana flow into you!</span>")
for(var/obj/effect/proc_holder/spell/spell in rewarded.mind.spell_list) for(var/obj/effect/proc_holder/spell/spell in rewarded.mind.spell_list)
spell.charge_counter = spell.charge_max spell.charge_counter = spell.charge_max

View File

@@ -31,13 +31,13 @@
holder.visible_message("<span class='notice'>[icon2html(B, viewers(holder))] Nothing happens.</span>") holder.visible_message("<span class='notice'>[icon2html(B, viewers(holder))] Nothing happens.</span>")
else else
holder.visible_message("<span class='notice'>[icon2html(B, viewers(holder))] The bomb chirps.</span>") holder.visible_message("<span class='notice'>[icon2html(B, viewers(holder))] The bomb chirps.</span>")
playsound(B, 'sound/machines/chime.ogg', 30, 1) playsound(B, 'sound/machines/chime.ogg', 30, TRUE)
B.detonation_timer += 300 B.detonation_timer += 300
if(B.active) if(B.active)
B.delayedbig = TRUE B.delayedbig = TRUE
if(WIRE_PROCEED) if(WIRE_PROCEED)
holder.visible_message("<span class='danger'>[icon2html(B, viewers(holder))] The bomb buzzes ominously!</span>") holder.visible_message("<span class='danger'>[icon2html(B, viewers(holder))] The bomb buzzes ominously!</span>")
playsound(B, 'sound/machines/buzz-sigh.ogg', 30, 1) playsound(B, 'sound/machines/buzz-sigh.ogg', 30, TRUE)
var/seconds = B.seconds_remaining() var/seconds = B.seconds_remaining()
if(seconds >= 61) // Long fuse bombs can suddenly become more dangerous if you tinker with them. if(seconds >= 61) // Long fuse bombs can suddenly become more dangerous if you tinker with them.
B.detonation_timer = world.time + 600 B.detonation_timer = world.time + 600
@@ -68,7 +68,7 @@
if(WIRE_UNBOLT) if(WIRE_UNBOLT)
if(!mend && B.anchored) if(!mend && B.anchored)
holder.visible_message("<span class='notice'>[icon2html(B, viewers(holder))] The bolts lift out of the ground!</span>") holder.visible_message("<span class='notice'>[icon2html(B, viewers(holder))] The bolts lift out of the ground!</span>")
playsound(B, 'sound/effects/stealthoff.ogg', 30, 1) playsound(B, 'sound/effects/stealthoff.ogg', 30, TRUE)
B.anchored = FALSE B.anchored = FALSE
if(WIRE_PROCEED) if(WIRE_PROCEED)
if(!mend && B.active) if(!mend && B.active)

View File

@@ -194,7 +194,7 @@
/obj/item/grown/bananapeel/bombanana/suicide_act(mob/user) /obj/item/grown/bananapeel/bombanana/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is deliberately slipping on the [src.name]! It looks like \he's trying to commit suicide.</span>") user.visible_message("<span class='suicide'>[user] is deliberately slipping on the [src.name]! It looks like \he's trying to commit suicide.</span>")
playsound(loc, 'sound/misc/slip.ogg', 50, 1, -1) playsound(loc, 'sound/misc/slip.ogg', 50, TRUE, -1)
bomb.preprime(user, 0, FALSE) bomb.preprime(user, 0, FALSE)
return (BRUTELOSS) return (BRUTELOSS)

View File

@@ -450,7 +450,7 @@
player_mind.add_antag_datum(/datum/antagonist/nightmare) player_mind.add_antag_datum(/datum/antagonist/nightmare)
S.set_species(/datum/species/shadow/nightmare) S.set_species(/datum/species/shadow/nightmare)
playsound(S, 'sound/magic/ethereal_exit.ogg', 50, 1, -1) playsound(S, 'sound/magic/ethereal_exit.ogg', 50, TRUE, -1)
message_admins("[ADMIN_LOOKUPFLW(S)] has been made into a Nightmare by the midround ruleset.") message_admins("[ADMIN_LOOKUPFLW(S)] has been made into a Nightmare by the midround ruleset.")
log_game("DYNAMIC: [key_name(S)] was spawned as a Nightmare by the midround ruleset.") log_game("DYNAMIC: [key_name(S)] was spawned as a Nightmare by the midround ruleset.")
return S return S

View File

@@ -135,7 +135,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
/obj/effect/meteor/Bump(atom/A) /obj/effect/meteor/Bump(atom/A)
if(A) if(A)
ram_turf(get_turf(A)) ram_turf(get_turf(A))
playsound(src.loc, meteorsound, 40, 1) playsound(src.loc, meteorsound, 40, TRUE)
get_hit() get_hit()
/obj/effect/meteor/proc/ram_turf(turf/T) /obj/effect/meteor/proc/ram_turf(turf/T)

View File

@@ -424,7 +424,7 @@ Class Procs:
if(I.use_tool(src, user, time, extra_checks = CALLBACK(src, .proc/unfasten_wrench_check, prev_anchored, user))) if(I.use_tool(src, user, time, extra_checks = CALLBACK(src, .proc/unfasten_wrench_check, prev_anchored, user)))
to_chat(user, "<span class='notice'>You [anchored ? "un" : ""]secure [src].</span>") to_chat(user, "<span class='notice'>You [anchored ? "un" : ""]secure [src].</span>")
setAnchored(!anchored) setAnchored(!anchored)
playsound(src, 'sound/items/deconstruct.ogg', 50, 1) playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE)
SEND_SIGNAL(src, COMSIG_OBJ_DEFAULT_UNFASTEN_WRENCH, anchored) SEND_SIGNAL(src, COMSIG_OBJ_DEFAULT_UNFASTEN_WRENCH, anchored)
return SUCCESSFUL_UNFASTEN return SUCCESSFUL_UNFASTEN
return FAILED_UNFASTEN return FAILED_UNFASTEN

View File

@@ -105,7 +105,7 @@ GLOBAL_LIST_EMPTY(announcement_systems)
return return
if(stat & BROKEN) if(stat & BROKEN)
visible_message("<span class='warning'>[src] buzzes.</span>", "<span class='italics'>You hear a faint buzz.</span>") visible_message("<span class='warning'>[src] buzzes.</span>", "<span class='italics'>You hear a faint buzz.</span>")
playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 1) playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, TRUE)
return return
@@ -123,7 +123,7 @@ GLOBAL_LIST_EMPTY(announcement_systems)
return return
if(stat & BROKEN) if(stat & BROKEN)
visible_message("<span class='warning'>[src] buzzes.</span>", "<span class='italics'>You hear a faint buzz.</span>") visible_message("<span class='warning'>[src] buzzes.</span>", "<span class='italics'>You hear a faint buzz.</span>")
playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 1) playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, TRUE)
return return
if(href_list["ArrivalTopic"]) if(href_list["ArrivalTopic"])

View File

@@ -51,7 +51,7 @@
end_syphon() end_syphon()
return return
playsound(src, 'sound/items/poster_being_created.ogg', 100, 1) playsound(src, 'sound/items/poster_being_created.ogg', 100, TRUE)
syphoning_credits += 200 syphoning_credits += 200
D.adjust_money(-200) D.adjust_money(-200)
if(next_warning < world.time && prob(15)) if(next_warning < world.time && prob(15))

View File

@@ -94,7 +94,7 @@
if(W.use_tool(src, user, 40)) if(W.use_tool(src, user, 40))
to_chat(user, "<span class='notice'>You unsecure the button frame.</span>") to_chat(user, "<span class='notice'>You unsecure the button frame.</span>")
transfer_fingerprints_to(new /obj/item/wallframe/button(get_turf(src))) transfer_fingerprints_to(new /obj/item/wallframe/button(get_turf(src)))
playsound(loc, 'sound/items/deconstruct.ogg', 50, 1) playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE)
qdel(src) qdel(src)
update_icon() update_icon()
@@ -110,7 +110,7 @@
return return
req_access = list() req_access = list()
req_one_access = list() req_one_access = list()
playsound(src, "sparks", 100, 1) playsound(src, "sparks", 100, TRUE)
obj_flags |= EMAGGED obj_flags |= EMAGGED
/obj/machinery/button/attack_ai(mob/user) /obj/machinery/button/attack_ai(mob/user)

View File

@@ -87,16 +87,16 @@
switch(damage_type) switch(damage_type)
if(BRUTE) if(BRUTE)
if(stat & BROKEN) if(stat & BROKEN)
playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1) playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, TRUE)
else else
playsound(src.loc, 'sound/effects/glasshit.ogg', 75, 1) playsound(src.loc, 'sound/effects/glasshit.ogg', 75, TRUE)
if(BURN) if(BURN)
playsound(src.loc, 'sound/items/welder.ogg', 100, 1) playsound(src.loc, 'sound/items/welder.ogg', 100, TRUE)
/obj/machinery/computer/obj_break(damage_flag) /obj/machinery/computer/obj_break(damage_flag)
if(circuit && !(flags_1 & NODECONSTRUCT_1)) //no circuit, no breaking if(circuit && !(flags_1 & NODECONSTRUCT_1)) //no circuit, no breaking
if(!(stat & BROKEN)) if(!(stat & BROKEN))
playsound(loc, 'sound/effects/glassbr3.ogg', 100, 1) playsound(loc, 'sound/effects/glassbr3.ogg', 100, TRUE)
stat |= BROKEN stat |= BROKEN
update_icon() update_icon()
set_light(0) set_light(0)
@@ -124,7 +124,7 @@
if(user) if(user)
to_chat(user, "<span class='notice'>The broken glass falls out.</span>") to_chat(user, "<span class='notice'>The broken glass falls out.</span>")
else else
playsound(src, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1) playsound(src, 'sound/effects/hit_on_shattered_glass.ogg', 70, TRUE)
new /obj/item/shard(drop_location()) new /obj/item/shard(drop_location())
new /obj/item/shard(drop_location()) new /obj/item/shard(drop_location())
A.state = 3 A.state = 3

View File

@@ -98,7 +98,7 @@
return return
if(href_list["fix"]) if(href_list["fix"])
to_chat(usr, "<span class='notice'>Reconstruction in progress. This will take several minutes.</span>") to_chat(usr, "<span class='notice'>Reconstruction in progress. This will take several minutes.</span>")
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 25, 0) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 25, FALSE)
active = TRUE active = TRUE
if(occupier) if(occupier)
var/mob/living/silicon/ai/A = occupier var/mob/living/silicon/ai/A = occupier

View File

@@ -23,8 +23,8 @@
if(active_apc) if(active_apc)
if(!active_apc.locked) if(!active_apc.locked)
active_apc.say("Remote access canceled. Interface locked.") active_apc.say("Remote access canceled. Interface locked.")
playsound(active_apc, 'sound/machines/boltsdown.ogg', 25, 0) playsound(active_apc, 'sound/machines/boltsdown.ogg', 25, FALSE)
playsound(active_apc, 'sound/machines/terminal_alert.ogg', 50, 0) playsound(active_apc, 'sound/machines/terminal_alert.ogg', 50, FALSE)
active_apc.locked = TRUE active_apc.locked = TRUE
active_apc.update_icon() active_apc.update_icon()
active_apc.remote_control = null active_apc.remote_control = null
@@ -98,10 +98,10 @@
authenticated = TRUE authenticated = TRUE
auth_id = "[ID.registered_name] ([ID.assignment])" auth_id = "[ID.registered_name] ([ID.assignment])"
log_activity("logged in") log_activity("logged in")
playsound(src, 'sound/machines/terminal_on.ogg', 50, 0) playsound(src, 'sound/machines/terminal_on.ogg', 50, FALSE)
if(href_list["log_out"]) if(href_list["log_out"])
log_activity("logged out") log_activity("logged out")
playsound(src, 'sound/machines/terminal_off.ogg', 50, 0) playsound(src, 'sound/machines/terminal_off.ogg', 50, FALSE)
authenticated = FALSE authenticated = FALSE
auth_id = "\[NULL\]" auth_id = "\[NULL\]"
if(href_list["restore_logging"]) if(href_list["restore_logging"])
@@ -109,7 +109,7 @@
obj_flags &= ~EMAGGED obj_flags &= ~EMAGGED
LAZYADD(logs, "<b>-=- Logging restored to full functionality at this point -=-</b>") LAZYADD(logs, "<b>-=- Logging restored to full functionality at this point -=-</b>")
if(href_list["access_apc"]) if(href_list["access_apc"])
playsound(src, "terminal_type", 50, 0) playsound(src, "terminal_type", 50, FALSE)
var/obj/machinery/power/apc/APC = locate(href_list["access_apc"]) in GLOB.apcs_list var/obj/machinery/power/apc/APC = locate(href_list["access_apc"]) in GLOB.apcs_list
if(!APC || APC.aidisabled || APC.panel_open || QDELETED(APC)) if(!APC || APC.aidisabled || APC.panel_open || QDELETED(APC))
to_chat(usr, "<span class='robot danger'>[icon2html(src, usr)] APC does not return interface request. Remote access may be disabled.</span>") to_chat(usr, "<span class='robot danger'>[icon2html(src, usr)] APC does not return interface request. Remote access may be disabled.</span>")
@@ -117,8 +117,8 @@
if(active_apc) if(active_apc)
to_chat(usr, "<span class='robot danger'>[icon2html(src, usr)] Disconnected from [active_apc].</span>") to_chat(usr, "<span class='robot danger'>[icon2html(src, usr)] Disconnected from [active_apc].</span>")
active_apc.say("Remote access canceled. Interface locked.") active_apc.say("Remote access canceled. Interface locked.")
playsound(active_apc, 'sound/machines/boltsdown.ogg', 25, 0) playsound(active_apc, 'sound/machines/boltsdown.ogg', 25, FALSE)
playsound(active_apc, 'sound/machines/terminal_alert.ogg', 50, 0) playsound(active_apc, 'sound/machines/terminal_alert.ogg', 50, FALSE)
active_apc.locked = TRUE active_apc.locked = TRUE
active_apc.update_icon() active_apc.update_icon()
active_apc.remote_control = null active_apc.remote_control = null
@@ -127,43 +127,43 @@
log_activity("remotely accessed APC in [get_area_name(APC.area, TRUE)]") log_activity("remotely accessed APC in [get_area_name(APC.area, TRUE)]")
APC.remote_control = src APC.remote_control = src
APC.ui_interact(usr) APC.ui_interact(usr)
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
message_admins("[ADMIN_LOOKUPFLW(usr)] remotely accessed [APC] from [src] at [AREACOORD(src)].") message_admins("[ADMIN_LOOKUPFLW(usr)] remotely accessed [APC] from [src] at [AREACOORD(src)].")
log_game("[key_name(usr)] remotely accessed [APC] from [src] at [AREACOORD(src)].") log_game("[key_name(usr)] remotely accessed [APC] from [src] at [AREACOORD(src)].")
if(APC.locked) if(APC.locked)
APC.say("Remote access detected. Interface unlocked.") APC.say("Remote access detected. Interface unlocked.")
playsound(APC, 'sound/machines/boltsup.ogg', 25, 0) playsound(APC, 'sound/machines/boltsup.ogg', 25, FALSE)
playsound(APC, 'sound/machines/terminal_alert.ogg', 50, 0) playsound(APC, 'sound/machines/terminal_alert.ogg', 50, FALSE)
APC.locked = FALSE APC.locked = FALSE
APC.update_icon() APC.update_icon()
active_apc = APC active_apc = APC
if(href_list["name_filter"]) if(href_list["name_filter"])
playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
var/new_filter = stripped_input(usr, "What name are you looking for?", name) var/new_filter = stripped_input(usr, "What name are you looking for?", name)
if(!src || !usr || !usr.canUseTopic(src, !issilicon(usr)) || stat || QDELETED(src)) if(!src || !usr || !usr.canUseTopic(src, !issilicon(usr)) || stat || QDELETED(src))
return return
log_activity("changed name filter to \"[new_filter]\"") log_activity("changed name filter to \"[new_filter]\"")
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
result_filters["Name"] = new_filter result_filters["Name"] = new_filter
if(href_list["above_filter"]) if(href_list["above_filter"])
playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
var/new_filter = input(usr, "Enter a percentage from 1-100 to sort by (greater than).", name) as null|num var/new_filter = input(usr, "Enter a percentage from 1-100 to sort by (greater than).", name) as null|num
if(!src || !usr || !usr.canUseTopic(src, !issilicon(usr)) || stat || QDELETED(src)) if(!src || !usr || !usr.canUseTopic(src, !issilicon(usr)) || stat || QDELETED(src))
return return
log_activity("changed greater than charge filter to \"[new_filter]\"") log_activity("changed greater than charge filter to \"[new_filter]\"")
if(new_filter) if(new_filter)
new_filter = CLAMP(new_filter, 0, 100) new_filter = CLAMP(new_filter, 0, 100)
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
result_filters["Charge Above"] = new_filter result_filters["Charge Above"] = new_filter
if(href_list["below_filter"]) if(href_list["below_filter"])
playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
var/new_filter = input(usr, "Enter a percentage from 1-100 to sort by (lesser than).", name) as null|num var/new_filter = input(usr, "Enter a percentage from 1-100 to sort by (lesser than).", name) as null|num
if(!src || !usr || !usr.canUseTopic(src, !issilicon(usr)) || stat || QDELETED(src)) if(!src || !usr || !usr.canUseTopic(src, !issilicon(usr)) || stat || QDELETED(src))
return return
log_activity("changed lesser than charge filter to \"[new_filter]\"") log_activity("changed lesser than charge filter to \"[new_filter]\"")
if(new_filter) if(new_filter)
new_filter = CLAMP(new_filter, 0, 100) new_filter = CLAMP(new_filter, 0, 100)
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
result_filters["Charge Below"] = new_filter result_filters["Charge Below"] = new_filter
if(href_list["access_filter"]) if(href_list["access_filter"])
if(isnull(result_filters["Responsive"])) if(isnull(result_filters["Responsive"]))
@@ -172,7 +172,7 @@
else else
result_filters["Responsive"] = !result_filters["Responsive"] result_filters["Responsive"] = !result_filters["Responsive"]
log_activity("sorted by all APCs") log_activity("sorted by all APCs")
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
if(href_list["check_logs"]) if(href_list["check_logs"])
checking_logs = TRUE checking_logs = TRUE
log_activity("checked logs") log_activity("checked logs")
@@ -192,7 +192,7 @@
user.visible_message("<span class='warning'>You emag [src], disabling precise logging and allowing you to clear logs.</span>") user.visible_message("<span class='warning'>You emag [src], disabling precise logging and allowing you to clear logs.</span>")
log_game("[key_name(user)] emagged [src] at [AREACOORD(src)], disabling operator tracking.") log_game("[key_name(user)] emagged [src] at [AREACOORD(src)], disabling operator tracking.")
obj_flags |= EMAGGED obj_flags |= EMAGGED
playsound(src, "sparks", 50, 1) playsound(src, "sparks", 50, TRUE)
/obj/machinery/computer/apc_control/proc/log_activity(log_text) /obj/machinery/computer/apc_control/proc/log_activity(log_text)
var/op_string = operator && !(obj_flags & EMAGGED) ? operator : "\[NULL OPERATOR\]" var/op_string = operator && !(obj_flags & EMAGGED) ? operator : "\[NULL OPERATOR\]"

View File

@@ -179,7 +179,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
blocked = TRUE blocked = TRUE
var/attackamt = rand(2,6) var/attackamt = rand(2,6)
temp = "You attack for [attackamt] damage!" temp = "You attack for [attackamt] damage!"
playsound(loc, 'sound/arcade/hit.ogg', 50, 1, extrarange = -3, falloff = 10) playsound(loc, 'sound/arcade/hit.ogg', 50, TRUE, extrarange = -3, falloff = 10)
updateUsrDialog() updateUsrDialog()
if(turtle > 0) if(turtle > 0)
turtle-- turtle--
@@ -193,7 +193,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
var/pointamt = rand(1,3) var/pointamt = rand(1,3)
var/healamt = rand(6,8) var/healamt = rand(6,8)
temp = "You use [pointamt] magic to heal for [healamt] damage!" temp = "You use [pointamt] magic to heal for [healamt] damage!"
playsound(loc, 'sound/arcade/heal.ogg', 50, 1, extrarange = -3, falloff = 10) playsound(loc, 'sound/arcade/heal.ogg', 50, TRUE, extrarange = -3, falloff = 10)
updateUsrDialog() updateUsrDialog()
turtle++ turtle++
@@ -208,7 +208,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
blocked = TRUE blocked = TRUE
var/chargeamt = rand(4,7) var/chargeamt = rand(4,7)
temp = "You regain [chargeamt] points" temp = "You regain [chargeamt] points"
playsound(loc, 'sound/arcade/mana.ogg', 50, 1, extrarange = -3, falloff = 10) playsound(loc, 'sound/arcade/mana.ogg', 50, TRUE, extrarange = -3, falloff = 10)
player_mp += chargeamt player_mp += chargeamt
if(turtle > 0) if(turtle > 0)
turtle-- turtle--
@@ -243,7 +243,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
if(!gameover) if(!gameover)
gameover = TRUE gameover = TRUE
temp = "[enemy_name] has fallen! Rejoice!" temp = "[enemy_name] has fallen! Rejoice!"
playsound(loc, 'sound/arcade/win.ogg', 50, 1, extrarange = -3, falloff = 10) playsound(loc, 'sound/arcade/win.ogg', 50, TRUE, extrarange = -3, falloff = 10)
if(obj_flags & EMAGGED) if(obj_flags & EMAGGED)
new /obj/effect/spawner/newbomb/timer/syndicate(loc) new /obj/effect/spawner/newbomb/timer/syndicate(loc)
@@ -260,13 +260,13 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
else if ((obj_flags & EMAGGED) && (turtle >= 4)) else if ((obj_flags & EMAGGED) && (turtle >= 4))
var/boomamt = rand(5,10) var/boomamt = rand(5,10)
temp = "[enemy_name] throws a bomb, exploding you for [boomamt] damage!" temp = "[enemy_name] throws a bomb, exploding you for [boomamt] damage!"
playsound(loc, 'sound/arcade/boom.ogg', 50, 1, extrarange = -3, falloff = 10) playsound(loc, 'sound/arcade/boom.ogg', 50, TRUE, extrarange = -3, falloff = 10)
player_hp -= boomamt player_hp -= boomamt
else if ((enemy_mp <= 5) && (prob(70))) else if ((enemy_mp <= 5) && (prob(70)))
var/stealamt = rand(2,3) var/stealamt = rand(2,3)
temp = "[enemy_name] steals [stealamt] of your power!" temp = "[enemy_name] steals [stealamt] of your power!"
playsound(loc, 'sound/arcade/steal.ogg', 50, 1, extrarange = -3, falloff = 10) playsound(loc, 'sound/arcade/steal.ogg', 50, TRUE, extrarange = -3, falloff = 10)
player_mp -= stealamt player_mp -= stealamt
updateUsrDialog() updateUsrDialog()
@@ -274,27 +274,27 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
gameover = TRUE gameover = TRUE
sleep(10) sleep(10)
temp = "You have been drained! GAME OVER" temp = "You have been drained! GAME OVER"
playsound(loc, 'sound/arcade/lose.ogg', 50, 1, extrarange = -3, falloff = 10) playsound(loc, 'sound/arcade/lose.ogg', 50, TRUE, extrarange = -3, falloff = 10)
if(obj_flags & EMAGGED) if(obj_flags & EMAGGED)
usr.gib() usr.gib()
SSblackbox.record_feedback("nested tally", "arcade_results", 1, list("loss", "mana", (obj_flags & EMAGGED ? "emagged":"normal"))) SSblackbox.record_feedback("nested tally", "arcade_results", 1, list("loss", "mana", (obj_flags & EMAGGED ? "emagged":"normal")))
else if ((enemy_hp <= 10) && (enemy_mp > 4)) else if ((enemy_hp <= 10) && (enemy_mp > 4))
temp = "[enemy_name] heals for 4 health!" temp = "[enemy_name] heals for 4 health!"
playsound(loc, 'sound/arcade/heal.ogg', 50, 1, extrarange = -3, falloff = 10) playsound(loc, 'sound/arcade/heal.ogg', 50, TRUE, extrarange = -3, falloff = 10)
enemy_hp += 4 enemy_hp += 4
enemy_mp -= 4 enemy_mp -= 4
else else
var/attackamt = rand(3,6) var/attackamt = rand(3,6)
temp = "[enemy_name] attacks for [attackamt] damage!" temp = "[enemy_name] attacks for [attackamt] damage!"
playsound(loc, 'sound/arcade/hit.ogg', 50, 1, extrarange = -3, falloff = 10) playsound(loc, 'sound/arcade/hit.ogg', 50, TRUE, extrarange = -3, falloff = 10)
player_hp -= attackamt player_hp -= attackamt
if ((player_mp <= 0) || (player_hp <= 0)) if ((player_mp <= 0) || (player_hp <= 0))
gameover = TRUE gameover = TRUE
temp = "You have been crushed! GAME OVER" temp = "You have been crushed! GAME OVER"
playsound(loc, 'sound/arcade/lose.ogg', 50, 1, extrarange = -3, falloff = 10) playsound(loc, 'sound/arcade/lose.ogg', 50, TRUE, extrarange = -3, falloff = 10)
if(obj_flags & EMAGGED) if(obj_flags & EMAGGED)
usr.gib() usr.gib()
SSblackbox.record_feedback("nested tally", "arcade_results", 1, list("loss", "hp", (obj_flags & EMAGGED ? "emagged":"normal"))) SSblackbox.record_feedback("nested tally", "arcade_results", 1, list("loss", "hp", (obj_flags & EMAGGED ? "emagged":"normal")))
@@ -527,7 +527,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
else else
to_chat(usr, "<span class='userdanger'>Something strikes you from behind! It hurts like hell and feel like a blunt weapon, but nothing is there...</span>") to_chat(usr, "<span class='userdanger'>Something strikes you from behind! It hurts like hell and feel like a blunt weapon, but nothing is there...</span>")
M.take_bodypart_damage(30) M.take_bodypart_damage(30)
playsound(loc, 'sound/weapons/genhit2.ogg', 100, 1) playsound(loc, 'sound/weapons/genhit2.ogg', 100, TRUE)
if(ORION_TRAIL_ILLNESS) if(ORION_TRAIL_ILLNESS)
var/severity = rand(1,3) //pray to RNGesus. PRAY, PIGS var/severity = rand(1,3) //pray to RNGesus. PRAY, PIGS
if(severity == 1) if(severity == 1)
@@ -545,12 +545,12 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
M.Paralyze(60) M.Paralyze(60)
say("A sudden gust of powerful wind slams [M] into the floor!") say("A sudden gust of powerful wind slams [M] into the floor!")
M.take_bodypart_damage(25) M.take_bodypart_damage(25)
playsound(loc, 'sound/weapons/genhit.ogg', 100, 1) playsound(loc, 'sound/weapons/genhit.ogg', 100, TRUE)
else else
to_chat(M, "<span class='userdanger'>A violent gale blows past you, and you barely manage to stay standing!</span>") to_chat(M, "<span class='userdanger'>A violent gale blows past you, and you barely manage to stay standing!</span>")
if(ORION_TRAIL_COLLISION) //by far the most damaging event if(ORION_TRAIL_COLLISION) //by far the most damaging event
if(prob(90)) if(prob(90))
playsound(loc, 'sound/effects/bang.ogg', 100, 1) playsound(loc, 'sound/effects/bang.ogg', 100, TRUE)
var/turf/open/floor/F var/turf/open/floor/F
for(F in orange(1, src)) for(F in orange(1, src))
F.ScrapeAway() F.ScrapeAway()
@@ -558,15 +558,15 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
if(hull) if(hull)
sleep(10) sleep(10)
say("A new floor suddenly appears around [src]. What the hell?") say("A new floor suddenly appears around [src]. What the hell?")
playsound(loc, 'sound/weapons/genhit.ogg', 100, 1) playsound(loc, 'sound/weapons/genhit.ogg', 100, TRUE)
var/turf/open/space/T var/turf/open/space/T
for(T in orange(1, src)) for(T in orange(1, src))
T.PlaceOnTop(/turf/open/floor/plating) T.PlaceOnTop(/turf/open/floor/plating)
else else
say("Something slams into the floor around [src] - luckily, it didn't get through!") say("Something slams into the floor around [src] - luckily, it didn't get through!")
playsound(loc, 'sound/effects/bang.ogg', 50, 1) playsound(loc, 'sound/effects/bang.ogg', 50, TRUE)
if(ORION_TRAIL_MALFUNCTION) if(ORION_TRAIL_MALFUNCTION)
playsound(loc, 'sound/effects/empulse.ogg', 50, 1) playsound(loc, 'sound/effects/empulse.ogg', 50, TRUE)
visible_message("<span class='danger'>[src] malfunctions, randomizing in-game stats!</span>") visible_message("<span class='danger'>[src] malfunctions, randomizing in-game stats!</span>")
var/oldfood = food var/oldfood = food
var/oldfuel = fuel var/oldfuel = fuel
@@ -580,7 +580,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
audible_message("<span class='danger'>[src] lets out a somehow ominous chime.</span>") audible_message("<span class='danger'>[src] lets out a somehow ominous chime.</span>")
food = oldfood food = oldfood
fuel = oldfuel fuel = oldfuel
playsound(loc, 'sound/machines/chime.ogg', 50, 1) playsound(loc, 'sound/machines/chime.ogg', 50, TRUE)
else if(href_list["newgame"]) //Reset everything else if(href_list["newgame"]) //Reset everything
if(gameStatus == ORION_STATUS_START) if(gameStatus == ORION_STATUS_START)
@@ -632,7 +632,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
event = ORION_TRAIL_BLACKHOLE event = ORION_TRAIL_BLACKHOLE
event() event()
if(obj_flags & EMAGGED) if(obj_flags & EMAGGED)
playsound(loc, 'sound/effects/supermatter.ogg', 100, 1) playsound(loc, 'sound/effects/supermatter.ogg', 100, TRUE)
say("A miniature black hole suddenly appears in front of [src], devouring [usr] alive!") say("A miniature black hole suddenly appears in front of [src], devouring [usr] alive!")
if(isliving(usr)) if(isliving(usr))
var/mob/living/L = usr var/mob/living/L = usr
@@ -654,7 +654,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
else if(href_list["killcrew"]) //shoot a crewmember else if(href_list["killcrew"]) //shoot a crewmember
if(gameStatus == ORION_STATUS_NORMAL || event == ORION_TRAIL_LING) if(gameStatus == ORION_STATUS_NORMAL || event == ORION_TRAIL_LING)
var/sheriff = remove_crewmember() //I shot the sheriff var/sheriff = remove_crewmember() //I shot the sheriff
playsound(loc,'sound/weapons/gunshot.ogg', 100, 1) playsound(loc,'sound/weapons/gunshot.ogg', 100, TRUE)
if(settlers.len == 0 || alive == 0) if(settlers.len == 0 || alive == 0)
say("The last crewmember [sheriff], shot themselves, GAME OVER!") say("The last crewmember [sheriff], shot themselves, GAME OVER!")
@@ -1102,14 +1102,14 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
to_chat(user, "<span class='warning'>You flip the switch on the underside of [src].</span>") to_chat(user, "<span class='warning'>You flip the switch on the underside of [src].</span>")
active = 1 active = 1
visible_message("<span class='notice'>[src] softly beeps and whirs to life!</span>") visible_message("<span class='notice'>[src] softly beeps and whirs to life!</span>")
playsound(loc, 'sound/machines/defib_SaftyOn.ogg', 25, 1) playsound(loc, 'sound/machines/defib_SaftyOn.ogg', 25, TRUE)
say("This is ship ID #[rand(1,1000)] to Orion Port Authority. We're coming in for landing, over.") say("This is ship ID #[rand(1,1000)] to Orion Port Authority. We're coming in for landing, over.")
sleep(20) sleep(20)
visible_message("<span class='warning'>[src] begins to vibrate...</span>") visible_message("<span class='warning'>[src] begins to vibrate...</span>")
say("Uh, Port? Having some issues with our reactor, could you check it out? Over.") say("Uh, Port? Having some issues with our reactor, could you check it out? Over.")
sleep(30) sleep(30)
say("Oh, God! Code Eight! CODE EIGHT! IT'S GONNA BL-") say("Oh, God! Code Eight! CODE EIGHT! IT'S GONNA BL-")
playsound(loc, 'sound/machines/buzz-sigh.ogg', 25, 1) playsound(loc, 'sound/machines/buzz-sigh.ogg', 25, TRUE)
sleep(3.6) sleep(3.6)
visible_message("<span class='userdanger'>[src] explodes!</span>") visible_message("<span class='userdanger'>[src] explodes!</span>")
explosion(loc, 2,4,8, flame_range = 16) explosion(loc, 2,4,8, flame_range = 16)
@@ -1132,14 +1132,14 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
to_chat(c_user, "<span class='warning'>You move your hand towards the machine, and begin to hesitate as a bloodied guillotine emerges from inside of it...</span>") to_chat(c_user, "<span class='warning'>You move your hand towards the machine, and begin to hesitate as a bloodied guillotine emerges from inside of it...</span>")
if(do_after(c_user, 50, target = src)) if(do_after(c_user, 50, target = src))
to_chat(c_user, "<span class='userdanger'>The guillotine drops on your arm, and the machine sucks it in!</span>") to_chat(c_user, "<span class='userdanger'>The guillotine drops on your arm, and the machine sucks it in!</span>")
playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1) playsound(loc, 'sound/weapons/slice.ogg', 25, TRUE, -1)
var/which_hand = BODY_ZONE_L_ARM var/which_hand = BODY_ZONE_L_ARM
if(!(c_user.active_hand_index % 2)) if(!(c_user.active_hand_index % 2))
which_hand = BODY_ZONE_R_ARM which_hand = BODY_ZONE_R_ARM
var/obj/item/bodypart/chopchop = c_user.get_bodypart(which_hand) var/obj/item/bodypart/chopchop = c_user.get_bodypart(which_hand)
chopchop.dismember() chopchop.dismember()
qdel(chopchop) qdel(chopchop)
playsound(loc, 'sound/arcade/win.ogg', 50, 1, extrarange = -3, falloff = 10) playsound(loc, 'sound/arcade/win.ogg', 50, TRUE, extrarange = -3, falloff = 10)
for(var/i=1; i<=rand(3,5); i++) for(var/i=1; i<=rand(3,5); i++)
prizevend(user) prizevend(user)
else else

View File

@@ -36,7 +36,7 @@
if(istype(P, /obj/item/circuitboard/computer) && !circuit) if(istype(P, /obj/item/circuitboard/computer) && !circuit)
if(!user.transferItemToLoc(P, src)) if(!user.transferItemToLoc(P, src))
return return
playsound(src, 'sound/items/deconstruct.ogg', 50, 1) playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE)
to_chat(user, "<span class='notice'>You place [P] inside the frame.</span>") to_chat(user, "<span class='notice'>You place [P] inside the frame.</span>")
icon_state = "1" icon_state = "1"
circuit = P circuit = P
@@ -92,7 +92,7 @@
if(istype(P, /obj/item/stack/sheet/glass)) if(istype(P, /obj/item/stack/sheet/glass))
if(!P.tool_start_check(user, amount=2)) if(!P.tool_start_check(user, amount=2))
return return
playsound(src, 'sound/items/deconstruct.ogg', 50, 1) playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE)
to_chat(user, "<span class='notice'>You start to put in the glass panel...</span>") to_chat(user, "<span class='notice'>You start to put in the glass panel...</span>")
if(P.use_tool(src, user, 20, amount=2)) if(P.use_tool(src, user, 20, amount=2))
if(state != 3) if(state != 3)

View File

@@ -81,7 +81,7 @@
if(!(user in watchers)) if(!(user in watchers))
user.unset_machine() // no usable camera on the network, we disconnect the user from the computer. user.unset_machine() // no usable camera on the network, we disconnect the user from the computer.
return return
playsound(src, 'sound/machines/terminal_prompt.ogg', 25, 0) playsound(src, 'sound/machines/terminal_prompt.ogg', 25, FALSE)
use_camera_console(user) use_camera_console(user)
/obj/machinery/computer/security/proc/use_camera_console(mob/user) /obj/machinery/computer/security/proc/use_camera_console(mob/user)
@@ -91,14 +91,14 @@
return return
if(!t) if(!t)
user.unset_machine() user.unset_machine()
playsound(src, 'sound/machines/terminal_off.ogg', 25, 0) playsound(src, 'sound/machines/terminal_off.ogg', 25, FALSE)
return return
var/obj/machinery/camera/C = camera_list[t] var/obj/machinery/camera/C = camera_list[t]
if(t == "Cancel") if(t == "Cancel")
user.unset_machine() user.unset_machine()
playsound(src, 'sound/machines/terminal_off.ogg', 25, 0) playsound(src, 'sound/machines/terminal_off.ogg', 25, FALSE)
return return
if(C) if(C)
var/camera_fail = 0 var/camera_fail = 0
@@ -115,7 +115,7 @@
user.unset_machine() user.unset_machine()
return 0 return 0
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 25, 0) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 25, FALSE)
if(isAI(user)) if(isAI(user))
var/mob/living/silicon/ai/A = user var/mob/living/silicon/ai/A = user
A.eyeobj.setLoc(get_turf(C)) A.eyeobj.setLoc(get_turf(C))

View File

@@ -78,7 +78,7 @@
current_user = null current_user = null
user.unset_machine() user.unset_machine()
playsound(src, 'sound/machines/terminal_off.ogg', 25, 0) playsound(src, 'sound/machines/terminal_off.ogg', 25, FALSE)
/obj/machinery/computer/camera_advanced/check_eye(mob/user) /obj/machinery/computer/camera_advanced/check_eye(mob/user)
if( (stat & (NOPOWER|BROKEN)) || (!Adjacent(user) && !user.has_unlimited_silicon_privilege) || user.eye_blind || user.incapacitated() ) if( (stat & (NOPOWER|BROKEN)) || (!Adjacent(user) && !user.has_unlimited_silicon_privilege) || user.eye_blind || user.incapacitated() )
@@ -269,17 +269,17 @@
if (tempnetwork.len) if (tempnetwork.len)
T["[netcam.c_tag][netcam.can_use() ? null : " (Deactivated)"]"] = netcam T["[netcam.c_tag][netcam.can_use() ? null : " (Deactivated)"]"] = netcam
playsound(origin, 'sound/machines/terminal_prompt.ogg', 25, 0) playsound(origin, 'sound/machines/terminal_prompt.ogg', 25, FALSE)
var/camera = input("Choose which camera you want to view", "Cameras") as null|anything in T var/camera = input("Choose which camera you want to view", "Cameras") as null|anything in T
var/obj/machinery/camera/final = T[camera] var/obj/machinery/camera/final = T[camera]
playsound(src, "terminal_type", 25, 0) playsound(src, "terminal_type", 25, FALSE)
if(final) if(final)
playsound(origin, 'sound/machines/terminal_prompt_confirm.ogg', 25, 0) playsound(origin, 'sound/machines/terminal_prompt_confirm.ogg', 25, FALSE)
remote_eye.setLoc(get_turf(final)) remote_eye.setLoc(get_turf(final))
C.overlay_fullscreen("flash", /obj/screen/fullscreen/flash/static) C.overlay_fullscreen("flash", /obj/screen/fullscreen/flash/static)
C.clear_fullscreen("flash", 3) //Shorter flash than normal since it's an ~~advanced~~ console! C.clear_fullscreen("flash", 3) //Shorter flash than normal since it's an ~~advanced~~ console!
else else
playsound(origin, 'sound/machines/terminal_prompt_deny.ogg', 25, 0) playsound(origin, 'sound/machines/terminal_prompt_deny.ogg', 25, FALSE)
//Used by servants of Ratvar! They let you beam to the station. //Used by servants of Ratvar! They let you beam to the station.

View File

@@ -482,7 +482,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
if("return") if("return")
//DISPLAY MAIN MENU //DISPLAY MAIN MENU
mode = 3; mode = 3;
playsound(src, "terminal_type", 25, 0) playsound(src, "terminal_type", 25, FALSE)
if("make_job_available") if("make_job_available")
// MAKE ANOTHER JOB POSITION AVAILABLE FOR LATE JOINERS // MAKE ANOTHER JOB POSITION AVAILABLE FOR LATE JOINERS

View File

@@ -139,7 +139,7 @@
return return
diskette = W diskette = W
to_chat(user, "<span class='notice'>You insert [W].</span>") to_chat(user, "<span class='notice'>You insert [W].</span>")
playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE)
updateUsrDialog() updateUsrDialog()
else if(W.tool_behaviour == TOOL_MULTITOOL) else if(W.tool_behaviour == TOOL_MULTITOOL)
if(!multitool_check_buffer(user, W)) if(!multitool_check_buffer(user, W))
@@ -331,11 +331,11 @@
if(scanner && HasEfficientPod() && scanner.scan_level >= AUTOCLONING_MINIMAL_LEVEL) if(scanner && HasEfficientPod() && scanner.scan_level >= AUTOCLONING_MINIMAL_LEVEL)
autoprocess = TRUE autoprocess = TRUE
START_PROCESSING(SSmachines, src) START_PROCESSING(SSmachines, src)
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
if("stopautoprocess") if("stopautoprocess")
autoprocess = FALSE autoprocess = FALSE
STOP_PROCESSING(SSmachines, src) STOP_PROCESSING(SSmachines, src)
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
if("include_se") if("include_se")
include_se = TRUE include_se = TRUE
if("exclude_se") if("exclude_se")
@@ -354,7 +354,7 @@
var/body_only = href_list["body_only"] var/body_only = href_list["body_only"]
loading = TRUE loading = TRUE
updateUsrDialog() updateUsrDialog()
playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
say("Initiating scan...") say("Initiating scan...")
spawn(20) spawn(20)
@@ -362,20 +362,20 @@
loading = FALSE loading = FALSE
updateUsrDialog() updateUsrDialog()
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
//No locking an open scanner. //No locking an open scanner.
else if ((href_list["lock"]) && !isnull(scanner) && scanner.is_operational()) else if ((href_list["lock"]) && !isnull(scanner) && scanner.is_operational())
if ((!scanner.locked) && (scanner.occupant)) if ((!scanner.locked) && (scanner.occupant))
scanner.locked = TRUE scanner.locked = TRUE
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
else else
scanner.locked = FALSE scanner.locked = FALSE
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
else if(href_list["view_rec"]) else if(href_list["view_rec"])
playsound(src, "terminal_type", 25, 0) playsound(src, "terminal_type", 25, FALSE)
active_record = find_record("id", href_list["view_rec"], records) active_record = find_record("id", href_list["view_rec"], records)
if(active_record) if(active_record)
menu = 3 menu = 3
@@ -398,11 +398,11 @@
if(has_access) if(has_access)
temp = "Delete record?" temp = "Delete record?"
menu = 4 menu = 4
playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
else else
temp = "Access Denied" temp = "Access Denied"
menu = 2 menu = 2
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
else if (menu == 4) else if (menu == 4)
@@ -410,7 +410,7 @@
temp = "[active_record.fields["name"]] => Record deleted." temp = "[active_record.fields["name"]] => Record deleted."
records.Remove(active_record) records.Remove(active_record)
active_record = null active_record = null
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
menu = 2 menu = 2
else if (href_list["disk"]) //Load or eject. else if (href_list["disk"]) //Load or eject.
@@ -421,13 +421,13 @@
if (!diskette || !istype(diskette.fields)) if (!diskette || !istype(diskette.fields))
temp = "<font class='bad'>Load error.</font>" temp = "<font class='bad'>Load error.</font>"
updateUsrDialog() updateUsrDialog()
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
return return
if (!active_record) if (!active_record)
temp = "<font class='bad'>Record error.</font>" temp = "<font class='bad'>Record error.</font>"
menu = 1 menu = 1
updateUsrDialog() updateUsrDialog()
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
return return
if(include_ue) if(include_ue)
@@ -441,29 +441,29 @@
log_cloning("[key_name(usr)] uploaded [key_name(active_record.fields["mindref"])]'s cloning records to [src] at [AREACOORD(src)] via [diskette].") log_cloning("[key_name(usr)] uploaded [key_name(active_record.fields["mindref"])]'s cloning records to [src] at [AREACOORD(src)] via [diskette].")
temp = "Load successful." temp = "Load successful."
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
if("eject") if("eject")
if(diskette) if(diskette)
diskette.forceMove(drop_location()) diskette.forceMove(drop_location())
diskette = null diskette = null
playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE)
if("save") if("save")
if(!diskette || diskette.read_only || !active_record || !active_record.fields) if(!diskette || diskette.read_only || !active_record || !active_record.fields)
temp = "<font class='bad'>Save error.</font>" temp = "<font class='bad'>Save error.</font>"
updateUsrDialog() updateUsrDialog()
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
return return
log_cloning("[key_name(usr)] added [key_name(active_record.fields["mindref"])]'s cloning records to [diskette] via [src] at [AREACOORD(src)].") log_cloning("[key_name(usr)] added [key_name(active_record.fields["mindref"])]'s cloning records to [diskette] via [src] at [AREACOORD(src)].")
diskette.fields = active_record.fields.Copy() diskette.fields = active_record.fields.Copy()
diskette.name = "data disk - '[diskette.fields["name"]]'" diskette.name = "data disk - '[diskette.fields["name"]]'"
temp = "Save successful." temp = "Save successful."
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
else if (href_list["refresh"]) else if (href_list["refresh"])
updateUsrDialog() updateUsrDialog()
playsound(src, "terminal_type", 25, 0) playsound(src, "terminal_type", 25, FALSE)
else if (href_list["clone"]) else if (href_list["clone"])
var/datum/data/record/C = find_record("id", href_list["clone"], records) var/datum/data/record/C = find_record("id", href_list["clone"], records)
@@ -472,27 +472,27 @@
if(C) if(C)
if(C.fields["body_only"] && !empty) if(C.fields["body_only"] && !empty)
temp = "<font class='bad'>Cannot initiate regular cloning with body-only scans.</font>" temp = "<font class='bad'>Cannot initiate regular cloning with body-only scans.</font>"
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
var/obj/machinery/clonepod/pod = GetAvailablePod() var/obj/machinery/clonepod/pod = GetAvailablePod()
var/success = FALSE var/success = FALSE
//Can't clone without someone to clone. Or a pod. Or if the pod is busy. Or full of gibs. //Can't clone without someone to clone. Or a pod. Or if the pod is busy. Or full of gibs.
if(!LAZYLEN(pods)) if(!LAZYLEN(pods))
temp = "<font class='bad'>No Clonepods detected.</font>" temp = "<font class='bad'>No Clonepods detected.</font>"
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
else if(!pod) else if(!pod)
temp = "<font class='bad'>No Clonepods available.</font>" temp = "<font class='bad'>No Clonepods available.</font>"
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
else if(!CONFIG_GET(flag/revival_cloning) && !empty) else if(!CONFIG_GET(flag/revival_cloning) && !empty)
temp = "<font class='bad'>Unable to initiate cloning cycle.</font>" temp = "<font class='bad'>Unable to initiate cloning cycle.</font>"
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
else if(pod.occupant) else if(pod.occupant)
temp = "<font class='bad'>Cloning cycle already in progress.</font>" temp = "<font class='bad'>Cloning cycle already in progress.</font>"
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
else else
var/result = grow_clone_from_record(pod, C, empty) var/result = grow_clone_from_record(pod, C, empty)
if(result & CLONING_SUCCESS) if(result & CLONING_SUCCESS)
temp = "[C.fields["name"]] => <font class='good'>Cloning cycle in progress...</font>" temp = "[C.fields["name"]] => <font class='good'>Cloning cycle in progress...</font>"
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
if(active_record == C) if(active_record == C)
active_record = null active_record = null
menu = 1 menu = 1
@@ -509,15 +509,15 @@
if(!success) if(!success)
temp = "[C.fields["name"]] => <font class='bad'>Initialisation failure.</font>" temp = "[C.fields["name"]] => <font class='bad'>Initialisation failure.</font>"
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
else else
temp = "<font class='bad'>Data corruption.</font>" temp = "<font class='bad'>Data corruption.</font>"
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
else if (href_list["menu"]) else if (href_list["menu"])
menu = text2num(href_list["menu"]) menu = text2num(href_list["menu"])
playsound(src, "terminal_type", 25, 0) playsound(src, "terminal_type", 25, FALSE)
add_fingerprint(usr) add_fingerprint(usr)
updateUsrDialog() updateUsrDialog()
@@ -542,28 +542,28 @@
if(!istype(dna)) if(!istype(dna))
scantemp = "<font class='bad'>Unable to locate valid genetic data.</font>" scantemp = "<font class='bad'>Unable to locate valid genetic data.</font>"
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
return return
if(!body_only && (mob_occupant.suiciding || mob_occupant.hellbound)) if(!body_only && (mob_occupant.suiciding || mob_occupant.hellbound))
scantemp = "<font class='bad'>Subject's brain is not responding to scanning stimuli.</font>" scantemp = "<font class='bad'>Subject's brain is not responding to scanning stimuli.</font>"
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
return return
if((HAS_TRAIT(mob_occupant, TRAIT_HUSK)) && (src.scanner.scan_level < 2)) if((HAS_TRAIT(mob_occupant, TRAIT_HUSK)) && (src.scanner.scan_level < 2))
scantemp = "<font class='bad'>Subject's body is too damaged to scan properly.</font>" scantemp = "<font class='bad'>Subject's body is too damaged to scan properly.</font>"
playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0) playsound(src, 'sound/machines/terminal_alert.ogg', 50, FALSE)
return return
if(HAS_TRAIT(mob_occupant, TRAIT_BADDNA)) if(HAS_TRAIT(mob_occupant, TRAIT_BADDNA))
scantemp = "<font class='bad'>Subject's DNA is damaged beyond any hope of recovery.</font>" scantemp = "<font class='bad'>Subject's DNA is damaged beyond any hope of recovery.</font>"
playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0) playsound(src, 'sound/machines/terminal_alert.ogg', 50, FALSE)
return return
if (!body_only && isnull(mob_occupant.mind)) if (!body_only && isnull(mob_occupant.mind))
scantemp = "<font class='bad'>Mental interface failure.</font>" scantemp = "<font class='bad'>Mental interface failure.</font>"
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
return return
if(!body_only && SSeconomy.full_ancap) if(!body_only && SSeconomy.full_ancap)
if(!has_bank_account) if(!has_bank_account)
scantemp = "<font class='average'>Subject is either missing an ID card with a bank account on it, or does not have an account to begin with. Please ensure the ID card is on the body before attempting to scan.</font>" scantemp = "<font class='average'>Subject is either missing an ID card with a bank account on it, or does not have an account to begin with. Please ensure the ID card is on the body before attempting to scan.</font>"
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
return return
var/datum/data/record/R = new() var/datum/data/record/R = new()
if(dna.species) if(dna.species)

View File

@@ -60,7 +60,7 @@
// main interface // main interface
if("main") if("main")
state = STATE_DEFAULT state = STATE_DEFAULT
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
if("login") if("login")
var/mob/M = usr var/mob/M = usr
@@ -72,19 +72,19 @@
auth_id = "[I.registered_name] ([I.assignment])" auth_id = "[I.registered_name] ([I.assignment])"
if((20 in I.access)) if((20 in I.access))
authenticated = 2 authenticated = 2
playsound(src, 'sound/machines/terminal_on.ogg', 50, 0) playsound(src, 'sound/machines/terminal_on.ogg', 50, FALSE)
if(obj_flags & EMAGGED) if(obj_flags & EMAGGED)
authenticated = 2 authenticated = 2
auth_id = "Unknown" auth_id = "Unknown"
to_chat(M, "<span class='warning'>[src] lets out a quiet alarm as its login is overridden.</span>") to_chat(M, "<span class='warning'>[src] lets out a quiet alarm as its login is overridden.</span>")
playsound(src, 'sound/machines/terminal_on.ogg', 50, 0) playsound(src, 'sound/machines/terminal_on.ogg', 50, FALSE)
playsound(src, 'sound/machines/terminal_alert.ogg', 25, 0) playsound(src, 'sound/machines/terminal_alert.ogg', 25, FALSE)
if(prob(25)) if(prob(25))
for(var/mob/living/silicon/ai/AI in active_ais()) for(var/mob/living/silicon/ai/AI in active_ais())
SEND_SOUND(AI, sound('sound/machines/terminal_alert.ogg', volume = 10)) //Very quiet for balance reasons SEND_SOUND(AI, sound('sound/machines/terminal_alert.ogg', volume = 10)) //Very quiet for balance reasons
if("logout") if("logout")
authenticated = 0 authenticated = 0
playsound(src, 'sound/machines/terminal_off.ogg', 50, 0) playsound(src, 'sound/machines/terminal_off.ogg', 50, FALSE)
if("swipeidseclevel") if("swipeidseclevel")
var/mob/M = usr var/mob/M = usr
@@ -104,7 +104,7 @@
set_security_level(tmp_alertlevel) set_security_level(tmp_alertlevel)
if(GLOB.security_level != old_level) if(GLOB.security_level != old_level)
to_chat(usr, "<span class='notice'>Authorization confirmed. Modifying security level.</span>") to_chat(usr, "<span class='notice'>Authorization confirmed. Modifying security level.</span>")
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
//Only notify people if an actual change happened //Only notify people if an actual change happened
var/security_level = get_security_level() var/security_level = get_security_level()
log_game("[key_name(usr)] has changed the security level to [security_level] with [src] at [AREACOORD(usr)].") log_game("[key_name(usr)] has changed the security level to [security_level] with [src] at [AREACOORD(usr)].")
@@ -113,28 +113,28 @@
tmp_alertlevel = 0 tmp_alertlevel = 0
else else
to_chat(usr, "<span class='warning'>You are not authorized to do this!</span>") to_chat(usr, "<span class='warning'>You are not authorized to do this!</span>")
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
tmp_alertlevel = 0 tmp_alertlevel = 0
state = STATE_DEFAULT state = STATE_DEFAULT
else else
to_chat(usr, "<span class='warning'>You need to swipe your ID!</span>") to_chat(usr, "<span class='warning'>You need to swipe your ID!</span>")
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
if("announce") if("announce")
if(authenticated==2) if(authenticated==2)
playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
make_announcement(usr) make_announcement(usr)
if("crossserver") if("crossserver")
if(authenticated==2) if(authenticated==2)
if(!checkCCcooldown()) if(!checkCCcooldown())
to_chat(usr, "<span class='warning'>Arrays recycling. Please stand by.</span>") to_chat(usr, "<span class='warning'>Arrays recycling. Please stand by.</span>")
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
return return
var/input = stripped_multiline_input(usr, "Please choose a message to transmit to allied stations. Please be aware that this process is very expensive, and abuse will lead to... termination.", "Send a message to an allied station.", "") var/input = stripped_multiline_input(usr, "Please choose a message to transmit to allied stations. Please be aware that this process is very expensive, and abuse will lead to... termination.", "Send a message to an allied station.", "")
if(!input || !(usr in view(1,src)) || !checkCCcooldown()) if(!input || !(usr in view(1,src)) || !checkCCcooldown())
return return
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
send2otherserver("[station_name()]", input,"Comms_Console") send2otherserver("[station_name()]", input,"Comms_Console")
minor_announce(input, title = "Outgoing message to allied station") minor_announce(input, title = "Outgoing message to allied station")
usr.log_talk(input, LOG_SAY, tag="message to the other server") usr.log_talk(input, LOG_SAY, tag="message to the other server")
@@ -255,7 +255,7 @@
// Status display stuff // Status display stuff
if("setstat") if("setstat")
playsound(src, "terminal_type", 50, 0) playsound(src, "terminal_type", 50, FALSE)
switch(href_list["statdisp"]) switch(href_list["statdisp"])
if("message") if("message")
post_status("message", stat_msg1, stat_msg2) post_status("message", stat_msg1, stat_msg2)
@@ -280,7 +280,7 @@
var/input = stripped_input(usr, "Please choose a message to transmit to CentCom via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "Send a message to CentCom.", "") var/input = stripped_input(usr, "Please choose a message to transmit to CentCom via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "Send a message to CentCom.", "")
if(!input || !(usr in view(1,src)) || !checkCCcooldown()) if(!input || !(usr in view(1,src)) || !checkCCcooldown())
return return
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
CentCom_announce(input, usr) CentCom_announce(input, usr)
to_chat(usr, "<span class='notice'>Message transmitted to Central Command.</span>") to_chat(usr, "<span class='notice'>Message transmitted to Central Command.</span>")
usr.log_talk(input, LOG_SAY, tag="CentCom announcement") usr.log_talk(input, LOG_SAY, tag="CentCom announcement")
@@ -292,12 +292,12 @@
if((authenticated) && (obj_flags & EMAGGED)) if((authenticated) && (obj_flags & EMAGGED))
if(!checkCCcooldown()) if(!checkCCcooldown())
to_chat(usr, "<span class='warning'>Arrays recycling. Please stand by.</span>") to_chat(usr, "<span class='warning'>Arrays recycling. Please stand by.</span>")
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
return return
var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING COORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "Send a message to /??????/.", "") var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING COORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "Send a message to /??????/.", "")
if(!input || !(usr in view(1,src)) || !checkCCcooldown()) if(!input || !(usr in view(1,src)) || !checkCCcooldown())
return return
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
Syndicate_announce(input, usr) Syndicate_announce(input, usr)
to_chat(usr, "<span class='danger'>SYSERR @l(19833)of(transmit.dm): !@$ MESSAGE TRANSMITTED TO SYNDICATE COMMAND.</span>") to_chat(usr, "<span class='danger'>SYSERR @l(19833)of(transmit.dm): !@$ MESSAGE TRANSMITTED TO SYNDICATE COMMAND.</span>")
usr.log_talk(input, LOG_SAY, tag="Syndicate announcement") usr.log_talk(input, LOG_SAY, tag="Syndicate announcement")
@@ -306,7 +306,7 @@
if("RestoreBackup") if("RestoreBackup")
to_chat(usr, "<span class='notice'>Backup routing data restored!</span>") to_chat(usr, "<span class='notice'>Backup routing data restored!</span>")
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
obj_flags &= ~EMAGGED obj_flags &= ~EMAGGED
updateDialog() updateDialog()
@@ -421,7 +421,7 @@
if(authenticated == 1) if(authenticated == 1)
authenticated = 2 authenticated = 2
to_chat(user, "<span class='danger'>You scramble the communication routing circuits!</span>") to_chat(user, "<span class='danger'>You scramble the communication routing circuits!</span>")
playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0) playsound(src, 'sound/machines/terminal_alert.ogg', 50, FALSE)
/obj/machinery/computer/communications/ui_interact(mob/user) /obj/machinery/computer/communications/ui_interact(mob/user)
. = ..() . = ..()
@@ -486,16 +486,16 @@
dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=login'>Log In</A> \]" dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=login'>Log In</A> \]"
if(STATE_CALLSHUTTLE) if(STATE_CALLSHUTTLE)
dat += get_call_shuttle_form() dat += get_call_shuttle_form()
playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
if(STATE_CANCELSHUTTLE) if(STATE_CANCELSHUTTLE)
dat += get_cancel_shuttle_form() dat += get_cancel_shuttle_form()
playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
if(STATE_MESSAGELIST) if(STATE_MESSAGELIST)
dat += "Messages:" dat += "Messages:"
for(var/i in 1 to messages.len) for(var/i in 1 to messages.len)
var/datum/comm_message/M = messages[i] var/datum/comm_message/M = messages[i]
dat += "<BR><A HREF='?src=[REF(src)];operation=viewmessage;message-num=[i]'>[M.title]</A>" dat += "<BR><A HREF='?src=[REF(src)];operation=viewmessage;message-num=[i]'>[M.title]</A>"
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
if(STATE_VIEWMESSAGE) if(STATE_VIEWMESSAGE)
if (currmsg) if (currmsg)
dat += "<B>[currmsg.title]</B><BR><BR>[currmsg.content]" dat += "<B>[currmsg.title]</B><BR><BR>[currmsg.content]"
@@ -529,7 +529,7 @@
dat += " <A HREF='?src=[REF(src)];operation=setstat;statdisp=alert;alert=redalert'>Red Alert</A> |" dat += " <A HREF='?src=[REF(src)];operation=setstat;statdisp=alert;alert=redalert'>Red Alert</A> |"
dat += " <A HREF='?src=[REF(src)];operation=setstat;statdisp=alert;alert=lockdown'>Lockdown</A> |" dat += " <A HREF='?src=[REF(src)];operation=setstat;statdisp=alert;alert=lockdown'>Lockdown</A> |"
dat += " <A HREF='?src=[REF(src)];operation=setstat;statdisp=alert;alert=biohazard'>Biohazard</A> \]<BR><HR>" dat += " <A HREF='?src=[REF(src)];operation=setstat;statdisp=alert;alert=biohazard'>Biohazard</A> \]<BR><HR>"
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
if(STATE_ALERT_LEVEL) if(STATE_ALERT_LEVEL)
dat += "Current alert level: [get_security_level()]<BR>" dat += "Current alert level: [get_security_level()]<BR>"
if(GLOB.security_level == SEC_LEVEL_DELTA) if(GLOB.security_level == SEC_LEVEL_DELTA)
@@ -542,7 +542,7 @@
dat += "Confirm the change to: [num2seclevel(tmp_alertlevel)]<BR>" dat += "Confirm the change to: [num2seclevel(tmp_alertlevel)]<BR>"
dat += "<A HREF='?src=[REF(src)];operation=swipeidseclevel'>Swipe ID</A> to confirm change.<BR>" dat += "<A HREF='?src=[REF(src)];operation=swipeidseclevel'>Swipe ID</A> to confirm change.<BR>"
if(STATE_TOGGLE_EMERGENCY) if(STATE_TOGGLE_EMERGENCY)
playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
if(GLOB.emergency_access == 1) if(GLOB.emergency_access == 1)
dat += "<b>Emergency Maintenance Access is currently <font color='red'>ENABLED</font></b>" dat += "<b>Emergency Maintenance Access is currently <font color='red'>ENABLED</font></b>"
dat += "<BR>Restore maintenance access restrictions? <BR>\[ <A HREF='?src=[REF(src)];operation=disableemergency'>OK</A> | <A HREF='?src=[REF(src)];operation=viewmessage'>Cancel</A> \]" dat += "<BR>Restore maintenance access restrictions? <BR>\[ <A HREF='?src=[REF(src)];operation=disableemergency'>OK</A> | <A HREF='?src=[REF(src)];operation=viewmessage'>Cancel</A> \]"

View File

@@ -505,7 +505,7 @@
if(!( printing )) if(!( printing ))
printing = 1 printing = 1
GLOB.data_core.medicalPrintCount++ GLOB.data_core.medicalPrintCount++
playsound(loc, 'sound/items/poster_being_created.ogg', 100, 1) playsound(loc, 'sound/items/poster_being_created.ogg', 100, TRUE)
sleep(30) sleep(30)
var/obj/item/paper/P = new /obj/item/paper( loc ) var/obj/item/paper/P = new /obj/item/paper( loc )
P.info = "<CENTER><B>Medical Record - (MR-[GLOB.data_core.medicalPrintCount])</B></CENTER><BR>" P.info = "<CENTER><B>Medical Record - (MR-[GLOB.data_core.medicalPrintCount])</B></CENTER><BR>"

View File

@@ -132,12 +132,12 @@
say("[contained_id]'s ID card goal defaulting to [contained_id.goal] points.") say("[contained_id]'s ID card goal defaulting to [contained_id.goal] points.")
log_game("[key_name(user)] teleported [key_name(prisoner)] to the Labor Camp [COORD(beacon)] for [id_goal_not_set ? "default goal of ":""][contained_id.goal] points.") log_game("[key_name(user)] teleported [key_name(prisoner)] to the Labor Camp [COORD(beacon)] for [id_goal_not_set ? "default goal of ":""][contained_id.goal] points.")
teleporter.handle_prisoner(contained_id, temporary_record) teleporter.handle_prisoner(contained_id, temporary_record)
playsound(src, 'sound/weapons/emitter.ogg', 50, 1) playsound(src, 'sound/weapons/emitter.ogg', 50, TRUE)
prisoner.forceMove(get_turf(beacon)) prisoner.forceMove(get_turf(beacon))
prisoner.Paralyze(40) // small travel dizziness prisoner.Paralyze(40) // small travel dizziness
to_chat(prisoner, "<span class='warning'>The teleportation makes you a little dizzy.</span>") to_chat(prisoner, "<span class='warning'>The teleportation makes you a little dizzy.</span>")
new /obj/effect/particle_effect/sparks(get_turf(prisoner)) new /obj/effect/particle_effect/sparks(get_turf(prisoner))
playsound(src, "sparks", 50, 1) playsound(src, "sparks", 50, TRUE)
if(teleporter.locked) if(teleporter.locked)
teleporter.locked = FALSE teleporter.locked = FALSE
teleporter.toggle_open() teleporter.toggle_open()

View File

@@ -382,7 +382,7 @@ What a mess.*/
investigate_log("Citation Paid off: <strong>[p.crimeName]</strong> Fine: [p.fine] | Paid off by [key_name(usr)]", INVESTIGATE_RECORDS) investigate_log("Citation Paid off: <strong>[p.crimeName]</strong> Fine: [p.fine] | Paid off by [key_name(usr)]", INVESTIGATE_RECORDS)
to_chat(usr, "<span class='notice'>The fine has been paid in full</span>") to_chat(usr, "<span class='notice'>The fine has been paid in full</span>")
qdel(C) qdel(C)
playsound(src, "terminal_type", 25, 0) playsound(src, "terminal_type", 25, FALSE)
else else
to_chat(usr, "<span class='warning'>Fines can only be paid with holochips</span>") to_chat(usr, "<span class='warning'>Fines can only be paid with holochips</span>")
@@ -390,7 +390,7 @@ What a mess.*/
if(!( printing )) if(!( printing ))
printing = 1 printing = 1
GLOB.data_core.securityPrintCount++ GLOB.data_core.securityPrintCount++
playsound(loc, 'sound/items/poster_being_created.ogg', 100, 1) playsound(loc, 'sound/items/poster_being_created.ogg', 100, TRUE)
sleep(30) sleep(30)
var/obj/item/paper/P = new /obj/item/paper( loc ) var/obj/item/paper/P = new /obj/item/paper( loc )
P.info = "<CENTER><B>Security Record - (SR-[GLOB.data_core.securityPrintCount])</B></CENTER><BR>" P.info = "<CENTER><B>Security Record - (SR-[GLOB.data_core.securityPrintCount])</B></CENTER><BR>"
@@ -472,7 +472,7 @@ What a mess.*/
var/info = stripped_multiline_input(usr, "Please input a description for the poster:", "Print Wanted Poster", default_description, null) var/info = stripped_multiline_input(usr, "Please input a description for the poster:", "Print Wanted Poster", default_description, null)
if(info) if(info)
playsound(loc, 'sound/items/poster_being_created.ogg', 100, 1) playsound(loc, 'sound/items/poster_being_created.ogg', 100, TRUE)
printing = 1 printing = 1
sleep(30) sleep(30)
if((istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)))//make sure the record still exists. if((istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)))//make sure the record still exists.
@@ -489,7 +489,7 @@ What a mess.*/
var/info = stripped_multiline_input(usr, "Please input a description for the poster:", "Print Missing Persons Poster", default_description, null) var/info = stripped_multiline_input(usr, "Please input a description for the poster:", "Print Missing Persons Poster", default_description, null)
if(info) if(info)
playsound(loc, 'sound/items/poster_being_created.ogg', 100, 1) playsound(loc, 'sound/items/poster_being_created.ogg', 100, TRUE)
printing = 1 printing = 1
sleep(30) sleep(30)
if((istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)))//make sure the record still exists. if((istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)))//make sure the record still exists.

View File

@@ -119,11 +119,11 @@
for(var/datum/data/record/R in GLOB.data_core.security) for(var/datum/data/record/R in GLOB.data_core.security)
if(R.fields["name"] == authenticated) if(R.fields["name"] == authenticated)
current = R current = R
playsound(src, 'sound/machines/terminal_on.ogg', 50, 0) playsound(src, 'sound/machines/terminal_on.ogg', 50, FALSE)
if("Logout") if("Logout")
current = null current = null
authenticated = null authenticated = null
playsound(src, 'sound/machines/terminal_off.ogg', 50, 0) playsound(src, 'sound/machines/terminal_off.ogg', 50, FALSE)
if("Pay") if("Pay")
for(var/datum/data/crime/p in current.fields["citation"]) for(var/datum/data/crime/p in current.fields["citation"])
@@ -141,7 +141,7 @@
investigate_log("Citation Paid off: <strong>[p.crimeName]</strong> Fine: [p.fine] | Paid off by [key_name(usr)]", INVESTIGATE_RECORDS) investigate_log("Citation Paid off: <strong>[p.crimeName]</strong> Fine: [p.fine] | Paid off by [key_name(usr)]", INVESTIGATE_RECORDS)
to_chat(M, "<span class='notice'>The fine has been paid in full</span>") to_chat(M, "<span class='notice'>The fine has been paid in full</span>")
qdel(C) qdel(C)
playsound(src, "terminal_type", 25, 0) playsound(src, "terminal_type", 25, FALSE)
else else
to_chat(M, "<span class='warning'>Fines can only be paid with holochips</span>") to_chat(M, "<span class='warning'>Fines can only be paid with holochips</span>")
updateUsrDialog() updateUsrDialog()

View File

@@ -124,7 +124,7 @@
return return
if(!user.transferItemToLoc(B, src)) if(!user.transferItemToLoc(B, src))
return return
playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) playsound(src.loc, 'sound/items/deconstruct.ogg', 50, TRUE)
to_chat(user, "<span class='notice'>You add the circuit board to the frame.</span>") to_chat(user, "<span class='notice'>You add the circuit board to the frame.</span>")
circuit = B circuit = B
icon_state = "box_2" icon_state = "box_2"

View File

@@ -72,7 +72,7 @@
else if(anchored) else if(anchored)
to_chat(user,"<span class='notice'>You unsecure and disconnect [src].</span>") to_chat(user,"<span class='notice'>You unsecure and disconnect [src].</span>")
setAnchored(FALSE) setAnchored(FALSE)
playsound(src, 'sound/items/deconstruct.ogg', 50, 1) playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE)
return return
return ..() return ..()
@@ -95,7 +95,7 @@
return return
if(!songs.len) if(!songs.len)
to_chat(user,"<span class='warning'>Error: No music tracks have been authorized for your station. Petition Central Command to resolve this issue.</span>") to_chat(user,"<span class='warning'>Error: No music tracks have been authorized for your station. Petition Central Command to resolve this issue.</span>")
playsound(src,'sound/misc/compiler-failure.ogg', 25, 1) playsound(src,'sound/misc/compiler-failure.ogg', 25, TRUE)
return return
var/list/dat = list() var/list/dat = list()
dat +="<div class='statusDisplay' style='text-align:center'>" dat +="<div class='statusDisplay' style='text-align:center'>"
@@ -120,7 +120,7 @@
if(!active) if(!active)
if(stop > world.time) if(stop > world.time)
to_chat(usr, "<span class='warning'>Error: The device is still resetting from the last activation, it will be ready again in [DisplayTimeText(stop-world.time)].</span>") to_chat(usr, "<span class='warning'>Error: The device is still resetting from the last activation, it will be ready again in [DisplayTimeText(stop-world.time)].</span>")
playsound(src, 'sound/misc/compiler-failure.ogg', 50, 1) playsound(src, 'sound/misc/compiler-failure.ogg', 50, TRUE)
return return
activate_music() activate_music()
START_PROCESSING(SSobj, src) START_PROCESSING(SSobj, src)
@@ -452,7 +452,7 @@
active = FALSE active = FALSE
STOP_PROCESSING(SSobj, src) STOP_PROCESSING(SSobj, src)
dance_over() dance_over()
playsound(src,'sound/machines/terminal_off.ogg',50,1) playsound(src,'sound/machines/terminal_off.ogg',50,TRUE)
update_icon() update_icon()
stop = world.time + 100 stop = world.time + 100

View File

@@ -246,7 +246,7 @@
if(locked) if(locked)
return return
locked = TRUE locked = TRUE
playsound(src,boltDown,30,0,3) playsound(src,boltDown,30,FALSE,3)
audible_message("<span class='italics'>You hear a click from the bottom of the door.</span>", null, 1) audible_message("<span class='italics'>You hear a click from the bottom of the door.</span>", null, 1)
update_icon() update_icon()
@@ -257,7 +257,7 @@
if(!locked) if(!locked)
return return
locked = FALSE locked = FALSE
playsound(src,boltUp,30,0,3) playsound(src,boltUp,30,FALSE,3)
audible_message("<span class='italics'>You hear a click from the bottom of the door.</span>", null, 1) audible_message("<span class='italics'>You hear a click from the bottom of the door.</span>", null, 1)
update_icon() update_icon()
@@ -621,7 +621,7 @@
if("deny") if("deny")
if(!stat) if(!stat)
update_icon(AIRLOCK_DENY) update_icon(AIRLOCK_DENY)
playsound(src,doorDeni,50,0,3) playsound(src,doorDeni,50,FALSE,3)
sleep(6) sleep(6)
update_icon(AIRLOCK_CLOSED) update_icon(AIRLOCK_CLOSED)
@@ -1049,7 +1049,7 @@
if(obj_flags & EMAGGED) if(obj_flags & EMAGGED)
return FALSE return FALSE
use_power(50) use_power(50)
playsound(src, doorOpen, 30, 1) playsound(src, doorOpen, 30, TRUE)
if(closeOther != null && istype(closeOther, /obj/machinery/door/airlock/) && !closeOther.density) if(closeOther != null && istype(closeOther, /obj/machinery/door/airlock/) && !closeOther.density)
closeOther.close() closeOther.close()
else else
@@ -1249,7 +1249,7 @@
var/time_to_open = 5 var/time_to_open = 5
if(hasPower()) if(hasPower())
time_to_open = 50 //Powered airlocks take longer to open, and are loud. time_to_open = 50 //Powered airlocks take longer to open, and are loud.
playsound(src, 'sound/machines/airlock_alien_prying.ogg', 100, 1) playsound(src, 'sound/machines/airlock_alien_prying.ogg', 100, TRUE)
if(do_after(user, time_to_open, TRUE, src)) if(do_after(user, time_to_open, TRUE, src))

View File

@@ -605,7 +605,7 @@
return return
/obj/machinery/door/airlock/clockwork/deconstruct(disassembled = TRUE) /obj/machinery/door/airlock/clockwork/deconstruct(disassembled = TRUE)
playsound(src, 'sound/items/deconstruct.ogg', 50, 1) playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE)
if(!(flags_1 & NODECONSTRUCT_1)) if(!(flags_1 & NODECONSTRUCT_1))
var/turf/T = get_turf(src) var/turf/T = get_turf(src)
if(disassembled) if(disassembled)
@@ -624,14 +624,14 @@
if(!I.use_tool(src, user, 75, volume=50) || construction_state != GEAR_SECURE) if(!I.use_tool(src, user, 75, volume=50) || construction_state != GEAR_SECURE)
return 1 return 1
user.visible_message("<span class='notice'>[user] loosens [src]'s cogwheel!</span>", "<span class='notice'>[src]'s cogwheel pops off and dangles loosely.</span>") user.visible_message("<span class='notice'>[user] loosens [src]'s cogwheel!</span>", "<span class='notice'>[src]'s cogwheel pops off and dangles loosely.</span>")
playsound(src, 'sound/items/deconstruct.ogg', 50, 1) playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE)
construction_state = GEAR_LOOSE construction_state = GEAR_LOOSE
else if(construction_state == GEAR_LOOSE) else if(construction_state == GEAR_LOOSE)
user.visible_message("<span class='notice'>[user] begins tightening [src]'s cogwheel...</span>", "<span class='notice'>You begin tightening [src]'s cogwheel into place...</span>") user.visible_message("<span class='notice'>[user] begins tightening [src]'s cogwheel...</span>", "<span class='notice'>You begin tightening [src]'s cogwheel into place...</span>")
if(!I.use_tool(src, user, 75, volume=50) || construction_state != GEAR_LOOSE) if(!I.use_tool(src, user, 75, volume=50) || construction_state != GEAR_LOOSE)
return 1 return 1
user.visible_message("<span class='notice'>[user] tightens [src]'s cogwheel!</span>", "<span class='notice'>You firmly tighten [src]'s cogwheel into place.</span>") user.visible_message("<span class='notice'>[user] tightens [src]'s cogwheel!</span>", "<span class='notice'>You firmly tighten [src]'s cogwheel into place.</span>")
playsound(src, 'sound/items/deconstruct.ogg', 50, 1) playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE)
construction_state = GEAR_SECURE construction_state = GEAR_SECURE
return 1 return 1
else if(I.tool_behaviour == TOOL_CROWBAR) else if(I.tool_behaviour == TOOL_CROWBAR)

View File

@@ -212,13 +212,13 @@
switch(damage_type) switch(damage_type)
if(BRUTE) if(BRUTE)
if(glass) if(glass)
playsound(loc, 'sound/effects/glasshit.ogg', 90, 1) playsound(loc, 'sound/effects/glasshit.ogg', 90, TRUE)
else if(damage_amount) else if(damage_amount)
playsound(loc, 'sound/weapons/smash.ogg', 50, 1) playsound(loc, 'sound/weapons/smash.ogg', 50, TRUE)
else else
playsound(src, 'sound/weapons/tap.ogg', 50, 1) playsound(src, 'sound/weapons/tap.ogg', 50, TRUE)
if(BURN) if(BURN)
playsound(src.loc, 'sound/items/welder.ogg', 100, 1) playsound(src.loc, 'sound/items/welder.ogg', 100, TRUE)
/obj/machinery/door/emp_act(severity) /obj/machinery/door/emp_act(severity)
. = ..() . = ..()

View File

@@ -109,7 +109,7 @@
"<span class='notice'>You start unfastening [src]'s floor bolts...</span>") "<span class='notice'>You start unfastening [src]'s floor bolts...</span>")
if(!C.use_tool(src, user, 50)) if(!C.use_tool(src, user, 50))
return return
playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, TRUE)
user.visible_message("<span class='notice'>[user] unfastens [src]'s bolts.</span>", \ user.visible_message("<span class='notice'>[user] unfastens [src]'s bolts.</span>", \
"<span class='notice'>You undo [src]'s floor bolts.</span>") "<span class='notice'>You undo [src]'s floor bolts.</span>")
deconstruct(TRUE) deconstruct(TRUE)
@@ -299,7 +299,7 @@
return return
if(constructionStep != CONSTRUCTION_PANEL_OPEN) if(constructionStep != CONSTRUCTION_PANEL_OPEN)
return return
playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, TRUE)
user.visible_message("<span class='notice'>[user] pries out a metal plate from [src], exposing the wires.</span>", \ user.visible_message("<span class='notice'>[user] pries out a metal plate from [src], exposing the wires.</span>", \
"<span class='notice'>You remove the cover plate from [src], exposing the wires.</span>") "<span class='notice'>You remove the cover plate from [src], exposing the wires.</span>")
constructionStep = CONSTRUCTION_WIRES_EXPOSED constructionStep = CONSTRUCTION_WIRES_EXPOSED
@@ -318,7 +318,7 @@
return return
user.visible_message("<span class='notice'>[user] finishes the firelock.</span>", \ user.visible_message("<span class='notice'>[user] finishes the firelock.</span>", \
"<span class='notice'>You finish the firelock.</span>") "<span class='notice'>You finish the firelock.</span>")
playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, TRUE)
if(reinforced) if(reinforced)
new /obj/machinery/door/firedoor/heavy(get_turf(src)) new /obj/machinery/door/firedoor/heavy(get_turf(src))
else else
@@ -335,13 +335,13 @@
return return
user.visible_message("<span class='notice'>[user] begins reinforcing [src]...</span>", \ user.visible_message("<span class='notice'>[user] begins reinforcing [src]...</span>", \
"<span class='notice'>You begin reinforcing [src]...</span>") "<span class='notice'>You begin reinforcing [src]...</span>")
playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, TRUE)
if(do_after(user, 60, target = src)) if(do_after(user, 60, target = src))
if(constructionStep != CONSTRUCTION_PANEL_OPEN || reinforced || P.get_amount() < 2 || !P) if(constructionStep != CONSTRUCTION_PANEL_OPEN || reinforced || P.get_amount() < 2 || !P)
return return
user.visible_message("<span class='notice'>[user] reinforces [src].</span>", \ user.visible_message("<span class='notice'>[user] reinforces [src].</span>", \
"<span class='notice'>You reinforce [src].</span>") "<span class='notice'>You reinforce [src].</span>")
playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, TRUE)
P.use(2) P.use(2)
reinforced = 1 reinforced = 1
return return
@@ -369,7 +369,7 @@
return return
if(constructionStep != CONSTRUCTION_WIRES_EXPOSED) if(constructionStep != CONSTRUCTION_WIRES_EXPOSED)
return return
playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, TRUE)
user.visible_message("<span class='notice'>[user] pries the metal plate into [src].</span>", \ user.visible_message("<span class='notice'>[user] pries the metal plate into [src].</span>", \
"<span class='notice'>You pry [src]'s cover plate into place, hiding the wires.</span>") "<span class='notice'>You pry [src]'s cover plate into place, hiding the wires.</span>")
constructionStep = CONSTRUCTION_PANEL_OPEN constructionStep = CONSTRUCTION_PANEL_OPEN
@@ -396,13 +396,13 @@
return return
user.visible_message("<span class='notice'>[user] begins wiring [src]...</span>", \ user.visible_message("<span class='notice'>[user] begins wiring [src]...</span>", \
"<span class='notice'>You begin adding wires to [src]...</span>") "<span class='notice'>You begin adding wires to [src]...</span>")
playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, TRUE)
if(do_after(user, 60, target = src)) if(do_after(user, 60, target = src))
if(constructionStep != CONSTRUCTION_GUTTED || B.get_amount() < 5 || !B) if(constructionStep != CONSTRUCTION_GUTTED || B.get_amount() < 5 || !B)
return return
user.visible_message("<span class='notice'>[user] adds wires to [src].</span>", \ user.visible_message("<span class='notice'>[user] adds wires to [src].</span>", \
"<span class='notice'>You wire [src].</span>") "<span class='notice'>You wire [src].</span>")
playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, TRUE)
B.use(5) B.use(5)
constructionStep = CONSTRUCTION_WIRES_EXPOSED constructionStep = CONSTRUCTION_WIRES_EXPOSED
update_icon() update_icon()
@@ -428,7 +428,7 @@
if(istype(C, /obj/item/electronics/firelock)) if(istype(C, /obj/item/electronics/firelock))
user.visible_message("<span class='notice'>[user] starts adding [C] to [src]...</span>", \ user.visible_message("<span class='notice'>[user] starts adding [C] to [src]...</span>", \
"<span class='notice'>You begin adding a circuit board to [src]...</span>") "<span class='notice'>You begin adding a circuit board to [src]...</span>")
playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, TRUE)
if(!do_after(user, 40, target = src)) if(!do_after(user, 40, target = src))
return return
if(constructionStep != CONSTRUCTION_NOCIRCUIT) if(constructionStep != CONSTRUCTION_NOCIRCUIT)
@@ -436,7 +436,7 @@
qdel(C) qdel(C)
user.visible_message("<span class='notice'>[user] adds a circuit to [src].</span>", \ user.visible_message("<span class='notice'>[user] adds a circuit to [src].</span>", \
"<span class='notice'>You insert and secure [C].</span>") "<span class='notice'>You insert and secure [C].</span>")
playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, TRUE)
constructionStep = CONSTRUCTION_GUTTED constructionStep = CONSTRUCTION_GUTTED
update_icon() update_icon()
return return

View File

@@ -52,13 +52,13 @@
switch(animation) switch(animation)
if("opening") if("opening")
flick("opening", src) flick("opening", src)
playsound(src, 'sound/machines/blastdoor.ogg', 30, 1) playsound(src, 'sound/machines/blastdoor.ogg', 30, TRUE)
if("closing") if("closing")
flick("closing", src) flick("closing", src)
playsound(src, 'sound/machines/blastdoor.ogg', 30, 1) playsound(src, 'sound/machines/blastdoor.ogg', 30, TRUE)
if("deny") if("deny")
//Deny animation would be nice to have. //Deny animation would be nice to have.
playsound(src, 'sound/machines/buzz-sigh.ogg', 30, 1) playsound(src, 'sound/machines/buzz-sigh.ogg', 30, TRUE)
/obj/machinery/door/password/proc/ask_for_pass(mob/user) /obj/machinery/door/password/proc/ask_for_pass(mob/user)
var/guess = stripped_input(user,"Enter the password:", "Password", "") var/guess = stripped_input(user,"Enter the password:", "Password", "")

View File

@@ -77,10 +77,10 @@
switch(animation) switch(animation)
if("opening") if("opening")
flick("opening", src) flick("opening", src)
playsound(src, 'sound/machines/blastdoor.ogg', 30, 1) playsound(src, 'sound/machines/blastdoor.ogg', 30, TRUE)
if("closing") if("closing")
flick("closing", src) flick("closing", src)
playsound(src, 'sound/machines/blastdoor.ogg', 30, 1) playsound(src, 'sound/machines/blastdoor.ogg', 30, TRUE)
/obj/machinery/door/poddoor/update_icon() /obj/machinery/door/poddoor/update_icon()
if(density) if(density)

View File

@@ -44,7 +44,7 @@
density = FALSE density = FALSE
QDEL_LIST(debris) QDEL_LIST(debris)
if(obj_integrity == 0) if(obj_integrity == 0)
playsound(src, "shatter", 70, 1) playsound(src, "shatter", 70, TRUE)
electronics = null electronics = null
return ..() return ..()
@@ -144,7 +144,7 @@
if(!operating) //in case of emag if(!operating) //in case of emag
operating = TRUE operating = TRUE
do_animate("opening") do_animate("opening")
playsound(src, 'sound/machines/windowdoor.ogg', 100, 1) playsound(src, 'sound/machines/windowdoor.ogg', 100, TRUE)
icon_state ="[base_state]open" icon_state ="[base_state]open"
sleep(10) sleep(10)
@@ -167,7 +167,7 @@
return 0 return 0
operating = TRUE operating = TRUE
do_animate("closing") do_animate("closing")
playsound(src, 'sound/machines/windowdoor.ogg', 100, 1) playsound(src, 'sound/machines/windowdoor.ogg', 100, TRUE)
icon_state = base_state icon_state = base_state
density = TRUE density = TRUE
@@ -181,9 +181,9 @@
/obj/machinery/door/window/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) /obj/machinery/door/window/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
switch(damage_type) switch(damage_type)
if(BRUTE) if(BRUTE)
playsound(src, 'sound/effects/glasshit.ogg', 90, 1) playsound(src, 'sound/effects/glasshit.ogg', 90, TRUE)
if(BURN) if(BURN)
playsound(src, 'sound/items/welder.ogg', 100, 1) playsound(src, 'sound/items/welder.ogg', 100, TRUE)
/obj/machinery/door/window/deconstruct(disassembled = TRUE) /obj/machinery/door/window/deconstruct(disassembled = TRUE)
@@ -212,7 +212,7 @@
obj_flags |= EMAGGED obj_flags |= EMAGGED
operating = TRUE operating = TRUE
flick("[base_state]spark", src) flick("[base_state]spark", src)
playsound(src, "sparks", 75, 1) playsound(src, "sparks", 75, TRUE)
sleep(6) sleep(6)
operating = FALSE operating = FALSE
desc += "<BR><span class='warning'>Its access panel is smoking slightly.</span>" desc += "<BR><span class='warning'>Its access panel is smoking slightly.</span>"

View File

@@ -70,7 +70,7 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
/obj/machinery/doppler_array/proc/rot_message(mob/user) /obj/machinery/doppler_array/proc/rot_message(mob/user)
to_chat(user, "<span class='notice'>You adjust [src]'s dish to face to the [dir2text(dir)].</span>") to_chat(user, "<span class='notice'>You adjust [src]'s dish to face to the [dir2text(dir)].</span>")
playsound(src, 'sound/items/screwdriver2.ogg', 50, 1) playsound(src, 'sound/items/screwdriver2.ogg', 50, TRUE)
/obj/machinery/doppler_array/proc/sense_explosion(turf/epicenter,devastation_range,heavy_impact_range,light_impact_range, /obj/machinery/doppler_array/proc/sense_explosion(turf/epicenter,devastation_range,heavy_impact_range,light_impact_range,
took,orig_dev_range,orig_heavy_range,orig_light_range) took,orig_dev_range,orig_heavy_range,orig_light_range)

View File

@@ -162,7 +162,7 @@
if(begin_create_message) if(begin_create_message)
visible_message("<span class='notice'>[src] [begin_create_message]</span>") visible_message("<span class='notice'>[src] [begin_create_message]</span>")
if(work_sound) if(work_sound)
playsound(src, work_sound, 50, 1) playsound(src, work_sound, 50, TRUE)
mode = DRONE_PRODUCTION mode = DRONE_PRODUCTION
timer = world.time + production_time timer = world.time + production_time
update_icon() update_icon()
@@ -176,7 +176,7 @@
A.flags_1 |= (flags_1 & ADMIN_SPAWNED_1) A.flags_1 |= (flags_1 & ADMIN_SPAWNED_1)
if(create_sound) if(create_sound)
playsound(src, create_sound, 50, 1) playsound(src, create_sound, 50, TRUE)
if(end_create_message) if(end_create_message)
visible_message("<span class='notice'>[src] [end_create_message]</span>") visible_message("<span class='notice'>[src] [end_create_message]</span>")
@@ -186,7 +186,7 @@
if(DRONE_RECHARGING) if(DRONE_RECHARGING)
if(recharge_sound) if(recharge_sound)
playsound(src, recharge_sound, 50, 1) playsound(src, recharge_sound, 50, TRUE)
if(recharge_message) if(recharge_message)
visible_message("<span class='notice'>[src] [recharge_message]</span>") visible_message("<span class='notice'>[src] [recharge_message]</span>")
@@ -247,7 +247,7 @@
if(break_message) if(break_message)
audible_message("<span class='warning'>[src] [break_message]</span>") audible_message("<span class='warning'>[src] [break_message]</span>")
if(break_sound) if(break_sound)
playsound(src, break_sound, 50, 1) playsound(src, break_sound, 50, TRUE)
stat |= BROKEN stat |= BROKEN
update_icon() update_icon()

View File

@@ -31,7 +31,7 @@
obj_flags |= EMAGGED obj_flags |= EMAGGED
req_access = list() req_access = list()
req_one_access = list() req_one_access = list()
playsound(src, "sparks", 100, 1) playsound(src, "sparks", 100, TRUE)
to_chat(user, "<span class='warning'>You short out the access controller.</span>") to_chat(user, "<span class='warning'>You short out the access controller.</span>")
/obj/machinery/doorButtons/proc/removeMe() /obj/machinery/doorButtons/proc/removeMe()

View File

@@ -231,27 +231,27 @@
loading = TRUE loading = TRUE
updateUsrDialog() updateUsrDialog()
playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
say("Initiating scan...") say("Initiating scan...")
spawn(20) spawn(20)
clone_occupant(scanner.occupant) clone_occupant(scanner.occupant)
loading = FALSE loading = FALSE
updateUsrDialog() updateUsrDialog()
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
//No locking an open scanner. //No locking an open scanner.
else if ((href_list["lock"]) && !isnull(scanner) && scanner.is_operational()) else if ((href_list["lock"]) && !isnull(scanner) && scanner.is_operational())
if ((!scanner.locked) && (scanner.occupant)) if ((!scanner.locked) && (scanner.occupant))
scanner.locked = TRUE scanner.locked = TRUE
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
else else
scanner.locked = FALSE scanner.locked = FALSE
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
else if (href_list["refresh"]) else if (href_list["refresh"])
updateUsrDialog() updateUsrDialog()
playsound(src, "terminal_type", 25, 0) playsound(src, "terminal_type", 25, FALSE)
add_fingerprint(usr) add_fingerprint(usr)
updateUsrDialog() updateUsrDialog()
@@ -269,15 +269,15 @@
if(!istype(dna)) if(!istype(dna))
scantemp = "<font class='bad'>Unable to locate valid genetic data.</font>" scantemp = "<font class='bad'>Unable to locate valid genetic data.</font>"
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
return return
if((HAS_TRAIT(mob_occupant, TRAIT_HUSK)) && (src.scanner.scan_level < 2)) if((HAS_TRAIT(mob_occupant, TRAIT_HUSK)) && (src.scanner.scan_level < 2))
scantemp = "<font class='bad'>Subject's body is too damaged to scan properly.</font>" scantemp = "<font class='bad'>Subject's body is too damaged to scan properly.</font>"
playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0) playsound(src, 'sound/machines/terminal_alert.ogg', 50, FALSE)
return return
if(HAS_TRAIT(mob_occupant, TRAIT_BADDNA)) if(HAS_TRAIT(mob_occupant, TRAIT_BADDNA))
scantemp = "<font class='bad'>Subject's DNA is damaged beyond any hope of recovery.</font>" scantemp = "<font class='bad'>Subject's DNA is damaged beyond any hope of recovery.</font>"
playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0) playsound(src, 'sound/machines/terminal_alert.ogg', 50, FALSE)
return return
var/clone_species var/clone_species
@@ -291,14 +291,14 @@
//Can't clone without someone to clone. Or a pod. Or if the pod is busy. Or full of gibs. //Can't clone without someone to clone. Or a pod. Or if the pod is busy. Or full of gibs.
if(!LAZYLEN(pods)) if(!LAZYLEN(pods))
temp = "<font class='bad'>No Clonepods detected.</font>" temp = "<font class='bad'>No Clonepods detected.</font>"
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
else if(!pod) else if(!pod)
temp = "<font class='bad'>No Clonepods available.</font>" temp = "<font class='bad'>No Clonepods available.</font>"
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
else if(pod.occupant) else if(pod.occupant)
temp = "<font class='bad'>Cloning cycle already in progress.</font>" temp = "<font class='bad'>Cloning cycle already in progress.</font>"
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
else else
pod.growclone(mob_occupant.real_name, dna.uni_identity, dna.mutation_index, null, null, clone_species, dna.features, mob_occupant.faction) pod.growclone(mob_occupant.real_name, dna.uni_identity, dna.mutation_index, null, null, clone_species, dna.features, mob_occupant.faction)
temp = "[mob_occupant.real_name] => <font class='good'>Cloning data sent to pod.</font>" temp = "[mob_occupant.real_name] => <font class='good'>Cloning data sent to pod.</font>"
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)

View File

@@ -112,7 +112,7 @@
if(user) if(user)
user.visible_message("<span class='warning'>Sparks fly out of [src]!</span>", user.visible_message("<span class='warning'>Sparks fly out of [src]!</span>",
"<span class='notice'>You emag [src], disabling its thermal sensors.</span>") "<span class='notice'>You emag [src], disabling its thermal sensors.</span>")
playsound(src, "sparks", 50, 1) playsound(src, "sparks", 50, TRUE)
/obj/machinery/firealarm/temperature_expose(datum/gas_mixture/air, temperature, volume) /obj/machinery/firealarm/temperature_expose(datum/gas_mixture/air, temperature, volume)
if((temperature > T0C + 200 || temperature < BODYTEMP_COLD_DAMAGE_LIMIT) && (last_alarm+FIREALARM_COOLDOWN < world.time) && !(obj_flags & EMAGGED) && detecting && !stat) if((temperature > T0C + 200 || temperature < BODYTEMP_COLD_DAMAGE_LIMIT) && (last_alarm+FIREALARM_COOLDOWN < world.time) && !(obj_flags & EMAGGED) && detecting && !stat)

View File

@@ -106,7 +106,7 @@
power_change() power_change()
return return
playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1) playsound(src.loc, 'sound/weapons/flash.ogg', 100, TRUE)
flick("[base_state]_flash", src) flick("[base_state]_flash", src)
flash_lighting_fx(FLASH_LIGHT_RANGE, light_power, light_color) flash_lighting_fx(FLASH_LIGHT_RANGE, light_power, light_color)
last_flash = world.time last_flash = world.time
@@ -152,7 +152,7 @@
var/obj/item/wallframe/flasher/F = new(get_turf(src)) var/obj/item/wallframe/flasher/F = new(get_turf(src))
transfer_fingerprints_to(F) transfer_fingerprints_to(F)
F.id = id F.id = id
playsound(loc, 'sound/items/deconstruct.ogg', 50, 1) playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE)
else else
new /obj/item/stack/sheet/metal (loc, 2) new /obj/item/stack/sheet/metal (loc, 2)
qdel(src) qdel(src)

View File

@@ -67,15 +67,15 @@
var/obj/item/I = A var/obj/item/I = A
if(!(HAS_TRAIT(I, TRAIT_NODROP))) if(!(HAS_TRAIT(I, TRAIT_NODROP)))
say("Subject may not have abiotic items on.") say("Subject may not have abiotic items on.")
playsound(src, 'sound/machines/buzz-sigh.ogg', 30, 1) playsound(src, 'sound/machines/buzz-sigh.ogg', 30, TRUE)
return return
if(!(C.mob_biotypes & MOB_ORGANIC)) if(!(C.mob_biotypes & MOB_ORGANIC))
say("Subject is not organic.") say("Subject is not organic.")
playsound(src, 'sound/machines/buzz-sigh.ogg', 30, 1) playsound(src, 'sound/machines/buzz-sigh.ogg', 30, TRUE)
return return
if(!allow_living && !(C.stat == DEAD || HAS_TRAIT(C, TRAIT_FAKEDEATH))) //I mean, the machines scanners arent advanced enough to tell you're alive if(!allow_living && !(C.stat == DEAD || HAS_TRAIT(C, TRAIT_FAKEDEATH))) //I mean, the machines scanners arent advanced enough to tell you're alive
say("Subject is still alive.") say("Subject is still alive.")
playsound(src, 'sound/machines/buzz-sigh.ogg', 30, 1) playsound(src, 'sound/machines/buzz-sigh.ogg', 30, TRUE)
return return
return TRUE return TRUE
@@ -94,7 +94,7 @@
update_icon() update_icon()
if(!harvesting || state_open || !powered(EQUIP) || !occupant || !iscarbon(occupant)) if(!harvesting || state_open || !powered(EQUIP) || !occupant || !iscarbon(occupant))
return return
playsound(src, 'sound/machines/juicer.ogg', 20, 1) playsound(src, 'sound/machines/juicer.ogg', 20, TRUE)
var/mob/living/carbon/C = occupant var/mob/living/carbon/C = occupant
if(!LAZYLEN(operation_order)) //The list is empty, so we're done here if(!LAZYLEN(operation_order)) //The list is empty, so we're done here
end_harvesting() end_harvesting()
@@ -128,7 +128,7 @@
harvesting = FALSE harvesting = FALSE
open_machine() open_machine()
say("Subject has been successfully harvested.") say("Subject has been successfully harvested.")
playsound(src, 'sound/machines/microwave/microwave-end.ogg', 100, 0) playsound(src, 'sound/machines/microwave/microwave-end.ogg', 100, FALSE)
/obj/machinery/harvester/screwdriver_act(mob/living/user, obj/item/I) /obj/machinery/harvester/screwdriver_act(mob/living/user, obj/item/I)
. = TRUE . = TRUE

View File

@@ -640,7 +640,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
if(replay_holo) if(replay_holo)
replay_holo.say(message) replay_holo.say(message)
if(HOLORECORD_SOUND) if(HOLORECORD_SOUND)
playsound(src,entry[2],50,1) playsound(src,entry[2],50,TRUE)
if(HOLORECORD_DELAY) if(HOLORECORD_DELAY)
addtimer(CALLBACK(src,.proc/replay_entry,entry_number+1),entry[2]) addtimer(CALLBACK(src,.proc/replay_entry,entry_number+1),entry[2])
return return

View File

@@ -150,7 +150,7 @@
// If the human is losing too much blood, beep. // If the human is losing too much blood, beep.
if(attached.blood_volume < BLOOD_VOLUME_SAFE && prob(5)) if(attached.blood_volume < BLOOD_VOLUME_SAFE && prob(5))
visible_message("<span class='italics'>[src] beeps loudly.</span>") visible_message("<span class='italics'>[src] beeps loudly.</span>")
playsound(loc, 'sound/machines/twobeep_high.ogg', 50, 1) playsound(loc, 'sound/machines/twobeep_high.ogg', 50, TRUE)
attached.transfer_blood_to(beaker, amount) attached.transfer_blood_to(beaker, amount)
update_icon() update_icon()

View File

@@ -123,7 +123,7 @@
indicator_icon = "launchpad_pull" indicator_icon = "launchpad_pull"
update_indicator() update_indicator()
playsound(get_turf(src), 'sound/weapons/flash.ogg', 25, 1) playsound(get_turf(src), 'sound/weapons/flash.ogg', 25, TRUE)
teleporting = TRUE teleporting = TRUE
@@ -149,7 +149,7 @@
source = dest source = dest
dest = target dest = target
playsound(get_turf(src), 'sound/weapons/emitter2.ogg', 25, 1) playsound(get_turf(src), 'sound/weapons/emitter2.ogg', 25, TRUE)
var/first = TRUE var/first = TRUE
for(var/atom/movable/ROI in source) for(var/atom/movable/ROI in source)
if(ROI == src) if(ROI == src)

View File

@@ -722,7 +722,7 @@ GLOBAL_LIST_EMPTY(allCasters)
to_chat(user, "<span class='notice'>You start [anchored ? "un" : ""]securing [name]...</span>") to_chat(user, "<span class='notice'>You start [anchored ? "un" : ""]securing [name]...</span>")
I.play_tool_sound(src) I.play_tool_sound(src)
if(I.use_tool(src, user, 60)) if(I.use_tool(src, user, 60))
playsound(loc, 'sound/items/deconstruct.ogg', 50, 1) playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE)
if(stat & BROKEN) if(stat & BROKEN)
to_chat(user, "<span class='warning'>The broken remains of [src] fall on the ground.</span>") to_chat(user, "<span class='warning'>The broken remains of [src] fall on the ground.</span>")
new /obj/item/stack/sheet/metal(loc, 5) new /obj/item/stack/sheet/metal(loc, 5)
@@ -755,11 +755,11 @@ GLOBAL_LIST_EMPTY(allCasters)
switch(damage_type) switch(damage_type)
if(BRUTE) if(BRUTE)
if(stat & BROKEN) if(stat & BROKEN)
playsound(loc, 'sound/effects/hit_on_shattered_glass.ogg', 100, 1) playsound(loc, 'sound/effects/hit_on_shattered_glass.ogg', 100, TRUE)
else else
playsound(loc, 'sound/effects/glasshit.ogg', 90, 1) playsound(loc, 'sound/effects/glasshit.ogg', 90, TRUE)
if(BURN) if(BURN)
playsound(src.loc, 'sound/items/welder.ogg', 100, 1) playsound(src.loc, 'sound/items/welder.ogg', 100, TRUE)
/obj/machinery/newscaster/deconstruct(disassembled = TRUE) /obj/machinery/newscaster/deconstruct(disassembled = TRUE)
@@ -772,7 +772,7 @@ GLOBAL_LIST_EMPTY(allCasters)
/obj/machinery/newscaster/obj_break() /obj/machinery/newscaster/obj_break()
if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1)) if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1))
stat |= BROKEN stat |= BROKEN
playsound(loc, 'sound/effects/glassbr3.ogg', 100, 1) playsound(loc, 'sound/effects/glassbr3.ogg', 100, TRUE)
update_icon() update_icon()
@@ -859,10 +859,10 @@ GLOBAL_LIST_EMPTY(allCasters)
alert = TRUE alert = TRUE
update_icon() update_icon()
addtimer(CALLBACK(src,.proc/remove_alert),alert_delay,TIMER_UNIQUE|TIMER_OVERRIDE) addtimer(CALLBACK(src,.proc/remove_alert),alert_delay,TIMER_UNIQUE|TIMER_OVERRIDE)
playsound(loc, 'sound/machines/twobeep_high.ogg', 75, 1) playsound(loc, 'sound/machines/twobeep_high.ogg', 75, TRUE)
else else
say("Attention! Wanted issue distributed!") say("Attention! Wanted issue distributed!")
playsound(loc, 'sound/machines/warning-buzzer.ogg', 75, 1) playsound(loc, 'sound/machines/warning-buzzer.ogg', 75, TRUE)
/obj/item/newspaper /obj/item/newspaper
@@ -891,7 +891,7 @@ GLOBAL_LIST_EMPTY(allCasters)
user.say(";JOURNALISM IS MY CALLING! EVERYBODY APPRECIATES UNBIASED REPORTI-GLORF", forced="newspaper suicide") user.say(";JOURNALISM IS MY CALLING! EVERYBODY APPRECIATES UNBIASED REPORTI-GLORF", forced="newspaper suicide")
var/mob/living/carbon/human/H = user var/mob/living/carbon/human/H = user
var/obj/W = new /obj/item/reagent_containers/food/drinks/bottle/whiskey(H.loc) var/obj/W = new /obj/item/reagent_containers/food/drinks/bottle/whiskey(H.loc)
playsound(H.loc, 'sound/items/drink.ogg', rand(10,50), 1) playsound(H.loc, 'sound/items/drink.ogg', rand(10,50), TRUE)
W.reagents.trans_to(H, W.reagents.total_volume, transfered_by = user) W.reagents.trans_to(H, W.reagents.total_volume, transfered_by = user)
user.visible_message("<span class='suicide'>[user] downs the contents of [W.name] in one gulp! Shoulda stuck to sudoku!</span>") user.visible_message("<span class='suicide'>[user] downs the contents of [W.name] in one gulp! Shoulda stuck to sudoku!</span>")
@@ -1006,7 +1006,7 @@ GLOBAL_LIST_EMPTY(allCasters)
if(curr_page == 0) //We're at the start, get to the middle if(curr_page == 0) //We're at the start, get to the middle
screen=1 screen=1
curr_page++ curr_page++
playsound(loc, "pageturn", 50, 1) playsound(loc, "pageturn", 50, TRUE)
else if(href_list["prev_page"]) else if(href_list["prev_page"])
if(curr_page == 0) if(curr_page == 0)
return return
@@ -1016,7 +1016,7 @@ GLOBAL_LIST_EMPTY(allCasters)
if(curr_page == pages+1) //we're at the end, let's go back to the middle. if(curr_page == pages+1) //we're at the end, let's go back to the middle.
screen = 1 screen = 1
curr_page-- curr_page--
playsound(loc, "pageturn", 50, 1) playsound(loc, "pageturn", 50, TRUE)
if(ismob(loc)) if(ismob(loc))
attack_self(loc) attack_self(loc)

View File

@@ -552,11 +552,11 @@
if(mode == TURRET_STUN) if(mode == TURRET_STUN)
use_power(reqpower) use_power(reqpower)
A = new stun_projectile(T) A = new stun_projectile(T)
playsound(loc, stun_projectile_sound, 75, 1) playsound(loc, stun_projectile_sound, 75, TRUE)
else else
use_power(reqpower * 2) use_power(reqpower * 2)
A = new lethal_projectile(T) A = new lethal_projectile(T)
playsound(loc, lethal_projectile_sound, 75, 1) playsound(loc, lethal_projectile_sound, 75, TRUE)
//Shooting Code: //Shooting Code:

View File

@@ -134,7 +134,7 @@
/obj/machinery/quantumpad/proc/doteleport(mob/user, obj/machinery/quantumpad/target_pad = linked_pad) /obj/machinery/quantumpad/proc/doteleport(mob/user, obj/machinery/quantumpad/target_pad = linked_pad)
if(target_pad) if(target_pad)
playsound(get_turf(src), 'sound/weapons/flash.ogg', 25, 1) playsound(get_turf(src), 'sound/weapons/flash.ogg', 25, TRUE)
teleporting = TRUE teleporting = TRUE
spawn(teleport_speed) spawn(teleport_speed)
@@ -159,9 +159,9 @@
target_pad.sparks() target_pad.sparks()
flick("qpad-beam", src) flick("qpad-beam", src)
playsound(get_turf(src), 'sound/weapons/emitter2.ogg', 25, 1, extrarange = 3, falloff = 5) playsound(get_turf(src), 'sound/weapons/emitter2.ogg', 25, TRUE, extrarange = 3, falloff = 5)
flick("qpad-beam", target_pad) flick("qpad-beam", target_pad)
playsound(get_turf(target_pad), 'sound/weapons/emitter2.ogg', 25, 1, extrarange = 3, falloff = 5) playsound(get_turf(target_pad), 'sound/weapons/emitter2.ogg', 25, TRUE, extrarange = 3, falloff = 5)
for(var/atom/movable/ROI in get_turf(src)) for(var/atom/movable/ROI in get_turf(src))
if(QDELETED(ROI)) if(QDELETED(ROI))
continue //sleeps in CHECK_TICK continue //sleeps in CHECK_TICK

View File

@@ -72,7 +72,7 @@
if(safety_mode) if(safety_mode)
safety_mode = FALSE safety_mode = FALSE
update_icon() update_icon()
playsound(src, "sparks", 75, 1, -1) playsound(src, "sparks", 75, TRUE, -1)
to_chat(user, "<span class='notice'>You use the cryptographic sequencer on [src].</span>") to_chat(user, "<span class='notice'>You use the cryptographic sequencer on [src].</span>")
/obj/machinery/recycler/update_icon() /obj/machinery/recycler/update_icon()
@@ -123,9 +123,9 @@
recycle_item(AM) recycle_item(AM)
items_recycled++ items_recycled++
else else
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0) playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE)
if(items_recycled && sound) if(items_recycled && sound)
playsound(src, item_recycle_sound, 50, 1) playsound(src, item_recycle_sound, 50, TRUE)
/obj/machinery/recycler/proc/recycle_item(obj/item/I) /obj/machinery/recycler/proc/recycle_item(obj/item/I)
@@ -150,14 +150,14 @@
/obj/machinery/recycler/proc/emergency_stop(mob/living/L) /obj/machinery/recycler/proc/emergency_stop(mob/living/L)
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0) playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE)
safety_mode = TRUE safety_mode = TRUE
update_icon() update_icon()
L.forceMove(loc) L.forceMove(loc)
addtimer(CALLBACK(src, .proc/reboot), SAFETY_COOLDOWN) addtimer(CALLBACK(src, .proc/reboot), SAFETY_COOLDOWN)
/obj/machinery/recycler/proc/reboot() /obj/machinery/recycler/proc/reboot()
playsound(src, 'sound/machines/ping.ogg', 50, 0) playsound(src, 'sound/machines/ping.ogg', 50, FALSE)
safety_mode = FALSE safety_mode = FALSE
update_icon() update_icon()
@@ -166,9 +166,9 @@
L.forceMove(loc) L.forceMove(loc)
if(issilicon(L)) if(issilicon(L))
playsound(src, 'sound/items/welder.ogg', 50, 1) playsound(src, 'sound/items/welder.ogg', 50, TRUE)
else else
playsound(src, 'sound/effects/splat.ogg', 50, 1) playsound(src, 'sound/effects/splat.ogg', 50, TRUE)
// By default, the emagged recycler will gib all non-carbons. (human simple animal mobs don't count) // By default, the emagged recycler will gib all non-carbons. (human simple animal mobs don't count)
if(iscarbon(L)) if(iscarbon(L))

View File

@@ -398,7 +398,7 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments)
messages += "[header][sending]" messages += "[header][sending]"
if(!silenced) if(!silenced)
playsound(src, 'sound/machines/twobeep_high.ogg', 50, 1) playsound(src, 'sound/machines/twobeep_high.ogg', 50, TRUE)
say(alert) say(alert)
if(radio_freq) if(radio_freq)

View File

@@ -136,7 +136,7 @@
/obj/machinery/scanner_gate/proc/alarm_beep() /obj/machinery/scanner_gate/proc/alarm_beep()
if(next_beep <= world.time) if(next_beep <= world.time)
next_beep = world.time + 20 next_beep = world.time + 20
playsound(src, 'sound/machines/scanbuzz.ogg', 100, 0) playsound(src, 'sound/machines/scanbuzz.ogg', 100, FALSE)
var/image/I = image(icon, src, "alarm_light", layer+1) var/image/I = image(icon, src, "alarm_light", layer+1)
flick_overlay_view(I, src, 20) flick_overlay_view(I, src, 20)
set_scanline("alarm", 20) set_scanline("alarm", 20)

View File

@@ -34,9 +34,9 @@
/obj/structure/emergency_shield/play_attack_sound(damage, damage_type = BRUTE, damage_flag = 0) /obj/structure/emergency_shield/play_attack_sound(damage, damage_type = BRUTE, damage_flag = 0)
switch(damage_type) switch(damage_type)
if(BURN) if(BURN)
playsound(loc, 'sound/effects/empulse.ogg', 75, 1) playsound(loc, 'sound/effects/empulse.ogg', 75, TRUE)
if(BRUTE) if(BRUTE)
playsound(loc, 'sound/effects/empulse.ogg', 75, 1) playsound(loc, 'sound/effects/empulse.ogg', 75, TRUE)
/obj/structure/emergency_shield/take_damage(damage, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) /obj/structure/emergency_shield/take_damage(damage, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
. = ..() . = ..()
@@ -203,7 +203,7 @@
return return
obj_flags |= EMAGGED obj_flags |= EMAGGED
locked = FALSE locked = FALSE
playsound(src, "sparks", 100, 1) playsound(src, "sparks", 100, TRUE)
to_chat(user, "<span class='warning'>You short out the access controller.</span>") to_chat(user, "<span class='warning'>You short out the access controller.</span>")
/obj/machinery/shieldgen/update_icon() /obj/machinery/shieldgen/update_icon()
@@ -392,7 +392,7 @@
return return
obj_flags |= EMAGGED obj_flags |= EMAGGED
locked = FALSE locked = FALSE
playsound(src, "sparks", 100, 1) playsound(src, "sparks", 100, TRUE)
to_chat(user, "<span class='warning'>You short out the access controller.</span>") to_chat(user, "<span class='warning'>You short out the access controller.</span>")
//////////////Containment Field START //////////////Containment Field START
@@ -435,9 +435,9 @@
/obj/machinery/shieldwall/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) /obj/machinery/shieldwall/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
switch(damage_type) switch(damage_type)
if(BURN) if(BURN)
playsound(loc, 'sound/effects/empulse.ogg', 75, 1) playsound(loc, 'sound/effects/empulse.ogg', 75, TRUE)
if(BRUTE) if(BRUTE)
playsound(loc, 'sound/effects/empulse.ogg', 75, 1) playsound(loc, 'sound/effects/empulse.ogg', 75, TRUE)
//the shield wall is immune to damage but it drains the stored power of the generators. //the shield wall is immune to damage but it drains the stored power of the generators.
/obj/machinery/shieldwall/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) /obj/machinery/shieldwall/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)

View File

@@ -132,7 +132,7 @@
var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread() var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread()
spark_system.set_up(4, 0, src.loc) spark_system.set_up(4, 0, src.loc)
spark_system.start() spark_system.start()
playsound(src, "sparks", 50, 1) playsound(src, "sparks", 50, TRUE)
/obj/machinery/computer/slot_machine/ui_interact(mob/living/user) /obj/machinery/computer/slot_machine/ui_interact(mob/living/user)
. = ..() . = ..()

View File

@@ -261,7 +261,7 @@
locked = FALSE locked = FALSE
if(uv_super) if(uv_super)
visible_message("<span class='warning'>[src]'s door creaks open with a loud whining noise. A cloud of foul black smoke escapes from its chamber.</span>") visible_message("<span class='warning'>[src]'s door creaks open with a loud whining noise. A cloud of foul black smoke escapes from its chamber.</span>")
playsound(src, 'sound/machines/airlock_alien_prying.ogg', 50, 1) playsound(src, 'sound/machines/airlock_alien_prying.ogg', 50, TRUE)
helmet = null helmet = null
qdel(helmet) qdel(helmet)
suit = null suit = null
@@ -277,7 +277,7 @@
visible_message("<span class='notice'>[src]'s door slides open. The glowing yellow lights dim to a gentle green.</span>") visible_message("<span class='notice'>[src]'s door slides open. The glowing yellow lights dim to a gentle green.</span>")
else else
visible_message("<span class='warning'>[src]'s door slides open, barraging you with the nauseating smell of charred flesh.</span>") visible_message("<span class='warning'>[src]'s door slides open, barraging you with the nauseating smell of charred flesh.</span>")
playsound(src, 'sound/machines/airlockclose.ogg', 25, 1) playsound(src, 'sound/machines/airlockclose.ogg', 25, TRUE)
var/list/things_to_clear = list() //Done this way since using GetAllContents on the SSU itself would include circuitry and such. var/list/things_to_clear = list() //Done this way since using GetAllContents on the SSU itself would include circuitry and such.
if(suit) if(suit)
things_to_clear += suit things_to_clear += suit

View File

@@ -122,7 +122,7 @@
if(user) if(user)
to_chat(user, "<span class='notice'>Locked In.</span>") to_chat(user, "<span class='notice'>Locked In.</span>")
new droptype( user.loc ) new droptype( user.loc )
playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) playsound(src, 'sound/effects/pop.ogg', 100, TRUE, TRUE)
qdel(src) qdel(src)
return return

View File

@@ -71,7 +71,7 @@
volume = 10 volume = 10
else else
volume = 5 volume = 5
playsound(loc, beepsound, volume, 0) playsound(loc, beepsound, volume, FALSE)
next_beep = world.time + 10 next_beep = world.time + 10
if(active && ((detonation_timer <= world.time) || explode_now)) if(active && ((detonation_timer <= world.time) || explode_now))
@@ -187,7 +187,7 @@
countdown.start() countdown.start()
next_beep = world.time + 10 next_beep = world.time + 10
detonation_timer = world.time + (timer_set * 10) detonation_timer = world.time + (timer_set * 10)
playsound(loc, 'sound/machines/click.ogg', 30, 1) playsound(loc, 'sound/machines/click.ogg', 30, TRUE)
notify_ghosts("\A [src] has been activated at [get_area(src)]!", source = src, action = NOTIFY_ORBIT, flashwindow = FALSE, header = "Bomb Planted") notify_ghosts("\A [src] has been activated at [get_area(src)]!", source = src, action = NOTIFY_ORBIT, flashwindow = FALSE, header = "Bomb Planted")
/obj/machinery/syndicatebomb/proc/settings(mob/user) /obj/machinery/syndicatebomb/proc/settings(mob/user)
@@ -417,14 +417,14 @@
reactants += S.reagents reactants += S.reagents
if(!chem_splash(get_turf(src), spread_range, reactants, temp_boost)) if(!chem_splash(get_turf(src), spread_range, reactants, temp_boost))
playsound(loc, 'sound/items/screwdriver2.ogg', 50, 1) playsound(loc, 'sound/items/screwdriver2.ogg', 50, TRUE)
return // The Explosion didn't do anything. No need to log, or disappear. return // The Explosion didn't do anything. No need to log, or disappear.
if(adminlog) if(adminlog)
message_admins(adminlog) message_admins(adminlog)
log_game(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/)) if(loc && istype(loc, /obj/machinery/syndicatebomb/))
qdel(loc) qdel(loc)
@@ -513,7 +513,7 @@
B.detonation_timer = world.time + BUTTON_DELAY B.detonation_timer = world.time + BUTTON_DELAY
detonated++ detonated++
existent++ existent++
playsound(user, 'sound/machines/click.ogg', 20, 1) playsound(user, 'sound/machines/click.ogg', 20, TRUE)
to_chat(user, "<span class='notice'>[existent] found, [detonated] triggered.</span>") to_chat(user, "<span class='notice'>[existent] found, [detonated] triggered.</span>")
if(detonated) if(detonated)
detonated-- detonated--

View File

@@ -79,7 +79,7 @@
return return
if(!transform_dead && H.stat == DEAD) if(!transform_dead && H.stat == DEAD)
playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0) playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, FALSE)
return return
// Activate the cooldown // Activate the cooldown
@@ -87,7 +87,7 @@
cooldown_timer = world.time + cooldown_duration cooldown_timer = world.time + cooldown_duration
update_icon() update_icon()
playsound(src.loc, 'sound/items/welder.ogg', 50, 1) playsound(src.loc, 'sound/items/welder.ogg', 50, TRUE)
H.emote("scream") // It is painful H.emote("scream") // It is painful
H.adjustBruteLoss(max(0, 80 - H.getBruteLoss())) // Hurt the human, don't try to kill them though. H.adjustBruteLoss(max(0, 80 - H.getBruteLoss())) // Hurt the human, don't try to kill them though.
@@ -107,7 +107,7 @@
addtimer(CALLBACK(src, .proc/unlock_new_robot, R), 50) addtimer(CALLBACK(src, .proc/unlock_new_robot, R), 50)
/obj/machinery/transformer/proc/unlock_new_robot(mob/living/silicon/robot/R) /obj/machinery/transformer/proc/unlock_new_robot(mob/living/silicon/robot/R)
playsound(src.loc, 'sound/machines/ping.ogg', 50, 0) playsound(src.loc, 'sound/machines/ping.ogg', 50, FALSE)
sleep(30) sleep(30)
if(R) if(R)
R.SetLockdown(0) R.SetLockdown(0)

View File

@@ -134,7 +134,7 @@
var/result = step(src,direction) var/result = step(src,direction)
if(result) if(result)
if(!squeak) if(!squeak)
playsound(src, "clownstep", 70, 1) playsound(src, "clownstep", 70, TRUE)
squeak = 1 squeak = 1
else else
squeak = 0 squeak = 0

View File

@@ -310,7 +310,7 @@
syringes -= mechsyringe syringes -= mechsyringe
mechsyringe.icon = 'icons/obj/chemical.dmi' mechsyringe.icon = 'icons/obj/chemical.dmi'
mechsyringe.icon_state = "syringeproj" mechsyringe.icon_state = "syringeproj"
playsound(chassis, 'sound/items/syringeproj.ogg', 50, 1) playsound(chassis, 'sound/items/syringeproj.ogg', 50, TRUE)
log_message("Launched [mechsyringe] from [src], targeting [target].", LOG_MECHA) log_message("Launched [mechsyringe] from [src], targeting [target].", LOG_MECHA)
var/mob/originaloccupant = chassis.occupant var/mob/originaloccupant = chassis.occupant
spawn(0) spawn(0)

View File

@@ -44,11 +44,11 @@
while(do_after_mecha(target, drill_delay)) while(do_after_mecha(target, drill_delay))
if(isliving(target)) if(isliving(target))
drill_mob(target, chassis.occupant) drill_mob(target, chassis.occupant)
playsound(src,'sound/weapons/drill.ogg',40,1) playsound(src,'sound/weapons/drill.ogg',40,TRUE)
else if(isobj(target)) else if(isobj(target))
var/obj/O = target var/obj/O = target
O.take_damage(15, BRUTE, 0, FALSE, get_dir(chassis, target)) O.take_damage(15, BRUTE, 0, FALSE, get_dir(chassis, target))
playsound(src,'sound/weapons/drill.ogg',40,1) playsound(src,'sound/weapons/drill.ogg',40,TRUE)
else else
set_ready_state(TRUE) set_ready_state(TRUE)
return return

View File

@@ -201,10 +201,10 @@
var/obj/structure/reagent_dispensers/watertank/WT = target var/obj/structure/reagent_dispensers/watertank/WT = target
WT.reagents.trans_to(src, 1000) WT.reagents.trans_to(src, 1000)
occupant_message("<span class='notice'>Extinguisher refilled.</span>") 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 else
if(reagents.total_volume > 0) 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/direction = get_dir(chassis,target)
var/turf/T = get_turf(target) var/turf/T = get_turf(target)
var/turf/T1 = get_step(T,turn(direction, 90)) var/turf/T1 = get_step(T,turn(direction, 90))
@@ -273,7 +273,7 @@
target = get_turf(target) target = get_turf(target)
if(!action_checks(target) || get_dist(chassis, target)>3) if(!action_checks(target) || get_dist(chassis, target)>3)
return return
playsound(chassis, 'sound/machines/click.ogg', 50, 1) playsound(chassis, 'sound/machines/click.ogg', 50, TRUE)
switch(mode) switch(mode)
if(0) if(0)
@@ -283,34 +283,34 @@
if(do_after_cooldown(W)) if(do_after_cooldown(W))
chassis.spark_system.start() chassis.spark_system.start()
W.ScrapeAway(flags = CHANGETURF_INHERIT_AIR) W.ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
playsound(W, 'sound/items/deconstruct.ogg', 50, 1) playsound(W, 'sound/items/deconstruct.ogg', 50, TRUE)
else if(isfloorturf(target)) else if(isfloorturf(target))
var/turf/open/floor/F = target var/turf/open/floor/F = target
occupant_message("<span class='notice'>Deconstructing [F]...</span>") occupant_message("<span class='notice'>Deconstructing [F]...</span>")
if(do_after_cooldown(target)) if(do_after_cooldown(target))
chassis.spark_system.start() chassis.spark_system.start()
F.ScrapeAway(flags = CHANGETURF_INHERIT_AIR) F.ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
playsound(F, 'sound/items/deconstruct.ogg', 50, 1) playsound(F, 'sound/items/deconstruct.ogg', 50, TRUE)
else if (istype(target, /obj/machinery/door/airlock)) else if (istype(target, /obj/machinery/door/airlock))
occupant_message("<span class='notice'>Deconstructing [target]...</span>") occupant_message("<span class='notice'>Deconstructing [target]...</span>")
if(do_after_cooldown(target)) if(do_after_cooldown(target))
chassis.spark_system.start() chassis.spark_system.start()
qdel(target) qdel(target)
playsound(target, 'sound/items/deconstruct.ogg', 50, 1) playsound(target, 'sound/items/deconstruct.ogg', 50, TRUE)
if(1) if(1)
if(isspaceturf(target)) if(isspaceturf(target))
var/turf/open/space/S = target var/turf/open/space/S = target
occupant_message("<span class='notice'>Building Floor...</span>") occupant_message("<span class='notice'>Building Floor...</span>")
if(do_after_cooldown(S)) if(do_after_cooldown(S))
S.PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) S.PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
playsound(S, 'sound/items/deconstruct.ogg', 50, 1) playsound(S, 'sound/items/deconstruct.ogg', 50, TRUE)
chassis.spark_system.start() chassis.spark_system.start()
else if(isfloorturf(target)) else if(isfloorturf(target))
var/turf/open/floor/F = target var/turf/open/floor/F = target
occupant_message("<span class='notice'>Building Wall...</span>") occupant_message("<span class='notice'>Building Wall...</span>")
if(do_after_cooldown(F)) if(do_after_cooldown(F))
F.PlaceOnTop(/turf/closed/wall) F.PlaceOnTop(/turf/closed/wall)
playsound(F, 'sound/items/deconstruct.ogg', 50, 1) playsound(F, 'sound/items/deconstruct.ogg', 50, TRUE)
chassis.spark_system.start() chassis.spark_system.start()
if(2) if(2)
if(isfloorturf(target)) if(isfloorturf(target))
@@ -319,8 +319,8 @@
chassis.spark_system.start() chassis.spark_system.start()
var/obj/machinery/door/airlock/T = new /obj/machinery/door/airlock(target) var/obj/machinery/door/airlock/T = new /obj/machinery/door/airlock(target)
T.autoclose = TRUE T.autoclose = TRUE
playsound(target, 'sound/items/deconstruct.ogg', 50, 1) playsound(target, 'sound/items/deconstruct.ogg', 50, TRUE)
playsound(target, 'sound/effects/sparks2.ogg', 50, 1) playsound(target, 'sound/effects/sparks2.ogg', 50, TRUE)
@@ -393,5 +393,5 @@
N.name = M.name N.name = M.name
M.wreckage = 0 M.wreckage = 0
qdel(M) qdel(M)
playsound(get_turf(N),'sound/items/ratchet.ogg',50,1) playsound(get_turf(N),'sound/items/ratchet.ogg',50,TRUE)
return return

View File

@@ -51,7 +51,7 @@
A.preparePixelProjectile(target, chassis.occupant, params, spread) A.preparePixelProjectile(target, chassis.occupant, params, spread)
A.fire() A.fire()
playsound(chassis, fire_sound, 50, 1) playsound(chassis, fire_sound, 50, TRUE)
sleep(max(0, projectile_delay)) sleep(max(0, projectile_delay))
@@ -179,7 +179,7 @@
/obj/item/mecha_parts/mecha_equipment/weapon/honker/action(target, params) /obj/item/mecha_parts/mecha_equipment/weapon/honker/action(target, params)
if(!action_checks(target)) if(!action_checks(target))
return return
playsound(chassis, 'sound/items/airhorn.ogg', 100, 1) playsound(chassis, 'sound/items/airhorn.ogg', 100, TRUE)
chassis.occupant_message("<font color='red' size='5'>HONK</font>") chassis.occupant_message("<font color='red' size='5'>HONK</font>")
for(var/mob/living/carbon/M in ohearers(6, chassis)) for(var/mob/living/carbon/M in ohearers(6, chassis))
if(ishuman(M)) if(ishuman(M))
@@ -366,7 +366,7 @@
if(!action_checks(target)) if(!action_checks(target))
return return
var/obj/O = new projectile(chassis.loc) var/obj/O = new projectile(chassis.loc)
playsound(chassis, fire_sound, 50, 1) playsound(chassis, fire_sound, 50, TRUE)
log_message("Launched a [O.name] from [name], targeting [target].", LOG_MECHA) log_message("Launched a [O.name] from [name], targeting [target].", LOG_MECHA)
projectiles-- projectiles--
proj_init(O) proj_init(O)

View File

@@ -579,7 +579,7 @@
/obj/mecha/proc/mechturn(direction) /obj/mecha/proc/mechturn(direction)
setDir(direction) setDir(direction)
if(turnsound) if(turnsound)
playsound(src,turnsound,40,1) playsound(src,turnsound,40,TRUE)
return 1 return 1
/obj/mecha/proc/mechstep(direction) /obj/mecha/proc/mechstep(direction)
@@ -588,13 +588,13 @@
if(strafe) if(strafe)
setDir(current_dir) setDir(current_dir)
if(result && stepsound) if(result && stepsound)
playsound(src,stepsound,40,1) playsound(src,stepsound,40,TRUE)
return result return result
/obj/mecha/proc/mechsteprand() /obj/mecha/proc/mechsteprand()
var/result = step_rand(src) var/result = step_rand(src)
if(result && stepsound) if(result && stepsound)
playsound(src,stepsound,40,1) playsound(src,stepsound,40,TRUE)
return result return result
/obj/mecha/Bump(var/atom/obstacle) /obj/mecha/Bump(var/atom/obstacle)
@@ -766,7 +766,7 @@
silicon_pilot = TRUE silicon_pilot = TRUE
icon_state = initial(icon_state) icon_state = initial(icon_state)
update_icon() update_icon()
playsound(src, 'sound/machines/windowdoor.ogg', 50, 1) playsound(src, 'sound/machines/windowdoor.ogg', 50, TRUE)
if(!internal_damage) if(!internal_damage)
SEND_SOUND(occupant, sound('sound/mecha/nominal.ogg',volume=50)) SEND_SOUND(occupant, sound('sound/mecha/nominal.ogg',volume=50))
AI.cancel_camera() AI.cancel_camera()
@@ -894,7 +894,7 @@
log_message("[H] moved in as pilot.", LOG_MECHA) log_message("[H] moved in as pilot.", LOG_MECHA)
icon_state = initial(icon_state) icon_state = initial(icon_state)
setDir(dir_in) setDir(dir_in)
playsound(src, 'sound/machines/windowdoor.ogg', 50, 1) playsound(src, 'sound/machines/windowdoor.ogg', 50, TRUE)
if(!internal_damage) if(!internal_damage)
SEND_SOUND(occupant, sound('sound/mecha/nominal.ogg',volume=50)) SEND_SOUND(occupant, sound('sound/mecha/nominal.ogg',volume=50))
return 1 return 1
@@ -1115,7 +1115,7 @@ GLOBAL_VAR_INIT(year_integer, text2num(year)) // = 2013???
gun.projectiles = gun.projectiles + ammo_needed gun.projectiles = gun.projectiles + ammo_needed
else else
gun.projectiles_cache = gun.projectiles_cache + ammo_needed gun.projectiles_cache = gun.projectiles_cache + ammo_needed
playsound(get_turf(user),A.load_audio,50,1) playsound(get_turf(user),A.load_audio,50,TRUE)
to_chat(user, "<span class='notice'>You add [ammo_needed] [A.round_term][ammo_needed > 1?"s":""] to the [gun.name]</span>") to_chat(user, "<span class='notice'>You add [ammo_needed] [A.round_term][ammo_needed > 1?"s":""] to the [gun.name]</span>")
A.rounds = A.rounds - ammo_needed A.rounds = A.rounds - ammo_needed
A.update_name() A.update_name()
@@ -1126,7 +1126,7 @@ GLOBAL_VAR_INIT(year_integer, text2num(year)) // = 2013???
gun.projectiles = gun.projectiles + A.rounds gun.projectiles = gun.projectiles + A.rounds
else else
gun.projectiles_cache = gun.projectiles_cache + A.rounds gun.projectiles_cache = gun.projectiles_cache + A.rounds
playsound(get_turf(user),A.load_audio,50,1) playsound(get_turf(user),A.load_audio,50,TRUE)
to_chat(user, "<span class='notice'>You add [A.rounds] [A.round_term][A.rounds > 1?"s":""] to the [gun.name]</span>") to_chat(user, "<span class='notice'>You add [A.rounds] [A.round_term][A.rounds > 1?"s":""] to the [gun.name]</span>")
A.rounds = 0 A.rounds = 0
A.update_name() A.update_name()

View File

@@ -251,7 +251,7 @@
chassis.occupant_message("<span class='notice'>A bone-chillingly thick plasteel needle protracts from the exosuit's palm.</span>") chassis.occupant_message("<span class='notice'>A bone-chillingly thick plasteel needle protracts from the exosuit's palm.</span>")
chassis.damtype = new_damtype chassis.damtype = new_damtype
button_icon_state = "mech_damtype_[new_damtype]" button_icon_state = "mech_damtype_[new_damtype]"
playsound(src, 'sound/mecha/mechmove01.ogg', 50, 1) playsound(src, 'sound/mecha/mechmove01.ogg', 50, TRUE)
UpdateButtonIcon() UpdateButtonIcon()
/datum/action/innate/mecha/mech_toggle_phasing /datum/action/innate/mecha/mech_toggle_phasing

View File

@@ -998,7 +998,7 @@
return FALSE return FALSE
if(istype(I, /obj/item/bikehorn)) if(istype(I, /obj/item/bikehorn))
playsound(parent, 'sound/items/bikehorn.ogg', 50, 1) playsound(parent, 'sound/items/bikehorn.ogg', 50, TRUE)
user.visible_message("<span class='danger'>HONK!</span>") user.visible_message("<span class='danger'>HONK!</span>")
//TODO: better messages. //TODO: better messages.

View File

@@ -59,7 +59,7 @@
return return
user.changeNext_move(CLICK_CD_MELEE) // Ugh. Ideally we shouldn't be setting cooldowns outside of click code. user.changeNext_move(CLICK_CD_MELEE) // Ugh. Ideally we shouldn't be setting cooldowns outside of click code.
user.do_attack_animation(src, ATTACK_EFFECT_PUNCH) 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='danger'>[user] hits [name]. Nothing happens.</span>", null, null, COMBAT_MESSAGE_RANGE) user.visible_message("<span class='danger'>[user] hits [name]. Nothing happens.</span>", null, null, COMBAT_MESSAGE_RANGE)
log_message("Attack by hand/paw. Attacker - [user].", LOG_MECHA, color="red") log_message("Attack by hand/paw. Attacker - [user].", LOG_MECHA, color="red")
@@ -68,7 +68,7 @@
/obj/mecha/attack_alien(mob/living/user) /obj/mecha/attack_alien(mob/living/user)
log_message("Attack by alien. Attacker - [user].", LOG_MECHA, color="red") log_message("Attack by alien. Attacker - [user].", LOG_MECHA, color="red")
playsound(src.loc, 'sound/weapons/slash.ogg', 100, 1) playsound(src.loc, 'sound/weapons/slash.ogg', 100, TRUE)
attack_generic(user, 15, BRUTE, "melee", 0) attack_generic(user, 15, BRUTE, "melee", 0)
/obj/mecha/attack_animal(mob/living/simple_animal/user) /obj/mecha/attack_animal(mob/living/simple_animal/user)
@@ -80,7 +80,7 @@
var/play_soundeffect = 1 var/play_soundeffect = 1
if(user.environment_smash) if(user.environment_smash)
play_soundeffect = 0 play_soundeffect = 0
playsound(src, 'sound/effects/bang.ogg', 50, 1) playsound(src, 'sound/effects/bang.ogg', 50, TRUE)
var/animal_damage = rand(user.melee_damage_lower,user.melee_damage_upper) var/animal_damage = rand(user.melee_damage_lower,user.melee_damage_upper)
if(user.obj_damage) if(user.obj_damage)
animal_damage = user.obj_damage animal_damage = user.obj_damage
@@ -287,7 +287,7 @@
to_chat(user, "<span class='warning'>The [name] is at full integrity!</span>") to_chat(user, "<span class='warning'>The [name] is at full integrity!</span>")
/obj/mecha/proc/mech_toxin_damage(mob/living/target) /obj/mecha/proc/mech_toxin_damage(mob/living/target)
playsound(src, 'sound/effects/spray2.ogg', 50, 1) playsound(src, 'sound/effects/spray2.ogg', 50, TRUE)
if(target.reagents) if(target.reagents)
if(target.reagents.get_reagent_amount(/datum/reagent/cryptobiolin) + force < force*2) if(target.reagents.get_reagent_amount(/datum/reagent/cryptobiolin) + force < force*2)
target.reagents.add_reagent(/datum/reagent/cryptobiolin, force/2) target.reagents.add_reagent(/datum/reagent/cryptobiolin, force/2)

View File

@@ -3,17 +3,17 @@
/obj/mecha/medical/mechturn(direction) /obj/mecha/medical/mechturn(direction)
setDir(direction) setDir(direction)
playsound(src,'sound/mecha/mechmove01.ogg',40,1) playsound(src,'sound/mecha/mechmove01.ogg',40,TRUE)
return 1 return 1
/obj/mecha/medical/mechstep(direction) /obj/mecha/medical/mechstep(direction)
var/result = step(src,direction) var/result = step(src,direction)
if(result) if(result)
playsound(src,'sound/mecha/mechstep.ogg',25,1) playsound(src,'sound/mecha/mechstep.ogg',25,TRUE)
return result return result
/obj/mecha/medical/mechsteprand() /obj/mecha/medical/mechsteprand()
var/result = step_rand(src) var/result = step_rand(src)
if(result) if(result)
playsound(src,'sound/mecha/mechstep.ogg',25,1) playsound(src,'sound/mecha/mechstep.ogg',25,TRUE)
return result return result

View File

@@ -38,7 +38,7 @@
return 0 return 0
if(prob(5)) if(prob(5))
playsound(loc, 'sound/items/welder.ogg', 100, 1) playsound(loc, 'sound/items/welder.ogg', 100, TRUE)
for(var/obj/O in target) for(var/obj/O in target)
if(prob(20) && !(resistance_flags & UNACIDABLE)) if(prob(20) && !(resistance_flags & UNACIDABLE))
@@ -61,7 +61,7 @@
var/acid_used = min(acid_level*0.05, 20) var/acid_used = min(acid_level*0.05, 20)
if(L.acid_act(10, acid_used, "feet")) if(L.acid_act(10, acid_used, "feet"))
acid_level = max(0, acid_level - acid_used*10) acid_level = max(0, acid_level - acid_used*10)
playsound(L, 'sound/weapons/sear.ogg', 50, 1) playsound(L, 'sound/weapons/sear.ogg', 50, TRUE)
to_chat(L, "<span class='userdanger'>[src] burns you!</span>") to_chat(L, "<span class='userdanger'>[src] burns you!</span>")
//xenomorph corrosive acid //xenomorph corrosive acid
@@ -73,7 +73,7 @@
. = ..() . = ..()
if(.) if(.)
if(prob(45)) if(prob(45))
playsound(loc, 'sound/items/welder.ogg', 100, 1) playsound(loc, 'sound/items/welder.ogg', 100, TRUE)
target_strength-- target_strength--
if(target_strength <= 0) if(target_strength <= 0)
target.visible_message("<span class='warning'>[target] collapses under its own weight into a puddle of goop and undigested debris!</span>") target.visible_message("<span class='warning'>[target] collapses under its own weight into a puddle of goop and undigested debris!</span>")

View File

@@ -215,7 +215,7 @@
var/turf/FROM = T // the turf of origin we're travelling FROM var/turf/FROM = T // the turf of origin we're travelling FROM
var/turf/TO = get_turf(chosen) // the turf of origin we're travelling TO var/turf/TO = get_turf(chosen) // the turf of origin we're travelling TO
playsound(TO, 'sound/effects/phasein.ogg', 100, 1) playsound(TO, 'sound/effects/phasein.ogg', 100, TRUE)
priority_announce("Massive bluespace translocation detected.", "Anomaly Alert") priority_announce("Massive bluespace translocation detected.", "Anomaly Alert")
var/list/flashers = list() var/list/flashers = list()

View File

@@ -103,7 +103,7 @@
if(ruined) if(ruined)
return return
visible_message("<span class='notice'>[user] rips [src] in a single, decisive motion!</span>" ) visible_message("<span class='notice'>[user] rips [src] in a single, decisive motion!</span>" )
playsound(src.loc, 'sound/items/poster_ripped.ogg', 100, 1) playsound(src.loc, 'sound/items/poster_ripped.ogg', 100, TRUE)
var/obj/structure/sign/poster/ripped/R = new(loc) var/obj/structure/sign/poster/ripped/R = new(loc)
R.pixel_y = pixel_y R.pixel_y = pixel_y
@@ -149,7 +149,7 @@
flick("poster_being_set",D) flick("poster_being_set",D)
D.forceMove(src) D.forceMove(src)
qdel(P) //delete it now to cut down on sanity checks afterwards. Agouri's code supports rerolling it anyway qdel(P) //delete it now to cut down on sanity checks afterwards. Agouri's code supports rerolling it anyway
playsound(D.loc, 'sound/items/poster_being_created.ogg', 100, 1) playsound(D.loc, 'sound/items/poster_being_created.ogg', 100, TRUE)
if(do_after(user, PLACE_SPEED, target=src)) if(do_after(user, PLACE_SPEED, target=src))
if(!D || QDELETED(D)) if(!D || QDELETED(D))

View File

@@ -74,7 +74,7 @@
/obj/effect/decal/cleanable/blood/gibs/Crossed(mob/living/L) /obj/effect/decal/cleanable/blood/gibs/Crossed(mob/living/L)
if(istype(L) && has_gravity(loc)) if(istype(L) && has_gravity(loc))
playsound(loc, 'sound/effects/gib_step.ogg', HAS_TRAIT(L, TRAIT_LIGHT_STEP) ? 20 : 50, 1) playsound(loc, 'sound/effects/gib_step.ogg', HAS_TRAIT(L, TRAIT_LIGHT_STEP) ? 20 : 50, TRUE)
. = ..() . = ..()
/obj/effect/decal/cleanable/blood/gibs/proc/streak(list/directions) /obj/effect/decal/cleanable/blood/gibs/proc/streak(list/directions)

View File

@@ -124,7 +124,7 @@
if(ishuman(user)) if(ishuman(user))
var/mob/living/carbon/human/H = user var/mob/living/carbon/human/H = user
if(isflyperson(H)) if(isflyperson(H))
playsound(get_turf(src), 'sound/items/drink.ogg', 50, 1) //slurp playsound(get_turf(src), 'sound/items/drink.ogg', 50, TRUE) //slurp
H.visible_message("<span class='alert'>[H] extends a small proboscis into the vomit pool, sucking it with a slurping sound.</span>") H.visible_message("<span class='alert'>[H] extends a small proboscis into the vomit pool, sucking it with a slurping sound.</span>")
if(reagents) if(reagents)
for(var/datum/reagent/R in reagents.reagent_list) for(var/datum/reagent/R in reagents.reagent_list)

View File

@@ -5,7 +5,7 @@
/obj/effect/decal/remains/acid_act() /obj/effect/decal/remains/acid_act()
visible_message("<span class='warning'>[src] dissolve[gender==PLURAL?"":"s"] into a puddle of sizzling goop!</span>") visible_message("<span class='warning'>[src] dissolve[gender==PLURAL?"":"s"] into a puddle of sizzling goop!</span>")
playsound(src, 'sound/items/welder.ogg', 150, 1) playsound(src, 'sound/items/welder.ogg', 150, TRUE)
new /obj/effect/decal/cleanable/greenglow(drop_location()) new /obj/effect/decal/cleanable/greenglow(drop_location())
qdel(src) qdel(src)

View File

@@ -92,7 +92,7 @@
. = ..() . = ..()
create_reagents(1000) //limited by the size of the reagent holder anyway. create_reagents(1000) //limited by the size of the reagent holder anyway.
START_PROCESSING(SSfastprocess, src) START_PROCESSING(SSfastprocess, src)
playsound(src, 'sound/effects/bubbles2.ogg', 80, 1, -3) playsound(src, 'sound/effects/bubbles2.ogg', 80, TRUE, -3)
/obj/effect/particle_effect/foam/ComponentInitialize() /obj/effect/particle_effect/foam/ComponentInitialize()
. = ..() . = ..()
@@ -281,7 +281,7 @@
return attack_hand(user) return attack_hand(user)
/obj/structure/foamedmetal/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) /obj/structure/foamedmetal/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
playsound(src.loc, 'sound/weapons/tap.ogg', 100, 1) playsound(src.loc, 'sound/weapons/tap.ogg', 100, TRUE)
/obj/structure/foamedmetal/attack_hand(mob/user) /obj/structure/foamedmetal/attack_hand(mob/user)
. = ..() . = ..()
@@ -290,7 +290,7 @@
user.changeNext_move(CLICK_CD_MELEE) user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src, ATTACK_EFFECT_PUNCH) user.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
to_chat(user, "<span class='warning'>You hit [src] but bounce off it!</span>") to_chat(user, "<span class='warning'>You hit [src] but bounce off it!</span>")
playsound(src.loc, 'sound/weapons/tap.ogg', 100, 1) playsound(src.loc, 'sound/weapons/tap.ogg', 100, TRUE)
/obj/structure/foamedmetal/CanPass(atom/movable/mover, turf/target) /obj/structure/foamedmetal/CanPass(atom/movable/mover, turf/target)
return !density return !density

View File

@@ -163,7 +163,7 @@
/obj/structure/glowshroom/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) /obj/structure/glowshroom/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
if(damage_type == BURN && damage_amount) if(damage_type == BURN && damage_amount)
playsound(src.loc, 'sound/items/welder.ogg', 100, 1) playsound(src.loc, 'sound/items/welder.ogg', 100, TRUE)
/obj/structure/glowshroom/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) /obj/structure/glowshroom/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > 300) if(exposed_temperature > 300)

View File

@@ -83,7 +83,7 @@
var/sound = 'sound/items/bikehorn.ogg' var/sound = 'sound/items/bikehorn.ogg'
/obj/effect/mine/sound/mineEffect(mob/victim) /obj/effect/mine/sound/mineEffect(mob/victim)
playsound(loc, sound, 100, 1) playsound(loc, sound, 100, TRUE)
/obj/effect/mine/sound/bwoink /obj/effect/mine/sound/bwoink

View File

@@ -10,7 +10,7 @@
new /obj/structure/alien/egg(T) new /obj/structure/alien/egg(T)
new /obj/effect/temp_visual/gravpush(T) new /obj/effect/temp_visual/gravpush(T)
playsound(T, 'sound/items/party_horn.ogg', 50, 1, -1) playsound(T, 'sound/items/party_horn.ogg', 50, TRUE, -1)
message_admins("An alien egg has been delivered to [ADMIN_VERBOSEJMP(T)].") message_admins("An alien egg has been delivered to [ADMIN_VERBOSEJMP(T)].")
log_game("An alien egg has been delivered to [AREACOORD(T)]") log_game("An alien egg has been delivered to [AREACOORD(T)]")

View File

@@ -11,7 +11,7 @@
/obj/structure/spider/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) /obj/structure/spider/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
if(damage_type == BURN)//the stickiness of the web mutes all attack sounds except fire damage type if(damage_type == BURN)//the stickiness of the web mutes all attack sounds except fire damage type
playsound(loc, 'sound/items/welder.ogg', 100, 1) playsound(loc, 'sound/items/welder.ogg', 100, TRUE)
/obj/structure/spider/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) /obj/structure/spider/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)

View File

@@ -486,7 +486,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
src.add_fingerprint(user) src.add_fingerprint(user)
playsound(loc, src.hitsound, 30, 1, -1) playsound(loc, src.hitsound, 30, TRUE, -1)
user.do_attack_animation(M) user.do_attack_animation(M)
@@ -620,7 +620,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
if(damtype == BURN) if(damtype == BURN)
. = 'sound/weapons/sear.ogg' . = 'sound/weapons/sear.ogg'
else else
. = pick('sound/misc/desceration-01.ogg', 'sound/misc/desceration-02.ogg', 'sound/misc/desceration-03.ogg') . = "desceration"
/obj/item/proc/open_flame(flame_heat=700) /obj/item/proc/open_flame(flame_heat=700)
var/turf/location = loc var/turf/location = loc
@@ -787,7 +787,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
if(islist(usesound)) if(islist(usesound))
played_sound = pick(usesound) played_sound = pick(usesound)
playsound(target, played_sound, volume, 1) playsound(target, played_sound, volume, TRUE)
// Used in a callback that is passed by use_tool into do_after call. Do not override, do not call manually. // Used in a callback that is passed by use_tool into do_after call. Do not override, do not call manually.
/obj/item/proc/tool_check_callback(mob/living/user, amount, datum/callback/extra_checks) /obj/item/proc/tool_check_callback(mob/living/user, amount, datum/callback/extra_checks)

View File

@@ -518,7 +518,7 @@ AI MODULES
/obj/item/aiModule/toyAI/attack_self(mob/user) /obj/item/aiModule/toyAI/attack_self(mob/user)
laws[1] = generate_ion_law() laws[1] = generate_ion_law()
to_chat(user, "<span class='notice'>You press the button on [src].</span>") to_chat(user, "<span class='notice'>You press the button on [src].</span>")
playsound(user, 'sound/machines/click.ogg', 20, 1) playsound(user, 'sound/machines/click.ogg', 20, TRUE)
src.loc.visible_message("<span class='warning'>[icon2html(src, viewers(loc))] [laws[1]]</span>") src.loc.visible_message("<span class='warning'>[icon2html(src, viewers(loc))] [laws[1]]</span>")
/******************** Mother Drone ******************/ /******************** Mother Drone ******************/

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