Merge pull request #3762 from Segrain/master

Small mechafix.
This commit is contained in:
Mloc
2013-10-12 11:56:51 -07:00
2 changed files with 6 additions and 5 deletions
+5 -4
View File
@@ -28,6 +28,10 @@
var/turf/targloc = get_turf(target)
if(!curloc || !targloc)
return
chassis.use_power(energy_drain)
chassis.visible_message("<span class='warning'>[chassis] fires [src]!</span>")
occupant_message("<span class='warning'>You fire [src]!</span>")
log_message("Fired from [src], targeting [target].")
for(var/i = 1 to min(projectiles, projectiles_per_shot))
var/turf/aimloc = targloc
if(deviation)
@@ -43,10 +47,6 @@
if(auto_rearm)
projectiles = projectiles_per_shot
set_ready_state(0)
chassis.use_power(energy_drain)
chassis.visible_message("<span class='warning'>[chassis] fires [src]!</span>")
occupant_message("<span class='warning'>You fire [src]!</span>")
log_message("Fired from [src], targeting [target].")
do_after_cooldown()
return
@@ -223,6 +223,7 @@
projectiles_per_shot = 3
deviation = 0.3
projectile_energy_cost = 20
fire_cooldown = 2
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack
var/missile_speed = 2
+1 -1
View File
@@ -6,7 +6,7 @@
name = "mecha part"
icon = 'icons/mecha/mech_construct.dmi'
icon_state = "blank"
w_class = 20
w_class = 5
flags = FPRINT | TABLEPASS | CONDUCT
origin_tech = "programming=2;materials=2"
var/construction_time = 100