Merge remote-tracking branch 'upstream/dev' into 150907-UplinkUses

This commit is contained in:
PsiOmegaDelta
2015-09-09 08:18:26 +02:00
13 changed files with 41 additions and 28 deletions
@@ -100,6 +100,7 @@ var/datum/uplink/uplink = new()
/datum/uplink_item/proc/purchase_log(obj/item/device/uplink/U)
feedback_add_details("traitor_uplink_items_bought", "[src]")
log_and_message_admins("used \the [U.loc] to buy \a [src]")
U.purchase_log[src] = U.purchase_log[src] + 1
datum/uplink_item/dd_SortValue()
@@ -542,6 +543,7 @@ datum/uplink_item/dd_SortValue()
/datum/uplink_item/item/badassery/random_many/purchase_log(obj/item/device/uplink/U)
feedback_add_details("traitor_uplink_items_bought", "[src]")
log_and_message_admins("used \the [U.loc] to buy \a [src]")
/****************
* Surplus Crate *