From 26125cb563e910fe69a41b50b1df81b9439f03c1 Mon Sep 17 00:00:00 2001 From: Yonnimer <31339047+Yonnimer@users.noreply.github.com> Date: Tue, 16 Feb 2021 14:37:20 -0500 Subject: [PATCH] Makes dionae insulated against shocks (#11092) --- .../living/carbon/human/species/species.dm | 3 ++ .../human/species/station/diona/diona.dm | 3 ++ .../human/species/station/vaurca/vaurca.dm | 3 ++ code/modules/power/power.dm | 2 +- html/changelogs/yonnimer-insulated.yml | 41 +++++++++++++++++++ 5 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/yonnimer-insulated.yml diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index ac9efe3b120..410df6fc645 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -656,3 +656,6 @@ /datum/species/proc/get_injection_modifier() return injection_mod + +/datum/species/proc/is_naturally_insulated() + return FALSE diff --git a/code/modules/mob/living/carbon/human/species/station/diona/diona.dm b/code/modules/mob/living/carbon/human/species/station/diona/diona.dm index fc01c21cfc5..cd134924cb2 100644 --- a/code/modules/mob/living/carbon/human/species/station/diona/diona.dm +++ b/code/modules/mob/living/carbon/human/species/station/diona/diona.dm @@ -201,3 +201,6 @@ /datum/species/diona/has_psi_potential() return FALSE + +/datum/species/diona/is_naturally_insulated() + return TRUE diff --git a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca.dm b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca.dm index 7774bd50387..f28d3ac6d37 100644 --- a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca.dm +++ b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca.dm @@ -155,3 +155,6 @@ /datum/species/bug/has_psi_potential() return FALSE + +/datum/species/bug/is_naturally_insulated() + return TRUE diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index 0e36b3a463c..01c8c806d93 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -355,7 +355,7 @@ if(H) if(H.species.siemens_coefficient == 0) return - if(isvaurca(H)) //natural vaurca insulation + if(H.species.is_naturally_insulated()) return if(H.gloves && contact_zone == "hand") var/obj/item/clothing/gloves/G = H.gloves diff --git a/html/changelogs/yonnimer-insulated.yml b/html/changelogs/yonnimer-insulated.yml new file mode 100644 index 00000000000..8312d2b6f39 --- /dev/null +++ b/html/changelogs/yonnimer-insulated.yml @@ -0,0 +1,41 @@ +################################ +# 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: Yonnimer + +# 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: "Makes dionae naturally insulated against being shocked"