cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

hyposprays can draw from containers (#95863)

Browse Source 
## About The Pull Request

hyposprays can now draw from other containers like a syringe/beaker

## Why It's Good For The Game

reduce inventory juggling, make the hypospray slightly less annoying to
use vs a syringe

## Changelog
🆑
qol: hyposprays can now draw from other reagent containers
/🆑
This commit is contained in:
TheRyeGuyWhoWillNowDie
2026-04-30 20:22:39 -05:00
committed by GitHub
parent f96284c8ba
commit 8055b4c9da
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/hypospray.dm
+25
View File
@@ -28,6 +28,31 @@
return NONE
return inject(interacting_with, user) ? ITEM_INTERACT_SUCCESS : ITEM_INTERACT_BLOCKING
/obj/item/reagent_containers/hypospray/interact_with_atom_secondary(atom/target, mob/living/user, list/modifiers)
if (!target.reagents)
return NONE
if(isliving(target))
to_chat(user, span_warning("[src] can't be used to draw blood!"))
return ITEM_INTERACT_BLOCKING
if(reagents.holder_full())
to_chat(user, span_notice("[src] is full."))
return ITEM_INTERACT_BLOCKING
if(!target.reagents.total_volume)
to_chat(user, span_warning("[target] is empty!"))
return ITEM_INTERACT_BLOCKING
if(!target.is_drawable(user))
to_chat(user, span_warning("You cannot directly remove reagents from [target]!"))
return ITEM_INTERACT_BLOCKING
var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this, transferred_by = user)
if(trans)
to_chat(user, span_notice("You fill [src] with [trans] units of the solution. It now contains [reagents.total_volume] units."))
return ITEM_INTERACT_SUCCESS
///Handles all injection checks, injection and logging.
/obj/item/reagent_containers/hypospray/proc/inject(mob/living/affected_mob, mob/user)
if(used_up)