From 6dc2d8f0eb3598a52c20216bdb6774cda42ab497 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 24 Dec 2017 18:02:13 -0500 Subject: [PATCH] Update reagents.dm --- code/modules/integrated_electronics/subtypes/reagents.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/integrated_electronics/subtypes/reagents.dm b/code/modules/integrated_electronics/subtypes/reagents.dm index 6f527c8149..0c66c3a943 100644 --- a/code/modules/integrated_electronics/subtypes/reagents.dm +++ b/code/modules/integrated_electronics/subtypes/reagents.dm @@ -296,12 +296,7 @@ activators = list("push ref" = IC_PINTYPE_PULSE_OUT) spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH -<<<<<<< HEAD -/obj/item/integrated_circuit/reagent/storage/interact(mob/user) -======= - /obj/item/integrated_circuit/reagent/storage/do_work() ->>>>>>> 95b9e19... [READY]Circuitry upgrades (#33579) set_pin_data(IC_OUTPUT, 2, WEAKREF(src)) push_data()