Skip to content

Commit

Permalink
Fixes item attack logs (#11114)
Browse files Browse the repository at this point in the history
* Update atoms.dm

* Log the type as well since names are decieving

* Update code/game/atoms.dm

* Update atoms.dm
  • Loading branch information
PowerfulBacon authored Jun 27, 2024
1 parent ebd3bbe commit 43fa540
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions code/game/atoms.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1609,6 +1609,7 @@
user = A_ref.resolve()
var/ssource = key_name(user)
var/starget = key_name(target)
var/datum/tool_atom = object

var/mob/living/living_target = target
var/hp = istype(living_target) ? " (NEWHP: [living_target.health]) " : ""
Expand All @@ -1618,8 +1619,8 @@
stam = "(STAM: [C.getStaminaLoss()]) "

var/sobject = ""
if(object && !isitem(object))
sobject = " with [object]"
if(object)
sobject = " with [object][(istype(tool_atom) ? " ([tool_atom.type])" : "")]"
var/saddition = ""
if(addition)
saddition = " [addition]"
Expand All @@ -1631,7 +1632,6 @@

if (important && isliving(user) && isliving(target))
var/mob/living/living_user = user
var/datum/tool_atom = object
SScombat_logging.log_combat(living_user, living_target, istype(tool_atom) ? tool_atom.type : object)

if(user != target)
Expand Down

0 comments on commit 43fa540

Please sign in to comment.