cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 21:19:00 +01: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>

Conflicts:
	code/game/turfs/simulated.dm
	code/game/turfs/simulated/floor.dm
This commit is contained in:
Mloc-Argent
2014-04-28 18:57:59 -04:00
committed by ZomgPonies
parent 13a72f4a04
commit a5b3e3d567
4 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/simulated.dm
+11 -10
View File
@@ -101,9 +101,9 @@
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)
M.Stun(8)
M.Weaken(5)
playsound(src, 'sound/misc/slip.ogg', 50, 1, -3)
M.Stun(5)
M.Weaken(3)
else
M.inertia_dir = 0
return
@@ -112,9 +112,9 @@
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)
M.Stun(8)
M.Weaken(5)
playsound(src, 'sound/misc/slip.ogg', 50, 1, -3)
M.Stun(5)
M.Weaken(3)
else
M.inertia_dir = 0
return
@@ -129,7 +129,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
@@ -138,7 +138,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(5)
else
@@ -149,7 +149,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(5)
else
@@ -209,4 +209,5 @@
this.blood_DNA["UNKNOWN BLOOD"] = "X*"
else if( istype(M, /mob/living/silicon/robot ))
new /obj/effect/decal/cleanable/oil(src)
new /obj/effect/decal/cleanable/oil(src)
code/game/turfs/simulated/floor.dm
+9 -10
View File
@@ -466,17 +466,16 @@ turf/simulated/floor/proc/update_icon()
return
if(istype(C, /obj/item/weapon/screwdriver))
if(is_wood_floor())
if(broken || burnt)
return
else
if(is_wood_floor())
user << "\red You unscrew the planks."
new floor_tile.type(src)
make_plating()
playsound(src, 'sound/items/Screwdriver.ogg', 80, 1)
if(istype(C, /obj/item/weapon/screwdriver) && is_wood_floor())
if(broken || burnt)
return
else
if(is_wood_floor())
user << "\red You unscrew the planks."
new floor_tile.type(src)
make_plating()
playsound(src, 'sound/items/Screwdriver.ogg', 80, 1)
if(is_catwalk())
if(broken) return
ReplaceWithLattice()
code/game/turfs/simulated/floor_types.dm
+1 -1
View File
@@ -58,7 +58,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)
code/game/turfs/space/space.dm
+2 -2
View File
@@ -50,7 +50,7 @@
return
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
@@ -60,7 +60,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