From 320444fd00be55802569f72f027a40797056ea84 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Mon, 3 Jul 2017 15:17:09 -0300 Subject: [PATCH] Changes ipcs brute mods and fixes some issues with their external organs (#2894) -removes the brute reduction from the regular baseline, because robotic limbs already have those -reduces the industrial brute resist from 0.5 to 0.8, because again robotics limbs already have some -fixes industrial and shells head not being tagged as vital and makes their max damage be equal as other external organs --- .../human/species/station/machine_subspecies.dm | 4 ++-- .../living/carbon/human/species/station/station.dm | 4 ++-- code/modules/organs/subtypes/machine.dm | 12 ------------ html/changelogs/alberky-PR-2894.yml | 7 +++++++ 4 files changed, 11 insertions(+), 16 deletions(-) create mode 100644 html/changelogs/alberky-PR-2894.yml diff --git a/code/modules/mob/living/carbon/human/species/station/machine_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/machine_subspecies.dm index 55d9a72bd4c..a437fe06994 100644 --- a/code/modules/mob/living/carbon/human/species/station/machine_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/machine_subspecies.dm @@ -84,7 +84,7 @@ /datum/species/machine/shell/get_bodytype() return bodytype - + /datum/species/machine/shell/equip_survival_gear(var/mob/living/carbon/human/H) check_tag(H, H.client) @@ -94,7 +94,7 @@ name_plural = "Industrials" bald = 1 - brute_mod = 0.5 + brute_mod = 0.8 burn_mod = 1.3 slowdown = 4 diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index fd456b6b8e2..2a91a09d063 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -387,8 +387,8 @@ radiation_mod = 0 // not affected by radiation remains_type = /obj/effect/decal/remains/robot - // #TODO-MERGE: Check for balance and self-repair. If self-repair is a thing, RIP balance. - brute_mod = 0.8 + + brute_mod = 1.0 burn_mod = 1.0 show_ssd = "flashing a 'system offline' glyph on their monitor" death_message = "gives one shrill beep before falling lifeless." diff --git a/code/modules/organs/subtypes/machine.dm b/code/modules/organs/subtypes/machine.dm index 784eb1d936d..e0143d5d760 100644 --- a/code/modules/organs/subtypes/machine.dm +++ b/code/modules/organs/subtypes/machine.dm @@ -4,9 +4,6 @@ /obj/item/organ/external/head/ipc dislocated = -1 can_intake_reagents = 0 - vital = 1 //because it is now hosting the posibrain - max_damage = 50 //made same as arm, since it is not vital - min_broken_damage = 30 encased = "support frame" /obj/item/organ/external/head/ipc/New() @@ -229,9 +226,6 @@ /obj/item/organ/external/head/terminator dislocated = -1 can_intake_reagents = 0 - vital = 0 - max_damage = 50 //made same as arm, since it is not vital - min_broken_damage = 30 encased = "reinforced support frame" emp_coeff = 0.5 @@ -339,9 +333,6 @@ /obj/item/organ/external/head/industrial dislocated = -1 can_intake_reagents = 0 - vital = 0 - max_damage = 50 //made same as arm, since it is not vital - min_broken_damage = 30 encased = "support frame" /obj/item/organ/external/head/industrial/New() @@ -435,9 +426,6 @@ /obj/item/organ/external/head/shell dislocated = -1 can_intake_reagents = 0 - vital = 0 - max_damage = 50 //made same as arm, since it is not vital - min_broken_damage = 30 encased = "support frame" force_skintone = TRUE diff --git a/html/changelogs/alberky-PR-2894.yml b/html/changelogs/alberky-PR-2894.yml new file mode 100644 index 00000000000..0e454da158d --- /dev/null +++ b/html/changelogs/alberky-PR-2894.yml @@ -0,0 +1,7 @@ +author: Alberyk + +delete-after: True + +changes: + - balance: "Removed the ipc brute reduction, since robotic limbs have them by default, also reduced the brute reduction of industrial ipcs." + - bugfix: "Fixed shells and industrial's head not being marked as vital parts of their bodies."