Skip to content

Commit

Permalink
Hypospray uprgrade (#13469)
Browse files Browse the repository at this point in the history
* Added drawing reagents from beakers/bottles to hypospray

* Proximity fix

---------

Co-authored-by: KIBORG04 <[email protected]>
  • Loading branch information
L4rever and KIBORG04 committed Aug 30, 2024
1 parent d1ded4c commit dce0d9f
Showing 1 changed file with 18 additions and 0 deletions.
18 changes: 18 additions & 0 deletions code/modules/reagents/reagent_containers/hypospray.dm
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,24 @@
/obj/item/weapon/reagent_containers/hypospray/cmo
list_reagents = list("tricordrazine" = 30)

/obj/item/weapon/reagent_containers/hypospray/cmo/afterattack(atom/target, mob/user, proximity, params)
if(!proximity)
return
if(istype(target, /obj/item/weapon/reagent_containers/glass))
if(reagents.total_volume >= reagents.maximum_volume)
to_chat(user, "<span class='warning'>The hypospray is full.</span>")
return
if(!target.reagents.total_volume)
to_chat(user, "<span class='warning'>[target] is empty.</span>")
return

if(!target.is_open_container())
to_chat(user, "<span class='warning'>Container is closed.</span>")
return

var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this)

to_chat(user, "<span class='notice'>You fill the syringe with [trans] units of the solution.</span>")

/obj/item/weapon/reagent_containers/hypospray/autoinjector
name = "inaprovaline autoinjector"
Expand Down

0 comments on commit dce0d9f

Please sign in to comment.