| [role_text]:" var/extra = get_extra_panel_options(player) if(is_antagonist(player)) - dat += "\[-\]" - dat += "\[equip\]" + dat += "\[-\]" + dat += "\[equip\]" if(starting_locations && starting_locations.len) - dat += "\[move to spawn\]" + dat += "\[move to spawn\]" if(extra) dat += "[extra]" else - dat += "\[+\]" + dat += "\[+\]" dat += " | ";
diff --git a/code/game/gamemodes/cult/items/tome.dm b/code/game/gamemodes/cult/items/tome.dm
index 1e395701234..62edde129c8 100644
--- a/code/game/gamemodes/cult/items/tome.dm
+++ b/code/game/gamemodes/cult/items/tome.dm
@@ -34,7 +34,7 @@
/obj/item/book/tome/proc/attack_admins(var/mob/living/target_mob, var/mob/living/user)
target_mob.attack_log += "\[[time_stamp()]\] Has had the [name] used on them by [user.name] ([user.ckey])"
user.attack_log += "\[[time_stamp()]\] Used [name] on [target_mob.name] ([target_mob.ckey])"
- msg_admin_attack("[key_name_admin(user)] used [name] on [target_mob.name] ([target_mob.ckey]) (JMP)",ckey=key_name(user),ckey_target=key_name(target_mob))
+ msg_admin_attack("[key_name_admin(user)] used [name] on [target_mob.name] ([target_mob.ckey]) (JMP)",ckey=key_name(user),ckey_target=key_name(target_mob))
/obj/item/book/tome/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
@@ -100,7 +100,7 @@
. = ..()
if(iscultist(user) || isobserver(user))
. += "The scriptures of Nar-Sie, The One Who Sees, The Geometer of Blood. Contains the details of every ritual his followers could think of. Most of these are useless, though."
- . += SPAN_WARNING("\[?\] This tome contains arcane knowledge of the Geometer's runes. \[Read Tome\]")
+ . += SPAN_WARNING("\[?\] This tome contains arcane knowledge of the Geometer's runes. JMP)")
+ msg_admin_attack("Meteor collided with shields at (JMP)")
qdel(src)
if(A && !QDELETED(src)) // Prevents explosions and other effects when we were deleted by whatever we Bumped() - currently used by shields.
@@ -166,7 +166,7 @@
/obj/effect/meteor/medium/meteor_effect()
..()
explosion(src.loc, 0, 1, 2, 3, 0)
- msg_admin_attack("Meteor exploded at coords (JMP)")
+ msg_admin_attack("Meteor exploded at coords (JMP)")
/obj/effect/meteor/big
name = "large meteor"
@@ -178,7 +178,7 @@
/obj/effect/meteor/big/meteor_effect()
..()
explosion(src.loc, 1, 2, 3, 4, 0)
- msg_admin_attack("Meteor exploded at coords (JMP)")
+ msg_admin_attack("Meteor exploded at coords (JMP)")
/obj/effect/meteor/dust
name = "space dust"
@@ -199,7 +199,7 @@
/obj/effect/meteor/flaming/meteor_effect()
..()
explosion(src.loc, 1, 2, 3, 4, 0, 0, 5)
- msg_admin_attack("Meteor exploded at coords (JMP)")
+ msg_admin_attack("Meteor exploded at coords (JMP)")
/obj/effect/meteor/irradiated
name = "glowing meteor"
@@ -255,7 +255,7 @@
explosion(src.loc, 1, 2, 3, 4, 0)
for(var/obj/machinery/power/apc/A in range(rand(12, 20), src))
A.energy_fail(round(10 * rand(8, 12)))
- msg_admin_attack("Meteor exploded at coords (JMP)")
+ msg_admin_attack("Meteor exploded at coords (JMP)")
/obj/effect/meteor/meaty
name = "meaty ore"
diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm
index eb3fcf56524..3551afde9ec 100644
--- a/code/game/machinery/ai_slipper.dm
+++ b/code/game/machinery/ai_slipper.dm
@@ -80,8 +80,8 @@
if(src.locked && (!istype(user, /mob/living/silicon)))
t += "(Swipe ID card to unlock control panel.) " else - t += "Dispenser [(src.disabled ? "deactivated" : "activated")] - [(src.disabled ? "Enable" : "Disable")]? \n" - t += "Uses Left: [uses]. Activate the dispenser? \n" + t += "Dispenser [(src.disabled ? "deactivated" : "activated")] - [(src.disabled ? "Enable" : "Disable")]? \n" + t += "Uses Left: [uses]. Activate the dispenser? \n" user << browse(t, "window=computer;size=575x450") onclose(user, "computer") diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index 6cf1f6996e8..7d53e8dfa25 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -209,10 +209,10 @@ user = usr log_admin("[user] ([user.ckey]) opened '[src.name]' containing [gases].") - message_admins("[key_name_admin(user)] opened '[src.name]' containing [gases]. (JMP)") + message_admins("[key_name_admin(user)] opened '[src.name]' containing [gases]. (JMP)") /obj/machinery/portable_atmospherics/proc/log_open_userless(var/cause) if(air_contents.gas.len == 0) return - message_admins("'[src.name]' was opened[cause ? " by [cause]" : ""], containing [english_list(air_contents.gas)]. (JMP)") + message_admins("'[src.name]' was opened[cause ? " by [cause]" : ""], containing [english_list(air_contents.gas)]. (JMP)") diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index 0f7e88a8122..743bcf23e3f 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -400,8 +400,8 @@ SPECIAL if("menu") if (beaker) dat += "
| ||||||