cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Adds toggling shower's refills (#2735)

Browse Source 
* Adds toggling shower's refills (#55895)

Adds the ability to toggle showers water reclaimers with a multitool
Adds some delta_time handling to showers.

* Adds toggling shower's refills

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
This commit is contained in:
SkyratBot
2021-01-17 13:15:18 +01:00
committed by GitHub
co-authored by TemporalOroboros
parent 837eedd519
commit f36d4698f3
1 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/shower.dm
+40 -15
View File
@@ -4,7 +4,7 @@
#define SHOWER_NORMAL_TEMP 300
#define SHOWER_BOILING "boiling"
#define SHOWER_BOILING_TEMP 400
#define SHOWER_REACTION_MULTIPLIER 0.05
#define SHOWER_REACTION_MULTIPLIER 0.025
/obj/machinery/shower
@@ -23,12 +23,18 @@
///What reagent should the shower be filled with when initially built.
var/reagent_id = /datum/reagent/water
///How much reagent capacity should the shower begin with when built.
var/reaction_volume = 200
var/reagent_capacity = 200
///How many units the shower refills every second.
var/refill_rate = 0.5
/// Whether or not the shower's water reclaimer is operating.
var/can_refill = TRUE
/// Whether to allow players to toggle the water reclaimer.
var/can_toggle_refill = TRUE
/obj/machinery/shower/Initialize()
. = ..()
create_reagents(reaction_volume)
reagents.add_reagent(reagent_id, reaction_volume)
create_reagents(reagent_capacity)
reagents.add_reagent(reagent_id, reagent_capacity)
soundloop = new(list(src), FALSE)
AddComponent(/datum/component/plumbing/simple_demand)
@@ -65,6 +71,17 @@
else
return ..()
/obj/machinery/shower/multitool_act(mob/living/user, obj/item/I)
. = ..()
if(. || !can_toggle_refill)
return
can_refill = !can_refill
to_chat(user, "<span class=notice>You [can_refill ? "en" : "dis"]able the shower's water recycler.</span>")
playsound(src, 'sound/machines/click.ogg', 20, TRUE)
return TRUE
/obj/machinery/shower/wrench_act(mob/living/user, obj/item/I)
..()
to_chat(user, "<span class='notice'>You begin to adjust the temperature valve with \the [I]...</span>")
@@ -114,7 +131,7 @@
/obj/machinery/shower/Crossed(atom/movable/AM)
..()
if(on)
if(on && reagents.total_volume)
wash_atom(AM)
/obj/machinery/shower/proc/wash_atom(atom/A)
@@ -125,21 +142,23 @@
if(isliving(A))
check_heat(A)
/obj/machinery/shower/process()
if(on && reagents.total_volume >= 5)
reagents.remove_any(5)
/obj/machinery/shower/process(delta_time)
if(on && reagents.total_volume)
reagents.remove_any(2.5 * delta_time)
wash_atom(loc)
for(var/am in loc)
var/atom/movable/movable_content = am
reagents.expose(movable_content, TOUCH, SHOWER_REACTION_MULTIPLIER) //There's not many reagents leaving the sink at once! This should make for a 10 unit reaction
reagents.expose(movable_content, TOUCH, SHOWER_REACTION_MULTIPLIER * delta_time) //There's not many reagents leaving the sink at once! This should make for a 10 unit reaction
if(!ismopable(movable_content)) // Mopables will be cleaned anyways by the turf wash above
wash_atom(movable_content)
else
reagents.add_reagent(reagent_id, 1)
on = FALSE
soundloop.stop()
handle_mist()
update_icon()
return
on = FALSE
soundloop.stop()
handle_mist()
if(can_refill)
reagents.add_reagent(reagent_id, refill_rate * delta_time)
update_icon()
if(reagents.total_volume == reagents.maximum_volume)
return PROCESS_KILL
@@ -195,3 +214,9 @@
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
#undef SHOWER_REACTION_MULTIPLIER
#undef SHOWER_BOILING_TEMP
#undef SHOWER_BOILING
#undef SHOWER_NORMAL_TEMP
#undef SHOWER_NORMAL
#undef SHOWER_FREEZING_TEMP
#undef SHOWER_FREEZING