Skip to content

Commit

Permalink
You can now melee plunge people (#2978)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## 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:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

Signed-off-by: Theos <[email protected]>
  • Loading branch information
SomeguyManperson authored May 20, 2024
1 parent 2c973c3 commit 4346e75
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions code/game/objects/structures/lavaland/geyser.dm
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
to_chat(user, "<span class'warning'>The [name] is already active!</span>")
return

to_chat(user, "<span class='notice'>You start vigorously plunging [src]!</span>")
to_chat(user, span_notice("You start vigorously plunging [src]!"))
if(do_after(user, 50 * P.plunge_mod, target = src) && !activated)
start_chemming()

Expand All @@ -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 ..()
Expand All @@ -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("<span class='warning'>The plunger slams into [H]'s face!</span>", "<span class='warning'>The plunger suctions to your face!</span>")
H.visible_message(span_warning("[src] slams into [H]'s face!"), span_warning("[src] suctions to your face!"), span_hear("You hear violent plumbing."))

0 comments on commit 4346e75

Please sign in to comment.