cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changes way syringes interact with containers

Browse Source
This commit is contained in:
Atermonera
2019-04-18 09:26:34 -08:00
committed by VirgoBot
parent f878127d21
commit f986f56ec2
2 changed files with 55 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -173,6 +173,13 @@
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
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) 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
@@ -201,6 +208,7 @@
var/trans = 0 var/trans = 0
var/contained = reagentlist() var/contained = reagentlist()
<<<<<<< HEAD
while(reagents.total_volume) while(reagents.total_volume)
if(ismob(target)) if(ismob(target))
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)
@@ -210,6 +218,17 @@
if(!reagents.total_volume || !do_after(user,cycle_time,target)) if(!reagents.total_volume || !do_after(user,cycle_time,target))
break 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) if (reagents.total_volume <= 0 && mode == SYRINGE_INJECT)
mode = SYRINGE_DRAW mode = SYRINGE_DRAW
update_icon() update_icon()

36
html/changelogs/Heroman3003 - syringetweak.yml Normal file
View File

@@ -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"