mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-26 21:48:21 +01:00
Merge pull request #9550 from SamHPurp/well-defined,-some-would-say-chiseled
Updates use_power to use the Defines
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
icon_state = "clawmachine_on"
|
||||
density = 1
|
||||
anchored = 1
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 40
|
||||
var/tokens = 0
|
||||
var/freeplay = 0 //for debugging and admin kindness
|
||||
@@ -111,7 +111,7 @@
|
||||
if(!customer_account)
|
||||
to_chat(user, "Unable to access account: incorrect credentials.")
|
||||
return 0
|
||||
|
||||
|
||||
return customer_account.charge(token_price, null, "Purchase of [name] credit", name, name)
|
||||
|
||||
/obj/machinery/arcade/proc/start_play(mob/user as mob)
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
icon_state = "prize_counter-on"
|
||||
density = 1
|
||||
anchored = 1
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 40
|
||||
var/tickets = 0
|
||||
|
||||
@@ -205,4 +205,4 @@ th.cost.toomuch {background:maroon;}
|
||||
print_tickets()
|
||||
else
|
||||
new /obj/item/stack/tickets(get_turf(src), tickets)
|
||||
tickets = 0
|
||||
tickets = 0
|
||||
|
||||
@@ -31,7 +31,7 @@ var/obj/machinery/gateway/centerstation/the_gateway = null
|
||||
/obj/machinery/gateway/centerstation
|
||||
density = 1
|
||||
icon_state = "offcenter"
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
|
||||
//warping vars
|
||||
var/list/linked = list()
|
||||
@@ -169,7 +169,7 @@ var/obj/machinery/gateway/centerstation/the_gateway = null
|
||||
/obj/machinery/gateway/centeraway
|
||||
density = 1
|
||||
icon_state = "offcenter"
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
var/calibrated = 1
|
||||
var/list/linked = list() //a list of the connected gateway chunks
|
||||
var/ready = 0
|
||||
|
||||
@@ -28,10 +28,10 @@
|
||||
anchored = 1
|
||||
density = 1
|
||||
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
idle_power_usage = 0
|
||||
active_power_usage = 0
|
||||
|
||||
active = 1
|
||||
locked = 1
|
||||
state = 2
|
||||
state = 2
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
|
||||
anchored = 1
|
||||
density = 1
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
|
||||
var/chargesa = 1
|
||||
var/insistinga = 0
|
||||
@@ -288,4 +288,4 @@
|
||||
say("How could you betray the Syndicate?")
|
||||
for(var/mob/living/simple_animal/hostile/syndicate/ranged/wildwest/W in living_mob_list)
|
||||
W.on_alert = TRUE
|
||||
..(gibbed)
|
||||
..(gibbed)
|
||||
|
||||
@@ -19,7 +19,7 @@ log transactions
|
||||
icon = 'icons/obj/terminals.dmi'
|
||||
icon_state = "atm"
|
||||
anchored = 1
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 10
|
||||
var/obj/machinery/computer/account_database/linked_db
|
||||
var/datum/money_account/authenticated_account
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
layer = 2.9
|
||||
density = 1
|
||||
anchored = 1
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 5
|
||||
var/on = 0
|
||||
var/onicon = null
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
var/stealthmode = FALSE
|
||||
var/list/victims = list()
|
||||
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 2
|
||||
active_power_usage = 500
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
anchored = 1
|
||||
icon = 'icons/obj/cooking_machines.dmi'
|
||||
icon_state = "icecream_vat"
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 20
|
||||
var/obj/item/reagent_containers/glass/beaker = null
|
||||
var/useramount = 15 //Last used amount
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
layer = 2.9
|
||||
density = 1
|
||||
anchored = 0
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 5
|
||||
active_power_usage = 100
|
||||
pass_flags = PASSTABLE
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
layer = 2.9
|
||||
density = 1
|
||||
anchored = 1
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 5
|
||||
active_power_usage = 100
|
||||
flags = OPENCONTAINER
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
layer = 2.9
|
||||
density = 1
|
||||
anchored = 1
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 5
|
||||
active_power_usage = 50
|
||||
var/grinded = 0
|
||||
@@ -102,4 +102,4 @@
|
||||
to_chat(user, "<span class='notice'>The machine's display flashes that it has [grinded] monkey\s worth of material left.</span>")
|
||||
else // I'm not sure if the \s macro works with a word in between; I'll play it safe
|
||||
to_chat(user, "<span class='warning'>The machine needs at least [required_grind] monkey\s worth of material to compress [cube_production] monkey\s. It only has [grinded].</span>")
|
||||
return
|
||||
return
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
layer = 2.9
|
||||
density = 1
|
||||
anchored = 1
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
var/candy = 0
|
||||
idle_power_usage = 5
|
||||
var/on = FALSE //Is it making food already?
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
var/broken = 0
|
||||
var/processing = 0
|
||||
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 5
|
||||
active_power_usage = 50
|
||||
var/rating_speed = 1
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
layer = 2.9
|
||||
density = 1
|
||||
anchored = 1
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 5
|
||||
active_power_usage = 100
|
||||
var/max_n_of_items = 1500
|
||||
@@ -227,7 +227,7 @@
|
||||
if(load(O, user))
|
||||
user.visible_message("<span class='notice'>[user] has added \the [O] to \the [src].</span>", "<span class='notice'>You add \the [O] to \the [src].</span>")
|
||||
SSnanoui.update_uis(src)
|
||||
|
||||
|
||||
else if(istype(O, /obj/item/storage/bag))
|
||||
var/obj/item/storage/bag/P = O
|
||||
var/plants_loaded = 0
|
||||
@@ -410,7 +410,7 @@
|
||||
desc = "A wooden contraption, used to dry plant products, food and leather."
|
||||
icon = 'icons/obj/hydroponics/equipment.dmi'
|
||||
icon_state = "drying_rack_on"
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 5
|
||||
active_power_usage = 200
|
||||
icon_on = "drying_rack_on"
|
||||
@@ -447,13 +447,13 @@
|
||||
return 1
|
||||
if(href_list["dryingOn"])
|
||||
drying = TRUE
|
||||
use_power = 2
|
||||
use_power = ACTIVE_POWER_USE
|
||||
update_icon()
|
||||
return 1
|
||||
|
||||
if(href_list["dryingOff"])
|
||||
drying = FALSE
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
update_icon()
|
||||
return 1
|
||||
return 0
|
||||
@@ -497,10 +497,10 @@
|
||||
/obj/machinery/smartfridge/drying_rack/proc/toggle_drying(forceoff)
|
||||
if(drying || forceoff)
|
||||
drying = FALSE
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
else
|
||||
drying = TRUE
|
||||
use_power = 2
|
||||
use_power = ACTIVE_POWER_USE
|
||||
update_icon()
|
||||
|
||||
/obj/machinery/smartfridge/drying_rack/proc/rack_dry()
|
||||
@@ -552,4 +552,4 @@
|
||||
to_chat(usr, "<span class='warning'>Access denied.</span>")
|
||||
SSnanoui.update_uis(src)
|
||||
return 0
|
||||
return ..()
|
||||
return ..()
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
icon_state = "biogen-empty"
|
||||
density = 1
|
||||
anchored = 1
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 40
|
||||
var/processing = 0
|
||||
var/obj/item/reagent_containers/glass/beaker = null
|
||||
|
||||
@@ -1008,7 +1008,7 @@
|
||||
icon = 'icons/obj/hydroponics/equipment.dmi'
|
||||
icon_state = "soil"
|
||||
density = 0
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
wrenchable = 0
|
||||
|
||||
/obj/machinery/hydroponics/soil/update_icon_hoses()
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
unacidable = 1
|
||||
burn_state = LAVA_PROOF | FIRE_PROOF
|
||||
pixel_y = -4
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
var/memory_saved = FALSE
|
||||
var/list/stored_items = list()
|
||||
var/static/list/blacklist = typecacheof(list(/obj/item/spellbook))
|
||||
@@ -97,7 +97,7 @@
|
||||
icon = 'icons/obj/lavaland/artefacts.dmi'
|
||||
icon_state = "anomaly_crystal"
|
||||
luminosity = 8
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
density = 1
|
||||
burn_state = LAVA_PROOF | FIRE_PROOF
|
||||
unacidable = 1
|
||||
|
||||
@@ -281,7 +281,7 @@ var/list/ai_verbs_default = list(
|
||||
/obj/machinery/ai_powersupply
|
||||
name="\improper AI power supply"
|
||||
active_power_usage=1000
|
||||
use_power = 2
|
||||
use_power = ACTIVE_POWER_USE
|
||||
power_channel = EQUIP
|
||||
var/mob/living/silicon/ai/powered_ai = null
|
||||
invisibility = 100
|
||||
@@ -303,9 +303,9 @@ var/list/ai_verbs_default = list(
|
||||
return
|
||||
if(!powered_ai.anchored)
|
||||
loc = powered_ai.loc
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
if(powered_ai.anchored)
|
||||
use_power = 2
|
||||
use_power = ACTIVE_POWER_USE
|
||||
|
||||
/mob/living/silicon/ai/proc/pick_icon()
|
||||
set category = "AI Commands"
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
density = 1
|
||||
anchored = 1
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 20
|
||||
active_power_usage = 5000
|
||||
|
||||
|
||||
@@ -889,7 +889,7 @@ Pass a positive integer as an argument to override a bot's default speed.
|
||||
|
||||
// Machinery to simplify topic and access calls
|
||||
/obj/machinery/bot_core
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
var/mob/living/simple_animal/bot/owner = null
|
||||
|
||||
/obj/machinery/bot_core/New(loc)
|
||||
@@ -1106,4 +1106,4 @@ Pass a positive integer as an argument to override a bot's default speed.
|
||||
var/image/I = path[path[1]]
|
||||
if(I)
|
||||
I.icon = null
|
||||
path.Cut(1, 2)
|
||||
path.Cut(1, 2)
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/obj/machinery/ntnet_relay
|
||||
name = "NTNet Quantum Relay"
|
||||
desc = "A very complex router and transmitter capable of connecting electronic devices together. Looks fragile."
|
||||
use_power = 2
|
||||
use_power = ACTIVE_POWER_USE
|
||||
active_power_usage = 10000 //10kW, apropriate for machine that keeps massive cross-Zlevel wireless network operational. Used to be 20 but that actually drained the smes one round
|
||||
idle_power_usage = 100
|
||||
icon = 'icons/obj/stationobjs.dmi'
|
||||
@@ -38,9 +38,9 @@
|
||||
|
||||
/obj/machinery/ntnet_relay/process()
|
||||
if(operable())
|
||||
use_power = 2
|
||||
use_power = ACTIVE_POWER_USE
|
||||
else
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
|
||||
update_icon()
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ var/list/global_modular_computers = list()
|
||||
name = "modular computer"
|
||||
desc = "An advanced computer."
|
||||
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 5
|
||||
var/hardware_flag = 0 // A flag that describes this device type
|
||||
var/last_power_usage = 0 // Power usage during last tick
|
||||
|
||||
@@ -13,7 +13,7 @@ var/list/alldepartments = list()
|
||||
var/long_range_enabled = 0 // Can we send messages off the station?
|
||||
req_one_access = list(access_lawyer, access_heads, access_armory)
|
||||
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 30
|
||||
active_power_usage = 200
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
var/insert_anim = "bigscanner1"
|
||||
anchored = 1
|
||||
density = 1
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 30
|
||||
active_power_usage = 200
|
||||
power_channel = EQUIP
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
desc = "A control terminal for the area electrical systems."
|
||||
icon_state = "apc0"
|
||||
anchored = 1
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
req_access = list(access_engine_equip)
|
||||
var/spooky=0
|
||||
var/area/area
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
icon_state = "teg"
|
||||
anchored = 0
|
||||
density = 1
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
|
||||
var/obj/machinery/atmospherics/binary/circulator/cold_circ
|
||||
var/obj/machinery/atmospherics/binary/circulator/hot_circ
|
||||
@@ -244,4 +244,4 @@
|
||||
|
||||
/obj/machinery/power/generator/power_change()
|
||||
..()
|
||||
update_icon()
|
||||
update_icon()
|
||||
|
||||
@@ -24,7 +24,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
|
||||
icon = 'icons/obj/machines/gravity_generator.dmi'
|
||||
anchored = 1
|
||||
density = 1
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
unacidable = 1
|
||||
var/sprite_number = 0
|
||||
|
||||
@@ -101,7 +101,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
|
||||
active_power_usage = 3000
|
||||
power_channel = ENVIRON
|
||||
sprite_number = 8
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
interact_offline = 1
|
||||
var/on = 1
|
||||
var/breaker = 1
|
||||
@@ -287,7 +287,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
|
||||
/obj/machinery/gravity_generator/main/proc/set_state(var/new_state)
|
||||
charging_state = POWER_IDLE
|
||||
on = new_state
|
||||
use_power = on ? 2 : 1
|
||||
use_power = on ? ACTIVE_POWER_USE : IDLE_POWER_USE
|
||||
// Sound the alert if gravity was just enabled or disabled.
|
||||
var/alert = 0
|
||||
var/area/area = get_area(src)
|
||||
|
||||
@@ -133,7 +133,7 @@
|
||||
desc = "A lighting fixture."
|
||||
anchored = 1
|
||||
layer = 5 // They were appearing under mobs which is a little weird - Ostaf
|
||||
use_power = 2
|
||||
use_power = ACTIVE_POWER_USE
|
||||
idle_power_usage = 2
|
||||
active_power_usage = 20
|
||||
power_channel = LIGHT //Lights are calc'd via area so they dont need to be in the machine list
|
||||
@@ -258,10 +258,10 @@
|
||||
on = 0
|
||||
set_light(0)
|
||||
else
|
||||
use_power = 2
|
||||
use_power = ACTIVE_POWER_USE
|
||||
set_light(BR, PO, CO)
|
||||
else
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
set_light(0)
|
||||
|
||||
active_power_usage = (brightness_range * 10)
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
icon_state = "portgen0_0"
|
||||
density = 1
|
||||
anchored = 0
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
|
||||
var/active = 0
|
||||
var/power_gen = 5000
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
anchored = 1.0
|
||||
on_blueprints = TRUE
|
||||
var/datum/powernet/powernet = null
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
idle_power_usage = 0
|
||||
active_power_usage = 0
|
||||
|
||||
@@ -297,7 +297,7 @@
|
||||
//source is an object caused electrocuting (airlock, grille, etc)
|
||||
//No animations will be performed by this proc.
|
||||
/proc/electrocute_mob(mob/living/carbon/M as mob, var/power_source, var/obj/source, var/siemens_coeff = 1.0)
|
||||
if(!istype(M))
|
||||
if(!istype(M))
|
||||
return 0
|
||||
if(istype(M.loc,/obj/mecha))
|
||||
return 0 //feckin mechs are dumb
|
||||
@@ -305,7 +305,7 @@
|
||||
var/mob/living/carbon/human/H = M
|
||||
if(H.gloves)
|
||||
var/obj/item/clothing/gloves/G = H.gloves
|
||||
if(G.siemens_coefficient == 0)
|
||||
if(G.siemens_coefficient == 0)
|
||||
return 0 //to avoid spamming with insulated glvoes on
|
||||
|
||||
var/area/source_area
|
||||
|
||||
@@ -8,7 +8,7 @@ var/global/list/rad_collectors = list()
|
||||
anchored = 0
|
||||
density = 1
|
||||
req_access = list(access_engine_equip)
|
||||
// use_power = 0
|
||||
// use_power = NO_POWER_USE
|
||||
var/obj/item/tank/plasma/P = null
|
||||
var/last_power = 0
|
||||
var/active = 0
|
||||
@@ -148,4 +148,3 @@ var/global/list/rad_collectors = list()
|
||||
flick("ca_deactive", src)
|
||||
update_icons()
|
||||
return
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
anchored = 1
|
||||
density = 0
|
||||
unacidable = 1
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
light_range = 4
|
||||
layer = OBJ_LAYER + 0.1
|
||||
var/obj/machinery/field/generator/FG1 = null
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
density = 1
|
||||
req_access = list(access_engine_equip)
|
||||
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
idle_power_usage = 10
|
||||
active_power_usage = 300
|
||||
|
||||
@@ -167,7 +167,7 @@
|
||||
/* if((severity == 1)&&prob(1)&&prob(1))
|
||||
if(src.active)
|
||||
src.active = 0
|
||||
src.use_power = 1 */
|
||||
src.use_power = IDLE_POWER_USE */
|
||||
return 1
|
||||
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ field_generator power level display
|
||||
icon_state = "Field_Gen"
|
||||
anchored = 0
|
||||
density = 1
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
armor = list(melee = 25, bullet = 10, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0)
|
||||
var/const/num_power_levels = 6 // Total number of power level icon has
|
||||
var/power_level = 0
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
icon_state = "TheSingGen"
|
||||
anchored = 0
|
||||
density = 1
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
var/energy = 0
|
||||
var/creation_type = /obj/singularity
|
||||
|
||||
|
||||
@@ -281,7 +281,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
|
||||
icon_state = "none"
|
||||
anchored = 0
|
||||
density = 1
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
idle_power_usage = 0
|
||||
active_power_usage = 0
|
||||
var/construction_state = 0
|
||||
@@ -408,10 +408,10 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
|
||||
if(construction_state < 3)//Was taken apart, update state
|
||||
update_state()
|
||||
if(use_power)
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
construction_state = temp_state
|
||||
if(construction_state >= 3)
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
update_icon()
|
||||
return 1
|
||||
return 0
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
reference = "control_box"
|
||||
anchored = 0
|
||||
density = 1
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
idle_power_usage = 500
|
||||
active_power_usage = 10000
|
||||
construction_state = 0
|
||||
@@ -42,7 +42,7 @@
|
||||
|
||||
/obj/machinery/particle_accelerator/control_box/update_state()
|
||||
if(construction_state < 3)
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
assembled = 0
|
||||
active = 0
|
||||
for(var/obj/structure/particle_accelerator/part in connected_parts)
|
||||
@@ -52,7 +52,7 @@
|
||||
connected_parts = list()
|
||||
return
|
||||
if(!part_scan())
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
active = 0
|
||||
connected_parts = list()
|
||||
|
||||
@@ -147,9 +147,9 @@
|
||||
..()
|
||||
if(stat & NOPOWER)
|
||||
active = 0
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
else if(!stat && construction_state <= 3)
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
update_icon()
|
||||
|
||||
if((stat & NOPOWER) || (!stat && construction_state <= 3)) //Only update the part icons if something's changed (i.e. any of the above condition sets are met).
|
||||
@@ -231,13 +231,13 @@
|
||||
log_game("PA Control Computer turned ON by [key_name(usr)] in ([x],[y],[z])")
|
||||
use_log += text("\[[time_stamp()]\] <font color='red'>[key_name(usr)] has turned on the PA Control Computer.</font>")
|
||||
if(active)
|
||||
use_power = 2
|
||||
use_power = ACTIVE_POWER_USE
|
||||
for(var/obj/structure/particle_accelerator/part in connected_parts)
|
||||
part.strength = strength
|
||||
part.powered = 1
|
||||
part.update_icon()
|
||||
else
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
for(var/obj/structure/particle_accelerator/part in connected_parts)
|
||||
part.strength = null
|
||||
part.powered = 0
|
||||
@@ -276,4 +276,4 @@
|
||||
popup.set_content(dat)
|
||||
popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
|
||||
popup.open()
|
||||
return
|
||||
return
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
icon_state = "sp_base"
|
||||
anchored = 1
|
||||
density = 1
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
idle_power_usage = 0
|
||||
active_power_usage = 0
|
||||
var/id = 0
|
||||
@@ -279,7 +279,7 @@
|
||||
icon_state = "computer"
|
||||
anchored = 1
|
||||
density = 1
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 250
|
||||
var/icon_screen = "solar"
|
||||
var/icon_keyboard = "power_key"
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
icon_state = "tracker"
|
||||
anchored = 1
|
||||
density = 1
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
|
||||
var/id = 0
|
||||
var/sun_angle = 0 // sun angle as set by sun datum
|
||||
@@ -82,4 +82,4 @@
|
||||
icon = 'icons/obj/doors/door_assembly.dmi'
|
||||
icon_state = "door_electronics"
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
origin_tech = "engineering=2;programming=1"
|
||||
origin_tech = "engineering=2;programming=1"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
desc = "A power-generating treadmill."
|
||||
layer = 2.2
|
||||
anchored = 1
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
|
||||
var/speed = 0
|
||||
var/friction = 0.15 // lose this much speed every ptick
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
anchored = 1
|
||||
icon = 'icons/obj/chemical.dmi'
|
||||
icon_state = "dispenser"
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
idle_power_usage = 40
|
||||
var/ui_title = "Chem Dispenser 5000"
|
||||
var/energy = 100
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
anchored = 1
|
||||
icon = 'icons/obj/chemical.dmi'
|
||||
icon_state = "mixer0b"
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 40
|
||||
var/obj/item/reagent_containers/beaker = null
|
||||
var/desired_temp = 300
|
||||
@@ -154,4 +154,4 @@
|
||||
beakerContents.Add(list(list("name" = R.name, "volume" = R.volume))) // list in a list because Byond merges the first list...
|
||||
data["beakerContents"] = beakerContents
|
||||
|
||||
return data
|
||||
return data
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
anchored = 1
|
||||
icon = 'icons/obj/chemical.dmi'
|
||||
icon_state = "mixer0"
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 20
|
||||
var/obj/item/reagent_containers/beaker = null
|
||||
var/obj/item/storage/pill_bottle/loaded_pill_bottle = null
|
||||
@@ -416,4 +416,4 @@
|
||||
to_chat(user, "<span class='warning'>You can't use the [name] while it's panel is opened!</span>")
|
||||
return 1
|
||||
else
|
||||
..()
|
||||
..()
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
icon = 'icons/obj/chemical.dmi'
|
||||
icon_state = "mixer0"
|
||||
circuit = /obj/item/circuitboard/pandemic
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 20
|
||||
var/temp_html = ""
|
||||
var/wait = null
|
||||
@@ -294,4 +294,4 @@
|
||||
..()
|
||||
return
|
||||
else
|
||||
..()
|
||||
..()
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
icon_state = "juicer1"
|
||||
layer = 2.9
|
||||
anchored = 1
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 5
|
||||
active_power_usage = 100
|
||||
pass_flags = PASSTABLE
|
||||
@@ -446,4 +446,4 @@
|
||||
var/amount = O.reagents.total_volume
|
||||
O.reagents.trans_to(beaker, amount)
|
||||
if(!O.reagents.total_volume)
|
||||
remove_object(O)
|
||||
remove_object(O)
|
||||
|
||||
@@ -335,7 +335,7 @@
|
||||
// timed process
|
||||
// charge the gas reservoir and perform flush if ready
|
||||
/obj/machinery/disposal/process()
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
if(stat & BROKEN) // nothing can happen if broken
|
||||
return
|
||||
|
||||
@@ -356,13 +356,13 @@
|
||||
if(stat & NOPOWER) // won't charge if no power
|
||||
return
|
||||
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
|
||||
if(mode != 1) // if off or ready, no need to charge
|
||||
return
|
||||
|
||||
// otherwise charge
|
||||
use_power = 2
|
||||
use_power = ACTIVE_POWER_USE
|
||||
|
||||
var/atom/L = loc // recharging from loc turf
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
icon_state = "h_lathe"
|
||||
density = 1
|
||||
anchored = 1
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
var/recentlyExperimented = 0
|
||||
var/mob/trackedIan
|
||||
var/mob/trackedRuntime
|
||||
|
||||
@@ -50,7 +50,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
|
||||
name = "Messaging Server"
|
||||
density = 1
|
||||
anchored = 1.0
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 10
|
||||
active_power_usage = 100
|
||||
|
||||
@@ -199,7 +199,7 @@ var/obj/machinery/blackbox_recorder/blackbox
|
||||
name = "Blackbox Recorder"
|
||||
density = 1
|
||||
anchored = 1.0
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 10
|
||||
active_power_usage = 100
|
||||
var/list/messages = list() //Stores messages of non-standard frequencies
|
||||
@@ -377,4 +377,4 @@ proc/feedback_add_details(var/variable,var/details)
|
||||
|
||||
if(!FV) return
|
||||
|
||||
FV.add_details(details)
|
||||
FV.add_details(details)
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
icon = 'icons/obj/machines/research.dmi'
|
||||
density = 1
|
||||
anchored = 1
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
var/busy = 0
|
||||
var/hacked = 0
|
||||
var/disabled = 0
|
||||
@@ -130,4 +130,4 @@
|
||||
use_power(min(1000, (amount_inserted / 100)))
|
||||
overlays += "[initial(name)]_[stack_name]"
|
||||
sleep(10)
|
||||
overlays -= "[initial(name)]_[stack_name]"
|
||||
overlays -= "[initial(name)]_[stack_name]"
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
var/ert_reason = "Reason for ERT"
|
||||
|
||||
anchored = 1
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 2
|
||||
active_power_usage = 6
|
||||
power_channel = ENVIRON
|
||||
|
||||
@@ -256,7 +256,7 @@
|
||||
var/obj/machinery/bsa/full/cannon
|
||||
var/notice
|
||||
var/target
|
||||
use_power = 0
|
||||
use_power = NO_POWER_USE
|
||||
circuit = /obj/item/circuitboard/computer/bsa_control
|
||||
icon = 'icons/obj/machines/particle_accelerator3.dmi'
|
||||
icon_state = "control_boxp"
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
icon = 'icons/obj/telescience.dmi'
|
||||
icon_state = "pad-idle"
|
||||
anchored = 1
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 200
|
||||
active_power_usage = 5000
|
||||
var/efficiency
|
||||
@@ -61,7 +61,7 @@
|
||||
icon = 'icons/obj/telescience.dmi'
|
||||
icon_state = "pad-idle"
|
||||
anchored = 1
|
||||
use_power = 1
|
||||
use_power = IDLE_POWER_USE
|
||||
idle_power_usage = 20
|
||||
active_power_usage = 500
|
||||
var/stage = 0
|
||||
|
||||
Reference in New Issue
Block a user