cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 05:23:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Intent-based sink/reagent dispenser filling (#19647)

Browse Source 
Changes the sink/reagent dispenser (i.e. water tanks)' filling system to
be intent-based rather than opening a window every time. Should make
filling/emptying containers at least 10x quicker. :)

Use **HELP** intent to fill from a container. Any other intent (i.e.
HARM) will have you try to empty the container into the dispenser/sink
instead.

Additional examination info has been added to both the sink and reagent
dispensers to give such information.
This commit is contained in:
naut
2024-07-25 13:19:13 +00:00
committed by GitHub
parent dffebee0a0
commit b6853f24f8
3 changed files with 98 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_dispenser.dm
+17 -20
View File
@@ -1,7 +1,8 @@
/obj/structure/reagent_dispensers
name = "strange dispenser"
desc = "What the fuck is this?"
desc_info = "You can right-click this and change the amount transferred per use."
desc_info = "Use HELP intent to fill a container in your hand from this, and use any other intent to empty the container into this. \
You can right-click this and change the amount transferred per use."
icon = 'icons/obj/reagent_dispensers.dmi'
icon_state = "watertank"
density = 1
@@ -42,27 +43,23 @@
/obj/structure/reagent_dispensers/attackby(obj/item/attacking_item, mob/user)
var/obj/item/reagent_containers/RG = attacking_item
if (istype(RG) && RG.is_open_container())
var/atype
if(accept_any_reagent)
atype = alert(user, "Do you want to fill or empty \the [RG] at \the [src]?", "Fill or Empty", "Fill", "Empty", "Cancel")
else
atype = alert(user, "Do you want to fill \the [RG] at \the [src]?", "Fill", "Fill", "Cancel")
if (istype(RG))
if(!user.Adjacent(src)) return
if(RG.loc != user && !isrobot(user)) return
switch(atype)
if ("Fill")
RG.standard_dispenser_refill(user,src)
playsound(src.loc, 'sound/machines/reagent_dispense.ogg', 25, 1)
if ("Empty")
if(is_open_container())
RG.standard_pour_into(user,src)
else
to_chat(user,SPAN_NOTICE("The inlet cap on \the [src] is wrenched on tight!"))
return
if(!(RG.is_open_container()))
to_chat(usr, SPAN_WARNING("The [RG.name]'s lid is on!"))
return
if (usr.a_intent == I_HELP)
RG.standard_dispenser_refill(user,src)
playsound(src.loc, 'sound/machines/reagent_dispense.ogg', 25, 1)
else
if(!accept_any_reagent)
to_chat(user,SPAN_WARNING("You can't refill \the [src]."))
return
if(is_open_container())
RG.standard_pour_into(user,src)
else
to_chat(user,SPAN_NOTICE("The inlet cap on \the [src] is wrenched on tight!"))
if (attacking_item.iswrench())
if(use_check(user, USE_DISALLOW_SPECIALS))