From 1d054fd29eeb157ce1c375dd636eda67ce06c441 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sun, 10 Jun 2018 19:48:04 -0500 Subject: [PATCH 1/3] Robolimb brand damage tweaks, makes VeyMed more fragile (#5183) * Robolimb brand damage tweaks, makes VeyMed more fragile * Lessens VeyMed damage malus to 10%. --- code/modules/organs/organ_external.dm | 2 + code/modules/organs/robolimbs.dm | 5 +++ .../Anewbe - Robolimb Fragility.yml | 37 +++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 html/changelogs/Anewbe - Robolimb Fragility.yml diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 789dce7dfbc..777ff047e1d 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -1105,6 +1105,8 @@ Note that amputating the affected organ does in fact remove the infection from t R = basic_robolimb if(R) force_icon = R.icon + brute_mod *= R.robo_brute_mod + burn_mod *= R.robo_burn_mod if(R.lifelike) robotic = ORGAN_LIFELIKE name = "[initial(name)]" diff --git a/code/modules/organs/robolimbs.dm b/code/modules/organs/robolimbs.dm index 1f15f125c24..11d2d51733c 100644 --- a/code/modules/organs/robolimbs.dm +++ b/code/modules/organs/robolimbs.dm @@ -49,6 +49,9 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ var/suggested_species = "Human" //If it should make the torso a species var/speech_bubble_appearance = "synthetic" // What icon_state to use for speech bubbles when talking. Check talk.dmi for all the icons. + var/robo_brute_mod = 1 // Multiplier for incoming brute damage. + var/robo_burn_mod = 1 // As above for burn. + /datum/robolimb/unbranded_monitor company = "Unbranded Monitor" desc = "A generic unbranded interpretation of a popular prosthetic head model. It looks rudimentary and cheaply constructed." @@ -214,6 +217,8 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ skin_tone = 1 blood_color = "#CCCCCC" speech_bubble_appearance = "normal" + robo_brute_mod = 1.1 + robo_burn_mod = 1.1 /datum/robolimb/wardtakahashi company = "Ward-Takahashi" diff --git a/html/changelogs/Anewbe - Robolimb Fragility.yml b/html/changelogs/Anewbe - Robolimb Fragility.yml new file mode 100644 index 00000000000..74ba5734125 --- /dev/null +++ b/html/changelogs/Anewbe - Robolimb Fragility.yml @@ -0,0 +1,37 @@ +################################ +# 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: + - rscadd: "Adds the ability to make robolimb brands more or less vulnerable to brute or burn." + - rscdel: "Makes VeyMed limbs more vulnerable to brute and burn." From 02baa415f630a111c8cb3d2e6d944d814a093547 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Fri, 15 Jun 2018 08:55:20 -0400 Subject: [PATCH 3/3] Remove Veymed portion of change for weakness --- code/modules/organs/robolimbs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/organs/robolimbs.dm b/code/modules/organs/robolimbs.dm index 11d2d51733c..5a55b1bcd5a 100644 --- a/code/modules/organs/robolimbs.dm +++ b/code/modules/organs/robolimbs.dm @@ -217,8 +217,8 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ skin_tone = 1 blood_color = "#CCCCCC" speech_bubble_appearance = "normal" - robo_brute_mod = 1.1 - robo_burn_mod = 1.1 + //robo_brute_mod = 1.1 //VOREStation Edit + //robo_burn_mod = 1.1 //VOREStation Edit /datum/robolimb/wardtakahashi company = "Ward-Takahashi"