diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index f9a8c576ffb..bc11798079d 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -294,15 +294,16 @@ var/list/organ_cache = list() /obj/item/organ/emp_act(severity) if(!(robotic >= ORGAN_ASSISTED)) return - switch (severity) - if (1) - take_damage(rand(6,12)) - if (2) - take_damage(rand(4,8)) - if (3) - take_damage(rand(3,6)) - if (4) - take_damage(rand(1,4)) + for(var/i = 1; i <= robotic; i++) + switch (severity) + if (1) + take_damage(rand(5,9)) + if (2) + take_damage(rand(3,7)) + if (3) + take_damage(rand(2,5)) + if (4) + take_damage(rand(1,3)) /obj/item/organ/proc/removed(var/mob/living/user) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 0ab376a57c6..7253d350491 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -105,15 +105,16 @@ if(!(robotic >= ORGAN_ROBOT)) return var/burn_damage = 0 - switch (severity) - if (1) - burn_damage += rand(8, 13) - if (2) - burn_damage += rand(6, 9) - if(3) - burn_damage += rand(4, 7) - if(4) - burn_damage += rand(1, 5) + for(var/i = 1; i <= robotic; i++) + switch (severity) + if (1) + burn_damage += rand(5, 8) + if (2) + burn_damage += rand(4, 6) + if(3) + burn_damage += rand(2, 5) + if(4) + burn_damage += rand(1, 3) if(burn_damage) take_damage(0, burn_damage) diff --git a/html/changelogs/Anewbe - VeyMed EMP tweaks.yml b/html/changelogs/Anewbe - VeyMed EMP tweaks.yml new file mode 100644 index 00000000000..24b2090fc9f --- /dev/null +++ b/html/changelogs/Anewbe - VeyMed EMP tweaks.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: "Assisted robotic organs (internals, eyes) are less vulnerable to EMP." + - rscdel: "Lifelike robotic organs (currently VeyMed) are more vulnerable to EMP."