diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm
index f5f3c6554f..3edaaf900f 100644
--- a/code/ATMOSPHERICS/components/unary/vent_pump.dm
+++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm
@@ -380,7 +380,7 @@
to_chat(user, "Now welding the vent.")
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("\The [user] welds the vent shut.", "You weld the vent shut.", "You hear welding.")
welded = 1
diff --git a/code/ATMOSPHERICS/pipes/simple.dm b/code/ATMOSPHERICS/pipes/simple.dm
index 215f3498b7..e0f6f7d951 100644
--- a/code/ATMOSPHERICS/pipes/simple.dm
+++ b/code/ATMOSPHERICS/pipes/simple.dm
@@ -78,7 +78,7 @@
/obj/machinery/atmospherics/pipe/simple/proc/burst()
src.visible_message("\The [src] bursts!");
- 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()
diff --git a/code/ZAS/Airflow.dm b/code/ZAS/Airflow.dm
index 59837bbe5f..4d92a42c35 100644
--- a/code/ZAS/Airflow.dm
+++ b/code/ZAS/Airflow.dm
@@ -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("\The [src] slams into \a [A]!",1,"You hear a loud slam!",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("\The [src] slams into \a [A]!",1,"You hear a loud slam!",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("[src] slams into [A]!",1,"You hear a loud slam!",2)
- playsound(src.loc, "punch", 25, 1, -1)
+ playsound(src, "punch", 25, 1, -1)
if (prob(33))
loc:add_blood(src)
bloody_body(src)
diff --git a/code/__defines/flags.dm b/code/__defines/flags.dm
index e59dac70c5..2ff8f44dba 100644
--- a/code/__defines/flags.dm
+++ b/code/__defines/flags.dm
@@ -29,8 +29,7 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
#define OPENCONTAINER (1<<4) // Is an open container for chemistry purposes.
#define PHORONGUARD (1<<5) // Does not get contaminated by phoron.
#define NOREACT (1<<6) // Reagents don't react inside this container.
-#define PROXMOVE (1<<7)// Does this object require proximity checking in Enter()?
-#define OVERLAY_QUEUED (1<<8)// Atom queued to SSoverlay for COMPILE_OVERLAYS
+#define OVERLAY_QUEUED (1<<7)// Atom queued to SSoverlay for COMPILE_OVERLAYS
//Flags for items (equipment) - Used in /obj/item/var/item_flags
#define THICKMATERIAL (1<<0) // Prevents syringes, parapens and hyposprays if equipped to slot_suit or slot_head.
diff --git a/code/_helpers/game.dm b/code/_helpers/game.dm
index 438483b07b..16fdec7bd0 100644
--- a/code/_helpers/game.dm
+++ b/code/_helpers/game.dm
@@ -231,35 +231,43 @@
. = list()
// Returns a list of mobs who can hear any of the radios given in @radios
var/list/speaker_coverage = list()
- for(var/obj/item/device/radio/R in radios)
- if(R)
- //Cyborg checks. Receiving message uses a bit of cyborg's charge.
- var/obj/item/device/radio/borg/BR = R
- if(istype(BR) && BR.myborg)
- var/mob/living/silicon/robot/borg = BR.myborg
- var/datum/robot_component/CO = borg.get_component("radio")
- if(!CO)
- continue //No radio component (Shouldn't happen)
- if(!borg.is_component_functioning("radio") || !borg.cell_use_power(CO.active_usage))
- continue //No power.
-
- var/turf/speaker = get_turf(R)
- if(speaker)
- for(var/turf/T in hear(R.canhear_range,speaker))
- speaker_coverage[T] = R
+ for(var/r in radios)
+ var/obj/item/device/radio/R = r // You better fucking be a radio.
+ var/turf/speaker = get_turf(R)
+ if(speaker)
+ for(var/turf/T in hear(R.canhear_range,speaker))
+ speaker_coverage[T] = R
// Try to find all the players who can hear the message
for(var/i = 1; i <= player_list.len; i++)
var/mob/M = player_list[i]
- if(M)
- var/turf/ear = get_turf(M)
- if(ear)
- // Ghostship is magic: Ghosts can hear radio chatter from anywhere
- if(speaker_coverage[ear] || (istype(M, /mob/observer/dead) && M.is_preference_enabled(/datum/client_preference/ghost_radio)))
- . |= M // Since we're already looping through mobs, why bother using |= ? This only slows things down.
+ if(M.can_hear_radio(speaker_coverage))
+ . += M
return .
+/mob/proc/can_hear_radio(var/list/hearturfs)
+ return FALSE
+
+/mob/living/can_hear_radio(var/list/hearturfs)
+ return get_turf(src) in hearturfs
+
+/mob/living/silicon/robot/can_hear_radio(var/list/hearturfs)
+ var/turf/T = get_turf(src)
+ var/obj/item/device/radio/borg/R = hearturfs[T] // this should be an assoc list of turf-to-radio
+
+ // We heard it on our own radio? We use power for that.
+ if(istype(R) && R.myborg == src)
+ var/datum/robot_component/CO = get_component("radio")
+ if(!CO || !is_component_functioning("radio") || !cell_use_power(CO.active_usage))
+ return FALSE // Sorry, couldn't hear
+
+ return R // radio, true, false, what's the difference
+
+/mob/observer/dead/can_hear_radio(var/list/hearturfs)
+ return is_preference_enabled(/datum/client_preference/ghost_radio)
+
+
//Uses dview to quickly return mobs and objects in view,
// then adds additional mobs or objects if they are in range 'smartly',
// based on their presence in lists of players or registered objects
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 64ab38420d..5b7a043569 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -292,7 +292,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()
diff --git a/code/_onclick/hud/skybox.dm b/code/_onclick/hud/skybox.dm
index 492a11e588..8c1e3c10b5 100644
--- a/code/_onclick/hud/skybox.dm
+++ b/code/_onclick/hud/skybox.dm
@@ -50,11 +50,9 @@
if(. && client)
client.update_skybox(old_z != get_z(src))
-/mob/forceMove()
- var/old_z = get_z(src)
+/mob/Moved()
. = ..()
- if(. && client)
- client.update_skybox(old_z != get_z(src))
+ client?.update_skybox()
/mob/set_viewsize()
. = ..()
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index decc371475..54fc3239ac 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -97,7 +97,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)
diff --git a/code/controllers/subsystems/open_space.dm b/code/controllers/subsystems/open_space.dm
index dfc1319009..4e96dbfda4 100644
--- a/code/controllers/subsystems/open_space.dm
+++ b/code/controllers/subsystems/open_space.dm
@@ -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))
diff --git a/code/datums/observation/turf_enterexit.dm b/code/datums/observation/turf_enterexit.dm
new file mode 100644
index 0000000000..30cec0c39d
--- /dev/null
+++ b/code/datums/observation/turf_enterexit.dm
@@ -0,0 +1,33 @@
+// Observer Pattern Implementation: Turf Entered/Exited
+// Registration type: /turf
+//
+// Raised when: A /turf has a new item in contents, or an item has left it's contents
+//
+// Arguments that the called proc should expect:
+// /turf: The turf that was entered/exited
+// /atom/movable/moving_instance: The instance that entered/exited
+// /atom/old_loc / /atom/new_loc: The previous/new loc of the mover
+
+
+GLOBAL_DATUM_INIT(turf_entered_event, /decl/observ/turf_entered, new)
+GLOBAL_DATUM_INIT(turf_exited_event, /decl/observ/turf_exited, new)
+
+/decl/observ/turf_entered
+ name = "Turf Entered"
+ expected_type = /turf
+
+/decl/observ/turf_exited
+ name = "Turf Exited"
+ expected_type = /turf
+
+/********************
+* Movement Handling *
+********************/
+
+/turf/Entered(var/atom/movable/am, var/atom/old_loc)
+ . = ..()
+ GLOB.turf_entered_event.raise_event(src, am, old_loc)
+
+/turf/Exited(var/atom/movable/am, var/atom/new_loc)
+ . = ..()
+ GLOB.turf_exited_event.raise_event(src, am, new_loc)
\ No newline at end of file
diff --git a/code/defines/obj.dm b/code/defines/obj.dm
index 7308083ae6..de7800acfb 100644
--- a/code/defines/obj.dm
+++ b/code/defines/obj.dm
@@ -29,7 +29,6 @@
density = 0
unacidable = 1//Just to be sure.
var/def_zone
- flags = PROXMOVE
pass_flags = PASSTABLE
diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm
index 963530d671..b7d2c3f323 100644
--- a/code/game/area/Space Station 13 areas.dm
+++ b/code/game/area/Space Station 13 areas.dm
@@ -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
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index c93b6d78dc..ad349fe29e 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -336,7 +336,7 @@ var/list/mob/living/forced_ambiance_list = new
H.AdjustStunned(3)
H.AdjustWeakened(3)
to_chat(mob, "The sudden appearance of gravity makes you fall to the floor!")
- 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()
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 0bc5c14cf8..671bdf0b10 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -118,15 +118,33 @@
/atom/proc/CheckExit()
return 1
-// If you want to use this, the atom must have the PROXMOVE flag, and the moving
-// atom must also have the PROXMOVE flag currently to help with lag. ~ ComicIronic
-/atom/proc/HasProximity(atom/movable/AM as mob|obj)
+// Used to be for the PROXMOVE flag, but that was terrible, so instead it's just here as a stub for
+// all the atoms that still have the proc, but get events other ways.
+/atom/proc/HasProximity(turf/T, atom/movable/AM, old_loc)
return
+//Register listeners on turfs in a certain range
+/atom/proc/sense_proximity(var/range = 1, var/callback)
+ ASSERT(callback)
+ ASSERT(isturf(loc))
+ var/list/turfs = trange(range, src)
+ for(var/t in turfs)
+ var/turf/T = t
+ GLOB.turf_entered_event.register(T, src, callback)
+
+//Unregister from prox listening in a certain range. You should do this BEFORE you move, but if you
+// really can't, then you can set the center where you moved from.
+/atom/proc/unsense_proximity(var/range = 1, var/callback, var/center)
+ ASSERT(isturf(center) || isturf(loc))
+ var/list/turfs = trange(range, center ? center : src)
+ for(var/t in turfs)
+ var/turf/T = t
+ GLOB.turf_entered_event.unregister(T, src, callback)
+
+
/atom/proc/emp_act(var/severity)
return
-
/atom/proc/bullet_act(obj/item/projectile/P, def_zone)
P.on_hit(src, 0, def_zone)
. = 0
diff --git a/code/game/gamemodes/changeling/powers/armblade.dm b/code/game/gamemodes/changeling/powers/armblade.dm
index 664e6191ae..4a84fde371 100644
--- a/code/game/gamemodes/changeling/powers/armblade.dm
+++ b/code/game/gamemodes/changeling/powers/armblade.dm
@@ -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("\The [user] parries [attack_text] with \the [src]!")
- 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("\The [user] deflects [attack_text] with \the [src]!")
- playsound(user.loc, 'sound/weapons/slash.ogg', 50, 1)
+ playsound(src, 'sound/weapons/slash.ogg', 50, 1)
return 1
return 0
diff --git a/code/game/gamemodes/cult/construct_spells.dm b/code/game/gamemodes/cult/construct_spells.dm
index 64c97a30f4..954361fb9f 100644
--- a/code/game/gamemodes/cult/construct_spells.dm
+++ b/code/game/gamemodes/cult/construct_spells.dm
@@ -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
diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm
index 8560582ee8..827e9730da 100644
--- a/code/game/gamemodes/cult/cult_items.dm
+++ b/code/game/gamemodes/cult/cult_items.dm
@@ -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
diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm
index b9d434902e..bbf4bfb343 100644
--- a/code/game/gamemodes/cult/cult_structures.dm
+++ b/code/game/gamemodes/cult/cult_structures.dm
@@ -57,7 +57,7 @@
if(prob(1+ damage * 5))
visible_message("[shatter_message]")
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)
diff --git a/code/game/gamemodes/events/dust.dm b/code/game/gamemodes/events/dust.dm
index 400ae1058d..526164cd58 100644
--- a/code/game/gamemodes/events/dust.dm
+++ b/code/game/gamemodes/events/dust.dm
@@ -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
diff --git a/code/game/gamemodes/events/holidays/Christmas.dm b/code/game/gamemodes/events/holidays/Christmas.dm
index 66e329ac1a..c34f370a33 100644
--- a/code/game/gamemodes/events/holidays/Christmas.dm
+++ b/code/game/gamemodes/events/holidays/Christmas.dm
@@ -40,7 +40,7 @@
"What do you get from eating tree decorations?\n\nTinsilitis!",
"What do snowmen wear on their heads?\n\nIce caps!",
"Why is Christmas just like life on ss13?\n\nYou do all the work and the fat guy gets all the credit.",
- "Why doesn’t Santa have any children?\n\nBecause he only comes down the chimney.")
+ "Why doesn't Santa have any children?\n\nBecause he only comes down the chimney.")
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 ..()
diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm
index 5447431279..62406c3877 100644
--- a/code/game/gamemodes/nuclear/pinpointer.dm
+++ b/code/game/gamemodes/nuclear/pinpointer.dm
@@ -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("Shuttle Locator active.") //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("Authentication Disk Locator active.")
return
diff --git a/code/game/gamemodes/technomancer/devices/shield_armor.dm b/code/game/gamemodes/technomancer/devices/shield_armor.dm
index c8e8130adc..7618708aad 100644
--- a/code/game/gamemodes/technomancer/devices/shield_armor.dm
+++ b/code/game/gamemodes/technomancer/devices/shield_armor.dm
@@ -70,7 +70,7 @@
to_chat(user, "Your shield has absorbed most of \the [damage_source].")
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)
diff --git a/code/game/gamemodes/technomancer/devices/tesla_armor.dm b/code/game/gamemodes/technomancer/devices/tesla_armor.dm
index 86d6f82b08..124e1ed1f3 100644
--- a/code/game/gamemodes/technomancer/devices/tesla_armor.dm
+++ b/code/game/gamemodes/technomancer/devices/tesla_armor.dm
@@ -81,4 +81,4 @@
lightning.old_style_target(target)
lightning.fire()
visible_message("\The [src] strikes \the [target] with lightning!")
- playsound(get_turf(src), 'sound/weapons/gauss_shoot.ogg', 75, 1)
\ No newline at end of file
+ playsound(src, 'sound/weapons/gauss_shoot.ogg', 75, 1)
\ No newline at end of file
diff --git a/code/game/gamemodes/technomancer/spells/audible_deception.dm b/code/game/gamemodes/technomancer/spells/audible_deception.dm
index c8a66fac3c..1914b72f14 100644
--- a/code/game/gamemodes/technomancer/spells/audible_deception.dm
+++ b/code/game/gamemodes/technomancer/spells/audible_deception.dm
@@ -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(src, selected_sound, 80, 1, -1)
adjust_instability(1)
// Air Horn time.
if(selected_sound == 'sound/items/AirHorn.ogg' && pay_energy(3800))
diff --git a/code/game/gamemodes/technomancer/spells/instability_tap.dm b/code/game/gamemodes/technomancer/spells/instability_tap.dm
index 13a2b5e318..ad2c72518b 100644
--- a/code/game/gamemodes/technomancer/spells/instability_tap.dm
+++ b/code/game/gamemodes/technomancer/spells/instability_tap.dm
@@ -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)
\ No newline at end of file
diff --git a/code/game/gamemodes/technomancer/spells/oxygenate.dm b/code/game/gamemodes/technomancer/spells/oxygenate.dm
index 61c6367260..b36f17c726 100644
--- a/code/game/gamemodes/technomancer/spells/oxygenate.dm
+++ b/code/game/gamemodes/technomancer/spells/oxygenate.dm
@@ -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)
\ No newline at end of file
diff --git a/code/game/gamemodes/technomancer/spells/projectile/projectile.dm b/code/game/gamemodes/technomancer/spells/projectile/projectile.dm
index a52bb2e584..62ae49b0f0 100644
--- a/code/game/gamemodes/technomancer/spells/projectile/projectile.dm
+++ b/code/game/gamemodes/technomancer/spells/projectile/projectile.dm
@@ -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
diff --git a/code/game/gamemodes/technomancer/spells/reflect.dm b/code/game/gamemodes/technomancer/spells/reflect.dm
index 47ed0663f2..756e9e27fc 100644
--- a/code/game/gamemodes/technomancer/spells/reflect.dm
+++ b/code/game/gamemodes/technomancer/spells/reflect.dm
@@ -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!")
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.")
diff --git a/code/game/gamemodes/technomancer/spells/shield.dm b/code/game/gamemodes/technomancer/spells/shield.dm
index 6bcbda5ec4..b11d5590b0 100644
--- a/code/game/gamemodes/technomancer/spells/shield.dm
+++ b/code/game/gamemodes/technomancer/spells/shield.dm
@@ -55,7 +55,7 @@
if(check_shield_arc(user, bad_arc, damage_source, attacker))
user.visible_message("\The [user]'s [src] blocks [attack_text]!")
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
diff --git a/code/game/machinery/CableLayer.dm b/code/game/machinery/CableLayer.dm
index d954a80b29..8edc131ac8 100644
--- a/code/game/machinery/CableLayer.dm
+++ b/code/game/machinery/CableLayer.dm
@@ -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
diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm
index 3d76b02e0f..b45d00c3f7 100644
--- a/code/game/machinery/air_alarm.dm
+++ b/code/game/machinery/air_alarm.dm
@@ -116,7 +116,7 @@
/obj/machinery/alarm/proc/first_run()
alarm_area = get_area(src)
- area_uid = "\ref[alarm_area]"
+ area_uid = "\ref[alarm_area]"
if(name == "alarm")
name = "[alarm_area.name] Air Alarm"
@@ -188,7 +188,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)
@@ -196,7 +196,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)
diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm
index 3833c72ee4..3a012a1ccd 100644
--- a/code/game/machinery/atmoalter/canister.dm
+++ b/code/game/machinery/atmoalter/canister.dm
@@ -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()
diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm
index 3b6df894b5..879551493d 100644
--- a/code/game/machinery/atmoalter/scrubber.dm
+++ b/code/game/machinery/atmoalter/scrubber.dm
@@ -213,7 +213,7 @@
return
anchored = !anchored
- playsound(src.loc, I.usesound, 50, 1)
+ playsound(src, I.usesound, 50, 1)
to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].")
return
diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm
index 0865a3ec55..d8bd9ba1d1 100644
--- a/code/game/machinery/biogenerator.dm
+++ b/code/game/machinery/biogenerator.dm
@@ -163,11 +163,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"
diff --git a/code/game/machinery/bioprinter.dm b/code/game/machinery/bioprinter.dm
index 853029b217..034a7fe243 100644
--- a/code/game/machinery/bioprinter.dm
+++ b/code/game/machinery/bioprinter.dm
@@ -283,7 +283,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("\The [src] dings, then spits out \a [O].")
return O
@@ -348,7 +348,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("\The [src] dings, then spits out \a [O].")
return O
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index 27e7b5a7bd..5357711d9e 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -81,6 +81,8 @@
..()
/obj/machinery/camera/Destroy()
+ if(isMotion())
+ unsense_proximity(callback = .HasProximity)
deactivate(null, 0) //kick anyone viewing out
if(assembly)
qdel(assembly)
@@ -150,7 +152,7 @@
user.do_attack_animation(src)
user.setClickCooldown(user.get_attack_speed())
visible_message("\The [user] slashes at [src]!")
- playsound(src.loc, 'sound/weapons/slash.ogg', 100, 1)
+ playsound(src, 'sound/weapons/slash.ogg', 100, 1)
add_hiddenprint(user)
destroy()
@@ -161,7 +163,7 @@
S.do_attack_animation(src)
S.setClickCooldown(user.get_attack_speed())
visible_message("\The [user] [pick(S.attacktext)] \the [src]!")
- playsound(src.loc, S.attack_sound, 100, 1)
+ playsound(src, S.attack_sound, 100, 1)
add_hiddenprint(user)
destroy()
..()
@@ -175,7 +177,7 @@
panel_open = !panel_open
user.visible_message("[user] screws the camera's panel [panel_open ? "open" : "closed"]!",
"You screw the camera's panel [panel_open ? "open" : "closed"].")
- 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)
@@ -250,7 +252,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
@@ -270,7 +272,7 @@
visible_message(" [user] has deactivated [src]!")
else
visible_message(" [src] clicks and shuts down. ")
- 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
@@ -278,7 +280,7 @@
visible_message(" [user] has reactivated [src]!")
else
visible_message(" [src] clicks and reactivates itself. ")
- 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)
@@ -300,7 +302,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)
@@ -396,7 +398,7 @@
// Do after stuff here
to_chat(user, "You start to weld [src]..")
- 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))
diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm
index 31877f868e..69fb773c6d 100644
--- a/code/game/machinery/camera/camera_assembly.dm
+++ b/code/game/machinery/camera/camera_assembly.dm
@@ -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, "You start to weld the [src]..")
- 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))
diff --git a/code/game/machinery/camera/motion.dm b/code/game/machinery/camera/motion.dm
index eac1f89386..ad183a7be8 100644
--- a/code/game/machinery/camera/motion.dm
+++ b/code/game/machinery/camera/motion.dm
@@ -3,15 +3,13 @@
var/detectTime = 0
var/area/ai_monitored/area_motion = null
var/alarm_delay = 100 // Don't forget, there's another 10 seconds in queueAlarm()
- flags = PROXMOVE
/obj/machinery/camera/internal_process()
// motion camera event loop
if (stat & (EMPED|NOPOWER))
return
if(!isMotion())
- . = PROCESS_KILL
- return
+ return PROCESS_KILL
if (detectTime > 0)
var/elapsed = world.time - detectTime
if (elapsed > alarm_delay)
@@ -56,7 +54,7 @@
detectTime = -1
return 1
-/obj/machinery/camera/HasProximity(atom/movable/AM as mob|obj)
+/obj/machinery/camera/HasProximity(turf/T, atom/movable/AM, old_loc)
// Motion cameras outside of an "ai monitored" area will use this to detect stuff.
if (!area_motion)
if(isliving(AM))
diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm
index 15b5f7abca..f625fb9546 100644
--- a/code/game/machinery/camera/presets.dm
+++ b/code/game/machinery/camera/presets.dm
@@ -212,9 +212,12 @@ var/global/list/engineering_networks = list(
update_coverage()
/obj/machinery/camera/proc/upgradeMotion()
+ if(!isturf(loc))
+ return //nooooo
assembly.upgrades.Add(new /obj/item/device/assembly/prox_sensor(assembly))
setPowerUsage()
START_MACHINE_PROCESSING(src)
+ sense_proximity(callback = .HasProximity)
update_coverage()
/obj/machinery/camera/proc/setPowerUsage()
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 0e184bfc90..019ed86bea 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -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
diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm
index 8a88948ee0..397366c6c2 100644
--- a/code/game/machinery/computer/ai_core.dm
+++ b/code/game/machinery/computer/ai_core.dm
@@ -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, "You wrench the frame into place.")
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, "You deconstruct the frame.")
@@ -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, "You unfasten the frame.")
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, "You place the circuit board inside the frame.")
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, "You screw the circuit board into place.")
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, "You remove the circuit board.")
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, "You unfasten the circuit board.")
state = 1
icon_state = "1"
@@ -69,7 +69,7 @@
to_chat(user, "You need five coils of wire to add them to the frame.")
return
to_chat(user, "You start to add cables to the frame.")
- 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, "You remove the cables.")
state = 2
icon_state = "2"
@@ -94,7 +94,7 @@
to_chat(user, "You need two sheets of glass to put in the glass panel.")
return
to_chat(user, "You start to put in the glass panel.")
- 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, "You put in the glass panel.")
@@ -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, "You remove the brain.")
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, "You remove the glass panel.")
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, "You connect the monitor.")
if(!brain)
var/open_for_latejoin = alert(user, "Would you like this core to be open for latejoining AIs?", "Latejoin", "Yes", "Yes", "No") == "Yes"
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index 960ce3dc35..054c9c2cc3 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -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, "You wrench the frame into place.")
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, "You deconstruct the frame.")
@@ -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, "You unfasten the frame.")
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, "You place the circuit board inside the frame.")
src.icon_state = "1"
src.circuit = P
@@ -49,12 +49,12 @@
else
to_chat(user, "This frame does not accept circuit boards of this type!")
if(P.is_screwdriver() && circuit)
- playsound(src.loc, P.usesound, 50, 1)
+ playsound(src, P.usesound, 50, 1)
to_chat(user, "You screw the circuit board into place.")
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, "You remove the circuit board.")
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, "You unfasten the circuit board.")
src.state = 1
src.icon_state = "1"
@@ -72,7 +72,7 @@
to_chat(user, "You need five coils of wire to add them to the frame.")
return
to_chat(user, "You start to add cables to the frame.")
- 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, "You add cables to the frame.")
@@ -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, "You remove the cables.")
src.state = 2
src.icon_state = "2"
@@ -92,7 +92,7 @@
if (G.get_amount() < 2)
to_chat(user, "You need two sheets of glass to put in the glass panel.")
return
- playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
+ playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
to_chat(user, "You start to put in the glass panel.")
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, "You remove the glass panel.")
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, "You connect the monitor.")
var/B = new src.circuit.build_path ( src.loc )
src.circuit.construct(B)
diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm
index 441970a8cb..dbd5ba8383 100644
--- a/code/game/machinery/computer/pod.dm
+++ b/code/game/machinery/computer/pod.dm
@@ -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, "The broken glass falls out.")
diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index aa9c230e22..3717da58c5 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -33,7 +33,7 @@
if (C.get_amount() < 5)
to_chat(user, "You need five lengths of cable to add them to the frame.")
return
- playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
+ playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
to_chat(user, "You start to add cables to the frame.")
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, "You add the circuit board to the frame.")
circuit = P
user.drop_item()
@@ -72,7 +72,7 @@
to_chat(user, "This frame does not accept circuit boards of this type!")
else
if(P.is_wirecutter())
- playsound(src.loc, P.usesound, 50, 1)
+ playsound(src, P.usesound, 50, 1)
to_chat(user, "You remove the cables.")
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)
diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
index 42725bbe28..05eb9c322c 100644
--- a/code/game/machinery/deployable.dm
+++ b/code/game/machinery/deployable.dm
@@ -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("[user] [attack_verb] the [src]!")
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)
diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm
index e4a81d675c..b8f7acd5bf 100644
--- a/code/game/machinery/door_control.dm
+++ b/code/game/machinery/door_control.dm
@@ -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)
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index cd01d861c9..f5c42b8bb6 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -73,7 +73,7 @@
if(do_after(user,5 SECONDS,src))
visible_message("\The [user] forces \the [src] open, sparks flying from its electronics!")
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()
@@ -82,7 +82,7 @@
else if(src.density)
visible_message("\The [user] begins forcing \the [src] open!")
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("\The [user] forces \the [src] open!")
open(1)
else
@@ -900,7 +900,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
@@ -1020,9 +1020,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()
@@ -1104,7 +1104,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
close_door_at = world.time + 6
return
@@ -1117,9 +1117,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)
diff --git a/code/game/machinery/doors/blast_door.dm b/code/game/machinery/doors/blast_door.dm
index 5ff587a7d9..136b793f10 100644
--- a/code/game/machinery/doors/blast_door.dm
+++ b/code/game/machinery/doors/blast_door.dm
@@ -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("\The [user] hits \the [src] with \the [W] with no visible effect.")
else
user.visible_message("\The [user] forcefully strikes \the [src] with \the [W]!")
- 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("\The [user] hits \the [src] with \the [W] with no visible effect.")
else
user.visible_message("\The [user] forcefully strikes \the [src] with \the [W]!")
- 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("\The [user] begins forcing \the [src] open!")
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("\The [user] forces \the [src] open!")
force_open(1)
else
visible_message("\The [user] begins forcing \the [src] closed!")
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("\The [user] forces \the [src] closed!")
force_close(1)
else
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 57d7a4eebf..8b8fa2da51 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -194,7 +194,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
@@ -280,7 +280,7 @@
user.visible_message("\The [user] hits \the [src] with \the [W] with no visible effect.")
else
user.visible_message("\The [user] forcefully strikes \the [src] with \the [W]!")
- playsound(src.loc, hitsound, 100, 1)
+ playsound(src, hitsound, 100, 1)
take_damage(W.force)
return
@@ -405,7 +405,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
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index e4c83ef1bf..52ea077669 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -200,14 +200,14 @@
if(src.blocked)
visible_message("\The [user] begins digging into \the [src] internals!")
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("\The [user] begins forcing \the [src] open!")
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("\The [user] forces \the [src] open!")
open(1)
else
diff --git a/code/game/machinery/doors/firedoor_assembly.dm b/code/game/machinery/doors/firedoor_assembly.dm
index 4eeec7c5ff..aa857d5065 100644
--- a/code/game/machinery/doors/firedoor_assembly.dm
+++ b/code/game/machinery/doors/firedoor_assembly.dm
@@ -32,7 +32,7 @@ obj/structure/firedoor_assembly/attackby(obj/item/C, mob/user as mob)
to_chat(user, "You wire \the [src].")
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("[user] has inserted a circuit into \the [src]!",
"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, "You must secure \the [src] first!")
else if(C.is_wrench())
anchored = !anchored
- playsound(src.loc, C.usesound, 50, 1)
+ playsound(src, C.usesound, 50, 1)
user.visible_message("[user] has [anchored ? "" : "un" ]secured \the [src]!",
"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("[user] adds [S.name] to \the [src].",
"You start to install [S.name] into \the [src].")
if(do_after(user, 40, src) && !glass && S.use(1))
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index f7b8a1222d..98fb1c75d8 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -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("[user] smashes against the [src.name].", 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("The glass door was sliced open by [user]!")
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("[src] was hit by [I].")
if(I.damtype == BRUTE || I.damtype == BURN)
take_damage(aforce)
diff --git a/code/game/machinery/fire_alarm.dm b/code/game/machinery/fire_alarm.dm
index a9b4a0705e..fa95fed959 100644
--- a/code/game/machinery/fire_alarm.dm
+++ b/code/game/machinery/fire_alarm.dm
@@ -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)
diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm
index 572977ceb4..ad82ffd656 100644
--- a/code/game/machinery/flasher.dm
+++ b/code/game/machinery/flasher.dm
@@ -13,7 +13,6 @@
anchored = 1
use_power = USE_POWER_IDLE
idle_power_usage = 2
- flags = PROXMOVE
/obj/machinery/flasher/portable //Portable version of the flasher. Only flashes when anchored
name = "portable flasher"
@@ -57,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)
@@ -92,13 +91,13 @@
flash()
..(severity)
-/obj/machinery/flasher/portable/HasProximity(atom/movable/AM as mob|obj)
- if((disable) || (last_flash && world.time < last_flash + 150))
+/obj/machinery/flasher/portable/HasProximity(turf/T, atom/movable/AM, oldloc)
+ if(disable || !anchored || (last_flash && world.time < last_flash + 150))
return
- if(istype(AM, /mob/living/carbon))
+ if(iscarbon(AM))
var/mob/living/carbon/M = AM
- if((M.m_intent != "walk") && (anchored))
+ if(M.m_intent != "walk")
flash()
/obj/machinery/flasher/portable/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -108,11 +107,13 @@
if(!anchored)
user.show_message(text("[src] can now be moved."))
- overlays.Cut()
-
+ cut_overlays()
+ unsense_proximity(callback = .HasProximity)
+
else if(anchored)
user.show_message(text("[src] is now secured."))
- overlays += "[base_state]-s"
+ add_overlay("[base_state]-s")
+ sense_proximity(callback = .HasProximity)
/obj/machinery/button/flasher
name = "flasher button"
diff --git a/code/game/machinery/floor_light.dm b/code/game/machinery/floor_light.dm
index de51359855..09296ac302 100644
--- a/code/game/machinery/floor_light.dm
+++ b/code/game/machinery/floor_light.dm
@@ -31,7 +31,7 @@ var/list/floor_light_cache = list()
if(!WT.remove_fuel(0, user))
to_chat(user, "\The [src] 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))
return
if(!src || !WT.isOn())
@@ -53,7 +53,7 @@ var/list/floor_light_cache = list()
stat |= BROKEN
else
visible_message("\The [user] attacks \the [src]!")
- 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
diff --git a/code/game/machinery/frame.dm b/code/game/machinery/frame.dm
index 789773e8c3..209a06edab 100644
--- a/code/game/machinery/frame.dm
+++ b/code/game/machinery/frame.dm
@@ -274,7 +274,7 @@
if(P.is_wrench())
if(state == FRAME_PLACED && !anchored)
to_chat(user, "You start to wrench the frame into place.")
- 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)
@@ -295,7 +295,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, "You deconstruct the frame.")
@@ -311,7 +311,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, "You place the circuit board inside the frame.")
circuit = P
user.drop_item()
@@ -464,7 +464,7 @@
to_chat(user, "You need five coils of wire to add them to the frame.")
return
to_chat(user, "You start to add cables to the frame.")
- 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, "You add cables to the frame.")
@@ -475,7 +475,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)
@@ -524,7 +524,7 @@
if(G.get_amount() < 2)
to_chat(user, "You need two sheets of glass to put in the glass panel.")
return
- playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
+ playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
to_chat(user, "You start to put in the glass panel.")
if(do_after(user, 20) && state == FRAME_WIRED)
if(G.use(2))
@@ -536,7 +536,7 @@
if(G.get_amount() < 2)
to_chat(user, "You need two sheets of glass to put in the glass panel.")
return
- playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
+ playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
to_chat(user, "You start to put in the glass panel.")
if(do_after(user, 20) && state == FRAME_WIRED)
if(G.use(2))
@@ -548,7 +548,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)
diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm
index 344a800acf..b2bacc13d9 100644
--- a/code/game/machinery/jukebox.dm
+++ b/code/game/machinery/jukebox.dm
@@ -142,7 +142,7 @@ datum/track/New(var/title_name, var/audio)
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
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index c964416c03..4c05222f49 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -306,7 +306,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())
@@ -371,7 +371,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( \
@@ -432,12 +432,12 @@ Class Procs:
if(!panel_open)
return 0
user.visible_message("[user] has cut the wires inside \the [src]!", "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
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index 5383eb67fd..ff16c8d044 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -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("[name] beeps, \"Attention! Wanted issue distributed!\"",2)
- playsound(src.loc, 'sound/machines/warning-buzzer.ogg', 75, 1)
+ playsound(src, 'sound/machines/warning-buzzer.ogg', 75, 1)
return
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index b67f3738bd..436f738efc 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -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, "You secure the exterior bolts on the turret.")
else if(anchored)
- playsound(loc, I.usesound, 100, 1)
+ playsound(src, I.usesound, 100, 1)
anchored = FALSE
to_chat(user, "You unsecure the exterior bolts on the turret.")
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, "You secure the external bolts.")
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, "You dismantle the turret construction.")
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, "You unfasten the external bolts.")
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, "You bolt the metal armor into place.")
build_step = 3
return
@@ -1012,7 +1012,7 @@
to_chat(user, "You need more fuel to complete this task.")
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, "You remove the turret's metal armor bolts.")
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, "You close the internal access hatch.")
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, "You open the internal access hatch.")
return
@@ -1088,7 +1088,7 @@
if(WT.get_fuel() < 5)
to_chat(user, "You need more fuel to complete this task.")
- 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, "You pry off the turret's exterior armor.")
new /obj/item/stack/material/steel(loc, 2)
build_step = 6
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index 9a50c34aad..ab78094832 100644
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -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))
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index 8c2b1729cb..664d1c686f 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -206,7 +206,7 @@
protected = 1
if(!protected)
- playsound(src.loc, "sparks", 75, 1, -1)
+ playsound(src, "sparks", 75, 1, -1)
to_chat(user, "You try to touch the controls but you get zapped. There must be a short circuit somewhere.")
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, "You try to touch the controls but you get zapped. There must be a short circuit somewhere.")
return*/
else
diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm
index f04cf7076a..8cd1d8811e 100644
--- a/code/game/machinery/telecomms/logbrowser.dm
+++ b/code/game/machinery/telecomms/logbrowser.dm
@@ -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, "You you disable the security protocols")
src.updateUsrDialog()
diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm
index 819108b2ce..51a6ebf991 100644
--- a/code/game/machinery/telecomms/telemonitor.dm
+++ b/code/game/machinery/telecomms/telemonitor.dm
@@ -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, "You you disable the security protocols")
src.updateUsrDialog()
diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm
index 686a764ada..51c09d95e3 100644
--- a/code/game/machinery/telecomms/traffic_control.dm
+++ b/code/game/machinery/telecomms/traffic_control.dm
@@ -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, "You you disable the security protocols")
src.updateUsrDialog()
diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm
index c9c8ba20ae..621feae713 100644
--- a/code/game/machinery/transformer.dm
+++ b/code/game/machinery/transformer.dm
@@ -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)
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 364c30ad73..868313258b 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -253,7 +253,7 @@
*/
/obj/machinery/vending/proc/pay_with_ewallet(var/obj/item/weapon/spacecash/ewallet/wallet)
visible_message("\The [usr] swipes \the [wallet] through \the [src].")
- 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
@@ -274,7 +274,7 @@
visible_message("\The [usr] swipes \the [I] through \the [src].")
else
visible_message("\The [usr] swipes \the [ID_container] through \the [src].")
- 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."
@@ -430,7 +430,7 @@
if((!allowed(usr)) && !emagged && scan_id) //For SECURE VENDING MACHINES YEAH
to_chat(usr, "Access denied.") //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"])
@@ -467,7 +467,7 @@
if((!allowed(usr)) && !emagged && scan_id) //For SECURE VENDING MACHINES YEAH
to_chat(usr, "Access denied.") //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..."
@@ -506,7 +506,7 @@
sleep(3)
if(R.get_product(get_turf(src)))
visible_message("\The [src] clunks as it vends an additional item.")
- playsound(src.loc, "sound/[vending_sound]", 100, 1, 1)
+ playsound(src, "sound/[vending_sound]", 100, 1, 1)
status_message = ""
status_error = 0
@@ -778,10 +778,10 @@
product_slogans = "Try our new nougat bar!;Twice the calories for half the price!"
product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Oh my god it's so juicy!;Have a snack.;Snacks are good for you!;Have some more Getmore!;Best quality snacks straight from mars.;We love chocolate!;Try our new jerky!"
icon_state = "snack"
- products = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 6,/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 6,/obj/item/weapon/reagent_containers/food/snacks/chips =6,
- /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 6,/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 6,/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 6,
- /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 6, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 6, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 3)
- contraband = list(/obj/item/weapon/reagent_containers/food/snacks/syndicake = 6,/obj/item/weapon/reagent_containers/food/snacks/unajerky = 6,)
+ products = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 12,/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 12,/obj/item/weapon/reagent_containers/food/snacks/chips =12,
+ /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 12,/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 12,/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 12,
+ /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 12, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 12, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 6)
+ contraband = list(/obj/item/weapon/reagent_containers/food/snacks/syndicake = 6,/obj/item/weapon/reagent_containers/food/snacks/unajerky = 12,)
prices = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 1,/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 5,/obj/item/weapon/reagent_containers/food/snacks/chips = 1,
/obj/item/weapon/reagent_containers/food/snacks/sosjerky = 2,/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 1,/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 1,
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 1, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 2, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 4)
@@ -810,11 +810,11 @@
name = "SweatMAX"
desc = "Fueled by your inner inadequacy!"
icon_state = "fitness"
- products = list(/obj/item/weapon/reagent_containers/food/drinks/smallmilk = 8,
- /obj/item/weapon/reagent_containers/food/drinks/smallchocmilk = 8,
+ products = list(/obj/item/weapon/reagent_containers/food/drinks/smallmilk = 16,
+ /obj/item/weapon/reagent_containers/food/drinks/smallchocmilk = 16,
/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake = 8,
/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask = 8,
- /obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar = 8,
+ /obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar = 16,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 8,
/obj/item/weapon/reagent_containers/pill/diet = 8,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5,
@@ -851,13 +851,13 @@
product_ads = "Probably not bad for you!;Don't believe the scientists!;It's good for you!;Don't quit, buy more!;Smoke!;Nicotine heaven.;Best cigarettes since 2150.;Award-winning cigs.;Feeling temperamental? Try a Temperamento!;Carcinoma Angels - go fuck yerself!;Don't be so hard on yourself, kid. Smoke a Lucky Star!"
vend_delay = 34
icon_state = "cigs"
- products = list(/obj/item/weapon/storage/fancy/cigarettes = 5,
- /obj/item/weapon/storage/fancy/cigarettes/dromedaryco = 5,
- /obj/item/weapon/storage/fancy/cigarettes/killthroat = 5,
- /obj/item/weapon/storage/fancy/cigarettes/luckystars = 5,
- /obj/item/weapon/storage/fancy/cigarettes/jerichos = 5,
- /obj/item/weapon/storage/fancy/cigarettes/menthols = 5,
- /obj/item/weapon/storage/rollingpapers = 5,
+ products = list(/obj/item/weapon/storage/fancy/cigarettes = 10,
+ /obj/item/weapon/storage/fancy/cigarettes/dromedaryco = 10,
+ /obj/item/weapon/storage/fancy/cigarettes/killthroat = 10,
+ /obj/item/weapon/storage/fancy/cigarettes/luckystars = 10,
+ /obj/item/weapon/storage/fancy/cigarettes/jerichos = 10,
+ /obj/item/weapon/storage/fancy/cigarettes/menthols = 10,
+ /obj/item/weapon/storage/rollingpapers = 10,
/obj/item/weapon/storage/box/matches = 10,
/obj/item/weapon/flame/lighter/random = 4,
/obj/item/clothing/mask/smokable/ecig/util = 2,
diff --git a/code/game/mecha/combat/fighter.dm b/code/game/mecha/combat/fighter.dm
index 171c96395e..c87af14617 100644
--- a/code/game/mecha/combat/fighter.dm
+++ b/code/game/mecha/combat/fighter.dm
@@ -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()
. = ..()
diff --git a/code/game/mecha/combat/gorilla.dm b/code/game/mecha/combat/gorilla.dm
index e413fc892a..2f75de4a15 100644
--- a/code/game/mecha/combat/gorilla.dm
+++ b/code/game/mecha/combat/gorilla.dm
@@ -179,7 +179,7 @@
src.occupant_message("Zoom mode [zoom?"en":"dis"]abled.")
if(zoom)
src.occupant.set_viewsize(12)
- playsound(src.occupant, 'sound/mecha/imag_enh.ogg',50)
+ playsound(src, 'sound/mecha/imag_enh.ogg',50)
else
src.occupant.set_viewsize() // Reset to default
return
diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm
index 30ea5ea738..87a107f2c0 100644
--- a/code/game/mecha/equipment/mecha_equipment.dm
+++ b/code/game/mecha/equipment/mecha_equipment.dm
@@ -28,7 +28,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
diff --git a/code/game/mecha/equipment/tools/clamp.dm b/code/game/mecha/equipment/tools/clamp.dm
index a587d89568..6091764c2b 100644
--- a/code/game/mecha/equipment/tools/clamp.dm
+++ b/code/game/mecha/equipment/tools/clamp.dm
@@ -33,7 +33,7 @@
if(FD.blocked)
FD.visible_message("\The [chassis] begins prying on \the [FD]!")
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("\The [chassis] begins forcing \the [FD] open!")
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("\The [chassis] forces \the [FD] open!")
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("\The [chassis] tears \the [AD] open!")
if(!AD.welded)
if(density)
@@ -100,15 +100,15 @@
M.adjustOxyLoss(round(dam_force/2))
M.updatehealth()
occupant_message("You squeeze [target] with [src.name]. Something cracks.")
- playsound(src.loc, "fracture", 5, 1, -2) //CRACK
+ playsound(src, "fracture", 5, 1, -2) //CRACK
chassis.visible_message("[chassis] squeezes [target].")
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("You slam [target] with [src.name]. Something cracks.")
- playsound(src.loc, "fracture", 3, 1, -2) //CRACK 2
+ playsound(src, "fracture", 3, 1, -2) //CRACK 2
chassis.visible_message("[chassis] slams [target].")
M.throw_at(get_step(M,get_dir(src, M)), 14, 1.5, chassis)
else
diff --git a/code/game/mecha/equipment/tools/cloak.dm b/code/game/mecha/equipment/tools/cloak.dm
index 6f6ddd1c8f..e78a4f7395 100644
--- a/code/game/mecha/equipment/tools/cloak.dm
+++ b/code/game/mecha/equipment/tools/cloak.dm
@@ -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)
diff --git a/code/game/mecha/equipment/tools/extinguisher.dm b/code/game/mecha/equipment/tools/extinguisher.dm
index d383573017..5bb6cd147c 100644
--- a/code/game/mecha/equipment/tools/extinguisher.dm
+++ b/code/game/mecha/equipment/tools/extinguisher.dm
@@ -25,14 +25,14 @@
var/obj/o = target
var/amount = o.reagents.trans_to_obj(src, 200)
occupant_message("[amount] units transferred into internal tank.")
- 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("\The [src] is empty.")
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)
diff --git a/code/game/mecha/equipment/tools/syringe_gun.dm b/code/game/mecha/equipment/tools/syringe_gun.dm
index 36763c7f12..95c87b6253 100644
--- a/code/game/mecha/equipment/tools/syringe_gun.dm
+++ b/code/game/mecha/equipment/tools/syringe_gun.dm
@@ -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
diff --git a/code/game/mecha/equipment/weapons/honk.dm b/code/game/mecha/equipment/weapons/honk.dm
index 921111a6cd..427d53295c 100644
--- a/code/game/mecha/equipment/weapons/honk.dm
+++ b/code/game/mecha/equipment/weapons/honk.dm
@@ -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("You emit a high-pitched noise from the mech.")
for(var/mob/living/carbon/M in ohearers(6, chassis))
if(istype(M, /mob/living/carbon/human))
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index 5d01416785..355ce629ac 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -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.
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index eee4088376..b27a5188c3 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -669,12 +669,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, "You slash at the armored suit!")
visible_message("\The [user] slashes at [src.name]'s armor!")
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, "Your claws had no effect!")
src.occupant_message("\The [user]'s claws are stopped by the armor.")
visible_message("\The [user] rebounds off [src.name]'s armor!")
@@ -803,14 +803,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, "You smash at the armored suit!")
for (var/mob/V in viewers(src))
if(V.client && !(V.blinded))
V.show_message("\The [user] smashes against [src.name]'s armor!", 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, "Your attack had no effect!")
src.occupant_message("\The [user]'s attack is stopped by the armor.")
for (var/mob/V in viewers(src))
@@ -2003,7 +2003,7 @@
user.attack_log += text("\[[time_stamp()]\] attacked [src.name]")
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("\The [user]'s attack is stopped by the armor.")
visible_message("\The [user] rebounds off [src.name]'s armor!")
user.attack_log += text("\[[time_stamp()]\] attacked [src.name]")
diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm
index be698d3f9b..4312de96ed 100644
--- a/code/game/objects/buckling.dm
+++ b/code/game/objects/buckling.dm
@@ -120,7 +120,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(.)
if(!silent)
if(M == user)
@@ -136,7 +136,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(\
diff --git a/code/game/objects/effects/alien/aliens.dm b/code/game/objects/effects/alien/aliens.dm
index 1d0c855f71..836e277872 100644
--- a/code/game/objects/effects/alien/aliens.dm
+++ b/code/game/objects/effects/alien/aliens.dm
@@ -66,7 +66,7 @@
/obj/effect/alien/resin/attack_generic(var/mob/user, var/damage, var/attack_verb)
visible_message("[user] [attack_verb] the [src]!")
- 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
@@ -330,7 +330,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()
@@ -443,7 +443,6 @@
var/health = 100
var/status = BURST //can be GROWING, GROWN or BURST; all mutually exclusive
- flags = PROXMOVE
/obj/effect/alien/egg/New()
/*
@@ -534,7 +533,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()
@@ -547,16 +546,4 @@
/obj/effect/alien/egg/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > 500 + T0C)
health -= 5
- healthcheck()
-/*
-/obj/effect/alien/egg/HasProximity(atom/movable/AM as mob|obj)
- if(status == GROWN)
- if(!CanHug(AM))
- return
-
- var/mob/living/carbon/C = AM
- if(C.stat == CONSCIOUS && C.status_flags & XENO_HOST)
- return
-
- Burst(0)
-*/
\ No newline at end of file
+ healthcheck()
\ No newline at end of file
diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm
index 6ac967fc00..f533a2da60 100644
--- a/code/game/objects/effects/decals/contraband.dm
+++ b/code/game/objects/effects/decals/contraband.dm
@@ -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, "You remove the remnants of the poster.")
qdel(src)
@@ -166,7 +166,7 @@
return
visible_message("[user] rips [src] in a single, decisive motion!" )
- 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"
diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm
index b872f9b3d3..15931b5868 100644
--- a/code/game/objects/effects/effect_system.dm
+++ b/code/game/objects/effects/effect_system.dm
@@ -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)
diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
index f2a15be551..1497e4e7a0 100644
--- a/code/game/objects/effects/mines.dm
+++ b/code/game/objects/effects/mines.dm
@@ -61,7 +61,7 @@
panel_open = !panel_open
user.visible_message("[user] very carefully screws the mine's panel [panel_open ? "open" : "closed"].",
"You very carefully screw the mine's panel [panel_open ? "open" : "closed"].")
- 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]!")
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 1566fd411d..dc3a151686 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -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("[U] attempts to stab [M] in the eyes, but misses!")
for(var/mob/V in viewers(M))
V.show_message("[U] attempts to stab [M] in the eyes, but misses!")
@@ -643,11 +643,6 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
//Looking through a scope or binoculars should /not/ improve your periphereal vision. Still, increase viewsize a tiny bit so that sniping isn't as restricted to NSEW
/obj/item/var/ignore_visor_zoom_restriction = FALSE
-/obj/item/on_loc_moved(var/oldloc)
- . = ..()
- if(zoom)
- zoom() // aka unzoom
-
/obj/item/proc/zoom(var/tileoffset = 14,var/viewsize = 9) //tileoffset is client view offset in the direction the user is facing. viewsize is how far out this thing zooms. 7 is normal view
var/devicename
@@ -677,6 +672,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
H.toggle_zoom_hud() // If the user has already limited their HUD this avoids them having a HUD when they zoom in
H.set_viewsize(viewsize)
zoom = 1
+ GLOB.moved_event.register(H, src, .proc/zoom)
var/tilesize = 32
var/viewoffset = tilesize * tileoffset
@@ -705,6 +701,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
if(!H.hud_used.hud_shown)
H.toggle_zoom_hud()
zoom = 0
+ GLOB.moved_event.unregister(H, src, .proc/zoom)
H.client.pixel_x = 0
H.client.pixel_y = 0
diff --git a/code/game/objects/items/bells.dm b/code/game/objects/items/bells.dm
index af9d7ce0f8..c05c7d2686 100644
--- a/code/game/objects/items/bells.dm
+++ b/code/game/objects/items/bells.dm
@@ -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,"You hammer [src] rudely!")
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,"You gracefully ring [src].")
/obj/item/weapon/deskbell/proc/check_ability(mob/user)
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 8f89c2c074..cf32e30c90 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -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)
@@ -983,7 +983,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
@@ -1020,14 +1020,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
@@ -1064,7 +1064,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
var/mob/M = loc
M.put_in_hands(id)
to_chat(usr, "You remove the ID from the [name].")
- 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
@@ -1133,7 +1133,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
conversations.Add("\ref[P]")
if(!P.conversations.Find("\ref[src]"))
P.conversations.Add("\ref[src]")
-
+ to_chat(U, "[bicon(src)] Sent message to [P.owner] ([P.ownjob]), \"[t]\"")
if (prob(15)) //Give the AI a chance of intercepting the message
var/who = src.owner
@@ -1151,7 +1151,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.
@@ -1280,7 +1280,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
if (cartridge.radio)
cartridge.radio.hostpda = null
to_chat(usr, "You remove \the [cartridge] from the [name].")
- 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.
diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm
index 627145a38f..d6f42bee8f 100644
--- a/code/game/objects/items/devices/chameleonproj.dm
+++ b/code/game/objects/items/devices/chameleonproj.dm
@@ -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, "Scanned [target].")
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, "You deactivate the [src].")
@@ -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)
diff --git a/code/game/objects/items/devices/communicator/messaging.dm b/code/game/objects/items/devices/communicator/messaging.dm
index c6191ab21e..2b4e0bcdd4 100644
--- a/code/game/objects/items/devices/communicator/messaging.dm
+++ b/code/game/objects/items/devices/communicator/messaging.dm
@@ -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*"))
diff --git a/code/game/objects/items/devices/communicator/phone.dm b/code/game/objects/items/devices/communicator/phone.dm
index 492cd84179..3f13df8825 100644
--- a/code/game/objects/items/devices/communicator/phone.dm
+++ b/code/game/objects/items/devices/communicator/phone.dm
@@ -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*"))
diff --git a/code/game/objects/items/devices/defib.dm b/code/game/objects/items/devices/defib.dm
index dbb1410ef9..8a4f466d9e 100644
--- a/code/game/objects/items/devices/defib.dm
+++ b/code/game/objects/items/devices/defib.dm
@@ -391,12 +391,12 @@
if(!do_after(user, 30, H))
return
user.visible_message("\The [user] places [src] on [H]'s chest.", "You place [src] on [H]'s chest.")
- 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))
@@ -409,18 +409,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("\The [H]'s body convulses a bit.")
- 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)
@@ -434,7 +434,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)
@@ -455,7 +455,7 @@
to_chat(user, "You can't do that while the safety is enabled.")
return
- playsound(get_turf(src), 'sound/machines/defib_charge.ogg', 50, 0)
+ playsound(src, 'sound/machines/defib_charge.ogg', 50, 0)
audible_message("\The [src] lets out a steadily rising hum...")
if(!do_after(user, chargetime, H))
@@ -464,12 +464,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("\The [user] shocks [H] with \the [src]!", "You shock [H] with \the [src]!")
- 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)
@@ -543,10 +543,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()
..()
diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm
index 6c512650b6..91915c8c07 100644
--- a/code/game/objects/items/devices/flash.dm
+++ b/code/game/objects/items/devices/flash.dm
@@ -48,7 +48,7 @@
user.visible_message("\The [user] successfully repairs \the [src]!")
broken = FALSE
update_icon()
- playsound(src.loc, W.usesound, 50, 1)
+ playsound(src, W.usesound, 50, 1)
else
user.visible_message("\The [user] fails to repair \the [src].")
repairing = FALSE
@@ -138,7 +138,7 @@
if(user)
update_icon()
to_chat(user, "click")
- 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
if(iscarbon(M))
@@ -245,7 +245,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)
diff --git a/code/game/objects/items/devices/hacktool.dm b/code/game/objects/items/devices/hacktool.dm
index 0b6d25f0c9..a48a3da024 100644
--- a/code/game/objects/items/devices/hacktool.dm
+++ b/code/game/objects/items/devices/hacktool.dm
@@ -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
..()
diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm
index 3ce7a0b236..6ae95bcf8a 100644
--- a/code/game/objects/items/devices/lightreplacer.dm
+++ b/code/game/objects/items/devices/lightreplacer.dm
@@ -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, "\The [src] has fabricated a new bulb from the broken bulbs it has stored. It now has [uses] uses.")
- 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
diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm
index 7e7bbdb629..5516ccb099 100644
--- a/code/game/objects/items/devices/megaphone.dm
+++ b/code/game/objects/items/devices/megaphone.dm
@@ -134,7 +134,7 @@
user.audible_message("[user.GetVoice()][user.GetAltName()] broadcasts, \"[pick(insultmsg)]\"")
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
diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm
index 6847bb6fb0..820229fd83 100644
--- a/code/game/objects/items/devices/modkit.dm
+++ b/code/game/objects/items/devices/modkit.dm
@@ -47,7 +47,7 @@
to_chat(user, "[O] must be safely placed on the ground for modification.")
return
- playsound(src.loc, O.usesound, 100, 1)
+ playsound(src, O.usesound, 100, 1)
user.visible_message("\The [user] opens \the [src] and modifies \the [O].","You open \the [src] and modify \the [O].")
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index 7a9b07b999..3ddc35a209 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -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, "You trigger [src].")
times_used += 1
if(times_used >= max_uses)
diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index 4169dfc947..406919f96a 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -9,7 +9,6 @@
var/mob/attacher = null
var/valve_open = 0
var/toggle = 1
- flags = PROXMOVE
/obj/item/device/transfer_valve/attackby(obj/item/item, mob/user)
var/turf/location = get_turf(src) // For admin logs
@@ -57,11 +56,15 @@
return
-/obj/item/device/transfer_valve/HasProximity(atom/movable/AM as mob|obj)
- if(!attached_device) return
- attached_device.HasProximity(AM)
- return
+/obj/item/device/transfer_valve/HasProximity(turf/T, atom/movable/AM, old_loc)
+ attached_device?.HasProximity(T, AM, old_loc)
+/obj/item/device/transfer_valve/Moved(old_loc, direction, forced)
+ . = ..()
+ if(isturf(old_loc))
+ unsense_proximity(callback = .HasProximity, center = old_loc)
+ if(isturf(loc))
+ sense_proximity(callback = .HasProximity)
/obj/item/device/transfer_valve/attack_self(mob/user as mob)
ui_interact(user)
diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm
index c26d3f80aa..cf8cebeec1 100644
--- a/code/game/objects/items/devices/whistle.dm
+++ b/code/game/objects/items/devices/whistle.dm
@@ -32,11 +32,11 @@
return
if(isnull(insults))
- playsound(get_turf(src), 'sound/voice/halt.ogg', 100, 1, vary = 0)
+ playsound(src, 'sound/voice/halt.ogg', 100, 1, vary = 0)
user.audible_message("[user]'s [name] rasps, \"[use_message]\"", "\The [user] holds up \the [name].")
else
if(insults > 0)
- playsound(get_turf(src), 'sound/voice/binsult.ogg', 100, 1, vary = 0)
+ playsound(src, 'sound/voice/binsult.ogg', 100, 1, vary = 0)
// Yes, it used to show the transcription of the sound clip. That was a) inaccurate b) immature as shit.
user.audible_message("[user]'s [name] gurgles something indecipherable and deeply offensive.", "\The [user] holds up \the [name].")
insults--
diff --git a/code/game/objects/items/paintkit.dm b/code/game/objects/items/paintkit.dm
index f3bd0c1d3a..223c9a2018 100644
--- a/code/game/objects/items/paintkit.dm
+++ b/code/game/objects/items/paintkit.dm
@@ -16,7 +16,7 @@
/obj/item/device/kit/proc/use(var/amt, var/mob/user)
uses -= amt
- playsound(get_turf(user), 'sound/items/Screwdriver.ogg', 50, 1)
+ playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
if(uses<1)
user.drop_item()
qdel(src)
diff --git a/code/game/objects/items/stacks/marker_beacons.dm b/code/game/objects/items/stacks/marker_beacons.dm
index 88eb8e6271..5c7ed3aa04 100644
--- a/code/game/objects/items/stacks/marker_beacons.dm
+++ b/code/game/objects/items/stacks/marker_beacons.dm
@@ -58,7 +58,7 @@ var/list/marker_beacon_colors = list(
return
if(use(1))
to_chat(user, "You activate and anchor [amount ? "a":"the"] [singular_name] in place.")
- playsound(user, 'sound/machines/click.ogg', 50, 1)
+ playsound(src, 'sound/machines/click.ogg', 50, 1)
var/obj/structure/marker_beacon/M = new(user.loc, picked_color)
transfer_fingerprints_to(M)
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 7e89f96807..eb432d63c1 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -181,7 +181,7 @@
bullets--
D.icon_state = "foamdart"
D.name = "foam dart"
- playsound(user.loc, 'sound/items/syringeproj.ogg', 50, 1)
+ playsound(src, 'sound/items/syringeproj.ogg', 50, 1)
for(var/i=0, i<6, i++)
if (D)
@@ -229,7 +229,7 @@
O.show_message(text("\The [] casually lines up a shot with []'s head and pulls the trigger!", user, M), 1, "You hear the sound of foam against skull", 2)
O.show_message(text("\The [] was hit in the head by the foam dart!", M), 1)
- playsound(user.loc, 'sound/items/syringeproj.ogg', 50, 1)
+ playsound(src, 'sound/items/syringeproj.ogg', 50, 1)
new /obj/item/toy/ammo/crossbow(M.loc)
src.bullets--
else if (M.lying && src.bullets == 0)
@@ -278,12 +278,12 @@
src.active = !( src.active )
if (src.active)
to_chat(user, "You extend the plastic blade with a quick flick of your wrist.")
- playsound(user, 'sound/weapons/saberon.ogg', 50, 1)
+ playsound(src, 'sound/weapons/saberon.ogg', 50, 1)
src.item_state = "[icon_state]_blade"
src.w_class = ITEMSIZE_LARGE
else
to_chat(user, "You push the plastic blade back down into the handle.")
- playsound(user, 'sound/weapons/saberoff.ogg', 50, 1)
+ playsound(src, 'sound/weapons/saberoff.ogg', 50, 1)
src.item_state = "[icon_state]"
src.w_class = ITEMSIZE_SMALL
update_icon()
@@ -397,7 +397,7 @@
/obj/item/toy/bosunwhistle/attack_self(mob/user as mob)
if(cooldown < world.time - 35)
to_chat(user, "You blow on [src], creating an ear-splitting noise!")
- playsound(user, 'sound/misc/boatswain.ogg', 20, 1)
+ playsound(src, 'sound/misc/boatswain.ogg', 20, 1)
cooldown = world.time
/*
@@ -413,14 +413,14 @@
/obj/item/toy/prize/attack_self(mob/user as mob)
if(cooldown < world.time - 8)
to_chat(user, "You play with [src].")
- playsound(user, 'sound/mecha/mechstep.ogg', 20, 1)
+ playsound(src, 'sound/mecha/mechstep.ogg', 20, 1)
cooldown = world.time
/obj/item/toy/prize/attack_hand(mob/user as mob)
if(loc == user)
if(cooldown < world.time - 8)
to_chat(user, "You play with [src].")
- playsound(user, 'sound/mecha/mechturn.ogg', 20, 1)
+ playsound(src, 'sound/mecha/mechturn.ogg', 20, 1)
cooldown = world.time
return
..()
@@ -499,7 +499,7 @@
if(cooldown < world.time)
cooldown = (world.time + 30) //3 second cooldown
user.visible_message("The [src] says \"[toysay]\".")
- playsound(user, 'sound/machines/click.ogg', 20, 1)
+ playsound(src, 'sound/machines/click.ogg', 20, 1)
/obj/item/toy/figure/cmo
name = "Chief Medical Officer action figure"
@@ -753,12 +753,12 @@
// Attack mob
/obj/item/toy/plushie/carp/attack(mob/M as mob, mob/user as mob)
- playsound(loc, bitesound, 20, 1) // Play bite sound in local area
+ playsound(src, bitesound, 20, 1) // Play bite sound in local area
return ..()
// Attack self
/obj/item/toy/plushie/carp/attack_self(mob/user as mob)
- playsound(src.loc, bitesound, 20, 1)
+ playsound(src, bitesound, 20, 1)
return ..()
@@ -1371,7 +1371,7 @@
if(!cooldown) //for the sanity of everyone
var/message = generate_ion_law()
to_chat(user, "You press the button on [src].")
- playsound(user, 'sound/machines/click.ogg', 20, 1)
+ playsound(src, 'sound/machines/click.ogg', 20, 1)
visible_message("[message]")
cooldown = 1
spawn(30) cooldown = 0
@@ -1390,7 +1390,7 @@
if(!cooldown) //for the sanity of everyone
var/message = pick("You won't get away this time, Griffin!", "Stop right there, criminal!", "Hoot! Hoot!", "I am the night!")
to_chat(user, "You pull the string on the [src].")
- //playsound(user, 'sound/misc/hoot.ogg', 25, 1)
+ //playsound(src, 'sound/misc/hoot.ogg', 25, 1)
visible_message("[message]")
cooldown = 1
spawn(30) cooldown = 0
@@ -1409,7 +1409,7 @@
if(!cooldown) //for the sanity of everyone
var/message = pick("You can't stop me, Owl!", "My plan is flawless! The vault is mine!", "Caaaawwww!", "You will never catch me!")
to_chat(user, "You pull the string on the [src].")
- //playsound(user, 'sound/misc/caw.ogg', 25, 1)
+ //playsound(src, 'sound/misc/caw.ogg', 25, 1)
visible_message("[message]")
cooldown = 1
spawn(30) cooldown = 0
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index bafe4878f9..2dbd4aa082 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -57,7 +57,7 @@
stored_matter += cartridge.remaining
user.drop_from_inventory(W)
qdel(W)
- playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
+ playsound(src, 'sound/machines/click.ogg', 50, 1)
to_chat(user, span("notice", "The RCD now holds [stored_matter]/[max_stored_matter] matter-units."))
return TRUE
return ..()
@@ -70,7 +70,7 @@
mode_index++
to_chat(user, span("notice", "Changed mode to '[modes[mode_index]]'."))
- playsound(src.loc, 'sound/effects/pop.ogg', 50, 0)
+ playsound(src, 'sound/effects/pop.ogg', 50, 0)
if(prob(20))
src.spark_system.start()
@@ -106,7 +106,7 @@
to_chat(user, span("warning", "\The [src] lacks the required material to start."))
return FALSE
- playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
+ playsound(src, 'sound/machines/click.ogg', 50, 1)
var/true_delay = rcd_results[RCD_VALUE_DELAY] * toolspeed
@@ -126,7 +126,7 @@
return FALSE
if(A.rcd_act(user, src, rcd_results[RCD_VALUE_MODE]))
consume_resources(rcd_results[RCD_VALUE_COST])
- playsound(get_turf(A), 'sound/items/deconstruct.ogg', 50, 1)
+ playsound(A, 'sound/items/deconstruct.ogg', 50, 1)
return TRUE
// If they moved, kill the beam immediately.
diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm
index 724e85e1f6..3059e5af7f 100644
--- a/code/game/objects/items/weapons/RSF.dm
+++ b/code/game/objects/items/weapons/RSF.dm
@@ -48,7 +48,7 @@ RSF
qdel(W)
stored_matter += 10
- playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
+ playsound(src, 'sound/machines/click.ogg', 10, 1)
to_chat(user,"The RSF now holds [stored_matter]/30 fabrication-units.")
return
@@ -64,7 +64,7 @@ RSF
glasstype = /obj/item/weapon/reagent_containers/food/drinks/metaglass
/obj/item/weapon/rsf/attack_self(mob/user as mob)
- playsound(src.loc, 'sound/effects/pop.ogg', 50, 0)
+ playsound(src, 'sound/effects/pop.ogg', 50, 0)
if (mode == 1)
mode = 2
to_chat(user,"Changed dispensing mode to 'Container'.")
@@ -101,7 +101,7 @@ RSF
if(!istype(A, /obj/structure/table) && !istype(A, /turf/simulated/floor))
return
- playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
+ playsound(src, 'sound/machines/click.ogg', 10, 1)
var/used_energy = 0
var/obj/product
diff --git a/code/game/objects/items/weapons/canes.dm b/code/game/objects/items/weapons/canes.dm
index f7688fb2d1..5b7f346684 100644
--- a/code/game/objects/items/weapons/canes.dm
+++ b/code/game/objects/items/weapons/canes.dm
@@ -33,7 +33,7 @@
if(concealed_blade)
user.visible_message("[user] has unsheathed \a [concealed_blade] from [T.his] [src]!", "You unsheathe \the [concealed_blade] from \the [src].")
// Calling drop/put in hands to properly call item drop/pickup procs
- playsound(user.loc, 'sound/weapons/holster/sheathout.ogg', 50, 1)
+ playsound(src, 'sound/weapons/holster/sheathout.ogg', 50, 1)
user.drop_from_inventory(src)
user.put_in_hands(concealed_blade)
user.put_in_hands(src)
@@ -47,7 +47,7 @@
if(!src.concealed_blade && istype(W))
var/datum/gender/T = gender_datums[user.get_visible_gender()]
user.visible_message("[user] has sheathed \a [W] into [T.his] [src]!", "You sheathe \the [W] into \the [src].")
- playsound(user.loc, 'sound/weapons/holster/sheathin.ogg', 50, 1)
+ playsound(src, 'sound/weapons/holster/sheathin.ogg', 50, 1)
user.drop_from_inventory(W)
W.loc = src
src.concealed_blade = W
@@ -119,6 +119,6 @@
H.update_inv_l_hand()
H.update_inv_r_hand()
- playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1)
+ playsound(src, 'sound/weapons/empty.ogg', 50, 1)
add_fingerprint(user)
return TRUE
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index b6952198bd..46f9a34f4d 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -193,7 +193,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/smokable/proc/die(var/nomessage = 0)
var/turf/T = get_turf(src)
set_light(0)
- playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
+ playsound(src, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
STOP_PROCESSING(SSobj, src)
if (type_butt)
var/obj/item/butt = new type_butt(T)
@@ -215,7 +215,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
var/mob/living/M = loc
if (!nomessage)
to_chat(M, "Your [name] goes out, and you empty the ash.")
- playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
+ playsound(src, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
lit = 0
icon_state = initial(icon_state)
item_state = initial(item_state)
@@ -333,7 +333,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if(lit == 1)
if(user.a_intent == I_HURT)
user.visible_message("[user] drops and treads on the lit [src], putting it out instantly.")
- playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
+ playsound(src, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
die(1)
else
user.visible_message("[user] puts out \the [src].")
@@ -427,7 +427,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if(lit == 1)
if(user.a_intent == I_HURT)
user.visible_message("[user] empties the lit [src] on the floor!.")
- playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
+ playsound(src, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
die(1)
else
user.visible_message("[user] puts out \the [src].")
@@ -552,7 +552,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
lit = 1
icon_state = "[base_state]on"
item_state = "[base_state]on"
- playsound(src.loc, activation_sound, 75, 1)
+ playsound(src, activation_sound, 75, 1)
if(istype(src, /obj/item/weapon/flame/lighter/zippo) )
user.visible_message("Without even breaking stride, [user] flips open and lights [src] in one smooth movement.")
else
@@ -572,7 +572,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
lit = 0
icon_state = "[base_state]"
item_state = "[base_state]"
- playsound(src.loc, deactivation_sound, 75, 1)
+ playsound(src, deactivation_sound, 75, 1)
if(istype(src, /obj/item/weapon/flame/lighter/zippo) )
user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing.")
else
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index 1f53e64e77..73604b49f9 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -71,7 +71,7 @@
/obj/item/weapon/bikehorn/attack_self(mob/user as mob)
if (spam_flag == 0)
spam_flag = 1
- playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1)
+ playsound(src, 'sound/items/bikehorn.ogg', 50, 1)
src.add_fingerprint(user)
spawn(20)
spam_flag = 0
diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm
index 5e7b54c9eb..e9951c83d4 100644
--- a/code/game/objects/items/weapons/extinguisher.dm
+++ b/code/game/objects/items/weapons/extinguisher.dm
@@ -75,7 +75,7 @@
var/obj/o = target
var/amount = o.reagents.trans_to_obj(src, 50)
to_chat(user, "You fill [src] with [amount] units of the contents of [target].")
- playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
+ playsound(src, 'sound/effects/refill.ogg', 50, 1, -6)
return
if (!safety)
@@ -88,7 +88,7 @@
src.last_use = world.time
- playsound(src.loc, 'sound/effects/extinguish.ogg', 75, 1, -3)
+ playsound(src, 'sound/effects/extinguish.ogg', 75, 1, -3)
var/direction = get_dir(src,target)
diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm
index 94ca8b7cd2..88d9b0ff5d 100644
--- a/code/game/objects/items/weapons/gift_wrappaper.dm
+++ b/code/game/objects/items/weapons/gift_wrappaper.dm
@@ -27,7 +27,7 @@
/obj/item/weapon/gift/attack_self(mob/user as mob)
user.drop_item()
- playsound(src.loc, 'sound/items/package_unwrap.ogg', 50,1)
+ playsound(src, 'sound/items/package_unwrap.ogg', 50,1)
if(src.gift)
user.put_in_active_hand(gift)
src.gift.add_fingerprint(user)
diff --git a/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm b/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm
index 6646e698f9..fe4d80418d 100644
--- a/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm
@@ -7,7 +7,7 @@
origin_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 4)
/obj/item/weapon/grenade/anti_photon/detonate()
- playsound(src.loc, 'sound/effects/phasein.ogg', 50, 1, 5)
+ playsound(src, 'sound/effects/phasein.ogg', 50, 1, 5)
set_light(10, -10, "#FFFFFF")
var/extra_delay = rand(0,90)
@@ -18,5 +18,5 @@
set_light(10, 10, "#[num2hex(rand(64,255))][num2hex(rand(64,255))][num2hex(rand(64,255))]")
spawn(210)
..()
- playsound(src.loc, 'sound/effects/bang.ogg', 50, 1, 5)
+ playsound(src, 'sound/effects/bang.ogg', 50, 1, 5)
qdel(src)
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index 157c64f09f..cb3184a7f6 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -63,7 +63,7 @@
return
path = 1
to_chat(user, "You add [W] to the metal casing.")
- playsound(src.loc, 'sound/items/Screwdriver2.ogg', 25, -3)
+ playsound(src, 'sound/items/Screwdriver2.ogg', 25, -3)
user.remove_from_mob(det)
det.loc = src
detonator = det
@@ -96,7 +96,7 @@
return
else
to_chat(user, "You unlock the assembly.")
- playsound(src.loc, W.usesound, 50, -3)
+ playsound(src, W.usesound, 50, -3)
name = "unsecured grenade with [beakers.len] containers[detonator?" and detonator":""]"
icon_state = initial(icon_state) + (detonator?"_ass":"")
stage = 1
@@ -154,7 +154,7 @@
active = 0
if(!has_reagents)
icon_state = initial(icon_state) +"_locked"
- playsound(src.loc, 'sound/items/Screwdriver2.ogg', 50, 1)
+ playsound(src, 'sound/items/Screwdriver2.ogg', 50, 1)
spawn(0) //Otherwise det_time is erroneously set to 0 after this
if(istimer(detonator.a_left)) //Make sure description reflects that the timer has been reset
var/obj/item/device/assembly/timer/T = detonator.a_left
@@ -164,7 +164,7 @@
det_time = 10*T.time
return
- playsound(src.loc, 'sound/effects/bamf.ogg', 50, 1)
+ playsound(src, 'sound/effects/bamf.ogg', 50, 1)
for(var/obj/item/weapon/reagent_containers/glass/G in beakers)
G.reagents.trans_to_obj(src, G.reagents.total_volume)
diff --git a/code/game/objects/items/weapons/grenades/concussion.dm b/code/game/objects/items/weapons/grenades/concussion.dm
index 073b5ed9d1..fb821ab6f8 100644
--- a/code/game/objects/items/weapons/grenades/concussion.dm
+++ b/code/game/objects/items/weapons/grenades/concussion.dm
@@ -19,7 +19,7 @@
if(is_below_sound_pressure(T))
visible_message("Whump.")
return
- playsound(src.loc, 'sound/effects/bang.ogg', 75, 1, -3)
+ playsound(src, 'sound/effects/bang.ogg', 75, 1, -3)
if(istype(T))
for(var/mob/living/L in orange(T, radius))
if(ishuman(L))
diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm
index 087265ca5b..e2d095e0e1 100644
--- a/code/game/objects/items/weapons/grenades/flashbang.dm
+++ b/code/game/objects/items/weapons/grenades/flashbang.dm
@@ -29,7 +29,7 @@
/obj/item/weapon/grenade/flashbang/proc/bang(var/turf/T , var/mob/living/carbon/M) // Added a new proc called 'bang' that takes a location and a person to be banged.
to_chat(M, "BANG") // Called during the loop that bangs people in lockers/containers and when banging
- playsound(src.loc, 'sound/effects/bang.ogg', 50, 1, 30) // people in normal view. Could theroetically be called during other explosions.
+ playsound(src, 'sound/effects/bang.ogg', 50, 1, 30) // people in normal view. Could theroetically be called during other explosions.
// -- Polymorph
//Checking for protections
@@ -119,11 +119,11 @@
for(var/do_spawn = numspawned, do_spawn > 0, do_spawn--)
new /obj/item/weapon/grenade/flashbang/cluster(src.loc)//Launches flashbangs
- playsound(src.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
+ playsound(src, 'sound/weapons/armbomb.ogg', 75, 1, -3)
for(var/do_again = again, do_again > 0, do_again--)
new /obj/item/weapon/grenade/flashbang/clusterbang/segment(src.loc)//Creates a 'segment' that launches a few more flashbangs
- playsound(src.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
+ playsound(src, 'sound/weapons/armbomb.ogg', 75, 1, -3)
qdel(src)
return
diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm
index fdab7aaf39..7ac049a774 100644
--- a/code/game/objects/items/weapons/grenades/grenade.dm
+++ b/code/game/objects/items/weapons/grenades/grenade.dm
@@ -33,7 +33,7 @@
to_chat(user, "You prime the [name]! [det_time/10] seconds!")
active = 1
icon_state = initial(icon_state) + "_active"
- playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
+ playsound(src, 'sound/weapons/armbomb.ogg', 75, 1, -3)
spawn(det_time)
detonate()
return
@@ -75,7 +75,7 @@
icon_state = initial(icon_state) + "_active"
active = 1
- playsound(loc, arm_sound, 75, 1, -3)
+ playsound(src, arm_sound, 75, 1, -3)
spawn(det_time)
detonate()
@@ -83,7 +83,7 @@
/obj/item/weapon/grenade/proc/detonate()
-// playsound(loc, 'sound/items/Welder2.ogg', 25, 1)
+// playsound(src, 'sound/items/Welder2.ogg', 25, 1)
var/turf/T = get_turf(src)
if(T)
T.hotspot_expose(700,125)
diff --git a/code/game/objects/items/weapons/grenades/smokebomb.dm b/code/game/objects/items/weapons/grenades/smokebomb.dm
index 28540b981f..75c0e6a299 100644
--- a/code/game/objects/items/weapons/grenades/smokebomb.dm
+++ b/code/game/objects/items/weapons/grenades/smokebomb.dm
@@ -21,7 +21,7 @@
return ..()
/obj/item/weapon/grenade/smokebomb/detonate()
- playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
+ playsound(src, 'sound/effects/smoke.ogg', 50, 1, -3)
src.smoke.set_up(10, 0, usr.loc)
spawn(0)
for(var/i = 1 to smoke_strength)
diff --git a/code/game/objects/items/weapons/grenades/spawnergrenade.dm b/code/game/objects/items/weapons/grenades/spawnergrenade.dm
index 5cab658098..5f1bd4503b 100644
--- a/code/game/objects/items/weapons/grenades/spawnergrenade.dm
+++ b/code/game/objects/items/weapons/grenades/spawnergrenade.dm
@@ -15,7 +15,7 @@
if(spawner_type && deliveryamt)
// Make a quick flash
var/turf/T = get_turf(src)
- playsound(T, 'sound/effects/phasein.ogg', 100, 1)
+ playsound(src, 'sound/effects/phasein.ogg', 100, 1)
for(var/mob/living/carbon/human/M in viewers(T, null))
if(M:eyecheck() <= 0)
M.flash_eyes()
diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index 753f72a809..68f7f1fc34 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -60,7 +60,7 @@
return 0
/obj/item/weapon/handcuffs/proc/place_handcuffs(var/mob/living/carbon/target, var/mob/user)
- playsound(src.loc, cuff_sound, 30, 1, -2)
+ playsound(src, cuff_sound, 30, 1, -2)
var/mob/living/carbon/human/H = target
if(!istype(H))
@@ -244,7 +244,7 @@ var/last_chew = 0
to_chat(user, "You need to have a firm grip on [C] before you can put \the [src] on!")
/obj/item/weapon/handcuffs/legcuffs/proc/place_legcuffs(var/mob/living/carbon/target, var/mob/user)
- playsound(src.loc, cuff_sound, 30, 1, -2)
+ playsound(src, cuff_sound, 30, 1, -2)
var/mob/living/carbon/human/H = target
if(!istype(H))
@@ -315,7 +315,7 @@ var/last_chew = 0
qdel(src)
/obj/item/weapon/handcuffs/legcuffs/bola/place_legcuffs(var/mob/living/carbon/target, var/mob/user)
- playsound(src.loc, cuff_sound, 30, 1, -2)
+ playsound(src, cuff_sound, 30, 1, -2)
var/mob/living/carbon/human/H = target
if(!istype(H))
diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm
index 34f44ffc8d..81d5bb8f04 100644
--- a/code/game/objects/items/weapons/implants/implant.dm
+++ b/code/game/objects/items/weapons/implants/implant.dm
@@ -252,7 +252,7 @@ Implant Specifics: "}
if (elevel == "Localized Limb")
if(part) //For some reason, small_boom() didn't work. So have this bit of working copypaste.
imp_in.visible_message("Something beeps inside [imp_in][part ? "'s [part.name]" : ""]!")
- playsound(loc, 'sound/items/countdown.ogg', 75, 1, -3)
+ playsound(src, 'sound/items/countdown.ogg', 75, 1, -3)
sleep(25)
if (istype(part,/obj/item/organ/external/chest) || \
istype(part,/obj/item/organ/external/groin) || \
@@ -325,7 +325,7 @@ Implant Specifics: "}
/obj/item/weapon/implant/explosive/proc/small_boom()
if (ishuman(imp_in) && part)
imp_in.visible_message("Something beeps inside [imp_in][part ? "'s [part.name]" : ""]!")
- playsound(loc, 'sound/items/countdown.ogg', 75, 1, -3)
+ playsound(src, 'sound/items/countdown.ogg', 75, 1, -3)
spawn(25)
if (ishuman(imp_in) && part)
//No tearing off these parts since it's pretty much killing
diff --git a/code/game/objects/items/weapons/material/chainsaw.dm b/code/game/objects/items/weapons/material/chainsaw.dm
index fe99fad674..8ba5f20695 100644
--- a/code/game/objects/items/weapons/material/chainsaw.dm
+++ b/code/game/objects/items/weapons/material/chainsaw.dm
@@ -53,7 +53,7 @@ obj/item/weapon/chainsaw/proc/turnOff(mob/user as mob)
if(!on) return
to_chat(user, "You switch the gas nozzle on the chainsaw, turning it off.")
attack_verb = list("bluntly hit", "beat", "knocked")
- playsound(user, 'sound/weapons/chainsaw_turnoff.ogg',40,1)
+ playsound(src, 'sound/weapons/chainsaw_turnoff.ogg',40,1)
force = inactive_force
edge = 0
sharp = 0
@@ -93,7 +93,7 @@ obj/item/weapon/chainsaw/afterattack(atom/A as mob|obj|turf|area, mob/user as mo
to_chat(user, "You begin filling the tank on the chainsaw.")
if(do_after(usr, 15))
A.reagents.trans_to_obj(src, max_fuel)
- playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
+ playsound(src, 'sound/effects/refill.ogg', 50, 1, -6)
to_chat(user, "Chainsaw succesfully refueled.")
else
to_chat(user, "Don't move while you're refilling the chainsaw.")
diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm
index b2369f995d..4464084f85 100644
--- a/code/game/objects/items/weapons/material/kitchen.dm
+++ b/code/game/objects/items/weapons/material/kitchen.dm
@@ -46,7 +46,7 @@
if(!(M.can_force_feed(user, loaded) && do_mob(user, M, 5 SECONDS)))
return
M.visible_message("\The [user] feeds some [loaded] to \the [M] with \the [src].")
- playsound(M.loc,'sound/items/eatfood.ogg', rand(10,40), 1)
+ playsound(src,'sound/items/eatfood.ogg', rand(10,40), 1)
overlays.Cut()
return
else
diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm
index 099edd65c4..c06e80becf 100644
--- a/code/game/objects/items/weapons/material/knives.dm
+++ b/code/game/objects/items/weapons/material/knives.dm
@@ -46,7 +46,7 @@
active = !active
if(active)
to_chat(user, "You flip out \the [src].")
- playsound(user, 'sound/weapons/flipblade.ogg', 15, 1)
+ playsound(src, 'sound/weapons/flipblade.ogg', 15, 1)
else
to_chat(user, "\The [src] can now be concealed.")
update_force()
diff --git a/code/game/objects/items/weapons/material/material_armor.dm b/code/game/objects/items/weapons/material/material_armor.dm
index d981cafc07..91aca12dc1 100644
--- a/code/game/objects/items/weapons/material/material_armor.dm
+++ b/code/game/objects/items/weapons/material/material_armor.dm
@@ -125,7 +125,7 @@ Protectiveness | Armor %
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, user.loc)
spark_system.start()
- playsound(user.loc, 'sound/effects/teleport.ogg', 50, 1)
+ playsound(src, 'sound/effects/teleport.ogg', 50, 1)
user.loc = picked
return PROJECTILE_FORCE_MISS
diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm
index e2394537f3..19eaf7f776 100644
--- a/code/game/objects/items/weapons/material/shards.dm
+++ b/code/game/objects/items/weapons/material/shards.dm
@@ -102,7 +102,7 @@
if(will_break && src.loc == user) // If it's not in our hand anymore
user.visible_message("[user] hit \the [target] with \the [src], shattering it!", "You shatter \the [src] in your hand!")
- playsound(user, pick('sound/effects/Glassbr1.ogg', 'sound/effects/Glassbr2.ogg', 'sound/effects/Glassbr3.ogg'), 30, 1)
+ playsound(src, pick('sound/effects/Glassbr1.ogg', 'sound/effects/Glassbr2.ogg', 'sound/effects/Glassbr3.ogg'), 30, 1)
qdel(src)
return
@@ -116,7 +116,7 @@
if(M.buckled) //wheelchairs, office chairs, rollerbeds
return
- playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds
+ playsound(src, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds
if(ishuman(M))
var/mob/living/carbon/human/H = M
diff --git a/code/game/objects/items/weapons/material/swords.dm b/code/game/objects/items/weapons/material/swords.dm
index 3affd40887..ba0fe4ddfe 100644
--- a/code/game/objects/items/weapons/material/swords.dm
+++ b/code/game/objects/items/weapons/material/swords.dm
@@ -14,7 +14,7 @@
/obj/item/weapon/material/sword/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
if(unique_parry_check(user, attacker, damage_source) && prob(50))
user.visible_message("\The [user] parries [attack_text] with \the [src]!")
- playsound(user.loc, 'sound/weapons/punchmiss.ogg', 50, 1)
+ playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1)
return 1
return 0
diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm
index 244b2c6001..e2d5e94118 100644
--- a/code/game/objects/items/weapons/material/twohanded.dm
+++ b/code/game/objects/items/weapons/material/twohanded.dm
@@ -61,7 +61,7 @@
/obj/item/weapon/material/twohanded/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
if(wielded && default_parry_check(user, attacker, damage_source) && prob(15))
user.visible_message("\The [user] parries [attack_text] with \the [src]!")
- playsound(user.loc, 'sound/weapons/punchmiss.ogg', 50, 1)
+ playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1)
return 1
return 0
diff --git a/code/game/objects/items/weapons/material/twohanded.dm.orig b/code/game/objects/items/weapons/material/twohanded.dm.orig
index 01f4ee7e55..47d4f230c6 100644
--- a/code/game/objects/items/weapons/material/twohanded.dm.orig
+++ b/code/game/objects/items/weapons/material/twohanded.dm.orig
@@ -159,18 +159,8 @@
if(istype(A,/obj/structure/window))
var/obj/structure/window/W = A
W.shatter()
-<<<<<<< HEAD:code/game/objects/items/weapons/material/twohanded.dm
/*
-=======
- else if(istype(A,/obj/structure/grille))
- qdel(A)
- else if(istype(A,/obj/effect/plant))
- var/obj/effect/plant/P = A
- P.die_off()
-
- qdel(A)
->>>>>>> 284d1cc1f5c67503fe0da89ce01985d73bb02038:code/game/objects/items/weapons/twohanded.dm
/*
* Double-Bladed Energy Swords - Cheridan
*/
diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm
index 21d4d53a5c..7153ebfa60 100644
--- a/code/game/objects/items/weapons/melee/energy.dm
+++ b/code/game/objects/items/weapons/melee/energy.dm
@@ -57,14 +57,14 @@
sharp = 1
edge = 1
w_class = active_w_class
- playsound(user, 'sound/weapons/saberon.ogg', 50, 1)
+ playsound(src, 'sound/weapons/saberon.ogg', 50, 1)
update_icon()
set_light(lrange, lpower, lcolor)
/obj/item/weapon/melee/energy/proc/deactivate(mob/living/user)
if(!active)
return
- playsound(user, 'sound/weapons/saberoff.ogg', 50, 1)
+ playsound(src, 'sound/weapons/saberoff.ogg', 50, 1)
item_state = "[icon_state]"
active = 0
embed_chance = initial(embed_chance)
@@ -310,7 +310,7 @@
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, user.loc)
spark_system.start()
- playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1)
+ playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
return 1
if(active && unique_parry_check(user, attacker, damage_source) && prob(projectile_parry_chance))
user.visible_message("\The [user] deflects [attack_text] with \the [src]!")
@@ -318,7 +318,7 @@
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, user.loc)
spark_system.start()
- playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1)
+ playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
return 1
return 0
@@ -370,7 +370,7 @@
// EMP stuff.
var/obj/O = AM
O.emp_act(3) // A weaker severity is used because this has infinite uses.
- playsound(get_turf(O), 'sound/effects/EMPulse.ogg', 100, 1)
+ playsound(O, 'sound/effects/EMPulse.ogg', 100, 1)
user.setClickCooldown(user.get_attack_speed(src)) // A lot of objects don't set click delay.
return ..()
@@ -379,9 +379,9 @@
if(target.isSynthetic() && active)
// Do some extra damage. Not a whole lot more since emp_act() is pretty nasty on FBPs already.
target.emp_act(3) // A weaker severity is used because this has infinite uses.
- playsound(get_turf(target), 'sound/effects/EMPulse.ogg', 100, 1)
+ playsound(target, 'sound/effects/EMPulse.ogg', 100, 1)
target.adjustFireLoss(force * 3) // 15 Burn, for 20 total.
- playsound(get_turf(target), 'sound/weapons/blade1.ogg', 100, 1)
+ playsound(target, 'sound/weapons/blade1.ogg', 100, 1)
// Make lesser robots really mad at us.
if(target.mob_class & MOB_CLASS_SYNTHETIC)
@@ -481,7 +481,7 @@
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, user.loc)
spark_system.start()
- playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1)
+ playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
return 1
if(unique_parry_check(user, attacker, damage_source) && prob(projectile_parry_chance))
user.visible_message("\The [user] deflects [attack_text] with \the [src]!")
@@ -489,7 +489,7 @@
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, user.loc)
spark_system.start()
- playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1)
+ playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
return 1
return 0
@@ -547,6 +547,6 @@
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, user.loc)
spark_system.start()
- playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1)
+ playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
return 1
return 0
diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm
index 7d390d613f..4185cf92c2 100644
--- a/code/game/objects/items/weapons/melee/misc.dm
+++ b/code/game/objects/items/weapons/melee/misc.dm
@@ -69,7 +69,7 @@
/obj/item/weapon/melee/cursedblade/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(50))
user.visible_message("\The [user] parries [attack_text] with \the [src]!")
- playsound(user.loc, 'sound/weapons/punchmiss.ogg', 50, 1)
+ playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1)
return 1
return 0
diff --git a/code/game/objects/items/weapons/paiwire.dm b/code/game/objects/items/weapons/paiwire.dm
index 638d8f51cb..b654c24e67 100644
--- a/code/game/objects/items/weapons/paiwire.dm
+++ b/code/game/objects/items/weapons/paiwire.dm
@@ -1,7 +1,7 @@
/obj/item/weapon/pai_cable/proc/plugin(obj/machinery/M as obj, mob/user as mob)
if(istype(M, /obj/machinery/door) || istype(M, /obj/machinery/camera))
user.visible_message("[user] inserts [src] into a data port on [M].", "You insert [src] into a data port on [M].", "You hear the satisfying click of a wire jack fastening into place.")
- playsound(user, 'sound/machines/click.ogg', 50, 1)
+ playsound(src, 'sound/machines/click.ogg', 50, 1)
user.drop_item()
src.loc = M
src.machine = M
diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm
index 4d78a09bc5..e4a518e8db 100644
--- a/code/game/objects/items/weapons/shields.dm
+++ b/code/game/objects/items/weapons/shields.dm
@@ -94,7 +94,7 @@
return 0
//Otherwise, if we're here, we're gonna stop the attack entirely.
user.visible_message("\The [user] blocks [attack_text] with \the [src]!")
- playsound(user.loc, 'sound/weapons/Genhit.ogg', 50, 1)
+ playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
return 1
return 0
@@ -102,7 +102,7 @@
if(istype(W, /obj/item/weapon/melee/baton))
if(cooldown < world.time - 25)
user.visible_message("[user] bashes [src] with [W]!")
- playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, 1)
+ playsound(src, 'sound/effects/shieldbash.ogg', 50, 1)
cooldown = world.time
else
..()
@@ -144,7 +144,7 @@
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, user.loc)
spark_system.start()
- playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1)
+ playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
/obj/item/weapon/shield/energy/get_block_chance(mob/user, var/damage, atom/damage_source = null, mob/attacker = null)
if(istype(damage_source, /obj/item/projectile))
@@ -163,7 +163,7 @@
update_icon()
w_class = ITEMSIZE_LARGE
slot_flags = null
- playsound(user, 'sound/weapons/saberon.ogg', 50, 1)
+ playsound(src, 'sound/weapons/saberon.ogg', 50, 1)
to_chat(user, "\The [src] is now active.")
else
@@ -171,7 +171,7 @@
update_icon()
w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS
- playsound(user, 'sound/weapons/saberoff.ogg', 50, 1)
+ playsound(src, 'sound/weapons/saberoff.ogg', 50, 1)
to_chat(user, "\The [src] can now be concealed.")
if(istype(user,/mob/living/carbon/human))
@@ -240,7 +240,7 @@
/obj/item/weapon/shield/riot/tele/attack_self(mob/living/user)
active = !active
icon_state = "teleriot[active]"
- playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1)
+ playsound(src, 'sound/weapons/empty.ogg', 50, 1)
if(active)
force = 8
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 88f6caeb74..2cdc341523 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -21,13 +21,13 @@
/obj/item/weapon/storage/backpack/equipped(var/mob/user, var/slot)
if (slot == slot_back && src.use_sound)
- playsound(src.loc, src.use_sound, 50, 1, -5)
+ playsound(src, src.use_sound, 50, 1, -5)
..(user, slot)
/*
/obj/item/weapon/storage/backpack/dropped(mob/user as mob)
if (loc == user && src.use_sound)
- playsound(src.loc, src.use_sound, 50, 1, -5)
+ playsound(src, src.use_sound, 50, 1, -5)
..(user)
*/
diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm
index 0d97b4f878..75cbc2297e 100644
--- a/code/game/objects/items/weapons/storage/bible.dm
+++ b/code/game/objects/items/weapons/storage/bible.dm
@@ -35,5 +35,5 @@
/obj/item/weapon/storage/bible/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (src.use_sound)
- playsound(src.loc, src.use_sound, 50, 1, -5)
+ playsound(src, src.use_sound, 50, 1, -5)
..()
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index a1cad988d7..1655cb28a6 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -52,7 +52,7 @@
return
// Now make the cardboard
to_chat(user, "You fold [src] flat.")
- playsound(src.loc, 'sound/items/storage/boxfold.ogg', 30, 1)
+ playsound(src, 'sound/items/storage/boxfold.ogg', 30, 1)
new foldable(get_turf(src))
qdel(src)
diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm
index 2fa8e54e87..b10caa3610 100644
--- a/code/game/objects/items/weapons/storage/lockbox.dm
+++ b/code/game/objects/items/weapons/storage/lockbox.dm
@@ -40,8 +40,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, 'sound/weapons/blade1.ogg', 50, 1)
- playsound(src.loc, "sparks", 50, 1)
+ playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
+ playsound(src, "sparks", 50, 1)
if(!locked)
..()
else
diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm
index c8bc129e3d..034e37ff8e 100644
--- a/code/game/objects/items/weapons/storage/secure.dm
+++ b/code/game/objects/items/weapons/storage/secure.dm
@@ -39,8 +39,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, 'sound/weapons/blade1.ogg', 50, 1)
- playsound(src.loc, "sparks", 50, 1)
+ playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
+ playsound(src, "sparks", 50, 1)
return
if (W.is_screwdriver())
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 5fc789549a..bfcbd695e5 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -142,7 +142,7 @@
/obj/item/weapon/storage/proc/open(mob/user as mob)
if (use_sound)
- playsound(src.loc, src.use_sound, 50, 0, -5)
+ playsound(src, src.use_sound, 50, 0, -5)
orient2hud(user)
if (user.s_active)
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index 183366a4c7..87ce75a233 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -148,7 +148,7 @@
if(bcell && bcell.charge > hitcost)
status = !status
to_chat(user, "[src] is now [status ? "on" : "off"].")
- playsound(loc, "sparks", 75, 1, -1)
+ playsound(src, "sparks", 75, 1, -1)
update_icon()
else
status = 0
@@ -193,7 +193,7 @@
target.visible_message("[target] has been prodded in the [affecting.name] with [src] by [user]!")
else
target.visible_message("[target] has been prodded with [src] by [user]!")
- playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
+ playsound(src, 'sound/weapons/Egloves.ogg', 50, 1, -1)
//stun effects
if(status)
diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm
index 204ebb6f89..a4a7992872 100644
--- a/code/game/objects/items/weapons/swords_axes_etc.dm
+++ b/code/game/objects/items/weapons/swords_axes_etc.dm
@@ -77,7 +77,7 @@
H.update_inv_l_hand()
H.update_inv_r_hand()
- playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1)
+ playsound(src, 'sound/weapons/empty.ogg', 50, 1)
add_fingerprint(user)
if(blood_overlay && blood_DNA && (blood_DNA.len >= 1)) //updates blood overlay, if any
@@ -104,7 +104,7 @@
user.take_organ_damage(2*force)
return
if(..())
- //playsound(src.loc, "swing_hit", 50, 1, -1)
+ //playsound(src, "swing_hit", 50, 1, -1)
return
else
return ..()
diff --git a/code/game/objects/items/weapons/syndie.dm b/code/game/objects/items/weapons/syndie.dm
index c4e273deea..b97f5303df 100644
--- a/code/game/objects/items/weapons/syndie.dm
+++ b/code/game/objects/items/weapons/syndie.dm
@@ -48,7 +48,7 @@
/obj/item/weapon/syndie/c4explosive/proc/detonate()
icon_state = "c-4[size]_1"
- playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1)
+ playsound(src, 'sound/weapons/armbomb.ogg', 75, 1)
for(var/mob/O in hearers(src, null))
O.show_message("[bicon(src)] The [src.name] beeps! ")
sleep(50)
diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm
index c78ffc7d55..32f6f99b27 100644
--- a/code/game/objects/items/weapons/tanks/jetpack.dm
+++ b/code/game/objects/items/weapons/tanks/jetpack.dm
@@ -31,7 +31,7 @@
. = ..()
if(air_contents.total_moles < 5)
. += "The meter on \the [src] indicates you are almost out of gas!"
- playsound(user, 'sound/effects/alert.ogg', 50, 1)
+ playsound(src, 'sound/effects/alert.ogg', 50, 1)
/obj/item/weapon/tank/jetpack/verb/toggle_rockets()
set name = "Toggle Jetpack Stabilization"
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index 9ecfaf16ce..9957e09f55 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -471,7 +471,7 @@ var/list/global/tank_gauge_cache = list()
if(!T)
return
T.assume_air(air_contents)
- playsound(get_turf(src), 'sound/weapons/Gunshot_shotgun.ogg', 20, 1)
+ playsound(src, 'sound/weapons/Gunshot_shotgun.ogg', 20, 1)
visible_message("[bicon(src)] \The [src] flies apart!", "You hear a bang!")
T.hotspot_expose(air_contents.temperature, 70, 1)
@@ -518,7 +518,7 @@ var/list/global/tank_gauge_cache = list()
T.assume_air(leaked_gas)
if(!leaking)
visible_message("[bicon(src)] \The [src] relief valve flips open with a hiss!", "You hear hissing.")
- playsound(src.loc, 'sound/effects/spray.ogg', 10, 1, -3)
+ playsound(src, 'sound/effects/spray.ogg', 10, 1, -3)
leaking = 1
#ifdef FIREDBG
log_debug("[x],[y] tank is leaking: [pressure] kPa, integrity [integrity]")
@@ -678,6 +678,11 @@ var/list/global/tank_gauge_cache = list()
tank.update_icon()
tank.overlays -= "bomb_assembly"
-/obj/item/device/tankassemblyproxy/HasProximity(atom/movable/AM as mob|obj)
- if(src.assembly)
- src.assembly.HasProximity(AM)
+/obj/item/device/tankassemblyproxy/HasProximity(turf/T, atom/movable/AM, old_loc)
+ assembly?.HasProximity(T, AM, old_loc)
+
+/obj/item/device/tankassemblyproxy/Moved(old_loc, direction, forced)
+ if(isturf(old_loc))
+ unsense_proximity(callback = .HasProximity, center = old_loc)
+ if(isturf(loc))
+ sense_proximity(callback = .HasProximity)
diff --git a/code/game/objects/items/weapons/tools/crowbar.dm b/code/game/objects/items/weapons/tools/crowbar.dm
index 56afaf8219..a139efe9f6 100644
--- a/code/game/objects/items/weapons/tools/crowbar.dm
+++ b/code/game/objects/items/weapons/tools/crowbar.dm
@@ -102,7 +102,7 @@
return ..()
/obj/item/weapon/tool/crowbar/power/attack_self(mob/user)
- playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1)
+ playsound(src, 'sound/items/change_jaws.ogg', 50, 1)
user.drop_item(src)
counterpart.forceMove(get_turf(src))
src.forceMove(counterpart)
diff --git a/code/game/objects/items/weapons/tools/screwdriver.dm b/code/game/objects/items/weapons/tools/screwdriver.dm
index c87cb50166..aea17ebf2b 100644
--- a/code/game/objects/items/weapons/tools/screwdriver.dm
+++ b/code/game/objects/items/weapons/tools/screwdriver.dm
@@ -146,7 +146,7 @@
return ..()
/obj/item/weapon/tool/screwdriver/power/attack_self(mob/user)
- playsound(get_turf(user),'sound/items/change_drill.ogg',50,1)
+ playsound(src,'sound/items/change_drill.ogg',50,1)
user.drop_item(src)
counterpart.forceMove(get_turf(src))
src.forceMove(counterpart)
diff --git a/code/game/objects/items/weapons/tools/weldingtool.dm b/code/game/objects/items/weapons/tools/weldingtool.dm
index 80d4d9a856..0c0add9e24 100644
--- a/code/game/objects/items/weapons/tools/weldingtool.dm
+++ b/code/game/objects/items/weapons/tools/weldingtool.dm
@@ -146,7 +146,7 @@
if(!welding && max_fuel)
O.reagents.trans_to_obj(src, max_fuel)
to_chat(user, "Welder refueled")
- playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
+ playsound(src, 'sound/effects/refill.ogg', 50, 1, -6)
return
else if(!welding)
to_chat(user, "[src] doesn't use fuel.")
@@ -273,7 +273,7 @@
to_chat(M, "You switch the [src] on.")
else if(T)
T.visible_message("\The [src] turns on.")
- playsound(loc, acti_sound, 50, 1)
+ playsound(src, acti_sound, 50, 1)
src.force = 15
src.damtype = "fire"
src.w_class = ITEMSIZE_LARGE
@@ -295,7 +295,7 @@
to_chat(M, "You switch \the [src] off.")
else if(T)
T.visible_message("\The [src] turns off.")
- playsound(loc, deac_sound, 50, 1)
+ playsound(src, deac_sound, 50, 1)
src.force = 3
src.damtype = "brute"
src.w_class = initial(src.w_class)
diff --git a/code/game/objects/items/weapons/tools/wirecutters.dm b/code/game/objects/items/weapons/tools/wirecutters.dm
index 6d5d0bb64a..d910f2cbf9 100644
--- a/code/game/objects/items/weapons/tools/wirecutters.dm
+++ b/code/game/objects/items/weapons/tools/wirecutters.dm
@@ -113,7 +113,7 @@
return ..()
/obj/item/weapon/tool/wirecutters/power/attack_self(mob/user)
- playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1)
+ playsound(src, 'sound/items/change_jaws.ogg', 50, 1)
user.drop_item(src)
counterpart.forceMove(get_turf(src))
src.forceMove(counterpart)
diff --git a/code/game/objects/items/weapons/tools/wrench.dm b/code/game/objects/items/weapons/tools/wrench.dm
index e48e572a51..d96a244282 100644
--- a/code/game/objects/items/weapons/tools/wrench.dm
+++ b/code/game/objects/items/weapons/tools/wrench.dm
@@ -96,7 +96,7 @@
return ..()
/obj/item/weapon/tool/wrench/power/attack_self(mob/user)
- playsound(get_turf(user),'sound/items/change_drill.ogg',50,1)
+ playsound(src,'sound/items/change_drill.ogg',50,1)
user.drop_item(src)
counterpart.forceMove(get_turf(src))
src.forceMove(counterpart)
diff --git a/code/game/objects/items/weapons/towels.dm b/code/game/objects/items/weapons/towels.dm
index ba1b662ebb..b9566c399b 100644
--- a/code/game/objects/items/weapons/towels.dm
+++ b/code/game/objects/items/weapons/towels.dm
@@ -12,7 +12,7 @@
/obj/item/weapon/towel/attack_self(mob/living/user as mob)
user.visible_message(text("[] uses [] to towel themselves off.", user, src))
- playsound(user, 'sound/weapons/towelwipe.ogg', 25, 1)
+ playsound(src, 'sound/weapons/towelwipe.ogg', 25, 1)
if(user.fire_stacks > 0)
user.fire_stacks = (max(0, user.fire_stacks - 1.5))
else if(user.fire_stacks < 0)
diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm
index 8e6667c759..0ec9bc7af3 100644
--- a/code/game/objects/items/weapons/traps.dm
+++ b/code/game/objects/items/weapons/traps.dm
@@ -39,7 +39,7 @@
"You have deployed \the [src]!",
"You hear a latch click loudly."
)
- playsound(src.loc, 'sound/machines/click.ogg',70, 1)
+ playsound(src, 'sound/machines/click.ogg',70, 1)
deployed = 1
user.drop_from_inventory(src)
@@ -64,7 +64,7 @@
"You begin disarming \the [src]!",
"You hear a latch click followed by the slow creaking of a spring."
)
- playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
+ playsound(src, 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 60))
user.visible_message(
@@ -98,6 +98,16 @@
if(!L.apply_damage(30, BRUTE, target_zone, blocked, soaked, used_weapon=src))
return 0
+ if(ishuman(L))
+ var/mob/living/carbon/human/H = L
+ var/obj/item/organ/external/affected = H.get_organ(check_zone(target_zone))
+ if(!affected) // took it clean off!
+ to_chat(H, "The steel jaws of \the [src] take your limb clean off!")
+ L.Stun(stun_length*2)
+ deployed = 0
+ anchored = FALSE
+ return
+
//trap the victim in place
set_dir(L.dir)
can_buckle = 1
diff --git a/code/game/objects/items/weapons/trays.dm b/code/game/objects/items/weapons/trays.dm
index 48d65ffb16..6809ae4547 100644
--- a/code/game/objects/items/weapons/trays.dm
+++ b/code/game/objects/items/weapons/trays.dm
@@ -36,10 +36,10 @@
M.Weaken(1)
user.take_organ_damage(2)
if(prob(50))
- playsound(M, 'sound/items/trayhit1.ogg', 50, 1)
+ playsound(src, 'sound/items/trayhit1.ogg', 50, 1)
return
else
- playsound(M, 'sound/items/trayhit2.ogg', 50, 1) //sound playin'
+ playsound(src, 'sound/items/trayhit2.ogg', 50, 1) //sound playin'
return //it always returns, but I feel like adding an extra return just for safety's sakes. EDIT; Oh well I won't :3
var/mob/living/carbon/human/H = M ///////////////////////////////////// /Let's have this ready for later.
@@ -60,12 +60,12 @@
else
M.take_organ_damage(5)
if(prob(50))
- playsound(M, 'sound/items/trayhit1.ogg', 50, 1)
+ playsound(src, 'sound/items/trayhit1.ogg', 50, 1)
for(var/mob/O in viewers(M, null))
O.show_message(text("[] slams [] with the tray!", user, M), 1)
return
else
- playsound(M, 'sound/items/trayhit2.ogg', 50, 1) //we applied the damage, we played the sound, we showed the appropriate messages. Time to return and stop the proc
+ playsound(src, 'sound/items/trayhit2.ogg', 50, 1) //we applied the damage, we played the sound, we showed the appropriate messages. Time to return and stop the proc
for(var/mob/O in viewers(M, null))
O.show_message(text("[] slams [] with the tray!", user, M), 1)
return
@@ -93,11 +93,11 @@
location.add_blood(H)
if(prob(50))
- playsound(M, 'sound/items/trayhit1.ogg', 50, 1)
+ playsound(src, 'sound/items/trayhit1.ogg', 50, 1)
for(var/mob/O in viewers(M, null))
O.show_message(text("[] slams [] with the tray!", user, M), 1)
else
- playsound(M, 'sound/items/trayhit2.ogg', 50, 1) //sound playin'
+ playsound(src, 'sound/items/trayhit2.ogg', 50, 1) //sound playin'
for(var/mob/O in viewers(M, null))
O.show_message(text("[] slams [] with the tray!", user, M), 1)
if(prob(10))
@@ -117,11 +117,11 @@
location.add_blood(H)
if(prob(50))
- playsound(M, 'sound/items/trayhit1.ogg', 50, 1)
+ playsound(src, 'sound/items/trayhit1.ogg', 50, 1)
for(var/mob/O in viewers(M, null))
O.show_message(text("[] slams [] in the face with the tray!", user, M), 1)
else
- playsound(M, 'sound/items/trayhit2.ogg', 50, 1) //sound playin' again
+ playsound(src, 'sound/items/trayhit2.ogg', 50, 1) //sound playin' again
for(var/mob/O in viewers(M, null))
O.show_message(text("[] slams [] in the face with the tray!", user, M), 1)
if(prob(30))
@@ -141,7 +141,7 @@
if(istype(W, /obj/item/weapon/material/kitchen/rollingpin))
if(cooldown < world.time - 25)
user.visible_message("[user] bashes [src] with [W]!")
- playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, 1)
+ playsound(src, 'sound/effects/shieldbash.ogg', 50, 1)
cooldown = world.time
else
..()
diff --git a/code/game/objects/items/weapons/weldbackpack.dm b/code/game/objects/items/weapons/weldbackpack.dm
index f603aa6498..e839bba3b3 100644
--- a/code/game/objects/items/weapons/weldbackpack.dm
+++ b/code/game/objects/items/weapons/weldbackpack.dm
@@ -68,7 +68,7 @@
to_chat(user, "That was close!")
src.reagents.trans_to_obj(W, T.max_fuel)
to_chat(user, "Welder refilled!")
- playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
+ playsound(src, 'sound/effects/refill.ogg', 50, 1, -6)
return
else if(nozzle)
if(nozzle == W)
@@ -105,7 +105,7 @@
if (istype(O, /obj/structure/reagent_dispensers/fueltank) && src.reagents.total_volume < max_fuel)
O.reagents.trans_to_obj(src, max_fuel)
to_chat(user, "You crack the cap off the top of the pack and fill it back up again from the tank.")
- playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
+ playsound(src, 'sound/effects/refill.ogg', 50, 1, -6)
return
else if (istype(O, /obj/structure/reagent_dispensers/fueltank) && src.reagents.total_volume == max_fuel)
to_chat(user, "The pack is already full!")
diff --git a/code/game/objects/structures/catwalk.dm b/code/game/objects/structures/catwalk.dm
index a912f354da..147a5dc38f 100644
--- a/code/game/objects/structures/catwalk.dm
+++ b/code/game/objects/structures/catwalk.dm
@@ -116,7 +116,7 @@
health -= amount
if(health <= 0)
visible_message("\The [src] breaks down!")
- playsound(loc, 'sound/effects/grillehit.ogg', 50, 1)
+ playsound(src, 'sound/effects/grillehit.ogg', 50, 1)
new /obj/item/stack/rods(get_turf(src))
Destroy()
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 3ff2f5fdd7..3c25ca3f90 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -122,7 +122,7 @@
src.icon_state = src.icon_opened
src.opened = 1
- playsound(src.loc, open_sound, 15, 1, -3)
+ playsound(src, open_sound, 15, 1, -3)
if(initial(density))
density = !density
return 1
@@ -147,7 +147,7 @@
src.icon_state = src.icon_closed
src.opened = 0
- playsound(src.loc, close_sound, 15, 1, -3)
+ playsound(src, close_sound, 15, 1, -3)
if(initial(density))
density = !density
return 1
@@ -427,7 +427,16 @@
breakout = 0
return
- playsound(src.loc, breakout_sound, 100, 1)
+ playsound(src, breakout_sound, 100, 1)
+ animate_shake()
+ add_fingerprint(escapee)
+
+ //Well then break it!
+ breakout = 0
+ to_chat(escapee, "You successfully break out!")
+ visible_message("\The [escapee] successfully broke out of \the [src]!")
+ playsound(src, breakout_sound, 100, 1)
+ break_open()
animate_shake()
add_fingerprint(escapee)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
index 0a77e4cafc..3094814d16 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
@@ -78,8 +78,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, 'sound/weapons/blade1.ogg', 50, 1)
- playsound(src.loc, "sparks", 50, 1)
+ playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
+ playsound(src, "sparks", 50, 1)
else
to_chat(user, "Access Denied")
return
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
index af07ceb9e5..c5732a337e 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
@@ -56,7 +56,7 @@
return
if(src.allowed(user))
src.locked = !src.locked
- playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3)
+ playsound(src, 'sound/machines/click.ogg', 15, 1, -3)
for(var/mob/O in viewers(user, 3))
if((O.client && !( O.blinded )))
to_chat(O, "The locker has been [locked ? null : "un"]locked by [user].")
@@ -86,8 +86,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, 'sound/weapons/blade1.ogg', 50, 1)
- playsound(src.loc, "sparks", 50, 1)
+ playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
+ playsound(src, "sparks", 50, 1)
else if(W.is_wrench())
if(sealed)
if(anchored)
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index 55378be679..e6f37f64d0 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -34,7 +34,7 @@
if(usr.stunned)
return 2
- playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3)
+ playsound(src, 'sound/machines/click.ogg', 15, 1, -3)
for(var/obj/O in src)
O.forceMove(get_turf(src))
icon_state = icon_opened
@@ -50,7 +50,7 @@
if(!src.can_close())
return 0
- playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3)
+ playsound(src, 'sound/machines/click.ogg', 15, 1, -3)
var/itemcount = 0
for(var/obj/O in get_turf(src))
if(itemcount >= storage_capacity)
@@ -97,7 +97,7 @@
else if(W.is_wirecutter())
if(rigged)
to_chat(user , "You cut away the wiring.")
- playsound(src.loc, W.usesound, 100, 1)
+ playsound(src, W.usesound, 100, 1)
rigged = 0
return
else return attack_hand(user)
@@ -206,7 +206,7 @@
overlays += emag
overlays += sparks
spawn(6) overlays -= sparks //Tried lots of stuff but nothing works right. so i have to use this *sadface*
- playsound(src.loc, "sparks", 60, 1)
+ playsound(src, "sparks", 60, 1)
src.locked = 0
src.broken = 1
to_chat(user, "You unlock \the [src].")
@@ -225,7 +225,7 @@
overlays += emag
overlays += sparks
spawn(6) overlays -= sparks //Tried lots of stuff but nothing works right. so i have to use this *sadface*
- playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
+ playsound(src, 'sound/effects/sparks4.ogg', 75, 1)
src.locked = 0
if(!opened && prob(20/severity))
if(!locked)
diff --git a/code/game/objects/structures/crates_lockers/vehiclecage.dm b/code/game/objects/structures/crates_lockers/vehiclecage.dm
index b565124e78..b98636eb16 100644
--- a/code/game/objects/structures/crates_lockers/vehiclecage.dm
+++ b/code/game/objects/structures/crates_lockers/vehiclecage.dm
@@ -32,11 +32,11 @@
if(!T)
to_chat(user, "You can't open this here!")
if(W.is_wrench() && do_after(user, 60 * W.toolspeed, src))
- playsound(loc, W.usesound, 50, 1)
+ playsound(src, W.usesound, 50, 1)
disassemble(W, user)
user.visible_message("[user] begins loosening \the [src]'s bolts.")
if(W.is_wirecutter() && do_after(user, 70 * W.toolspeed, src))
- playsound(loc, W.usesound, 50, 1)
+ playsound(src, W.usesound, 50, 1)
disassemble(W, user)
user.visible_message("[user] begins cutting \the [src]'s bolts.")
else
diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm
index c44f714cc5..9de63fd3d0 100644
--- a/code/game/objects/structures/curtains.dm
+++ b/code/game/objects/structures/curtains.dm
@@ -22,7 +22,7 @@
..(P, def_zone)
/obj/structure/curtain/attack_hand(mob/user)
- playsound(get_turf(loc), "rustle", 15, 1, -5)
+ playsound(src, "rustle", 15, 1, -5)
toggle()
..()
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index 088dbd33c6..0f18d967b3 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -43,7 +43,7 @@
playsound(src, "shatter", 70, 1)
update_icon()
else
- playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
+ playsound(src, 'sound/effects/Glasshit.ogg', 75, 1)
return
/obj/structure/displaycase/update_icon()
@@ -57,7 +57,7 @@
/obj/structure/displaycase/attackby(obj/item/weapon/W as obj, mob/user as mob)
user.setClickCooldown(user.get_attack_speed(W))
user.do_attack_animation(src)
- playsound(loc, 'sound/effects/Glasshit.ogg', 50, 1)
+ playsound(src, 'sound/effects/Glasshit.ogg', 50, 1)
src.health -= W.force
src.healthcheck()
..()
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index 40c47c9bb9..5a786cacd8 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -268,7 +268,7 @@
if (S)
if (S.get_amount() >= 1)
if(material_name == "rglass")
- playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
+ playsound(src, 'sound/items/Crowbar.ogg', 100, 1)
user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly.")
if(do_after(user, 40) && !glass)
if (S.use(1))
@@ -280,7 +280,7 @@
to_chat(user, "You cannot make an airlock out of that material.")
return
if(S.get_amount() >= 2)
- playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
+ playsound(src, 'sound/items/Crowbar.ogg', 100, 1)
user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly.")
if(do_after(user, 40) && !glass)
if (S.use(2))
diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm
index 0879e196f2..ed3669247a 100644
--- a/code/game/objects/structures/extinguisher.dm
+++ b/code/game/objects/structures/extinguisher.dm
@@ -38,7 +38,7 @@
if(O.is_wrench())
if(!has_extinguisher)
to_chat(user, "You start to unwrench the extinguisher cabinet.")
- playsound(src.loc, O.usesound, 50, 1)
+ playsound(src, O.usesound, 50, 1)
if(do_after(user, 15 * O.toolspeed))
to_chat(user, "You unwrench the extinguisher cabinet.")
new /obj/item/frame/extinguisher_cabinet( src.loc )
diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm
index e5735d1255..2e2251fabe 100644
--- a/code/game/objects/structures/fireaxe.dm
+++ b/code/game/objects/structures/fireaxe.dm
@@ -31,7 +31,7 @@
if (isrobot(user) || locked)
if(istype(O, /obj/item/device/multitool))
to_chat(user, "Resetting circuitry...")
- playsound(user, 'sound/machines/lockreset.ogg', 50, 1)
+ playsound(src, 'sound/machines/lockreset.ogg', 50, 1)
if(do_after(user, 20 * O.toolspeed))
locked = 0
to_chat(user, " You disable the locking modules.")
@@ -44,13 +44,13 @@
toggle_close_open()
return
else
- playsound(user, 'sound/effects/Glasshit.ogg', 100, 1) //We don't want this playing every time
+ playsound(src, 'sound/effects/Glasshit.ogg', 100, 1) //We don't want this playing every time
if(W.force < 15)
to_chat(user, "The cabinet's protective glass glances off the hit.")
else
hitstaken++
if(hitstaken == 4)
- playsound(user, 'sound/effects/Glassbr3.ogg', 100, 1) //Break cabinet, receive goodies. Cabinet's fucked for life after that.
+ playsound(src, 'sound/effects/Glassbr3.ogg', 100, 1) //Break cabinet, receive goodies. Cabinet's fucked for life after that.
smashed = 1
locked = 0
open= 1
@@ -82,7 +82,7 @@
return
else
to_chat(user, "Resetting circuitry...")
- playsound(user, 'sound/machines/lockenable.ogg', 50, 1)
+ playsound(src, 'sound/machines/lockenable.ogg', 50, 1)
if(do_after(user,20 * O.toolspeed))
locked = 1
to_chat(user, " You re-enable the locking modules.")
diff --git a/code/game/objects/structures/fitness.dm b/code/game/objects/structures/fitness.dm
index 158bf5533b..729e578ba5 100644
--- a/code/game/objects/structures/fitness.dm
+++ b/code/game/objects/structures/fitness.dm
@@ -20,7 +20,7 @@
if(user.a_intent == I_HURT)
user.setClickCooldown(user.get_attack_speed())
flick("[icon_state]_hit", src)
- playsound(src.loc, 'sound/effects/woodhit.ogg', 25, 1, -1)
+ playsound(src, 'sound/effects/woodhit.ogg', 25, 1, -1)
user.do_attack_animation(src)
user.nutrition = user.nutrition - 5
to_chat(user, "You [pick(hit_message)] \the [src].")
@@ -34,7 +34,7 @@
/obj/structure/fitness/weightlifter/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(W.is_wrench())
- playsound(src.loc, 'sound/items/Deconstruct.ogg', 75, 1)
+ playsound(src, 'sound/items/Deconstruct.ogg', 75, 1)
weight = ((weight) % qualifiers.len) + 1
to_chat(user, "You set the machine's weight level to [weight].")
@@ -52,12 +52,12 @@
return
else
being_used = 1
- playsound(src.loc, 'sound/effects/weightlifter.ogg', 50, 1)
+ playsound(src, 'sound/effects/weightlifter.ogg', 50, 1)
user.set_dir(SOUTH)
flick("[icon_state]_[weight]", src)
if(do_after(user, 20 + (weight * 10)))
- playsound(src.loc, 'sound/effects/weightdrop.ogg', 25, 1)
- user.nutrition -= weight * 10
+ playsound(src, 'sound/effects/weightdrop.ogg', 25, 1)
+ user.adjust_nutrition(weight * -10)
to_chat(user, "You lift the weights [qualifiers[weight]].")
being_used = 0
else
diff --git a/code/game/objects/structures/flora/trees.dm b/code/game/objects/structures/flora/trees.dm
index c4d8f58ebd..a9f3658ff6 100644
--- a/code/game/objects/structures/flora/trees.dm
+++ b/code/game/objects/structures/flora/trees.dm
@@ -58,9 +58,9 @@
damage_to_do = round(damage_to_do / 4)
if(damage_to_do > 0)
if(W.sharp && W.edge)
- playsound(get_turf(src), 'sound/effects/woodcutting.ogg', 50, 1)
+ playsound(src, 'sound/effects/woodcutting.ogg', 50, 1)
else
- playsound(get_turf(src), W.hitsound, 50, 1)
+ playsound(src, W.hitsound, 50, 1)
if(damage_to_do > 5 && !indestructable)
adjust_health(-damage_to_do)
else
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index d959aaa1ee..2cc53ff821 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -27,7 +27,7 @@
/obj/structure/grille/attack_hand(mob/user as mob)
user.setClickCooldown(user.get_attack_speed())
- playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
+ playsound(src, 'sound/effects/grillehit.ogg', 80, 1)
user.do_attack_animation(src)
var/damage_dealt = 1
@@ -153,7 +153,7 @@
else if((W.flags & NOCONDUCT) || !shock(user, 70))
user.setClickCooldown(user.get_attack_speed(W))
user.do_attack_animation(src)
- playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
+ playsound(src, 'sound/effects/grillehit.ogg', 80, 1)
switch(W.damtype)
if("fire")
health -= W.force
diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm
index 995bf4eece..3e58a93850 100644
--- a/code/game/objects/structures/inflatable.dm
+++ b/code/game/objects/structures/inflatable.dm
@@ -86,7 +86,7 @@
/obj/structure/inflatable/proc/hit(var/damage, var/sound_effect = 1)
health = max(0, health - damage)
if(sound_effect)
- playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1)
+ playsound(src, 'sound/effects/Glasshit.ogg', 75, 1)
if(health <= 0)
puncture()
@@ -102,7 +102,7 @@
qdel(src)
/obj/structure/inflatable/proc/deflate()
- playsound(loc, 'sound/machines/hiss.ogg', 75, 1)
+ playsound(src, 'sound/machines/hiss.ogg', 75, 1)
//to_chat(user, "You slowly deflate the inflatable wall.")
visible_message("[src] slowly deflates.")
spawn(50)
@@ -111,7 +111,7 @@
qdel(src)
/obj/structure/inflatable/proc/puncture()
- playsound(loc, 'sound/machines/hiss.ogg', 75, 1)
+ playsound(src, 'sound/machines/hiss.ogg', 75, 1)
visible_message("[src] rapidly deflates!")
var/obj/item/inflatable/torn/R = new /obj/item/inflatable/torn(loc)
src.transfer_fingerprints_to(R)
@@ -227,7 +227,7 @@
icon_state = "door_closed"
/obj/structure/inflatable/door/deflate()
- playsound(loc, 'sound/machines/hiss.ogg', 75, 1)
+ playsound(src, 'sound/machines/hiss.ogg', 75, 1)
visible_message("[src] slowly deflates.")
spawn(50)
var/obj/item/inflatable/door/R = new /obj/item/inflatable/door(loc)
@@ -235,7 +235,7 @@
qdel(src)
/obj/structure/inflatable/door/puncture()
- playsound(loc, 'sound/machines/hiss.ogg', 75, 1)
+ playsound(src, 'sound/machines/hiss.ogg', 75, 1)
visible_message("[src] rapidly deflates!")
var/obj/item/inflatable/door/torn/R = new /obj/item/inflatable/door/torn(loc)
src.transfer_fingerprints_to(R)
diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm
index 78bc276ecd..f320c478b9 100644
--- a/code/game/objects/structures/janicart.dm
+++ b/code/game/objects/structures/janicart.dm
@@ -329,7 +329,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
if(reagents.total_volume > 1)
reagents.trans_to_obj(I, 2)
to_chat(user, "You wet [I] in the [callme].")
- playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
+ playsound(src, 'sound/effects/slosh.ogg', 25, 1)
else
to_chat(user, "This [callme] is out of water!")
else if(istype(I, /obj/item/key))
diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm
index 07cc774fb0..4705b39276 100644
--- a/code/game/objects/structures/mirror.dm
+++ b/code/game/objects/structures/mirror.dm
@@ -51,7 +51,7 @@
/obj/structure/mirror/attackby(obj/item/I as obj, mob/user as mob)
if(I.is_wrench())
if(!glass)
- playsound(src.loc, I.usesound, 50, 1)
+ playsound(src, I.usesound, 50, 1)
if(do_after(user, 20 * I.toolspeed))
to_chat(user, "You unfasten the frame.")
new /obj/item/frame/mirror( src.loc )
@@ -65,7 +65,7 @@
new /obj/item/weapon/material/shard( src.loc )
return
if(!shattered && glass)
- playsound(src.loc, I.usesound, 50, 1)
+ playsound(src, I.usesound, 50, 1)
to_chat(user, "You remove the glass.")
glass = !glass
icon_state = "mirror_frame"
@@ -88,7 +88,7 @@
return
if(shattered && glass)
- playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
+ playsound(src, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
return
if(prob(I.force * 2))
@@ -97,13 +97,13 @@
shatter()
else
visible_message("[user] hits [src] with [I]!")
- playsound(src.loc, 'sound/effects/Glasshit.ogg', 70, 1)
+ playsound(src, 'sound/effects/Glasshit.ogg', 70, 1)
/obj/structure/mirror/attack_generic(var/mob/user, var/damage)
user.do_attack_animation(src)
if(shattered && glass)
- playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
+ playsound(src, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
return 0
if(damage)
diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm
index 13e3ca4cdc..e7e80206f2 100644
--- a/code/game/objects/structures/mop_bucket.dm
+++ b/code/game/objects/structures/mop_bucket.dm
@@ -28,4 +28,4 @@ GLOBAL_LIST_BOILERPLATE(all_mopbuckets, /obj/structure/mopbucket)
else
reagents.trans_to_obj(I, 5)
to_chat(user, "You wet \the [I] in \the [src].")
- playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
+ playsound(src, 'sound/effects/slosh.ogg', 25, 1)
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index c1ccfb6c69..d22d903861 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -95,13 +95,13 @@
for(var/atom/movable/A as mob|obj in src.connected.loc)
if (!( A.anchored ))
A.forceMove(src)
- playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
+ playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
qdel(src.connected)
src.connected = null
/obj/structure/morgue/proc/open()
- playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
+ playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
src.connected = new /obj/structure/m_tray( src.loc )
step(src.connected, src.dir)
src.connected.layer = OBJ_LAYER
@@ -225,11 +225,11 @@ GLOBAL_LIST_BOILERPLATE(all_crematoriums, /obj/structure/morgue/crematorium)
for(var/atom/movable/A as mob|obj in src.connected.loc)
if (!( A.anchored ))
A.forceMove(src)
- playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
+ playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
//src.connected = null
qdel(src.connected)
else if (src.locked == 0)
- playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
+ playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
src.connected = new /obj/structure/m_tray/c_tray( src.loc )
step(src.connected, EAST)
src.connected.layer = OBJ_LAYER
@@ -319,7 +319,7 @@ GLOBAL_LIST_BOILERPLATE(all_crematoriums, /obj/structure/morgue/crematorium)
sleep(30)
cremating = 0
locked = 0
- playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
+ playsound(src, 'sound/machines/ding.ogg', 50, 1)
return
diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm
index 39eea11236..cfd036b9bb 100644
--- a/code/game/objects/structures/musician.dm
+++ b/code/game/objects/structures/musician.dm
@@ -345,7 +345,7 @@
/obj/structure/device/piano/attackby(obj/item/O as obj, mob/user as mob)
if(O.is_wrench())
if(anchored)
- playsound(src.loc, O.usesound, 50, 1)
+ playsound(src, O.usesound, 50, 1)
to_chat(user, "You begin to loosen \the [src]'s casters...")
if (do_after(user, 40 * O.toolspeed))
user.visible_message( \
@@ -354,7 +354,7 @@
"You hear ratchet.")
src.anchored = 0
else
- playsound(src.loc, O.usesound, 50, 1)
+ playsound(src, O.usesound, 50, 1)
to_chat(user, "You begin to tighten \the [src] to the floor...")
if (do_after(user, 20 * O.toolspeed))
user.visible_message( \
diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm
index c701ae9015..629bc1c41e 100644
--- a/code/game/objects/structures/noticeboard.dm
+++ b/code/game/objects/structures/noticeboard.dm
@@ -43,7 +43,7 @@
to_chat(user, "You reach to pin your paper to the board but hesitate. You are certain your paper will not be seen among the many others already attached.")
if(O.is_wrench())
to_chat(user, "You start to unwrench the noticeboard.")
- playsound(src.loc, O.usesound, 50, 1)
+ playsound(src, O.usesound, 50, 1)
if(do_after(user, 15 * O.toolspeed))
to_chat(user, "You unwrench the noticeboard.")
new /obj/item/frame/noticeboard( src.loc )
diff --git a/code/game/objects/structures/props/swarm.dm b/code/game/objects/structures/props/swarm.dm
index 85cc967e68..128254a456 100644
--- a/code/game/objects/structures/props/swarm.dm
+++ b/code/game/objects/structures/props/swarm.dm
@@ -37,7 +37,7 @@
if(prob(1 + damage * 3))
visible_message("[shatter_message]")
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"
@@ -53,21 +53,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/swarm/pylon_unique()
. = ..()
@@ -117,7 +117,7 @@
if(prob(1 + damage * 3) && damage >= 25)
visible_message("[shatter_message]")
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"
@@ -133,18 +133,18 @@
)
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 * 3))
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)
diff --git a/code/game/objects/structures/railing.dm b/code/game/objects/structures/railing.dm
index ae21c406c3..5a4ce00a8c 100644
--- a/code/game/objects/structures/railing.dm
+++ b/code/game/objects/structures/railing.dm
@@ -63,7 +63,7 @@
health -= amount
if(health <= 0)
visible_message("\The [src] breaks down!")
- playsound(loc, 'sound/effects/grillehit.ogg', 50, 1)
+ playsound(src, 'sound/effects/grillehit.ogg', 50, 1)
new /obj/item/stack/rods(get_turf(src))
qdel(src)
@@ -203,7 +203,7 @@
/obj/structure/railing/attackby(obj/item/W as obj, mob/user as mob)
// Dismantle
if(W.is_wrench() && !anchored)
- playsound(src.loc, W.usesound, 50, 1)
+ playsound(src, W.usesound, 50, 1)
if(do_after(user, 20, src))
user.visible_message("\The [user] dismantles \the [src].", "You dismantle \the [src].")
new /obj/item/stack/material/steel(get_turf(usr), 2)
@@ -214,7 +214,7 @@
if(health < maxhealth && istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/F = W
if(F.welding)
- playsound(src.loc, F.usesound, 50, 1)
+ playsound(src, F.usesound, 50, 1)
if(do_after(user, 20, src))
user.visible_message("\The [user] repairs some damage to \the [src].", "You repair some damage to \the [src].")
health = min(health+(maxhealth/5), maxhealth) // 20% repair per application
@@ -223,7 +223,7 @@
// Install
if(W.is_screwdriver())
user.visible_message(anchored ? "\The [user] begins unscrewing \the [src]." : "\The [user] begins fasten \the [src]." )
- playsound(loc, W.usesound, 75, 1)
+ playsound(src, W.usesound, 75, 1)
if(do_after(user, 10, src))
to_chat(user, (anchored ? "You have unfastened \the [src] from the floor." : "You have fastened \the [src] to the floor."))
anchored = !anchored
@@ -245,7 +245,7 @@
M.apply_damage(8,def_zone = "head")
take_damage(8)
visible_message("[G.assailant] slams [G.affecting]'s face against \the [src]!")
- playsound(loc, 'sound/effects/grillehit.ogg', 50, 1)
+ playsound(src, 'sound/effects/grillehit.ogg', 50, 1)
else
to_chat(user, "You need a better grip to do that!")
return
@@ -260,7 +260,7 @@
return
else
- playsound(loc, 'sound/effects/grillehit.ogg', 50, 1)
+ playsound(src, 'sound/effects/grillehit.ogg', 50, 1)
take_damage(W.force)
user.setClickCooldown(user.get_attack_speed(W))
diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index 9de9dc082b..e68fa43640 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -114,7 +114,7 @@ FLOOR SAFES
tumbler_2_pos = decrement(tumbler_2_pos)
if(canhear)
to_chat(user, "You hear a [pick("click", "chink", "clink")] from \the [src].")
- playsound(user, 'sound/machines/click.ogg', 20, 1)
+ playsound(src, 'sound/machines/click.ogg', 20, 1)
check_unlocked(user, canhear)
updateUsrDialog()
@@ -130,7 +130,7 @@ FLOOR SAFES
tumbler_2_pos = increment(tumbler_2_pos)
if(canhear)
to_chat(user, "You hear a [pick("click", "chink", "clink")] from \the [src].")
- playsound(user, 'sound/machines/click.ogg', 20, 1)
+ playsound(src, 'sound/machines/click.ogg', 20, 1)
check_unlocked(user, canhear)
updateUsrDialog()
return
diff --git a/code/game/objects/structures/salvageable.dm b/code/game/objects/structures/salvageable.dm
index 2703a7eed6..201b203acc 100644
--- a/code/game/objects/structures/salvageable.dm
+++ b/code/game/objects/structures/salvageable.dm
@@ -15,7 +15,7 @@
/obj/structure/salvageable/attackby(obj/item/I, mob/user)
if(I.is_crowbar())
- playsound(loc, I.usesound, 50, 1)
+ playsound(src, I.usesound, 50, 1)
var/actual_time = I.toolspeed * 170
user.visible_message( \
"\The [user] begins salvaging from \the [src].", \
@@ -240,7 +240,7 @@ obj/structure/salvageable/bliss/Initialize()
/obj/structure/salvageable/bliss/attackby(obj/item/I, mob/user)
if((. = ..()))
- playsound(user, 'sound/machines/shutdown.ogg', 60, 1)
+ playsound(src, 'sound/machines/shutdown.ogg', 60, 1)
//////////////////
//// ONE STAR ////
diff --git a/code/game/objects/structures/simple_doors.dm b/code/game/objects/structures/simple_doors.dm
index ff8dbe141e..95689683a5 100644
--- a/code/game/objects/structures/simple_doors.dm
+++ b/code/game/objects/structures/simple_doors.dm
@@ -95,7 +95,7 @@
/obj/structure/simple_door/proc/Open()
isSwitchingStates = 1
- playsound(loc, material.dooropen_noise, 100, 1)
+ playsound(src, material.dooropen_noise, 100, 1)
flick("[material.door_icon_base]opening",src)
sleep(10)
density = 0
@@ -107,7 +107,7 @@
/obj/structure/simple_door/proc/Close()
isSwitchingStates = 1
- playsound(loc, material.dooropen_noise, 100, 1)
+ playsound(src, material.dooropen_noise, 100, 1)
flick("[material.door_icon_base]closing",src)
sleep(10)
density = 1
@@ -135,9 +135,9 @@
hardness -= W.force/10
visible_message("[user] hits [src] with [W]!")
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)
CheckHardness()
@@ -160,9 +160,9 @@
/obj/structure/simple_door/attack_generic(var/mob/user, var/damage, var/attack_verb)
visible_message("[user] [attack_verb] the [src]!")
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)
diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
index 270583011d..ebba811fb9 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
@@ -73,7 +73,7 @@
/obj/structure/bed/nest/attackby(obj/item/weapon/W as obj, mob/user as mob)
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)
for(var/mob/M in viewers(src, 7))
M.show_message("[user] hits [src] with [W]!", 1)
healthcheck()
diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index 0cf31edb89..3d6743d82b 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -124,7 +124,7 @@
to_chat(user, "\The [src] has no padding to remove.")
return
to_chat(user, "You remove the padding from \the [src].")
- playsound(src.loc, W.usesound, 100, 1)
+ playsound(src, W.usesound, 100, 1)
remove_padding()
else if(istype(W, /obj/item/weapon/grab))
diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
index fc84fea573..593e1db1f2 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -21,7 +21,7 @@
return
user.drop_item()
var/obj/structure/bed/chair/e_chair/E = new (src.loc, material.name)
- playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
+ playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
E.set_dir(dir)
E.part = SK
SK.loc = E
@@ -188,7 +188,7 @@
occupant.apply_effect(6, WEAKEN, blocked)
occupant.apply_effect(6, STUTTER, blocked)
occupant.apply_damage(10, BRUTE, def_zone, blocked, soaked)
- playsound(src.loc, 'sound/weapons/punch1.ogg', 50, 1, -1)
+ playsound(src, 'sound/weapons/punch1.ogg', 50, 1, -1)
if(istype(A, /mob/living))
var/mob/living/victim = A
def_zone = ran_zone()
diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm
index 88b07f3243..407591b285 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm
@@ -145,7 +145,7 @@ var/global/list/stool_cache = list() //haha stool
to_chat(user, "\The [src] has no padding to remove.")
return
to_chat(user, "You remove the padding from \the [src].")
- playsound(src.loc, W.usesound, 50, 1)
+ playsound(src, W.usesound, 50, 1)
remove_padding()
else
..()
diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
index 639020ba5d..089e65fc04 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
@@ -166,7 +166,7 @@
occupant.apply_effect(6, WEAKEN, blocked)
occupant.apply_effect(6, STUTTER, blocked)
occupant.apply_damage(10, BRUTE, def_zone, soaked)
- playsound(src.loc, 'sound/weapons/punch1.ogg', 50, 1, -1)
+ playsound(src, 'sound/weapons/punch1.ogg', 50, 1, -1)
if(istype(A, /mob/living))
var/mob/living/victim = A
def_zone = ran_zone()
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 467579a225..78ad49d907 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -46,7 +46,7 @@
/obj/structure/toilet/attackby(obj/item/I as obj, mob/living/user as mob)
if(I.is_crowbar())
to_chat(user, "You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"].")
- playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 50, 1)
+ playsound(src, 'sound/effects/stonedoor_openclose.ogg', 50, 1)
if(do_after(user, 30))
user.visible_message("[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!", "You [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!", "You hear grinding porcelain.")
cistern = !cistern
@@ -172,7 +172,7 @@
if(I.is_wrench())
var/newtemp = input(user, "What setting would you like to set the temperature valve to?", "Water Temperature Valve") in temperature_settings
to_chat(user, "You begin to adjust the temperature valve with \the [I].")
- playsound(src.loc, I.usesound, 50, 1)
+ playsound(src, I.usesound, 50, 1)
if(do_after(user, 50 * I.toolspeed))
watertemp = newtemp
user.visible_message("[user] adjusts the shower with \the [I].", "You adjust the shower with \the [I].")
@@ -384,7 +384,7 @@
return
to_chat(usr, "You start washing your hands.")
- playsound(loc, 'sound/effects/sink_long.ogg', 75, 1)
+ playsound(src, 'sound/effects/sink_long.ogg', 75, 1)
busy = 1
sleep(40)
@@ -407,7 +407,7 @@
if (istype(RG) && RG.is_open_container())
RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
user.visible_message("[user] fills \the [RG] using \the [src].","You fill \the [RG] using \the [src].")
- playsound(loc, 'sound/effects/sink.ogg', 75, 1)
+ playsound(src, 'sound/effects/sink.ogg', 75, 1)
return 1
else if (istype(O, /obj/item/weapon/melee/baton))
@@ -431,7 +431,7 @@
else if(istype(O, /obj/item/weapon/mop))
O.reagents.add_reagent("water", 5)
to_chat(user, "You wet \the [O] in \the [src].")
- playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
+ playsound(src, 'sound/effects/slosh.ogg', 25, 1)
return
var/turf/location = user.loc
diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm
index 353df5ecb8..400b997dc5 100644
--- a/code/game/objects/structures/windoor_assembly.dm
+++ b/code/game/objects/structures/windoor_assembly.dm
@@ -91,7 +91,7 @@ obj/structure/windoor_assembly/Destroy()
var/obj/item/weapon/weldingtool/WT = W
if (WT.remove_fuel(0,user))
user.visible_message("[user] disassembles the windoor assembly.", "You start to disassemble the windoor assembly.")
- playsound(src.loc, WT.usesound, 50, 1)
+ playsound(src, WT.usesound, 50, 1)
if(do_after(user, 40 * WT.toolspeed))
if(!src || !WT.isOn()) return
@@ -157,7 +157,7 @@ obj/structure/windoor_assembly/Destroy()
//Adding airlock electronics for access. Step 6 complete.
else if(istype(W, /obj/item/weapon/airlock_electronics))
- playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
+ playsound(src, 'sound/items/Screwdriver.ogg', 100, 1)
user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly.")
if(do_after(user, 40))
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 666f05b79b..79a6bf6e21 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -59,7 +59,7 @@
shatter()
else
if(sound_effect)
- playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1)
+ playsound(src, 'sound/effects/Glasshit.ogg', 100, 1)
if(health < maxhealth / 4 && initialhealth >= maxhealth / 4)
visible_message("[src] looks like it's about to shatter!" )
update_icon()
@@ -172,7 +172,7 @@
/obj/structure/window/attack_tk(mob/user as mob)
user.visible_message("Something knocks on [src].")
- playsound(loc, 'sound/effects/Glasshit.ogg', 50, 1)
+ playsound(src, 'sound/effects/Glasshit.ogg', 50, 1)
/obj/structure/window/attack_hand(mob/user as mob)
user.setClickCooldown(user.get_attack_speed())
@@ -190,13 +190,13 @@
attack_generic(H,25)
return
- playsound(src.loc, 'sound/effects/glassknock.ogg', 80, 1)
+ playsound(src, 'sound/effects/glassknock.ogg', 80, 1)
user.do_attack_animation(src)
usr.visible_message("\The [usr] bangs against \the [src]!",
"You bang against \the [src]!",
"You hear a banging sound.")
else
- playsound(src.loc, 'sound/effects/glassknock.ogg', 80, 1)
+ playsound(src, 'sound/effects/glassknock.ogg', 80, 1)
usr.visible_message("[usr.name] knocks on the [src.name].",
"You knock on the [src.name].",
"You hear a knocking sound.")
@@ -297,13 +297,13 @@
else if(istype(W, /obj/item/stack/cable_coil) && reinf && state == 0 && !istype(src, /obj/structure/window/reinforced/polarized))
var/obj/item/stack/cable_coil/C = W
if (C.use(1))
- playsound(src.loc, 'sound/effects/sparks1.ogg', 75, 1)
+ playsound(src, 'sound/effects/sparks1.ogg', 75, 1)
user.visible_message( \
"\The [user] begins to wire \the [src] for electrochromic tinting.", \
"You begin to wire \the [src] for electrochromic tinting.", \
"You hear sparks.")
if(do_after(user, 20 * C.toolspeed, src) && state == 0)
- playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
+ playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
var/obj/structure/window/reinforced/polarized/P = new(loc, dir)
if(is_fulltile())
P.fulltile = TRUE
@@ -326,7 +326,7 @@
update_nearby_icons()
step(src, get_dir(user, src))
else
- playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1)
+ playsound(src, 'sound/effects/Glasshit.ogg', 75, 1)
..()
return
diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm
index 071499c297..9a5c0c4b48 100644
--- a/code/game/turfs/simulated/water.dm
+++ b/code/game/turfs/simulated/water.dm
@@ -45,7 +45,7 @@
else if(istype(O, /obj/item/weapon/mop))
O.reagents.add_reagent(reagent_type, 5)
to_chat(user, "You wet \the [O] in \the [src].")
- playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
+ playsound(src, 'sound/effects/slosh.ogg', 25, 1)
return 1
else return ..()
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index 29bad72682..8b6e71aeda 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -136,15 +136,10 @@
return
/turf/space/Entered(var/atom/movable/A)
- ..()
-
- if (!A || src != A.loc)
- return
-
- inertial_drift(A)
+ . = ..()
if(edge && ticker?.mode)
- A.touch_map_edge()
+ A?.touch_map_edge()
/turf/space/proc/Sandbox_Spacemove(atom/movable/A as mob|obj)
var/cur_x
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 07969b9479..e93380d791 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -142,37 +142,6 @@ turf/attackby(obj/item/weapon/W as obj, mob/user as mob)
sleep(2)
O.update_transform()
-var/const/enterloopsanity = 100
-/turf/Entered(atom/atom as mob|obj)
-
- if(movement_disabled)
- to_chat(usr, "Movement is admin-disabled.") //This is to identify lag problems
- return
- ..()
-
- if(!istype(atom, /atom/movable))
- return
-
- var/atom/movable/A = atom
-
- if(ismob(A))
- var/mob/M = A
- if(M.lastarea?.has_gravity == 0)
- inertial_drift(M)
- else if(!is_space())
- M.inertia_dir = 0
- M.make_floating(0)
-
- var/objects = 0
- if(A && (A.flags & PROXMOVE))
- for(var/atom/movable/thing in range(1))
- if(objects++ > enterloopsanity) break
- spawn(0)
- if(A) //Runtime prevention
- A.HasProximity(thing, 1)
- if ((thing && A) && (thing.flags & PROXMOVE))
- thing.HasProximity(A, 1)
-
/turf/CanPass(atom/movable/mover, turf/target)
if(!target)
return FALSE
@@ -241,22 +210,6 @@ var/const/enterloopsanity = 100
/turf/proc/is_plating()
return 0
-/turf/proc/inertial_drift(atom/movable/A as mob|obj)
- if(!(A.last_move)) return
- if((istype(A, /mob/) && src.x > 1 && src.x < (world.maxx) && src.y > 1 && src.y < (world.maxy)))
- var/mob/M = A
- if(M.Process_Spacemove(1))
- M.inertia_dir = 0
- return
- spawn(5)
- if((M && !(M.anchored) && !(M.pulledby) && (M.loc == src)))
- if(M.inertia_dir)
- step(M, M.inertia_dir)
- return
- M.inertia_dir = M.last_move
- step(M, M.inertia_dir)
- return
-
/turf/proc/levelupdate()
for(var/obj/O in src)
O.hide(O.hides_under_flooring() && !is_plating())
diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm
index 2a946b492a..60f1640cdd 100644
--- a/code/modules/admin/verbs/playsound.dm
+++ b/code/modules/admin/verbs/playsound.dm
@@ -28,7 +28,7 @@ var/list/sounds_cache = list()
log_admin("[key_name(src)] played a local sound [S]")
message_admins("[key_name_admin(src)] played a local sound [S]", 1)
- playsound(get_turf(src.mob), S, 50, 0, 0)
+ playsound(src.mob, S, 50, 0, 0)
feedback_add_details("admin_verb","PLS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/ai/ai_holder_communication.dm b/code/modules/ai/ai_holder_communication.dm
index ef8fcf253d..beddb68924 100644
--- a/code/modules/ai/ai_holder_communication.dm
+++ b/code/modules/ai/ai_holder_communication.dm
@@ -34,8 +34,8 @@
if(holder.say_list)
holder.ISay(safepick(holder.say_list.say_threaten))
- playsound(holder.loc, holder.say_list.threaten_sound, 50, 1) // We do this twice to make the sound -very- noticable to the target.
- playsound(target.loc, holder.say_list.threaten_sound, 50, 1) // Actual aim-mode also does that so at least it's consistant.
+ playsound(holder, holder.say_list.threaten_sound, 50, 1) // We do this twice to make the sound -very- noticable to the target.
+ playsound(target, holder.say_list.threaten_sound, 50, 1) // Actual aim-mode also does that so at least it's consistant.
else // Otherwise we are waiting for them to go away or to wait long enough for escalate.
if(target in list_targets()) // Are they still visible?
var/should_escalate = FALSE
@@ -57,8 +57,8 @@
set_stance(STANCE_IDLE)
if(holder.say_list)
holder.ISay(safepick(holder.say_list.say_stand_down))
- playsound(holder.loc, holder.say_list.stand_down_sound, 50, 1) // We do this twice to make the sound -very- noticable to the target.
- playsound(target.loc, holder.say_list.stand_down_sound, 50, 1) // Actual aim-mode also does that so at least it's consistant.
+ playsound(holder, holder.say_list.stand_down_sound, 50, 1) // We do this twice to make the sound -very- noticable to the target.
+ playsound(target, holder.say_list.stand_down_sound, 50, 1) // Actual aim-mode also does that so at least it's consistant.
// Determines what is deserving of a warning when STANCE_ALERT is active.
/datum/ai_holder/proc/will_threaten(mob/living/the_target)
diff --git a/code/modules/artifice/deadringer.dm b/code/modules/artifice/deadringer.dm
index 0906eda63e..b5edd57784 100644
--- a/code/modules/artifice/deadringer.dm
+++ b/code/modules/artifice/deadringer.dm
@@ -89,7 +89,7 @@
/obj/item/weapon/deadringer/proc/reveal()
if(watchowner)
watchowner.alpha = 255
- playsound(get_turf(src), 'sound/effects/uncloak.ogg', 35, 1, -1)
+ playsound(src, 'sound/effects/uncloak.ogg', 35, 1, -1)
return
/obj/item/weapon/deadringer/proc/makeacorpse(var/mob/living/carbon/human/H)
diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm
index 2f6d7ab02f..824eb85b0a 100644
--- a/code/modules/assembly/holder.dm
+++ b/code/modules/assembly/holder.dm
@@ -3,7 +3,6 @@
icon = 'icons/obj/assemblies/new_assemblies.dmi'
icon_state = "holder"
item_state = "assembly"
- flags = PROXMOVE
throwforce = 5
w_class = ITEMSIZE_SMALL
throw_speed = 3
@@ -64,11 +63,18 @@
else
. += "\The [src] can be attached!"
-/obj/item/device/assembly_holder/HasProximity(atom/movable/AM as mob|obj)
+/obj/item/device/assembly_holder/Moved(atom/old_loc, direction, forced = FALSE)
+ . = ..()
+ if(isturf(old_loc))
+ unsense_proximity(callback = .HasProximity, center = old_loc)
+ if(isturf(loc))
+ sense_proximity(callback = .HasProximity)
+
+/obj/item/device/assembly_holder/HasProximity(turf/T, atom/movable/AM, old_loc)
if(a_left)
- a_left.HasProximity(AM)
+ a_left.HasProximity(T, AM, old_loc)
if(a_right)
- a_right.HasProximity(AM)
+ a_right.HasProximity(T, AM, old_loc)
/obj/item/device/assembly_holder/Crossed(atom/movable/AM as mob|obj)
if(AM.is_incorporeal())
diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm
index b294fc90c8..6ea9dfdff7 100644
--- a/code/modules/assembly/mousetrap.dm
+++ b/code/modules/assembly/mousetrap.dm
@@ -43,7 +43,7 @@
var/mob/living/simple_mob/animal/passive/mouse/M = target
visible_message("SPLAT!")
M.splat()
- playsound(target.loc, 'sound/effects/snap.ogg', 50, 1)
+ playsound(target, 'sound/effects/snap.ogg', 50, 1)
layer = MOB_LAYER - 0.2
armed = 0
update_icon()
@@ -65,7 +65,7 @@
to_chat(user, "You disarm [src].")
armed = !armed
update_icon()
- playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3)
+ playsound(user, 'sound/weapons/handcuffs.ogg', 30, 1, -3)
/obj/item/device/assembly/mousetrap/attack_hand(var/mob/living/user)
if(armed)
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index c439163fc2..f7d8e3e59e 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -4,7 +4,6 @@
icon_state = "prox"
origin_tech = list(TECH_MAGNET = 1)
matter = list(DEFAULT_WALL_MATERIAL = 800, "glass" = 200, "waste" = 50)
- flags = PROXMOVE
wires = WIRE_PULSE
secured = 0
@@ -33,7 +32,7 @@
update_icon()
return secured
-/obj/item/device/assembly/prox_sensor/HasProximity(atom/movable/AM as mob|obj)
+/obj/item/device/assembly/prox_sensor/HasProximity(turf/T, atom/movable/AM, old_loc)
if(!istype(AM))
log_debug("DEBUG: HasProximity called with [AM] on [src] ([usr]).")
return
@@ -90,6 +89,10 @@
/obj/item/device/assembly/prox_sensor/Moved(atom/old_loc, direction, forced = FALSE)
. = ..()
+ if(isturf(old_loc))
+ unsense_proximity(range = range, callback = .HasProximity, center = old_loc)
+ if(isturf(loc))
+ sense_proximity(range = range, callback = .HasProximity)
sense()
/obj/item/device/assembly/prox_sensor/interact(mob/user as mob)//TODO: Change this to the wires thingy
diff --git a/code/modules/blob/blob.dm b/code/modules/blob/blob.dm
index c9ab387753..e450e85ed4 100644
--- a/code/modules/blob/blob.dm
+++ b/code/modules/blob/blob.dm
@@ -43,7 +43,7 @@
/obj/effect/blob/proc/take_damage(var/damage)
health -= damage
if(health < 0)
- playsound(loc, 'sound/effects/splat.ogg', 50, 1)
+ playsound(src, 'sound/effects/splat.ogg', 50, 1)
qdel(src)
else
update_icon()
@@ -103,7 +103,7 @@
if(L.stat == DEAD)
continue
L.visible_message("The blob attacks \the [L]!", "The blob attacks you!")
- playsound(loc, 'sound/effects/attackblob.ogg', 50, 1)
+ playsound(src, 'sound/effects/attackblob.ogg', 50, 1)
L.take_organ_damage(rand(30, 40))
return
new expandType(T, min(health, 30))
@@ -135,7 +135,7 @@
/obj/effect/blob/attackby(var/obj/item/weapon/W, var/mob/user)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
- playsound(loc, 'sound/effects/attackblob.ogg', 50, 1)
+ playsound(src, 'sound/effects/attackblob.ogg', 50, 1)
visible_message("\The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]")
var/damage = 0
switch(W.damtype)
diff --git a/code/modules/blob2/blobs/base_blob.dm b/code/modules/blob2/blobs/base_blob.dm
index 1bcf7c35bd..71d4ad7254 100644
--- a/code/modules/blob2/blobs/base_blob.dm
+++ b/code/modules/blob2/blobs/base_blob.dm
@@ -32,7 +32,7 @@ GLOBAL_LIST_EMPTY(all_blobs)
/obj/structure/blob/Destroy()
- playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) //Expand() is no longer broken, no check necessary.
+ playsound(src, 'sound/effects/splat.ogg', 50, 1) //Expand() is no longer broken, no check necessary.
GLOB.all_blobs -= src
overmind = null
return ..()
@@ -149,7 +149,7 @@ GLOBAL_LIST_EMPTY(all_blobs)
if(istype(T, /turf/space) && !(locate(/obj/structure/lattice) in T) && prob(80))
make_blob = FALSE
- playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) //Let's give some feedback that we DID try to spawn in space, since players are used to it
+ playsound(src, 'sound/effects/splat.ogg', 50, 1) //Let's give some feedback that we DID try to spawn in space, since players are used to it
consume_tile() //hit the tile we're in, making sure there are no border objects blocking us
@@ -223,7 +223,7 @@ GLOBAL_LIST_EMPTY(all_blobs)
/obj/structure/blob/attack_generic(var/mob/user, var/damage, var/attack_verb)
visible_message("[user] [attack_verb] the [src]!")
- playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
+ playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
user.do_attack_animation(src)
if(overmind)
damage *= overmind.blob_type.brute_multiplier
@@ -307,7 +307,7 @@ GLOBAL_LIST_EMPTY(all_blobs)
/obj/structure/blob/attackby(var/obj/item/weapon/W, var/mob/user)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
- playsound(loc, 'sound/effects/attackblob.ogg', 50, 1)
+ playsound(src, 'sound/effects/attackblob.ogg', 50, 1)
visible_message("\The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]")
var/damage = W.force
switch(W.damtype)
@@ -318,7 +318,7 @@ GLOBAL_LIST_EMPTY(all_blobs)
damage *= 2
if(damage > 0)
- playsound(src.loc, 'sound/items/welder.ogg', 100, 1)
+ playsound(src, 'sound/items/welder.ogg', 100, 1)
else
playsound(src, 'sound/weapons/tap.ogg', 50, 1)
if(BRUTE, SEARING, TOX, CLONE)
@@ -328,7 +328,7 @@ GLOBAL_LIST_EMPTY(all_blobs)
damage *= 2
if(damage > 0)
- playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1)
+ playsound(src, 'sound/effects/attackblob.ogg', 50, 1)
else
playsound(src, 'sound/weapons/tap.ogg', 50, 1)
if(overmind)
@@ -369,7 +369,7 @@ GLOBAL_LIST_EMPTY(all_blobs)
/obj/structure/blob/proc/adjust_integrity(amount)
integrity = between(0, integrity + amount, max_integrity)
if(integrity == 0)
- playsound(loc, 'sound/effects/splat.ogg', 50, 1)
+ playsound(src, 'sound/effects/splat.ogg', 50, 1)
if(overmind)
overmind.blob_type.on_death(src)
qdel(src)
diff --git a/code/modules/catalogue/cataloguer.dm b/code/modules/catalogue/cataloguer.dm
index e4e148c230..8f7f3152f3 100644
--- a/code/modules/catalogue/cataloguer.dm
+++ b/code/modules/catalogue/cataloguer.dm
@@ -111,25 +111,25 @@ GLOBAL_LIST_EMPTY(all_cataloguers)
box_segments = draw_box(target, scan_range, user.client)
color_box(box_segments, "#00FF00", scan_delay)
- playsound(src.loc, 'sound/machines/beep.ogg', 50)
+ playsound(src, 'sound/machines/beep.ogg', 50)
// The delay, and test for if the scan succeeds or not.
var/scan_start_time = world.time
if(do_after(user, scan_delay, target, ignore_movement = TRUE, max_distance = scan_range))
if(target.can_catalogue(user))
to_chat(user, span("notice", "You successfully scan \the [target] with \the [src]."))
- playsound(src.loc, 'sound/machines/ping.ogg', 50)
+ playsound(src, 'sound/machines/ping.ogg', 50)
catalogue_object(target, user)
else
// In case someone else scans it first, or it died, etc.
to_chat(user, span("warning", "\The [target] is no longer valid to scan with \the [src]."))
- playsound(src.loc, 'sound/machines/buzz-two.ogg', 50)
+ playsound(src, 'sound/machines/buzz-two.ogg', 50)
partial_scanned = null
partial_scan_time = 0
else
to_chat(user, span("warning", "You failed to finish scanning \the [target] with \the [src]."))
- playsound(src.loc, 'sound/machines/buzz-two.ogg', 50)
+ playsound(src, 'sound/machines/buzz-two.ogg', 50)
color_box(box_segments, "#FF0000", 3)
partial_scanned = weakref(target)
partial_scan_time += world.time - scan_start_time // This is added to the existing value so two partial scans will add up correctly.
@@ -204,7 +204,7 @@ GLOBAL_LIST_EMPTY(all_cataloguers)
busy = TRUE
update_icon()
- playsound(src.loc, 'sound/machines/beep.ogg', 50)
+ playsound(src, 'sound/machines/beep.ogg', 50)
// First, get everything able to be scanned.
var/list/scannable_atoms = list()
@@ -232,9 +232,9 @@ GLOBAL_LIST_EMPTY(all_cataloguers)
busy = FALSE
update_icon()
if(scannable_atoms.len)
- playsound(src.loc, 'sound/machines/ping.ogg', 50)
+ playsound(src, 'sound/machines/ping.ogg', 50)
else
- playsound(src.loc, 'sound/machines/buzz-two.ogg', 50)
+ playsound(src, 'sound/machines/buzz-two.ogg', 50)
to_chat(user, span("notice", "\The [src] found [scannable_atoms.len] object\s that can be scanned."))
diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm
index 92beaa5d9a..d5edede6ce 100644
--- a/code/modules/client/preference_setup/general/03_body.dm
+++ b/code/modules/client/preference_setup/general/03_body.dm
@@ -321,33 +321,33 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
. += "Hair "
if(has_flag(mob_species, HAS_HAIR_COLOR))
- . += "Change Color
__
"
- . += " Style: [pref.h_style] "
+ . += "Change Color [color_square(pref.r_hair, pref.g_hair, pref.b_hair)] "
+ . += " Style: <>[pref.h_style] " //The < & > in this line is correct-- those extra characters are the arrows you click to switch between styles.
. += " Facial "
if(has_flag(mob_species, HAS_HAIR_COLOR))
- . += "Change Color
__
"
- . += " Style: [pref.f_style] "
+ . += "Change Color [color_square(pref.r_facial, pref.g_facial, pref.b_facial)] "
+ . += " Style: <>[pref.f_style] " //Same as above with the extra > & < characters
if(has_flag(mob_species, HAS_EYE_COLOR))
. += " Eyes "
- . += "Change Color
__
"
+ . += "Change Color [color_square(pref.r_eyes, pref.g_eyes, pref.b_eyes)] "
if(has_flag(mob_species, HAS_SKIN_COLOR))
. += " Body Color "
- . += "Change Color