shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merges #4011

Browse Source
This commit is contained in:
deathride58
2017-11-21 15:07:31 -05:00
parent 0feca054da
commit aedf16a76e
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/controllers/subsystem/blackbox.dm
View File

@@ -154,6 +154,7 @@ feedback data can be recorded in 5 formats:
used to track the number of occurances of structured semi-relational values i.e. the results of arcade machines
similar to running total, but related values are nested in a multi-dimensional array built
the final element in the data list is used as the tracking key, all prior elements are used for nesting
all data list elements must be strings
further calls to the same key will:
add or subtract from the saved value of the data key if it already exists in the same multi-dimensional position
append the key and it's value if it doesn't exist

2
code/modules/mob/living/carbon/human/human_defense.dm
View File

@@ -162,7 +162,7 @@
affecting = get_bodypart(ran_zone(user.zone_selected))
var/target_area = parse_zone(check_zone(user.zone_selected)) //our intended target
SSblackbox.record_feedback("nested tally", "item_used_for_combat", 1, list(I.force, I.type))
SSblackbox.record_feedback("nested tally", "item_used_for_combat", 1, list("[I.force]", "[I.type]"))
SSblackbox.record_feedback("tally", "zone_targeted", 1, target_area)
// the attacked_by code varies among species