mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-25 22:12:58 +01:00
Implement Bay's SSmachinery and power usage updates, further unclogging the toilet (#13910)
This commit is contained in:
@@ -26,7 +26,7 @@
|
||||
var/obj/structure/cable/attached // the attached cable
|
||||
|
||||
/obj/item/device/powersink/Destroy()
|
||||
STOP_PROCESSING(SSprocessing, src)
|
||||
STOP_PROCESSING_POWER_OBJECT(src)
|
||||
processing_power_items -= src
|
||||
|
||||
return ..()
|
||||
@@ -48,7 +48,7 @@
|
||||
return TRUE
|
||||
else
|
||||
if (mode == 2)
|
||||
STOP_PROCESSING(SSprocessing, src)
|
||||
STOP_PROCESSING_POWER_OBJECT(src)
|
||||
processing_power_items.Remove(src)
|
||||
anchored = 0
|
||||
mode = 0
|
||||
@@ -73,7 +73,7 @@
|
||||
mode = 2
|
||||
icon_state = "powersink1"
|
||||
item_state = "powersink1"
|
||||
START_PROCESSING(SSprocessing, src)
|
||||
START_PROCESSING_POWER_OBJECT(src)
|
||||
processing_power_items += src
|
||||
if(2) //This switch option wasn't originally included. It exists now. --NeoFite
|
||||
visible_message("<span class='notice'>\The [user] deactivates \the [src]!</span>")
|
||||
@@ -81,7 +81,7 @@
|
||||
set_light(0)
|
||||
icon_state = "powersink0"
|
||||
item_state = "powersink0"
|
||||
STOP_PROCESSING(SSprocessing, src)
|
||||
STOP_PROCESSING_POWER_OBJECT(src)
|
||||
processing_power_items -= src
|
||||
|
||||
/obj/item/device/powersink/pwr_drain()
|
||||
|
||||
@@ -650,7 +650,7 @@ BREATH ANALYZER
|
||||
if(!internal_bodyscanner)
|
||||
var/obj/machinery/body_scanconsole/S = new (src)
|
||||
S.forceMove(src)
|
||||
S.use_power = FALSE
|
||||
S.update_use_power(POWER_USE_OFF)
|
||||
internal_bodyscanner = S
|
||||
|
||||
/obj/item/device/advanced_healthanalyzer/Destroy()
|
||||
|
||||
@@ -150,6 +150,7 @@
|
||||
/obj/machinery/camera/spy
|
||||
// These cheap toys are accessible from the mercenary camera console as well
|
||||
network = list(NETWORK_MERCENARY)
|
||||
active_power_usage = 0
|
||||
|
||||
/obj/machinery/camera/spy/Initialize()
|
||||
. = ..()
|
||||
|
||||
@@ -231,7 +231,7 @@ Frequency:
|
||||
if(user == loc)
|
||||
var/turf/current_location = get_turf(src)
|
||||
var/list/teleport_options = list()
|
||||
for(var/obj/machinery/teleport/pad/P in SSmachinery.all_machines)
|
||||
for(var/obj/machinery/teleport/pad/P in SSmachinery.machinery)
|
||||
if(AreConnectedZLevels(current_location.z, P.z))
|
||||
var/area/A = get_area(P)
|
||||
if(P.engaged)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user