From f986f56ec20567a05f99ea24914198471ab780c6 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Thu, 18 Apr 2019 09:26:34 -0800 Subject: [PATCH 1/4] Changes way syringes interact with containers --- .../reagents/reagent_containers/syringes.dm | 19 ++++++++++ .../changelogs/Heroman3003 - syringetweak.yml | 36 +++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 html/changelogs/Heroman3003 - syringetweak.yml diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 29544fa052f..f2104558d16 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -173,6 +173,13 @@ 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 +<<<<<<< HEAD +======= + var/warmup_time = 0 //0 for containers + if(ismob(target)) + 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) warmup_time = injtime*0.66 //66% of the time is warmup @@ -201,6 +208,7 @@ var/trans = 0 var/contained = reagentlist() +<<<<<<< HEAD while(reagents.total_volume) if(ismob(target)) trans += reagents.trans_to_mob(target, amount_per_transfer_from_this, CHEM_BLOOD) @@ -210,6 +218,17 @@ if(!reagents.total_volume || !do_after(user,cycle_time,target)) break +======= + if(ismob(target)) + while(reagents.total_volume) + trans += reagents.trans_to_mob(target, amount_per_transfer_from_this, CHEM_BLOOD) + update_icon() + if(!reagents.total_volume || !do_after(user,cycle_time,target)) + break + else + 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) mode = SYRINGE_DRAW update_icon() diff --git a/html/changelogs/Heroman3003 - syringetweak.yml b/html/changelogs/Heroman3003 - syringetweak.yml new file mode 100644 index 00000000000..4c0e623ee2a --- /dev/null +++ b/html/changelogs/Heroman3003 - syringetweak.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Heroman3003 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Syringes will now inject 5 units per injection and immedeately when injecting into reagent containers. Does not chage way injecting mobs work" \ No newline at end of file From 69cc49c009064a8a4c8180ac02b39d465c897d3c Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Thu, 18 Apr 2019 13:44:38 -0400 Subject: [PATCH 2/4] Conflict Resolution --- .../reagents/reagent_containers/syringes.dm | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index f2104558d16..b91e66e6dab 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -173,13 +173,10 @@ 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 -<<<<<<< HEAD -======= var/warmup_time = 0 //0 for containers if(ismob(target)) 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) warmup_time = injtime*0.66 //66% of the time is warmup @@ -208,17 +205,6 @@ var/trans = 0 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)) while(reagents.total_volume) trans += reagents.trans_to_mob(target, amount_per_transfer_from_this, CHEM_BLOOD) @@ -228,7 +214,6 @@ else 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) mode = SYRINGE_DRAW update_icon() From 8e93b70bb64f5516a0e7ae8e1bded9410b6a3afd Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Thu, 18 Apr 2019 13:51:08 -0400 Subject: [PATCH 3/4] Update syringes.dm --- code/modules/reagents/reagent_containers/syringes.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index b91e66e6dab..94170adcdaa 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -171,8 +171,6 @@ to_chat(user, "You cannot inject a robotic limb.") return - 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/warmup_time = 0 //0 for containers if(ismob(target)) warmup_time = cycle_time //If the target is another mob, this gets overwritten From aac3f800ba55fc1bf85861a58798f9bccfd9ff95 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Thu, 18 Apr 2019 13:53:34 -0400 Subject: [PATCH 4/4] Update syringes.dm --- code/modules/reagents/reagent_containers/syringes.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 94170adcdaa..092070e0a4c 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -171,6 +171,7 @@ to_chat(user, "You cannot inject a robotic limb.") return + var/cycle_time = injtime*0.33 //33% of the time slept between 5u doses var/warmup_time = 0 //0 for containers if(ismob(target)) warmup_time = cycle_time //If the target is another mob, this gets overwritten