From 53f40c87b55147a5dcfeaeb6091a3b3378cfa946 Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Fri, 22 Apr 2022 19:51:25 +0100 Subject: [PATCH 1/4] Jank --- code/game/objects/structures/tank_dispenser.dm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index ea5654f3cce1..e6bd0c3e85f0 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -50,6 +50,17 @@ oxygentanks++ else full = TRUE + else if(I.tool_behaviour == TOOL_CROWBAR) + var/obj/item/tank/internals/plasma/tank = locate() in src + if(tank && Adjacent(usr)) + plasmatanks-- + user.dropItemToGround(tank) + var/obj/item/tank/internals/oxygen/tank2 = locate() in src + if(tank && Adjacent(usr)) + oxygentanks-- + user.dropItemToGround(tank2) + to_chat(user, "You crowbar out an oxygen tank and a plasma tank.") + return else if(I.tool_behaviour == TOOL_WRENCH) default_unfasten_wrench(user, I, time = 20) return @@ -110,4 +121,4 @@ new /obj/item/stack/sheet/metal (loc, 2) qdel(src) -#undef TANK_DISPENSER_CAPACITY \ No newline at end of file +#undef TANK_DISPENSER_CAPACITY From f9f87ee0e8c5088e92fc9439b3883693bbb54616 Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Mon, 25 Apr 2022 23:22:16 +0100 Subject: [PATCH 2/4] Should be better --- .../game/objects/structures/tank_dispenser.dm | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index e6bd0c3e85f0..2f51f7f9093a 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -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)) @@ -50,17 +54,6 @@ oxygentanks++ else full = TRUE - else if(I.tool_behaviour == TOOL_CROWBAR) - var/obj/item/tank/internals/plasma/tank = locate() in src - if(tank && Adjacent(usr)) - plasmatanks-- - user.dropItemToGround(tank) - var/obj/item/tank/internals/oxygen/tank2 = locate() in src - if(tank && Adjacent(usr)) - oxygentanks-- - user.dropItemToGround(tank2) - to_chat(user, "You crowbar out an oxygen tank and a plasma tank.") - return else if(I.tool_behaviour == TOOL_WRENCH) default_unfasten_wrench(user, I, time = 20) return @@ -101,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.dropItemToGround(tank) + 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.dropItemToGround(tank) + else + usr.put_in_hands(tank) oxygentanks-- . = TRUE update_icon() From 46bbd21da73e2ace2da20ea3d07a0e309215fdba Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Sat, 30 Apr 2022 14:11:50 +0100 Subject: [PATCH 3/4] Update code/game/objects/structures/tank_dispenser.dm Co-authored-by: Byemoh --- code/game/objects/structures/tank_dispenser.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index 2f51f7f9093a..122989f53fa4 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -95,7 +95,7 @@ var/obj/item/tank/internals/plasma/tank = locate() in src if(tank && Adjacent(usr)) if(iscyborg(usr)) - usr.dropItemToGround(tank) + usr.transferItemToLoc(tank, src.loc) else usr.put_in_hands(tank) plasmatanks-- From 805fac4954410e5bde0208f7e4c95a7e8c353d16 Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Sat, 30 Apr 2022 14:11:55 +0100 Subject: [PATCH 4/4] Update code/game/objects/structures/tank_dispenser.dm Co-authored-by: Byemoh --- code/game/objects/structures/tank_dispenser.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index 122989f53fa4..e444e73b84b0 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -104,7 +104,7 @@ var/obj/item/tank/internals/oxygen/tank = locate() in src if(tank && Adjacent(usr)) if(iscyborg(usr)) - usr.dropItemToGround(tank) + usr.transferItemToLoc(tank,src.loc) else usr.put_in_hands(tank) oxygentanks--