cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 08:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

to_chat fixes

Browse Source 
Mostly sounds using to_chat instead of << like they should. Also, the
to_chat CRASH now refers to itself as to_chat instead of Boutput.
This commit is contained in:
Krausus
2016-06-24 18:36:50 -04:00
parent 9095f2ebe1
commit eecf8ba93b
33 changed files with 85 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/flufftext/Hallucination.dm
+14 -14
View File
@@ -295,29 +295,29 @@ Gunshots/explosions/opening doors/less rare audio (done)
switch(rand(1,5))
if(1) //Laser fight
for(var/i=0,i<hits,i++)
to_chat(target, sound('sound/weapons/Laser.ogg',0,1,0,25))
target << sound('sound/weapons/Laser.ogg',0,1,0,25)
sleep(rand(1,5))
to_chat(target, sound(get_sfx("bodyfall"),0,1,0,25))
target << sound(get_sfx("bodyfall"),0,1,0,25)
if(2) //Esword fight
to_chat(target, sound('sound/weapons/saberon.ogg',0,1,0,15))
target << sound('sound/weapons/saberon.ogg',0,1,0,15)
for(var/i=0,i<hits,i++)
to_chat(target, sound('sound/weapons/blade1.ogg',,0,1,0,25))
target << sound('sound/weapons/blade1.ogg',,0,1,0,25)
sleep(rand(1,5))
to_chat(target, sound(get_sfx("bodyfall"),0,1,0,25))
to_chat(target, sound('sound/weapons/saberoff.ogg',0,1,0,15))
target << sound(get_sfx("bodyfall"),0,1,0,25)
target << sound('sound/weapons/saberoff.ogg',0,1,0,15)
if(3) //Gun fight
for(var/i=0,i<hits,i++)
to_chat(target, sound(get_sfx("gunshot"),0,1,0,25))
target << sound(get_sfx("gunshot"),0,1,0,25)
sleep(rand(1,5))
to_chat(target, sound(get_sfx("bodyfall"),0,1,0,25))
target << sound(get_sfx("bodyfall"),0,1,0,25)
if(4) //Stunprod + cablecuff
to_chat(target, sound('sound/weapons/Egloves.ogg',0,1,40))
to_chat(target, sound(get_sfx("bodyfall"),0,1,0,25))
target << sound('sound/weapons/Egloves.ogg',0,1,40)
target << sound(get_sfx("bodyfall"),0,1,0,25)
sleep(30)
to_chat(target, sound('sound/weapons/cablecuff.ogg',0,1,0,15))
target << sound('sound/weapons/cablecuff.ogg',0,1,0,15)
if(5) // Tick Tock
for(var/i=0,i<hits,i++)
to_chat(target, sound('sound/items/timer.ogg',0,1,0,25))
target << sound('sound/items/timer.ogg',0,1,0,25)
sleep(15)
qdel(src)
@@ -459,7 +459,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
else if(src.dir == WEST)
qdel(src.currentimage)
src.currentimage = new /image(left,src)
to_chat(my_target, currentimage)
my_target << currentimage
/obj/effect/fake_attacker/proc/attack_loop()
@@ -503,7 +503,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
var/obj/effect/overlay/O = new/obj/effect/overlay(target.loc)
O.name = "blood"
var/image/I = image('icons/effects/blood.dmi',O,"floor[rand(1,7)]",O.dir,1)
to_chat(target, I)
target << I
spawn(300)
qdel(O)
return