cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate

Browse Source
This commit is contained in:
izac112
2020-05-21 21:17:58 +02:00
parent 6f082b9817 7a78ea227d
commit e684df5236
460 changed files with 14753 additions and 14885 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/ATMOSPHERICS/components/unary/vent_pump.dm
View File

@@ -396,7 +396,7 @@
to_chat(user, "<span class='notice'>Now welding the vent.</span>")
if(do_after(user, 20 * WT.toolspeed))
if(!src || !WT.isOn()) return
playsound(src.loc, WT.usesound, 50, 1)
playsound(src, WT.usesound, 50, 1)
if(!welded)
user.visible_message("<span class='notice'>\The [user] welds the vent shut.</span>", "<span class='notice'>You weld the vent shut.</span>", "You hear welding.")
welded = 1

2
code/ATMOSPHERICS/pipes/simple.dm
View File

@@ -78,7 +78,7 @@
/obj/machinery/atmospherics/pipe/simple/proc/burst()
src.visible_message("<span class='danger'>\The [src] bursts!</span>");
playsound(src.loc, 'sound/effects/bang.ogg', 25, 1)
playsound(src, 'sound/effects/bang.ogg', 25, 1)
var/datum/effect/effect/system/smoke_spread/smoke = new
smoke.set_up(1,0, src.loc, 0)
smoke.start()

6
code/ZAS/Airflow.dm
View File

@@ -97,7 +97,7 @@ atom/movable/proc/airflow_hit(atom/A)
mob/airflow_hit(atom/A)
for(var/mob/M in hearers(src))
M.show_message("<span class='danger'>\The [src] slams into \a [A]!</span>",1,"<span class='danger'>You hear a loud slam!</span>",2)
playsound(src.loc, "smash.ogg", 25, 1, -1)
playsound(src, "smash.ogg", 25, 1, -1)
var/weak_amt = istype(A,/obj/item) ? A:w_class : rand(1,5) //Heheheh
Weaken(weak_amt)
. = ..()
@@ -105,7 +105,7 @@ mob/airflow_hit(atom/A)
obj/airflow_hit(atom/A)
for(var/mob/M in hearers(src))
M.show_message("<span class='danger'>\The [src] slams into \a [A]!</span>",1,"<span class='danger'>You hear a loud slam!</span>",2)
playsound(src.loc, "smash.ogg", 25, 1, -1)
playsound(src, "smash.ogg", 25, 1, -1)
. = ..()
obj/item/airflow_hit(atom/A)
@@ -115,7 +115,7 @@ obj/item/airflow_hit(atom/A)
mob/living/carbon/human/airflow_hit(atom/A)
// for(var/mob/M in hearers(src))
// M.show_message("<span class='danger'>[src] slams into [A]!</span>",1,"<span class='danger'>You hear a loud slam!</span>",2)
playsound(src.loc, "punch", 25, 1, -1)
playsound(src, "punch", 25, 1, -1)
if (prob(33))
loc:add_blood(src)
bloody_body(src)

2
code/_onclick/click.dm
View File

@@ -308,7 +308,7 @@
var/obj/item/projectile/beam/LE = new (T)
LE.icon = 'icons/effects/genetics.dmi'
LE.icon_state = "eyelasers"
playsound(usr.loc, 'sound/weapons/taser2.ogg', 75, 1)
playsound(src, 'sound/weapons/taser2.ogg', 75, 1)
LE.firer = src
LE.preparePixelProjectile(A, src, params)
LE.fire()

6
code/_onclick/hud/skybox.dm
View File

@@ -49,9 +49,9 @@
if(old_z != new_z)
client?.update_skybox(TRUE)
/mob/doMove()
if((. = ..()))
client?.update_skybox()
/mob/Moved()
. = ..()
client?.update_skybox()
/mob/set_viewsize()
. = ..()

2
code/_onclick/item_attack.dm
View File

@@ -98,7 +98,7 @@ avoid code duplication. This includes items that may sometimes act as a standard
/obj/item/proc/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone, var/attack_modifier)
user.break_cloak()
if(hitsound)
playsound(loc, hitsound, 50, 1, -1)
playsound(src, hitsound, 50, 1, -1)
var/power = force
for(var/datum/modifier/M in user.modifiers)

1
code/controllers/subsystems/mobs.dm
View File

@@ -42,6 +42,7 @@ SUBSYSTEM_DEF(mobs)
if(!M || QDELETED(M))
mob_list -= M
continue
else if(M.low_priority && !(process_z[get_z(M)]))
slept_mobs++
continue

16
code/controllers/subsystems/open_space.dm
View File

@@ -79,22 +79,6 @@ SUBSYSTEM_DEF(open_space)
/datum/controller/subsystem/open_space/stat_entry(msg_prefix)
return ..("T [turfs_to_process.len]")
/turf/Entered(atom/movable/AM)
. = ..()
if(GLOB.open_space_initialised && !AM.invisibility && isobj(AM))
var/turf/T = GetAbove(src)
if(isopenspace(T))
// log_debug("[T] ([T.x],[T.y],[T.z]) queued for update for [src].Entered([AM])")
SSopen_space.add_turf(T, 1)
/turf/Exited(atom/movable/AM)
. = ..()
if(GLOB.open_space_initialised && !AM.invisibility && isobj(AM))
var/turf/T = GetAbove(src)
if(isopenspace(T))
// log_debug("[T] ([T.x],[T.y],[T.z]) queued for update for [src].Exited([AM])")
SSopen_space.add_turf(T, 1)
/obj/update_icon()
. = ..()
if(GLOB.open_space_initialised && !invisibility && isturf(loc))

3
code/controllers/subsystems/time_track.dm
View File

@@ -30,8 +30,11 @@ SUBSYSTEM_DEF(time_track)
time_dilation_avg_fast = MC_AVERAGE_FAST(time_dilation_avg_fast, time_dilation_current)
time_dilation_avg = MC_AVERAGE(time_dilation_avg, time_dilation_avg_fast)
time_dilation_avg_slow = MC_AVERAGE_SLOW(time_dilation_avg_slow, time_dilation_avg)
log_game("TIDI: [time_dilation_current];[time_dilation_avg_fast];[time_dilation_avg];[time_dilation_avg_slow]")
else
first_run = FALSE
log_debug("TiDi Starting Log")
last_tick_realtime = current_realtime
last_tick_byond_time = current_byondtime
last_tick_tickcount = current_tickcount

8
code/game/antagonist/antagonist_helpers.dm
View File

@@ -12,8 +12,12 @@
return FALSE
if(avoid_silicons)
var/datum/job/J = SSjob.get_job(player.assigned_role)
if(J.mob_type & JOB_SILICON)
return FALSE
if(J)
if(J.mob_type & JOB_SILICON)
return FALSE
else // If SSjob couldn't find a job, they don't have one yet, so the next best thing we can switch on are job preferences
if((player.current.client.prefs.job_engsec_high | player.current.client.prefs.job_engsec_med | player.current.client.prefs.job_engsec_low) & (AI | CYBORG)) // If they have ANY chance of being silicon
return FALSE
return TRUE
/datum/antagonist/proc/antags_are_dead()

1
code/game/area/Space Station 13 areas.dm
View File

@@ -25,6 +25,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
requires_power = 1
always_unpowered = 1
dynamic_lighting = 0
has_gravity = 0
power_light = 0
power_equip = 0
power_environ = 0

2
code/game/area/areas.dm
View File

@@ -420,7 +420,7 @@ var/list/mob/living/forced_ambiance_list = new
H.AdjustStunned(3)
H.AdjustWeakened(3)
to_chat(mob, "<span class='notice'>The sudden appearance of gravity makes you fall to the floor!</span>")
playsound(get_turf(src), "bodyfall", 50, 1)
playsound(mob, "bodyfall", 50, 1)
/area/proc/prison_break(break_lights = TRUE, open_doors = TRUE, open_blast_doors = TRUE)
var/obj/machinery/power/apc/theAPC = get_apc()

4
code/game/gamemodes/changeling/powers/armblade.dm
View File

@@ -113,11 +113,11 @@
/obj/item/weapon/melee/changeling/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
if(default_parry_check(user, attacker, damage_source) && prob(defend_chance))
user.visible_message("<span class='danger'>\The [user] parries [attack_text] with \the [src]!</span>")
playsound(user.loc, 'sound/weapons/slash.ogg', 50, 1)
playsound(src, 'sound/weapons/slash.ogg', 50, 1)
return 1
if(unique_parry_check(user, attacker, damage_source) && prob(projectile_parry_chance))
user.visible_message("<span class='danger'>\The [user] deflects [attack_text] with \the [src]!</span>")
playsound(user.loc, 'sound/weapons/slash.ogg', 50, 1)
playsound(src, 'sound/weapons/slash.ogg', 50, 1)
return 1
return 0

2
code/game/gamemodes/cult/construct_spells.dm
View File

@@ -537,7 +537,7 @@ proc/findNullRod(var/atom/target)
new_projectile.fire()
log_and_message_admins("has casted [src] at \the [hit_atom].")
if(fire_sound)
playsound(get_turf(src), fire_sound, 75, 1)
playsound(src, fire_sound, 75, 1)
return 1
return 0

2
code/game/gamemodes/cult/cult_items.dm
View File

@@ -35,7 +35,7 @@
throw_at(get_edge_target_turf(src, pick(alldirs)), rand(1,3), throw_speed)
var/spooky = pick('sound/hallucinations/growl1.ogg', 'sound/hallucinations/growl2.ogg', 'sound/hallucinations/growl3.ogg', 'sound/hallucinations/wail.ogg')
playsound(loc, spooky, 50, 1)
playsound(src, spooky, 50, 1)
return 1

8
code/game/gamemodes/cult/cult_structures.dm
View File

@@ -57,7 +57,7 @@
if(prob(1+ damage * 5))
visible_message("<span class='danger'>[shatter_message]</span>")
STOP_PROCESSING(SSobj, src)
playsound(get_turf(src),shatter_sound, 75, 1)
playsound(src,shatter_sound, 75, 1)
isbroken = 1
density = 0
icon_state = "[initial(icon_state)]-broken"
@@ -73,21 +73,21 @@
)
STOP_PROCESSING(SSobj, src)
user.do_attack_animation(src)
playsound(get_turf(src),shatter_sound, 75, 1)
playsound(src,shatter_sound, 75, 1)
isbroken = 1
density = 0
icon_state = "[initial(icon_state)]-broken"
set_light(0)
else
to_chat(user, "You hit \the [src]!")
playsound(get_turf(src),impact_sound, 75, 1)
playsound(src,impact_sound, 75, 1)
else
if(prob(damage * 2))
to_chat(user, "You pulverize what was left of \the [src]!")
qdel(src)
else
to_chat(user, "You hit \the [src]!")
playsound(get_turf(src),impact_sound, 75, 1)
playsound(src,impact_sound, 75, 1)
/obj/structure/cult/pylon/proc/repair(mob/user as mob)
if(isbroken)

2
code/game/gamemodes/events/dust.dm
View File

@@ -95,7 +95,7 @@ The "dust" will damage the hull of the station causin minor hull breaches.
if(!M.stat && !istype(M, /mob/living/silicon/ai))
shake_camera(M, 3, 1)
if (A)
playsound(src.loc, 'sound/effects/meteorimpact.ogg', 40, 1)
playsound(src, 'sound/effects/meteorimpact.ogg', 40, 1)
if(ismob(A))
A.ex_act(strength)//This should work for now I guess

4
code/game/gamemodes/events/holidays/Christmas.dm
View File

@@ -40,7 +40,7 @@
"What do you get from eating tree decorations?\n\n<i>Tinsilitis!</i>",
"What do snowmen wear on their heads?\n\n<i>Ice caps!</i>",
"Why is Christmas just like life on ss13?\n\n<i>You do all the work and the fat guy gets all the credit.</i>",
"Why doesn<EFBFBD>t Santa have any children?\n\n<i>Because he only comes down the chimney.</i>")
"Why doesn't Santa have any children?\n\n<i>Because he only comes down the chimney.</i>")
new /obj/item/clothing/head/festive(target.loc)
user.update_icons()
cracked = 1
@@ -49,7 +49,7 @@
other_half.cracked = 1
other_half.icon_state = "cracker2"
target.put_in_active_hand(other_half)
playsound(user, 'sound/effects/snap.ogg', 50, 1)
playsound(src, 'sound/effects/snap.ogg', 50, 1)
return 1
return ..()

4
code/game/gamemodes/nuclear/pinpointer.dm
View File

@@ -211,7 +211,7 @@
/obj/item/weapon/pinpointer/nukeop/proc/workdisk()
if(bomb_set) //If the bomb is set, lead to the shuttle
mode = 1 //Ensures worklocation() continues to work
playsound(loc, 'sound/machines/twobeep.ogg', 50, 1) //Plays a beep
playsound(src, 'sound/machines/twobeep.ogg', 50, 1) //Plays a beep
visible_message("<span class='notice'>Shuttle Locator active.</span>") //Lets the mob holding it know that the mode has changed
return //Get outta here
@@ -236,7 +236,7 @@
/obj/item/weapon/pinpointer/nukeop/proc/worklocation()
if(!bomb_set)
mode = 0
playsound(loc, 'sound/machines/twobeep.ogg', 50, 1)
playsound(src, 'sound/machines/twobeep.ogg', 50, 1)
visible_message("<span class='notice'>Authentication Disk Locator active.</span>")
return

2
code/game/gamemodes/technomancer/devices/shield_armor.dm
View File

@@ -70,7 +70,7 @@
to_chat(user, "<span class='warning'>Your shield has absorbed most of \the [damage_source].</span>")
spark_system.start()
playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1)
playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
return 0 // This shield does not block all damage, so returning 0 is needed to tell the game to apply the new damage.
/obj/item/clothing/suit/armor/shield/attack_self(mob/user)

2
code/game/gamemodes/technomancer/devices/tesla_armor.dm
View File

@@ -81,4 +81,4 @@
lightning.old_style_target(target)
lightning.fire()
visible_message("<span class='danger'>\The [src] strikes \the [target] with lightning!</span>")
playsound(get_turf(src), 'sound/weapons/gauss_shoot.ogg', 75, 1)
playsound(src, 'sound/weapons/gauss_shoot.ogg', 75, 1)

2
code/game/gamemodes/technomancer/spells/audible_deception.dm
View File

@@ -75,7 +75,7 @@
/obj/item/weapon/spell/audible_deception/on_ranged_cast(atom/hit_atom, mob/living/user)
var/turf/T = get_turf(hit_atom)
if(selected_sound && pay_energy(200))
playsound(T, selected_sound, 80, 1, -1)
playsound(hit_atom, selected_sound, 80, 1, -1)
adjust_instability(1)
// Air Horn time.
if(selected_sound == 'sound/items/AirHorn.ogg' && pay_energy(3800))

2
code/game/gamemodes/technomancer/spells/instability_tap.dm
View File

@@ -26,5 +26,5 @@
else
core.give_energy(amount)
adjust_instability(50)
playsound(get_turf(src), 'sound/effects/supermatter.ogg', 75, 1)
playsound(src, 'sound/effects/supermatter.ogg', 75, 1)
qdel(src)

2
code/game/gamemodes/technomancer/spells/oxygenate.dm
View File

@@ -29,5 +29,5 @@
if(pay_energy(1500))
T.assume_gas("oxygen", 200)
T.assume_gas("nitrogen", 800)
playsound(src.loc, 'sound/effects/spray.ogg', 50, 1, -3)
playsound(src, 'sound/effects/spray.ogg', 50, 1, -3)
adjust_instability(10)

2
code/game/gamemodes/technomancer/spells/projectile/projectile.dm
View File

@@ -16,7 +16,7 @@
new_projectile.fire()
log_and_message_admins("has casted [src] at \the [hit_atom].")
if(fire_sound)
playsound(get_turf(src), fire_sound, 75, 1)
playsound(src, fire_sound, 75, 1)
adjust_instability(instability_per_shot)
return 1
return 0

4
code/game/gamemodes/technomancer/spells/reflect.dm
View File

@@ -60,7 +60,7 @@
P.damage = P.damage * 1.5
spark_system.start()
playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1)
playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
// now send a log so that admins don't think they're shooting themselves on purpose.
log_and_message_admins("[user] reflected [attacker]'s attack back at them.")
@@ -80,7 +80,7 @@
on the same side, and hits you!</span>")
spark_system.start()
playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1)
playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
log_and_message_admins("[user] reflected [attacker]'s attack back at them.")

2
code/game/gamemodes/technomancer/spells/shield.dm
View File

@@ -55,7 +55,7 @@
if(check_shield_arc(user, bad_arc, damage_source, attacker))
user.visible_message("<span class='danger'>\The [user]'s [src] blocks [attack_text]!</span>")
spark_system.start()
playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1)
playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
adjust_instability(2)
return 1
return 0

2
code/game/machinery/CableLayer.dm
View File

@@ -41,7 +41,7 @@
m = min(m, cable.amount)
m = min(m, 30)
if(m)
playsound(src.loc, O.usesound, 50, 1)
playsound(src, O.usesound, 50, 1)
use_cable(m)
var/obj/item/stack/cable_coil/CC = new (get_turf(src))
CC.amount = m

4
code/game/machinery/air_alarm.dm
View File

@@ -192,7 +192,7 @@
regulating_temperature = 1
audible_message("\The [src] clicks as it starts [environment.temperature > target_temperature ? "cooling" : "heating"] the room.",\
"You hear a click and a faint electronic hum.")
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
playsound(src, 'sound/machines/click.ogg', 50, 1)
else
//check for when we should stop adjusting temperature
if(get_danger_level(target_temperature, TLV["temperature"]) || abs(environment.temperature - target_temperature) <= 0.5)
@@ -200,7 +200,7 @@
regulating_temperature = 0
audible_message("\The [src] clicks quietly as it stops [environment.temperature > target_temperature ? "cooling" : "heating"] the room.",\
"You hear a click as a faint electronic humming stops.")
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
playsound(src, 'sound/machines/click.ogg', 50, 1)
if(regulating_temperature)
if(target_temperature > T0C + MAX_TEMPERATURE)

2
code/game/machinery/atmoalter/canister.dm
View File

@@ -171,7 +171,7 @@ update_flag
location.assume_air(air_contents)
src.destroyed = 1
playsound(src.loc, 'sound/effects/spray.ogg', 10, 1, -3)
playsound(src, 'sound/effects/spray.ogg', 10, 1, -3)
src.density = 0
update_icon()

2
code/game/machinery/atmoalter/pump_vr.dm
View File

@@ -89,7 +89,7 @@
return
anchored = !anchored
playsound(get_turf(src), I.usesound, 50, 1)
playsound(src, I.usesound, 50, 1)
to_chat(user, "<span class='notice'>You [anchored ? "wrench" : "unwrench"] \the [src].</span>")
return

2
code/game/machinery/atmoalter/scrubber.dm
View File

@@ -220,7 +220,7 @@
return
anchored = !anchored
playsound(src.loc, I.usesound, 50, 1)
playsound(src, I.usesound, 50, 1)
to_chat(user, "<span class='notice'>You [anchored ? "wrench" : "unwrench"] \the [src].</span>")
return

4
code/game/machinery/biogenerator.dm
View File

@@ -164,11 +164,11 @@
processing = 1
update_icon()
updateUsrDialog()
playsound(src.loc, 'sound/machines/blender.ogg', 40, 1)
playsound(src, 'sound/machines/blender.ogg', 40, 1)
use_power(S * 30)
sleep((S + 15) / eat_eff)
processing = 0
playsound(src.loc, 'sound/machines/biogenerator_end.ogg', 40, 1)
playsound(src, 'sound/machines/biogenerator_end.ogg', 40, 1)
update_icon()
else
menustat = "void"

4
code/game/machinery/bioprinter.dm
View File

@@ -285,7 +285,7 @@
/obj/machinery/organ_printer/flesh/print_organ(var/choice)
var/obj/item/organ/O = ..()
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
playsound(src, 'sound/machines/ding.ogg', 50, 1)
visible_message("<span class='info'>\The [src] dings, then spits out \a [O].</span>")
return O
@@ -350,7 +350,7 @@
var/obj/item/organ/O = ..()
O.robotize()
O.status |= ORGAN_CUT_AWAY // robotize() resets status to 0
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
playsound(src, 'sound/machines/ding.ogg', 50, 1)
audible_message("<span class='info'>\The [src] dings, then spits out \a [O].</span>")
return O

4
code/game/machinery/bomb_tester_vr.dm
View File

@@ -359,11 +359,11 @@
if(cancelled)
return
if(simulation_results == "Error")
playsound(get_turf(src), 'sound/machines/buzz-sigh.ogg', 50, 0)
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0)
state("Invalid parameters.")
else
ping("Simulation complete!")
playsound(loc, "sound/effects/printer.ogg", 50, 1)
playsound(src, "sound/effects/printer.ogg", 50, 1)
var/obj/item/weapon/paper/P = new(get_turf(src))
P.name = "Explosive Simulator printout"
P.info = simulation_results

2
code/game/machinery/buttons.dm
View File

@@ -21,5 +21,5 @@
// VOREStation Edit Begin
/obj/machinery/button/attack_hand(obj/item/weapon/W, mob/user as mob)
if(..()) return 1
playsound(loc, 'sound/machines/button.ogg', 100, 1)
playsound(src, 'sound/machines/button.ogg', 100, 1)
// VOREStation Edit End

16
code/game/machinery/camera/camera.dm
View File

@@ -158,7 +158,7 @@
user.do_attack_animation(src)
user.setClickCooldown(user.get_attack_speed())
visible_message("<span class='warning'>\The [user] slashes at [src]!</span>")
playsound(src.loc, 'sound/weapons/slash.ogg', 100, 1)
playsound(src, 'sound/weapons/slash.ogg', 100, 1)
add_hiddenprint(user)
destroy()
@@ -169,7 +169,7 @@
S.do_attack_animation(src)
S.setClickCooldown(user.get_attack_speed())
visible_message("<span class='warning'>\The [user] [pick(S.attacktext)] \the [src]!</span>")
playsound(src.loc, S.attack_sound, 100, 1)
playsound(src, S.attack_sound, 100, 1)
add_hiddenprint(user)
destroy()
..()
@@ -183,7 +183,7 @@
panel_open = !panel_open
user.visible_message("<span class='warning'>[user] screws the camera's panel [panel_open ? "open" : "closed"]!</span>",
"<span class='notice'>You screw the camera's panel [panel_open ? "open" : "closed"].</span>")
playsound(src.loc, W.usesound, 50, 1)
playsound(src, W.usesound, 50, 1)
else if((W.is_wirecutter() || istype(W, /obj/item/device/multitool)) && panel_open)
interact(user)
@@ -258,7 +258,7 @@
if (istype(W, /obj/item)) //is it even possible to get into attackby() with non-items?
var/obj/item/I = W
if (I.hitsound)
playsound(loc, I.hitsound, 50, 1, -1)
playsound(src, I.hitsound, 50, 1, -1)
take_damage(W.force)
else
@@ -278,7 +278,7 @@
visible_message("<span class='notice'> [user] has deactivated [src]!</span>")
else
visible_message("<span class='notice'> [src] clicks and shuts down. </span>")
playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
playsound(src, 'sound/items/Wirecutter.ogg', 100, 1)
icon_state = "[initial(icon_state)]1"
add_hiddenprint(user)
else
@@ -286,7 +286,7 @@
visible_message("<span class='notice'> [user] has reactivated [src]!</span>")
else
visible_message("<span class='notice'> [src] clicks and reactivates itself. </span>")
playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
playsound(src, 'sound/items/Wirecutter.ogg', 100, 1)
icon_state = initial(icon_state)
add_hiddenprint(user)
@@ -308,7 +308,7 @@
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, loc)
spark_system.start()
playsound(loc, "sparks", 50, 1)
playsound(src, "sparks", 50, 1)
/obj/machinery/camera/proc/set_status(var/newstatus)
if (status != newstatus)
@@ -404,7 +404,7 @@
// Do after stuff here
to_chat(user, "<span class='notice'>You start to weld [src]..</span>")
playsound(src.loc, WT.usesound, 50, 1)
playsound(src, WT.usesound, 50, 1)
WT.eyecheck(user)
busy = 1
if(do_after(user, 100 * WT.toolspeed))

6
code/game/machinery/camera/camera_assembly.dm
View File

@@ -78,7 +78,7 @@
if(3)
// State 3
if(W.is_screwdriver())
playsound(src.loc, W.usesound, 50, 1)
playsound(src, W.usesound, 50, 1)
var/input = sanitize(input(usr, "Which networks would you like to connect this camera to? Separate networks with a comma. No Spaces!\nFor example: "+using_map.station_short+",Security,Secret ", "Set Network", camera_network ? camera_network : NETWORK_DEFAULT))
if(!input)
@@ -118,7 +118,7 @@
else if(W.is_wirecutter())
new/obj/item/stack/cable_coil(get_turf(src), 2)
playsound(src.loc, W.usesound, 50, 1)
playsound(src, W.usesound, 50, 1)
to_chat(user, "You cut the wires from the circuits.")
state = 2
return
@@ -161,7 +161,7 @@
return 0
to_chat(user, "<span class='notice'>You start to weld the [src]..</span>")
playsound(src.loc, WT.usesound, 50, 1)
playsound(src, WT.usesound, 50, 1)
WT.eyecheck(user)
busy = 1
if(do_after(user, 20 * WT.toolspeed))

2
code/game/machinery/cloning.dm
View File

@@ -201,7 +201,7 @@
return
else if((occupant.health >= heal_level || occupant.health == occupant.getMaxHealth()) && (!eject_wait))
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
playsound(src, 'sound/machines/ding.ogg', 50, 1)
audible_message("\The [src] signals that the cloning process is complete.")
connected_message("Cloning Process Complete.")
locked = 0

26
code/game/machinery/computer/ai_core.dm
View File

@@ -15,7 +15,7 @@
switch(state)
if(0)
if(P.is_wrench())
playsound(loc, P.usesound, 50, 1)
playsound(src, P.usesound, 50, 1)
if(do_after(user, 20 * P.toolspeed))
to_chat(user, "<span class='notice'>You wrench the frame into place.</span>")
anchored = 1
@@ -25,7 +25,7 @@
if(!WT.isOn())
to_chat(user, "The welder must be on for this task.")
return
playsound(loc, WT.usesound, 50, 1)
playsound(src, WT.usesound, 50, 1)
if(do_after(user, 20 * WT.toolspeed))
if(!src || !WT.remove_fuel(0, user)) return
to_chat(user, "<span class='notice'>You deconstruct the frame.</span>")
@@ -33,25 +33,25 @@
qdel(src)
if(1)
if(P.is_wrench())
playsound(loc, P.usesound, 50, 1)
playsound(src, P.usesound, 50, 1)
if(do_after(user, 20 * P.toolspeed))
to_chat(user, "<span class='notice'>You unfasten the frame.</span>")
anchored = 0
state = 0
if(istype(P, /obj/item/weapon/circuitboard/aicore) && !circuit)
playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1)
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
to_chat(user, "<span class='notice'>You place the circuit board inside the frame.</span>")
icon_state = "1"
circuit = P
user.drop_item()
P.loc = src
if(P.is_screwdriver() && circuit)
playsound(loc, P.usesound, 50, 1)
playsound(src, P.usesound, 50, 1)
to_chat(user, "<span class='notice'>You screw the circuit board into place.</span>")
state = 2
icon_state = "2"
if(P.is_crowbar() && circuit)
playsound(loc, P.usesound, 50, 1)
playsound(src, P.usesound, 50, 1)
to_chat(user, "<span class='notice'>You remove the circuit board.</span>")
state = 1
icon_state = "0"
@@ -59,7 +59,7 @@
circuit = null
if(2)
if(P.is_screwdriver() && circuit)
playsound(loc, P.usesound, 50, 1)
playsound(src, P.usesound, 50, 1)
to_chat(user, "<span class='notice'>You unfasten the circuit board.</span>")
state = 1
icon_state = "1"
@@ -69,7 +69,7 @@
to_chat(user, "<span class='warning'>You need five coils of wire to add them to the frame.</span>")
return
to_chat(user, "<span class='notice'>You start to add cables to the frame.</span>")
playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1)
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
if (do_after(user, 20) && state == 2)
if (C.use(5))
state = 3
@@ -81,7 +81,7 @@
if (brain)
to_chat(user, "Get that brain out of there first")
else
playsound(loc, P.usesound, 50, 1)
playsound(src, P.usesound, 50, 1)
to_chat(user, "<span class='notice'>You remove the cables.</span>")
state = 2
icon_state = "2"
@@ -94,7 +94,7 @@
to_chat(user, "<span class='warning'>You need two sheets of glass to put in the glass panel.</span>")
return
to_chat(user, "<span class='notice'>You start to put in the glass panel.</span>")
playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1)
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
if (do_after(user, 20) && state == 3)
if(RG.use(2))
to_chat(user, "<span class='notice'>You put in the glass panel.</span>")
@@ -146,7 +146,7 @@
icon_state = "3b"
if(P.is_crowbar() && brain)
playsound(loc, P.usesound, 50, 1)
playsound(src, P.usesound, 50, 1)
to_chat(user, "<span class='notice'>You remove the brain.</span>")
brain.loc = loc
brain = null
@@ -154,7 +154,7 @@
if(4)
if(P.is_crowbar())
playsound(loc, P.usesound, 50, 1)
playsound(src, P.usesound, 50, 1)
to_chat(user, "<span class='notice'>You remove the glass panel.</span>")
state = 3
if (brain)
@@ -165,7 +165,7 @@
return
if(P.is_screwdriver())
playsound(loc, P.usesound, 50, 1)
playsound(src, P.usesound, 50, 1)
to_chat(user, "<span class='notice'>You connect the monitor.</span>")
if(!brain)
var/open_for_latejoin = alert(user, "Would you like this core to be open for latejoining AIs?", "Latejoin", "Yes", "Yes", "No") == "Yes"

24
code/game/machinery/computer/buildandrepair.dm
View File

@@ -14,7 +14,7 @@
switch(state)
if(0)
if(P.is_wrench())
playsound(src.loc, P.usesound, 50, 1)
playsound(src, P.usesound, 50, 1)
if(do_after(user, 20 * P.toolspeed))
to_chat(user, "<span class='notice'>You wrench the frame into place.</span>")
src.anchored = 1
@@ -24,7 +24,7 @@
if(!WT.remove_fuel(0, user))
to_chat(user, "The welding tool must be on to complete this task.")
return
playsound(src.loc, WT.usesound, 50, 1)
playsound(src, WT.usesound, 50, 1)
if(do_after(user, 20 * WT.toolspeed))
if(!src || !WT.isOn()) return
to_chat(user, "<span class='notice'>You deconstruct the frame.</span>")
@@ -32,7 +32,7 @@
qdel(src)
if(1)
if(P.is_wrench())
playsound(src.loc, P.usesound, 50, 1)
playsound(src, P.usesound, 50, 1)
if(do_after(user, 20 * P.toolspeed))
to_chat(user, "<span class='notice'>You unfasten the frame.</span>")
src.anchored = 0
@@ -40,7 +40,7 @@
if(istype(P, /obj/item/weapon/circuitboard) && !circuit)
var/obj/item/weapon/circuitboard/B = P
if(B.board_type == "computer")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
to_chat(user, "<span class='notice'>You place the circuit board inside the frame.</span>")
src.icon_state = "1"
src.circuit = P
@@ -49,12 +49,12 @@
else
to_chat(user, "<span class='warning'>This frame does not accept circuit boards of this type!</span>")
if(P.is_screwdriver() && circuit)
playsound(src.loc, P.usesound, 50, 1)
playsound(src, P.usesound, 50, 1)
to_chat(user, "<span class='notice'>You screw the circuit board into place.</span>")
src.state = 2
src.icon_state = "2"
if(P.is_crowbar()) && circuit)
playsound(src.loc, P.usesound, 50, 1)
playsound(src, P.usesound, 50, 1)
to_chat(user, "<span class='notice'>You remove the circuit board.</span>")
src.state = 1
src.icon_state = "0"
@@ -62,7 +62,7 @@
src.circuit = null
if(2)
if(P.is_screwdriver() && circuit)
playsound(src.loc, P.usesound, 50, 1)
playsound(src, P.usesound, 50, 1)
to_chat(user, "<span class='notice'>You unfasten the circuit board.</span>")
src.state = 1
src.icon_state = "1"
@@ -72,7 +72,7 @@
to_chat(user, "<span class='warning'>You need five coils of wire to add them to the frame.</span>")
return
to_chat(user, "<span class='notice'>You start to add cables to the frame.</span>")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 20) && state == 2)
if (C.use(5))
to_chat(user, "<span class='notice'>You add cables to the frame.</span>")
@@ -80,7 +80,7 @@
icon_state = "3"
if(3)
if(P.is_wirecutter())
playsound(src.loc, P.usesound, 50, 1)
playsound(src, P.usesound, 50, 1)
to_chat(user, "<span class='notice'>You remove the cables.</span>")
src.state = 2
src.icon_state = "2"
@@ -92,7 +92,7 @@
if (G.get_amount() < 2)
to_chat(user, "<span class='warning'>You need two sheets of glass to put in the glass panel.</span>")
return
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
to_chat(user, "<span class='notice'>You start to put in the glass panel.</span>")
if(do_after(user, 20) && state == 3)
if (G.use(2))
@@ -101,13 +101,13 @@
src.icon_state = "4"
if(4)
if(P.is_crowbar())
playsound(src.loc, P.usesound, 50, 1)
playsound(src, P.usesound, 50, 1)
to_chat(user, "<span class='notice'>You remove the glass panel.</span>")
src.state = 3
src.icon_state = "3"
new /obj/item/stack/material/glass( src.loc, 2 )
if(P.is_screwdriver())
playsound(src.loc, P.usesound, 50, 1)
playsound(src, P.usesound, 50, 1)
to_chat(user, "<span class='notice'>You connect the monitor.</span>")
var/B = new src.circuit.build_path ( src.loc )
src.circuit.construct(B)

2
code/game/machinery/computer/pod.dm
View File

@@ -51,7 +51,7 @@
/*
/obj/machinery/computer/pod/attackby(I as obj, user as mob)
if(I.is_screwdriver())
playsound(src.loc, W.usesound, 50, 1)
playsound(src, W.usesound, 50, 1)
if(do_after(user, 20))
if(stat & BROKEN)
to_chat(user, "<span class='notice'>The broken glass falls out.</span>")

10
code/game/machinery/constructable_frame.dm
View File

@@ -33,7 +33,7 @@
if (C.get_amount() < 5)
to_chat(user, "<span class='warning'>You need five lengths of cable to add them to the frame.</span>")
return
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
to_chat(user, "<span class='notice'>You start to add cables to the frame.</span>")
if(do_after(user, 20) && state == 1)
if(C.use(5))
@@ -50,7 +50,7 @@
if(istype(P, /obj/item/weapon/circuitboard))
var/obj/item/weapon/circuitboard/B = P
if(B.board_type == "machine")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
to_chat(user, "<span class='notice'>You add the circuit board to the frame.</span>")
circuit = P
user.drop_item()
@@ -72,7 +72,7 @@
to_chat(user, "<span class='warning'>This frame does not accept circuit boards of this type!</span>")
else
if(P.is_wirecutter())
playsound(src.loc, P.usesound, 50, 1)
playsound(src, P.usesound, 50, 1)
to_chat(user, "<span class='notice'>You remove the cables.</span>")
state = 1
icon_state = "box_0"
@@ -103,7 +103,7 @@
component_check = 0
break
if(component_check)
playsound(src.loc, P.usesound, 50, 1)
playsound(src, P.usesound, 50, 1)
var/obj/machinery/new_machine = new src.circuit.build_path(src.loc, src.dir)
if(new_machine.component_parts)
@@ -131,7 +131,7 @@
if(istype(P, /obj/item))
for(var/I in req_components)
if(istype(P, text2path(I)) && (req_components[I] > 0))
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
if(P.is_cable_coil))
var/obj/item/stack/cable_coil/CP = P
if(CP.get_amount() > 1)

6
code/game/machinery/deployable.dm
View File

@@ -57,7 +57,7 @@ Barricades
if("brute")
health -= W.force * 0.75
if(material == (get_material_by_name(MAT_WOOD) || get_material_by_name(MAT_SIFWOOD)))
playsound(loc, 'sound/effects/woodcutting.ogg', 100, 1)
playsound(src, 'sound/effects/woodcutting.ogg', 100, 1)
else
playsound(src, 'sound/weapons/smash.ogg', 50, 1)
CheckHealth()
@@ -76,9 +76,9 @@ Barricades
/obj/structure/barricade/attack_generic(var/mob/user, var/damage, var/attack_verb)
visible_message("<span class='danger'>[user] [attack_verb] the [src]!</span>")
if(material == get_material_by_name("resin"))
playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
else if(material == (get_material_by_name(MAT_WOOD) || get_material_by_name(MAT_SIFWOOD)))
playsound(loc, 'sound/effects/woodcutting.ogg', 100, 1)
playsound(src, 'sound/effects/woodcutting.ogg', 100, 1)
else
playsound(src, 'sound/weapons/smash.ogg', 50, 1)
user.do_attack_animation(src)

2
code/game/machinery/door_control.dm
View File

@@ -31,7 +31,7 @@
if(req_access.len || req_one_access.len)
req_access = list()
req_one_access = list()
playsound(src.loc, "sparks", 100, 1)
playsound(src, "sparks", 100, 1)
return 1
/obj/machinery/button/remote/attack_hand(mob/user as mob)

4
code/game/machinery/doorbell_vr.dm
View File

@@ -20,7 +20,7 @@
if(inoperable())
return
use_power(active_power_usage)
playsound(src.loc, chime_sound, 75)
playsound(src, chime_sound, 75)
icon_state = "dbchime-active"
set_light(2, 0.5, "#33FF33")
visible_message("\The [src]'s light flashes.")
@@ -139,7 +139,7 @@
to_chat(user, "<span class='caution'>You save the data in \the [M]'s buffer.</span>")
else if(W.is_wrench())
to_chat(user, "<span class='notice'>You start to unwrench \the [src].</span>")
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
playsound(src, 'sound/items/Ratchet.ogg', 50, 1)
if(do_after(user, 15) && !QDELETED(src))
to_chat(user, "<span class='notice'>You unwrench \the [src].</span>")
new /obj/item/frame/doorbell(src.loc)

16
code/game/machinery/doors/airlock.dm
View File

@@ -81,7 +81,7 @@
if(do_after(user,5 SECONDS,src))
visible_message("<span class='danger'>\The [user] forces \the [src] open, sparks flying from its electronics!</span>")
src.do_animate("spark")
playsound(src.loc, 'sound/machines/airlock_creaking.ogg', 100, 1)
playsound(src, 'sound/machines/airlock_creaking.ogg', 100, 1)
src.locked = 0
src.welded = 0
update_icon()
@@ -90,7 +90,7 @@
else if(src.density)
visible_message("<span class='alium'>\The [user] begins forcing \the [src] open!</span>")
if(do_after(user, 5 SECONDS,src))
playsound(src.loc, 'sound/machines/airlock_creaking.ogg', 100, 1)
playsound(src, 'sound/machines/airlock_creaking.ogg', 100, 1)
visible_message("<span class='danger'>\The [user] forces \the [src] open!</span>")
open(1)
else
@@ -946,7 +946,7 @@ About the new airlock wires panel:
src.welded = 1
else
src.welded = null
playsound(src.loc, C.usesound, 75, 1)
playsound(src, C.usesound, 75, 1)
src.update_icon()
return
else
@@ -1066,9 +1066,9 @@ About the new airlock wires panel:
//if the door is unpowered then it doesn't make sense to hear the woosh of a pneumatic actuator
if(arePowerSystemsOn())
playsound(src.loc, open_sound_powered, 50, 1)
playsound(src, open_sound_powered, 50, 1)
else
playsound(src.loc, open_sound_unpowered, 75, 1)
playsound(src, open_sound_unpowered, 75, 1)
if(src.closeOther != null && istype(src.closeOther, /obj/machinery/door/airlock/) && !src.closeOther.density)
src.closeOther.close()
@@ -1150,7 +1150,7 @@ About the new airlock wires panel:
for(var/atom/movable/AM in turf)
if(AM.blocks_airlock())
if(!has_beeped)
playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0)
playsound(src, 'sound/machines/buzz-two.ogg', 50, 0)
has_beeped = 1
autoclose_in(6)
return
@@ -1163,9 +1163,9 @@ About the new airlock wires panel:
use_power(360) //360 W seems much more appropriate for an actuator moving an industrial door capable of crushing people
has_beeped = 0
if(arePowerSystemsOn())
playsound(src.loc, close_sound_powered, 50, 1)
playsound(src, close_sound_powered, 50, 1)
else
playsound(src.loc, open_sound_unpowered, 75, 1)
playsound(src, open_sound_unpowered, 75, 1)
for(var/turf/turf in locs)
var/obj/structure/window/killthis = (locate(/obj/structure/window) in turf)
if(killthis)

10
code/game/machinery/doors/blast_door.dm
View File

@@ -100,7 +100,7 @@
// Description: Opens or closes the door, depending on current state. No checks are done inside this proc.
/obj/machinery/door/blast/proc/force_toggle(var/forced = 0, mob/user as mob)
if (forced)
playsound(src.loc, 'sound/machines/airlock_creaking.ogg', 100, 1)
playsound(src, 'sound/machines/airlock_creaking.ogg', 100, 1)
if(src.density)
src.force_open()
@@ -150,7 +150,7 @@
user.visible_message("<span class='danger'>\The [user] hits \the [src] with \the [W] with no visible effect.</span>")
else
user.visible_message("<span class='danger'>\The [user] forcefully strikes \the [src] with \the [W]!</span>")
playsound(src.loc, hitsound, 100, 1)
playsound(src, hitsound, 100, 1)
take_damage(W.force*0.35) //it's a blast door, it should take a while. -Luke
return
@@ -180,7 +180,7 @@
user.visible_message("<span class='danger'>\The [user] hits \the [src] with \the [W] with no visible effect.</span>")
else
user.visible_message("<span class='danger'>\The [user] forcefully strikes \the [src] with \the [W]!</span>")
playsound(src.loc, hitsound, 100, 1)
playsound(src, hitsound, 100, 1)
take_damage(W.force*0.15) //If the item isn't a weapon, let's make this take longer than usual to break it down.
return
@@ -194,13 +194,13 @@
if(src.density)
visible_message("<span class='alium'>\The [user] begins forcing \the [src] open!</span>")
if(do_after(user, 15 SECONDS,src))
playsound(src.loc, 'sound/machines/airlock_creaking.ogg', 100, 1)
playsound(src, 'sound/machines/airlock_creaking.ogg', 100, 1)
visible_message("<span class='danger'>\The [user] forces \the [src] open!</span>")
force_open(1)
else
visible_message("<span class='alium'>\The [user] begins forcing \the [src] closed!</span>")
if(do_after(user, 5 SECONDS,src))
playsound(src.loc, 'sound/machines/airlock_creaking.ogg', 100, 1)
playsound(src, 'sound/machines/airlock_creaking.ogg', 100, 1)
visible_message("<span class='danger'>\The [user] forces \the [src] closed!</span>")
force_close(1)
else

6
code/game/machinery/doors/door.dm
View File

@@ -201,7 +201,7 @@
tforce = 15 * (speed/5)
else
tforce = AM:throwforce * (speed/5)
playsound(src.loc, hitsound, 100, 1)
playsound(src, hitsound, 100, 1)
take_damage(tforce)
return
@@ -289,7 +289,7 @@
user.visible_message("<span class='danger'>\The [user] hits \the [src] with \the [W] with no visible effect.</span>")
else
user.visible_message("<span class='danger'>\The [user] forcefully strikes \the [src] with \the [W]!</span>")
playsound(src.loc, hitsound, 100, 1)
playsound(src, hitsound, 100, 1)
take_damage(W.force)
return
@@ -414,7 +414,7 @@
if("deny")
if(density && !(stat & (NOPOWER|BROKEN)))
flick("door_deny", src)
playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0)
playsound(src, 'sound/machines/buzz-two.ogg', 50, 0)
return

4
code/game/machinery/doors/firedoor.dm
View File

@@ -200,14 +200,14 @@
if(src.blocked)
visible_message("<span class='alium'>\The [user] begins digging into \the [src] internals!</span>")
if(do_after(user,5 SECONDS,src))
playsound(src.loc, 'sound/machines/airlock_creaking.ogg', 100, 1)
playsound(src, 'sound/machines/airlock_creaking.ogg', 100, 1)
src.blocked = 0
update_icon()
open(1)
else if(src.density)
visible_message("<span class='alium'>\The [user] begins forcing \the [src] open!</span>")
if(do_after(user, 2 SECONDS,src))
playsound(src.loc, 'sound/machines/airlock_creaking.ogg', 100, 1)
playsound(src, 'sound/machines/airlock_creaking.ogg', 100, 1)
visible_message("<span class='danger'>\The [user] forces \the [src] open!</span>")
open(1)
else

8
code/game/machinery/doors/firedoor_assembly.dm
View File

@@ -32,7 +32,7 @@ obj/structure/firedoor_assembly/attackby(obj/item/C, mob/user as mob)
to_chat(user, "<span class='notice'>You wire \the [src].</span>")
else if(C.is_wirecutter() && wired )
playsound(src.loc, C.usesound, 100, 1)
playsound(src, C.usesound, 100, 1)
user.visible_message("[user] cuts the wires from \the [src].", "You start to cut the wires from \the [src].")
if(do_after(user, 40))
@@ -43,7 +43,7 @@ obj/structure/firedoor_assembly/attackby(obj/item/C, mob/user as mob)
else if(istype(C, /obj/item/weapon/circuitboard/airalarm) && wired)
if(anchored)
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
user.visible_message("<span class='warning'>[user] has inserted a circuit into \the [src]!</span>",
"You have inserted the circuit into \the [src]!")
if(glass)
@@ -56,7 +56,7 @@ obj/structure/firedoor_assembly/attackby(obj/item/C, mob/user as mob)
to_chat(user, "<span class='warning'>You must secure \the [src] first!</span>")
else if(C.is_wrench())
anchored = !anchored
playsound(src.loc, C.usesound, 50, 1)
playsound(src, C.usesound, 50, 1)
user.visible_message("<span class='warning'>[user] has [anchored ? "" : "un" ]secured \the [src]!</span>",
"You have [anchored ? "" : "un" ]secured \the [src]!")
update_icon()
@@ -86,7 +86,7 @@ obj/structure/firedoor_assembly/attackby(obj/item/C, mob/user as mob)
else if(istype(C, /obj/item/stack/material) && C.get_material_name() == "rglass" && !glass)
var/obj/item/stack/S = C
if (S.get_amount() >= 1)
playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
playsound(src, 'sound/items/Crowbar.ogg', 100, 1)
user.visible_message("<span class='info'>[user] adds [S.name] to \the [src].</span>",
"<span class='notice'>You start to install [S.name] into \the [src].</span>")
if(do_after(user, 40, src) && !glass && S.use(1))

12
code/game/machinery/doors/windowdoor.dm
View File

@@ -115,7 +115,7 @@
if (!operating) //in case of emag
operating = 1
flick(text("[src.base_state]opening"), src)
playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1)
playsound(src, 'sound/machines/windowdoor.ogg', 100, 1)
sleep(10)
explosion_resistance = 0
@@ -132,7 +132,7 @@
return FALSE
operating = TRUE
flick(text("[]closing", src.base_state), src)
playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1)
playsound(src, 'sound/machines/windowdoor.ogg', 100, 1)
density = TRUE
update_icon()
@@ -158,7 +158,7 @@
if(istype(user,/mob/living/carbon/human))
var/mob/living/carbon/human/H = user
if(H.species.can_shred(H))
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
playsound(src, 'sound/effects/Glasshit.ogg', 75, 1)
visible_message("<span class='danger'>[user] smashes against the [src.name].</span>", 1)
user.do_attack_animation(src)
user.setClickCooldown(user.get_attack_speed())
@@ -212,8 +212,8 @@
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, src.loc)
spark_system.start()
playsound(src.loc, "sparks", 50, 1)
playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1)
playsound(src, "sparks", 50, 1)
playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
visible_message("<span class='warning'>The glass door was sliced open by [user]!</span>")
return 1
@@ -259,7 +259,7 @@
if(src.density && istype(I, /obj/item/weapon) && !istype(I, /obj/item/weapon/card))
user.setClickCooldown(user.get_attack_speed(I))
var/aforce = I.force
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
playsound(src, 'sound/effects/Glasshit.ogg', 75, 1)
visible_message("<span class='danger'>[src] was hit by [I].</span>")
if(I.damtype == BRUTE || I.damtype == BURN)
take_damage(aforce)

2
code/game/machinery/fire_alarm.dm
View File

@@ -208,7 +208,7 @@ FIRE ALARM
for(var/obj/machinery/firealarm/FA in area)
fire_alarm.triggerAlarm(loc, FA, duration, hidden = alarms_hidden)
update_icon()
playsound(src.loc, 'sound/machines/airalarm.ogg', 25, 0, 4)
playsound(src, 'sound/machines/airalarm.ogg', 25, 0, 4)
return
/obj/machinery/firealarm/proc/set_security_level(var/newlevel)

2
code/game/machinery/flasher.dm
View File

@@ -56,7 +56,7 @@
if((disable) || (last_flash && world.time < last_flash + 150))
return
playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1)
playsound(src, 'sound/weapons/flash.ogg', 100, 1)
flick("[base_state]_flash", src)
last_flash = world.time
use_power(1500)

4
code/game/machinery/floor_light.dm
View File

@@ -31,7 +31,7 @@ var/list/floor_light_cache = list()
if(!WT.remove_fuel(0, user))
to_chat(user, "<span class='warning'>\The [src] must be on to complete this task.</span>")
return
playsound(src.loc, WT.usesound, 50, 1)
playsound(src, WT.usesound, 50, 1)
if(!do_after(user, 20 * WT.toolspeed))
return
if(!src || !WT.isOn())
@@ -53,7 +53,7 @@ var/list/floor_light_cache = list()
stat |= BROKEN
else
visible_message("<span class='danger'>\The [user] attacks \the [src]!</span>")
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
playsound(src, 'sound/effects/Glasshit.ogg', 75, 1)
if(isnull(damaged)) damaged = 0
update_brightness()
return

16
code/game/machinery/frame.dm
View File

@@ -284,7 +284,7 @@
if(P.is_wrench())
if(state == FRAME_PLACED && !anchored)
to_chat(user, "<span class='notice'>You start to wrench the frame into place.</span>")
playsound(src.loc, P.usesound, 50, 1)
playsound(src, P.usesound, 50, 1)
if(do_after(user, 20 * P.toolspeed))
anchored = TRUE
if(!need_circuit && circuit)
@@ -305,7 +305,7 @@
if(state == FRAME_PLACED)
var/obj/item/weapon/weldingtool/WT = P
if(WT.remove_fuel(0, user))
playsound(src.loc, P.usesound, 50, 1)
playsound(src, P.usesound, 50, 1)
if(do_after(user, 20 * P.toolspeed))
if(src && WT.isOn())
to_chat(user, "<span class='notice'>You deconstruct the frame.</span>")
@@ -321,7 +321,7 @@
var/obj/item/weapon/circuitboard/B = P
var/datum/frame/frame_types/board_type = B.board_type
if(board_type.name == frame_type.name)
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
to_chat(user, "<span class='notice'>You place the circuit board inside the frame.</span>")
circuit = P
user.drop_item()
@@ -474,7 +474,7 @@
to_chat(user, "<span class='warning'>You need five coils of wire to add them to the frame.</span>")
return
to_chat(user, "<span class='notice'>You start to add cables to the frame.</span>")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 20) && state == FRAME_FASTENED)
if(C.use(5))
to_chat(user, "<span class='notice'>You add cables to the frame.</span>")
@@ -485,7 +485,7 @@
if(frame_type.frame_class == FRAME_CLASS_MACHINE)
for(var/I in req_components)
if(istype(P, I) && (req_components[I] > 0))
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
if(istype(P, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/CP = P
if(CP.get_amount() > 1)
@@ -534,7 +534,7 @@
if(G.get_amount() < 2)
to_chat(user, "<span class='warning'>You need two sheets of glass to put in the glass panel.</span>")
return
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
to_chat(user, "<span class='notice'>You start to put in the glass panel.</span>")
if(do_after(user, 20) && state == FRAME_WIRED)
if(G.use(2))
@@ -546,7 +546,7 @@
if(G.get_amount() < 2)
to_chat(user, "<span class='warning'>You need two sheets of glass to put in the glass panel.</span>")
return
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
to_chat(user, "<span class='notice'>You start to put in the glass panel.</span>")
if(do_after(user, 20) && state == FRAME_WIRED)
if(G.use(2))
@@ -558,7 +558,7 @@
if(frame_type.frame_class == FRAME_CLASS_MACHINE)
for(var/I in req_components)
if(istype(P, I) && (req_components[I] > 0))
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
if(istype(P, /obj/item/stack))
var/obj/item/stack/ST = P
if(ST.get_amount() > 1)

2
code/game/machinery/holoposter.dm
View File

@@ -83,7 +83,7 @@ GLOBAL_LIST_EMPTY(holoposters)
if(stat & (NOPOWER))
return
if (W.is_multitool())
playsound(user.loc, 'sound/items/penclick.ogg', 60, 1)
playsound(src, 'sound/items/penclick.ogg', 60, 1)
icon_state = input("Available Posters", "Holographic Poster") as null|anything in postertypes + "random"
if(!Adjacent(user))
return

2
code/game/machinery/jukebox.dm
View File

@@ -217,7 +217,7 @@
StopPlaying()
else if(href_list["play"])
if(emagged)
playsound(src.loc, 'sound/items/AirHorn.ogg', 100, 1)
playsound(src, 'sound/items/AirHorn.ogg', 100, 1)
for(var/mob/living/carbon/M in ohearers(6, src))
if(M.get_ear_protection() >= 2)
continue

8
code/game/machinery/machinery.dm
View File

@@ -277,7 +277,7 @@ Class Procs:
text = "\The [src] pings."
state(text, "blue")
playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
playsound(src, 'sound/machines/ping.ogg', 50, 0)
/obj/machinery/proc/shock(mob/user, prb)
if(inoperable())
@@ -342,7 +342,7 @@ Class Procs:
return FALSE
if(panel_open)
return FALSE // Close panel first!
playsound(loc, W.usesound, 50, 1)
playsound(src, W.usesound, 50, 1)
var/actual_time = W.toolspeed * time
if(actual_time != 0)
user.visible_message( \
@@ -403,12 +403,12 @@ Class Procs:
if(!panel_open)
return 0
user.visible_message("<span class='warning'>[user] has cut the wires inside \the [src]!</span>", "You have cut the wires inside \the [src].")
playsound(src.loc, W.usesound, 50, 1)
playsound(src, W.usesound, 50, 1)
new/obj/item/stack/cable_coil(get_turf(src), 5)
. = dismantle()
/obj/machinery/proc/dismantle()
playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
playsound(src, 'sound/items/Crowbar.ogg', 50, 1)
//TFF 3/6/19 - port Cit RP fix of infinite frames. If it doesn't have a circuit board, don't create a frame. Return a smack instead. BONK!
if(!circuit)
return 0

8
code/game/machinery/newscaster.dm
View File

@@ -904,7 +904,7 @@ obj/item/weapon/newspaper/Topic(href, href_list)
if(curr_page == 0) //We're at the start, get to the middle
screen = 1
curr_page++
playsound(loc, "pageturn", 50, 1)
playsound(src, "pageturn", 50, 1)
else if(href_list["prev_page"])
if(curr_page == 0)
@@ -916,7 +916,7 @@ obj/item/weapon/newspaper/Topic(href, href_list)
if(curr_page == pages+1) //we're at the end, let's go back to the middle.
screen = 1
curr_page--
playsound(src.loc, "pageturn", 50, 1)
playsound(src, "pageturn", 50, 1)
if(istype(src.loc, /mob))
attack_self(src.loc)
@@ -974,9 +974,9 @@ obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob)
spawn(300)
alert = 0
update_icon()
playsound(src.loc, 'sound/machines/twobeep.ogg', 75, 1)
playsound(src, 'sound/machines/twobeep.ogg', 75, 1)
else
for(var/mob/O in hearers(world.view-1, T))
O.show_message("<span class='newscaster'><EM>[name]</EM> beeps, \"Attention! Wanted issue distributed!\"</span>",2)
playsound(src.loc, 'sound/machines/warning-buzzer.ogg', 75, 1)
playsound(src, 'sound/machines/warning-buzzer.ogg', 75, 1)
return

4
code/game/machinery/painter_vr.dm
View File

@@ -93,12 +93,12 @@
if(href_list["paint"])
for(var/atom/movable/O in processing)
O.color = activecolor
playsound(src.loc, 'sound/effects/spray3.ogg', 50, 1)
playsound(src, 'sound/effects/spray3.ogg', 50, 1)
if(href_list["clear"])
for(var/atom/movable/O in processing)
O.color = initial(O.color)
playsound(src.loc, 'sound/effects/spray3.ogg', 50, 1)
playsound(src, 'sound/effects/spray3.ogg', 50, 1)
if(href_list["eject"])
for(var/atom/movable/O in processing)

2
code/game/machinery/partslathe_vr.dm
View File

@@ -167,7 +167,7 @@
busy = 0
update_use_power(USE_POWER_IDLE)
update_icon()
playsound(src.loc, 'sound/machines/chime.ogg', 50, 0)
playsound(src, 'sound/machines/chime.ogg', 50, 0)
/obj/machinery/partslathe/proc/addToQueue(var/datum/category_item/partslathe/D)
queue += D

28
code/game/machinery/portable_turret.dm
View File

@@ -549,12 +549,12 @@
if(do_after(user, 50 * I.toolspeed))
//This code handles moving the turret around. After all, it's a portable turret!
if(!anchored)
playsound(loc, I.usesound, 100, 1)
playsound(src, I.usesound, 100, 1)
anchored = TRUE
update_icon()
to_chat(user, "<span class='notice'>You secure the exterior bolts on the turret.</span>")
else if(anchored)
playsound(loc, I.usesound, 100, 1)
playsound(src, I.usesound, 100, 1)
anchored = FALSE
to_chat(user, "<span class='notice'>You unsecure the exterior bolts on the turret.</span>")
update_icon()
@@ -890,10 +890,10 @@
var/obj/item/projectile/A
if(emagged || lethal)
A = new lethal_projectile(loc)
playsound(loc, lethal_shot_sound, 75, 1)
playsound(src, lethal_shot_sound, 75, 1)
else
A = new projectile(loc)
playsound(loc, shot_sound, 75, 1)
playsound(src, shot_sound, 75, 1)
// Lethal/emagged turrets use twice the power due to higher energy beams
// Emagged turrets again use twice as much power due to higher firing rates
@@ -966,14 +966,14 @@
switch(build_step)
if(0) //first step
if(I.is_wrench() && !anchored)
playsound(loc, I.usesound, 100, 1)
playsound(src, I.usesound, 100, 1)
to_chat(user, "<span class='notice'>You secure the external bolts.</span>")
anchored = TRUE
build_step = 1
return
else if(I.is_crowbar() && !anchored)
playsound(loc, I.usesound, 75, 1)
playsound(src, I.usesound, 75, 1)
to_chat(user, "<span class='notice'>You dismantle the turret construction.</span>")
new /obj/item/stack/material/steel(loc, 5)
qdel(src)
@@ -991,7 +991,7 @@
return
else if(I.is_wrench())
playsound(loc, I.usesound, 75, 1)
playsound(src, I.usesound, 75, 1)
to_chat(user, "<span class='notice'>You unfasten the external bolts.</span>")
anchored = FALSE
build_step = 0
@@ -999,7 +999,7 @@
if(2)
if(I.is_wrench())
playsound(loc, I.usesound, 100, 1)
playsound(src, I.usesound, 100, 1)
to_chat(user, "<span class='notice'>You bolt the metal armor into place.</span>")
build_step = 3
return
@@ -1012,7 +1012,7 @@
to_chat(user, "<span class='notice'>You need more fuel to complete this task.</span>")
return
playsound(loc, I.usesound, 50, 1)
playsound(src, I.usesound, 50, 1)
if(do_after(user, 20 * I.toolspeed))
if(!src || !WT.remove_fuel(5, user)) return
build_step = 1
@@ -1039,7 +1039,7 @@
return
else if(I.is_wrench())
playsound(loc, I.usesound, 100, 1)
playsound(src, I.usesound, 100, 1)
to_chat(user, "<span class='notice'>You remove the turret's metal armor bolts.</span>")
build_step = 2
return
@@ -1058,7 +1058,7 @@
if(5)
if(I.is_screwdriver())
playsound(loc, I.usesound, 100, 1)
playsound(src, I.usesound, 100, 1)
build_step = 6
to_chat(user, "<span class='notice'>You close the internal access hatch.</span>")
return
@@ -1076,7 +1076,7 @@
return
else if(I.is_screwdriver())
playsound(loc, I.usesound, 100, 1)
playsound(src, I.usesound, 100, 1)
build_step = 5
to_chat(user, "<span class='notice'>You open the internal access hatch.</span>")
return
@@ -1088,7 +1088,7 @@
if(WT.get_fuel() < 5)
to_chat(user, "<span class='notice'>You need more fuel to complete this task.</span>")
playsound(loc, WT.usesound, 50, 1)
playsound(src, WT.usesound, 50, 1)
if(do_after(user, 30 * WT.toolspeed))
if(!src || !WT.remove_fuel(5, user))
return
@@ -1106,7 +1106,7 @@
qdel(src) // qdel
else if(I.is_crowbar())
playsound(loc, I.usesound, 75, 1)
playsound(src, I.usesound, 75, 1)
to_chat(user, "<span class='notice'>You pry off the turret's exterior armor.</span>")
new /obj/item/stack/material/steel(loc, 2)
build_step = 6

2
code/game/machinery/recharger.dm
View File

@@ -84,7 +84,7 @@
return
anchored = !anchored
to_chat(user, "You [anchored ? "attached" : "detached"] [src].")
playsound(loc, G.usesound, 75, 1)
playsound(src, G.usesound, 75, 1)
else if(default_deconstruction_screwdriver(user, G))
return
else if(default_deconstruction_crowbar(user, G))

35
code/game/machinery/suit_storage_unit.dm
View File

@@ -206,7 +206,7 @@
protected = 1
if(!protected)
playsound(src.loc, "sparks", 75, 1, -1)
playsound(src, "sparks", 75, 1, -1)
to_chat(user, "<font color='red'>You try to touch the controls but you get zapped. There must be a short circuit somewhere.</font>")
return*/
else //welp, the guy is protected, we can continue
@@ -232,7 +232,7 @@
protected = 1
if(!protected)
playsound(src.loc, "sparks", 75, 1, -1)
playsound(src, "sparks", 75, 1, -1)
to_chat(user, "<font color='red'>You try to touch the controls but you get zapped. There must be a short circuit somewhere.</font>")
return*/
else
@@ -1068,6 +1068,22 @@
if("Gem-Encrusted" || "Wizard")
parent_helmet = /obj/item/clothing/head/helmet/space/void/wizard
parent_suit = /obj/item/clothing/suit/space/void/wizard
//Special or Event suits
if("Vintage Crew")
parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb
parent_suit = /obj/item/clothing/suit/space/void/refurb
if("Vintage Engineering")
parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/engineering
parent_suit = /obj/item/clothing/suit/space/void/refurb/engineering
if("Vintage Medical")
parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/medical
parent_suit = /obj/item/clothing/suit/space/void/refurb/medical
if("Vintage Marine")
parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/marine
parent_suit = /obj/item/clothing/suit/space/void/refurb/marine
if("Vintage Officer")
parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/officer
parent_suit = /obj/item/clothing/suit/space/void/refurb/officer
//BEGIN: Space for additional downstream variants
//VOREStation Addition Start
if("Director")
@@ -1076,6 +1092,21 @@
if("Prototype")
parent_helmet = /obj/item/clothing/head/helmet/space/void/merc/prototype
parent_suit = /obj/item/clothing/suit/space/void/merc/prototype
if("Talon Crew")
parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/talon
parent_suit = /obj/item/clothing/suit/space/void/refurb/talon
if("Talon Engineering")
parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/engineering/talon
parent_suit = /obj/item/clothing/suit/space/void/refurb/engineering/talon
if("Talon Medical")
parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/medical/talon
parent_suit = /obj/item/clothing/suit/space/void/refurb/medical/talon
if("Talon Marine")
parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/marine/talon
parent_suit = /obj/item/clothing/suit/space/void/refurb/marine/talon
if("Talon Officer")
parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/officer/talon
parent_suit = /obj/item/clothing/suit/space/void/refurb/officer/talon
//VOREStation Addition End
//END: downstream variant space

39
code/game/machinery/suit_storage_unit_vr.dm
View File

@@ -29,3 +29,42 @@
/obj/machinery/suit_cycler/prototype/Initialize() //No Teshari Sprites
species -= SPECIES_TESHARI
return ..()
/obj/machinery/suit_cycler/vintage
name = "Vintage suit cycler"
model_text = "Vintage"
departments = list("Vintage Crew","Vintage Engineering","Vintage Marine","Vintage Medical","Vintage Officer")
/obj/machinery/suit_cycler/vintage/Initialize() //No Teshari Sprites
species -= SPECIES_TESHARI
return ..()
/obj/machinery/suit_cycler/vintage/tcrew
name = "Talon crew suit cycler"
model_text = "Talon crew"
req_access = list(access_talon)
departments = list("Talon Crew")
/obj/machinery/suit_cycler/vintage/tengi
name = "Talon engineer suit cycler"
model_text = "Talon engineer"
req_access = list(access_talon)
departments = list("Talon Engineering")
/obj/machinery/suit_cycler/vintage/tguard
name = "Talon guard suit cycler"
model_text = "Talon guard"
req_access = list(access_talon)
departments = list("Talon Marine")
/obj/machinery/suit_cycler/vintage/tmedic
name = "Talon doctor suit cycler"
model_text = "Talon doctor"
req_access = list(access_talon)
departments = list("Talon Medical")
/obj/machinery/suit_cycler/vintage/tcaptain
name = "Talon captain suit cycler"
model_text = "Talon captain"
req_access = list(access_talon)
departments = list("Talon Officer")

2
code/game/machinery/telecomms/logbrowser.dm
View File

@@ -192,7 +192,7 @@
/obj/machinery/computer/telecomms/server/emag_act(var/remaining_charges, var/mob/user)
if(!emagged)
playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
playsound(src, 'sound/effects/sparks4.ogg', 75, 1)
emagged = 1
to_chat(user, "<span class='notice'>You you disable the security protocols</span>")
src.updateUsrDialog()

2
code/game/machinery/telecomms/telemonitor.dm
View File

@@ -127,7 +127,7 @@
/obj/machinery/computer/telecomms/monitor/emag_act(var/remaining_charges, var/mob/user)
if(!emagged)
playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
playsound(src, 'sound/effects/sparks4.ogg', 75, 1)
emagged = 1
to_chat(user, "<span class='notice'>You you disable the security protocols</span>")
src.updateUsrDialog()

2
code/game/machinery/telecomms/traffic_control.dm
View File

@@ -210,7 +210,7 @@
/obj/machinery/computer/telecomms/traffic/emag_act(var/remaining_charges, var/mob/user)
if(!emagged)
playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
playsound(src, 'sound/effects/sparks4.ogg', 75, 1)
emagged = 1
to_chat(user, "<span class='notice'>You you disable the security protocols</span>")
src.updateUsrDialog()

6
code/game/machinery/transformer.dm
View File

@@ -28,14 +28,14 @@
if(stat & (BROKEN|NOPOWER))
return
if(!transform_dead && H.stat == DEAD)
playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0)
return
playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
playsound(src, 'sound/items/Welder.ogg', 50, 1)
use_power(5000) // Use a lot of power.
var/mob/living/silicon/robot = H.Robotize()
robot.SetLockDown()
spawn(50) // So he can't jump out the gate right away.
playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
playsound(src, 'sound/machines/ping.ogg', 50, 0)
if(robot)
robot.SetLockDown(0)

10
code/game/machinery/vending.dm
View File

@@ -252,7 +252,7 @@
*/
/obj/machinery/vending/proc/pay_with_ewallet(var/obj/item/weapon/spacecash/ewallet/wallet)
visible_message("<span class='info'>\The [usr] swipes \the [wallet] through \the [src].</span>")
playsound(src.loc, 'sound/machines/id_swipe.ogg', 50, 1)
playsound(src, 'sound/machines/id_swipe.ogg', 50, 1)
if(currently_vending.price > wallet.worth)
status_message = "Insufficient funds on chargecard."
status_error = 1
@@ -273,7 +273,7 @@
visible_message("<span class='info'>\The [usr] swipes \the [I] through \the [src].</span>")
else
visible_message("<span class='info'>\The [usr] swipes \the [ID_container] through \the [src].</span>")
playsound(src.loc, 'sound/machines/id_swipe.ogg', 50, 1)
playsound(src, 'sound/machines/id_swipe.ogg', 50, 1)
var/datum/money_account/customer_account = get_account(I.associated_account_number)
if(!customer_account)
status_message = "Error: Unable to access account. Please contact technical support if problem persists."
@@ -429,7 +429,7 @@
if((!allowed(usr)) && !emagged && scan_id) //For SECURE VENDING MACHINES YEAH
to_chat(usr, "<span class='warning'>Access denied.</span>") //Unless emagged of course
flick("[icon_state]-deny",src)
playsound(src.loc, 'sound/machines/deniedbeep.ogg', 50, 0)
playsound(src, 'sound/machines/deniedbeep.ogg', 50, 0)
return
var/key = text2num(href_list["vend"])
@@ -466,7 +466,7 @@
if((!allowed(usr)) && !emagged && scan_id) //For SECURE VENDING MACHINES YEAH
to_chat(usr, "<span class='warning'>Access denied.</span>") //Unless emagged of course
flick("[icon_state]-deny",src)
playsound(src.loc, 'sound/machines/deniedbeep.ogg', 50, 0)
playsound(src, 'sound/machines/deniedbeep.ogg', 50, 0)
return
vend_ready = 0 //One thing at a time!!
status_message = "Vending..."
@@ -505,7 +505,7 @@
sleep(3)
if(R.get_product(get_turf(src)))
visible_message("<span class='notice'>\The [src] clunks as it vends an additional item.</span>")
playsound(src.loc, "sound/[vending_sound]", 100, 1, 1)
playsound(src, "sound/[vending_sound]", 100, 1, 1)
status_message = ""
status_error = 0

2
code/game/mecha/combat/fighter.dm
View File

@@ -164,7 +164,7 @@
else if(moved && gravity && !ground_capable)
occupant_message("Collision alert! Vehicle not rated for use in gravity!")
take_damage(NOGRAV_FIGHTER_DAMAGE, "brute")
playsound(loc, 'sound/effects/grillehit.ogg', 50, 1)
playsound(src, 'sound/effects/grillehit.ogg', 50, 1)
/obj/mecha/combat/fighter/handle_equipment_movement()
. = ..()

2
code/game/mecha/combat/gorilla.dm
View File

@@ -192,7 +192,7 @@ HONK Blaster and a pulse cannon protected by projectile armor and powered by a b
src.occupant_message("<font color='[src.zoom?"blue":"red"]'>Zoom mode [zoom?"en":"dis"]abled.</font>")
if(zoom)
src.occupant.set_viewsize(12)
src.occupant << sound('sound/mecha/imag_enh.ogg',volume=50)
playsound(src, 'sound/mecha/imag_enh.ogg',50)
else
src.occupant.set_viewsize() // Reset to default
return

2
code/game/mecha/equipment/mecha_equipment.dm
View File

@@ -32,7 +32,7 @@
sleep(equip_cooldown)
set_ready_state(1)
if(ready_sound) //Kind of like the kinetic accelerator.
playsound(loc, ready_sound, 50, 1, -1)
playsound(src, ready_sound, 50, 1, -1)
if(target && chassis)
return 1
return 0

12
code/game/mecha/equipment/tools/clamp.dm
View File

@@ -33,7 +33,7 @@
if(FD.blocked)
FD.visible_message("<span class='danger'>\The [chassis] begins prying on \the [FD]!</span>")
if(do_after(chassis.occupant,10 SECONDS,FD))
playsound(FD.loc, 'sound/machines/airlock_creaking.ogg', 100, 1)
playsound(FD, 'sound/machines/airlock_creaking.ogg', 100, 1)
FD.blocked = 0
FD.update_icon()
FD.open(1)
@@ -41,7 +41,7 @@
else if(FD.density)
FD.visible_message("<span class='warning'>\The [chassis] begins forcing \the [FD] open!</span>")
if(do_after(chassis.occupant, 5 SECONDS,FD))
playsound(FD.loc, 'sound/machines/airlock_creaking.ogg', 100, 1)
playsound(FD, 'sound/machines/airlock_creaking.ogg', 100, 1)
FD.visible_message("<span class='danger'>\The [chassis] forces \the [FD] open!</span>")
FD.open(1)
else
@@ -57,7 +57,7 @@
if(do_after(chassis.occupant, 15 SECONDS,AD) && chassis.Adjacent(AD))
AD.welded = FALSE
AD.update_icon()
playsound(AD.loc, 'sound/machines/airlock_creaking.ogg', 100, 1)
playsound(AD, 'sound/machines/airlock_creaking.ogg', 100, 1)
AD.visible_message("<span class='danger'>\The [chassis] tears \the [AD] open!</span>")
if(!AD.welded)
if(density)
@@ -100,15 +100,15 @@
M.adjustOxyLoss(round(dam_force/2))
M.updatehealth()
occupant_message("<span class='warning'>You squeeze [target] with [src.name]. Something cracks.</span>")
playsound(src.loc, "fracture", 5, 1, -2) //CRACK
playsound(src, "fracture", 5, 1, -2) //CRACK
chassis.visible_message("<span class='warning'>[chassis] squeezes [target].</span>")
else if(chassis.occupant.a_intent == I_DISARM && enable_special)
playsound(src.loc, 'sound/mecha/hydraulic.ogg', 10, 1, -2)
playsound(src, 'sound/mecha/hydraulic.ogg', 10, 1, -2)
M.take_overall_damage(dam_force/2)
M.adjustOxyLoss(round(dam_force/3))
M.updatehealth()
occupant_message("<span class='warning'>You slam [target] with [src.name]. Something cracks.</span>")
playsound(src.loc, "fracture", 3, 1, -2) //CRACK 2
playsound(src, "fracture", 3, 1, -2) //CRACK 2
chassis.visible_message("<span class='warning'>[chassis] slams [target].</span>")
M.throw_at(get_step(M,get_dir(src, M)), 14, 1.5, chassis)
else

4
code/game/mecha/equipment/tools/cloak.dm
View File

@@ -46,7 +46,7 @@
log_message("Activated.")
cloak_iterator.start()
set_ready_state(0)
playsound(get_turf(src), 'sound/effects/EMPulse.ogg', 100, 1)
playsound(src, 'sound/effects/EMPulse.ogg', 100, 1)
/obj/item/mecha_parts/mecha_equipment/cloak/proc/stop_cloak()
if(chassis)
@@ -54,7 +54,7 @@
log_message("Deactivated.")
cloak_iterator.stop()
set_ready_state(1)
playsound(get_turf(src), 'sound/effects/EMPulse.ogg', 100, 1)
playsound(src, 'sound/effects/EMPulse.ogg', 100, 1)
// These things are so silly
/datum/global_iterator/mecha_cloak/process(var/obj/item/mecha_parts/mecha_equipment/cloak/cloak)

4
code/game/mecha/equipment/tools/extinguisher.dm
View File

@@ -25,14 +25,14 @@
var/obj/o = target
var/amount = o.reagents.trans_to_obj(src, 200)
occupant_message("<span class='notice'>[amount] units transferred into internal tank.</span>")
playsound(chassis, 'sound/effects/refill.ogg', 50, 1, -6)
playsound(src, 'sound/effects/refill.ogg', 50, 1, -6)
return
if (src.reagents.total_volume < 1)
occupant_message("<span class='warning'>\The [src] is empty.</span>")
return
playsound(chassis, 'sound/effects/extinguish.ogg', 75, 1, -3)
playsound(src, 'sound/effects/extinguish.ogg', 75, 1, -3)
var/direction = get_dir(chassis,target)

2
code/game/mecha/equipment/tools/syringe_gun.dm
View File

@@ -67,7 +67,7 @@
syringes -= S
S.icon = 'icons/obj/chemical.dmi'
S.icon_state = "syringeproj"
playsound(chassis, 'sound/items/syringeproj.ogg', 50, 1)
playsound(src, 'sound/items/syringeproj.ogg', 50, 1)
log_message("Launched [S] from [src], targeting [target].")
spawn(-1)
src = null //if src is deleted, still process the syringe

2
code/game/mecha/equipment/weapons/honk.dm
View File

@@ -16,7 +16,7 @@
if(!equip_ready)
return 0
playsound(chassis, 'sound/effects/bang.ogg', 30, 1, 30)
playsound(src, 'sound/effects/bang.ogg', 30, 1, 30)
chassis.occupant_message("<span class='warning'>You emit a high-pitched noise from the mech.</span>")
for(var/mob/living/carbon/M in ohearers(6, chassis))
if(istype(M, /mob/living/carbon/human))

2
code/game/mecha/equipment/weapons/weapons.dm
View File

@@ -36,7 +36,7 @@
aimloc = locate(targloc.x+GaussRandRound(deviation,1),targloc.y+GaussRandRound(deviation,1),targloc.z)
if(!aimloc || aimloc == curloc || (locs && aimloc in locs))
break
playsound(chassis, fire_sound, fire_volume, 1)
playsound(src, fire_sound, fire_volume, 1)
projectiles--
var/turf/projectile_turf
if(chassis.locs && chassis.locs.len) // Multi tile.

10
code/game/mecha/mecha.dm
View File

@@ -673,12 +673,12 @@
if(!prob(src.deflect_chance))
src.take_damage(15)
src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1)
playsound(src, 'sound/weapons/slash.ogg', 50, 1, -1)
to_chat(user, "<span class='danger'>You slash at the armored suit!</span>")
visible_message("<span class='danger'>\The [user] slashes at [src.name]'s armor!</span>")
else
src.log_append_to_last("Armor saved.")
playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1)
playsound(src, 'sound/weapons/slash.ogg', 50, 1, -1)
to_chat(user, "<span class='danger'>Your claws had no effect!</span>")
src.occupant_message("<span class='notice'>\The [user]'s claws are stopped by the armor.</span>")
visible_message("<span class='warning'>\The [user] rebounds off [src.name]'s armor!</span>")
@@ -807,14 +807,14 @@
if(!prob(src.deflect_chance))
src.take_damage(6)
src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
playsound(src.loc, 'sound/effects/blobattack.ogg', 50, 1, -1)
playsound(src, 'sound/effects/blobattack.ogg', 50, 1, -1)
to_chat(user, "<span class='danger'>You smash at the armored suit!</span>")
for (var/mob/V in viewers(src))
if(V.client && !(V.blinded))
V.show_message("<span class='danger'>\The [user] smashes against [src.name]'s armor!</span>", 1)
else
src.log_append_to_last("Armor saved.")
playsound(src.loc, 'sound/effects/blobattack.ogg', 50, 1, -1)
playsound(src, 'sound/effects/blobattack.ogg', 50, 1, -1)
to_chat(user, "<span class='warning'>Your attack had no effect!</span>")
src.occupant_message("<span class='warning'>\The [user]'s attack is stopped by the armor.</span>")
for (var/mob/V in viewers(src))
@@ -2023,7 +2023,7 @@
user.attack_log += text("\[[time_stamp()]\] <font color='red'>attacked [src.name]</font>")
else
src.log_append_to_last("Armor saved.")
playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1)
playsound(src, 'sound/weapons/slash.ogg', 50, 1, -1)
src.occupant_message("<span class='notice'>\The [user]'s attack is stopped by the armor.</span>")
visible_message("<span class='notice'>\The [user] rebounds off [src.name]'s armor!</span>")
user.attack_log += text("\[[time_stamp()]\] <font color='red'>attacked [src.name]</font>")

4
code/game/objects/buckling.dm
View File

@@ -135,7 +135,7 @@
// step_towards(M, src)
. = buckle_mob(M, forced)
playsound(src.loc, 'sound/effects/seatbelt.ogg', 50, 1)
playsound(src, 'sound/effects/seatbelt.ogg', 50, 1)
if(.)
var/reveal_message = list("buckled_mob" = null, "buckled_to" = null) //VORE EDIT: This being a list and messages existing for the buckle target atom.
if(!silent)
@@ -163,7 +163,7 @@
/atom/movable/proc/user_unbuckle_mob(mob/living/buckled_mob, mob/user)
var/mob/living/M = unbuckle_mob(buckled_mob)
playsound(src.loc, 'sound/effects/seatbelt.ogg', 50, 1)
playsound(src, 'sound/effects/seatbelt.ogg', 50, 1)
if(M)
if(M != user)
M.visible_message(\

10
code/game/objects/effects/alien/aliens.dm
View File

@@ -66,7 +66,7 @@
/obj/effect/alien/resin/attack_generic(var/mob/user, var/damage, var/attack_verb)
visible_message("<span class='danger'>[user] [attack_verb] the [src]!</span>")
playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
user.do_attack_animation(src)
health -= damage
healthcheck()
@@ -100,7 +100,7 @@
tforce = 10
else
tforce = AM:throwforce
playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
health = max(0, health - tforce)
healthcheck()
..()
@@ -137,7 +137,7 @@
user.setClickCooldown(user.get_attack_speed(W))
var/aforce = W.force
health = max(0, health - aforce)
playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
healthcheck()
..()
return
@@ -328,7 +328,7 @@
if(WT.remove_fuel(0, user))
damage = 15
playsound(loc, 'sound/items/Welder.ogg', 100, 1)
playsound(src, 'sound/items/Welder.ogg', 100, 1)
health -= damage
healthcheck()
@@ -531,7 +531,7 @@
if(WT.remove_fuel(0, user))
damage = 15
playsound(src.loc, 'sound/items/Welder.ogg', 100, 1)
playsound(src, 'sound/items/Welder.ogg', 100, 1)
src.health -= damage
src.healthcheck()

4
code/game/objects/effects/decals/contraband.dm
View File

@@ -146,7 +146,7 @@
/obj/structure/sign/poster/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(W.is_wirecutter())
playsound(src.loc, W.usesound, 100, 1)
playsound(src, W.usesound, 100, 1)
if(ruined)
to_chat(user, "<span class='notice'>You remove the remnants of the poster.</span>")
qdel(src)
@@ -166,7 +166,7 @@
return
visible_message("<span class='warning'>[user] rips [src] in a single, decisive motion!</span>" )
playsound(src.loc, 'sound/items/poster_ripped.ogg', 100, 1)
playsound(src, 'sound/items/poster_ripped.ogg', 100, 1)
ruined = 1
icon_state = "poster_ripped"
name = "ripped poster"

2
code/game/objects/effects/effect_system.dm
View File

@@ -98,7 +98,7 @@ steam.start() -- spawns the effect
/obj/effect/effect/sparks/New()
..()
playsound(src.loc, "sparks", 100, 1)
playsound(src, "sparks", 100, 1)
var/turf/T = src.loc
if (istype(T, /turf))
T.hotspot_expose(1000,100)

4
code/game/objects/effects/mines.dm
View File

@@ -61,7 +61,7 @@
panel_open = !panel_open
user.visible_message("<span class='warning'>[user] very carefully screws the mine's panel [panel_open ? "open" : "closed"].</span>",
"<span class='notice'>You very carefully screw the mine's panel [panel_open ? "open" : "closed"].</span>")
playsound(src.loc, W.usesound, 50, 1)
playsound(src, W.usesound, 50, 1)
else if((W.is_wirecutter() || istype(W, /obj/item/device/multitool)) && panel_open)
interact(user)
@@ -224,7 +224,7 @@
msg_admin_attack("[key_name_admin(user)] primed \a [src]")
user.visible_message("[user] starts priming \the [src.name].", "You start priming \the [src.name]. Hold still!")
if(do_after(user, 10 SECONDS))
playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
playsound(src, 'sound/weapons/armbomb.ogg', 75, 1, -3)
prime(user)
else
visible_message("[user] triggers \the [src.name]!", "You accidentally trigger \the [src.name]!")

2
code/game/objects/items.dm
View File

@@ -508,7 +508,7 @@ var/list/global/slot_flags_enumeration = list(
var/hit_zone = get_zone_with_miss_chance(U.zone_sel.selecting, M, U.get_accuracy_penalty(U))
if(!hit_zone)
U.do_attack_animation(M)
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
//visible_message("<span class='danger'>[U] attempts to stab [M] in the eyes, but misses!</span>")
for(var/mob/V in viewers(M))
V.show_message("<span class='danger'>[U] attempts to stab [M] in the eyes, but misses!</span>")

6
code/game/objects/items/bells.dm
View File

@@ -19,7 +19,7 @@
/obj/item/weapon/deskbell/attack(mob/target as mob, mob/living/user as mob)
if(!broken)
playsound(user.loc, 'sound/effects/deskbell.ogg', 50, 1)
playsound(src, 'sound/effects/deskbell.ogg', 50, 1)
..()
/obj/item/weapon/deskbell/attack_hand(mob/user)
@@ -61,12 +61,12 @@
/obj/item/weapon/deskbell/proc/ring(mob/user)
if(user.a_intent == "harm")
playsound(user.loc, 'sound/effects/deskbell_rude.ogg', 50, 1)
playsound(src, 'sound/effects/deskbell_rude.ogg', 50, 1)
to_chat(user,"<span class='notice'>You hammer [src] rudely!</span>")
if (prob(2))
break_bell(user)
else
playsound(user.loc, 'sound/effects/deskbell.ogg', 50, 1)
playsound(src, 'sound/effects/deskbell.ogg', 50, 1)
to_chat(user,"<span class='notice'>You gracefully ring [src].</span>")
/obj/item/weapon/deskbell/proc/check_ability(mob/user)

16
code/game/objects/items/devices/PDA/PDA.dm
View File

@@ -330,7 +330,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
/obj/item/device/pda/ai/attack_self(mob/user as mob)
if ((honkamt > 0) && (prob(60)))//For clown virus.
honkamt--
playsound(loc, 'sound/items/bikehorn.ogg', 30, 1)
playsound(src, 'sound/items/bikehorn.ogg', 30, 1)
return
@@ -774,7 +774,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
scanmode = 4
if("Honk")
if ( !(last_honk && world.time < last_honk + 20) )
playsound(loc, 'sound/items/bikehorn.ogg', 50, 1)
playsound(src, 'sound/items/bikehorn.ogg', 50, 1)
last_honk = world.time
if("Gas Scan")
if(scanmode == 5)
@@ -978,7 +978,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
if ((honkamt > 0) && (prob(60)))//For clown virus.
honkamt--
playsound(loc, 'sound/items/bikehorn.ogg', 30, 1)
playsound(src, 'sound/items/bikehorn.ogg', 30, 1)
return 1 // return 1 tells it to refresh the UI in NanoUI
@@ -1015,14 +1015,14 @@ var/global/list/obj/item/device/pda/PDAs = list()
var/datum/effect/effect/system/smoke_spread/chem/S = new /datum/effect/effect/system/smoke_spread/chem
S.attach(P.loc)
S.set_up(P, 10, 0, P.loc)
playsound(P.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
playsound(P, 'sound/effects/smoke.ogg', 50, 1, -3)
S.start()
message += "Large clouds of smoke billow forth from your [P]!"
if(i>=40 && i<=45) //Bad smoke
var/datum/effect/effect/system/smoke_spread/bad/B = new /datum/effect/effect/system/smoke_spread/bad
B.attach(P.loc)
B.set_up(P, 10, 0, P.loc)
playsound(P.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
playsound(P, 'sound/effects/smoke.ogg', 50, 1, -3)
B.start()
message += "Large clouds of noxious smoke billow forth from your [P]!"
if(i>=65 && i<=75) //Weaken
@@ -1059,7 +1059,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
var/mob/M = loc
M.put_in_hands(id)
to_chat(usr, "<span class='notice'>You remove the ID from the [name].</span>")
playsound(loc, 'sound/machines/id_swipe.ogg', 100, 1)
playsound(src, 'sound/machines/id_swipe.ogg', 100, 1)
else
id.loc = get_turf(src)
id = null
@@ -1146,7 +1146,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
/obj/item/device/pda/proc/new_info(var/beep_silent, var/message_tone, var/reception_message)
if (!beep_silent)
playsound(loc, 'sound/machines/twobeep.ogg', 50, 1)
playsound(src, 'sound/machines/twobeep.ogg', 50, 1)
for (var/mob/O in hearers(2, loc))
O.show_message(text("[bicon(src)] *[message_tone]*"))
//Search for holder of the PDA.
@@ -1275,7 +1275,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
if (cartridge.radio)
cartridge.radio.hostpda = null
to_chat(usr, "<span class='notice'>You remove \the [cartridge] from the [name].</span>")
playsound(loc, 'sound/machines/id_swipe.ogg', 100, 1)
playsound(src, 'sound/machines/id_swipe.ogg', 100, 1)
cartridge = null
/obj/item/device/pda/proc/id_check(mob/user as mob, choice as num)//To check for IDs; 1 for in-pda use, 2 for out of pda use.

6
code/game/objects/items/devices/chameleonproj.dm
View File

@@ -31,7 +31,7 @@
if(!proximity) return
if(!active_dummy)
if(istype(target,/obj/item) && !istype(target, /obj/item/weapon/disk/nuclear))
playsound(get_turf(src), 'sound/weapons/flash.ogg', 100, 1, -6)
playsound(src, 'sound/weapons/flash.ogg', 100, 1, -6)
to_chat(user, "<span class='notice'>Scanned [target].</span>")
saved_item = target.type
saved_icon = target.icon
@@ -42,7 +42,7 @@
if(!can_use || !saved_item) return
if(active_dummy)
eject_all()
playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6)
playsound(src, 'sound/effects/pop.ogg', 100, 1, -6)
qdel(active_dummy)
active_dummy = null
to_chat(usr, "<span class='notice'>You deactivate the [src].</span>")
@@ -51,7 +51,7 @@
flick("emppulse",T)
spawn(8) qdel(T)
else
playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6)
playsound(src, 'sound/effects/pop.ogg', 100, 1, -6)
var/obj/O = new saved_item(src)
if(!O) return
var/obj/effect/dummy/chameleon/C = new /obj/effect/dummy/chameleon(usr.loc)

2
code/game/objects/items/devices/communicator/messaging.dm
View File

@@ -76,7 +76,7 @@
return
if(ringer)
playsound(loc, 'sound/machines/twobeep.ogg', 50, 1)
playsound(src, 'sound/machines/twobeep.ogg', 50, 1)
for (var/mob/O in hearers(2, loc))
O.show_message(text("[bicon(src)] *beep*"))

2
code/game/objects/items/devices/communicator/phone.dm
View File

@@ -161,7 +161,7 @@
voice_requests |= candidate
if(ringer)
playsound(loc, 'sound/machines/twobeep.ogg', 50, 1)
playsound(src, 'sound/machines/twobeep.ogg', 50, 1)
for (var/mob/O in hearers(2, loc))
O.show_message(text("[bicon(src)] *beep*"))

26
code/game/objects/items/devices/defib.dm
View File

@@ -395,12 +395,12 @@
if(!do_after(user, 30, H))
return
user.visible_message("<span class='notice'>\The [user] places [src] on [H]'s chest.</span>", "<span class='warning'>You place [src] on [H]'s chest.</span>")
playsound(get_turf(src), 'sound/machines/defib_charge.ogg', 50, 0)
playsound(src, 'sound/machines/defib_charge.ogg', 50, 0)
var/error = can_defib(H)
if(error)
make_announcement(error, "warning")
playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
playsound(src, 'sound/machines/defib_failed.ogg', 50, 0)
return
if(check_blood_level(H))
@@ -413,18 +413,18 @@
//deduct charge here, in case the base unit was EMPed or something during the delay time
if(!checked_use(chargecost))
make_announcement("buzzes, \"Insufficient charge.\"", "warning")
playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
playsound(src, 'sound/machines/defib_failed.ogg', 50, 0)
return
H.visible_message("<span class='warning'>\The [H]'s body convulses a bit.</span>")
playsound(get_turf(src), "bodyfall", 50, 1)
playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
playsound(src, "bodyfall", 50, 1)
playsound(src, 'sound/machines/defib_zap.ogg', 50, 1, -1)
set_cooldown(cooldowntime)
error = can_revive(H)
if(error)
make_announcement(error, "warning")
playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
playsound(src, 'sound/machines/defib_failed.ogg', 50, 0)
return
H.apply_damage(burn_damage_amt, BURN, BP_TORSO)
@@ -438,7 +438,7 @@
H.adjustToxLoss(-H.getToxLoss())
make_announcement("pings, \"Resuscitation successful.\"", "notice")
playsound(get_turf(src), 'sound/machines/defib_success.ogg', 50, 0)
playsound(src, 'sound/machines/defib_success.ogg', 50, 0)
make_alive(H)
@@ -459,7 +459,7 @@
to_chat(user, "<span class='warning'>You can't do that while the safety is enabled.</span>")
return
playsound(get_turf(src), 'sound/machines/defib_charge.ogg', 50, 0)
playsound(src, 'sound/machines/defib_charge.ogg', 50, 0)
audible_message("<span class='warning'>\The [src] lets out a steadily rising hum...</span>")
if(!do_after(user, chargetime, H))
@@ -468,12 +468,12 @@
//deduct charge here, in case the base unit was EMPed or something during the delay time
if(!checked_use(chargecost))
make_announcement("buzzes, \"Insufficient charge.\"", "warning")
playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
playsound(src, 'sound/machines/defib_failed.ogg', 50, 0)
return
user.visible_message("<span class='danger'><i>\The [user] shocks [H] with \the [src]!</i></span>", "<span class='warning'>You shock [H] with \the [src]!</span>")
playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 100, 1, -1)
playsound(loc, 'sound/weapons/Egloves.ogg', 100, 1, -1)
playsound(src, 'sound/machines/defib_zap.ogg', 100, 1, -1)
playsound(src, 'sound/weapons/Egloves.ogg', 100, 1, -1)
set_cooldown(cooldowntime)
H.stun_effect_act(2, 120, target_zone)
@@ -547,10 +547,10 @@
safety = new_safety
if(safety)
make_announcement("beeps, \"Safety protocols enabled!\"", "notice")
playsound(get_turf(src), 'sound/machines/defib_safetyon.ogg', 50, 0)
playsound(src, 'sound/machines/defib_safetyon.ogg', 50, 0)
else
make_announcement("beeps, \"Safety protocols disabled!\"", "warning")
playsound(get_turf(src), 'sound/machines/defib_safetyoff.ogg', 50, 0)
playsound(src, 'sound/machines/defib_safetyoff.ogg', 50, 0)
update_icon()
..()

8
code/game/objects/items/devices/flash.dm
View File

@@ -48,7 +48,7 @@
user.visible_message("<span class='notice'>\The [user] successfully repairs \the [src]!</span>")
broken = FALSE
update_icon()
playsound(src.loc, W.usesound, 50, 1)
playsound(src, W.usesound, 50, 1)
else
user.visible_message("<span class='notice'>\The [user] fails to repair \the [src].</span>")
repairing = FALSE
@@ -138,7 +138,7 @@
if(user)
update_icon()
to_chat(user, "<span class='warning'><i>click</i></span>")
playsound(src.loc, 'sound/weapons/empty.ogg', 80, 1)
playsound(src, 'sound/weapons/empty.ogg', 80, 1)
return FALSE
else if(battery && battery.checked_use(charge_cost + (round(charge_cost / 4) * max(0, times_used - max_flashes)))) // Using over your maximum flashes starts taking more charge per added flash.
times_used++
@@ -164,7 +164,7 @@
if(!check_capacitor(user))
return
playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1)
playsound(src, 'sound/weapons/flash.ogg', 100, 1)
var/flashfail = 0
//VOREStation Add - NIF
@@ -253,7 +253,7 @@
if(!check_capacitor(user))
return
playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1)
playsound(src, 'sound/weapons/flash.ogg', 100, 1)
flick("flash2", src)
if(user && isrobot(user))
spawn(0)

4
code/game/objects/items/devices/flashlight.dm
View File

@@ -60,7 +60,7 @@
if(cell.use(power_usage) != power_usage) // we weren't able to use our full power_usage amount!
visible_message("<span class='warning'>\The [src] flickers before going dull.</span>")
set_light(0)
playsound(src.loc, 'sound/effects/sparks3.ogg', 10, 1, -3) //Small cue that your light went dull in your pocket.
playsound(src, 'sound/effects/sparks3.ogg', 10, 1, -3) //Small cue that your light went dull in your pocket.
on = 0
update_icon()
return PROCESS_KILL
@@ -109,7 +109,7 @@
START_PROCESSING(SSobj, src)
else if(power_use)
STOP_PROCESSING(SSobj, src)
playsound(src.loc, 'sound/weapons/empty.ogg', 15, 1, -3)
playsound(src, 'sound/weapons/empty.ogg', 15, 1, -3)
update_icon()
user.update_action_buttons()
return 1

2
code/game/objects/items/devices/hacktool.dm
View File

@@ -26,7 +26,7 @@
/obj/item/device/multitool/hacktool/attackby(var/obj/item/W, var/mob/user)
if(W.is_screwdriver())
in_hack_mode = !in_hack_mode
playsound(src.loc, W.usesound, 50, 1)
playsound(src, W.usesound, 50, 1)
else
..()

8
code/game/objects/items/devices/lightreplacer.dm
View File

@@ -96,7 +96,7 @@
new_bulbs += AddShards(1)
qdel(L)
if(new_bulbs != 0)
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
playsound(src, 'sound/machines/ding.ogg', 50, 1)
to_chat(user, "You insert \the [L.name] into \the [src.name]. You have [uses] light\s remaining.")
return
@@ -148,7 +148,7 @@
/obj/item/device/lightreplacer/proc/Use(var/mob/user)
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
playsound(src, 'sound/machines/click.ogg', 50, 1)
add_uses(-1)
return 1
@@ -182,7 +182,7 @@
var/new_bulbs = AddShards(1)
if(new_bulbs != 0)
to_chat(U, "<span class='notice'>\The [src] has fabricated a new bulb from the broken bulbs it has stored. It now has [uses] uses.</span>")
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
playsound(src, 'sound/machines/ding.ogg', 50, 1)
target.status = LIGHT_EMPTY
target.update()
@@ -211,7 +211,7 @@
/obj/item/device/lightreplacer/emag_act(var/remaining_charges, var/mob/user)
emagged = !emagged
playsound(src.loc, "sparks", 100, 1)
playsound(src, "sparks", 100, 1)
update_icon()
return 1

2
code/game/objects/items/devices/megaphone.dm
View File

@@ -134,7 +134,7 @@
user.audible_message("<B>[user.GetVoice()]</B>[user.GetAltName()] broadcasts, <FONT size=[broadcast_size] face='[broadcast_font]' color='[broadcast_color]'>\"[pick(insultmsg)]\"</FONT>")
if(broadcast_size >= 11)
var/turf/T = get_turf(user)
playsound(T, 'sound/items/AirHorn.ogg', 100, 1)
playsound(src, 'sound/items/AirHorn.ogg', 100, 1)
for(var/mob/living/carbon/M in oviewers(4, T))
if(M.get_ear_protection() >= 2)
continue

2
code/game/objects/items/devices/modkit.dm
View File

@@ -47,7 +47,7 @@
to_chat(user, "<span class='warning'>[O] must be safely placed on the ground for modification.</span>")
return
playsound(src.loc, O.usesound, 100, 1)
playsound(src, O.usesound, 100, 1)
user.visible_message("<span class='notice'>\The [user] opens \the [src] and modifies \the [O].</span>","<span class='notice'>You open \the [src] and modify \the [O].</span>")

2
code/game/objects/items/devices/traitordevices.dm
View File

@@ -50,7 +50,7 @@ effective or pretty fucking useless.
add_attack_logs(user,affected,"Used a [name]")
playsound(src.loc, 'sound/misc/interference.ogg', 50, 1)
playsound(src, 'sound/misc/interference.ogg', 50, 1)
to_chat(user, "<span class='notice'>You trigger [src].</span>")
times_used += 1
if(times_used >= max_uses)

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