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

turfs: fix some playsound ERRORs on areas

Browse Source 
Turf (de)construction playsound()s were using src.loc, instead of src

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
This commit is contained in:
Mloc-Argent
2014-04-27 15:06:42 +01:00
parent 74ef3765d0
commit 01e1153c00
6 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/turfs/simulated.dm
View File

@@ -80,7 +80,7 @@
M.stop_pulling() M.stop_pulling()
step(M, M.dir) step(M, M.dir)
M << "\blue You slipped on the wet floor!" 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.Stun(5)
M.Weaken(3) M.Weaken(3)
else else
@@ -91,7 +91,7 @@
M.stop_pulling() M.stop_pulling()
step(M, M.dir) step(M, M.dir)
M << "\blue You slipped on the wet floor!" 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.Stun(5)
M.Weaken(3) M.Weaken(3)
else else
@@ -108,7 +108,7 @@
spawn(4) step(M, M.dir) spawn(4) step(M, M.dir)
M.take_organ_damage(2) // Was 5 -- TLE M.take_organ_damage(2) // Was 5 -- TLE
M << "\blue You slipped on the floor!" 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) M.Weaken(10)
if(3) // Ice if(3) // Ice
if(istype(M, /mob/living/carbon/human)) // Added check since monkeys don't have shoes if(istype(M, /mob/living/carbon/human)) // Added check since monkeys don't have shoes
@@ -116,7 +116,7 @@
M.stop_pulling() M.stop_pulling()
step(M, M.dir) step(M, M.dir)
M << "\blue You slipped on the icy floor!" 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.Stun(4)
M.Weaken(3) M.Weaken(3)
else else
@@ -127,7 +127,7 @@
M.stop_pulling() M.stop_pulling()
step(M, M.dir) step(M, M.dir)
M << "\blue You slipped on the icy floor!" 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.Stun(4)
M.Weaken(3) M.Weaken(3)
else else

10
code/game/turfs/simulated/floor.dm
View File

@@ -455,7 +455,7 @@ turf/simulated/floor/proc/update_icon()
new floor_tile.type(src) new floor_tile.type(src)
make_plating() make_plating()
playsound(src.loc, 'sound/items/Crowbar.ogg', 80, 1) playsound(src, 'sound/items/Crowbar.ogg', 80, 1)
return return
@@ -468,7 +468,7 @@ turf/simulated/floor/proc/update_icon()
new floor_tile.type(src) new floor_tile.type(src)
make_plating() make_plating()
playsound(src.loc, 'sound/items/Screwdriver.ogg', 80, 1) playsound(src, 'sound/items/Screwdriver.ogg', 80, 1)
return return
@@ -479,7 +479,7 @@ turf/simulated/floor/proc/update_icon()
user << "\blue Reinforcing the floor..." user << "\blue Reinforcing the floor..."
if(do_after(user, 30) && R && R.amount >= 2 && is_plating()) if(do_after(user, 30) && R && R.amount >= 2 && is_plating())
ChangeTurf(/turf/simulated/floor/engine) 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) R.use(2)
return return
else else
@@ -512,7 +512,7 @@ turf/simulated/floor/proc/update_icon()
T.use(1) T.use(1)
update_icon() update_icon()
levelupdate() levelupdate()
playsound(src.loc, 'sound/weapons/Genhit.ogg', 50, 1) playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
else else
user << "\blue This section is too damaged to support a tile. Use a welder to fix the damage." 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(broken || burnt)
if(welder.remove_fuel(0,user)) if(welder.remove_fuel(0,user))
user << "\red You fix some dents on the broken plating." 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" icon_state = "plating"
burnt = 0 burnt = 0
broken = 0 broken = 0

2
code/game/turfs/simulated/floor_types.dm
View File

@@ -61,7 +61,7 @@
return return
if(istype(C, /obj/item/weapon/wrench)) if(istype(C, /obj/item/weapon/wrench))
user << "\blue Removing rods..." 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)) if(do_after(user, 30))
new /obj/item/stack/rods(src, 2) new /obj/item/stack/rods(src, 2)
ChangeTurf(/turf/simulated/floor) ChangeTurf(/turf/simulated/floor)

24
code/game/turfs/simulated/walls.dm
View File

@@ -16,7 +16,7 @@
/turf/simulated/wall/proc/dismantle_wall(devastated=0, explode=0) /turf/simulated/wall/proc/dismantle_wall(devastated=0, explode=0)
if(istype(src,/turf/simulated/wall/r_wall)) if(istype(src,/turf/simulated/wall/r_wall))
if(!devastated) 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/structure/girder/reinforced(src)
new /obj/item/stack/sheet/plasteel( src ) new /obj/item/stack/sheet/plasteel( src )
else else
@@ -25,7 +25,7 @@
new /obj/item/stack/sheet/plasteel( src ) new /obj/item/stack/sheet/plasteel( src )
else if(istype(src,/turf/simulated/wall/cult)) else if(istype(src,/turf/simulated/wall/cult))
if(!devastated) 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/effect/decal/cleanable/blood(src)
new /obj/structure/cultgirder(src) new /obj/structure/cultgirder(src)
else else
@@ -34,7 +34,7 @@
else else
if(!devastated) if(!devastated)
playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) playsound(src, 'sound/items/Welder.ogg', 100, 1)
new /obj/structure/girder(src) new /obj/structure/girder(src)
if (mineral == "metal") if (mineral == "metal")
new /obj/item/stack/sheet/metal( src ) new /obj/item/stack/sheet/metal( src )
@@ -138,7 +138,7 @@
return return
user << "\blue You push the wall but nothing happens!" 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) src.add_fingerprint(user)
return return
@@ -156,7 +156,7 @@
var/obj/item/weapon/weldingtool/WT = W var/obj/item/weapon/weldingtool/WT = W
if( WT.remove_fuel(0,user) ) if( WT.remove_fuel(0,user) )
user << "<span class='notice'>You burn away the fungi with \the [WT].</span>" user << "<span class='notice'>You burn away the fungi with \the [WT].</span>"
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") for(var/obj/effect/E in src) if(E.name == "Wallrot")
del E del E
rotting = 0 rotting = 0
@@ -183,8 +183,8 @@
EB.spark_system.start() EB.spark_system.start()
user << "<span class='notice'>You slash \the [src] with \the [EB]; the thermite ignites!</span>" user << "<span class='notice'>You slash \the [src] with \the [EB]; the thermite ignites!</span>"
playsound(src.loc, "sparks", 50, 1) playsound(src, "sparks", 50, 1)
playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
thermitemelt(user) thermitemelt(user)
return return
@@ -196,7 +196,7 @@
var/obj/item/weapon/weldingtool/WT = W var/obj/item/weapon/weldingtool/WT = W
if( WT.remove_fuel(0,user) ) if( WT.remove_fuel(0,user) )
user << "<span class='notice'>You begin slicing through the outer plating.</span>" user << "<span class='notice'>You begin slicing through the outer plating.</span>"
playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) playsound(src, 'sound/items/Welder.ogg', 100, 1)
sleep(100) sleep(100)
if( !istype(src, /turf/simulated/wall) || !user || !WT || !WT.isOn() || !T ) return 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) ) else if( istype(W, /obj/item/weapon/pickaxe/plasmacutter) )
user << "<span class='notice'>You begin slicing through the outer plating.</span>" user << "<span class='notice'>You begin slicing through the outer plating.</span>"
playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) playsound(src, 'sound/items/Welder.ogg', 100, 1)
sleep(60) sleep(60)
if(mineral == "diamond")//Oh look, it's tougher if(mineral == "diamond")//Oh look, it's tougher
@@ -247,7 +247,7 @@
EB.spark_system.start() EB.spark_system.start()
user << "<span class='notice'>You stab \the [EB] into the wall and begin to slice it apart.</span>" user << "<span class='notice'>You stab \the [EB] into the wall and begin to slice it apart.</span>"
playsound(src.loc, "sparks", 50, 1) playsound(src, "sparks", 50, 1)
sleep(70) sleep(70)
if(mineral == "diamond") if(mineral == "diamond")
@@ -256,8 +256,8 @@
if( user.loc == T && user.get_active_hand() == W ) if( user.loc == T && user.get_active_hand() == W )
EB.spark_system.start() EB.spark_system.start()
playsound(src.loc, "sparks", 50, 1) playsound(src, "sparks", 50, 1)
playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
dismantle_wall(1) dismantle_wall(1)
for(var/mob/O in viewers(user, 5)) for(var/mob/O in viewers(user, 5))
O.show_message("<span class='warning'>The wall was sliced apart by [user]!</span>", 1, "<span class='warning'>You hear metal being sliced apart and sparks flying.</span>", 2) O.show_message("<span class='warning'>The wall was sliced apart by [user]!</span>", 1, "<span class='warning'>You hear metal being sliced apart and sparks flying.</span>", 2)

26
code/game/turfs/simulated/walls_reinforced.dm
View File

@@ -25,7 +25,7 @@
return return
user << "\blue You push the wall but nothing happens!" 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) src.add_fingerprint(user)
return return
@@ -44,7 +44,7 @@
var/obj/item/weapon/weldingtool/WT = W var/obj/item/weapon/weldingtool/WT = W
if( WT.remove_fuel(0,user) ) if( WT.remove_fuel(0,user) )
user << "<span class='notice'>You burn away the fungi with \the [WT].</span>" user << "<span class='notice'>You burn away the fungi with \the [WT].</span>"
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") for(var/obj/effect/E in src) if(E.name == "Wallrot")
del E del E
rotting = 0 rotting = 0
@@ -71,8 +71,8 @@
EB.spark_system.start() EB.spark_system.start()
user << "<span class='notice'>You slash \the [src] with \the [EB]; the thermite ignites!</span>" user << "<span class='notice'>You slash \the [src] with \the [EB]; the thermite ignites!</span>"
playsound(src.loc, "sparks", 50, 1) playsound(src, "sparks", 50, 1)
playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
thermitemelt(user) thermitemelt(user)
return return
@@ -87,7 +87,7 @@
switch(d_state) switch(d_state)
if(0) if(0)
if (istype(W, /obj/item/weapon/wirecutters)) 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.d_state = 1
src.icon_state = "r_wall-1" src.icon_state = "r_wall-1"
new /obj/item/stack/rods( src ) new /obj/item/stack/rods( src )
@@ -97,7 +97,7 @@
if(1) if(1)
if (istype(W, /obj/item/weapon/screwdriver)) if (istype(W, /obj/item/weapon/screwdriver))
user << "<span class='notice'>You begin removing the support lines.</span>" user << "<span class='notice'>You begin removing the support lines.</span>"
playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) playsound(src, 'sound/items/Screwdriver.ogg', 100, 1)
sleep(40) sleep(40)
if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return
@@ -127,7 +127,7 @@
if( WT.remove_fuel(0,user) ) if( WT.remove_fuel(0,user) )
user << "<span class='notice'>You begin slicing through the metal cover.</span>" user << "<span class='notice'>You begin slicing through the metal cover.</span>"
playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) playsound(src, 'sound/items/Welder.ogg', 100, 1)
sleep(60) sleep(60)
if( !istype(src, /turf/simulated/wall/r_wall) || !user || !WT || !WT.isOn() || !T ) return 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) ) if( istype(W, /obj/item/weapon/pickaxe/plasmacutter) )
user << "<span class='notice'>You begin slicing through the metal cover.</span>" user << "<span class='notice'>You begin slicing through the metal cover.</span>"
playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) playsound(src, 'sound/items/Welder.ogg', 100, 1)
sleep(40) sleep(40)
if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return
@@ -158,7 +158,7 @@
if (istype(W, /obj/item/weapon/crowbar)) if (istype(W, /obj/item/weapon/crowbar))
user << "<span class='notice'>You struggle to pry off the cover.</span>" user << "<span class='notice'>You struggle to pry off the cover.</span>"
playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) playsound(src, 'sound/items/Crowbar.ogg', 100, 1)
sleep(100) sleep(100)
if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return
@@ -173,7 +173,7 @@
if (istype(W, /obj/item/weapon/wrench)) if (istype(W, /obj/item/weapon/wrench))
user << "<span class='notice'>You start loosening the anchoring bolts which secure the support rods to their frame.</span>" user << "<span class='notice'>You start loosening the anchoring bolts which secure the support rods to their frame.</span>"
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) playsound(src, 'sound/items/Ratchet.ogg', 100, 1)
sleep(40) sleep(40)
if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return
@@ -190,7 +190,7 @@
if( WT.remove_fuel(0,user) ) if( WT.remove_fuel(0,user) )
user << "<span class='notice'>You begin slicing through the support rods.</span>" user << "<span class='notice'>You begin slicing through the support rods.</span>"
playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) playsound(src, 'sound/items/Welder.ogg', 100, 1)
sleep(100) sleep(100)
if( !istype(src, /turf/simulated/wall/r_wall) || !user || !WT || !WT.isOn() || !T ) return 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) ) if( istype(W, /obj/item/weapon/pickaxe/plasmacutter) )
user << "<span class='notice'>You begin slicing through the support rods.</span>" user << "<span class='notice'>You begin slicing through the support rods.</span>"
playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) playsound(src, 'sound/items/Welder.ogg', 100, 1)
sleep(70) sleep(70)
if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return
@@ -223,7 +223,7 @@
if( istype(W, /obj/item/weapon/crowbar) ) if( istype(W, /obj/item/weapon/crowbar) )
user << "<span class='notice'>You struggle to pry off the outer sheath.</span>" user << "<span class='notice'>You struggle to pry off the outer sheath.</span>"
playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) playsound(src, 'sound/items/Crowbar.ogg', 100, 1)
sleep(100) sleep(100)
if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return

4
code/game/turfs/space/space.dm
View File

@@ -39,7 +39,7 @@
return return
var/obj/item/stack/rods/R = C var/obj/item/stack/rods/R = C
user << "\blue Constructing support lattice ..." user << "\blue Constructing support lattice ..."
playsound(src.loc, 'sound/weapons/Genhit.ogg', 50, 1) playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
ReplaceWithLattice() ReplaceWithLattice()
R.use(1) R.use(1)
return return
@@ -49,7 +49,7 @@
if(L) if(L)
var/obj/item/stack/tile/plasteel/S = C var/obj/item/stack/tile/plasteel/S = C
del(L) del(L)
playsound(src.loc, 'sound/weapons/Genhit.ogg', 50, 1) playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
S.build(src) S.build(src)
S.use(1) S.use(1)
return return