Merge pull request #36617 from ShizCalev/logging-cleanup

Improves some logging legibility
This commit is contained in:
vuonojenmustaturska
2018-03-28 12:17:32 -05:00
committed by CitadelStationBot
parent 77f40b6be9
commit adf4786470
8 changed files with 16 additions and 16 deletions
+6 -4
View File
@@ -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 = "<font color='red'>has [what_done] [starget] with [sobject][addition] [hp] [sattackloc]</font>"
var/message = "<font color='red'>has [what_done] [starget][(sobject||addition) ? " with ":""][sobject][addition][hp][sattackloc]</font>"
user.log_message(message, INDIVIDUAL_ATTACK_LOG)
if(is_mob_target)
var/message = "<font color='orange'>has been [what_done] by [ssource] with [sobject][addition] [hp] [sattackloc]</font>"
var/message = "<font color='orange'>has been [what_done] by [ssource][(sobject||addition) ? " with ":""][sobject][addition][hp][sattackloc]</font>"
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)