Replaces all var/const with #define

This commit is contained in:
AffectedArc07
2020-01-28 21:25:20 +00:00
parent 076ef673cd
commit c64bc93649
269 changed files with 1481 additions and 1474 deletions
+2 -2
View File
@@ -55,7 +55,7 @@
max_integrity = 200
integrity_failure = 50
resistance_flags = FIRE_PROOF
req_access = list(access_engine_equip)
req_access = list(ACCESS_ENGINE_EQUIP)
siemens_strength = 1
damage_deflection = 10
var/area/area
@@ -128,7 +128,7 @@
report_power_alarm = FALSE
/obj/machinery/power/apc/syndicate //general syndicate access
req_access = list(access_syndicate)
req_access = list(ACCESS_SYNDICATE)
report_power_alarm = FALSE
/obj/item/apc_electronics
+19 -19
View File
@@ -5,14 +5,14 @@
var/list/gravity_generators = list() // We will keep track of this by adding new gravity generators to the list, and keying it with the z level.
var/const/POWER_IDLE = 0
var/const/POWER_UP = 1
var/const/POWER_DOWN = 2
#define GRAV_POWER_IDLE 0
#define GRAV_POWER_UP 1
#define GRAV_POWER_DOWN 2
var/const/GRAV_NEEDS_SCREWDRIVER = 0
var/const/GRAV_NEEDS_WELDING = 1
var/const/GRAV_NEEDS_PLASTEEL = 2
var/const/GRAV_NEEDS_WRENCH = 3
#define GRAV_NEEDS_SCREWDRIVER 0
#define GRAV_NEEDS_WELDING 1
#define GRAV_NEEDS_PLASTEEL 2
#define GRAV_NEEDS_WRENCH 3
//
// Abstract Generator
@@ -111,7 +111,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
var/breaker = 1
var/list/parts = list()
var/obj/middle = null
var/charging_state = POWER_IDLE
var/charging_state = GRAV_POWER_IDLE
var/charge_count = 100
var/current_overlay = null
var/broken_state = 0
@@ -237,8 +237,8 @@ var/const/GRAV_NEEDS_WRENCH = 3
dat += "<A href='?src=[UID()];gentoggle=1'>ON</A> <span class='linkOn'>OFF</span> "
dat += "<br>Generator Status:<br><div class='statusDisplay'>"
if(charging_state != POWER_IDLE)
dat += "<font class='bad'>WARNING</font> Radiation Detected. <br>[charging_state == POWER_UP ? "Charging..." : "Discharging..."]"
if(charging_state != GRAV_POWER_IDLE)
dat += "<font class='bad'>WARNING</font> Radiation Detected. <br>[charging_state == GRAV_POWER_UP ? "Charging..." : "Discharging..."]"
else if(on)
dat += "Powered."
else
@@ -271,7 +271,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
/obj/machinery/gravity_generator/main/get_status()
if(stat & BROKEN)
return "fix[min(broken_state, 3)]"
return on || charging_state != POWER_IDLE ? "on" : "off"
return on || charging_state != GRAV_POWER_IDLE ? "on" : "off"
/obj/machinery/gravity_generator/main/update_icon()
..()
@@ -286,13 +286,13 @@ var/const/GRAV_NEEDS_WRENCH = 3
else if(breaker)
new_state = 1
charging_state = new_state ? POWER_UP : POWER_DOWN // Startup sequence animation.
investigate_log("is now [charging_state == POWER_UP ? "charging" : "discharging"].", "gravity")
charging_state = new_state ? GRAV_POWER_UP : GRAV_POWER_DOWN // Startup sequence animation.
investigate_log("is now [charging_state == GRAV_POWER_UP ? "charging" : "discharging"].", "gravity")
update_icon()
// Set the state of the gravity.
/obj/machinery/gravity_generator/main/proc/set_state(var/new_state)
charging_state = POWER_IDLE
charging_state = GRAV_POWER_IDLE
on = new_state
use_power = on ? ACTIVE_POWER_USE : IDLE_POWER_USE
// Sound the alert if gravity was just enabled or disabled.
@@ -326,15 +326,15 @@ var/const/GRAV_NEEDS_WRENCH = 3
/obj/machinery/gravity_generator/main/process()
if(stat & BROKEN)
return
if(charging_state != POWER_IDLE)
if(charging_state == POWER_UP && charge_count >= 100)
if(charging_state != GRAV_POWER_IDLE)
if(charging_state == GRAV_POWER_UP && charge_count >= 100)
set_state(1)
else if(charging_state == POWER_DOWN && charge_count <= 0)
else if(charging_state == GRAV_POWER_DOWN && charge_count <= 0)
set_state(0)
else
if(charging_state == POWER_UP)
if(charging_state == GRAV_POWER_UP)
charge_count += 2
else if(charging_state == POWER_DOWN)
else if(charging_state == GRAV_POWER_DOWN)
charge_count -= 2
if(charge_count % 4 == 0 && prob(75)) // Let them know it is charging/discharging.
+1 -1
View File
@@ -7,7 +7,7 @@ var/global/list/rad_collectors = list()
icon_state = "ca"
anchored = 0
density = 1
req_access = list(access_engine_equip)
req_access = list(ACCESS_ENGINE_EQUIP)
// use_power = NO_POWER_USE
max_integrity = 350
integrity_failure = 80
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "emitter"
anchored = 0
density = 1
req_access = list(access_engine_equip)
req_access = list(ACCESS_ENGINE_EQUIP)
use_power = NO_POWER_USE
idle_power_usage = 10