From f3bfc1c4893b79dd2eec8390d621e88ae2dfe2f5 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Mon, 12 Nov 2018 16:46:55 -0500 Subject: [PATCH] Combine photosensitive trait with darksight --- .../carbon/human/species/station/traits_vr/negative.dm | 6 ------ .../carbon/human/species/station/traits_vr/positive.dm | 4 ++-- 2 files changed, 2 insertions(+), 8 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 20db108099..402c1928dd 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 @@ -90,12 +90,6 @@ cost = -2 var_changes = list("siemens_coefficient" = 2.0) //This makes you extremely weak to tasers. -/datum/trait/photosensitive - name = "Photosensitive" - desc = "Increases stun duration from flashes and other light-based stuns." - cost = -1 - var_changes = list("flash_mod" = 2.0) - /datum/trait/hollow name = "Hollow Bones/Aluminum Alloy" desc = "Your bones and robot limbs are much easier to break." 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 44238cc16a..a415469215 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 @@ -42,13 +42,13 @@ name = "Darksight" desc = "Allows you to see a short distance in the dark." cost = 1 - var_changes = list("darksight" = 3) + var_changes = list("darksight" = 3, "flash_mod" = 2.0) /datum/trait/darksight_plus name = "Darksight (Major)" desc = "Allows you to see in the dark for the whole screen." cost = 2 - var_changes = list("darksight" = 7) + var_changes = list("darksight" = 7, "flash_mod" = 3.0) /datum/trait/melee_attack name = "Sharp Melee"