mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-22 08:01:06 +00:00
8c1e92edcd
The armour and armor again strikes:
Apparently original Mech port PR has overridden borg's armor definition and was using it. This fixes it by making mech's armor a child of borg's armor instead.
renames borg's armour to armor references.
Mech's melee damage has been increased. It depends on manipulator type. Light: 15, Regular: 20, Combat 30, Heavy: 50. Fixes #7665
Adds missed check in mech's destroy proc
27 lines
1.5 KiB
Plaintext
27 lines
1.5 KiB
Plaintext
/*/datum/extension/armor/exosuit/apply_damage_modifications(damage, damage_type, damage_flags, mob/living/victim, armor_pen, silent = TRUE)
|
|
if(prob(get_blocked(damage_type, damage_flags, armor_pen) * 100)) //extra removal of sharp and edge on account of us being big robots
|
|
damage_flags &= ~(DAM_SHARP | DAM_EDGE)
|
|
. = ..()*/
|
|
|
|
/obj/item/robot_parts/robot_component/armor/mech
|
|
name = "exosuit armor plating"
|
|
armor = list(melee = 75, bullet = 33, laser = 50, energy = 10, bomb = 25, bio = 100, rad = 0)
|
|
origin_tech = list(TECH_MATERIAL = 1)
|
|
|
|
/obj/item/robot_parts/robot_component/armor/mech/radproof
|
|
name = "radiation-proof armor plating"
|
|
desc = "A fully enclosed radiation hardened shell designed to protect the pilot from radiation."
|
|
armor = list(melee = 75, bullet = 33, laser = 50, energy = 25, bomb = 25, bio = 100, rad = 100)
|
|
origin_tech = list(TECH_MATERIAL = 3)
|
|
|
|
/obj/item/robot_parts/robot_component/armor/mech/em
|
|
name = "EM-shielded armor plating"
|
|
desc = "A shielded plating that sorrounds the eletronics and protects them from electromagnetic radiation."
|
|
armor = list(melee = 65, bullet = 20, laser = 25, energy = 100, bomb = 10, bio = 100, rad = 60)
|
|
origin_tech = list(TECH_MATERIAL = 3)
|
|
|
|
/obj/item/robot_parts/robot_component/armor/mech/combat
|
|
name = "heavy combat plating"
|
|
desc = "Plating designed to deflect incoming attacks and explosions."
|
|
armor = list(melee = 85, bullet = 70, laser = 60, energy = 10, bomb = 70, bio = 100, rad = 0)
|
|
origin_tech = list(TECH_MATERIAL = 5) |