From 7a9a12959269d1c54f2532c618f366d4c1e80523 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Fri, 2 Jun 2017 19:08:30 +0100 Subject: [PATCH 1/2] Adds a set of new traits regarding susceptibility to electric shocks --- .../human/species/station/traits_vr/negative.dm | 12 ++++++++++++ .../human/species/station/traits_vr/positive.dm | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm index 647a070dfff..704cd21199d 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm @@ -56,6 +56,18 @@ cost = -2 var_changes = list("burn_mod" = 1.30) +/datum/trait/conductive + name = "Conductive (Minor)" + desc = "Increases your susceptibility to electric shocks by a small amount." + cost = -1 + var_changes = list("siemens_coefficient" = 1.15) + +/datum/trait/conductiveplus + name = "Non-Conductive (Major)" + desc = "Increases your susceptibility to electric shocks by a moderate amount." + cost = -2 + var_changes = list("siemens_coefficient" = 1.3) + /datum/trait/photosensitive name = "Photosensitive" desc = "Increases stun duration from flashes and other light-based stuns." diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm index 93a9d1911f0..e92f6678679 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm @@ -32,6 +32,18 @@ ..(S,H) H.setMaxHealth(S.total_health) +/datum/trait/nonconductive + name = "Non-Conductive (Minor)" + desc = "Decreases your susceptibility to electric shocks by a small amount." + cost = 1 + var_changes = list("siemens_coefficient" = 0.85) + +/datum/trait/nonconductiveplus + name = "Non-Conductive (Major)" + desc = "Decreases your susceptibility to electric shocks by a moderate amount." + cost = 2 + var_changes = list("siemens_coefficient" = 0.7) + /datum/trait/darksight name = "Darksight" desc = "Allows you to see a short distance in the dark." From 7e253921d4dfca0f2ff14ac43df3159356598c56 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Sat, 3 Jun 2017 13:06:37 +0100 Subject: [PATCH 2/2] Fixes the stuff --- .../carbon/human/species/station/traits_vr/negative.dm | 6 +++--- .../carbon/human/species/station/traits_vr/positive.dm | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm index 704cd21199d..ed66abb5aa1 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm @@ -57,13 +57,13 @@ var_changes = list("burn_mod" = 1.30) /datum/trait/conductive - name = "Conductive (Minor)" + name = "Conductive" desc = "Increases your susceptibility to electric shocks by a small amount." cost = -1 var_changes = list("siemens_coefficient" = 1.15) -/datum/trait/conductiveplus - name = "Non-Conductive (Major)" +/datum/trait/conductive_plus + name = "Conductive (Plus)" desc = "Increases your susceptibility to electric shocks by a moderate amount." cost = -2 var_changes = list("siemens_coefficient" = 1.3) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm index e92f6678679..984f886acbe 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm @@ -33,13 +33,13 @@ H.setMaxHealth(S.total_health) /datum/trait/nonconductive - name = "Non-Conductive (Minor)" + name = "Non-Conductive" desc = "Decreases your susceptibility to electric shocks by a small amount." cost = 1 var_changes = list("siemens_coefficient" = 0.85) -/datum/trait/nonconductiveplus - name = "Non-Conductive (Major)" +/datum/trait/nonconductive_plus + name = "Non-Conductive (Plus)" desc = "Decreases your susceptibility to electric shocks by a moderate amount." cost = 2 var_changes = list("siemens_coefficient" = 0.7)