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

Update reagents.dm

Browse Source
This commit is contained in:
deathride58
2017-12-24 18:02:13 -05:00
committed by GitHub
parent a893559c6b
commit 6dc2d8f0eb
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/integrated_electronics/subtypes/reagents.dm
-5
View File
@@ -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()