diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
index e6edc3fb141..4642f002cbc 100644
--- a/code/__HELPERS/mobs.dm
+++ b/code/__HELPERS/mobs.dm
@@ -128,7 +128,7 @@ Proc for attack log creation, because really why not
6 is additional information, anything that needs to be added
*/
-/proc/add_logs(mob/user, mob/target, what_done, var/admin=1, var/object=null, var/addition=null)
+/proc/add_logs(mob/user, mob/target, what_done, var/object=null, var/addition=null)
var/newhealthtxt = ""
if (target && isliving(target))
var/mob/living/L = target
@@ -137,5 +137,4 @@ Proc for attack log creation, because really why not
user.attack_log += text("\[[time_stamp()]\] Has [what_done] [target ? "[target.name][(ismob(target) && target.ckey) ? "([target.ckey])" : ""]" : "NON-EXISTANT SUBJECT"][object ? " with [object]" : " "][addition][newhealthtxt]")
if(target && ismob(target))
target.attack_log += text("\[[time_stamp()]\] Has been [what_done] by [user ? "[user.name][(ismob(user) && user.ckey) ? "([user.ckey])" : ""]" : "NON-EXISTANT SUBJECT"][object ? " with [object]" : " "][addition][newhealthtxt]")
- if(admin)
- log_attack("[user ? "[user.name][(ismob(user) && user.ckey) ? "([user.ckey])" : ""]" : "NON-EXISTANT SUBJECT"] [what_done] [target ? "[target.name][(ismob(target) && target.ckey)? "([target.ckey])" : ""]" : "NON-EXISTANT SUBJECT"][object ? " with [object]" : " "][addition][newhealthtxt]")
+ log_attack("[user ? "[user.name][(ismob(user) && user.ckey) ? "([user.ckey])" : ""]" : "NON-EXISTANT SUBJECT"] [what_done] [target ? "[target.name][(ismob(target) && target.ckey)? "([target.ckey])" : ""]" : "NON-EXISTANT SUBJECT"][object ? " with [object]" : " "][addition][newhealthtxt]")
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index d30bba2b562..172b4bd63ae 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -76,11 +76,12 @@
user.lastattacked = M
M.lastattacker = user
- add_logs(user, M, "attacked", object=src.name, addition="(INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])")
-
//spawn(1800) // this wont work right
// M.lastattacker = null
/////////////////////////
M.attacked_by(src, user, def_zone)
+
+ add_logs(user, M, "attacked", src.name, "(INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])")
add_fingerprint(user)
+
return 1
diff --git a/code/datums/martial.dm b/code/datums/martial.dm
index 76bcd9e6d5e..0e86b40443d 100644
--- a/code/datums/martial.dm
+++ b/code/datums/martial.dm
@@ -25,7 +25,7 @@
return
/datum/martial_art/proc/basic_hit(var/mob/living/carbon/human/A,var/mob/living/carbon/human/D)
- add_logs(A, D, "punched")
+
A.do_attack_animation(D)
var/damage = rand(0,9)
@@ -44,6 +44,7 @@
else
playsound(D.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
D.visible_message("[A] has attempted to [atk_verb] [D]!")
+ add_logs(A, D, "attempted to [atk_verb]")
return 0
var/obj/item/organ/limb/affecting = D.get_organ(ran_zone(A.zone_sel.selecting))
@@ -58,6 +59,9 @@
"[A] has [atk_verb]ed [D]!")
D.apply_damage(damage, BRUTE, affecting, armor_block)
+
+ add_logs(A, D, "punched")
+
if((D.stat != DEAD) && damage >= 9)
D.visible_message("[A] has weakened [D]!!", \
"[A] has weakened [D]!")
@@ -95,7 +99,7 @@
return 1
/datum/martial_art/boxing/harm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
- add_logs(A, D, "punched")
+
A.do_attack_animation(D)
var/atk_verb = pick("left hook","right hook","straight punch")
@@ -109,6 +113,7 @@
else
playsound(D.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
D.visible_message("[A] has attempted to hit [D] with a [atk_verb]!")
+ add_logs(A, D, "attempted to hit", atk_verb)
return 0
@@ -122,6 +127,7 @@
"[A] has hit [D] with a [atk_verb]!")
D.apply_damage(damage, STAMINA, affecting, armor_block)
+ add_logs(A, D, "punched")
if(D.getStaminaLoss() > 50)
var/knockout_prob = D.getStaminaLoss() + rand(-15,15)
if((D.stat != DEAD) && prob(knockout_prob))
@@ -151,13 +157,15 @@
/datum/martial_art/wrestling/proc/Suplex(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
- add_logs(A, D, "suplexed")
+
D.visible_message("[A] suplexes [D]!", \
"[A] suplexes [D]!")
D.forceMove(A.loc)
var/armor_block = D.run_armor_check(null, "melee")
D.apply_damage(30, BRUTE, null, armor_block)
D.apply_effect(6, WEAKEN, armor_block)
+ add_logs(A, D, "suplexed")
+
A.SpinAnimation(10,1)
D.SpinAnimation(10,1)
diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm
index a25186734b5..a51b0eadb08 100644
--- a/code/datums/wires/airlock.dm
+++ b/code/datums/wires/airlock.dm
@@ -97,7 +97,7 @@ var/const/AIRLOCK_WIRE_LIGHT = 2048
//Cutting this wire electrifies the door, so that the next person to touch the door without insulated gloves gets electrocuted.
if(A.secondsElectrified != -1)
A.shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])")
- add_logs(usr, A, "electrified", admin=0, addition="at [A.x],[A.y],[A.z]")
+ add_logs(usr, A, "electrified", addition="at [A.x],[A.y],[A.z]")
A.secondsElectrified = -1
else
if(A.secondsElectrified == -1)
@@ -164,7 +164,7 @@ var/const/AIRLOCK_WIRE_LIGHT = 2048
//one wire for electrifying the door. Sending a pulse through this electrifies the door for 30 seconds.
if(A.secondsElectrified==0)
A.shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])")
- add_logs(usr, A, "electrified", admin=0, addition="at [A.x],[A.y],[A.z]")
+ add_logs(usr, A, "electrified", addition="at [A.x],[A.y],[A.z]")
A.secondsElectrified = 30
spawn(10)
if(A)
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 52ac867c334..83a6d9f268b 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -78,7 +78,7 @@
/atom/proc/attack_hulk(mob/living/carbon/human/hulk, do_attack_animation = 0)
if(do_attack_animation)
hulk.changeNext_move(CLICK_CD_MELEE)
- add_logs(hulk, src, "punched", "hulk powers", admin=0)
+ add_logs(hulk, src, "punched", "hulk powers")
hulk.do_attack_animation(src)
return
diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm
index d8cf4981f48..e6ade92a27f 100644
--- a/code/game/gamemodes/changeling/powers/tiny_prick.dm
+++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm
@@ -54,7 +54,6 @@
user << "We stealthily sting [target.name]."
if(target.mind && target.mind.changeling)
target << "You feel a tiny prick."
- add_logs(user, target, "unsuccessfully stung")
return 1
@@ -88,7 +87,7 @@
return 1
/obj/effect/proc_holder/changeling/sting/transformation/sting_action(var/mob/user, var/mob/target)
- add_logs(user, target, "stung", object="transformation sting", addition=" new identity is [selected_dna.real_name]")
+ add_logs(user, target, "stung", "transformation sting", " new identity is [selected_dna.real_name]")
var/datum/dna/NewDNA = selected_dna
if(ismonkey(target))
user << "Our genes cry out as we sting [target.name]!"
@@ -174,7 +173,7 @@
return user.mind.changeling.can_absorb_dna(user, target)
/obj/effect/proc_holder/changeling/sting/extract_dna/sting_action(var/mob/user, var/mob/living/carbon/human/target)
- add_logs(user, target, "stung", object="extraction sting")
+ add_logs(user, target, "stung", "extraction sting")
if(!(user.mind.changeling.has_dna(target.dna)))
user.mind.changeling.absorb_dna(target, user)
feedback_add_details("changeling_powers","ED")
@@ -189,7 +188,7 @@
dna_cost = 2
/obj/effect/proc_holder/changeling/sting/mute/sting_action(var/mob/user, var/mob/living/carbon/target)
- add_logs(user, target, "stung", object="mute sting")
+ add_logs(user, target, "stung", "mute sting")
target.silent += 30
feedback_add_details("changeling_powers","MS")
return 1
@@ -203,7 +202,7 @@
dna_cost = 1
/obj/effect/proc_holder/changeling/sting/blind/sting_action(var/mob/user, var/mob/target)
- add_logs(user, target, "stung", object="blind sting")
+ add_logs(user, target, "stung", "blind sting")
target << "Your eyes burn horrifically!"
target.disabilities |= NEARSIGHT
target.eye_blind = 20
@@ -220,7 +219,7 @@
dna_cost = 1
/obj/effect/proc_holder/changeling/sting/LSD/sting_action(var/mob/user, var/mob/living/carbon/target)
- add_logs(user, target, "stung", object="LSD sting")
+ add_logs(user, target, "stung", "LSD sting")
spawn(rand(300,600))
if(target)
target.hallucination = max(400, target.hallucination)
@@ -236,7 +235,7 @@
dna_cost = 2
/obj/effect/proc_holder/changeling/sting/cryo/sting_action(var/mob/user, var/mob/target)
- add_logs(user, target, "stung", object="cryo sting")
+ add_logs(user, target, "stung", "cryo sting")
if(target.reagents)
target.reagents.add_reagent("frostoil", 30)
feedback_add_details("changeling_powers","CS")
diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm
index 7f671c28610..500f4d27b6a 100644
--- a/code/game/gamemodes/cult/ritual.dm
+++ b/code/game/gamemodes/cult/ritual.dm
@@ -490,13 +490,13 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
// usr << browse(null, "window=tank")
/obj/item/weapon/tome/attack(mob/living/M as mob, mob/living/user as mob)
- add_logs(user, M, "smacked", object=src)
if(istype(M,/mob/dead))
M.invisibility = 0
user.visible_message( \
"[user] drags the ghost to our plane of reality!", \
"You drag the ghost to our plane of reality!" \
)
+ add_logs(user, M, "smacked", src)
return
if(!istype(M))
return
@@ -508,10 +508,12 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
var/holy2unholy = M.reagents.get_reagent_amount("holywater")
M.reagents.del_reagent("holywater")
M.reagents.add_reagent("unholywater",holy2unholy)
+ add_logs(user, M, "smacked", src, " removing the holy water from them")
return
M.take_organ_damage(0,rand(5,20)) //really lucky - 5 hits for a crit
M.visible_message("[user] beats [M] with the arcane tome!", \
"[user] beats you with the tome, and you feel a searing heat inside you!")
+ add_logs(user, M, "smacked", src)
/obj/item/weapon/tome/attack_self(mob/living/user as mob)
diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm
index 8a5b0de73ce..ce8e20d8009 100644
--- a/code/game/gamemodes/wizard/soulstone.dm
+++ b/code/game/gamemodes/wizard/soulstone.dm
@@ -29,7 +29,7 @@
return ..()
if(istype(M, /mob/living/carbon/human/dummy))
return..()
- add_logs(user, M, "captured [M.name]'s soul", object=src)
+ add_logs(user, M, "captured [M.name]'s soul", src)
transfer_soul("VICTIM", M, user)
return
diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm
index 8c6d3893202..f9543249cfa 100644
--- a/code/game/machinery/bots/bots.dm
+++ b/code/game/machinery/bots/bots.dm
@@ -167,7 +167,7 @@
M.changeNext_move(CLICK_CD_MELEE)
health -= M.melee_damage_upper
visible_message("[M] has [M.attacktext] [src]!")
- add_logs(M, src, "attacked", admin=0)
+ add_logs(M, src, "attacked")
if(prob(10))
new /obj/effect/decal/cleanable/oil(loc)
healthcheck()
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index f5fdbb61eee..5f9c99c7c9a 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -831,7 +831,7 @@ About the new airlock wires panel:
usr << text("The door is already electrified. You can't re-electrify it while it's already electrified.
\n")
else
shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])")
- add_logs(usr, src, "electrified", admin=0, addition="at [x],[y],[z]")
+ add_logs(usr, src, "electrified", addition="at [x],[y],[z]")
src.secondsElectrified = 30
spawn(10)
while (src.secondsElectrified>0)
@@ -850,7 +850,7 @@ About the new airlock wires panel:
usr << text("The door is already electrified. You can't re-electrify it while it's already electrified.
\n")
else
shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])")
- add_logs(usr, src, "electrified", admin=0, addition="at [x],[y],[z]")
+ add_logs(usr, src, "electrified", addition="at [x],[y],[z]")
src.secondsElectrified = -1
if (8) // Not in order >.>
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index ebf7b9005aa..68c7098d581 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -315,7 +315,7 @@
return
if(!(stat & BROKEN))
visible_message("[M] [M.attacktext] [src]!")
- add_logs(M, src, "attacked", admin=0)
+ add_logs(M, src, "attacked")
take_damage(M.melee_damage_upper)
else
M << "That object is useless to you."
@@ -327,7 +327,7 @@
if(!(stat & BROKEN))
playsound(src.loc, 'sound/weapons/slash.ogg', 25, 1, -1)
visible_message("[M] has slashed at [src]!")
- add_logs(M, src, "attacked", admin=0)
+ add_logs(M, src, "attacked")
take_damage(15)
else
M << "\green That object is useless to you."
diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm
index b1c356a0982..35c4bb5a968 100644
--- a/code/game/machinery/turrets.dm
+++ b/code/game/machinery/turrets.dm
@@ -314,7 +314,7 @@
if(M.melee_damage_upper == 0) return
if(!(stat & BROKEN))
visible_message("[M] [M.attacktext] [src]!")
- add_logs(M, src, "attacked", admin=0)
+ add_logs(M, src, "attacked")
//src.attack_log += text("\[[time_stamp()]\] was attacked by [M.name] ([M.ckey])")
src.health -= M.melee_damage_upper
if (src.health <= 0)
diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm
index ea79a05656b..3367d6024a5 100644
--- a/code/game/mecha/equipment/tools/medical_tools.dm
+++ b/code/game/mecha/equipment/tools/medical_tools.dm
@@ -196,7 +196,7 @@
if(to_inject && occupant.reagents.get_reagent_amount(R.id) + to_inject <= inject_amount*2)
occupant_message("Injecting [occupant] with [to_inject] units of [R.name].")
log_message("Injecting [occupant] with [to_inject] units of [R.name].")
- add_logs(chassis.occupant, occupant, "injected", object="[name] ([R] - [to_inject] units)")
+ add_logs(chassis.occupant, occupant, "injected", "[name] ([R] - [to_inject] units)")
SG.reagents.trans_id_to(occupant,R.id,to_inject)
update_equip_info()
return
@@ -328,7 +328,6 @@
if(M)
var/R
mechsyringe.visible_message(" [M] was hit by the syringe!")
- add_logs(originaloccupant, M, "shot", object="syringegun")
if(M.can_inject(null, 1))
if(mechsyringe.reagents)
for(var/datum/reagent/A in mechsyringe.reagents.reagent_list)
@@ -338,6 +337,7 @@
mechsyringe.icon = initial(mechsyringe.icon)
mechsyringe.reagents.trans_to(M, mechsyringe.reagents.total_volume)
M.take_organ_damage(2)
+ add_logs(originaloccupant, M, "shot", "syringegun")
break
else if(mechsyringe.loc == trg)
mechsyringe.icon_state = initial(mechsyringe.icon_state)
diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm
index 7b9a4867f03..481eb0921f8 100644
--- a/code/game/mecha/equipment/tools/tools.dm
+++ b/code/game/mecha/equipment/tools/tools.dm
@@ -66,7 +66,7 @@
target.visible_message("[chassis] squeezes [target].", \
"[chassis] squeezes [target].",\
"You hear something crack.")
- add_logs(chassis.occupant, M, "attacked", object="[name]", addition="(INTENT: [uppertext(chassis.occupant.a_intent)]) (DAMTYE: [uppertext(damtype)])")
+ add_logs(chassis.occupant, M, "attacked", "[name]", "(INTENT: [uppertext(chassis.occupant.a_intent)]) (DAMTYE: [uppertext(damtype)])")
else
step_away(M,chassis)
occupant_message("You push [target] out of the way.")
@@ -151,7 +151,6 @@
/obj/item/mecha_parts/mecha_equipment/tool/drill/proc/drill_mob(mob/living/target, mob/user, var/drill_damage=80)
target.visible_message("[chassis] drills [target] with [src].", \
"[chassis] drills [target] with [src].")
- add_logs(user, target, "attacked", object="[name]", addition="(INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])")
if(ishuman(target))
var/mob/living/carbon/human/H = target
var/obj/item/organ/limb/affecting = H.get_organ("chest")
@@ -162,6 +161,7 @@
if(target)
target.Paralyse(10)
target.updatehealth()
+ add_logs(user, target, "attacked", "[name]", "(INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])")
/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill
name = "diamond-tipped exosuit drill"
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index 0414658025d..70e92ebede8 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -128,7 +128,7 @@
src.life -= 10
if(ismob(A))
var/mob/M = A
- add_logs(firer, M, "shot", object="[src]")
+ add_logs(firer, M, "shot", "[src]")
if(life <= 0)
qdel(src)
return
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 48f34a6faaf..8814dc6c64e 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -325,7 +325,7 @@
return
visible_message("[M.name] has hit [src].")
take_damage(M.force, damtype)
- add_logs(M.occupant, src, "attacked", object=M, addition="(INTENT: [uppertext(M.occupant.a_intent)]) (DAMTYPE: [uppertext(M.damtype)])")
+ add_logs(M.occupant, src, "attacked", M, "(INTENT: [uppertext(M.occupant.a_intent)]) (DAMTYPE: [uppertext(M.damtype)])")
return
/obj/mecha/proc/range_action(atom/target)
@@ -546,12 +546,12 @@
src.take_damage(damage)
src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
visible_message("[user] [user.attacktext] [src]!")
- add_logs(user, src, "attacked", admin=0)
+ add_logs(user, src, "attacked")
else
src.log_append_to_last("Armor saved.")
playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1)
visible_message("The [user] rebounds off [src.name]'s armor!")
- add_logs(user, src, "attacked", admin=0)
+ add_logs(user, src, "attacked")
return
/obj/mecha/attack_tk()
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 0ab94fcd813..de1e1162a4a 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -372,8 +372,6 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s
user << "You cannot locate any organic eyes on this brain!"
return
- add_logs(user, M, "attacked", object="[src.name]", addition="(INTENT: [uppertext(user.a_intent)])")
-
src.add_fingerprint(user)
if(M != user)
@@ -393,6 +391,8 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s
else
M.take_organ_damage(7)
+ add_logs(user, M, "attacked", "[src.name]", "(INTENT: [uppertext(user.a_intent)])")
+
M.eye_blurry += rand(3,4)
M.eye_stat += rand(2,4)
if (M.eye_stat >= 10)
diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm
index b8e8857f92e..f153f50e84d 100644
--- a/code/game/objects/items/devices/aicard.dm
+++ b/code/game/objects/items/devices/aicard.dm
@@ -18,7 +18,7 @@
var/mob/living/silicon/ai/AI = locate(/mob/living/silicon/ai) in src
if(AI) //AI is on the card, implies user wants to upload it.
target.transfer_ai(AI_TRANS_FROM_CARD, user, AI, src)
- add_logs(user, AI, "carded", object="[name]")
+ add_logs(user, AI, "carded", src)
else //No AI on the card, therefore the user wants to download one.
target.transfer_ai(AI_TRANS_TO_CARD, user, null, src)
update_state() //Whatever happened, update the card's state (icon, name) to match.
diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm
index 8c26b6a7b14..1a7dadc9083 100644
--- a/code/game/objects/items/devices/flash.dm
+++ b/code/game/objects/items/devices/flash.dm
@@ -58,7 +58,7 @@
/obj/item/device/flash/proc/flash_carbon(var/mob/living/carbon/M, var/mob/user = null, var/power = 5, targeted = 1)
- add_logs(user, M, "flashed", object="[src.name]")
+ add_logs(user, M, "flashed", src)
if(user && targeted)
if(M.weakeyes)
M.Weaken(3) //quick weaken bypasses eye protection but has no eye flash
@@ -89,7 +89,7 @@
return 1
else if(issilicon(M))
- add_logs(user, M, "flashed", object="[src.name]")
+ add_logs(user, M, "flashed", src)
flick("e_flash", M.flash)
M.Weaken(rand(5,10))
user.visible_message("[user] overloads [M]'s sensors with the flash!", "You overload [M]'s sensors with the flash!")
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index bbceb535d4d..d8dce87fbab 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -313,7 +313,7 @@ obj/item/device/flashlight/lamp/bananalamp
"[user] blinks \the [src] at \the [A].")
if(ismob(A))
var/mob/M = A
- add_logs(user, M, "attacked", object="EMP-light")
+ add_logs(user, M, "attacked", "EMP-light")
user << "\The [src] now has [emp_cur_charges] charge\s."
A.emp_act(1)
else
diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm
index 8ea2723517d..4c805b9f8c4 100644
--- a/code/game/objects/items/devices/laserpointer.dm
+++ b/code/game/objects/items/devices/laserpointer.dm
@@ -98,7 +98,7 @@
if(iscarbon(target))
var/mob/living/carbon/C = target
if(user.zone_sel.selecting == "eyes")
- add_logs(user, C, "shone in the eyes", object="laser pointer")
+ add_logs(user, C, "shone in the eyes", src)
var/severity = 1
if(prob(33))
@@ -123,7 +123,7 @@
S.Weaken(rand(5,10))
S << "Your sensors were overloaded by a laser!"
outmsg = "You overload [S] by shining [src] at their sensors."
- add_logs(user, S, "shone in the sensors", object="laser pointer")
+ add_logs(user, S, "shone in the sensors", src)
else
outmsg = "You fail to overload [S] by shining [src] at their sensors!"
@@ -133,7 +133,7 @@
if(prob(effectchance * diode.rating))
C.emp_act(1)
outmsg = "You hit the lens of [C] with [src], temporarily disabling the camera!"
- add_logs(user, C, "EMPed", object="laser pointer")
+ add_logs(user, C, "EMPed", src)
else
outmsg = "You miss the lens of [C] with [src]!"
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index a558faff8a7..95d237b8618 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -37,7 +37,7 @@ effective or pretty fucking useless.
user << "The mind batterer has been burnt out!"
return
- add_logs(user, null, "knocked down people in the area", admin=0, object="[src]")
+ add_logs(user, null, "knocked down people in the area", src)
for(var/mob/living/carbon/human/M in orange(10, user))
spawn()
@@ -88,7 +88,7 @@ effective or pretty fucking useless.
/obj/item/device/rad_laser/attack(mob/living/M as mob, mob/living/user as mob)
if(!used)
- add_logs(user, M, "irradiated", object="[src.name]")
+ add_logs(user, M, "irradiated", src)
user.visible_message("[user] has analyzed [M]'s vitals.")
var/cooldown = round(max(100,(((intensity*8)-(wavelength/2))+(intensity*2))*10))
used = 1
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index 7e38de5879d..231970a65e8 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -22,7 +22,7 @@
if (O.client)
O.show_message("[user] has prodded [M] with an electrically-charged arm!", 1,
"You hear someone fall.", 2)
- add_logs(user, M, "stunned", object="[src.name]", addition="(INTENT: [uppertext(user.a_intent)])")
+ add_logs(user, M, "stunned", src, "(INTENT: [uppertext(user.a_intent)])")
/obj/item/borg/overdrive
name = "overdrive"
diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index 02114500111..5404fa7eda1 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -352,7 +352,7 @@
H.updatehealth() //forces health update before next life tick
playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
H.emote("gasp")
- add_logs(user, M, "stunned", object="defibrillator")
+ add_logs(user, M, "stunned", defib)
defib.deductcharge(revivecost)
cooldown = 1
busy = 0
@@ -386,7 +386,7 @@
if(!HU.stat)
HU.visible_message("[M] thrashes wildly, clutching at their chest!", "You feel a horrible agony in your chest!")
HU.apply_damage(50, BURN, "chest")
- add_logs(user, M, "overloaded the heart of", object="defibrillator")
+ add_logs(user, M, "overloaded the heart of", defib)
M.Weaken(5)
M.Jitter(100)
defib.deductcharge(revivecost)
@@ -454,7 +454,7 @@
if(tplus > tloss)
H.setBrainLoss( max(0, min(99, ((tlimit - tplus) / tlimit * 100))))
defib.deductcharge(revivecost)
- add_logs(user, M, "revived", object="defibrillator")
+ add_logs(user, M, "revived", defib)
else
if (H.suiciding || (NOCLONE in H.mutations))
user.visible_message("[defib] buzzes: Resuscitation failed - Recovery of patient impossible. Further attempts futile.")
diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm
index 49df5b897c7..aef3ae6a3bc 100644
--- a/code/game/objects/items/weapons/dna_injector.dm
+++ b/code/game/objects/items/weapons/dna_injector.dm
@@ -52,7 +52,7 @@
var/mob/living/carbon/human/humantarget = target
if (!humantarget.can_inject(user, 1))
return
- add_logs(user, target, "attempted to inject", object="[name]")
+ add_logs(user, target, "attempted to inject", src)
if(target != user)
target.visible_message("[user] is trying to inject [target] with [src]!", "[user] is trying to inject [target] with [src]!")
@@ -63,7 +63,7 @@
else
user << "You inject yourself with [src]."
- add_logs(user, target, "injected", object="[name]")
+ add_logs(user, target, "injected", src)
inject(target, user) //Now we actually do the heavy lifting.
qdel(src)
diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm
index a2f552024ac..df54a0073ee 100644
--- a/code/game/objects/items/weapons/explosives.dm
+++ b/code/game/objects/items/weapons/explosives.dm
@@ -75,15 +75,8 @@
src.target = target
loc = null
- if (ismob(target))
- add_logs(user, target, "planted [name] on")
- user.visible_message("[user.name] finished planting an explosive on [target.name].", "You finish planting an explosive on [target.name].")
- message_admins("[key_name_admin(user)](?) (FLW) planted [src.name] on [key_name_admin(target)](?) (FLW) with [timer] second fuse",0,1)
- log_game("[key_name(user)] planted [src.name] on [key_name(target)] with [timer] second fuse")
-
- else
- message_admins("[key_name_admin(user)](?) (FLW) planted [src.name] on [target.name] at ([target.x],[target.y],[target.z] - JMP) with [timer] second fuse",0,1)
- log_game("[key_name(user)] planted [src.name] on [target.name] at ([target.x],[target.y],[target.z]) with [timer] second fuse")
+ message_admins("[key_name_admin(user)](?) (FLW) planted [src.name] on [target.name] at ([target.x],[target.y],[target.z] - JMP) with [timer] second fuse",0,1)
+ log_game("[key_name(user)] planted [src.name] on [target.name] at ([target.x],[target.y],[target.z]) with [timer] second fuse")
target.overlays += image_overlay
user << "You plant the bomb. Timer counting down from [timer]."
diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm
index c1f0a4adb63..d70303c180e 100644
--- a/code/game/objects/items/weapons/flamethrower.dm
+++ b/code/game/objects/items/weapons/flamethrower.dm
@@ -65,7 +65,7 @@
var/turf/target_turf = get_turf(target)
if(target_turf)
var/turflist = getline(user, target_turf)
- add_logs(user, target, "flamethrowered", admin=0, addition="at [target.x],[target.y],[target.z]")
+ add_logs(user, target, "flamethrowered", src, "at [target.x],[target.y],[target.z]")
flame_turf(turflist)
/obj/item/weapon/flamethrower/attackby(obj/item/W as obj, mob/user as mob, params)
diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm
index 41a00b05019..cb54e6386b1 100644
--- a/code/game/objects/items/weapons/implants/implanter.dm
+++ b/code/game/objects/items/weapons/implants/implanter.dm
@@ -31,7 +31,7 @@
if(M.head && (M.head.flags & THICKMATERIAL))
return
M.visible_message("[user] has implanted [M].", "[user] implants you with the implant.")
- add_logs(user, M, "implanted", object="[name]")
+ add_logs(user, M, "implanted", src)
user << "You implant the implant into [M]."
if(imp.implanted(M))
imp.loc = M
diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm
index fa346334278..2d1f97216ee 100644
--- a/code/game/objects/items/weapons/melee/misc.dm
+++ b/code/game/objects/items/weapons/melee/misc.dm
@@ -57,7 +57,7 @@
if(cooldown <= 0)
playsound(get_turf(src), 'sound/effects/woodhit.ogg', 75, 1, -1)
target.Weaken(3)
- add_logs(user, target, "stunned", object="classic baton")
+ add_logs(user, target, "stunned", src)
src.add_fingerprint(user)
target.visible_message("[user] has knocked down [target] with \the [src]!", \
"[user] has knocked down [target] with \the [src]!")
diff --git a/code/game/objects/items/weapons/pneumaticCannon.dm b/code/game/objects/items/weapons/pneumaticCannon.dm
index 56e9da2f999..50f7c01fdaf 100644
--- a/code/game/objects/items/weapons/pneumaticCannon.dm
+++ b/code/game/objects/items/weapons/pneumaticCannon.dm
@@ -84,7 +84,7 @@
return
user.visible_message("[user] fires \the [src]!", \
"You fire \the [src]!")
- add_logs(user, target, "fired at", object="pneumatic cannon")
+ add_logs(user, target, "fired at", src)
playsound(src.loc, 'sound/weapons/sonic_jackhammer.ogg', (50 * pressureSetting), 1)
for(var/obj/item/ITD in loadedItems) //Item To Discharge
spawn(0)
diff --git a/code/game/objects/items/weapons/storage/book.dm b/code/game/objects/items/weapons/storage/book.dm
index dcb45f1fe5d..0ec158a7f37 100644
--- a/code/game/objects/items/weapons/storage/book.dm
+++ b/code/game/objects/items/weapons/storage/book.dm
@@ -130,7 +130,7 @@ var/global/list/bibleitemstates = list("bible", "koran", "scrapbook", "bible", "
if(user.mind && (user.mind.assigned_role == "Chaplain"))
chaplain = 1
- add_logs(user, M, "attacked", object="[src.name]")
+
if (!user.IsAdvancedToolUser())
user << "You don't have the dexterity to do this!"
@@ -183,6 +183,7 @@ var/global/list/bibleitemstates = list("bible", "koran", "scrapbook", "bible", "
M.visible_message("[user] beats [M] over the head with [src]!", \
"[user] beats [M] over the head with [src]!")
playsound(src.loc, "punch", 25, 1, -1)
+ add_logs(user, M, "attacked", src)
else if(M.stat == 2)
M.visible_message("[user] smacks [M]'s lifeless corpse with [src].")
diff --git a/code/game/objects/structures/spirit_board.dm b/code/game/objects/structures/spirit_board.dm
index cda3b1d422a..22d2333b092 100644
--- a/code/game/objects/structures/spirit_board.dm
+++ b/code/game/objects/structures/spirit_board.dm
@@ -33,7 +33,7 @@
notify_ghosts("Someone has begun playing with a [src.name] in [get_area(src)]!")
planchette = input("Choose the letter.", "Seance!") in list("A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z")
- add_logs(M, src, "picked a letter on", addition="which was \"[planchette]\".")
+ add_logs(M, src, "picked a letter on", " which was \"[planchette]\".")
cooldown = world.time
lastuser = M.ckey
diff --git a/code/modules/food&drinks/drinks/drinks.dm b/code/modules/food&drinks/drinks/drinks.dm
index dbf1634e576..a99e0c6a6b0 100644
--- a/code/modules/food&drinks/drinks/drinks.dm
+++ b/code/modules/food&drinks/drinks/drinks.dm
@@ -43,7 +43,7 @@
if(!reagents || !reagents.total_volume)
return // The drink might be empty after the delay, such as by spam-feeding
M.visible_message("[user] feeds the contents of [src] to [M].", "[user] feeds the contents of [src] to [M].")
- add_logs(user, M, "fed", object="[reagentlist(src)]")
+ add_logs(user, M, "fed", reagentlist(src))
var/fraction = min(gulp_size/reagents.total_volume, 1)
reagents.reaction(M, INGEST, fraction)
reagents.trans_to(M, gulp_size)
diff --git a/code/modules/food&drinks/drinks/drinks/bottle.dm b/code/modules/food&drinks/drinks/drinks/bottle.dm
index 366339e6be9..7b806842aab 100644
--- a/code/modules/food&drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food&drinks/drinks/drinks/bottle.dm
@@ -97,7 +97,7 @@
"[target] hits \himself with a bottle of [src.name][head_attack_message]!")
//Attack logs
- add_logs(user, target, "attacked", object="bottle")
+ add_logs(user, target, "attacked", src)
//The reagents in the bottle splash all over the target, thanks for the idea Nodrak
if(src.reagents)
diff --git a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm
index c6e12e99980..440c8224b86 100644
--- a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm
@@ -612,7 +612,7 @@
if(user.a_intent == "harm" && ismob(target) && target.reagents && reagents.total_volume)
target.visible_message("[user] splashes the contents of [src] onto [target]!", \
"[user] splashes the contents of [src] onto [target]!")
- add_logs(user, target, "splashed", object="[src]")
+ add_logs(user, target, "splashed", src)
reagents.reaction(target, TOUCH)
reagents.clear_reagents()
return
diff --git a/code/modules/food&drinks/food/condiment.dm b/code/modules/food&drinks/food/condiment.dm
index a20b7e078cd..de98ecda990 100644
--- a/code/modules/food&drinks/food/condiment.dm
+++ b/code/modules/food&drinks/food/condiment.dm
@@ -47,7 +47,7 @@
if(!reagents || !reagents.total_volume)
return // The condiment might be empty after the delay.
user.visible_message("[user] feeds [M] from [src].")
- add_logs(user, M, "fed", object="[reagentlist(src)]")
+ add_logs(user, M, "fed", reagentlist(src))
var/fraction = min(10/reagents.total_volume, 1)
reagents.reaction(M, INGEST, fraction)
diff --git a/code/modules/food&drinks/food/snacks.dm b/code/modules/food&drinks/food/snacks.dm
index 7f8d06dd703..1ea60e2531c 100644
--- a/code/modules/food&drinks/food/snacks.dm
+++ b/code/modules/food&drinks/food/snacks.dm
@@ -92,7 +92,7 @@
if(!do_mob(user, M))
return
- add_logs(user, M, "fed", object="[reagentlist(src)]")
+ add_logs(user, M, "fed", reagentlist(src))
M.visible_message("[user] forces [M] to eat [src].", \
"[user] feeds [M] to eat [src].")
diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm
index f0ca0943691..3a925b8e4c4 100644
--- a/code/modules/hydroponics/growninedible.dm
+++ b/code/modules/hydroponics/growninedible.dm
@@ -243,7 +243,7 @@
if(!..()) return
if(istype(M, /mob/living))
M << "You are stunned by the powerful acid of the Deathnettle!"
- add_logs(user, M, "attacked", object= "[src.name]")
+ add_logs(user, M, "attacked", src)
M.eye_blurry += force/7
if(prob(20))
diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index a6fe0b360b5..8cce76294b6 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -561,7 +561,7 @@
playsound(src,'sound/weapons/resonator_blast.ogg',50,1)
if(creator)
for(var/mob/living/L in src.loc)
- add_logs(creator, L, "used a resonator field on", object="resonator")
+ add_logs(creator, L, "used a resonator field on", "resonator")
L << "The [src.name] ruptured with you in it!"
L.adjustBruteLoss(resonance_damage)
else
diff --git a/code/modules/mob/living/carbon/alien/alien_defense.dm b/code/modules/mob/living/carbon/alien/alien_defense.dm
index 51e086ae669..73c9fbe573c 100644
--- a/code/modules/mob/living/carbon/alien/alien_defense.dm
+++ b/code/modules/mob/living/carbon/alien/alien_defense.dm
@@ -36,7 +36,7 @@ In all, this is a lot like the monkey code. /N
visible_message("[M.name] bites [src]!", \
"[M.name] bites [src]!")
adjustBruteLoss(damage)
- add_logs(M, src, "attacked", admin=0)
+ add_logs(M, src, "attacked")
updatehealth()
else
M << "[name] is too injured for that."
@@ -82,5 +82,5 @@ In all, this is a lot like the monkey code. /N
if(M.is_adult)
damage = rand(10, 40)
adjustBruteLoss(damage)
- add_logs(M, src, "attacked", admin=0)
+ add_logs(M, src, "attacked")
updatehealth()
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index 558604dad94..cc695822032 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -60,7 +60,7 @@
visible_message("[M] has weakened [src]!", \
"[M] has weakened [src]!")
adjustBruteLoss(damage)
- add_logs(M, src, "attacked", admin=0)
+ add_logs(M, src, "attacked")
updatehealth()
else
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
@@ -71,7 +71,7 @@
if (prob(5))
Paralyse(2)
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
- add_logs(M, src, "pushed", admin=0)
+ add_logs(M, src, "pushed")
visible_message("[M] has pushed down [src]!", \
"[M] has pushed down [src]!")
else
diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm
index 096f1e353a8..74c786143a7 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva.dm
@@ -57,7 +57,7 @@
var/damage = rand(1, 9)
if (prob(90))
playsound(loc, "punch", 25, 1, -1)
- add_logs(M, src, "attacked", admin=0)
+ add_logs(M, src, "attacked")
visible_message("[M] has kicked [src]!", \
"[M] has kicked [src]!")
if ((stat != DEAD) && (damage > 4.9))
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 4fc86b644a4..0f282ea5811 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -262,7 +262,7 @@
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, M, "thrown", admin=0, addition="from [start_T_descriptor] with the target [end_T_descriptor]")
+ add_logs(src, M, "thrown", addition="from [start_T_descriptor] with the target [end_T_descriptor]")
if(!item) return //Grab processing has a chance of returning null
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 20d8b20e620..8392a006fba 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -746,7 +746,6 @@
return 0
if(C.cpr_time < world.time + 30)
- add_logs(src, C, "CPRed")
visible_message("[src] is trying to perform CPR on [C.name]!", \
"You try to perform CPR on [C.name]... Hold still!")
if(!do_mob(src, C))
@@ -760,7 +759,7 @@
C.updatehealth()
src.visible_message("[src] performs CPR on [C.name]!", "You perform CPR on [C.name].")
C << "You feel a breath of fresh air enter your lungs... It feels good..."
-
+ add_logs(src, C, "CPRed")
/mob/living/carbon/human/generateStaticOverlay()
var/image/staticOverlay = image(icon('icons/effects/effects.dmi', "static"), loc = src)
diff --git a/code/modules/mob/living/carbon/human/human_attackalien.dm b/code/modules/mob/living/carbon/human/human_attackalien.dm
index ed9c6ef91c1..31c04c06b2f 100644
--- a/code/modules/mob/living/carbon/human/human_attackalien.dm
+++ b/code/modules/mob/living/carbon/human/human_attackalien.dm
@@ -25,7 +25,7 @@
visible_message("[M] has wounded [src]!", \
"[M] has wounded [src]!")
apply_effect(4, WEAKEN, armor_block)
- add_logs(M, src, "attacked", admin=0)
+ add_logs(M, src, "attacked")
updatehealth()
if(M.a_intent == "disarm")
@@ -33,7 +33,7 @@
if (randn <= 80)
playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
Weaken(5)
- add_logs(M, src, "tackled", admin=0)
+ add_logs(M, src, "tackled")
visible_message("[M] has tackled down [src]!", \
"[M] has tackled down [src]!")
else
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 7feb6af38b3..7e143f1baa0 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -450,7 +450,7 @@ emp_act
visible_message("[M.name] has hit [src]!", \
"[M.name] has hit [src]!")
- add_logs(M.occupant, src, "attacked", object=M, addition="(INTENT: [uppertext(M.occupant.a_intent)]) (DAMTYPE: [uppertext(M.damtype)])")
+ add_logs(M.occupant, src, "attacked", M, "(INTENT: [uppertext(M.occupant.a_intent)]) (DAMTYPE: [uppertext(M.damtype)])")
else
..()
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 5f9ea9ff9d8..33961e8fd0b 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -880,7 +880,6 @@
if(attacker_style && attacker_style.harm_act(M,H))
return 1
else
- add_logs(M, H, "punched")
M.do_attack_animation(H)
var/atk_verb = "punch"
@@ -916,6 +915,7 @@
"[M] has [atk_verb]ed [H]!")
H.apply_damage(damage, BRUTE, affecting, armor_block)
+ add_logs(M, H, "punched")
if((H.stat != DEAD) && damage >= 9)
H.visible_message("[M] has weakened [H]!", \
"[M] has weakened [H]!")
diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index 394a92d9437..da95fd25fdf 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -90,7 +90,7 @@
"[M] has knocked out [name]!")
return
adjustBruteLoss(damage)
- add_logs(M, src, "attacked", admin=0)
+ add_logs(M, src, "attacked")
updatehealth()
else
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
@@ -128,10 +128,11 @@
else
visible_message("[M] has slashed [name]!", \
"[M] has slashed [name]!")
- add_logs(M, src, "attacked", admin=0)
+
if (stat != DEAD)
adjustBruteLoss(damage)
updatehealth()
+ add_logs(M, src, "attacked")
else
playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
visible_message("[M] has attempted to lunge at [name]!", \
@@ -147,7 +148,7 @@
if(drop_item())
visible_message("[M] has disarmed [name]!", \
"[M] has disarmed [name]!")
- add_logs(M, src, "disarmed", admin=0)
+ add_logs(M, src, "disarmed")
updatehealth()
return
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 48b78d3fb65..7975b9a7789 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -725,7 +725,7 @@ Sorry Giacom. Please don't be mad :(
if(what && Adjacent(who))
src.unEquip(what)
who.equip_to_slot_if_possible(what, where, 0, 1)
- add_logs(src, who, "equipped", object=what)
+ add_logs(src, who, "equipped", what)
/mob/living/singularity_act()
var/gain = 20
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index d050141cd8d..e41881fa2f8 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -73,7 +73,7 @@
apply_damage(I.throwforce, dtype, zone, armor, I)
if(thrower)
- add_logs(thrower, src, "hit", object="[I]")
+ add_logs(thrower, src, "hit", I)
/mob/living/mech_melee_attack(obj/mecha/M)
if(M.occupant.a_intent == "harm")
@@ -94,10 +94,10 @@
updatehealth()
visible_message("[M.name] has hit [src]!", \
"[M.name] has hit [src]!")
- add_logs(M.occupant, src, "attacked", object=M, addition="(INTENT: [uppertext(M.occupant.a_intent)]) (DAMTYPE: [uppertext(M.damtype)])")
+ add_logs(M.occupant, src, "attacked", M, "(INTENT: [uppertext(M.occupant.a_intent)]) (DAMTYPE: [uppertext(M.damtype)])")
else
step_away(src,M)
- add_logs(M.occupant, src, "pushed", object=M, admin=0)
+ add_logs(M.occupant, src, "pushed", M)
visible_message("[M] pushes [src] out of the way.")
return
@@ -195,7 +195,7 @@
return // can't attack while eating!
if (stat != DEAD)
- add_logs(M, src, "attacked", admin=0)
+ add_logs(M, src, "attacked")
M.do_attack_animation(src)
visible_message("The [M.name] glomps [src]!", \
"The [M.name] glomps [src]!")
@@ -211,7 +211,7 @@
M.do_attack_animation(src)
visible_message("\The [M] [M.attacktext] [src]!", \
"\The [M] [M.attacktext] [src]!")
- add_logs(M, src, "attacked", admin=0)
+ add_logs(M, src, "attacked")
return 1
@@ -230,7 +230,7 @@
return 0
M.do_attack_animation(src)
if (prob(75))
- add_logs(M, src, "attacked", admin=0)
+ add_logs(M, src, "attacked")
playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
visible_message("[M.name] bites [src]!", \
"[M.name] bites [src]!")
@@ -250,7 +250,7 @@
else
L.do_attack_animation(src)
if(prob(90))
- add_logs(L, src, "attacked", admin=0)
+ add_logs(L, src, "attacked")
visible_message("[L.name] bites [src]!", \
"[L.name] bites [src]!")
playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index c1030d43b39..6409b17e945 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -624,7 +624,7 @@
step(src,get_dir(M,src))
spawn(5)
step(src,get_dir(M,src))
- add_logs(M, src, "pushed", admin=0)
+ add_logs(M, src, "pushed")
playsound(loc, 'sound/weapons/pierce.ogg', 50, 1, -1)
visible_message("[M] has forced back [src]!", \
"[M] has forced back [src]!")
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 82a7a0be1e9..dc549c835d1 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -363,13 +363,13 @@
if(..()) //if harm or disarm intent
var/damage = rand(10, 20)
if (prob(90))
- add_logs(M, src, "attacked", admin=0)
+ add_logs(M, src, "attacked")
playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1)
visible_message("[M] has slashed at [src]!", \
"[M] has slashed at [src]!")
if(prob(8))
flick("noise", flash)
- add_logs(M, src, "attacked", admin=0)
+ add_logs(M, src, "attacked")
adjustBruteLoss(damage)
updatehealth()
else
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 3bb4f016578..f20d4c04b8b 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -279,7 +279,7 @@
visible_message("[M] [response_harm] [src]!")
playsound(loc, "punch", 25, 1, -1)
attack_threshold_check(harm_intent_damage)
- add_logs(M, src, "attacked", admin=1)
+ add_logs(M, src, "attacked")
updatehealth()
return 1
@@ -302,14 +302,14 @@
playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
visible_message("[M] [response_disarm] [name]!", \
"[M] [response_disarm] [name]!")
- add_logs(M, src, "disarmed", admin=1)
+ add_logs(M, src, "disarmed")
else
var/damage = rand(15, 30)
visible_message("[M] has slashed at [src]!", \
"[M] has slashed at [src]!")
playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
- add_logs(M, src, "attacked", admin=1)
attack_threshold_check(damage)
+ add_logs(M, src, "attacked")
return 1
/mob/living/simple_animal/attack_larva(mob/living/carbon/alien/larva/L as mob)
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index da920274364..dc20fd83997 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -54,7 +54,7 @@
M << "You feel a tiny prick!"
. = 1
- add_logs(user, M, "stabbed", object="[name]")
+ add_logs(user, M, "stabbed", src)
/*
* Sleepypens
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 8fc1a4622f9..7854bbf8e7c 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -80,9 +80,9 @@
for(var/datum/reagent/R in reagents.reagent_list)
reagent_note += R.id + " ("
reagent_note += num2text(R.volume) + ") "
- add_logs(firer, L, "shot", object="[src]", addition=reagent_note)
L.on_hit(type)
+ add_logs(firer, L, "shot", src, reagent_note)
return L.apply_effects(stun, weaken, paralyze, irradiate, stutter, slur, eyeblur, drowsy, blocked, stamina, jitter)
/obj/item/projectile/proc/vol_by_damage()
diff --git a/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm
index 0637664da4d..f0e16a9924c 100644
--- a/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm
@@ -640,7 +640,7 @@
dead_mob_list -= M
living_mob_list |= list(M)
M.emote("gasp")
- add_logs(M, M, "revived", object="strange reagent")
+ add_logs(M, M, "revived", src)
..()
return
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 6037ebf02d8..b8edfbae4a6 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -96,9 +96,10 @@
R += A.id + " ("
R += num2text(A.volume) + "),"
- if(thrower)
- add_logs(thrower, M, "splashed", object="[R]")
+
reagents.reaction(target, TOUCH)
+ if(thrower)
+ add_logs(thrower, M, "splashed", R)
else if((!target.density || target.throwpass) && thrower && thrower.mind && thrower.mind.assigned_role == "Bartender")
visible_message("[src] lands onto the [target.name] without spilling a single drop.")
diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm
index 7e5a3d234fd..a2e689cc81f 100644
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -62,7 +62,7 @@
for(var/datum/reagent/A in src.reagents.reagent_list)
R += A.id + " ("
R += num2text(A.volume) + "),"
- add_logs(user, M, "squirted", object="[R]")
+ add_logs(user, M, "squirted", R)
trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
user << "You transfer [trans] unit\s of the solution."
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 87825de16b6..149a5c5c365 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -52,8 +52,9 @@
for(var/datum/reagent/A in reagents.reagent_list)
R += A.id + " ("
R += num2text(A.volume) + "),"
- add_logs(user, M, "splashed", object="[R]")
+
reagents.reaction(M, TOUCH)
+ add_logs(user, M, "splashed", R)
reagents.clear_reagents()
return
@@ -72,7 +73,7 @@
if(!do_mob(user, M)) return
if(!reagents.total_volume) return // The drink might be empty after the delay, such as by spam-feeding
M.visible_message("[user] feeds something to [M].", "[user] feeds something to you.")
- add_logs(user, M, "fed", object="[reagentlist(src)]")
+ add_logs(user, M, "fed", reagentlist(src))
if(reagents.total_volume)
reagents.reaction(M, INGEST)
spawn(5)
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 1a86c6f9ed7..4ab2c5b5268 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -37,7 +37,7 @@
var/contained = english_list(injected)
- add_logs(user, M, "injected", object="[src.name]", addition="([contained])")
+ add_logs(user, M, "injected", src, "([contained])")
/obj/item/weapon/reagent_containers/hypospray/CMO
list_reagents = list("omnizine" = 30)
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index b675f86913b..2a99e768c75 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -40,7 +40,7 @@
user.unEquip(src) //icon update
- add_logs(user, M, "fed", object="[reagentlist(src)]")
+ add_logs(user, M, "fed", reagentlist(src))
loc = M //Put the pill inside the mob. This fixes the issue where the pill appears to drop to the ground after someone eats it.
if(reagents.total_volume)
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index a0559bb4707..b3374dceb06 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -149,7 +149,7 @@
rinject += R.name
var/contained = english_list(rinject)
var/mob/M = target
- add_logs(user, M, "injected", object="[src.name]", addition="which had [contained]")
+ add_logs(user, M, "injected", src, addition="which had [contained]")
var/fraction = min(amount_per_transfer_from_this/reagents.total_volume, 1)
reagents.reaction(target, INGEST, fraction)
if(ismob(target) && target == user)