diff --git a/code/game/mecha/components/armor.dm b/code/game/mecha/components/armor.dm index b64c37bca5..ac4ce81ec5 100644 --- a/code/game/mecha/components/armor.dm +++ b/code/game/mecha/components/armor.dm @@ -92,7 +92,7 @@ /obj/item/mecha_parts/component/armor/military name = "military grade mecha plating" - step_delay = 6 + step_delay = 4 max_integrity = 100 @@ -121,14 +121,14 @@ typepass = TRUE if(typepass) - step_delay = 3 + step_delay = 0 else step_delay = initial(step_delay) /obj/item/mecha_parts/component/armor/marshal name = "marshal mecha plating" - step_delay = 5 + step_delay = 3 max_integrity = 100 @@ -215,7 +215,7 @@ /obj/item/mecha_parts/component/armor/alien name = "strange mecha plating" - step_delay = 3 + step_delay = 2 damage_absorption = list( "brute"=0.7, "fire"=0.7, diff --git a/code/game/mecha/equipment/tools/armor_melee.dm b/code/game/mecha/equipment/tools/armor_melee.dm index 085148d938..ed5724ce64 100644 --- a/code/game/mecha/equipment/tools/armor_melee.dm +++ b/code/game/mecha/equipment/tools/armor_melee.dm @@ -9,7 +9,7 @@ var/deflect_coeff = 1.15 var/damage_coeff = 0.8 - step_delay = 1 + step_delay = 0.5 equip_type = EQUIP_HULL diff --git a/code/game/mecha/equipment/tools/armor_ranged.dm b/code/game/mecha/equipment/tools/armor_ranged.dm index 5b8d6d8172..e1a06bef2d 100644 --- a/code/game/mecha/equipment/tools/armor_ranged.dm +++ b/code/game/mecha/equipment/tools/armor_ranged.dm @@ -9,7 +9,7 @@ var/deflect_coeff = 1.15 var/damage_coeff = 0.8 - step_delay = 2 + step_delay = 1 equip_type = EQUIP_HULL diff --git a/code/game/mecha/equipment/tools/shield.dm b/code/game/mecha/equipment/tools/shield.dm index 453c2ba9da..ce0c43e7da 100644 --- a/code/game/mecha/equipment/tools/shield.dm +++ b/code/game/mecha/equipment/tools/shield.dm @@ -7,7 +7,7 @@ energy_drain = 20 range = 0 - step_delay = 1 + step_delay = 0.2 var/obj/item/shield_projector/line/exosuit/my_shield = null var/my_shield_type = /obj/item/shield_projector/line/exosuit diff --git a/code/game/mecha/equipment/tools/shield_omni.dm b/code/game/mecha/equipment/tools/shield_omni.dm index aae68ef4cd..ca61a138e4 100644 --- a/code/game/mecha/equipment/tools/shield_omni.dm +++ b/code/game/mecha/equipment/tools/shield_omni.dm @@ -9,7 +9,7 @@ energy_drain = OMNI_SHIELD_DRAIN range = 0 - step_delay = 1 + step_delay = 0.2 var/obj/item/shield_projector/shields = null var/shield_type = /obj/item/shield_projector/rectangle/mecha @@ -48,7 +48,7 @@ log_message("Activated.") else set_ready_state(1) - step_delay = 1 + step_delay = initial(step_delay) log_message("Deactivated.") /obj/item/mecha_parts/mecha_equipment/omni_shield/Topic(href, href_list) diff --git a/code/game/mecha/equipment/weapons/ballistic/shotgun.dm b/code/game/mecha/equipment/weapons/ballistic/shotgun.dm index e6b12d8ebd..e698248b7f 100644 --- a/code/game/mecha/equipment/weapons/ballistic/shotgun.dm +++ b/code/game/mecha/equipment/weapons/ballistic/shotgun.dm @@ -11,7 +11,7 @@ deviation = 0.7 projectile_energy_cost = 25 - step_delay = 2 + step_delay = 0.5 origin_tech = list(TECH_MATERIAL = 3, TECH_COMBAT = 4) diff --git a/code/game/mecha/equipment/weapons/energy/laser.dm b/code/game/mecha/equipment/weapons/energy/laser.dm index 0dfcbd1328..5a480a9691 100644 --- a/code/game/mecha/equipment/weapons/energy/laser.dm +++ b/code/game/mecha/equipment/weapons/energy/laser.dm @@ -52,7 +52,7 @@ projectile = /obj/item/projectile/beam/heavylaser fire_sound = 'sound/weapons/lasercannonfire.ogg' - step_delay = 2 + step_delay = 1 origin_tech = list(TECH_MATERIAL = 3, TECH_COMBAT = 4, TECH_MAGNET = 4) diff --git a/code/game/mecha/equipment/weapons/explosive/missile.dm b/code/game/mecha/equipment/weapons/explosive/missile.dm index df8cf0c3bb..9ff28ade8e 100644 --- a/code/game/mecha/equipment/weapons/explosive/missile.dm +++ b/code/game/mecha/equipment/weapons/explosive/missile.dm @@ -2,7 +2,7 @@ var/missile_speed = 2 var/missile_range = 30 - step_delay = 2 + step_delay = 0.5 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/Fire(atom/movable/AM, atom/target, turf/aimloc) AM.throw_at(target,missile_range, missile_speed, chassis) diff --git a/code/game/mecha/equipment/weapons/fire/flamethrower.dm b/code/game/mecha/equipment/weapons/fire/flamethrower.dm index 532c35a6b4..5e2d79615c 100644 --- a/code/game/mecha/equipment/weapons/fire/flamethrower.dm +++ b/code/game/mecha/equipment/weapons/fire/flamethrower.dm @@ -7,7 +7,7 @@ energy_drain = 30 - step_delay = 2 + step_delay = 0.5 projectile = /obj/item/projectile/bullet/incendiary/flamethrower/large fire_sound = 'sound/weapons/towelwipe.ogg' diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 9dccf551c9..fa7e2005c6 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -12,7 +12,7 @@ var/auto_rearm = 0 //Does the weapon reload itself after each shot? required_type = list(/obj/mecha/combat, /obj/mecha/working/hoverpod/combatpod) - step_delay = 1 + step_delay = 0.1 equip_type = EQUIP_WEAPON diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index cb48955d0d..bfdb4508e9 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -674,7 +674,7 @@ break break - return max(1, round(tally)) + return max(1, round(tally, 0.1)) /obj/mecha/proc/dyndomove(direction) if(!can_move) diff --git a/code/modules/research/designs/circuits/circuits.dm b/code/modules/research/designs/circuits/circuits.dm index 425223ffe7..008d1f486b 100644 --- a/code/modules/research/designs/circuits/circuits.dm +++ b/code/modules/research/designs/circuits/circuits.dm @@ -494,7 +494,7 @@ CIRCUITS BELOW id = "durand_main" req_tech = list(TECH_DATA = 4) materials = list("glass" = 2000, MAT_GRAPHITE = 1250) - chemicals = list("pacid" = 20) + chemicals = list("sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/durand/main sort_string = "NAADA" @@ -503,7 +503,7 @@ CIRCUITS BELOW id = "durand_peri" req_tech = list(TECH_DATA = 4) materials = list("glass" = 2000, MAT_GRAPHITE = 1250) - chemicals = list("pacid" = 20) + chemicals = list("sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/durand/peripherals sort_string = "NAADB" @@ -512,7 +512,7 @@ CIRCUITS BELOW id = "durand_targ" req_tech = list(TECH_DATA = 4, TECH_COMBAT = 2) materials = list("glass" = 2000, MAT_GRAPHITE = 1250) - chemicals = list("pacid" = 20) + chemicals = list("sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/durand/targeting sort_string = "NAADC" diff --git a/code/modules/research/mechfab_designs.dm b/code/modules/research/mechfab_designs.dm index a5031055c3..8e7f31b731 100644 --- a/code/modules/research/mechfab_designs.dm +++ b/code/modules/research/mechfab_designs.dm @@ -184,49 +184,49 @@ name = "Durand Torso" id = "durand_torso" build_path = /obj/item/mecha_parts/part/durand_torso - time = 60 + time = 30 materials = list(DEFAULT_WALL_MATERIAL = 41250, MAT_PLASTEEL = 15000, "silver" = 7500) /datum/design/item/mechfab/durand/head name = "Durand Head" id = "durand_head" build_path = /obj/item/mecha_parts/part/durand_head - time = 40 + time = 20 materials = list(DEFAULT_WALL_MATERIAL = 18750, "glass" = 7500, "silver" = 2250) /datum/design/item/mechfab/durand/left_arm name = "Durand Left Arm" id = "durand_left_arm" build_path = /obj/item/mecha_parts/part/durand_left_arm - time = 40 + time = 20 materials = list(DEFAULT_WALL_MATERIAL = 26250, "silver" = 2250) /datum/design/item/mechfab/durand/right_arm name = "Durand Right Arm" id = "durand_right_arm" build_path = /obj/item/mecha_parts/part/durand_right_arm - time = 40 + time = 20 materials = list(DEFAULT_WALL_MATERIAL = 26250, "silver" = 2250) /datum/design/item/mechfab/durand/left_leg name = "Durand Left Leg" id = "durand_left_leg" build_path = /obj/item/mecha_parts/part/durand_left_leg - time = 40 + time = 20 materials = list(DEFAULT_WALL_MATERIAL = 30000, "silver" = 2250) /datum/design/item/mechfab/durand/right_leg name = "Durand Right Leg" id = "durand_right_leg" build_path = /obj/item/mecha_parts/part/durand_right_leg - time = 40 + time = 20 materials = list(DEFAULT_WALL_MATERIAL = 30000, "silver" = 2250) /datum/design/item/mechfab/durand/armour name = "Durand Armour Plates" id = "durand_armour" build_path = /obj/item/mecha_parts/part/durand_armour - time = 90 + time = 60 materials = list(DEFAULT_WALL_MATERIAL = 27500, MAT_PLASTEEL = 10000, "uranium" = 7500) /datum/design/item/mechfab/janus @@ -1043,7 +1043,7 @@ /datum/design/item/mechfab/exointernal category = "Exosuit Internals" - time = 120 + time = 30 req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3) /datum/design/item/mechfab/exointernal/stan_armor