mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 05:00:55 +01:00
[MIRROR] Removes remove_any from the game (#26930)
* Removes remove_any from the game (#82020) ## About The Pull Request Okay, so, turns out smoke machines, cigarettes, vapes and all sorts of things intentionally unmix your mixes. Why? For chaotic effects. Well sadly it just deletes chems from mixes and makes them completely useless. It also tends to have very little effect on deathmixes and moreso just gimps you ability to use them for healing. This is pretty bad, especially for machines like the smoke machine that are specifically intended for chemists. This PR entirely removes all uses of remove_any as well as the proc itself from the game. It's just bad. ## Why It's Good For The Game As it turns out, the game intentionally gimping your chem mixes just to fuck with you is bad. Especially when it's both obscure and not really all that fun for gameplay. ## Changelog 🆑 balance: Smoke Machines, Showers, Vapes, etc will no longer arbitrarily delete a random amount of the chems they are processing /🆑 * Removes remove_any from the game * Update shower.dm * a * remove a --------- Co-authored-by: RikuTheKiller <88713943+RikuTheKiller@users.noreply.github.com> Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com> Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com>
This commit is contained in:
co-authored by
RikuTheKiller
jjpark-kb
Pinta
parent
54f705721b
commit
3c39e2b15e
@@ -123,7 +123,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16))
|
||||
//SKYRAT EDIT ADDITION
|
||||
/obj/machinery/shower/plunger_act(obj/item/plunger/P, mob/living/user, reinforced)
|
||||
if(do_after(user, 3 SECONDS, src))
|
||||
reagents.remove_any(reagents.total_volume)
|
||||
reagents.remove_all(reagents.total_volume)
|
||||
balloon_alert(user, "reservoir emptied")
|
||||
//SKYRAT EDIT END
|
||||
|
||||
@@ -320,7 +320,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16))
|
||||
if(!ismopable(movable_content)) // Mopables will be cleaned anyways by the turf wash above
|
||||
wash_atom(movable_content) // Reagent exposure is handled in wash_atom
|
||||
|
||||
reagents.remove_any(SHOWER_SPRAY_VOLUME)
|
||||
reagents.remove_all(SHOWER_SPRAY_VOLUME)
|
||||
|
||||
/obj/machinery/shower/on_deconstruction(disassembled = TRUE)
|
||||
new /obj/item/stack/sheet/iron(drop_location(), 2)
|
||||
|
||||
@@ -362,7 +362,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink, (-14))
|
||||
return
|
||||
|
||||
busy = FALSE
|
||||
reagents.remove_any(5)
|
||||
reagents.remove_all(5)
|
||||
reagents.expose(user, TOUCH, 5 / max(reagents.total_volume, 5))
|
||||
begin_reclamation()
|
||||
if(washing_face)
|
||||
|
||||
Reference in New Issue
Block a user