cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 16:38:22 +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 21:41:23 +02: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/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