Skip to content

Commit

Permalink
You can plunge geysers with a normal plunger and removes reinforced p…
Browse files Browse the repository at this point in the history
…lungers (#2864)

<!-- 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
You can plunger and activate geysers with a standard plunger. 

Also removes reinforced plungers since they don't do anything anymore.
and adds a normal plunger to the Schmiedeberg in it's place.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
The reinforced plunger was effectively made unobtainable with #2617
removing it from the vendor stock, aside from the one ship it's
currently mapped on (Schmiedeberg), with no other available sources.
Geysers are basically inaccessible to the vast majority of players as a
result.

Even then, having the reinforced plunger only obtainable in the medical
vendor gated it behind a small subset of ships, and meant it was almost
never seen anyways.

This will make geysers usable again and the increased accessibility
hopefully means it will actually be interacted with.


<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
tweak: Geysers can now be plunged with a normal plunger.
tweak: Schmiedeberg's reinforced plunger replaced with a normal plunger
del: Reinforced plungers
imagedel: Reinforced plunger sprites
/: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. -->
  • Loading branch information
Gristlebee authored Mar 30, 2024
1 parent 1139b94 commit 777b3d9
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 19 deletions.
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_schmiedeberg.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1295,7 +1295,7 @@
"rC" = (
/obj/machinery/light/small/directional/south,
/obj/structure/closet/crate/secure/loot,
/obj/item/plunger/reinforced,
/obj/item/plunger,
/obj/effect/turf_decal/box/white,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt,
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/medipen_refiller.dm
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
return
..()

/obj/machinery/medipen_refiller/plunger_act(obj/item/plunger/P, mob/living/user, reinforced)
/obj/machinery/medipen_refiller/plunger_act(obj/item/plunger/P, mob/living/user)
to_chat(user, "<span class='notice'>You start furiously plunging [name].</span>")
if(do_after(user, 30, target = src))
to_chat(user, "<span class='notice'>You finish plunging the [name].</span>")
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/objs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@
return TRUE
return ..()

/obj/proc/plunger_act(obj/item/plunger/P, mob/living/user, reinforced)
/obj/proc/plunger_act(obj/item/plunger/P, mob/living/user)
return

// Should move all contained objects to it's location.
Expand Down
17 changes: 2 additions & 15 deletions code/game/objects/structures/lavaland/geyser.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@
if(activated && reagents.total_volume <= reagents.maximum_volume) //this is also evaluated in add_reagent, but from my understanding proc calls are expensive
reagents.add_reagent(reagent_id, potency)

/obj/structure/geyser/plunger_act(obj/item/plunger/P, mob/living/user, _reinforced)
if(!_reinforced)
to_chat(user, "<span class='warning'>The [P.name] isn't strong enough!</span>")
return
/obj/structure/geyser/plunger_act(obj/item/plunger/P, mob/living/user)
if(activated)
to_chat(user, "<span class'warning'>The [name] is already active!</span>")
return
Expand Down Expand Up @@ -61,10 +58,9 @@
custom_materials = list(/datum/material/iron = 150) // WS Edit - Item Materials

var/plunge_mod = 1 //time*plunge_mod = total time we take to plunge an object
var/reinforced = FALSE //whether we do heavy duty stuff like geysers

/obj/item/plunger/attack_obj(obj/O, mob/living/user)
if(!O.plunger_act(src, user, reinforced))
if(!O.plunger_act(src, user))
return ..()

/obj/item/plunger/throw_impact(atom/hit_atom, datum/thrownthing/tt)
Expand All @@ -77,12 +73,3 @@
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>")

/obj/item/plunger/reinforced
name = "reinforced plunger"
desc = "It's an M. 7 Reinforced Plunger© for heavy duty plunging."
icon_state = "reinforced_plunger"

reinforced = TRUE
plunge_mod = 0.8

custom_premium_price = 1200
2 changes: 1 addition & 1 deletion code/modules/plumbing/plumbers/_plumb_machinery.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
default_unfasten_wrench(user, I)
return TRUE

/obj/machinery/plumbing/plunger_act(obj/item/plunger/P, mob/living/user, reinforced)
/obj/machinery/plumbing/plunger_act(obj/item/plunger/P, mob/living/user)
to_chat(user, "<span class='notice'>You start furiously plunging [name].</span>")
if(do_after(user, 30, target = src))
to_chat(user, "<span class='notice'>You finish plunging the [name].</span>")
Expand Down
Binary file modified icons/obj/watercloset.dmi
Binary file not shown.

0 comments on commit 777b3d9

Please sign in to comment.