Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

This commit is contained in:
LetterJay
2017-12-16 13:08:50 -06:00
committed by GitHub
parent 715960b324
commit 7af461539f
756 changed files with 10062 additions and 11368 deletions
+9 -5
View File
@@ -12,6 +12,8 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
circuit = /obj/item/circuitboard/machine/circuit_imprinter
var/efficiency_coeff
var/console_link = TRUE //can this link to a console?
var/requires_console = TRUE
var/datum/component/material_container/materials //Store for hyper speed!
@@ -30,11 +32,11 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
)
/obj/machinery/rnd/circuit_imprinter/Initialize()
var/datum/component/material_container/materials
materials = AddComponent(/datum/component/material_container, list(MAT_GLASS, MAT_GOLD, MAT_DIAMOND, MAT_METAL, MAT_BLUESPACE), 0,
FALSE, list(/obj/item/stack, /obj/item/ore/bluespace_crystal), CALLBACK(src, .proc/is_insertion_ready), CALLBACK(src, .proc/AfterMaterialInsert))
materials.precise_insertion = TRUE
create_reagents(0)
RefreshParts()
return ..()
/obj/machinery/rnd/circuit_imprinter/RefreshParts()
@@ -117,9 +119,11 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
return TRUE
/obj/machinery/rnd/circuit_imprinter/proc/do_print(path, list/matlist, notify_admins)
if(notify_admins && usr)
investigate_log("[key_name(usr)] built [path] at a circuit imprinter.", INVESTIGATE_RESEARCH)
message_admins("[ADMIN_LOOKUPFLW(usr)] has built [path] at a circuit imprinter.")
if(notify_admins)
if(usr)
usr.investigate_log("built [path] at a circuit imprinter.", INVESTIGATE_RESEARCH)
var/turf/T = get_turf(usr)
message_admins("[key_name(usr)][ADMIN_JMP(T)] has built [path] at a circuit imprinter at [COORD(usr)]")
var/obj/item/I = new path(get_turf(src))
I.materials = matlist.Copy()
SSblackbox.record_feedback("nested tally", "circuit_printed", 1, list("[type]", "[path]"))
SSblackbox.record_feedback("nested_tally", "circuit_printed", 1, list("[type]", "[path]"))