cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conflict Resolution

Browse Source
This commit is contained in:
Novacat
2019-04-18 13:44:38 -04:00
committed by GitHub
parent f986f56ec2
commit 69cc49c009
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/reagents/reagent_containers/syringes.dm
View File

@@ -173,13 +173,10 @@
var/warmup_time = 0 //None if we're using this on ourselves. var/warmup_time = 0 //None if we're using this on ourselves.
var/cycle_time = injtime*0.33 //33% of the time slept between 5u doses var/cycle_time = injtime*0.33 //33% of the time slept between 5u doses
<<<<<<< HEAD
=======
var/warmup_time = 0 //0 for containers var/warmup_time = 0 //0 for containers
if(ismob(target)) if(ismob(target))
warmup_time = cycle_time //If the target is another mob, this gets overwritten warmup_time = cycle_time //If the target is another mob, this gets overwritten
>>>>>>> 2af21a1... Merge pull request #6096 from Heroman3003/syringe-beaker-interactions
if(ismob(target) && target != user) if(ismob(target) && target != user)
warmup_time = injtime*0.66 //66% of the time is warmup warmup_time = injtime*0.66 //66% of the time is warmup
@@ -208,17 +205,6 @@
var/trans = 0 var/trans = 0
var/contained = reagentlist() var/contained = reagentlist()
<<<<<<< HEAD
while(reagents.total_volume)
if(ismob(target))
trans += reagents.trans_to_mob(target, amount_per_transfer_from_this, CHEM_BLOOD)
else
trans += reagents.trans_to_obj(target, amount_per_transfer_from_this)
update_icon()
if(!reagents.total_volume || !do_after(user,cycle_time,target))
break
=======
if(ismob(target)) if(ismob(target))
while(reagents.total_volume) while(reagents.total_volume)
trans += reagents.trans_to_mob(target, amount_per_transfer_from_this, CHEM_BLOOD) trans += reagents.trans_to_mob(target, amount_per_transfer_from_this, CHEM_BLOOD)
@@ -228,7 +214,6 @@
else else
trans += reagents.trans_to_obj(target, amount_per_transfer_from_this) trans += reagents.trans_to_obj(target, amount_per_transfer_from_this)
>>>>>>> 2af21a1... Merge pull request #6096 from Heroman3003/syringe-beaker-interactions
if (reagents.total_volume <= 0 && mode == SYRINGE_INJECT) if (reagents.total_volume <= 0 && mode == SYRINGE_INJECT)
mode = SYRINGE_DRAW mode = SYRINGE_DRAW
update_icon() update_icon()