Changes a Chemistry Transfer Proc

This commit is contained in:
Fox-McCloud
2015-09-22 05:56:49 -04:00
parent 7da9249aef
commit 71001cc5ea
6 changed files with 9 additions and 35 deletions
-26
View File
@@ -118,32 +118,6 @@ var/const/INGEST = 2
src.handle_reactions()
return amount
/datum/reagents/proc/trans_to_ingest(var/obj/target, var/amount=1, var/multiplier=1, var/preserve_data=1)//For items ingested. A delay is added between ingestion and addition of the reagents
if (!target )
return
if (!target.reagents || src.total_volume<=0)
return
var/obj/item/weapon/reagent_containers/glass/beaker/noreact/B = new /obj/item/weapon/reagent_containers/glass/beaker/noreact //temporary holder
B.volume = 1000
var/datum/reagents/BR = B.reagents
var/datum/reagents/R = target.reagents
amount = min(min(amount, src.total_volume), R.maximum_volume-R.total_volume)
src.trans_to(B, amount)
spawn(-1)
src = null // Survive through deletion of the reagent holder
sleep(100)
if(!target)
return
BR.trans_to(target, BR.total_volume)
qdel(B)
return amount
/datum/reagents/proc/copy_to(var/obj/target, var/amount=1, var/multiplier=1, var/preserve_data=1, var/safety = 0)
if(!target)
return
@@ -36,7 +36,7 @@
if(reagents.total_volume)
reagents.reaction(M, INGEST)
spawn(0)
reagents.trans_to_ingest(M, 10)
reagents.trans_to(M, 10)
playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
return 1
@@ -38,7 +38,7 @@
if(reagents.total_volume)
reagents.reaction(M, INGEST)
spawn(0)
reagents.trans_to_ingest(M, gulp_size)
reagents.trans_to(M, gulp_size)
playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
return 1
@@ -66,7 +66,7 @@
if(reagents.total_volume)
reagents.reaction(M, INGEST)
spawn(0)
reagents.trans_to_ingest(M, gulp_size)
reagents.trans_to(M, gulp_size)
if(isrobot(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell
var/mob/living/silicon/robot/bro = user
@@ -108,9 +108,9 @@
var/temp_bitesize = max(reagents.total_volume /2, bitesize)
reagents.trans_to(M, temp_bitesize)
*/
reagents.trans_to_ingest(M, bitesize)
reagents.trans_to(M, bitesize)
else
reagents.trans_to_ingest(M, reagents.total_volume)
reagents.trans_to(M, reagents.total_volume)
bitecount++
On_Consume(M)
return 1
@@ -33,7 +33,7 @@
if(reagents.total_volume)
reagents.reaction(M, apply_type)
spawn(0)
reagents.trans_to_ingest(M, reagents.total_volume*transfer_efficiency)
reagents.trans_to(M, reagents.total_volume*transfer_efficiency)
qdel(src)
else
qdel(src)
@@ -67,7 +67,7 @@
if(reagents.total_volume)
reagents.reaction(M, apply_type)
spawn(0)
reagents.trans_to_ingest(M, reagents.total_volume*transfer_efficiency)
reagents.trans_to(M, reagents.total_volume*transfer_efficiency)
qdel(src)
else
qdel(src)