Line note fixes (forgot the tesla in the mecha code hue)

This commit is contained in:
Tigercat2000
2016-08-17 13:53:36 -07:00
parent 258f477eb3
commit be79fd01c5
2 changed files with 6 additions and 26 deletions
@@ -348,17 +348,11 @@
var/fuel_per_cycle_active = 100
var/power_per_cycle = 30
/obj/item/mecha_parts/mecha_equipment/generator/New()
..()
generator_init()
/obj/item/mecha_parts/mecha_equipment/generator/Destroy()
processing_objects.Remove(src)
return ..()
/obj/item/mecha_parts/mecha_equipment/generator/proc/generator_init()
fuel_amount = 0
/obj/item/mecha_parts/mecha_equipment/generator/detach()
processing_objects.Remove(src)
..()
@@ -482,9 +476,6 @@
power_per_cycle = 50
var/rad_per_cycle = 0.3
/obj/item/mecha_parts/mecha_equipment/generator/nuclear/generator_init()
fuel_amount = 0
/obj/item/mecha_parts/mecha_equipment/generator/nuclear/critfail()
return
+6 -17
View File
@@ -1320,34 +1320,23 @@
return (get_charge()>=amount)
/obj/mecha/proc/get_charge()
return call((proc_res["dyngetcharge"]||src), "dyngetcharge")()
/obj/mecha/proc/dyngetcharge()//returns null if no powercell, else returns cell.charge
if(!cell) return
diag_hud_set_mechcell()
return max(0, cell.charge)
for(var/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/R in equipment)
var/relay_charge = R.get_charge()
if(relay_charge)
return relay_charge
if(cell)
return max(0, cell.charge)
/obj/mecha/proc/use_power(amount)
return call((proc_res["dynusepower"]||src), "dynusepower")(amount)
/obj/mecha/proc/dynusepower(amount)
if(get_charge())
cell.use(amount)
return 1
//Diagnostic HUD updates
diag_hud_set_mechhealth()
diag_hud_set_mechcell()
diag_hud_set_mechstat()
return 0
/obj/mecha/proc/give_power(amount)
if(!isnull(get_charge()))
cell.give(amount)
return 1
//Diagnostic HUD updates
diag_hud_set_mechhealth()
diag_hud_set_mechcell()
diag_hud_set_mechstat()
return 0
/obj/mecha/proc/reset_icon()