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

Merge pull request #579 from Citadel-Station-13/upstream-merge-26129

Browse Source 
[MIRROR] Unorphans the blackbox
This commit is contained in:
LetterJay
2017-05-02 05:13:49 -05:00
committed by GitHub
parent 4a6ffec412 a8e6de5795
commit 3b8484b52b
131 changed files with 2226 additions and 589 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/uplink/uplink_item.dm
+5 -5
View File
@@ -88,7 +88,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
/datum/uplink_item/proc/spawn_item(turf/loc, obj/item/device/uplink/U)
if(item)
feedback_add_details("traitor_uplink_items_bought", "[name]|[cost]")
SSblackbox.add_details("traitor_uplink_items_bought", "[name]|[cost]")
return new item(loc)
/datum/uplink_item/proc/buy(mob/user, obj/item/device/uplink/U)
@@ -1159,7 +1159,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
/datum/uplink_item/cyber_implants/spawn_item(turf/loc, obj/item/device/uplink/U)
if(item)
if(istype(item, /obj/item/organ))
feedback_add_details("traitor_uplink_items_bought", "[item]|[cost]")
SSblackbox.add_details("traitor_uplink_items_bought", "[item]|[cost]")
return new /obj/item/weapon/storage/box/cyber_implants(loc, item)
else
return ..()
@@ -1327,7 +1327,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
new I.item(C)
U.purchase_log += "<big>\icon[I.item]</big>"
feedback_add_details("traitor_uplink_items_bought", "[name]|[cost]")
SSblackbox.add_details("traitor_uplink_items_bought", "[name]|[cost]")
return C
/datum/uplink_item/badass/random
@@ -1353,6 +1353,6 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
var/datum/uplink_item/I = pick(possible_items)
U.telecrystals -= I.cost
U.spent_telecrystals += I.cost
feedback_add_details("traitor_uplink_items_bought","[name]|[I.cost]")
feedback_add_details("traitor_random_uplink_items_gotten","[I.name]")
SSblackbox.add_details("traitor_uplink_items_bought","[name]|[I.cost]")
SSblackbox.add_details("traitor_random_uplink_items_gotten","[I.name]")
return new I.item(loc)
code/modules/uplink/uplink_item.dm.rej
+17
View File
@@ -0,0 +1,17 @@
diff a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm (rejected hunks)
@@ -88,7 +88,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
/datum/uplink_item/proc/spawn_item(turf/loc, obj/item/device/uplink/U)
if(item)
- feedback_add_details("traitor_uplink_items_bought", "[item]")
+ SSblackbox.add_details("traitor_uplink_items_bought", "[item]")
return new item(loc)
/datum/uplink_item/proc/buy(mob/user, obj/item/device/uplink/U)
@@ -1351,5 +1351,5 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
var/datum/uplink_item/I = pick(possible_items)
U.telecrystals -= I.cost
U.spent_telecrystals += I.cost
- feedback_add_details("traitor_uplink_items_bought","RN")
+ SSblackbox.add_details("traitor_uplink_items_bought","RN")
return new I.item(loc)