cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Exosuit Upkeep (#7473)

Browse Source 
* Exosuit upkeep, lower slowdown of Durand and Gygax components, guns now slow far less.

* Time time time.

* Seeds survive. For now.
This commit is contained in:
Mechoid
2020-08-17 15:19:20 -07:00
committed by VirgoBot
parent db03f17102
commit ccd5993b38
13 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/mecha/components/armor.dm
View File

@@ -92,7 +92,7 @@
/obj/item/mecha_parts/component/armor/military /obj/item/mecha_parts/component/armor/military
name = "military grade mecha plating" name = "military grade mecha plating"
step_delay = 6 step_delay = 4
max_integrity = 100 max_integrity = 100
@@ -121,14 +121,14 @@
typepass = TRUE typepass = TRUE
if(typepass) if(typepass)
step_delay = 3 step_delay = 0
else else
step_delay = initial(step_delay) step_delay = initial(step_delay)
/obj/item/mecha_parts/component/armor/marshal /obj/item/mecha_parts/component/armor/marshal
name = "marshal mecha plating" name = "marshal mecha plating"
step_delay = 5 step_delay = 3
max_integrity = 100 max_integrity = 100
@@ -215,7 +215,7 @@
/obj/item/mecha_parts/component/armor/alien /obj/item/mecha_parts/component/armor/alien
name = "strange mecha plating" name = "strange mecha plating"
step_delay = 3 step_delay = 2
damage_absorption = list( damage_absorption = list(
"brute"=0.7, "brute"=0.7,
"fire"=0.7, "fire"=0.7,

2
code/game/mecha/equipment/tools/armor_melee.dm
View File

@@ -9,7 +9,7 @@
var/deflect_coeff = 1.15 var/deflect_coeff = 1.15
var/damage_coeff = 0.8 var/damage_coeff = 0.8
step_delay = 1 step_delay = 0.5
equip_type = EQUIP_HULL equip_type = EQUIP_HULL

2
code/game/mecha/equipment/tools/armor_ranged.dm
View File

@@ -9,7 +9,7 @@
var/deflect_coeff = 1.15 var/deflect_coeff = 1.15
var/damage_coeff = 0.8 var/damage_coeff = 0.8
step_delay = 2 step_delay = 1
equip_type = EQUIP_HULL equip_type = EQUIP_HULL

2
code/game/mecha/equipment/tools/shield.dm
View File

@@ -7,7 +7,7 @@
energy_drain = 20 energy_drain = 20
range = 0 range = 0
step_delay = 1 step_delay = 0.2
var/obj/item/shield_projector/line/exosuit/my_shield = null var/obj/item/shield_projector/line/exosuit/my_shield = null
var/my_shield_type = /obj/item/shield_projector/line/exosuit var/my_shield_type = /obj/item/shield_projector/line/exosuit

4
code/game/mecha/equipment/tools/shield_omni.dm
View File

@@ -9,7 +9,7 @@
energy_drain = OMNI_SHIELD_DRAIN energy_drain = OMNI_SHIELD_DRAIN
range = 0 range = 0
step_delay = 1 step_delay = 0.2
var/obj/item/shield_projector/shields = null var/obj/item/shield_projector/shields = null
var/shield_type = /obj/item/shield_projector/rectangle/mecha var/shield_type = /obj/item/shield_projector/rectangle/mecha
@@ -48,7 +48,7 @@
log_message("Activated.") log_message("Activated.")
else else
set_ready_state(1) set_ready_state(1)
step_delay = 1 step_delay = initial(step_delay)
log_message("Deactivated.") log_message("Deactivated.")
/obj/item/mecha_parts/mecha_equipment/omni_shield/Topic(href, href_list) /obj/item/mecha_parts/mecha_equipment/omni_shield/Topic(href, href_list)

2
code/game/mecha/equipment/weapons/ballistic/shotgun.dm
View File

@@ -11,7 +11,7 @@
deviation = 0.7 deviation = 0.7
projectile_energy_cost = 25 projectile_energy_cost = 25
step_delay = 2 step_delay = 0.5
origin_tech = list(TECH_MATERIAL = 3, TECH_COMBAT = 4) origin_tech = list(TECH_MATERIAL = 3, TECH_COMBAT = 4)

2
code/game/mecha/equipment/weapons/energy/laser.dm
View File

@@ -52,7 +52,7 @@
projectile = /obj/item/projectile/beam/heavylaser projectile = /obj/item/projectile/beam/heavylaser
fire_sound = 'sound/weapons/lasercannonfire.ogg' fire_sound = 'sound/weapons/lasercannonfire.ogg'
step_delay = 2 step_delay = 1
origin_tech = list(TECH_MATERIAL = 3, TECH_COMBAT = 4, TECH_MAGNET = 4) origin_tech = list(TECH_MATERIAL = 3, TECH_COMBAT = 4, TECH_MAGNET = 4)

2
code/game/mecha/equipment/weapons/explosive/missile.dm
View File

@@ -2,7 +2,7 @@
var/missile_speed = 2 var/missile_speed = 2
var/missile_range = 30 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) /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) AM.throw_at(target,missile_range, missile_speed, chassis)

2
code/game/mecha/equipment/weapons/fire/flamethrower.dm
View File

@@ -7,7 +7,7 @@
energy_drain = 30 energy_drain = 30
step_delay = 2 step_delay = 0.5
projectile = /obj/item/projectile/bullet/incendiary/flamethrower/large projectile = /obj/item/projectile/bullet/incendiary/flamethrower/large
fire_sound = 'sound/weapons/towelwipe.ogg' fire_sound = 'sound/weapons/towelwipe.ogg'

2
code/game/mecha/equipment/weapons/weapons.dm
View File

@@ -12,7 +12,7 @@
var/auto_rearm = 0 //Does the weapon reload itself after each shot? var/auto_rearm = 0 //Does the weapon reload itself after each shot?
required_type = list(/obj/mecha/combat, /obj/mecha/working/hoverpod/combatpod) required_type = list(/obj/mecha/combat, /obj/mecha/working/hoverpod/combatpod)
step_delay = 1 step_delay = 0.1
equip_type = EQUIP_WEAPON equip_type = EQUIP_WEAPON

2
code/game/mecha/mecha.dm
View File

@@ -674,7 +674,7 @@
break break
break break
return max(1, round(tally)) return max(1, round(tally, 0.1))
/obj/mecha/proc/dyndomove(direction) /obj/mecha/proc/dyndomove(direction)
if(!can_move) if(!can_move)

6
code/modules/research/designs/circuits/circuits.dm
View File

@@ -494,7 +494,7 @@ CIRCUITS BELOW
id = "durand_main" id = "durand_main"
req_tech = list(TECH_DATA = 4) req_tech = list(TECH_DATA = 4)
materials = list("glass" = 2000, MAT_GRAPHITE = 1250) materials = list("glass" = 2000, MAT_GRAPHITE = 1250)
chemicals = list("pacid" = 20) chemicals = list("sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/durand/main build_path = /obj/item/weapon/circuitboard/mecha/durand/main
sort_string = "NAADA" sort_string = "NAADA"
@@ -503,7 +503,7 @@ CIRCUITS BELOW
id = "durand_peri" id = "durand_peri"
req_tech = list(TECH_DATA = 4) req_tech = list(TECH_DATA = 4)
materials = list("glass" = 2000, MAT_GRAPHITE = 1250) materials = list("glass" = 2000, MAT_GRAPHITE = 1250)
chemicals = list("pacid" = 20) chemicals = list("sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/durand/peripherals build_path = /obj/item/weapon/circuitboard/mecha/durand/peripherals
sort_string = "NAADB" sort_string = "NAADB"
@@ -512,7 +512,7 @@ CIRCUITS BELOW
id = "durand_targ" id = "durand_targ"
req_tech = list(TECH_DATA = 4, TECH_COMBAT = 2) req_tech = list(TECH_DATA = 4, TECH_COMBAT = 2)
materials = list("glass" = 2000, MAT_GRAPHITE = 1250) materials = list("glass" = 2000, MAT_GRAPHITE = 1250)
chemicals = list("pacid" = 20) chemicals = list("sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/durand/targeting build_path = /obj/item/weapon/circuitboard/mecha/durand/targeting
sort_string = "NAADC" sort_string = "NAADC"

16
code/modules/research/mechfab_designs.dm
View File

@@ -184,49 +184,49 @@
name = "Durand Torso" name = "Durand Torso"
id = "durand_torso" id = "durand_torso"
build_path = /obj/item/mecha_parts/part/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) materials = list(DEFAULT_WALL_MATERIAL = 41250, MAT_PLASTEEL = 15000, "silver" = 7500)
/datum/design/item/mechfab/durand/head /datum/design/item/mechfab/durand/head
name = "Durand Head" name = "Durand Head"
id = "durand_head" id = "durand_head"
build_path = /obj/item/mecha_parts/part/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) materials = list(DEFAULT_WALL_MATERIAL = 18750, "glass" = 7500, "silver" = 2250)
/datum/design/item/mechfab/durand/left_arm /datum/design/item/mechfab/durand/left_arm
name = "Durand Left Arm" name = "Durand Left Arm"
id = "durand_left_arm" id = "durand_left_arm"
build_path = /obj/item/mecha_parts/part/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) materials = list(DEFAULT_WALL_MATERIAL = 26250, "silver" = 2250)
/datum/design/item/mechfab/durand/right_arm /datum/design/item/mechfab/durand/right_arm
name = "Durand Right Arm" name = "Durand Right Arm"
id = "durand_right_arm" id = "durand_right_arm"
build_path = /obj/item/mecha_parts/part/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) materials = list(DEFAULT_WALL_MATERIAL = 26250, "silver" = 2250)
/datum/design/item/mechfab/durand/left_leg /datum/design/item/mechfab/durand/left_leg
name = "Durand Left Leg" name = "Durand Left Leg"
id = "durand_left_leg" id = "durand_left_leg"
build_path = /obj/item/mecha_parts/part/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) materials = list(DEFAULT_WALL_MATERIAL = 30000, "silver" = 2250)
/datum/design/item/mechfab/durand/right_leg /datum/design/item/mechfab/durand/right_leg
name = "Durand Right Leg" name = "Durand Right Leg"
id = "durand_right_leg" id = "durand_right_leg"
build_path = /obj/item/mecha_parts/part/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) materials = list(DEFAULT_WALL_MATERIAL = 30000, "silver" = 2250)
/datum/design/item/mechfab/durand/armour /datum/design/item/mechfab/durand/armour
name = "Durand Armour Plates" name = "Durand Armour Plates"
id = "durand_armour" id = "durand_armour"
build_path = /obj/item/mecha_parts/part/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) materials = list(DEFAULT_WALL_MATERIAL = 27500, MAT_PLASTEEL = 10000, "uranium" = 7500)
/datum/design/item/mechfab/janus /datum/design/item/mechfab/janus
@@ -1043,7 +1043,7 @@
/datum/design/item/mechfab/exointernal /datum/design/item/mechfab/exointernal
category = "Exosuit Internals" category = "Exosuit Internals"
time = 120 time = 30
req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3) req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3)
/datum/design/item/mechfab/exointernal/stan_armor /datum/design/item/mechfab/exointernal/stan_armor