- Made Mech RCDs drain power when decontructing shit instead of recharging, both for consistency and the fact that it was pretty dumb.

- Changed Energy Relays so that they no longer offset equipment drain to APCs while charging from them (Essentially infinite power for the most part), buffed the charge rate so it will compensate for a Ripley's movement as a benchmark.
- Updated tgstation.2.0.9.dmm to remove a stray pipe that was sitting on the arrival shuttle, even though it was being deleted at round-start

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4977 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
sieve32@gmail.com
2012-10-28 22:04:38 +00:00
parent 1879167cd4
commit a3d01da585
2 changed files with 7960 additions and 7961 deletions

View File

@@ -281,7 +281,7 @@
chassis.spark_system.start()
target:ReplaceWithPlating()
playsound(target, 'sound/items/Deconstruct.ogg', 50, 1)
chassis.give_power(energy_drain)
chassis.use_power(energy_drain)
else if (istype(target, /turf/simulated/floor))
occupant_message("Deconstructing [target]...")
set_ready_state(0)
@@ -290,7 +290,7 @@
chassis.spark_system.start()
target:ReplaceWithSpace()
playsound(target, 'sound/items/Deconstruct.ogg', 50, 1)
chassis.give_power(energy_drain)
chassis.use_power(energy_drain)
else if (istype(target, /obj/machinery/door/airlock))
occupant_message("Deconstructing [target]...")
set_ready_state(0)
@@ -299,7 +299,7 @@
chassis.spark_system.start()
del(target)
playsound(target, 'sound/items/Deconstruct.ogg', 50, 1)
chassis.give_power(energy_drain)
chassis.use_power(energy_drain)
if(1)
if(istype(target, /turf/space))
occupant_message("Building Floor...")
@@ -722,7 +722,7 @@
detach()
pr_energy_relay.stop()
chassis.proc_res["dynusepower"] = null
// chassis.proc_res["dynusepower"] = null
chassis.proc_res["dyngetcharge"] = null
..()
return
@@ -730,12 +730,12 @@
attach(obj/mecha/M)
..()
chassis.proc_res["dyngetcharge"] = src
chassis.proc_res["dynusepower"] = src
// chassis.proc_res["dynusepower"] = src
return
can_attach(obj/mecha/M)
if(..())
if(!M.proc_res["dynusepower"] && !M.proc_res["dyngetcharge"])
if(!M.proc_res["dyngetcharge"])// && !M.proc_res["dynusepower"])
return 1
return 0
@@ -775,14 +775,14 @@
if(!chassis) return
return "<span style=\"color:[equip_ready?"#0f0":"#f00"];\">*</span>&nbsp;[src.name] - <a href='?src=\ref[src];toggle_relay=1'>[pr_energy_relay.active()?"Dea":"A"]ctivate</a>"
proc/dynusepower(amount)
/* proc/dynusepower(amount)
if(!equip_ready) //enabled
var/area/A = get_area(chassis)
var/pow_chan = get_power_channel(A)
if(pow_chan)
A.master.use_power(amount*coeff, pow_chan)
return 1
return chassis.dynusepower(amount)
return chassis.dynusepower(amount)*/
/datum/global_iterator/mecha_energy_relay
@@ -806,7 +806,7 @@
pow_chan = c
break
if(pow_chan)
var/delta = min(2, ER.chassis.cell.maxcharge-cur_charge)
var/delta = min(12, ER.chassis.cell.maxcharge-cur_charge)
ER.chassis.give_power(delta)
A.master.use_power(delta*ER.coeff, pow_chan)
return