diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
index de62d80c321..68355974ba4 100644
--- a/code/_onclick/other_mobs.dm
+++ b/code/_onclick/other_mobs.dm
@@ -77,14 +77,13 @@
var/armor = ML.run_armor_check(affecting, "melee")
if(prob(75))
ML.apply_damage(rand(1,3), BRUTE, affecting, armor)
- for(var/mob/O in viewers(ML, null))
- O.show_message("[name] bites [ML]!", 1)
+ ML.visible_message("[name] bites [ML]!", \
+ "[name] bites [ML]!")
if(armor >= 2) return
for(var/datum/disease/D in viruses)
ML.contract_disease(D,1,0)
else
- for(var/mob/O in viewers(ML, null))
- O.show_message("[src] has attempted to bite [ML]!", 1)
+ ML.visible_message("[src] has attempted to bite [ML]!")
/*
Aliens
diff --git a/code/controllers/shuttle_controller.dm b/code/controllers/shuttle_controller.dm
index c8ca0d4730d..acb6fb2a24b 100644
--- a/code/controllers/shuttle_controller.dm
+++ b/code/controllers/shuttle_controller.dm
@@ -136,7 +136,7 @@ var/global/datum/shuttle_controller/emergency_shuttle/emergency_shuttle
if(!online && direction == 1) //we don't call the shuttle if it's already coming
incall(SHUTTLEAUTOCALLTIMER) //X minutes! If they want to recall, they have X-(X-5) minutes to do so
log_game("All the communications consoles were destroyed and all AIs are inactive. Shuttle called.")
- message_admins("All the communications consoles were destroyed and all AIs are inactive. Shuttle called.", 1)
+ message_admins("All the communications consoles were destroyed and all AIs are inactive. Shuttle called.")
/datum/shuttle_controller/proc/move_shuttles()
var/datum/shuttle_manager/s
diff --git a/code/datums/diseases/brainrot.dm b/code/datums/diseases/brainrot.dm
index 971755d070d..f457c533011 100644
--- a/code/datums/diseases/brainrot.dm
+++ b/code/datums/diseases/brainrot.dm
@@ -51,8 +51,7 @@
affected_mob << "Strange buzzing fills your head, removing all thoughts."
if(prob(3))
affected_mob << "You lose consciousness..."
- for(var/mob/O in viewers(affected_mob, null))
- O.show_message("[affected_mob] suddenly collapses", 1)
+ affected_mob.visible_message("[affected_mob] suddenly collapses")
affected_mob.Paralyse(rand(5,10))
if(prob(1))
affected_mob.emote("snore")
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 58a3b600d7a..4cba5208781 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -989,7 +989,7 @@
var/mob/living/carbon/monkey/M = current
if (istype(H))
log_admin("[key_name(usr)] attempting to monkeyize and infect [key_name(current)]")
- message_admins("[key_name_admin(usr)] attempting to monkeyize and infect [key_name_admin(current)]", 1)
+ message_admins("[key_name_admin(usr)] attempting to monkeyize and infect [key_name_admin(current)]")
src = null
M = H.monkeyize()
src = M.mind
diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index 8e2a9c15a14..2d9ab0ed8c3 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -70,7 +70,7 @@ var/round_start_time = 0
if((master_mode=="secret") && (secret_force_mode != "secret"))
var/datum/game_mode/smode = config.pick_mode(secret_force_mode)
if (!smode.can_start())
- message_admins("\blue Unable to force secret [secret_force_mode]. [smode.required_players] players and [smode.required_enemies] eligible antagonists needed.", 1)
+ message_admins("\blue Unable to force secret [secret_force_mode]. [smode.required_players] players and [smode.required_enemies] eligible antagonists needed.")
else
src.mode = smode
diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm
index a9c45b8dc5b..f27815a0a3c 100644
--- a/code/game/machinery/bots/cleanbot.dm
+++ b/code/game/machinery/bots/cleanbot.dm
@@ -327,7 +327,7 @@ text("[src.oddbutton ? "Yes" : "No"
/obj/machinery/bot/cleanbot/explode()
src.on = 0
- src.visible_message("[src] blows apart!", 1)
+ src.visible_message("[src] blows apart!")
var/turf/Tsec = get_turf(src)
new /obj/item/weapon/reagent_containers/glass/bucket(Tsec)
diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm
index c8bc47d15a1..b106abcf13a 100644
--- a/code/game/machinery/bots/ed209bot.dm
+++ b/code/game/machinery/bots/ed209bot.dm
@@ -234,8 +234,7 @@ Auto Patrol: []"},
if(open && !locked)
if(user) user << "You short out [src]'s target assessment circuits."
spawn(0)
- for(var/mob/O in hearers(src, null))
- O.show_message("[src] buzzes oddly!", 1)
+ audible_message("[src] buzzes oddly!")
src.target = null
if(user) src.oldtarget_name = user.name
src.last_found = world.time
@@ -715,7 +714,7 @@ Auto Patrol: []"},
/obj/machinery/bot/ed209/explode()
walk_to(src,0)
- src.visible_message("[src] blows apart!", 1)
+ src.visible_message("[src] blows apart!")
var/turf/Tsec = get_turf(src)
var/obj/item/weapon/ed209_assembly/Sa = new /obj/item/weapon/ed209_assembly(Tsec)
diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm
index 8f0e67df3b4..195c07958a6 100644
--- a/code/game/machinery/bots/floorbot.dm
+++ b/code/game/machinery/bots/floorbot.dm
@@ -379,7 +379,7 @@
/obj/machinery/bot/floorbot/explode()
src.on = 0
- src.visible_message("[src] blows apart!", 1)
+ src.visible_message("[src] blows apart!")
var/turf/Tsec = get_turf(src)
var/obj/item/weapon/storage/toolbox/mechanical/N = new /obj/item/weapon/storage/toolbox/mechanical(Tsec)
diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm
index a9754377d85..5ba7c7a3ba3 100644
--- a/code/game/machinery/bots/medbot.dm
+++ b/code/game/machinery/bots/medbot.dm
@@ -231,7 +231,7 @@
if(open && !locked)
if(user) user << "You short out [src]'s reagent synthesis circuits."
spawn(0)
- src.visible_message("[src] buzzes oddly!", 1)
+ audible_message("[src] buzzes oddly!")
flick("medibot_spark", src)
src.patient = null
if(user) src.oldpatient = user
@@ -472,7 +472,7 @@
/obj/machinery/bot/medbot/explode()
src.on = 0
- visible_message("[src] blows apart!", 1)
+ visible_message("[src] blows apart!")
var/turf/Tsec = get_turf(src)
new /obj/item/weapon/storage/firstaid(Tsec)
diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm
index 696da1238b4..bad30b9b2e5 100644
--- a/code/game/machinery/bots/mulebot.dm
+++ b/code/game/machinery/bots/mulebot.dm
@@ -886,7 +886,7 @@ var/global/mulebot_count = 0
/obj/machinery/bot/mulebot/explode()
- src.visible_message("[src] blows apart!", 1)
+ src.visible_message("[src] blows apart!")
var/turf/Tsec = get_turf(src)
new /obj/item/device/assembly/prox_sensor(Tsec)
diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm
index ae8f5927db7..cdce3fa798a 100644
--- a/code/game/machinery/bots/secbot.dm
+++ b/code/game/machinery/bots/secbot.dm
@@ -219,8 +219,7 @@ Auto Patrol: []"},
if(open && !locked)
if(user) user << "You short out [src]'s target assessment circuits."
spawn(0)
- for(var/mob/O in hearers(src, null))
- O.show_message("[src] buzzes oddly!", 1)
+ audible_message("[src] buzzes oddly!")
src.target = null
if(user) src.oldtarget_name = user.name
src.last_found = world.time
@@ -661,7 +660,7 @@ Auto Patrol: []"},
/obj/machinery/bot/secbot/explode()
walk_to(src,0)
- src.visible_message("[src] blows apart!", 1)
+ src.visible_message("[src] blows apart!")
var/turf/Tsec = get_turf(src)
var/obj/item/weapon/secbot_assembly/Sa = new /obj/item/weapon/secbot_assembly(Tsec)
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index bca82949746..fd2320b0182 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -568,7 +568,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
spawn(600)//One minute cooldown
message_cooldown = 0
log_say("[key_name(user)] has made a priority announcement: [input]")
- message_admins("[key_name_admin(user)] has made a priority announcement.", 1)
+ message_admins("[key_name_admin(user)] has made a priority announcement.")
/proc/call_shuttle_proc(var/mob/user, var/call_reason)
if ((!( ticker ) || emergency_shuttle.location))
@@ -599,7 +599,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
emergency_shuttle.incall(1, signal_origin, emergency_reason, 0)
log_game("[key_name(user)] has called the shuttle.")
- message_admins("[key_name_admin(user)] has called the shuttle.", 1)
+ message_admins("[key_name_admin(user)] has called the shuttle.")
return
@@ -621,7 +621,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
var/area/signal_origin = get_area(user)
emergency_shuttle.recall(signal_origin)
log_game("[key_name(user)] has recalled the shuttle.")
- message_admins("[key_name_admin(user)] has recalled the shuttle.", 1)
+ message_admins("[key_name_admin(user)] has recalled the shuttle.")
return 1
return
diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm
index cf3453400d8..2220eb7c732 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -343,7 +343,7 @@
if(PN) //runtime errors fixer. They were caused by PN.newload trying to access missing network in case of working on stored power.
storedpower += shieldload
PN.load += shieldload //uses powernet power.
-// message_admins("[PN.load]", 1)
+// message_admins("[PN.load]")
// use_power(250) //uses APC power
/obj/machinery/shieldwallgen/attack_hand(mob/user as mob)
diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm
index 3e2c9ec363c..0e67d4593ae 100644
--- a/code/game/objects/effects/effect_system.dm
+++ b/code/game/objects/effects/effect_system.dm
@@ -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 << "You smash through the metal foam wall."
- for(var/mob/O in oviewers(user))
- if ((O.client && !( O.blinded )))
- O << "[user] smashes through the foamed metal."
+ user.visible_message("[user] smashes through the foamed metal.", \
+ "You smash through the metal foam wall.")
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 << "[G.assailant] smashes [G.affecting] through the foamed metal wall."
+ visible_message("[G.assailant] smashes [G.affecting] through the foamed metal wall.")
qdel(I)
qdel(src)
return
if(prob(I.force*20 - metal*25))
- user << "You smash through the foamed metal with \the [I]."
- for(var/mob/O in oviewers(user))
- if ((O.client && !( O.blinded )))
- O << "[user] smashes through the foamed metal."
+ user.visible_message("[user] smashes through the foamed metal.", \
+ "You smash through the foamed metal with \the [I].")
qdel(src)
else
user << "You hit the metal foam to no effect."
@@ -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 << "The solution violently explodes."
+ location.visible_message("The solution violently explodes!", \
+ "You hear an explosion!")
for(var/mob/M in viewers(1, location))
if (prob (50 * amount))
M << "The explosion knocks you down."
@@ -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 << "The solution violently explodes."
+ location.visible_message("The solution violently explodes!", \
+ "You hear an explosion!")
explosion(location, devastation, heavy, light, flash)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index c7818ed01ed..989149f2662 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -337,14 +337,12 @@
M.adjustBruteLoss(10)
*/
if(M != user)
- for(var/mob/O in (viewers(M) - user - M))
- O.show_message("[M] has been stabbed in the eye with [src] by [user].", 1)
- M << "[user] stabs you in the eye with [src]!"
- user << "You stab [M] in the eye with [src]!"
+ M.visible_message("[M] has been stabbed in the eye with [src] by [user]!", \
+ "[user] stabs you in the eye with [src]!")
else
user.visible_message( \
- "[user] has stabbed themself with [src]!", \
- "You stab yourself in the eyes with [src]!" \
+ "[user] has stabbed themself in the eyes with [src]!", \
+ "You stab yourself in the eyes with [src]!" \
)
if(istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/U = M
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index e83598b3166..06a5fb632d6 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -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("[user] has analyzed [C]'s radiation levels!", 1)
+ C.visible_message("[user] has analyzed [C]'s radiation levels!")
user.show_message("Analyzing Results for [C]:")
if(C.radiation)
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 756a2884c77..ea1d85067d5 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -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("[user] fires [src] at [target]!"), 1,
- " You hear a gunshot.", 2)
+ user.visible_message("[user] fires [src] at [target]!", \
+ "You fire [src] at [target]!", \
+ " You hear a gunshot.")
/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("[] was hit by the foam dart!", M), 1)
+ D.visible_message("[M] was hit by the foam dart!")
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("[] realized they were out of ammo and starting scrounging for some!", user), 1)
+ user.visible_message("[user] realized they were out of ammo and starting scrounging for some!")
/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("[] casually lines up a shot with []'s head and pulls the trigger!", user, M), 1, "You hear the sound of foam against skull.", 2)
- O.show_message(text("[] was hit in the head by the foam dart!", M), 1)
+ M.visible_message("[user] casually lines up a shot with [M]'s head and pulls the trigger!")
+ M.visible_message("[M] was hit in the head by the foam dart!", \
+ "You're hit in the head by the foam dart!", \
+ "You hear the sound of foam against skull.")
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("[] 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!", user, M), 1, "You hear someone fall", 2)
+ M.visible_message("[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!")
user.Weaken(5)
return
diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm
index 424029867d7..ced385ba06e 100644
--- a/code/game/objects/items/weapons/implants/implantchair.dm
+++ b/code/game/objects/items/weapons/implants/implantchair.dm
@@ -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("[M] has been implanted by the [src.name].", 1)
+ M.visible_message("[M] has been implanted by the [src.name].")
if(imp.implanted(M))
imp.loc = M
diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm
index 783e5c833a9..32acca5e4b4 100644
--- a/code/game/objects/items/weapons/kitchen.dm
+++ b/code/game/objects/items/weapons/kitchen.dm
@@ -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("[] eats a delicious forkful of omelette!", user), 1)
- M.reagents.add_reagent("nutriment", 1)
+ M.visible_message("[user] eats a delicious forkful of omelette!")
+ M.reagents.add_reagent("nutriment", 1)
else
- for(var/mob/O in viewers(M, null))
- O.show_message(text("[] feeds [] a delicious forkful of omelette!", user, M), 1)
- M.reagents.add_reagent("nutriment", 1)
+ M.visible_message("[user] feeds [M] a delicious forkful of omelette!")
+ M.reagents.add_reagent("nutriment", 1)
src.icon_state = "fork"
return
else
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index ef98bdcadc4..b00a81ef01b 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -265,9 +265,9 @@
if(M == usr)
usr << "You put [W] [preposition]to [src]."
else if(in_range(M, usr)) //If someone is standing close enough, they can tell what it is...
- M.show_message("[usr] puts [W] [preposition]to [src].")
+ M.show_message("[usr] puts [W] [preposition]to [src].", 1)
else if(W && W.w_class >= 3.0) //Otherwise they can only see large or normal items from a distance...
- M.show_message("[usr] puts [W] [preposition]to [src].")
+ M.show_message("[usr] puts [W] [preposition]to [src].", 1)
orient2hud(usr)
if(usr.s_active)
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index 637d0ebffbc..f07deae0109 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -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("[] stuffs [] into []!", user, O, src)
+ B.show_message("[user] stuffs [O] into [src]!", 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("You hear a hollow crackle.", 1)
- return
+ audible_message("You hear a hollow crackle.")
+ return
else
- for (var/mob/M in viewers(src))
- M.show_message("You hear a roar as the crematorium activates.", 1)
+ audible_message("You hear a roar as the crematorium activates.")
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("[] stuffs [] into []!", user, O, src)
+ B.show_message("[user] stuffs [O] into [src]!", 1)
//Foreach goto(99)
return
diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
index 5428ec16cd3..2437b38378b 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
@@ -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("[user] hits [src] with [W]!", 1)
+ visible_message("[user] hits [src] with [W]!")
healthcheck()
/obj/structure/stool/bed/nest/proc/healthcheck()
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 2f00ae34b70..9653a0d407e 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -545,7 +545,7 @@ var/global/floorIsLava = 0
set name="Toggle OOC"
toggle_ooc()
log_admin("[key_name(usr)] toggled OOC.")
- message_admins("[key_name_admin(usr)] toggled OOC.", 1)
+ message_admins("[key_name_admin(usr)] toggled OOC.")
feedback_add_details("admin_verb","TOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/datum/admins/proc/toggleoocdead()
@@ -555,7 +555,7 @@ var/global/floorIsLava = 0
dooc_allowed = !( dooc_allowed )
log_admin("[key_name(usr)] toggled OOC.")
- message_admins("[key_name_admin(usr)] toggled Dead OOC.", 1)
+ message_admins("[key_name_admin(usr)] toggled Dead OOC.")
feedback_add_details("admin_verb","TDOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/*
/datum/admins/proc/toggletraitorscaling()
@@ -564,7 +564,7 @@ var/global/floorIsLava = 0
set name="Toggle Traitor Scaling"
traitor_scaling = !traitor_scaling
log_admin("[key_name(usr)] toggled Traitor Scaling to [traitor_scaling].")
- message_admins("[key_name_admin(usr)] toggled Traitor Scaling [traitor_scaling ? "on" : "off"].", 1)
+ message_admins("[key_name_admin(usr)] toggled Traitor Scaling [traitor_scaling ? "on" : "off"].")
feedback_add_details("admin_verb","TTS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
*/
/datum/admins/proc/startnow()
@@ -594,7 +594,7 @@ var/global/floorIsLava = 0
else
world << "New players may now enter the game."
log_admin("[key_name(usr)] toggled new player game entering.")
- message_admins("[key_name_admin(usr)] toggled new player game entering.", 1)
+ message_admins("[key_name_admin(usr)] toggled new player game entering.")
world.update_status()
feedback_add_details("admin_verb","TE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -620,7 +620,7 @@ var/global/floorIsLava = 0
world << "You may now respawn."
else
world << "You may no longer respawn :("
- message_admins("[key_name_admin(usr)] toggled respawn to [abandon_allowed ? "On" : "Off"].", 1)
+ message_admins("[key_name_admin(usr)] toggled respawn to [abandon_allowed ? "On" : "Off"].")
log_admin("[key_name(usr)] toggled respawn to [abandon_allowed ? "On" : "Off"].")
world.update_status()
feedback_add_details("admin_verb","TR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -663,7 +663,7 @@ var/global/floorIsLava = 0
set name = "Unprison"
if (M.z == 2)
M.loc = pick(latejoin)
- message_admins("[key_name_admin(usr)] has unprisoned [key_name_admin(M)]", 1)
+ message_admins("[key_name_admin(usr)] has unprisoned [key_name_admin(M)]")
log_admin("[key_name(usr)] has unprisoned [key_name(M)]")
else
alert("[M.name] is not prisoned.")
@@ -748,7 +748,7 @@ var/global/floorIsLava = 0
else
world << "The tinted_weldhelh has been disabled!"
log_admin("[key_name(usr)] toggled tinted_weldhelh.")
- message_admins("[key_name_admin(usr)] toggled tinted_weldhelh.", 1)
+ message_admins("[key_name_admin(usr)] toggled tinted_weldhelh.")
feedback_add_details("admin_verb","TTWH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/datum/admins/proc/toggleguests()
@@ -761,7 +761,7 @@ var/global/floorIsLava = 0
else
world << "Guests may now enter the game."
log_admin("[key_name(usr)] toggled guests game entering [guests_allowed?"":"dis"]allowed.")
- message_admins("[key_name_admin(usr)] toggled guests game entering [guests_allowed?"":"dis"]allowed.", 1)
+ message_admins("[key_name_admin(usr)] toggled guests game entering [guests_allowed?"":"dis"]allowed.")
feedback_add_details("admin_verb","TGU") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/unjobban_panel()
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 3a1017aacd0..37cb81ed0bf 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -391,7 +391,7 @@ var/list/admin_verbs_hideable = list(
new_key = copytext(new_key, 1, 26)
holder.fakekey = new_key
log_admin("[key_name(usr)] has turned stealth mode [holder.fakekey ? "ON" : "OFF"]")
- message_admins("[key_name_admin(usr)] has turned stealth mode [holder.fakekey ? "ON" : "OFF"]", 1)
+ message_admins("[key_name_admin(usr)] has turned stealth mode [holder.fakekey ? "ON" : "OFF"]")
feedback_add_details("admin_verb","SM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/drop_bomb()
@@ -429,13 +429,13 @@ var/list/admin_verbs_hideable = list(
return
feedback_add_details("admin_verb","GS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(usr)] gave [key_name(T)] the spell [S].")
- message_admins("[key_name_admin(usr)] gave [key_name(T)] the spell [S].", 1)
+ message_admins("[key_name_admin(usr)] gave [key_name(T)] the spell [S].")
if(T.mind)
T.mind.spell_list += new S
else
T.mob_spell_list += new S
- message_admins("Spells given to mindless mobs will not be transferred in mindswap or cloning!", 1)
+ message_admins("Spells given to mindless mobs will not be transferred in mindswap or cloning!")
/client/proc/give_disease(mob/T as mob in mob_list)
@@ -447,7 +447,7 @@ var/list/admin_verbs_hideable = list(
T.contract_disease(new D, 1)
feedback_add_details("admin_verb","GD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(usr)] gave [key_name(T)] the disease [D].")
- message_admins("[key_name_admin(usr)] gave [key_name(T)] the disease [D].", 1)
+ message_admins("[key_name_admin(usr)] gave [key_name(T)] the disease [D].")
/client/proc/object_say(var/obj/O in world)
set category = "Special Verbs"
@@ -462,7 +462,7 @@ var/list/admin_verbs_hideable = list(
O.say(message)
O.languages = templanguages
log_admin("[key_name(usr)] made [O] at [O.x], [O.y], [O.z] say [message]")
- message_admins("[key_name_admin(usr)] made [O] at [O.x], [O.y], [O.z]. say [message]", 1)
+ message_admins("[key_name_admin(usr)] made [O] at [O.x], [O.y], [O.z]. say [message]")
feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/togglebuildmodeself()
@@ -484,7 +484,7 @@ var/list/admin_verbs_hideable = list(
usr << "Disabled air processing."
feedback_add_details("admin_verb","KA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(usr)] used 'kill air'.")
- message_admins("[key_name_admin(usr)] used 'kill air'.", 1)
+ message_admins("[key_name_admin(usr)] used 'kill air'.")
/client/proc/deadmin_self()
set name = "De-admin self"
@@ -493,7 +493,7 @@ var/list/admin_verbs_hideable = list(
if(holder)
if(alert("Confirm self-deadmin for the round? You can't re-admin yourself without someont promoting you.",,"Yes","No") == "Yes")
log_admin("[src] deadmined themself.")
- message_admins("[src] deadmined themself.", 1)
+ message_admins("[src] deadmined themself.")
deadmin()
src << "You are now a normal player."
feedback_add_details("admin_verb","DAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 54ca285ed53..e65b5fc0056 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -82,7 +82,7 @@
if("No")
event.announceWhen = -1
event.processing = 1
- message_admins("[key_name_admin(usr)] has triggered an event. ([E.name])", 1)
+ message_admins("[key_name_admin(usr)] has triggered an event. ([E.name])")
log_admin("[key_name(usr)] has triggered an event. ([E.name])")
return
@@ -186,7 +186,7 @@
return
emergency_shuttle.incall()
log_admin("[key_name(usr)] called the Emergency Shuttle")
- message_admins("[key_name_admin(usr)] called the Emergency Shuttle to the station", 1)
+ message_admins("[key_name_admin(usr)] called the Emergency Shuttle to the station")
if("2")
if ((!( ticker ) || emergency_shuttle.location || emergency_shuttle.direction == 0))
@@ -195,11 +195,11 @@
if(-1)
emergency_shuttle.incall()
log_admin("[key_name(usr)] called the Emergency Shuttle")
- message_admins("[key_name_admin(usr)] called the Emergency Shuttle to the station", 1)
+ message_admins("[key_name_admin(usr)] called the Emergency Shuttle to the station")
if(1)
emergency_shuttle.recall()
log_admin("[key_name(usr)] sent the Emergency Shuttle back")
- message_admins("[key_name_admin(usr)] sent the Emergency Shuttle back", 1)
+ message_admins("[key_name_admin(usr)] sent the Emergency Shuttle back")
href_list["secretsadmin"] = "check_antagonist"
@@ -209,7 +209,7 @@
emergency_shuttle.settimeleft( input("Enter new shuttle duration (seconds):","Edit Shuttle Timeleft", emergency_shuttle.timeleft() ) as num )
log_admin("[key_name(usr)] edited the Emergency Shuttle's timeleft to [emergency_shuttle.timeleft()]")
minor_announce("The emergency shuttle will reach its destination in [round(emergency_shuttle.timeleft()/60)] minutes.")
- message_admins("[key_name_admin(usr)] edited the Emergency Shuttle's timeleft to [emergency_shuttle.timeleft()]", 1)
+ message_admins("[key_name_admin(usr)] edited the Emergency Shuttle's timeleft to [emergency_shuttle.timeleft()]")
href_list["secretsadmin"] = "check_antagonist"
else if(href_list["delay_round_end"])
@@ -217,7 +217,7 @@
ticker.delay_end = !ticker.delay_end
log_admin("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].")
- message_admins("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1)
+ message_admins("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].")
href_list["secretsadmin"] = "check_antagonist"
else if(href_list["simplemake"])
@@ -234,7 +234,7 @@
if("Yes") delmob = 1
log_admin("[key_name(usr)] has used rudimentary transformation on [key_name(M)]. Transforming to [href_list["simplemake"]]; deletemob=[delmob]")
- message_admins("[key_name_admin(usr)] has used rudimentary transformation on [key_name_admin(M)]. Transforming to [href_list["simplemake"]]; deletemob=[delmob]", 1)
+ message_admins("[key_name_admin(usr)] has used rudimentary transformation on [key_name_admin(M)]. Transforming to [href_list["simplemake"]]; deletemob=[delmob]")
switch(href_list["simplemake"])
if("observer") M.change_mob_type( /mob/dead/observer , null, null, delmob )
@@ -314,7 +314,7 @@
log_admin("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]")
ban_unban_log_save("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]")
- message_admins("[key_name_admin(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]", 1)
+ message_admins("[key_name_admin(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]")
Banlist.cd = "/base/[banfolder]"
Banlist["reason"] << reason
Banlist["temp"] << temp
@@ -350,7 +350,7 @@
feedback_inc("ban_appearance_unban", 1)
DB_ban_unban(M.ckey, BANTYPE_APPEARANCE)
appearance_unban(M)
- message_admins("[key_name_admin(usr)] removed [key_name_admin(M)]'s appearance ban", 1)
+ message_admins("[key_name_admin(usr)] removed [key_name_admin(M)]'s appearance ban")
M << "[usr.client.ckey] has removed your appearance ban."
else switch(alert("Appearance ban [M.ckey]?",,"Yes","No", "Cancel"))
@@ -364,7 +364,7 @@
DB_ban_record(BANTYPE_APPEARANCE, M, -1, reason)
appearance_fullban(M, "[reason]; By [usr.ckey] on [time2text(world.realtime)]")
notes_add(M.ckey, "Appearance banned - [reason]")
- message_admins("[key_name_admin(usr)] appearance banned [key_name_admin(M)]", 1)
+ message_admins("[key_name_admin(usr)] appearance banned [key_name_admin(M)]")
M << "You have been appearance banned by [usr.client.ckey]."
M << "The reason is: [reason]"
M << "Appearance ban can be lifted only upon request."
@@ -722,7 +722,7 @@
else
msg += ", [job]"
notes_add(M.ckey, "Banned from [msg] - [reason]")
- message_admins("[key_name_admin(usr)] banned [key_name_admin(M)] from [msg] for [mins] minutes", 1)
+ message_admins("[key_name_admin(usr)] banned [key_name_admin(M)] from [msg] for [mins] minutes")
M << "You have been jobbanned by [usr.client.ckey] from: [msg]."
M << "The reason is: [reason]"
M << "This jobban will be lifted in [mins] minutes."
@@ -742,7 +742,7 @@
if(!msg) msg = job
else msg += ", [job]"
notes_add(M.ckey, "Banned from [msg] - [reason]")
- message_admins("[key_name_admin(usr)] banned [key_name_admin(M)] from [msg]", 1)
+ message_admins("[key_name_admin(usr)] banned [key_name_admin(M)] from [msg]")
M << "You have been jobbanned by [usr.client.ckey] from: [msg]."
M << "The reason is: [reason]"
M << "Jobban can be lifted only upon request."
@@ -775,7 +775,7 @@
else
continue
if(msg)
- message_admins("[key_name_admin(usr)] unbanned [key_name_admin(M)] from [msg]", 1)
+ message_admins("[key_name_admin(usr)] unbanned [key_name_admin(M)] from [msg]")
M << "You have been un-jobbanned by [usr.client.ckey] from [msg]."
href_list["jobban2"] = 1 // lets it fall through and refresh
return 1
@@ -788,7 +788,7 @@
return
M << "You have been kicked from the server."
log_admin("[key_name(usr)] booted [key_name(M)].")
- message_admins("[key_name_admin(usr)] booted [key_name_admin(M)].", 1)
+ message_admins("[key_name_admin(usr)] booted [key_name_admin(M)].")
//M.client = null
del(M.client)
@@ -812,7 +812,7 @@
if(t)
if((alert("Do you want to unjobban [t]?","Unjobban confirmation", "Yes", "No") == "Yes") && t) //No more misclicks! Unless you do it twice.
log_admin("[key_name(usr)] removed [t]")
- message_admins("[key_name_admin(usr)] removed [t]", 1)
+ message_admins("[key_name_admin(usr)] removed [t]")
jobban_remove(t)
href_list["ban"] = 1 // lets it fall through and refresh
var/t_split = text2list(t, " - ")
@@ -931,7 +931,7 @@
return alert(usr, "The game has already started.", null, null, null, null)
master_mode = href_list["c_mode2"]
log_admin("[key_name(usr)] set the mode as [master_mode].")
- message_admins("[key_name_admin(usr)] set the mode as [master_mode].", 1)
+ message_admins("[key_name_admin(usr)] set the mode as [master_mode].")
world << "The mode is now: [master_mode]"
Game() // updates the main game menu
world.save_mode(master_mode)
@@ -946,7 +946,7 @@
return alert(usr, "The game mode has to be secret!", null, null, null, null)
secret_force_mode = href_list["f_secret2"]
log_admin("[key_name(usr)] set the forced secret mode as [secret_force_mode].")
- message_admins("[key_name_admin(usr)] set the forced secret mode as [secret_force_mode].", 1)
+ message_admins("[key_name_admin(usr)] set the forced secret mode as [secret_force_mode].")
Game() // updates the main game menu
.(href, list("f_secret"=1))
@@ -959,7 +959,7 @@
return
log_admin("[key_name(usr)] attempting to monkeyize [key_name(H)]")
- message_admins("[key_name_admin(usr)] attempting to monkeyize [key_name_admin(H)]", 1)
+ message_admins("[key_name_admin(usr)] attempting to monkeyize [key_name_admin(H)]")
H.monkeyize()
else if(href_list["humanone"])
@@ -971,7 +971,7 @@
return
log_admin("[key_name(usr)] attempting to humanize [key_name(Mo)]")
- message_admins("[key_name_admin(usr)] attempting to humanize [key_name_admin(Mo)]", 1)
+ message_admins("[key_name_admin(usr)] attempting to humanize [key_name_admin(Mo)]")
Mo.humanize()
else if(href_list["corgione"])
@@ -983,7 +983,7 @@
return
log_admin("[key_name(usr)] attempting to corgize [key_name(H)]")
- message_admins("[key_name_admin(usr)] attempting to corgize [key_name_admin(H)]", 1)
+ message_admins("[key_name_admin(usr)] attempting to corgize [key_name_admin(H)]")
H.corgize()
@@ -1019,7 +1019,7 @@
M << "You have been sent to Prison!"
log_admin("[key_name(usr)] has sent [key_name(M)] to Prison!")
- message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] Prison!", 1)
+ message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] Prison!")
else if(href_list["tdome1"])
if(!check_rights(R_FUN)) return
@@ -1047,7 +1047,7 @@
spawn(50)
M << "You have been sent to the Thunderdome."
log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Team 1)")
- message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 1)", 1)
+ message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 1)")
else if(href_list["tdome2"])
if(!check_rights(R_FUN)) return
@@ -1076,7 +1076,7 @@
spawn(50)
M << "You have been sent to the Thunderdome."
log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Team 2)")
- message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 2)", 1)
+ message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 2)")
else if(href_list["tdomeadmin"])
if(!check_rights(R_FUN)) return
@@ -1098,7 +1098,7 @@
spawn(50)
M << "You have been sent to the Thunderdome."
log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Admin.)")
- message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Admin.)", 1)
+ message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Admin.)")
else if(href_list["tdomeobserve"])
if(!check_rights(R_FUN)) return
@@ -1131,7 +1131,7 @@
spawn(50)
M << " You have been sent to the Thunderdome."
log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Observer.)")
- message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Observer.)", 1)
+ message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Observer.)")
else if(href_list["revive"])
if(!check_rights(R_REJUVINATE)) return
@@ -1142,7 +1142,7 @@
return
L.revive()
- message_admins("Admin [key_name_admin(usr)] healed / revived [key_name_admin(L)]!", 1)
+ message_admins("Admin [key_name_admin(usr)] healed / revived [key_name_admin(L)]!")
log_admin("[key_name(usr)] healed / Revived [key_name(L)]")
else if(href_list["makeai"])
@@ -1153,7 +1153,7 @@
usr << "This can only be used on instances of type /mob/living/carbon/human"
return
- message_admins("Admin [key_name_admin(usr)] AIized [key_name_admin(H)]!", 1)
+ message_admins("Admin [key_name_admin(usr)] AIized [key_name_admin(H)]!")
log_admin("[key_name(usr)] AIized [key_name(H)]")
H.AIize()
@@ -1593,13 +1593,13 @@
log_admin("[key_name(usr)] created a [english_list(paths)]")
for(var/path in paths)
if(ispath(path, /mob))
- message_admins("[key_name_admin(usr)] created a [english_list(paths)]", 1)
+ message_admins("[key_name_admin(usr)] created a [english_list(paths)]")
break
else
log_admin("[key_name(usr)] created [number]ea [english_list(paths)]")
for(var/path in paths)
if(ispath(path, /mob))
- message_admins("[key_name_admin(usr)] created [number]ea [english_list(paths)]", 1)
+ message_admins("[key_name_admin(usr)] created [number]ea [english_list(paths)]")
break
return
@@ -1625,7 +1625,7 @@
template.copy_contents_to(thunderdome)
log_admin("[key_name(usr)] reset the thunderdome to default with delete_mobs==[delete_mobs].", 1)
- message_admins("[key_name_admin(usr)] reset the thunderdome to default with delete_mobs==[delete_mobs].", 1)
+ message_admins("[key_name_admin(usr)] reset the thunderdome to default with delete_mobs==[delete_mobs].")
if("monkey")
feedback_inc("admin_secrets_fun_used",1)
@@ -1638,7 +1638,7 @@
var/result = input(usr, "Please choose a new species","Species") as null|anything in species_list
if(result)
log_admin("[key_name(usr)] turned all humans into [result]", 1)
- message_admins("\blue [key_name_admin(usr)] turned all humans into [result]", 1)
+ message_admins("\blue [key_name_admin(usr)] turned all humans into [result]")
var/newtype = species_list[result]
for(var/mob/living/carbon/human/H in mob_list)
H.dna.species = new newtype()
@@ -1664,19 +1664,19 @@
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","P")
log_admin("[key_name(usr)] made all areas powered", 1)
- message_admins("[key_name_admin(usr)] made all areas powered", 1)
+ message_admins("[key_name_admin(usr)] made all areas powered")
power_restore()
if("unpower")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","UP")
log_admin("[key_name(usr)] made all areas unpowered", 1)
- message_admins("[key_name_admin(usr)] made all areas unpowered", 1)
+ message_admins("[key_name_admin(usr)] made all areas unpowered")
power_failure()
if("quickpower")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","QP")
log_admin("[key_name(usr)] made all SMESs powered", 1)
- message_admins("[key_name_admin(usr)] made all SMESs powered", 1)
+ message_admins("[key_name_admin(usr)] made all SMESs powered")
power_restore_quick()
if("traitor_all")
if(!ticker)
@@ -1712,7 +1712,7 @@
A.mind.objectives += new_objective
ticker.mode.greet_traitor(A.mind)
ticker.mode.finalize_traitor(A.mind)
- message_admins("[key_name_admin(usr)] used everyone is a traitor secret. Objective is [objective]", 1)
+ message_admins("[key_name_admin(usr)] used everyone is a traitor secret. Objective is [objective]")
log_admin("[key_name(usr)] used everyone is a traitor secret. Objective is [objective]")
if("togglebombcap")
feedback_inc("admin_secrets_fun_used",1)
@@ -1742,24 +1742,24 @@
MAX_EX_LIGHT_RANGE = 14
MAX_EX_HEAVY_RANGE = 7
MAX_EX_DEVESTATION_RANGE = 3
- message_admins("[key_name_admin(usr)] changed the bomb cap to [MAX_EX_DEVESTATION_RANGE], [MAX_EX_HEAVY_RANGE], [MAX_EX_LIGHT_RANGE]", 1)
+ message_admins("[key_name_admin(usr)] changed the bomb cap to [MAX_EX_DEVESTATION_RANGE], [MAX_EX_HEAVY_RANGE], [MAX_EX_LIGHT_RANGE]")
log_admin("[key_name(usr)] changed the bomb cap to [MAX_EX_DEVESTATION_RANGE], [MAX_EX_HEAVY_RANGE], [MAX_EX_LIGHT_RANGE]")
if("lightsout")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","LO")
- message_admins("[key_name_admin(usr)] has broke a lot of lights", 1)
+ message_admins("[key_name_admin(usr)] has broke a lot of lights")
E = new /datum/round_event/electrical_storm{lightsoutAmount = 2}()
if("blackout")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","BO")
- message_admins("[key_name_admin(usr)] broke all lights", 1)
+ message_admins("[key_name_admin(usr)] broke all lights")
for(var/obj/machinery/light/L in world)
L.broken()
if("whiteout")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","WO")
- message_admins("[key_name_admin(usr)] fixed all lights", 1)
+ message_admins("[key_name_admin(usr)] fixed all lights")
for(var/obj/machinery/light/L in world)
L.fix()
if("floorlava")
@@ -1781,7 +1781,7 @@
return
floorIsLava = 1
- message_admins("[key_name_admin(usr)] made the floor LAVA! It'll last [length] seconds and it will deal [damage] damage to everyone.", 1)
+ message_admins("[key_name_admin(usr)] made the floor LAVA! It'll last [length] seconds and it will deal [damage] damage to everyone.")
for(var/turf/simulated/floor/F in world)
if(F.z == 1)
@@ -1884,7 +1884,7 @@
if("clear_virus")
var/choice = input("Are you sure you want to cure all disease?") in list("Yes", "Cancel")
if(choice == "Yes")
- message_admins("[key_name_admin(usr)] has cured all diseases.", 1)
+ message_admins("[key_name_admin(usr)] has cured all diseases.")
for(var/datum/disease/D in active_diseases)
D.cure(D)
if("list_bombers")
@@ -1909,21 +1909,21 @@
feedback_add_details("admin_secrets_fun_used","ShM")
var/datum/shuttle_manager/s = shuttles["mining"]
if(istype(s)) s.move_shuttle(0)
- message_admins("[key_name_admin(usr)] moved mining shuttle", 1)
+ message_admins("[key_name_admin(usr)] moved mining shuttle")
log_admin("[key_name(usr)] moved the mining shuttle")
if("movelaborshuttle")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","ShL")
var/datum/shuttle_manager/s = shuttles["laborcamp"]
if(istype(s)) s.move_shuttle(0)
- message_admins("[key_name_admin(usr)] moved labor shuttle", 1)
+ message_admins("[key_name_admin(usr)] moved labor shuttle")
log_admin("[key_name(usr)] moved the labor shuttle")
if("moveferry")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","ShF")
var/datum/shuttle_manager/s = shuttles["ferry"]
if(istype(s)) s.move_shuttle(0)
- message_admins("[key_name_admin(usr)] moved the centcom ferry", 1)
+ message_admins("[key_name_admin(usr)] moved the centcom ferry")
log_admin("[key_name(usr)] moved the centcom ferry")
if("kick_all_from_lobby")
if(ticker && ticker.current_state == GAME_STATE_PLAYING)
@@ -1935,7 +1935,7 @@
var/strkicked = ""
for(var/name in listkicked)
strkicked += "[name], "
- message_admins("[key_name_admin(usr)] has kicked [afkonly ? "all AFK" : "all"] clients from the lobby. [length(listkicked)] clients kicked: [strkicked ? strkicked : "--"]", 1)
+ message_admins("[key_name_admin(usr)] has kicked [afkonly ? "all AFK" : "all"] clients from the lobby. [length(listkicked)] clients kicked: [strkicked ? strkicked : "--"]")
log_admin("[key_name(usr)] has kicked [afkonly ? "all AFK" : "all"] clients from the lobby. [length(listkicked)] clients kicked: [strkicked ? strkicked : "--"]")
else
usr << "You may only use this when the game is running"
diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm
index 28f8c297c36..0b9cdb13469 100644
--- a/code/modules/admin/verbs/adminjump.dm
+++ b/code/modules/admin/verbs/adminjump.dm
@@ -8,7 +8,7 @@
usr.loc = pick(get_area_turfs(A))
log_admin("[key_name(usr)] jumped to [A]")
- message_admins("[key_name_admin(usr)] jumped to [A]", 1)
+ message_admins("[key_name_admin(usr)] jumped to [A]")
feedback_add_details("admin_verb","JA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/jumptoturf(var/turf/T in world)
@@ -19,7 +19,7 @@
return
log_admin("[key_name(usr)] jumped to [T.x],[T.y],[T.z] in [T.loc]")
- message_admins("[key_name_admin(usr)] jumped to [T.x],[T.y],[T.z] in [T.loc]", 1)
+ message_admins("[key_name_admin(usr)] jumped to [T.x],[T.y],[T.z] in [T.loc]")
usr.loc = T
feedback_add_details("admin_verb","JT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return
@@ -33,7 +33,7 @@
return
log_admin("[key_name(usr)] jumped to [key_name(M)]")
- message_admins("[key_name_admin(usr)] jumped to [key_name_admin(M)]", 1)
+ message_admins("[key_name_admin(usr)] jumped to [key_name_admin(M)]")
if(src.mob)
var/mob/A = src.mob
var/turf/T = get_turf(M)
@@ -76,7 +76,7 @@
return
var/mob/M = selection:mob
log_admin("[key_name(usr)] jumped to [key_name(M)]")
- message_admins("[key_name_admin(usr)] jumped to [key_name_admin(M)]", 1)
+ message_admins("[key_name_admin(usr)] jumped to [key_name_admin(M)]")
usr.loc = M.loc
feedback_add_details("admin_verb","JK") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -89,7 +89,7 @@
return
log_admin("[key_name(usr)] teleported [key_name(M)]")
- message_admins("[key_name_admin(usr)] teleported [key_name_admin(M)]", 1)
+ message_admins("[key_name_admin(usr)] teleported [key_name_admin(M)]")
M.loc = get_turf(usr)
feedback_add_details("admin_verb","GM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -113,7 +113,7 @@
if(!M)
return
log_admin("[key_name(usr)] teleported [key_name(M)]")
- message_admins("[key_name_admin(usr)] teleported [key_name(M)]", 1)
+ message_admins("[key_name_admin(usr)] teleported [key_name(M)]")
if(M)
M.loc = get_turf(usr)
feedback_add_details("admin_verb","GK") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -130,4 +130,4 @@
feedback_add_details("admin_verb","SMOB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(usr)] teleported [key_name(M)] to [A]")
- message_admins("[key_name_admin(usr)] teleported [key_name_admin(M)] to [A]", 1)
\ No newline at end of file
+ message_admins("[key_name_admin(usr)] teleported [key_name_admin(M)] to [A]")
\ No newline at end of file
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 89e92bc079b..326689c514d 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -244,7 +244,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
M:Alienize()
feedback_add_details("admin_verb","MKAL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(usr)] made [key_name(M)] into an alien.")
- message_admins("[key_name_admin(usr)] made [key_name(M)] into an alien.", 1)
+ message_admins("[key_name_admin(usr)] made [key_name(M)] into an alien.")
else
alert("Invalid mob")
@@ -261,7 +261,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
M:slimeize()
feedback_add_details("admin_verb","MKMET") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(usr)] made [key_name(M)] into a slime.")
- message_admins("[key_name_admin(usr)] made [key_name(M)] into a slime.", 1)
+ message_admins("[key_name_admin(usr)] made [key_name(M)] into a slime.")
else
alert("Invalid mob")
@@ -487,7 +487,7 @@ var/global/list/g_fancy_list_of_safe_types = null
alert("Invalid mob")
feedback_add_details("admin_verb","GFA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(src)] has granted [M.key] full access.")
- message_admins("[key_name_admin(usr)] has granted [M.key] full access.", 1)
+ message_admins("[key_name_admin(usr)] has granted [M.key] full access.")
/client/proc/cmd_assume_direct_control(var/mob/M in mob_list)
set category = "Admin"
@@ -500,7 +500,7 @@ var/global/list/g_fancy_list_of_safe_types = null
else
var/mob/dead/observer/ghost = new/mob/dead/observer(M,1)
ghost.ckey = M.ckey
- message_admins("[key_name_admin(usr)] assumed direct control of [M].", 1)
+ message_admins("[key_name_admin(usr)] assumed direct control of [M].")
log_admin("[key_name(usr)] assumed direct control of [M].")
var/mob/adminmob = src.mob
M.ckey = src.ckey
@@ -991,7 +991,7 @@ var/global/list/g_fancy_list_of_safe_types = null
M.regenerate_icons()
log_admin("[key_name(usr)] changed the equipment of [key_name(M)] to [dresscode].")
- message_admins("[key_name_admin(usr)] changed the equipment of [key_name_admin(M)] to [dresscode]..", 1)
+ message_admins("[key_name_admin(usr)] changed the equipment of [key_name_admin(M)] to [dresscode]..")
return
/client/proc/startSinglo()
diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm
index f03402416fb..f6af08d200f 100644
--- a/code/modules/admin/verbs/diagnostics.dm
+++ b/code/modules/admin/verbs/diagnostics.dm
@@ -42,9 +42,9 @@
log_admin("DEBUG: [key_name(M)] next_move = [M.next_move] lastDblClick = [M.next_click] world.time = [world.time]")
M.next_move = 1
M.next_click = 0
- message_admins("[key_name_admin(largest_move_mob)] had the largest move delay with [largest_move_time] frames / [largest_move_time/10] seconds!", 1)
- message_admins("[key_name_admin(largest_click_mob)] had the largest click delay with [largest_click_time] frames / [largest_click_time/10] seconds!", 1)
- message_admins("world.time = [world.time]", 1)
+ message_admins("[key_name_admin(largest_move_mob)] had the largest move delay with [largest_move_time] frames / [largest_move_time/10] seconds!")
+ message_admins("[key_name_admin(largest_click_mob)] had the largest click delay with [largest_click_time] frames / [largest_click_time/10] seconds!")
+ message_admins("world.time = [world.time]")
feedback_add_details("admin_verb","UFE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return
diff --git a/code/modules/admin/verbs/massmodvar.dm b/code/modules/admin/verbs/massmodvar.dm
index 4b9cdbac6da..880ec3da326 100644
--- a/code/modules/admin/verbs/massmodvar.dm
+++ b/code/modules/admin/verbs/massmodvar.dm
@@ -372,4 +372,4 @@
A.vars[variable] = O.vars[variable]
log_admin("[key_name(src)] mass modified [original_name]'s [variable] to [O.vars[variable]]")
- message_admins("[key_name_admin(src)] mass modified [original_name]'s [variable] to [O.vars[variable]]", 1)
\ No newline at end of file
+ message_admins("[key_name_admin(src)] mass modified [original_name]'s [variable] to [O.vars[variable]]")
\ No newline at end of file
diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm
index 9f1e3e206bb..ff04e9c6491 100644
--- a/code/modules/admin/verbs/modifyvariables.dm
+++ b/code/modules/admin/verbs/modifyvariables.dm
@@ -518,5 +518,5 @@ var/list/forbidden_varedit_object_types = list(
world.log << "### VarEdit by [src]: [O.type] [variable]=[html_encode("[O.vars[variable]]")]"
log_admin("[key_name(src)] modified [original_name]'s [variable] to [O.vars[variable]]")
- message_admins("[key_name_admin(src)] modified [original_name]'s [variable] to [O.vars[variable]]", 1)
+ message_admins("[key_name_admin(src)] modified [original_name]'s [variable] to [O.vars[variable]]")
diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm
index 528fd97ba31..1b2c4bdf428 100644
--- a/code/modules/admin/verbs/onlyone.dm
+++ b/code/modules/admin/verbs/onlyone.dm
@@ -46,5 +46,5 @@
W.update_label(H.real_name)
H.equip_to_slot_or_del(W, slot_wear_id)
- message_admins("[key_name_admin(usr)] used THERE CAN BE ONLY ONE!", 1)
+ message_admins("[key_name_admin(usr)] used THERE CAN BE ONLY ONE!")
log_admin("[key_name(usr)] used there can be only one.")
\ No newline at end of file
diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm
index 45c316988f6..0fa3e382fa5 100644
--- a/code/modules/admin/verbs/playsound.dm
+++ b/code/modules/admin/verbs/playsound.dm
@@ -11,7 +11,7 @@ var/sound/admin_sound
admin_sound.status = SOUND_UPDATE|SOUND_STREAM
log_admin("[key_name(src)] played sound [S]")
- message_admins("[key_name_admin(src)] played sound [S]", 1)
+ message_admins("[key_name_admin(src)] played sound [S]")
if(events.holiday == "April Fool's Day")
admin_sound.frequency = pick(0.5, 0.7, 0.8, 0.85, 0.9, 0.95, 1.1, 1.2, 1.4, 1.6, 2.0, 2.5)
@@ -32,7 +32,7 @@ var/sound/admin_sound
if(!check_rights(R_SOUNDS)) return
log_admin("[key_name(src)] played a local sound [S]")
- message_admins("[key_name_admin(src)] played a local sound [S]", 1)
+ message_admins("[key_name_admin(src)] played a local sound [S]")
playsound(get_turf(src.mob), S, 50, 0, 0)
feedback_add_details("admin_verb","PLS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/admin/verbs/possess.dm b/code/modules/admin/verbs/possess.dm
index af1f9aedbc1..773e475b9f4 100644
--- a/code/modules/admin/verbs/possess.dm
+++ b/code/modules/admin/verbs/possess.dm
@@ -11,10 +11,10 @@
if(T)
log_admin("[key_name(usr)] has possessed [O] ([O.type]) at ([T.x], [T.y], [T.z])")
- message_admins("[key_name(usr)] has possessed [O] ([O.type]) at ([T.x], [T.y], [T.z])", 1)
+ message_admins("[key_name(usr)] has possessed [O] ([O.type]) at ([T.x], [T.y], [T.z])")
else
log_admin("[key_name(usr)] has possessed [O] ([O.type]) at an unknown location")
- message_admins("[key_name(usr)] has possessed [O] ([O.type]) at an unknown location", 1)
+ message_admins("[key_name(usr)] has possessed [O] ([O.type]) at an unknown location")
if(!usr.control_object) //If you're not already possessing something...
usr.name_archive = usr.real_name
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 5690818169b..1e63312b6f2 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -13,7 +13,7 @@
M.unEquip(W)
log_admin("[key_name(usr)] made [key_name(M)] drop everything!")
- message_admins("[key_name_admin(usr)] made [key_name_admin(M)] drop everything!", 1)
+ message_admins("[key_name_admin(usr)] made [key_name_admin(M)] drop everything!")
feedback_add_details("admin_verb","DEVR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -36,7 +36,7 @@
M << "\bold You hear a voice in your head... \italic [msg]"
log_admin("SubtlePM: [key_name(usr)] -> [key_name(M)] : [msg]")
- message_admins(" SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg]", 1)
+ message_admins(" SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg]")
feedback_add_details("admin_verb","SMS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_world_narrate()
@@ -53,7 +53,7 @@
return
world << "[msg]"
log_admin("GlobalNarrate: [key_name(usr)] : [msg]")
- message_admins(" GlobalNarrate: [key_name_admin(usr)] : [msg]
", 1)
+ message_admins(" GlobalNarrate: [key_name_admin(usr)] : [msg]
")
feedback_add_details("admin_verb","GLN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_direct_narrate(var/mob/M)
@@ -77,7 +77,7 @@
M << msg
log_admin("DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]")
- message_admins(" DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]
", 1)
+ message_admins(" DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]
")
feedback_add_details("admin_verb","DIRN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_godmode(mob/M as mob in mob_list)
@@ -90,7 +90,7 @@
usr << "Toggled [(M.status_flags & GODMODE) ? "ON" : "OFF"]"
log_admin("[key_name(usr)] has toggled [key_name(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]")
- message_admins("[key_name_admin(usr)] has toggled [key_name_admin(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]", 1)
+ message_admins("[key_name_admin(usr)] has toggled [key_name_admin(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]")
feedback_add_details("admin_verb","GOD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -132,7 +132,7 @@ proc/cmd_admin_mute(whom, mute_type, automute = 0)
muteunmute = "auto-muted"
P.muted |= mute_type
log_admin("SPAM AUTOMUTE: [muteunmute] [key_name(whom)] from [mute_string]")
- message_admins("SPAM AUTOMUTE: [muteunmute] [key_name_admin(whom)] from [mute_string].", 1)
+ message_admins("SPAM AUTOMUTE: [muteunmute] [key_name_admin(whom)] from [mute_string].")
if(C) C << "You have been [muteunmute] from [mute_string] by the SPAM AUTOMUTE system. Contact an admin."
feedback_add_details("admin_verb","AUTOMUTE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return
@@ -145,7 +145,7 @@ proc/cmd_admin_mute(whom, mute_type, automute = 0)
P.muted |= mute_type
log_admin("[key_name(usr)] has [muteunmute] [key_name(whom)] from [mute_string]")
- message_admins("[key_name_admin(usr)] has [muteunmute] [key_name_admin(whom)] from [mute_string].", 1)
+ message_admins("[key_name_admin(usr)] has [muteunmute] [key_name_admin(whom)] from [mute_string].")
if(C) C << "You have been [muteunmute] from [mute_string]."
feedback_add_details("admin_verb","MUTE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -159,7 +159,7 @@ proc/cmd_admin_mute(whom, mute_type, automute = 0)
var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
if(confirm != "Yes") return
log_admin("[key_name(src)] has added a random AI law.")
- message_admins("[key_name_admin(src)] has added a random AI law.", 1)
+ message_admins("[key_name_admin(src)] has added a random AI law.")
var/show_log = alert(src, "Show ion message?", "Message", "Yes", "No")
var/announce_ion_laws = (show_log == "Yes" ? 1 : -1)
@@ -196,7 +196,7 @@ proc/cmd_admin_mute(whom, mute_type, automute = 0)
else return 0
new_xeno.ckey = ckey
- message_admins("[key_name_admin(usr)] has spawned [ckey] as a filthy xeno [alien_caste].", 1)
+ message_admins("[key_name_admin(usr)] has spawned [ckey] as a filthy xeno [alien_caste].")
return 1
/*
@@ -247,7 +247,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
G_found.mind.transfer_to(new_xeno) //be careful when doing stuff like this! I've already checked the mind isn't in use
new_xeno.key = G_found.key
new_xeno << "You have been fully respawned. Enjoy the game."
- message_admins("[key_name_admin(usr)] has respawned [new_xeno.key] as a filthy xeno.", 1)
+ message_admins("[key_name_admin(usr)] has respawned [new_xeno.key] as a filthy xeno.")
return //all done. The ghost is auto-deleted
//check if they were a monkey
@@ -257,7 +257,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
G_found.mind.transfer_to(new_monkey) //be careful when doing stuff like this! I've already checked the mind isn't in use
new_monkey.key = G_found.key
new_monkey << "You have been fully respawned. Enjoy the game."
- message_admins("[key_name_admin(usr)] has respawned [new_monkey.key] as a filthy xeno.", 1)
+ message_admins("[key_name_admin(usr)] has respawned [new_monkey.key] as a filthy xeno.")
return //all done. The ghost is auto-deleted
@@ -367,7 +367,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(alert(new_character,"Would you like an active AI to announce this character?",,"No","Yes")=="Yes")
call(/mob/new_player/proc/AnnounceArrival)(new_character, new_character.mind.assigned_role)
- message_admins("[admin] has respawned [player_key] as [new_character.real_name].", 1)
+ message_admins("[admin] has respawned [player_key] as [new_character.real_name].")
new_character << "You have been fully respawned. Enjoy the game."
@@ -385,7 +385,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
return
log_admin("Admin [key_name(usr)] has added a new AI law - [input]")
- message_admins("Admin [key_name_admin(usr)] has added a new AI law - [input]", 1)
+ message_admins("Admin [key_name_admin(usr)] has added a new AI law - [input]")
var/show_log = alert(src, "Show ion message?", "Message", "Yes", "No")
var/announce_ion_laws = (show_log == "Yes" ? 1 : -1)
@@ -408,7 +408,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
M.revive()
log_admin("[key_name(usr)] healed / revived [key_name(M)]")
- message_admins("Admin [key_name_admin(usr)] healed / revived [key_name_admin(M)]!", 1)
+ message_admins("Admin [key_name_admin(usr)] healed / revived [key_name_admin(M)]!")
feedback_add_details("admin_verb","REJU") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_create_centcom_report()
@@ -430,7 +430,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
print_command_report(input,"[confirm=="Yes" ? "" : "Classified "][command_name()] Update")
log_admin("[key_name(src)] has created a command report: [input]")
- message_admins("[key_name_admin(src)] has created a command report", 1)
+ message_admins("[key_name_admin(src)] has created a command report")
feedback_add_details("admin_verb","CCR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_delete(atom/O as obj|mob|turf in world)
@@ -443,7 +443,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
if (alert(src, "Are you sure you want to delete:\n[O]\nat ([O.x], [O.y], [O.z])?", "Confirmation", "Yes", "No") == "Yes")
log_admin("[key_name(usr)] deleted [O] at ([O.x],[O.y],[O.z])")
- message_admins("[key_name_admin(usr)] deleted [O] at ([O.x],[O.y],[O.z])", 1)
+ message_admins("[key_name_admin(usr)] deleted [O] at ([O.x],[O.y],[O.z])")
feedback_add_details("admin_verb","DEL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
qdel(O)
@@ -483,7 +483,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
explosion(O, devastation, heavy, light, flash, null, null,flames)
log_admin("[key_name(usr)] created an explosion ([devastation],[heavy],[light],[flames]) at ([O.x],[O.y],[O.z])")
- message_admins("[key_name_admin(usr)] created an explosion ([devastation],[heavy],[light],[flames]) at ([O.x],[O.y],[O.z])", 1)
+ message_admins("[key_name_admin(usr)] created an explosion ([devastation],[heavy],[light],[flames]) at ([O.x],[O.y],[O.z])")
feedback_add_details("admin_verb","EXPL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return
else
@@ -506,7 +506,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
empulse(O, heavy, light)
log_admin("[key_name(usr)] created an EM Pulse ([heavy],[light]) at ([O.x],[O.y],[O.z])")
- message_admins("[key_name_admin(usr)] created an EM PUlse ([heavy],[light]) at ([O.x],[O.y],[O.z])", 1)
+ message_admins("[key_name_admin(usr)] created an EM PUlse ([heavy],[light]) at ([O.x],[O.y],[O.z])")
feedback_add_details("admin_verb","EMP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return
@@ -527,7 +527,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(!M) return
log_admin("[key_name(usr)] has gibbed [key_name(M)]")
- message_admins("[key_name_admin(usr)] has gibbed [key_name_admin(M)]", 1)
+ message_admins("[key_name_admin(usr)] has gibbed [key_name_admin(M)]")
if(istype(M, /mob/dead/observer))
gibs(M.loc, M.viruses)
@@ -548,7 +548,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
mob.gib()
log_admin("[key_name(usr)] used gibself.")
- message_admins("[key_name_admin(usr)] used gibself.", 1)
+ message_admins("[key_name_admin(usr)] used gibself.")
feedback_add_details("admin_verb","GIBS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/*
/client/proc/cmd_manual_ban()
@@ -663,7 +663,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
view = world.view
log_admin("[key_name(usr)] changed their view range to [view].")
- //message_admins("\blue [key_name_admin(usr)] changed their view range to [view].", 1) //why? removed by order of XSI
+ //message_admins("\blue [key_name_admin(usr)] changed their view range to [view].") //why? removed by order of XSI
feedback_add_details("admin_verb","CVRA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -692,7 +692,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
emergency_shuttle.incall()
feedback_add_details("admin_verb","CSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(usr)] admin-called the emergency shuttle.")
- message_admins("[key_name_admin(usr)] admin-called the emergency shuttle.", 1)
+ message_admins("[key_name_admin(usr)] admin-called the emergency shuttle.")
return
/client/proc/admin_cancel_shuttle()
@@ -707,7 +707,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
emergency_shuttle.recall()
feedback_add_details("admin_verb","CCSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(usr)] admin-recalled the emergency shuttle.")
- message_admins("[key_name_admin(usr)] admin-recalled the emergency shuttle.", 1)
+ message_admins("[key_name_admin(usr)] admin-recalled the emergency shuttle.")
return
@@ -732,7 +732,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(config.force_random_names)
config.force_random_names = 0
- message_admins("Admin [key_name_admin(usr)] has disabled \"Everyone is Special\" mode.", 1)
+ message_admins("Admin [key_name_admin(usr)] has disabled \"Everyone is Special\" mode.")
usr << "Disabled."
return
@@ -742,7 +742,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
return
log_admin("Admin [key_name(src)] has forced the players to have random appearances.")
- message_admins("Admin [key_name_admin(usr)] has forced the players to have random appearances.", 1)
+ message_admins("Admin [key_name_admin(usr)] has forced the players to have random appearances.")
if(notifyplayers == "Yes")
world << "Admin [usr.key] has forced the players to have completely random identities!"
@@ -760,9 +760,9 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(!config.allow_random_events)
config.allow_random_events = 1
usr << "Random events enabled"
- message_admins("Admin [key_name_admin(usr)] has enabled random events.", 1)
+ message_admins("Admin [key_name_admin(usr)] has enabled random events.")
else
config.allow_random_events = 0
usr << "Random events disabled"
- message_admins("Admin [key_name_admin(usr)] has disabled random events.", 1)
+ message_admins("Admin [key_name_admin(usr)] has disabled random events.")
feedback_add_details("admin_verb","TRE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/admin/verbs/tripAI.dm b/code/modules/admin/verbs/tripAI.dm
index dd8d12d1b05..ac1dced5366 100644
--- a/code/modules/admin/verbs/tripAI.dm
+++ b/code/modules/admin/verbs/tripAI.dm
@@ -14,9 +14,9 @@
if(ticker.triai)
ticker.triai = 0
usr << "Only one AI will be spawned at round start."
- message_admins("[key_name_admin(usr)] has toggled off triple AIs at round start.", 1)
+ message_admins("[key_name_admin(usr)] has toggled off triple AIs at round start.")
else
ticker.triai = 1
usr << "There will be an AI Triumvirate at round start."
- message_admins("[key_name_admin(usr)] has toggled on triple AIs at round start.", 1)
+ message_admins("[key_name_admin(usr)] has toggled on triple AIs at round start.")
return
diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm
index 16fcdb2f4b6..baba97a0b2c 100644
--- a/code/modules/awaymissions/bluespaceartillery.dm
+++ b/code/modules/awaymissions/bluespaceartillery.dm
@@ -41,7 +41,7 @@
if(src.reload < 180) return
if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
priority_announce("Bluespace artillery fire detected. Brace for impact.")
- message_admins("[key_name_admin(usr)] has launched an artillery strike.", 1)
+ message_admins("[key_name_admin(usr)] has launched an artillery strike.")
var/list/L = list()
for(var/turf/T in get_area_turfs(thearea.type))
L+=T
diff --git a/code/modules/food&drinks/food/condiment.dm b/code/modules/food&drinks/food/condiment.dm
index ff7706eec96..21ec47ce544 100644
--- a/code/modules/food&drinks/food/condiment.dm
+++ b/code/modules/food&drinks/food/condiment.dm
@@ -42,11 +42,9 @@
return 1
else if( istype(M, /mob/living/carbon/human) )
- for(var/mob/O in viewers(world.view, user))
- O.show_message("[user] attempts to feed [M] [src].", 1)
+ visible_message("[user] attempts to feed [M] [src].")
if(!do_mob(user, M)) return
- for(var/mob/O in viewers(world.view, user))
- O.show_message("[user] feeds [M] [src].", 1)
+ visible_message("[user] feeds [M] [src].")
add_logs(user, M, "fed", object="[reagentlist(src)]")
diff --git a/code/modules/mob/living/carbon/alien/humanoid/death.dm b/code/modules/mob/living/carbon/alien/humanoid/death.dm
index bee27cda077..de4438814ef 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/death.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/death.dm
@@ -5,8 +5,7 @@
if(!gibbed)
playsound(loc, 'sound/voice/hiss6.ogg', 80, 1, 1)
- for(var/mob/O in viewers(src, null))
- O.show_message("[src] lets out a waning guttural screech, green blood bubbling from its maw...", 1)
+ visible_message("[src] lets out a waning guttural screech, green blood bubbling from its maw...")
update_canmove()
if(client) blind.layer = 0
update_icons()
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 03fe3b71989..8316fd8249e 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -39,9 +39,8 @@
H.updatehealth()
else
src.take_organ_damage(d)
- for(var/mob/M in viewers(user, null))
- if(M.client)
- M.show_message("[user] attacks [src]'s stomach wall with the [I.name]!", 2)
+ visible_message("[user] attacks [src]'s stomach wall with the [I.name]!", \
+ "[user] attacks your stomach wall with the [I.name]!")
playsound(user.loc, 'sound/effects/attackblob.ogg', 50, 1)
if(prob(src.getBruteLoss() - 50))
diff --git a/code/modules/mob/living/carbon/slime/death.dm b/code/modules/mob/living/carbon/slime/death.dm
index d1b3a945a4a..c54e5d869c3 100644
--- a/code/modules/mob/living/carbon/slime/death.dm
+++ b/code/modules/mob/living/carbon/slime/death.dm
@@ -16,8 +16,7 @@
stat = DEAD
icon_state = "[colour] baby slime dead"
overlays.len = 0
- for(var/mob/O in viewers(src, null))
- O.show_message("The [name] seizes up and falls limp...", 1) //ded -- Urist
+ visible_message("The [name] seizes up and falls limp...") //ded -- Urist
update_canmove()
if(blind) blind.layer = 0
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index ceea1384d12..e1849718ab4 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -420,8 +420,7 @@ var/list/ai_list = list()
else
if(M.attack_sound)
playsound(loc, M.attack_sound, 50, 1, 1)
- for(var/mob/O in viewers(src, null))
- O.show_message("[M] [M.attacktext] [src]!", 1)
+ visible_message("[M] [M.attacktext] [src]!")
add_logs(M, src, "attacked", admin=0)
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
adjustBruteLoss(damage)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 10a17446b52..f5c428e926d 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -733,8 +733,7 @@
else
if(M.attack_sound)
playsound(loc, M.attack_sound, 50, 1, 1)
- for(var/mob/O in viewers(src, null))
- O.show_message("[M] [M.attacktext] [src]!", 1)
+ visible_message("[M] [M.attacktext] [src]!")
add_logs(M, src, "attacked", admin=0)
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
adjustBruteLoss(damage)
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index 888488ee76e..6034aad76dd 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -231,7 +231,7 @@
/mob/living/simple_animal/hostile/proc/OpenFire(var/the_target)
var/target = the_target
- visible_message("[src] [ranged_message] at [target]!", 1)
+ visible_message("[src] [ranged_message] at [target]!")
var/tturf = get_turf(target)
if(rapid)
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index a441a1da8de..b227f06acd4 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -17,10 +17,10 @@
spawn() alert("You have logged in already with another key this round, please log out of this one NOW or risk being banned!")
if(matches)
if(M.client)
- message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)].", 1)
+ message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)].")
log_access("Notice: [key_name(src)] has the same [matches] as [key_name(M)].")
else
- message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)] (no longer logged in). ", 1)
+ message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)] (no longer logged in). ")
log_access("Notice: [key_name(src)] has the same [matches] as [key_name(M)] (no longer logged in).")
/mob/Login()
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index c9cc1fe6764..88055515d70 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -455,8 +455,7 @@ proc/is_special_character(mob/M) // returns 1 for special characters and 2 for h
affecting.heal_damage(brute,burn,1)
H.update_damage_overlays(0)
H.updatehealth()
- for(var/mob/O in viewers(user, null))
- O.show_message(text("[user] has fixed some of the [dam ? "dents on" : "burnt wires in"] [H]'s [affecting.getDisplayName()]!"), 1)
+ user.visible_message("[user] has fixed some of the [dam ? "dents on" : "burnt wires in"] [H]'s [affecting.getDisplayName()]!")
return
else
user << "[H]'s [affecting.getDisplayName()] is already in good condition"
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index ba869fce07f..aec8d809801 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -136,8 +136,7 @@ By design, d1 is the smallest direction and d2 is the highest
else
newcable = new/obj/item/stack/cable_coil(T, 1, cable_color)
- for(var/mob/O in viewers(src, null))
- O.show_message("[user] cuts the cable.", 1)
+ visible_message("[user] cuts the cable.")
newcable.add_fingerprint(user)
investigate_log("was cut by [key_name(usr, usr.client)] in [user.loc.loc]","wires")
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 43551762fa9..029095551c0 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -379,11 +379,9 @@
if(prob(1+W.force * 5))
- user << "You hit the light, and it smashes!"
- for(var/mob/M in viewers(src))
- if(M == user)
- continue
- M.show_message("[user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2)
+ user.visible_message("[user.name] smashed the light!", \
+ "You hit the light, and it smashes!", \
+ "You hear a tinkle of breaking glass")
if(on && (W.flags & CONDUCT))
//if(!user.mutations & COLD_RESISTANCE)
if (prob(12))
@@ -391,14 +389,14 @@
broken()
else
- user << "You hit the light!"
+ user.visible_message("[user.name] hits the light.")
// attempt to stick weapon into light socket
else if(status == LIGHT_EMPTY)
if(istype(W, /obj/item/weapon/screwdriver)) //If it's a screwdriver open it.
playsound(src.loc, 'sound/items/Screwdriver.ogg', 75, 1)
- user.visible_message("[user.name] opens [src]'s casing.", \
- "You open [src]'s casing.", "You hear a noise.")
+ user.visible_message("[user.name] opens [src]'s casing.", \
+ "You open [src]'s casing.", "You hear a noise.")
var/obj/machinery/light_construct/newlight = null
switch(fitting)
if("tube")
@@ -458,8 +456,7 @@
user << "\green That object is useless to you."
return
else if (status == LIGHT_OK||status == LIGHT_BURNED)
- for(var/mob/M in viewers(src))
- M.show_message("[user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2)
+ visible_message("[user.name] smashed the light!", "You hear a tinkle of breaking glass")
broken()
return
@@ -469,8 +466,7 @@
M << "That object is useless to you."
return
else if (status == LIGHT_OK||status == LIGHT_BURNED)
- for(var/mob/O in viewers(src))
- O.show_message("[M.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2)
+ visible_message("[M.name] smashed the light!", "You hear a tinkle of breaking glass")
broken()
return
// attack with hand - remove tube/bulb
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index e9ceeffcbd9..e3d15860703 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -211,8 +211,7 @@ field_generator power level display
if(draw_power(round(power_draw/2,1)))
return 1
else
- for(var/mob/M in viewers(src))
- M.show_message("The [src.name] shuts down!")
+ visible_message("The [src.name] shuts down!", "You hear something shutting down")
turn_off()
investigate_log("ran out of power and deactivated","singulo")
src.power = 0
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 4ec642bdadf..41520035e4b 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -1687,8 +1687,7 @@ datum/reagent/toxin/acid/reaction_obj(var/obj/O, var/volume)
if(!O.unacidable)
var/obj/effect/decal/cleanable/molten_item/I = new/obj/effect/decal/cleanable/molten_item(get_turf(O))
I.desc = "Looks like this was \an [O] some time ago."
- for(var/mob/M in viewers(5, O))
- M << " \the [O] melts."
+ O.visible_message(" \the [O] melts.")
qdel(O)
datum/reagent/toxin/acid/polyacid
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index 3dce51e7c62..44cc07bc51b 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -585,6 +585,7 @@ silicate
var/location = get_turf(holder.my_atom)
+
for(var/mob/M in viewers(5, location))
M << "The solution spews out a metalic foam!"
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index b1ea5d08ee7..e33b55290ec 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -128,11 +128,8 @@
if(I)
I.loc = src
- user << "You place \the [I] into \the [src]."
- for(var/mob/M in viewers(src))
- if(M == user)
- continue
- M.show_message("[user.name] places \the [I] into \the [src].", 3)
+ user.visible_message("[user.name] places \the [I] into \the [src].", \
+ "You place \the [I] into \the [src].")
update()
@@ -151,7 +148,7 @@
"[user] starts climbing into [src].")
else
target.visible_message("[user] starts putting [target] into [src].", \
- "[user] starts putting [target] into [src].")
+ "[user] starts putting [target] into [src]!")
if(do_mob(usr, target, 20))
if (target.client)
target.client.perspective = EYE_PERSPECTIVE
@@ -448,11 +445,9 @@
return
if(prob(75))
I.loc = src
- for(var/mob/M in viewers(src))
- M.show_message("\the [I] lands in \the [src].", 3)
+ visible_message("\the [I] lands in \the [src].")
else
- for(var/mob/M in viewers(src))
- M.show_message("\the [I] bounces off of \the [src]'s rim!", 3)
+ visible_message("\the [I] bounces off of \the [src]'s rim!")
return 0
else
return ..(mover, target, height, air_group)
diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm
index 9920edec6ab..d634f16f058 100644
--- a/code/modules/security levels/keycard authentication.dm
+++ b/code/modules/security levels/keycard authentication.dm
@@ -117,7 +117,7 @@
confirmed = 0
trigger_event(event)
log_game("[key_name(event_triggered_by)] triggered and [key_name(event_confirmed_by)] confirmed event [event]")
- message_admins("[key_name(event_triggered_by)] triggered and [key_name(event_confirmed_by)] confirmed event [event]", 1)
+ message_admins("[key_name(event_triggered_by)] triggered and [key_name(event_confirmed_by)] confirmed event [event]")
reset()
/obj/machinery/keycard_auth/proc/receive_request(var/obj/machinery/keycard_auth/source)