From 4bc3a6737b643bf08708179a3509d1dc3c00909b Mon Sep 17 00:00:00 2001 From: Alan Date: Fri, 17 Jul 2026 02:23:04 -0400 Subject: [PATCH] Migrate latex balloon to the new attack chain. (#32219) * Migrate latex balloon to the new attack chain. * Apply suggestion from CRUNCH review Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Signed-off-by: Alan * Hopefully clear CRLF error? * Add fingerprint. --------- Signed-off-by: Alan Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> --- code/game/objects/items/latexballoon.dm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm index 65117269fe4..7af1f8375c5 100644 --- a/code/game/objects/items/latexballoon.dm +++ b/code/game/objects/items/latexballoon.dm @@ -10,6 +10,7 @@ cares_about_temperature = TRUE var/state var/datum/gas_mixture/air_contents = null + new_attack_chain = TRUE /obj/item/latexballon/Destroy() QDEL_NULL(air_contents) @@ -26,6 +27,7 @@ user.update_inv_l_hand() to_chat(user, SPAN_NOTICE("You blow up [src] with [tank].")) air_contents = tank.remove_air_volume(3) + add_fingerprint(user) /obj/item/latexballon/proc/burst() if(!air_contents || icon_state != "latexballon_blow") @@ -59,10 +61,13 @@ if(exposed_temperature > T0C+100) burst() -/obj/item/latexballon/attackby__legacy__attackchain(obj/item/W, mob/user, params) - if(istype(W, /obj/item/tank)) - var/obj/item/tank/T = W - blow(T, user) - return - if(W.sharp || W.get_heat() || is_pointed(W)) +/obj/item/latexballon/item_interaction(mob/living/user, obj/item/used, list/modifiers) + if(istype(used, /obj/item/tank)) + var/obj/item/tank/tank = used + blow(tank, user) + return ITEM_INTERACT_COMPLETE + + if(used.sharp || used.get_heat() || is_pointed(used)) burst() + + return ITEM_INTERACT_COMPLETE