diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index 5250148688..dd70ad37ea 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -80,7 +80,7 @@ M.stop_pulling() step(M, M.dir) M << "\blue You slipped on the wet floor!" - playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3) + playsound(src, 'sound/misc/slip.ogg', 50, 1, -3) M.Stun(5) M.Weaken(3) else @@ -91,7 +91,7 @@ M.stop_pulling() step(M, M.dir) M << "\blue You slipped on the wet floor!" - playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3) + playsound(src, 'sound/misc/slip.ogg', 50, 1, -3) M.Stun(5) M.Weaken(3) else @@ -108,7 +108,7 @@ spawn(4) step(M, M.dir) M.take_organ_damage(2) // Was 5 -- TLE M << "\blue You slipped on the floor!" - playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3) + playsound(src, 'sound/misc/slip.ogg', 50, 1, -3) M.Weaken(10) if(3) // Ice if(istype(M, /mob/living/carbon/human)) // Added check since monkeys don't have shoes @@ -116,7 +116,7 @@ M.stop_pulling() step(M, M.dir) M << "\blue You slipped on the icy floor!" - playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3) + playsound(src, 'sound/misc/slip.ogg', 50, 1, -3) M.Stun(4) M.Weaken(3) else @@ -127,7 +127,7 @@ M.stop_pulling() step(M, M.dir) M << "\blue You slipped on the icy floor!" - playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3) + playsound(src, 'sound/misc/slip.ogg', 50, 1, -3) M.Stun(4) M.Weaken(3) else @@ -189,4 +189,4 @@ this.blood_DNA["UNKNOWN BLOOD"] = "X*" else if( istype(M, /mob/living/silicon/robot )) - new /obj/effect/decal/cleanable/blood/oil(src) + new /obj/effect/decal/cleanable/blood/oil(src) diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 64eceb34d3..90aa2a4f02 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -455,7 +455,7 @@ turf/simulated/floor/proc/update_icon() new floor_tile.type(src) make_plating() - playsound(src.loc, 'sound/items/Crowbar.ogg', 80, 1) + playsound(src, 'sound/items/Crowbar.ogg', 80, 1) return @@ -468,7 +468,7 @@ turf/simulated/floor/proc/update_icon() new floor_tile.type(src) make_plating() - playsound(src.loc, 'sound/items/Screwdriver.ogg', 80, 1) + playsound(src, 'sound/items/Screwdriver.ogg', 80, 1) return @@ -479,7 +479,7 @@ turf/simulated/floor/proc/update_icon() user << "\blue Reinforcing the floor..." if(do_after(user, 30) && R && R.amount >= 2 && is_plating()) ChangeTurf(/turf/simulated/floor/engine) - playsound(src.loc, 'sound/items/Deconstruct.ogg', 80, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 80, 1) R.use(2) return else @@ -512,7 +512,7 @@ turf/simulated/floor/proc/update_icon() T.use(1) update_icon() levelupdate() - playsound(src.loc, 'sound/weapons/Genhit.ogg', 50, 1) + playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) else user << "\blue This section is too damaged to support a tile. Use a welder to fix the damage." @@ -539,7 +539,7 @@ turf/simulated/floor/proc/update_icon() if(broken || burnt) if(welder.remove_fuel(0,user)) user << "\red You fix some dents on the broken plating." - playsound(src.loc, 'sound/items/Welder.ogg', 80, 1) + playsound(src, 'sound/items/Welder.ogg', 80, 1) icon_state = "plating" burnt = 0 broken = 0 diff --git a/code/game/turfs/simulated/floor_types.dm b/code/game/turfs/simulated/floor_types.dm index f24e837820..9984516a9c 100644 --- a/code/game/turfs/simulated/floor_types.dm +++ b/code/game/turfs/simulated/floor_types.dm @@ -61,7 +61,7 @@ return if(istype(C, /obj/item/weapon/wrench)) user << "\blue Removing rods..." - playsound(src.loc, 'sound/items/Ratchet.ogg', 80, 1) + playsound(src, 'sound/items/Ratchet.ogg', 80, 1) if(do_after(user, 30)) new /obj/item/stack/rods(src, 2) ChangeTurf(/turf/simulated/floor) diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index a8d7326366..7522683941 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -16,7 +16,7 @@ /turf/simulated/wall/proc/dismantle_wall(devastated=0, explode=0) if(istype(src,/turf/simulated/wall/r_wall)) if(!devastated) - playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) + playsound(src, 'sound/items/Welder.ogg', 100, 1) new /obj/structure/girder/reinforced(src) new /obj/item/stack/sheet/plasteel( src ) else @@ -25,7 +25,7 @@ new /obj/item/stack/sheet/plasteel( src ) else if(istype(src,/turf/simulated/wall/cult)) if(!devastated) - playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) + playsound(src, 'sound/items/Welder.ogg', 100, 1) new /obj/effect/decal/cleanable/blood(src) new /obj/structure/cultgirder(src) else @@ -34,7 +34,7 @@ else if(!devastated) - playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) + playsound(src, 'sound/items/Welder.ogg', 100, 1) new /obj/structure/girder(src) if (mineral == "metal") new /obj/item/stack/sheet/metal( src ) @@ -138,7 +138,7 @@ return user << "\blue You push the wall but nothing happens!" - playsound(src.loc, 'sound/weapons/Genhit.ogg', 25, 1) + playsound(src, 'sound/weapons/Genhit.ogg', 25, 1) src.add_fingerprint(user) return @@ -156,7 +156,7 @@ var/obj/item/weapon/weldingtool/WT = W if( WT.remove_fuel(0,user) ) user << "You burn away the fungi with \the [WT]." - playsound(src.loc, 'sound/items/Welder.ogg', 10, 1) + playsound(src, 'sound/items/Welder.ogg', 10, 1) for(var/obj/effect/E in src) if(E.name == "Wallrot") del E rotting = 0 @@ -183,8 +183,8 @@ EB.spark_system.start() user << "You slash \the [src] with \the [EB]; the thermite ignites!" - 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) thermitemelt(user) return @@ -196,7 +196,7 @@ var/obj/item/weapon/weldingtool/WT = W if( WT.remove_fuel(0,user) ) user << "You begin slicing through the outer plating." - playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) + playsound(src, 'sound/items/Welder.ogg', 100, 1) sleep(100) if( !istype(src, /turf/simulated/wall) || !user || !WT || !WT.isOn() || !T ) return @@ -211,7 +211,7 @@ else if( istype(W, /obj/item/weapon/pickaxe/plasmacutter) ) user << "You begin slicing through the outer plating." - playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) + playsound(src, 'sound/items/Welder.ogg', 100, 1) sleep(60) if(mineral == "diamond")//Oh look, it's tougher @@ -247,7 +247,7 @@ EB.spark_system.start() user << "You stab \the [EB] into the wall and begin to slice it apart." - playsound(src.loc, "sparks", 50, 1) + playsound(src, "sparks", 50, 1) sleep(70) if(mineral == "diamond") @@ -256,8 +256,8 @@ if( user.loc == T && user.get_active_hand() == W ) EB.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) dismantle_wall(1) for(var/mob/O in viewers(user, 5)) O.show_message("The wall was sliced apart by [user]!", 1, "You hear metal being sliced apart and sparks flying.", 2) diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm index c2ef4050c1..f70322ee57 100644 --- a/code/game/turfs/simulated/walls_reinforced.dm +++ b/code/game/turfs/simulated/walls_reinforced.dm @@ -25,7 +25,7 @@ return user << "\blue You push the wall but nothing happens!" - playsound(src.loc, 'sound/weapons/Genhit.ogg', 25, 1) + playsound(src, 'sound/weapons/Genhit.ogg', 25, 1) src.add_fingerprint(user) return @@ -44,7 +44,7 @@ var/obj/item/weapon/weldingtool/WT = W if( WT.remove_fuel(0,user) ) user << "You burn away the fungi with \the [WT]." - playsound(src.loc, 'sound/items/Welder.ogg', 10, 1) + playsound(src, 'sound/items/Welder.ogg', 10, 1) for(var/obj/effect/E in src) if(E.name == "Wallrot") del E rotting = 0 @@ -71,8 +71,8 @@ EB.spark_system.start() user << "You slash \the [src] with \the [EB]; the thermite ignites!" - 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) thermitemelt(user) return @@ -87,7 +87,7 @@ switch(d_state) if(0) if (istype(W, /obj/item/weapon/wirecutters)) - playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) + playsound(src, 'sound/items/Wirecutter.ogg', 100, 1) src.d_state = 1 src.icon_state = "r_wall-1" new /obj/item/stack/rods( src ) @@ -97,7 +97,7 @@ if(1) if (istype(W, /obj/item/weapon/screwdriver)) user << "You begin removing the support lines." - playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) + playsound(src, 'sound/items/Screwdriver.ogg', 100, 1) sleep(40) if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return @@ -127,7 +127,7 @@ if( WT.remove_fuel(0,user) ) user << "You begin slicing through the metal cover." - playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) + playsound(src, 'sound/items/Welder.ogg', 100, 1) sleep(60) if( !istype(src, /turf/simulated/wall/r_wall) || !user || !WT || !WT.isOn() || !T ) return @@ -143,7 +143,7 @@ if( istype(W, /obj/item/weapon/pickaxe/plasmacutter) ) user << "You begin slicing through the metal cover." - playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) + playsound(src, 'sound/items/Welder.ogg', 100, 1) sleep(40) if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return @@ -158,7 +158,7 @@ if (istype(W, /obj/item/weapon/crowbar)) user << "You struggle to pry off the cover." - playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) + playsound(src, 'sound/items/Crowbar.ogg', 100, 1) sleep(100) if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return @@ -173,7 +173,7 @@ if (istype(W, /obj/item/weapon/wrench)) user << "You start loosening the anchoring bolts which secure the support rods to their frame." - playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) + playsound(src, 'sound/items/Ratchet.ogg', 100, 1) sleep(40) if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return @@ -190,7 +190,7 @@ if( WT.remove_fuel(0,user) ) user << "You begin slicing through the support rods." - playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) + playsound(src, 'sound/items/Welder.ogg', 100, 1) sleep(100) if( !istype(src, /turf/simulated/wall/r_wall) || !user || !WT || !WT.isOn() || !T ) return @@ -207,7 +207,7 @@ if( istype(W, /obj/item/weapon/pickaxe/plasmacutter) ) user << "You begin slicing through the support rods." - playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) + playsound(src, 'sound/items/Welder.ogg', 100, 1) sleep(70) if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return @@ -223,7 +223,7 @@ if( istype(W, /obj/item/weapon/crowbar) ) user << "You struggle to pry off the outer sheath." - playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) + playsound(src, 'sound/items/Crowbar.ogg', 100, 1) sleep(100) if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 4323ee0adb..d99dc06677 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -39,7 +39,7 @@ return var/obj/item/stack/rods/R = C user << "\blue Constructing support lattice ..." - playsound(src.loc, 'sound/weapons/Genhit.ogg', 50, 1) + playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) ReplaceWithLattice() R.use(1) return @@ -49,7 +49,7 @@ if(L) var/obj/item/stack/tile/plasteel/S = C del(L) - playsound(src.loc, 'sound/weapons/Genhit.ogg', 50, 1) + playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) S.build(src) S.use(1) return