From a4bd9e995124ffda3d9c0fce04e0421fc0da0598 Mon Sep 17 00:00:00 2001 From: Theos Date: Mon, 20 May 2024 05:00:22 -0400 Subject: [PATCH] You can now melee plunge people (#2978) ## About The Pull Request also replaces spans with span macros ## Why It's Good For The Game slap ## Changelog :cl: add: you can now attach plungers to people by hand, rather than throwing /:cl: Signed-off-by: Theos --- code/game/objects/structures/lavaland/geyser.dm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/lavaland/geyser.dm b/code/game/objects/structures/lavaland/geyser.dm index 224a11206d9f..af536d2e8c1c 100644 --- a/code/game/objects/structures/lavaland/geyser.dm +++ b/code/game/objects/structures/lavaland/geyser.dm @@ -35,7 +35,7 @@ to_chat(user, "The [name] is already active!") return - to_chat(user, "You start vigorously plunging [src]!") + to_chat(user, span_notice("You start vigorously plunging [src]!")) if(do_after(user, 50 * P.plunge_mod, target = src) && !activated) start_chemming() @@ -61,6 +61,15 @@ var/plunge_mod = 1 //time*plunge_mod = total time we take to plunge an object + +/obj/item/plunger/afterattack(atom/target, mob/user, proximity_flag, click_parameters) + . = ..() + if(!. && user.zone_selected == BODY_ZONE_HEAD && iscarbon(target)) + var/mob/living/carbon/H = target + if(!H.wear_mask) + H.equip_to_slot_if_possible(src, ITEM_SLOT_MASK) + H.visible_message(span_warning("[user] slaps [src] onto [H]'s face!"), span_warning("[user] slaps [src] onto your face!"), span_hear("You hear violent plumbing.")) + /obj/item/plunger/attack_obj(obj/O, mob/living/user) if(!O.plunger_act(src, user)) return ..() @@ -73,5 +82,5 @@ var/mob/living/carbon/H = hit_atom if(!H.wear_mask) H.equip_to_slot_if_possible(src, ITEM_SLOT_MASK) - H.visible_message("The plunger slams into [H]'s face!", "The plunger suctions to your face!") + H.visible_message(span_warning("[src] slams into [H]'s face!"), span_warning("[src] suctions to your face!"), span_hear("You hear violent plumbing."))