diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 2ad534ca5d3..5138b3ec004 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -474,9 +474,9 @@ /obj/machinery/alarm/proc/return_text(mob/user) if(!(istype(user, /mob/living/silicon)) && locked) - return "[src][return_status()]
(Swipe ID card to unlock interface)" + return "[src][return_status()]
[rcon_text()]
(Swipe ID card to unlock interface)" else - return "[src][return_status()]
[return_controls()]" + return "[src][return_status()]
[rcon_text()]
[return_controls()]" /obj/machinery/alarm/proc/return_status() var/turf/location = src.loc diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm index 601f5f0187d..01210b543cc 100755 --- a/code/game/objects/devices/PDA/PDA.dm +++ b/code/game/objects/devices/PDA/PDA.dm @@ -19,7 +19,7 @@ //Secondary variables var/scanmode = 0 //1 is medical scanner, 2 is forensics, 3 is reagent scanner. var/fon = 0 //Is the flashlight function on? - var/f_lum = 4 //Luminosity for the flashlight function + var/f_lum = 3 //Luminosity for the flashlight function var/silent = 0 //To beep or not to beep, that is the question var/toff = 0 //If 1, messenger disabled var/tnote = null //Current Texts diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index d5b62c10224..0a609da27d7 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -25,9 +25,9 @@ return if (user && imp) if (M != user) - user.visible_message("\red You try to implant yourself with \the [src]!","\red [user] tries to implant [user.gender == MALE? "himself":"herself"] with \the [src]!") - else user.visible_message("\red You try to implant [M] with \the [src]!","\red [user] tries to implant [M] with \the [src]!") + else + user.visible_message("\red You try to implant yourself with \the [src]!","\red [user] tries to implant [user.gender == MALE? "himself":"herself"] with \the [src]!") if(!do_mob(user, M,60)) return if(hasorgans(M)) @@ -38,9 +38,9 @@ target.implant += imp imp.loc = target if (M != user) - user.visible_message("\red You implant your [target.display_name] with \the [src]!","\red [user] implants [user.gender == MALE? "his own ":"her own "][target.display_name] with \the [src]!") - else user.visible_message("\red You implant [M]'s [target.display_name] with \the [src]!","\red [user] implants [M]'s [target.display_name] with \the [src]!") + else + user.visible_message("\red You implant your [target.display_name] with \the [src]!","\red [user] implants [user.gender == MALE? "his own ":"her own "][target.display_name] with \the [src]!") M.attack_log += text("\[[time_stamp()]\] Implanted with [src] ([imp]) by [user] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src] ([imp]) to implant [M] ([M.ckey])") log_admin("ATTACK: [user] ([user.ckey]) implanted [M] ([M.ckey]) with [src].")