cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-21 04:48:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing Mechs more. The fight between armor and armour (#7723)

Browse Source 
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
This commit is contained in:
Mykhailo Bykhovtsev
2019-12-19 11:41:23 -08:00
committed by Erki
parent 6295c336fd
commit 8c1e92edcd
13 changed files with 75 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/heavy_vehicle/components/armor.dm
+4 -4
View File
@@ -3,24 +3,24 @@
damage_flags &= ~(DAM_SHARP | DAM_EDGE)
. = ..()*/
/obj/item/robot_parts/robot_component/armor
/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/radproof
/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/em
/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/combat
/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)
code/modules/heavy_vehicle/components/arms.dm
+1 -1
View File
@@ -5,7 +5,7 @@
has_hardpoints = list(HARDPOINT_LEFT_HAND, HARDPOINT_RIGHT_HAND)
power_use = 50
var/melee_damage = 15
var/melee_damage = 20
var/action_delay = 15
var/obj/item/robot_parts/robot_component/actuator/motivator
code/modules/heavy_vehicle/components/body.dm
+1 -1
View File
@@ -98,7 +98,7 @@
to_chat(user, "<span class='warning'>\The [src] already has a cell installed.</span>")
return
if(install_component(thing,user)) cell = thing
else if(istype(thing, /obj/item/robot_parts/robot_component/armor))
else if(istype(thing, /obj/item/robot_parts/robot_component/armor/mech))
if(mech_armor)
to_chat(user, "<span class='warning'>\The [src] already has mech_armor installed.</span>")
return
code/modules/heavy_vehicle/mech_construction.dm
+2 -1
View File
@@ -39,7 +39,8 @@
target = hardpoint
break
hardpoints[target] = null
if(target)
hardpoints[target] = null
if(target == selected_hardpoint)
clear_selected_hardpoint()
code/modules/heavy_vehicle/premade/combat.dm
+2 -2
View File
@@ -28,7 +28,7 @@
name = "combat arms"
exosuit_desc_string = "flexible, advanced manipulators"
icon_state = "combat_arms"
melee_damage = 5
melee_damage = 30
action_delay = 10
power_use = 5000
@@ -66,7 +66,7 @@
/obj/item/mech_component/chassis/combat/prebuild()
. = ..()
mech_armor = new /obj/item/robot_parts/robot_component/armor/combat(src)
mech_armor = new /obj/item/robot_parts/robot_component/armor/mech/combat(src)
/obj/item/mech_component/chassis/combat/Initialize()
pilot_positions = list(
code/modules/heavy_vehicle/premade/heavy.dm
+3 -3
View File
@@ -27,7 +27,7 @@
exosuit_desc_string = "super-heavy reinforced manipulators"
icon_state = "heavy_arms"
desc = "Designed to function where any other piece of equipment would have long fallen apart, the Hephaestus Superheavy Lifter series can take a beating and excel at delivering it."
melee_damage = 25
melee_damage = 50
action_delay = 15
max_damage = 90
power_use = 7500
@@ -68,7 +68,7 @@
/obj/item/mech_component/chassis/heavy/prebuild()
. = ..()
mech_armor = new /obj/item/robot_parts/robot_component/armor/combat(src)
mech_armor = new /obj/item/robot_parts/robot_component/armor/mech/combat(src)
/obj/item/mech_component/chassis/superheavy
name = "reinforced exosuit chassis"
@@ -84,7 +84,7 @@
/obj/item/mech_component/chassis/superheavy/prebuild()
. = ..()
cell = new /obj/item/cell/super(src)
mech_armor = new /obj/item/robot_parts/robot_component/armor/combat(src)
mech_armor = new /obj/item/robot_parts/robot_component/armor/mech/combat(src)
/mob/living/heavy_vehicle/premade/superheavy
name = "Marauder"
code/modules/heavy_vehicle/premade/light.dm
+2 -2
View File
@@ -29,7 +29,7 @@
name = "light arms"
exosuit_desc_string = "lightweight, segmented manipulators"
icon_state = "light_arms"
melee_damage = 5
melee_damage = 15
action_delay = 15
max_damage = 40
power_use = 3000
@@ -76,7 +76,7 @@
/obj/item/mech_component/chassis/light/prebuild()
. = ..()
mech_armor = new /obj/item/robot_parts/robot_component/armor/radproof(src)
mech_armor = new /obj/item/robot_parts/robot_component/armor/mech/radproof(src)
/obj/item/mech_component/chassis/light/Initialize()
pilot_positions = list(
code/modules/heavy_vehicle/premade/powerloader.dm
+3 -3
View File
@@ -16,7 +16,7 @@
body = new /obj/item/mech_component/chassis/ripley(src)
body.color = "#ffdc37"
body.armor = new /obj/item/robot_parts/robot_component/armour(src)
body.armor = new /obj/item/robot_parts/robot_component/armor/mech(src)
. = ..()
@@ -65,7 +65,7 @@
/obj/item/mech_component/chassis/ripley/prebuild()
. = ..()
armor = new /obj/item/robot_parts/robot_component/armour(src)
armor = new /obj/item/robot_parts/robot_component/armor/mech(src)
/obj/item/mech_component/chassis/ripley/Initialize()
pilot_positions = list(
@@ -149,7 +149,7 @@
body = new /obj/item/mech_component/chassis/ripley(src)
body.color = "#849bc1"
body.mech_armor = new /obj/item/robot_parts/robot_component/armor/combat(src)
body.mech_armor = new /obj/item/robot_parts/robot_component/armor/mech/combat(src)
. = ..()
code/modules/mob/living/silicon/robot/component.dm
+5 -5
View File
@@ -77,9 +77,9 @@
// ARMOUR
// Protects the cyborg from damage. Usually first module to be hit
// No power usage
/datum/robot_component/armour
/datum/robot_component/armor
name = "armour plating"
external_type = /obj/item/robot_parts/robot_component/armour
external_type = /obj/item/robot_parts/robot_component/armor
max_damage = 60
// JETPACK
@@ -232,7 +232,7 @@
components["diagnosis unit"] = new/datum/robot_component/diagnosis_unit(src)
components["camera"] = new/datum/robot_component/camera(src)
components["comms"] = new/datum/robot_component/binary_communication(src)
components["armour"] = new/datum/robot_component/armour(src)
components["armour"] = new/datum/robot_component/armor(src)
components["jetpack"] = new/datum/robot_component/jetpack(src)
components["surge"] = new/datum/robot_component/surge(src)
jetpackComponent = components["jetpack"]
@@ -297,8 +297,8 @@
icon_state = "motor"
icon_state_broken = "motor_broken"
/obj/item/robot_parts/robot_component/armour
name = "armour plating"
/obj/item/robot_parts/robot_component/armor
name = "armor plating"
icon_state = "armor"
icon_state_broken = "armor_broken"
code/modules/mob/living/silicon/robot/robot_damage.dm
+2 -2
View File
@@ -91,7 +91,7 @@
to_chat(src, "<span class='warning'>Your shield absorbs some of the impact!</span>")
if(!emp)
var/datum/robot_component/armour/A = get_armour()
var/datum/robot_component/armor/A = get_armour()
if(A)
A.take_damage(brute,burn,sharp,edge)
return
@@ -136,7 +136,7 @@
burn -= absorb_burn
to_chat(src, "<span class='warning'>Your shield absorbs some of the impact!</span>")
var/datum/robot_component/armour/A = get_armour()
var/datum/robot_component/armor/A = get_armour()
if(A)
A.take_damage(brute,burn,sharp)
return
code/modules/research/designs/mechfab/mechs/designs_exosuits.dm
+4 -4
View File
@@ -49,14 +49,14 @@
/datum/design/item/mechfab/exosuit/basic_armour
name = "basic exosuit armour"
id = "mech_armour_basic"
build_path = /obj/item/robot_parts/robot_component/armour
build_path = /obj/item/robot_parts/robot_component/armor/mech
time = 30
materials = list(DEFAULT_WALL_MATERIAL = 7500)
/datum/design/item/mechfab/exosuit/radproof_armour
name = "radiation-proof exosuit armour"
id = "mech_armour_radproof"
build_path = /obj/item/robot_parts/robot_component/armor/radproof
build_path = /obj/item/robot_parts/robot_component/armor/mech/radproof
time = 50
req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2)
materials = list(DEFAULT_WALL_MATERIAL = 12500)
@@ -64,7 +64,7 @@
/datum/design/item/mechfab/exosuit/em_armour
name = "EM-shielded exosuit armour"
id = "mech_armour_em"
build_path = /obj/item/robot_parts/robot_component/armor/em
build_path = /obj/item/robot_parts/robot_component/armor/mech/em
time = 50
req_tech = list(TECH_MATERIAL = 2, TECH_POWER = 2)
materials = list(DEFAULT_WALL_MATERIAL = 12500, "silver" = 1000)
@@ -72,7 +72,7 @@
/datum/design/item/mechfab/exosuit/combat_armour
name = "combat exosuit armor"
id = "mech_armour_combat"
build_path = /obj/item/robot_parts/robot_component/armor/combat
build_path = /obj/item/robot_parts/robot_component/armor/mech/combat
time = 50
req_tech = list(TECH_MATERIAL = 4, TECH_COMBAT = 3)
materials = list(DEFAULT_WALL_MATERIAL = 20000, "diamond" = 5000)
code/modules/research/designs/mechfab/robot/robot.dm
+4 -4
View File
@@ -97,10 +97,10 @@
id = "camera"
build_path = /obj/item/robot_parts/robot_component/camera
/datum/design/item/mechfab/robot/component/armour
name = "Armour plating"
id = "armour"
build_path = /obj/item/robot_parts/robot_component/armour
/datum/design/item/mechfab/robot/component/armor
name = "Armor plating"
id = "armor"
build_path = /obj/item/robot_parts/robot_component/armor
/datum/design/item/mechfab/robot/component/surge
name = "Heavy surge prevention module"