From c66f1018da7b0445d2596909a7ae4ef2872be5fd Mon Sep 17 00:00:00 2001 From: ParadoxSpace Date: Wed, 1 Jan 2020 07:33:32 -0700 Subject: [PATCH] Robolimb Durability Buff (#7827) Instead of breaking at ten damage, robolimbs now break at around the same time as human limbs. However, more fuel and cable is required to fix them. --- code/modules/organs/organ_external.dm | 2 +- code/modules/surgery/robotics.dm | 6 +-- html/changelogs/paradoxspace-fleshisweak.yml | 42 ++++++++++++++++++++ 3 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 html/changelogs/paradoxspace-fleshisweak.yml diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 5402a76f2b9..e36eec7ab13 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -1094,7 +1094,7 @@ Note that amputating the affected organ does in fact remove the infection from t return ..() && !is_dislocated() && !(status & ORGAN_TENDON_CUT) && (!can_feel_pain() || get_pain() < pain_disability_threshold) && brute_ratio < 1 && burn_ratio < 1 /obj/item/organ/external/proc/is_malfunctioning() - return ((status & ORGAN_ROBOT) && (brute_dam + burn_dam) >= 10 && prob(brute_dam + burn_dam)) + return (BP_IS_ROBOTIC(src) && (brute_ratio + burn_ratio) >= 0.3 && prob(brute_dam + burn_dam)) /obj/item/organ/external/proc/embed(var/obj/item/W, var/silent = 0, var/supplied_message) if(!owner || loc != owner) diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm index a835a2786e9..981b04f8f7f 100644 --- a/code/modules/surgery/robotics.dm +++ b/code/modules/surgery/robotics.dm @@ -133,7 +133,7 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) if(tool.iswelder()) var/obj/item/weldingtool/welder = tool - if(!welder.isOn() || !welder.remove_fuel(1,user)) + if(!welder.isOn() || !welder.remove_fuel(2,user)) return 0 return affected && affected.open == 3 && affected.brute_dam > 0 && target_zone != BP_MOUTH @@ -170,8 +170,8 @@ var/limb_can_operate = (affected && affected.open == 3 && affected.burn_dam > 0 && target_zone != BP_MOUTH) if(limb_can_operate) if(istype(C)) - if(!C.get_amount() >= 3) - to_chat(user, "You need three or more cable pieces to repair this damage.") + if(!C.get_amount() >= 6) + to_chat(user, "You need six or more cable pieces to repair this damage.") return SURGERY_FAILURE C.use(3) return 1 diff --git a/html/changelogs/paradoxspace-fleshisweak.yml b/html/changelogs/paradoxspace-fleshisweak.yml new file mode 100644 index 00000000000..278b42e69f7 --- /dev/null +++ b/html/changelogs/paradoxspace-fleshisweak.yml @@ -0,0 +1,42 @@ +################################ +# 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 +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: ParadoxSpace + +# 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: + - rscadd: "Robotic limbs now become nonfunctional at about the same health as human limbs." + - rscadd: "Fixing them now takes more cable/fuel."