From 8eb72ead353e2b4faacfddba061d71d46692e74a Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sat, 24 Feb 2018 02:37:09 -0600 Subject: [PATCH] Robolimbs require repair at 30 composite damage --- code/modules/organs/organ_external.dm | 4 +-- html/changelogs/Anewbe - Robolimb Repair.yml | 36 ++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/Anewbe - Robolimb Repair.yml diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index a28ad19592..0744834ff1 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -398,7 +398,7 @@ user << "Nothing to fix!" return 0 - if(damage_amount >= ROBOLIMB_REPAIR_CAP) + if(brute_dam + burn_dam >= ROBOLIMB_REPAIR_CAP) user << "The damage is far too severe to patch over externally." return 0 @@ -1131,7 +1131,7 @@ Note that amputating the affected organ does in fact remove the infection from t return !(status & (ORGAN_MUTATED|ORGAN_DEAD)) /obj/item/organ/external/proc/is_malfunctioning() - return ((robotic >= ORGAN_ROBOT) && (brute_dam + burn_dam) >= 25 && prob(brute_dam + burn_dam)) + return ((robotic >= ORGAN_ROBOT) && (brute_dam + burn_dam) >= ROBOLIMB_REPAIR_CAP && prob(brute_dam + burn_dam)) /obj/item/organ/external/proc/embed(var/obj/item/weapon/W, var/silent = 0) if(!owner || loc != owner) diff --git a/html/changelogs/Anewbe - Robolimb Repair.yml b/html/changelogs/Anewbe - Robolimb Repair.yml new file mode 100644 index 0000000000..a2521de202 --- /dev/null +++ b/html/changelogs/Anewbe - Robolimb Repair.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Anewbe + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscdel: "Robotic limbs now need internal repair at 30 composite damage, rather than 30 of burn or brute."