Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Cyborgs can now open task dispenser UI #13844

Merged
JamieD1 merged 4 commits into from
Apr 30, 2022
Merged

Cyborgs can now open task dispenser UI #13844

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
53f40c8
Jank
JamieD1 Apr 22, 2022
f9f87ee
Should be better
JamieD1 Apr 25, 2022
46bbd21
Update code/game/objects/structures/tank_dispenser.dm
JamieD1 Apr 30, 2022
805fac4
Update code/game/objects/structures/tank_dispenser.dm
JamieD1 Apr 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions code/game/objects/structures/tank_dispenser.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@
if(5 to TANK_DISPENSER_CAPACITY)
add_overlay("plasma-5")

/obj/structure/tank_dispenser/attack_ai(mob/user)
. = ..()
return ui_interact(user)

/obj/structure/tank_dispenser/attackby(obj/item/I, mob/user, params)
var/full
if(istype(I, /obj/item/tank/internals/plasma))
Expand Down Expand Up @@ -90,13 +94,19 @@
if("plasma")
var/obj/item/tank/internals/plasma/tank = locate() in src
if(tank && Adjacent(usr))
usr.put_in_hands(tank)
if(iscyborg(usr))
usr.transferItemToLoc(tank, src.loc)
else
usr.put_in_hands(tank)
plasmatanks--
. = TRUE
if("oxygen")
var/obj/item/tank/internals/oxygen/tank = locate() in src
if(tank && Adjacent(usr))
usr.put_in_hands(tank)
if(iscyborg(usr))
usr.transferItemToLoc(tank,src.loc)
else
usr.put_in_hands(tank)
oxygentanks--
. = TRUE
update_icon()
Expand All @@ -110,4 +120,4 @@
new /obj/item/stack/sheet/metal (loc, 2)
qdel(src)

#undef TANK_DISPENSER_CAPACITY
#undef TANK_DISPENSER_CAPACITY