diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm
index f405ae7b..d98853dd 100644
--- a/code/game/gamemodes/changeling/changeling_powers.dm
+++ b/code/game/gamemodes/changeling/changeling_powers.dm
@@ -839,7 +839,7 @@ var/list/datum/dna/hivemind_bank = list()
if(T.reagents) T.reagents.add_reagent("lexorin", 40)
//Becase a deadly powerful attack should be logged
- msg_admin_attack("[usr.name] ([usr.ckey]) Death Stung [T.name] ([T.ckey])")
+ msg_admin_attack("[usr.name] ([usr.ckey]) Death Stung [T.name] ([T.ckey]) - JMP")
usr.attack_log += text("\[[time_stamp()]\] Death stung [T.name] ([T.ckey])")
T.attack_log += text("\[[time_stamp()]\] Was death stung by [usr.name] ([usr.ckey])")
feedback_add_details("changeling_powers","DTHS")
diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm
index 4ad1c547..6e278e7f 100644
--- a/code/game/gamemodes/vampire/vampire_powers.dm
+++ b/code/game/gamemodes/vampire/vampire_powers.dm
@@ -175,7 +175,7 @@
shutdown.speed = 1
shutdown.stage = 2
shutdown.clicks = 185
- msg_admin_attack("[usr.name] ([usr.ckey]) gave [C.name] ([C.ckey]) the shutdown disease")
+ msg_admin_attack("[usr.name] ([usr.ckey]) gave [C.name] ([C.ckey]) the shutdown disease - JMP")
usr.attack_log += text("\[[time_stamp()]\] Gave [C.name] ([C.ckey]) the shutdown disease")
C.attack_log += text("\[[time_stamp()]\] Has been given the shutdown disease by [usr.name] ([usr.ckey])")
infect_virus2(C,shutdown,0)
@@ -354,7 +354,7 @@
src << "\red You have successfully Enthralled [H.name]. If they refuse to do as you say just adminhelp."
ticker.mode.update_vampire_icons_added(H.mind)
ticker.mode.update_vampire_icons_added(src.mind)
- msg_admin_attack("[name]([ckey]) has mind-slaved [H.name]([H.ckey]).")
+ msg_admin_attack("[name]([ckey]) has mind-slaved [H.name]([H.ckey]) - JMP.")
/client/vampire/proc/vampire_bats()
set category = "Abilities"
diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm
index 7d2ffc5a..895f82dd 100644
--- a/code/game/machinery/kitchen/gibber.dm
+++ b/code/game/machinery/kitchen/gibber.dm
@@ -212,7 +212,7 @@
if(src.occupant.client) // Gibbed a cow with a client in it? log that shit
src.occupant.attack_log += "\[[time_stamp()]\] Was gibbed by [user]/[user.ckey]"
user.attack_log += "\[[time_stamp()]\] Gibbed [src.occupant]/[src.occupant.ckey]"
- msg_admin_attack("\[[time_stamp()]\] [key_name(user)] gibbed [key_name(src.occupant)]")
+ msg_admin_attack("\[[time_stamp()]\] [key_name(user)] gibbed [key_name(src.occupant)] - JMP")
src.occupant.death(1)
src.occupant.ghostize()
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index c0fdee0c..a35a956a 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -196,7 +196,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
M.attack_log += text("\[[time_stamp()]\] Has been burnt with [src.name] by [user.name] ([user.ckey])")
user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to burn [M.name] ([M.ckey])")
- msg_admin_attack("[key_name(user)] burnt [key_name(user)] with [src.name] (INTENT: [uppertext(user.a_intent)])")
+ msg_admin_attack("[key_name(user)] burnt [key_name(user)] with [src.name] (INTENT: [uppertext(user.a_intent)]) - JMP")
/obj/item/clothing/mask/cigarette/afterattack(obj/item/weapon/reagent_containers/glass/glass, mob/user as mob, proximity)
diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index dc969588..12eb57f7 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -109,7 +109,7 @@
playsound(get_turf(src), 'sound/weapons/Egloves.ogg', 50, 1, -1)
user.attack_log += "\[[time_stamp()]\] Defibrillated [H.name] ([H.ckey]) with [src.name]"
H.attack_log += "\[[time_stamp()]\] Defibrillated by [user.name] ([user.ckey]) with [src.name]"
- msg_admin_attack("[user.name] ([user.ckey]) defibrillated [H.name] ([H.ckey]) with [src.name]" )
+ msg_admin_attack("[user.name] ([user.ckey]) defibrillated [H.name] ([H.ckey]) with [src.name] - JMP" )
if(!iscarbon(user))
M.LAssailant = null
else
diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm
index 9e876154..2dabc2cf 100644
--- a/code/game/objects/items/weapons/gift_wrappaper.dm
+++ b/code/game/objects/items/weapons/gift_wrappaper.dm
@@ -185,7 +185,7 @@
H.attack_log += text("\[[time_stamp()]\] Has been wrapped with [src.name] by [user.name] ([user.ckey])")
user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to wrap [H.name] ([H.ckey])")
- msg_admin_attack("[key_name(user)] used [src] to wrap [key_name(H)]")
+ msg_admin_attack("[key_name(user)] used [src] to wrap [key_name(H)] - JMP")
else
user << "\blue You need more paper."
diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index 7bd91a4f..6aed134a 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -54,7 +54,7 @@
C.attack_log += text("\[[time_stamp()]\] Has been handcuffed (attempt) by [user.name] ([user.ckey])")
user.attack_log += text("\[[time_stamp()]\] Attempted to handcuff [C.name] ([C.ckey])")
- msg_admin_attack("[key_name(user)] attempted to handcuff [key_name(C)]")
+ msg_admin_attack("[key_name(user)] attempted to handcuff [key_name(C)] - JMP")
var/obj/effect/equip_e/human/O = new /obj/effect/equip_e/human( )
O.source = user
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index 7dbc5f31..bddfda17 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -88,7 +88,7 @@
user.attack_log += "\[[time_stamp()]\] Stunned [H.name] ([H.ckey]) with [src.name]"
H.attack_log += "\[[time_stamp()]\] Stunned by [user.name] ([user.ckey]) with [src.name]"
- msg_admin_attack("[key_name(user)] stunned [key_name(H)] with [src.name]")
+ msg_admin_attack("[key_name(user)] stunned [key_name(H)] with [src.name] - JMP")
playsound(src.loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
if(charges < 1)
@@ -115,7 +115,7 @@
H.visible_message("[src], thrown by [foundmob.name], strikes [H] and stuns them!")
H.attack_log += "\[[time_stamp()]\] Stunned by thrown [src.name] last touched by ([src.fingerprintslast])"
- msg_admin_attack("Flying [src.name], last touched by ([src.fingerprintslast]) stunned [key_name(H)]" )
+ msg_admin_attack("Flying [src.name], last touched by ([src.fingerprintslast]) stunned [key_name(H)] - JMP" )
/obj/item/weapon/melee/baton/emp_act(severity)
switch(severity)
@@ -228,7 +228,7 @@
user.attack_log += "\[[time_stamp()]\] Stunned [H.name] ([H.ckey]) with [src.name]"
H.attack_log += "\[[time_stamp()]\] Stunned by [user.name] ([user.ckey]) with [src.name]"
- msg_admin_attack("[key_name(user)] stunned [key_name(H)] with [src.name]")
+ msg_admin_attack("[key_name(user)] stunned [key_name(H)] with [src.name] - JMP")
playsound(src.loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
if(charges < 1)
@@ -256,7 +256,7 @@
H.visible_message("[src], thrown by [foundmob.name], strikes [H] and stuns them!")
H.attack_log += "\[[time_stamp()]\] Stunned by thrown [src.name] last touched by ([src.fingerprintslast])"
- msg_admin_attack("Flying [src.name], last touched by ([src.fingerprintslast]) stunned [key_name(H)]" )
+ msg_admin_attack("Flying [src.name], last touched by ([src.fingerprintslast]) stunned [key_name(H)] - JMP" )
/obj/item/weapon/melee/baton/stunrod/emp_act(severity)
switch(severity)
diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm
index a5c01637..180a89ea 100644
--- a/code/game/objects/items/weapons/swords_axes_etc.dm
+++ b/code/game/objects/items/weapons/swords_axes_etc.dm
@@ -104,7 +104,7 @@
M.Weaken(5)
M.attack_log += text("\[[time_stamp()]\] Has been attacked with [src.name] by [user.name] ([user.ckey])")
user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to attack [M.name] ([M.ckey])")
- msg_admin_attack("[key_name(user)] attacked [key_name(user)] with [src.name] (INTENT: [uppertext(user.a_intent)])")
+ msg_admin_attack("[key_name(user)] attacked [key_name(user)] with [src.name] (INTENT: [uppertext(user.a_intent)]) - JMP")
src.add_fingerprint(user)
for(var/mob/O in viewers(M))
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index c778ddd3..a06702f0 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -364,7 +364,7 @@
if (prob(15)) M.Weaken(5)
M.apply_damage(8,def_zone = "head")
visible_message("\red [G.assailant] slams [G.affecting]'s face against \the [src]!")
- msg_admin_attack("[user.name]([user.ckey]) slams [M.name]'s([M.ckey]) face against \the [src]!")
+ msg_admin_attack("[user.name]([user.ckey]) slams [M.name]'s([M.ckey]) face against \the [src]! - JMP")
playsound(src.loc, 'sound/weapons/tablehit1.ogg', 50, 1)
else
user << "\red You need a better grip to do that!"
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 0b5c9178..755641f4 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -180,20 +180,20 @@
M.apply_damage(7)
hit(10)
visible_message("\red [user] slams [M] against \the [src]!")
- msg_admin_attack("[user.name]([user.ckey]) slams [M.name]'s([M.ckey]) against \the [src]!")
+ msg_admin_attack("[user.name]([user.ckey]) slams [M.name]'s([M.ckey]) against \the [src]! - JMP")
if(2)
if (prob(50))
M.Weaken(1)
M.apply_damage(10)
hit(25)
visible_message("\red [user] bashes [M] against \the [src]!")
- msg_admin_attack("[user.name]([user.ckey]) bashes [M.name]'s([M.ckey]) against \the [src]!")
+ msg_admin_attack("[user.name]([user.ckey]) bashes [M.name]'s([M.ckey]) against \the [src]! - JMP")
if(3)
M.Weaken(5)
M.apply_damage(20)
hit(50)
visible_message("\red [user] crushes [M] against \the [src]!")
- msg_admin_attack("[user.name]([user.ckey]) crushes [M.name]'s([M.ckey]) against \the [src]!")
+ msg_admin_attack("[user.name]([user.ckey]) crushes [M.name]'s([M.ckey]) against \the [src]! - JMP")
return
if(istype(W, /obj/item/weapon/screwdriver))
if(reinf && state >= 1)
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index 77268870..b798f636 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -160,7 +160,7 @@
if (prob(15)) M.Weaken(5)
M.apply_damage(8,def_zone = "head")
visible_message("\red [G.assailant] slams [G.affecting]'s face against \the [src]!")
- msg_admin_attack("[user.name]([user.ckey]) slams [M.name]'s([M.ckey]) face against \the [src]!")
+ msg_admin_attack("[user.name]([user.ckey]) slams [M.name]'s([M.ckey]) face against \the [src]! - JMP")
// switch(rand(1,3))
// if(1)
// playsound(src.loc, 'sound/weapons/genhit1.ogg', 50, 1)
diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm
index e234df64..b8da744a 100644
--- a/code/game/turfs/simulated/walls_reinforced.dm
+++ b/code/game/turfs/simulated/walls_reinforced.dm
@@ -48,7 +48,7 @@
if (prob(15)) M.Weaken(5)
M.apply_damage(16,def_zone = "head")
visible_message("\red [G.assailant] slams [G.affecting]'s face against \the [src]!")
- msg_admin_attack("[user.name]([user.ckey]) slams [M.name]'s([M.ckey]) face against \the [src]!")
+ msg_admin_attack("[user.name]([user.ckey]) slams [M.name]'s([M.ckey]) face against \the [src]! - JMP")
// switch(rand(1,3))
// if(1)
// playsound(src.loc, 'sound/weapons/genhit1.ogg', 50, 1)
diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index 9d9f1145..bdca13ab 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -131,13 +131,13 @@
//and leave an attack log
M.attack_log += text("\[[time_stamp()]\] Bit [src.name] ([src.ckey]) in the neck and draining their blood")
src.attack_log += text("\[[time_stamp()]\] Has been bit in the neck by [M.name] ([M.ckey])")
- msg_admin_attack("[M.name] ([M.ckey]) bit [src.name] ([src.ckey]) in the neck")
+ msg_admin_attack("[M.name] ([M.ckey]) bit [src.name] ([src.ckey]) in the neck - JMP")
M.handle_bloodsucking(src)
return
//end vampire codes
M.attack_log += text("\[[time_stamp()]\] [pick(attack.attack_verb)]ed [src.name] ([src.ckey])")
src.attack_log += text("\[[time_stamp()]\] Has been [pick(attack.attack_verb)]ed by [M.name] ([M.ckey])")
- msg_admin_attack("[key_name(M)] [pick(attack.attack_verb)]ed [key_name(src)]")
+ msg_admin_attack("[key_name(M)] [pick(attack.attack_verb)]ed [key_name(src)] - JMP")
var/damage = rand(0, 5)//BS12 EDIT
if(!damage)
@@ -168,7 +168,7 @@
M.attack_log += text("\[[time_stamp()]\] Disarmed [src.name] ([src.ckey])")
src.attack_log += text("\[[time_stamp()]\] Has been disarmed by [M.name] ([M.ckey])")
- msg_admin_attack("[key_name(M)] disarmed [src.name] ([src.ckey])")
+ msg_admin_attack("[key_name(M)] disarmed [src.name] ([src.ckey]) - JMP")
if(w_uniform)
w_uniform.add_fingerprint(M)
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index fcaf9888..9c9656d6 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -137,7 +137,7 @@
affecting.loc = assailant.loc
affecting.attack_log += "\[[time_stamp()]\] Has had their neck grabbed by [assailant.name] ([assailant.ckey])"
assailant.attack_log += "\[[time_stamp()]\] Grabbed the neck of [affecting.name] ([affecting.ckey])"
- msg_admin_attack("[key_name(assailant)] grabbed the neck of [key_name(affecting)]")
+ msg_admin_attack("[key_name(assailant)] grabbed the neck of [key_name(affecting)] - JMP")
hud.icon_state = "disarm/kill"
hud.name = "disarm/kill"
else
@@ -158,7 +158,7 @@
assailant.visible_message("[assailant] has tightened \his grip on [affecting]'s neck!")
affecting.attack_log += "\[[time_stamp()]\] Has been strangled (kill intent) by [assailant.name] ([assailant.ckey])"
assailant.attack_log += "\[[time_stamp()]\] Strangled (kill intent) [affecting.name] ([affecting.ckey])"
- msg_admin_attack("[key_name(assailant)] strangled (kill intent) [key_name(affecting)]")
+ msg_admin_attack("[key_name(assailant)] strangled (kill intent) [key_name(affecting)] - JMP")
assailant.next_move = world.time + 10
affecting.losebreath += 1