Implement Bay's SSmachinery and power usage updates, further unclogging the toilet (#13910)

This commit is contained in:
Wildkins
2022-05-16 18:50:16 +02:00
committed by GitHub
parent a18d6598e3
commit a4461a17af
296 changed files with 1662 additions and 1778 deletions
+4 -5
View File
@@ -225,7 +225,6 @@
density = 1
anchored = 1
use_power = 1
idle_power_usage = 60
active_power_usage = 10000
@@ -296,7 +295,7 @@
usr.client.eye = src
usr.forceMove(src)
src.occupant = WEAKREF(usr)
update_use_power(2)
update_use_power(POWER_USE_ACTIVE)
flick("[initial(icon_state)]-anim", src)
update_icon()
src.add_fingerprint(usr)
@@ -319,7 +318,7 @@
H.client.perspective = MOB_PERSPECTIVE
H.forceMove(get_turf(src))
occupant = null
update_use_power(1)
update_use_power(POWER_USE_IDLE)
flick("[initial(icon_state)]-anim", src)
update_icon()
return
@@ -350,7 +349,7 @@
L.forceMove(src)
occupant = WEAKREF(L)
update_use_power(2)
update_use_power(POWER_USE_ACTIVE)
flick("[initial(icon_state)]-anim", src)
update_icon()
@@ -389,7 +388,7 @@
H.client.eye = src
H.forceMove(src)
occupant = WEAKREF(H)
update_use_power(2)
update_use_power(POWER_USE_ACTIVE)
flick("[initial(icon_state)]-anim", src)
update_icon()
src.add_fingerprint(user)
+2 -2
View File
@@ -133,7 +133,7 @@
icon_state = "shower"
density = 0
anchored = 1
use_power = 0
use_power = POWER_USE_OFF
var/spray_amount = 20
var/on = 0
var/obj/effect/mist/mymist = null
@@ -349,7 +349,7 @@
if(istype(E,/obj/effect/rune) || istype(E,/obj/effect/decal/cleanable) || istype(E,/obj/effect/overlay))
qdel(E)
/obj/machinery/shower/machinery_process()
/obj/machinery/shower/process()
if(!on)
return
wash_floor()
+1 -1
View File
@@ -550,7 +550,7 @@
toggle_tint()
/obj/machinery/button/switch/windowtint/proc/toggle_tint()
use_power(5)
use_power_oneoff(5)
active = !active
update_icon()