Skip to content

Commit

Permalink
noises and stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
Thera-Pissed committed Jan 20, 2024
1 parent 92eeb8c commit a1bd997
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
12 changes: 9 additions & 3 deletions code/game/machinery/outpost_electrolyzer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,17 @@
. += "<span class='notice'>Has [merit] merits, equaling [merit * MOLS_PER_MERIT] mols of hydrogen.</span>"
else
. += "<span class='notice'>Has no merits, get some from the electrolyzer or buy them to get hydrogen!</span>"
. += "<span class='notice'>[src] is currently [on ? "on" : "off"] </span>"
. += "<span class='notice'>[src] is currently [on ? "on" : "off"], and shuts off above [H2_PUMP_SHUTOFF_PRESSURE]kPa.</span>"

/obj/machinery/atmospherics/components/unary/hydrogen_pump/process_atmos()
update_parents()
var/datum/gas_mixture/air = airs[1] //hydrogen out
if(!merit || air.return_pressure() > H2_PUMP_SHUTOFF_PRESSURE || !on)
if(!on)
return
if(!merit || air.return_pressure() > H2_PUMP_SHUTOFF_PRESSURE)
on = FALSE
visible_message("<span class='danger'>The [src.name] shuts off!</span>")
playsound(src, 'sound/machines/switch2.ogg', 10, FALSE)
return
var/meritused
if(merit >= MERITS_USED_PER_TICK)
Expand All @@ -182,13 +187,14 @@
if(istype(I, /obj/item/merit/bundle))
var/obj/item/merit/bundle/C = I
merit += C.value
to_chat(user, "<span class='notice'>You deposit [I]s, for a total of [merit] merits.</span>")
to_chat(user, "<span class='notice'>You deposit [I], for a total of [merit] merits.</span>")
qdel(I)
return
return ..()

/obj/machinery/atmospherics/components/unary/hydrogen_pump/CtrlClick(mob/user)
on = !on
playsound(src, 'sound/machines/switch3.ogg', 10, FALSE)
to_chat(user, "<span class='notice'>You toggle the pump [on ? "on" : "off"].</span>")
investigate_log("was turned [on ? "on" : "off"] by [key_name(user)]", INVESTIGATE_ATMOS)
update_appearance()
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/HydrogenExchange.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export const HydrogenExchange = (props, context) => {
}
/>
<LabeledList.Item
label="Dispense Merits and Credits"
label="Dispense merits and credits"
buttons={
<Button
icon="sync"
Expand Down

0 comments on commit a1bd997

Please sign in to comment.