mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-18 11:36:24 +01:00
Grep for space indentation (#54850)
#54604 atomizing Since a lot of the space indents are in lists ill atomize those later
This commit is contained in:
TiviPlus
@@ -22,13 +22,11 @@ GLOBAL_LIST_INIT(pipe_cleaner_colors, list(
|
||||
////////////////////////////////
|
||||
|
||||
/* Cable directions (d1 and d2)
|
||||
|
||||
|
||||
9 1 5
|
||||
\ | /
|
||||
8 - 0 - 4
|
||||
/ | \
|
||||
10 2 6
|
||||
* 9 1 5
|
||||
* \ | /
|
||||
* 8 - 0 - 4
|
||||
* / | \
|
||||
* 10 2 6
|
||||
|
||||
If d1 = 0 and d2 = 0, there's no pipe_cleaner
|
||||
If d1 = 0 and d2 = dir, it's a O-X pipe_cleaner, getting from the center of the tile to dir (knot pipe_cleaner)
|
||||
|
||||
+18
-18
@@ -102,9 +102,9 @@
|
||||
A.use_power(amount, chan)
|
||||
|
||||
/**
|
||||
* An alternative to 'use_power', this proc directly costs the APC in direct charge, as opposed to being calculated periodically.
|
||||
* - Amount: How much power the APC's cell is to be costed.
|
||||
*/
|
||||
* An alternative to 'use_power', this proc directly costs the APC in direct charge, as opposed to being calculated periodically.
|
||||
* - Amount: How much power the APC's cell is to be costed.
|
||||
*/
|
||||
/obj/machinery/proc/directly_use_power(amount)
|
||||
var/area/A = get_area(src)
|
||||
var/obj/machinery/power/apc/local_apc
|
||||
@@ -119,15 +119,15 @@
|
||||
return TRUE
|
||||
|
||||
/**
|
||||
* Attempts to draw power directly from the APC's Powernet rather than the APC's battery. For high-draw machines, like the cell charger
|
||||
*
|
||||
* Checks the surplus power on the APC's powernet, and compares to the requested amount. If the requested amount is available, this proc
|
||||
* will add the amount to the APC's usage and return that amount. Otherwise, this proc will return FALSE.
|
||||
* If the take_any var arg is set to true, this proc will use and return any surplus that is under the requested amount, assuming that
|
||||
* the surplus is above zero.
|
||||
* Args:
|
||||
* - amount, the amount of power requested from the Powernet. In standard loosely-defined SS13 power units.
|
||||
* - take_any, a bool of whether any amount of power is acceptable, instead of all or nothing. Defaults to FALSE
|
||||
* Attempts to draw power directly from the APC's Powernet rather than the APC's battery. For high-draw machines, like the cell charger
|
||||
*
|
||||
* Checks the surplus power on the APC's powernet, and compares to the requested amount. If the requested amount is available, this proc
|
||||
* will add the amount to the APC's usage and return that amount. Otherwise, this proc will return FALSE.
|
||||
* If the take_any var arg is set to true, this proc will use and return any surplus that is under the requested amount, assuming that
|
||||
* the surplus is above zero.
|
||||
* Args:
|
||||
* - amount, the amount of power requested from the Powernet. In standard loosely-defined SS13 power units.
|
||||
* - take_any, a bool of whether any amount of power is acceptable, instead of all or nothing. Defaults to FALSE
|
||||
*/
|
||||
/obj/machinery/proc/use_power_from_net(amount, take_any = FALSE)
|
||||
if(amount <= 0) //just in case
|
||||
@@ -162,12 +162,12 @@
|
||||
addStaticPower(-value, powerchannel)
|
||||
|
||||
/**
|
||||
* Called whenever the power settings of the containing area change
|
||||
*
|
||||
* by default, check equipment channel & set flag, can override if needed
|
||||
*
|
||||
* Returns TRUE if the NOPOWER flag was toggled
|
||||
*/
|
||||
* Called whenever the power settings of the containing area change
|
||||
*
|
||||
* by default, check equipment channel & set flag, can override if needed
|
||||
*
|
||||
* Returns TRUE if the NOPOWER flag was toggled
|
||||
*/
|
||||
/obj/machinery/proc/power_change()
|
||||
SIGNAL_HANDLER
|
||||
SHOULD_CALL_PARENT(TRUE)
|
||||
|
||||
@@ -3,13 +3,13 @@
|
||||
|
||||
/*
|
||||
field_generator power level display
|
||||
The icon used for the field_generator need to have 6 icon states
|
||||
named 'Field_Gen +p[num]' where 'num' ranges from 1 to 6
|
||||
The icon used for the field_generator need to have 6 icon states
|
||||
named 'Field_Gen +p[num]' where 'num' ranges from 1 to 6
|
||||
|
||||
The power level is displayed using overlays. The current displayed power level is stored in 'powerlevel'.
|
||||
The overlay in use and the powerlevel variable must be kept in sync. A powerlevel equal to 0 means that
|
||||
no power level overlay is currently in the overlays list.
|
||||
-Aygar
|
||||
The power level is displayed using overlays. The current displayed power level is stored in 'powerlevel'.
|
||||
The overlay in use and the powerlevel variable must be kept in sync. A powerlevel equal to 0 means that
|
||||
no power level overlay is currently in the overlays list.
|
||||
-Aygar
|
||||
*/
|
||||
|
||||
#define field_generator_max_power 250
|
||||
@@ -173,12 +173,11 @@ field_generator power level display
|
||||
cleanup()
|
||||
return ..()
|
||||
|
||||
/*
|
||||
The power level is displayed using overlays. The current displayed power level is stored in 'powerlevel'.
|
||||
The overlay in use and the powerlevel variable must be kept in sync. A powerlevel equal to 0 means that
|
||||
no power level overlay is currently in the overlays list.
|
||||
*/
|
||||
|
||||
/**
|
||||
*The power level is displayed using overlays. The current displayed power level is stored in 'powerlevel'.
|
||||
*The overlay in use and the powerlevel variable must be kept in sync. A powerlevel equal to 0 means that
|
||||
*no power level overlay is currently in the overlays list.
|
||||
*/
|
||||
/obj/machinery/field/generator/proc/check_power_level()
|
||||
var/new_level = round(6 * power / field_generator_max_power)
|
||||
if(new_level != power_level)
|
||||
|
||||
@@ -516,7 +516,7 @@
|
||||
/obj/singularity/deadchat_controlled/Initialize(mapload, starting_energy)
|
||||
. = ..()
|
||||
AddComponent(/datum/component/deadchat_control, DEMOCRACY_MODE, list(
|
||||
"up" = CALLBACK(GLOBAL_PROC, .proc/_step, src, NORTH),
|
||||
"down" = CALLBACK(GLOBAL_PROC, .proc/_step, src, SOUTH),
|
||||
"left" = CALLBACK(GLOBAL_PROC, .proc/_step, src, WEST),
|
||||
"right" = CALLBACK(GLOBAL_PROC, .proc/_step, src, EAST)))
|
||||
"up" = CALLBACK(GLOBAL_PROC, .proc/_step, src, NORTH),
|
||||
"down" = CALLBACK(GLOBAL_PROC, .proc/_step, src, SOUTH),
|
||||
"left" = CALLBACK(GLOBAL_PROC, .proc/_step, src, WEST),
|
||||
"right" = CALLBACK(GLOBAL_PROC, .proc/_step, src, EAST)))
|
||||
|
||||
@@ -157,7 +157,7 @@
|
||||
add_overlay(mutable_appearance(icon, "comp-o2", FLY_LAYER))
|
||||
else if(rpm>500)
|
||||
add_overlay(mutable_appearance(icon, "comp-o1", FLY_LAYER))
|
||||
//TODO: DEFERRED
|
||||
//TODO: DEFERRED
|
||||
|
||||
// These are crucial to working of a turbine - the stats modify the power output. TurbGenQ modifies how much raw energy can you get from
|
||||
// rpms, TurbGenG modifies the shape of the curve - the lower the value the less straight the curve is.
|
||||
|
||||
Reference in New Issue
Block a user