mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-09 16:12:17 +00:00
VOREStation Specific: Always call update_use_power() instead of directly setting the use_power var.
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
anchored = 1
|
||||
density = 1
|
||||
power_channel = EQUIP
|
||||
use_power = 1
|
||||
use_power = USE_POWER_IDLE
|
||||
idle_power_usage = 100 // Minimal lights to keep algae alive
|
||||
active_power_usage = 5000 // Powerful grow lights to stimulate oxygen production
|
||||
//power_rating = 7500 //7500 W ~ 10 HP
|
||||
@@ -57,10 +57,10 @@
|
||||
..()
|
||||
recent_moles_transferred = 0
|
||||
|
||||
if(inoperable() || use_power < 2)
|
||||
if(inoperable() || use_power < USE_POWER_ACTIVE)
|
||||
ui_error = null
|
||||
update_icon()
|
||||
if(use_power == 1)
|
||||
if(use_power == USE_POWER_IDLE)
|
||||
last_power_draw = idle_power_usage
|
||||
else
|
||||
last_power_draw = 0
|
||||
@@ -113,7 +113,7 @@
|
||||
update_icon()
|
||||
|
||||
/obj/machinery/atmospherics/binary/algae_farm/update_icon()
|
||||
if(inoperable() || !anchored || use_power < 2)
|
||||
if(inoperable() || !anchored || use_power < USE_POWER_ACTIVE)
|
||||
icon_state = "algae-off"
|
||||
else if(recent_moles_transferred >= moles_per_tick)
|
||||
icon_state = "algae-full"
|
||||
@@ -214,13 +214,13 @@
|
||||
|
||||
// Queue management can be done even while busy
|
||||
if(href_list["activate"])
|
||||
update_use_power(2)
|
||||
update_use_power(USE_POWER_ACTIVE)
|
||||
update_icon()
|
||||
updateUsrDialog()
|
||||
return
|
||||
|
||||
if(href_list["deactivate"])
|
||||
update_use_power(1)
|
||||
update_use_power(USE_POWER_IDLE)
|
||||
update_icon()
|
||||
updateUsrDialog()
|
||||
return
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
density = 1
|
||||
anchored = 0
|
||||
|
||||
use_power = 0 //is powered directly from cables
|
||||
use_power = USE_POWER_OFF //is powered directly from cables
|
||||
active_power_usage = 150 KILOWATTS //BIG POWER
|
||||
idle_power_usage = 500
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
anchored = 1
|
||||
volume = 500000
|
||||
|
||||
use_power = 1
|
||||
use_power = USE_POWER_IDLE
|
||||
idle_power_usage = 50 //internal circuitry, friction losses and stuff
|
||||
active_power_usage = 1000 // Blowers running
|
||||
power_rating = 100000 //100 kW ~ 135 HP
|
||||
|
||||
@@ -210,7 +210,7 @@
|
||||
|
||||
/obj/machinery/bomb_tester/proc/start_simulating()
|
||||
simulating = 1
|
||||
update_use_power(2)
|
||||
update_use_power(USE_POWER_ACTIVE)
|
||||
simulation_started = world.time
|
||||
update_icon()
|
||||
switch(sim_mode)
|
||||
@@ -352,7 +352,7 @@
|
||||
|
||||
/obj/machinery/bomb_tester/proc/simulation_finish(cancelled = 0)
|
||||
simulating = 0
|
||||
update_use_power(1)
|
||||
update_use_power(USE_POWER_IDLE)
|
||||
update_icon()
|
||||
if(test_canister && test_canister.anchored && !test_canister.connected_port)
|
||||
test_canister.anchored = 0
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
desc = "Small wall-mounted chime triggered by a doorbell"
|
||||
icon = 'icons/obj/machines/doorbell_vr.dmi'
|
||||
icon_state = "dbchime-standby"
|
||||
use_power = 1
|
||||
use_power = USE_POWER_IDLE
|
||||
idle_power_usage = 10
|
||||
active_power_usage = 200
|
||||
anchored = 1
|
||||
@@ -89,7 +89,7 @@
|
||||
desc = "A doorbell, press to chime."
|
||||
icon = 'icons/obj/machines/doorbell_vr.dmi'
|
||||
icon_state = "doorbell-standby"
|
||||
use_power = 0
|
||||
use_power = USE_POWER_OFF
|
||||
|
||||
/obj/machinery/button/doorbell/New(var/loc, var/dir, var/building = 0)
|
||||
..()
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
circuit = /obj/item/weapon/circuitboard/partslathe
|
||||
anchored = 1
|
||||
density = 1
|
||||
use_power = 1
|
||||
use_power = USE_POWER_IDLE
|
||||
idle_power_usage = 30
|
||||
active_power_usage = 5000
|
||||
|
||||
@@ -155,7 +155,7 @@
|
||||
var/datum/category_item/partslathe/D = queue[1]
|
||||
if(canBuild(D))
|
||||
busy = 1
|
||||
update_use_power(2)
|
||||
update_use_power(USE_POWER_ACTIVE)
|
||||
progress += speed
|
||||
if(progress >= D.time)
|
||||
build(D)
|
||||
@@ -165,7 +165,7 @@
|
||||
else if(busy)
|
||||
visible_message("<span class='notice'>\icon [src] flashes: insufficient materials: [getLackingMaterials(D)].</span>")
|
||||
busy = 0
|
||||
update_use_power(1)
|
||||
update_use_power(USE_POWER_IDLE)
|
||||
update_icon()
|
||||
playsound(src.loc, 'sound/machines/chime.ogg', 50, 0)
|
||||
|
||||
|
||||
@@ -140,11 +140,11 @@
|
||||
var/obj/item/ammo_casing/microbattery/batt = charging
|
||||
if(batt.shots_left >= initial(batt.shots_left))
|
||||
icon_state = icon_state_charged
|
||||
update_use_power(1)
|
||||
update_use_power(USE_POWER_IDLE)
|
||||
else
|
||||
icon_state = icon_state_charging
|
||||
batt.shots_left++
|
||||
update_use_power(2)
|
||||
update_use_power(USE_POWER_ACTIVE)
|
||||
return
|
||||
//VOREStation Add End
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
icon_keyboard = "tech_key"
|
||||
icon_screen = "request"
|
||||
light_color = "#315ab4"
|
||||
use_power = 1
|
||||
use_power = USE_POWER_IDLE
|
||||
idle_power_usage = 250
|
||||
active_power_usage = 500
|
||||
circuit = /obj/item/weapon/circuitboard/roguezones
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
icon = 'icons/obj/telescience.dmi'
|
||||
icon_state = "qpad-idle"
|
||||
anchored = TRUE
|
||||
use_power = 1
|
||||
use_power = USE_POWER_IDLE
|
||||
idle_power_usage = 200
|
||||
active_power_usage = 5000
|
||||
circuit = /obj/item/weapon/circuitboard/quantumpad
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
icon = 'icons/obj/telescience.dmi'
|
||||
icon_state = "pad-idle"
|
||||
anchored = 1
|
||||
use_power = 1
|
||||
use_power = USE_POWER_IDLE
|
||||
circuit = /obj/item/weapon/circuitboard/telesci_pad
|
||||
idle_power_usage = 200
|
||||
active_power_usage = 5000
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
desc = "A utility often used to lose weight."
|
||||
icon = 'icons/obj/machines/fitness_machines_vr.dmi'
|
||||
anchored = 1
|
||||
use_power = 0
|
||||
use_power = USE_POWER_OFF
|
||||
idle_power_usage = 0
|
||||
active_power_usage = 0
|
||||
var/messages
|
||||
@@ -88,7 +88,7 @@
|
||||
icon_state = "scale"
|
||||
desc = "A scale used to measure ones weight relative to their size and species."
|
||||
anchored = 1 // Set to 0 when we can construct or dismantle these.
|
||||
use_power = 0
|
||||
use_power = USE_POWER_OFF
|
||||
idle_power_usage = 0
|
||||
active_power_usage = 0
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
music = list('sound/music/elevator.ogg') // Woo elevator music!
|
||||
|
||||
/obj/machinery/atmospherics/unary/vent_pump/positive
|
||||
use_power = 1
|
||||
use_power = USE_POWER_IDLE
|
||||
icon_state = "map_vent_out"
|
||||
external_pressure_bound = ONE_ATMOSPHERE * 1.1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user