use_power var now uses a define to reflect it not being a bool (#1842)

This commit is contained in:
CitadelStationBot
2017-06-30 22:41:59 -05:00
committed by kevinz000
parent c32da6e2cb
commit 9d5e51777b
103 changed files with 155 additions and 149 deletions
+1 -1
View File
@@ -9,7 +9,7 @@ GLOBAL_LIST_EMPTY(rad_collectors)
anchored = 0
density = 1
req_access = list(GLOB.access_engine_equip)
// use_power = 0
// use_power = NO_POWER_USE
obj_integrity = 350
max_integrity = 350
integrity_failure = 80
@@ -8,7 +8,7 @@
anchored = 1
density = 0
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
use_power = 0
use_power = NO_POWER_USE
luminosity = 4
layer = ABOVE_OBJ_LAYER
var/obj/machinery/field/generator/FG1 = null
+2 -2
View File
@@ -13,7 +13,7 @@
var/charge = 0
var/atom/target = null
use_power = 0
use_power = NO_POWER_USE
idle_power_usage = 10
active_power_usage = 300
@@ -153,7 +153,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
@@ -25,7 +25,7 @@ field_generator power level display
icon_state = "Field_Gen"
anchored = 0
density = 1
use_power = 0
use_power = NO_POWER_USE
obj_integrity = 500
max_integrity = 500
//100% immune to lasers and energy projectiles since it absorbs their energy.
+1 -1
View File
@@ -6,7 +6,7 @@
icon_state = "TheSingGen"
anchored = 0
density = 1
use_power = 0
use_power = NO_POWER_USE
resistance_flags = FIRE_PROOF
// You can buckle someone to the singularity generator, then start the engine. Fun!
@@ -5,7 +5,7 @@
icon_state = "control_box"
anchored = 0
density = 1
use_power = 0
use_power = NO_POWER_USE
idle_power_usage = 500
active_power_usage = 10000
dir = NORTH
@@ -43,7 +43,7 @@
/obj/machinery/particle_accelerator/control_box/proc/update_state()
if(construction_state < PA_CONSTRUCTION_COMPLETE)
use_power = 0
use_power = NO_POWER_USE
assembled = 0
active = 0
for(var/CP in connected_parts)
@@ -54,7 +54,7 @@
connected_parts.Cut()
return
if(!part_scan())
use_power = 1
use_power = IDLE_POWER_USE
active = 0
connected_parts.Cut()
@@ -136,9 +136,9 @@
..()
if(stat & NOPOWER)
active = 0
use_power = 0
use_power = NO_POWER_USE
else if(!stat && construction_state == PA_CONSTRUCTION_COMPLETE)
use_power = 1
use_power = IDLE_POWER_USE
/obj/machinery/particle_accelerator/control_box/process()
if(active)
@@ -208,14 +208,14 @@
message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? key_name_admin(usr) : "outside forces"](<A HREF='?_src_=holder;adminmoreinfo=\ref[usr]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[usr]'>FLW</A>) in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
log_game("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? "[key_name(usr)]" : "outside forces"] in ([x],[y],[z])")
if(active)
use_power = 2
use_power = ACTIVE_POWER_USE
for(var/CP in connected_parts)
var/obj/structure/particle_accelerator/part = CP
part.strength = strength
part.powered = 1
part.update_icon()
else
use_power = 1
use_power = IDLE_POWER_USE
for(var/CP in connected_parts)
var/obj/structure/particle_accelerator/part = CP
part.strength = null