mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-10 09:54:52 +00:00
Port.
This commit is contained in:
@@ -86,10 +86,6 @@
|
|||||||
if (CONFIG_GET(flag/log_attack))
|
if (CONFIG_GET(flag/log_attack))
|
||||||
WRITE_LOG(GLOB.world_attack_log, "ATTACK: [text]")
|
WRITE_LOG(GLOB.world_attack_log, "ATTACK: [text]")
|
||||||
|
|
||||||
/proc/log_wounded(text)
|
|
||||||
if (CONFIG_GET(flag/log_attack))
|
|
||||||
WRITE_LOG(GLOB.world_attack_log, "WOUND: [text]")
|
|
||||||
|
|
||||||
/proc/log_manifest(ckey, datum/mind/mind,mob/body, latejoin = FALSE)
|
/proc/log_manifest(ckey, datum/mind/mind,mob/body, latejoin = FALSE)
|
||||||
if (CONFIG_GET(flag/log_manifest))
|
if (CONFIG_GET(flag/log_manifest))
|
||||||
WRITE_LOG(GLOB.world_manifest_log, "[ckey] \\ [body.real_name] \\ [mind.assigned_role] \\ [mind.special_role ? mind.special_role : "NONE"] \\ [latejoin ? "LATEJOIN":"ROUNDSTART"]")
|
WRITE_LOG(GLOB.world_manifest_log, "[ckey] \\ [body.real_name] \\ [mind.assigned_role] \\ [mind.special_role ? mind.special_role : "NONE"] \\ [latejoin ? "LATEJOIN":"ROUNDSTART"]")
|
||||||
|
|||||||
@@ -508,7 +508,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
|
|||||||
if(LOG_EMOTE)
|
if(LOG_EMOTE)
|
||||||
colored_message = "(EMOTE) [colored_message]"
|
colored_message = "(EMOTE) [colored_message]"
|
||||||
|
|
||||||
var/list/timestamped_message = list("\[[TIME_STAMP("hh:mm:ss", FALSE)]\] [key_name(src)] [loc_name(src)]" = colored_message)
|
var/list/timestamped_message = list("\[[TIME_STAMP("hh:mm:ss", FALSE)]\] [key_name(src)] [loc_name(src)] (Event #[LAZYLEN(logging[smessage_type])])" = colored_message)
|
||||||
|
|
||||||
logging[smessage_type] += timestamped_message
|
logging[smessage_type] += timestamped_message
|
||||||
|
|
||||||
|
|||||||
@@ -394,11 +394,10 @@
|
|||||||
var/datum/wound/new_wound
|
var/datum/wound/new_wound
|
||||||
if(replaced_wound)
|
if(replaced_wound)
|
||||||
new_wound = replaced_wound.replace_wound(possible_wound)
|
new_wound = replaced_wound.replace_wound(possible_wound)
|
||||||
log_wound(owner, new_wound, damage, wound_bonus, bare_wound_bonus, base_roll) // dismembering wounds are logged in the apply_wound() for loss wounds since they delete themselves immediately, these will be immediately returned
|
|
||||||
else
|
else
|
||||||
new_wound = new possible_wound
|
new_wound = new possible_wound
|
||||||
new_wound.apply_wound(src)
|
new_wound.apply_wound(src)
|
||||||
log_wound(owner, new_wound, damage, wound_bonus, bare_wound_bonus, base_roll)
|
log_wound(owner, new_wound, damage, wound_bonus, bare_wound_bonus, base_roll) // dismembering wounds are logged in the apply_wound() for loss wounds since they delete themselves immediately, these will be immediately returned
|
||||||
return new_wound
|
return new_wound
|
||||||
|
|
||||||
// try forcing a specific wound, but only if there isn't already a wound of that severity or greater for that type on this bodypart
|
// try forcing a specific wound, but only if there isn't already a wound of that severity or greater for that type on this bodypart
|
||||||
|
|||||||
Reference in New Issue
Block a user