diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
index 36cf604d3a..064f8b675f 100644
--- a/code/__HELPERS/mobs.dm
+++ b/code/__HELPERS/mobs.dm
@@ -288,7 +288,7 @@ Proc for attack log creation, because really why not
var/hp =" "
if(living_target)
- hp = "(NEWHP: [living_target.health])"
+ hp = " (NEWHP: [living_target.health]) "
var/starget = "NON-EXISTENT SUBJECT"
if(target)
@@ -307,20 +307,22 @@ Proc for attack log creation, because really why not
var/sobject = ""
if(object)
sobject = "[object]"
+ if(addition)
+ addition = " [addition]"
var/sattackloc = ""
if(attack_location)
sattackloc = "([attack_location.x],[attack_location.y],[attack_location.z])"
if(is_mob_user)
- var/message = "has [what_done] [starget] with [sobject][addition] [hp] [sattackloc]"
+ var/message = "has [what_done] [starget][(sobject||addition) ? " with ":""][sobject][addition][hp][sattackloc]"
user.log_message(message, INDIVIDUAL_ATTACK_LOG)
if(is_mob_target)
- var/message = "has been [what_done] by [ssource] with [sobject][addition] [hp] [sattackloc]"
+ var/message = "has been [what_done] by [ssource][(sobject||addition) ? " with ":""][sobject][addition][hp][sattackloc]"
target.log_message(message, INDIVIDUAL_ATTACK_LOG)
- log_attack("[ssource] [what_done] [starget] with [sobject][addition] [hp] [sattackloc]")
+ log_attack("[ssource] [what_done] [starget][(sobject||addition) ? " with ":""][sobject][addition][hp][sattackloc]")
/proc/do_mob(mob/user , mob/target, time = 30, uninterruptible = 0, progress = 1, datum/callback/extra_checks = null)
diff --git a/code/game/objects/items/implants/implant.dm b/code/game/objects/items/implants/implant.dm
index b49f325690..d1ff075ef2 100644
--- a/code/game/objects/items/implants/implant.dm
+++ b/code/game/objects/items/implants/implant.dm
@@ -70,7 +70,7 @@
H.sec_hud_set_implants()
if(user)
- add_logs(user, target, "implanted", object="[name]")
+ add_logs(user, target, "implanted", "\a [name]")
return 1
diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm
index b8a05de431..143ae840f5 100644
--- a/code/game/turfs/open.dm
+++ b/code/game/turfs/open.dm
@@ -199,8 +199,6 @@
return 0
if(!(lube&SLIDE_ICE))
to_chat(C, "You slipped[ O ? " on the [O.name]" : ""]!")
- C.log_message("Slipped[O ? " on the [O.name]" : ""][(lube&SLIDE)? " (LUBE)" : ""]!", INDIVIDUAL_ATTACK_LOG)
- if(!(lube&SLIDE_ICE))
playsound(C.loc, 'sound/misc/slip.ogg', 50, 1, -3)
C.SendSignal(COMSIG_ADD_MOOD_EVENT, "slipped", /datum/mood_event/slipped)
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index dc0b094128..e0c8f04030 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -169,9 +169,9 @@
var/turf/start_T = get_turf(loc) //Get the start and target tile for the descriptors
var/turf/end_T = get_turf(target)
if(start_T && end_T)
- var/start_T_descriptor = "tile at [start_T.x], [start_T.y], [start_T.z] in area [get_area(start_T)]"
- var/end_T_descriptor = "tile at [end_T.x], [end_T.y], [end_T.z] in area [get_area(end_T)]"
- add_logs(src, throwable_mob, "thrown", addition="from [start_T_descriptor] with the target [end_T_descriptor]")
+ var/start_T_descriptor = "tile in [get_area_name(start_T, TRUE)] ([start_T.x],[start_T.y],[start_T.z])"
+ var/end_T_descriptor = "tile at [get_area_name(end_T, TRUE)] ([end_T.x],[end_T.y],[end_T.z])"
+ add_logs(src, throwable_mob, "thrown", addition="grab from [start_T_descriptor] towards [end_T_descriptor]")
else if(!(I.flags_1 & (NODROP_1|ABSTRACT_1)))
thrown_thing = I
@@ -185,7 +185,7 @@
if(thrown_thing)
visible_message("[src] has thrown [thrown_thing].")
- add_logs(src, thrown_thing, "has thrown")
+ add_logs(src, thrown_thing, "thrown")
newtonian_move(get_dir(target, src))
thrown_thing.throw_at(target, thrown_thing.throw_range, thrown_thing.throw_speed, src)
diff --git a/code/modules/mob/living/carbon/carbon_movement.dm b/code/modules/mob/living/carbon/carbon_movement.dm
index 7ee828adb7..6fbd4b6f0a 100644
--- a/code/modules/mob/living/carbon/carbon_movement.dm
+++ b/code/modules/mob/living/carbon/carbon_movement.dm
@@ -24,7 +24,7 @@
if(movement_type & FLYING)
return 0
if(!(lube&SLIDE_ICE))
- add_logs(src,, "slipped",, "on [O ? O.name : "floor"]")
+ add_logs(src, (O ? O : get_turf(src)), "slipped on the", null, ((lube & SLIDE) ? "(LUBE)" : null))
return loc.handle_slip(src, knockdown_amount, O, lube)
/mob/living/carbon/Process_Spacemove(movement_dir = 0)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 2a0ac731cf..63ea389ebb 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -760,10 +760,10 @@
var/list/L = where
if(what == who.get_item_for_held_index(L[2]))
if(who.dropItemToGround(what))
- add_logs(src, who, "stripped", addition="of [what]")
+ add_logs(src, who, "stripped [what] off")
if(what == who.get_item_by_slot(where))
if(who.dropItemToGround(what))
- add_logs(src, who, "stripped", addition="of [what]")
+ add_logs(src, who, "stripped [what] off")
// The src mob is trying to place an item on someone
// Override if a certain mob should be behave differently when placing items (can't, for example)
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index ad1d0f76d0..e92393833c 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -324,7 +324,7 @@
/obj/item/projectile/proc/fire(angle, atom/direct_target)
//If no angle needs to resolve it from xo/yo!
if(!log_override && firer && original)
- add_logs(firer, original, "fired at", src, " [get_area(src)]")
+ add_logs(firer, original, "fired at", src, "from [get_area_name(src, TRUE)]")
if(direct_target)
if(prehit(direct_target))
direct_target.bullet_act(src, def_zone)
diff --git a/code/modules/surgery/helpers.dm b/code/modules/surgery/helpers.dm
index 2470146532..d74d7b6691 100644
--- a/code/modules/surgery/helpers.dm
+++ b/code/modules/surgery/helpers.dm
@@ -68,7 +68,7 @@
user.visible_message("[user] drapes [I] over [M]'s [parse_zone(selected_zone)] to prepare for \an [procedure.name].", \
"You drape [I] over [M]'s [parse_zone(selected_zone)] to prepare for \an [procedure.name].")
- add_logs(user, M, "operated", addition="Operation type: [procedure.name], location: [selected_zone]")
+ add_logs(user, M, "operated on", null, "(OPERATION TYPE: [procedure.name]) (TARGET AREA: [selected_zone])")
else
to_chat(user, "You need to expose [M]'s [parse_zone(selected_zone)] first!")