cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 06:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

VS machinery power update procs.

Browse Source
This commit is contained in:
Leshana
2020-04-22 20:46:26 -04:00
parent 9bd2347966
commit f80c320c0f
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/machinery/telecomms/machine_interactions.dm
View File

@@ -229,11 +229,11 @@
if(href_list["range_down"]) if(href_list["range_down"])
if(overmap_range > overmap_range_min) if(overmap_range > overmap_range_min)
overmap_range-- overmap_range--
idle_power_usage = initial(idle_power_usage)**(overmap_range+1) update_idle_power_usage(initial(idle_power_usage)**(overmap_range+1))
if(href_list["range_up"]) if(href_list["range_up"])
if(overmap_range < overmap_range_max) if(overmap_range < overmap_range_max)
overmap_range++ overmap_range++
idle_power_usage = initial(idle_power_usage)**(overmap_range+1) update_idle_power_usage(initial(idle_power_usage)**(overmap_range+1))
// RECEIVER // RECEIVER
/obj/machinery/telecomms/receiver/Options_Menu() /obj/machinery/telecomms/receiver/Options_Menu()
@@ -245,11 +245,11 @@
if(href_list["range_down"]) if(href_list["range_down"])
if(overmap_range > overmap_range_min) if(overmap_range > overmap_range_min)
overmap_range-- overmap_range--
idle_power_usage = initial(idle_power_usage)**(overmap_range+1) update_idle_power_usage(initial(idle_power_usage)**(overmap_range+1))
if(href_list["range_up"]) if(href_list["range_up"])
if(overmap_range < overmap_range_max) if(overmap_range < overmap_range_max)
overmap_range++ overmap_range++
idle_power_usage = initial(idle_power_usage)**(overmap_range+1) update_idle_power_usage(initial(idle_power_usage)**(overmap_range+1))
/obj/machinery/telecomms/Topic(href, href_list) /obj/machinery/telecomms/Topic(href, href_list)

4
code/modules/overmap/disperser/disperser_console.dm
View File

@@ -178,13 +178,13 @@ obj/machinery/computer/ship/disperser/proc/is_valid_setup()
var/input = input("1-5", "disperser strength", 1) as num|null var/input = input("1-5", "disperser strength", 1) as num|null
if(input && CanInteract(user, state)) if(input && CanInteract(user, state))
strength = sanitize_integer(input, 1, 5, 1) strength = sanitize_integer(input, 1, 5, 1)
middle.idle_power_usage = strength * range * 100 middle.update_idle_power_usage(strength * range * 100)
if(href_list["range"]) if(href_list["range"])
var/input = input("1-5", "disperser radius", 1) as num|null var/input = input("1-5", "disperser radius", 1) as num|null
if(input && CanInteract(user, state)) if(input && CanInteract(user, state))
range = sanitize_integer(input, 1, 5, 1) range = sanitize_integer(input, 1, 5, 1)
middle.idle_power_usage = strength * range * 100 middle.update_idle_power_usage(strength * range * 100)
if(href_list["fire"]) if(href_list["fire"])
fire(user) fire(user)

4
code/modules/power/gravitygenerator_vr.dm
View File

@@ -94,7 +94,7 @@ GLOBAL_LIST_EMPTY(gravity_generators)
setup_parts() setup_parts()
middle.add_overlay("activated") middle.add_overlay("activated")
current_overlay = "activated" current_overlay = "activated"
use_power = USE_POWER_ACTIVE update_use_power(USE_POWER_ACTIVE)
// //
// Generator an admin can spawn // Generator an admin can spawn
@@ -298,7 +298,7 @@ GLOBAL_LIST_EMPTY(gravity_generators)
/obj/machinery/gravity_generator/main/proc/set_state(new_state) /obj/machinery/gravity_generator/main/proc/set_state(new_state)
charging_state = POWER_IDLE charging_state = POWER_IDLE
on = new_state on = new_state
use_power = on ? USE_POWER_ACTIVE : USE_POWER_IDLE update_use_power(on ? USE_POWER_ACTIVE : USE_POWER_IDLE)
// Sound the alert if gravity was just enabled or disabled. // Sound the alert if gravity was just enabled or disabled.
var/alert = FALSE var/alert = FALSE
if(SSticker.IsRoundInProgress()) if(SSticker.IsRoundInProgress())