cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removing many instances of the no longer used second argument of message_admins() proc.

Browse Source 
Replacing "for(var/mob/M in viewers()) M.show_message()" by "visible_message()" or audible_message()" in many places.
Changing a few span classes.
This commit is contained in:
phil235
2014-10-05 01:29:30 +02:00
parent 0f5fd59c0c
commit 537280b4b9
52 changed files with 199 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/effect_system.dm
+9 -15
View File
@@ -966,10 +966,8 @@ steam.start() -- spawns the effect
/obj/structure/foamedmetal/attack_hand(var/mob/user)
if ((HULK in user.mutations) || (prob(75 - metal*25)))
user << "<span class='notice'>You smash through the metal foam wall.</span>"
for(var/mob/O in oviewers(user))
if ((O.client && !( O.blinded )))
O << "<span class='danger'>[user] smashes through the foamed metal.</span>"
user.visible_message("<span class='danger'>[user] smashes through the foamed metal.</span>", \
"<span class='danger'>You smash through the metal foam wall.</span>")
qdel(src)
else
@@ -982,18 +980,14 @@ steam.start() -- spawns the effect
if (istype(I, /obj/item/weapon/grab))
var/obj/item/weapon/grab/G = I
G.affecting.loc = src.loc
for(var/mob/O in viewers(src))
if (O.client)
O << "<span class='danger'>[G.assailant] smashes [G.affecting] through the foamed metal wall.</span>"
visible_message("<span class='danger'>[G.assailant] smashes [G.affecting] through the foamed metal wall.</span>")
qdel(I)
qdel(src)
return
if(prob(I.force*20 - metal*25))
user << "<span class='notice'>You smash through the foamed metal with \the [I].</span>"
for(var/mob/O in oviewers(user))
if ((O.client && !( O.blinded )))
O << "<span class='danger'>[user] smashes through the foamed metal.</span>"
user.visible_message("<span class='danger'>[user] smashes through the foamed metal.</span>", \
"<span class='danger'>You smash through the foamed metal with \the [I].</span>")
qdel(src)
else
user << "<span class='notice'>You hit the metal foam to no effect.</span>"
@@ -1028,8 +1022,8 @@ steam.start() -- spawns the effect
s.set_up(2, 1, location)
s.start()
for(var/mob/M in viewers(5, location))
M << "<span class='danger'>The solution violently explodes.</span>"
location.visible_message("<span class='danger'>The solution violently explodes!</span>", \
"You hear an explosion!")
for(var/mob/M in viewers(1, location))
if (prob (50 * amount))
M << "<span class='danger'>The explosion knocks you down.</span>"
@@ -1054,7 +1048,7 @@ steam.start() -- spawns the effect
if (flash && flashing_factor)
flash += (round(amount/4) * flashing_factor)
for(var/mob/M in viewers(8, location))
M << "<span class='danger'>The solution violently explodes.</span>"
location.visible_message("<span class='danger'>The solution violently explodes!</span>", \
"You hear an explosion!")
explosion(location, devastation, heavy, light, flash)
code/game/objects/items.dm
+4 -6
View File
@@ -337,14 +337,12 @@
M.adjustBruteLoss(10)
*/
if(M != user)
for(var/mob/O in (viewers(M) - user - M))
O.show_message("<span class='danger'>[M] has been stabbed in the eye with [src] by [user].</span>", 1)
M << "<span class='danger'>[user] stabs you in the eye with [src]!</span>"
user << "<span class='danger'>You stab [M] in the eye with [src]!</span>"
M.visible_message("<span class='danger'>[M] has been stabbed in the eye with [src] by [user]!</span>", \
"<span class='userdanger'>[user] stabs you in the eye with [src]!</span>")
else
user.visible_message( \
"<span class='danger'>[user] has stabbed themself with [src]!</span>", \
"<span class='danger'>You stab yourself in the eyes with [src]!</span>" \
"<span class='danger'>[user] has stabbed themself in the eyes with [src]!</span>", \
"<span class='userdanger'>You stab yourself in the eyes with [src]!</span>" \
)
if(istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/U = M
code/game/objects/items/devices/PDA/PDA.dm
+1 -2
View File
@@ -893,8 +893,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
// Unused
if(4)
for (var/mob/O in viewers(C, null))
O.show_message("<span class='danger'>[user] has analyzed [C]'s radiation levels!</span>", 1)
C.visible_message("<span class='warning'>[user] has analyzed [C]'s radiation levels!</span>")
user.show_message("<span class='notice'>Analyzing Results for [C]:</span>")
if(C.radiation)
code/game/objects/items/toys.dm
+10 -13
View File
@@ -162,9 +162,9 @@
return
playsound(user, 'sound/weapons/Gunshot.ogg', 100, 1)
src.bullets--
for(var/mob/O in viewers(user, null))
O.show_message(text("<span class='danger'>[user] fires [src] at [target]!</span>"), 1,
"<span class='warning'> You hear a gunshot.</span>", 2)
user.visible_message("<span class='danger'>[user] fires [src] at [target]!</span>", \
"<span class='danger'>You fire [src] at [target]!</span>", \
"<span class='danger'> You hear a gunshot.</span>")
/obj/item/toy/ammo/gun
name = "ammo-caps"
@@ -234,8 +234,7 @@
for(var/mob/living/M in D.loc)
if(!istype(M,/mob/living)) continue
if(M == user) continue
for(var/mob/O in viewers(world.view, D))
O.show_message(text("<span class='danger'>[] was hit by the foam dart!</span>", M), 1)
D.visible_message("<span class='danger'>[M] was hit by the foam dart!</span>")
new /obj/item/toy/ammo/crossbow(M.loc)
qdel(D)
return
@@ -256,8 +255,7 @@
return
else if (bullets == 0)
user.Weaken(5)
for(var/mob/O in viewers(world.view, user))
O.show_message(text("<span class='danger'>[] realized they were out of ammo and starting scrounging for some!</span>", user), 1)
user.visible_message("<span class='danger'>[user] realized they were out of ammo and starting scrounging for some!</span>")
/obj/item/toy/crossbow/attack(mob/M as mob, mob/user as mob)
@@ -267,17 +265,16 @@
if (src.bullets > 0 && M.lying)
for(var/mob/O in viewers(M, null))
if(O.client)
O.show_message(text("<span class='userdanger'>[] casually lines up a shot with []'s head and pulls the trigger!</span>", user, M), 1, "<span class='danger'>You hear the sound of foam against skull.</span>", 2)
O.show_message(text("<span class='danger'>[] was hit in the head by the foam dart!</span>", M), 1)
M.visible_message("<span class='danger'>[user] casually lines up a shot with [M]'s head and pulls the trigger!</span>")
M.visible_message("<span class='danger'>[M] was hit in the head by the foam dart!</span>", \
"<span class='userdanger'>You're hit in the head by the foam dart!</span>", \
"<span class='danger'>You hear the sound of foam against skull.</span>")
playsound(user.loc, 'sound/items/syringeproj.ogg', 50, 1)
new /obj/item/toy/ammo/crossbow(M.loc)
src.bullets--
else if (M.lying && src.bullets == 0)
for(var/mob/O in viewers(M, null))
if (O.client) O.show_message(text("<span class='userdanger'>[] casually lines up a shot with []'s head, pulls the trigger, then realizes they are out of ammo and drops to the floor in search of some!</span>", user, M), 1, "<span class='danger'>You hear someone fall</span>", 2)
M.visible_message("<span class='danger'>[user] casually lines up a shot with [M]'s head, pulls the trigger, then realizes they are out of ammo and drops to the floor in search of some!</span>")
user.Weaken(5)
return
code/game/objects/items/weapons/implants/implantchair.dm
+1 -2
View File
@@ -130,8 +130,7 @@
for(var/obj/item/weapon/implant/loyalty/imp in implant_list)
if(!imp) continue
if(istype(imp, /obj/item/weapon/implant/loyalty))
for (var/mob/O in viewers(M, null))
O.show_message("<span class='danger'>[M] has been implanted by the [src.name].</span>", 1)
M.visible_message("<span class='danger'>[M] has been implanted by the [src.name].</span>")
if(imp.implanted(M))
imp.loc = M
code/game/objects/items/weapons/kitchen.dm
+4 -6
View File
@@ -58,13 +58,11 @@
if (src.icon_state == "forkloaded") //This is a poor way of handling it, but a proper rewrite of the fork to allow for a more varied foodening can happen when I'm in the mood. --NEO
if(M == user)
for(var/mob/O in viewers(M, null))
O.show_message(text("<span class='notice'>[] eats a delicious forkful of omelette!</span>", user), 1)
M.reagents.add_reagent("nutriment", 1)
M.visible_message("<span class='notice'>[user] eats a delicious forkful of omelette!</span>")
M.reagents.add_reagent("nutriment", 1)
else
for(var/mob/O in viewers(M, null))
O.show_message(text("<span class='notice'>[] feeds [] a delicious forkful of omelette!</span>", user, M), 1)
M.reagents.add_reagent("nutriment", 1)
M.visible_message("<span class='notice'>[user] feeds [M] a delicious forkful of omelette!</span>")
M.reagents.add_reagent("nutriment", 1)
src.icon_state = "fork"
return
else
code/game/objects/items/weapons/storage/storage.dm
+2 -2
View File
@@ -265,9 +265,9 @@
if(M == usr)
usr << "<span class='notice'>You put [W] [preposition]to [src].</span>"
else if(in_range(M, usr)) //If someone is standing close enough, they can tell what it is...
M.show_message("<span class='notice'>[usr] puts [W] [preposition]to [src].</span>")
M.show_message("<span class='notice'>[usr] puts [W] [preposition]to [src].</span>", 1)
else if(W && W.w_class >= 3.0) //Otherwise they can only see large or normal items from a distance...
M.show_message("<span class='notice'>[usr] puts [W] [preposition]to [src].</span>")
M.show_message("<span class='notice'>[usr] puts [W] [preposition]to [src].</span>", 1)
orient2hud(usr)
if(usr.s_active)
code/game/objects/structures/morgue.dm
+5 -9
View File
@@ -144,8 +144,7 @@
O.loc = src.loc
if (user != O)
for(var/mob/B in viewers(user, 3))
if ((B.client && !( B.blinded )))
B << text("<span class='danger'>[] stuffs [] into []!</span>", user, O, src)
B.show_message("<span class='danger'>[user] stuffs [O] into [src]!</span>", 1)
return
@@ -235,13 +234,11 @@
return //don't let you cremate something twice or w/e
if(contents.len <= 1)
for (var/mob/M in viewers(src))
M.show_message("<span class='danger'>You hear a hollow crackle.</span>", 1)
return
audible_message("<span class='danger'>You hear a hollow crackle.</span>")
return
else
for (var/mob/M in viewers(src))
M.show_message("<span class='danger'>You hear a roar as the crematorium activates.</span>", 1)
audible_message("<span class='danger'>You hear a roar as the crematorium activates.</span>")
cremating = 1
locked = 1
@@ -324,8 +321,7 @@
O.loc = src.loc
if (user != O)
for(var/mob/B in viewers(user, 3))
if ((B.client && !( B.blinded )))
B << text("<span class='danger'>[] stuffs [] into []!</span>", user, O, src)
B.show_message("<span class='danger'>[user] stuffs [O] into [src]!</span>", 1)
//Foreach goto(99)
return
code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
+1 -2
View File
@@ -64,8 +64,7 @@
var/aforce = W.force
health = max(0, health - aforce)
playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
for(var/mob/M in viewers(src, 7))
M.show_message("<span class='warning'>[user] hits [src] with [W]!</span>", 1)
visible_message("<span class='danger'>[user] hits [src] with [W]!</span>")
healthcheck()
/obj/structure/stool/bed/nest/proc/healthcheck()