From dcf87543d4b69f0698fe53a9a911d36e63ba8e6a Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Tue, 17 Oct 2017 18:57:54 -0400 Subject: [PATCH 1/5] Makes some negative traits have more of an "oomph" Also adds EXTREMELY low endurance trait, which gives you as much hp as a teshari. --- .../species/station/traits_vr/negative.dm | 36 ++++++++++++------- 1 file changed, 23 insertions(+), 13 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 ed66abb5aa1..c96743eca1b 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 @@ -24,7 +24,7 @@ /datum/trait/endurance_low name = "Low Endurance" - desc = "Reduces your maximum total hitpoints." + desc = "Reduces your maximum total hitpoints to 75." cost = -2 var_changes = list("total_health" = 75) @@ -32,41 +32,51 @@ ..(S,H) H.setMaxHealth(S.total_health) +/datum/trait/endurance_very_low + name = "Extremely Low Endurance" + desc = "Reduces your maximum total hitpoints to 50." + cost = -3 //Teshari HP. This makes the person a lot more suseptable to getting stunned, killed, etc. + var_changes = list("total_health" = 50) + + apply(var/datum/species/S,var/mob/living/carbon/human/H) + ..(S,H) + H.setMaxHealth(S.total_health) + /datum/trait/brute_weak name = "Brute Weakness" - desc = "Increases damage from brute damage sources." + desc = "Increases damage from brute damage sources by 25%" cost = -1 - var_changes = list("brute_mod" = 1.15) + var_changes = list("brute_mod" = 1.25) /datum/trait/brute_weak_plus name = "Brute Weakness (Plus)" - desc = "Increases damage significantly from brute damage sources." + desc = "Increases damage from brute damage sources by 50%" cost = -2 - var_changes = list("brute_mod" = 1.30) + var_changes = list("brute_mod" = 1.5) /datum/trait/burn_weak name = "Burn Weakness" - desc = "Increases damage from burn damage sources." + desc = "Increases damage from burn damage sources by 25%" cost = -1 - var_changes = list("burn_mod" = 1.15) + var_changes = list("burn_mod" = 1.25) /datum/trait/burn_weak_plus name = "Burn Weakness (Plus)" - desc = "Increases damage significantly from burn damage sources." + desc = "Increases damage from burn damage sources by 50%" cost = -2 - var_changes = list("burn_mod" = 1.30) + var_changes = list("burn_mod" = 1.5) /datum/trait/conductive name = "Conductive" - desc = "Increases your susceptibility to electric shocks by a small amount." + desc = "Increases your susceptibility to electric shocks by 50%" cost = -1 - var_changes = list("siemens_coefficient" = 1.15) + var_changes = list("siemens_coefficient" = 1.5) /datum/trait/conductive_plus name = "Conductive (Plus)" - desc = "Increases your susceptibility to electric shocks by a moderate amount." + desc = "Increases your susceptibility to electric shocks by 100%" cost = -2 - var_changes = list("siemens_coefficient" = 1.3) + var_changes = list("siemens_coefficient" = 2.0) /datum/trait/photosensitive name = "Photosensitive" From 4853adf0e4321992a78c130d68118c3194940d30 Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Tue, 17 Oct 2017 19:14:41 -0400 Subject: [PATCH 2/5] More potent positives & minor positives. Higher cost & clarity --- .../species/station/traits_vr/positive.dm | 66 ++++++++++++------- 1 file changed, 44 insertions(+), 22 deletions(-) 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 cdcc3fd321b..24051f37b39 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 @@ -1,13 +1,13 @@ /datum/trait/speed_fast name = "Haste" desc = "Allows you to move faster on average than baseline." - cost = 2 + cost = 3 var_changes = list("slowdown" = -0.5) /datum/trait/speed_fast_plus name = "Haste (Plus)" desc = "Allows you to move MUCH faster on average than baseline." - cost = 4 + cost = 5 var_changes = list("slowdown" = -1.0) /datum/trait/hardy @@ -24,7 +24,7 @@ /datum/trait/endurance_high name = "High Endurance" - desc = "Increases your maximum total hitpoints." + desc = "Increases your maximum total hitpoints to 125" cost = 2 var_changes = list("total_health" = 125) @@ -32,17 +32,27 @@ ..(S,H) H.setMaxHealth(S.total_health) +/datum/trait/endurance_very_high + name = "Very High Endurance" + desc = "Increases your maximum total hitpoints to 150" + cost = 3 + var_changes = list("total_health" = 150) + + apply(var/datum/species/S,var/mob/living/carbon/human/H) + ..(S,H) + H.setMaxHealth(S.total_health) + /datum/trait/nonconductive name = "Non-Conductive" - desc = "Decreases your susceptibility to electric shocks by a small amount." - cost = 1 - var_changes = list("siemens_coefficient" = 0.85) + desc = "Decreases your susceptibility to electric shocks by a 25% amount." + cost = 2 //This effects tasers! + var_changes = list("siemens_coefficient" = 0.75) /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) + desc = "Decreases your susceptibility to electric shocks by a 50% amount." + cost = 3 //Let us not forget this effects tasers! + var_changes = list("siemens_coefficient" = 0.5) /datum/trait/darksight name = "Darksight" @@ -68,32 +78,44 @@ cost = 2 var_changes = list("unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp, /datum/unarmed_attack/bite/sharp/numbing)) -/datum/trait/brute_resist - name = "Brute Resist" - desc = "Adds some resistance to brute damage sources." +/datum/trait/minor_brute_resist + name = "Minor Brute Resist" + desc = "Adds 15% resistance to brute damage sources." cost = 1 var_changes = list("brute_mod" = 0.85) +/datum/trait/brute_resist + name = "Brute Resist" + desc = "Adds 25% resistance to brute damage sources." + cost = 2 + var_changes = list("brute_mod" = 0.75) + /datum/trait/brute_resist_plus name = "Brute Resist (Plus)" - desc = "Adds some resistance to brute damage sources." - cost = 2 - var_changes = list("brute_mod" = 0.70) + desc = "Adds 50% resistance to brute damage sources." + cost = 3 + var_changes = list("brute_mod" = 0.5) -/datum/trait/burn_resist - name = "Burn Resist" - desc = "Adds some resistance to burn damage sources." +/datum/trait/minor_burn_resist + name = "Minor Brute Resist" + desc = "Adds 15% resistance to burn damage sources." cost = 1 var_changes = list("burn_mod" = 0.85) +/datum/trait/burn_resist + name = "Burn Resist" + desc = "Adds 25% resistance to burn damage sources." + cost = 2 + var_changes = list("burn_mod" = 0.75) + /datum/trait/burn_resist_plus name = "Burn Resist (Plus)" - desc = "Adds some resistance to burn damage sources." - cost = 2 - var_changes = list("burn_mod" = 0.70) + desc = "Adds 50% resistance to burn damage sources." + cost = 3 + var_changes = list("burn_mod" = 0.5) /datum/trait/photoresistant name = "Photoresistant" - desc = "Decreases stun duration from flashes and other light-based stuns." + desc = "Decreases stun duration from flashes and other light-based stuns and disabilities by 50%" cost = 1 var_changes = list("flash_mod" = 0.5) From 0b1c73d97f87bbbfb341a37d7d5565c72977b953 Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Tue, 17 Oct 2017 19:16:50 -0400 Subject: [PATCH 3/5] Adds minor weaknesses --- .../species/station/traits_vr/negative.dm | 24 ++++++++++++++----- 1 file changed, 18 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 c96743eca1b..3567f7779f8 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 @@ -42,41 +42,53 @@ ..(S,H) H.setMaxHealth(S.total_health) +/datum/trait/minor_brute_weak + name = "Minor Brute Weakness" + desc = "Increases damage from brute damage sources by 15%" + cost = -1 + var_changes = list("brute_mod" = 1.15) + /datum/trait/brute_weak name = "Brute Weakness" desc = "Increases damage from brute damage sources by 25%" - cost = -1 + cost = -2 var_changes = list("brute_mod" = 1.25) /datum/trait/brute_weak_plus name = "Brute Weakness (Plus)" desc = "Increases damage from brute damage sources by 50%" - cost = -2 + cost = -3 var_changes = list("brute_mod" = 1.5) +/datum/trait/minor_burn_weak + name = "Minor Burn Weakness" + desc = "Increases damage from burn damage sources by 15%" + cost = -1 + var_changes = list("burn_mod" = 1.15) + /datum/trait/burn_weak name = "Burn Weakness" desc = "Increases damage from burn damage sources by 25%" - cost = -1 + cost = -2 var_changes = list("burn_mod" = 1.25) /datum/trait/burn_weak_plus name = "Burn Weakness (Plus)" desc = "Increases damage from burn damage sources by 50%" - cost = -2 + cost = -3 var_changes = list("burn_mod" = 1.5) /datum/trait/conductive name = "Conductive" desc = "Increases your susceptibility to electric shocks by 50%" cost = -1 - var_changes = list("siemens_coefficient" = 1.5) + var_changes = list("siemens_coefficient" = 1.5) //This makes you a lot weaker to tasers. /datum/trait/conductive_plus name = "Conductive (Plus)" desc = "Increases your susceptibility to electric shocks by 100%" cost = -2 - var_changes = list("siemens_coefficient" = 2.0) + var_changes = list("siemens_coefficient" = 2.0) //This makes you extremely weak to tasers. /datum/trait/photosensitive name = "Photosensitive" From c180781ee5963f801c9987d6362595d16a8c664e Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Wed, 18 Oct 2017 13:52:18 -0400 Subject: [PATCH 4/5] Update positive.dm --- .../human/species/station/traits_vr/positive.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 24051f37b39..6b6b4092bfb 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 @@ -5,7 +5,7 @@ var_changes = list("slowdown" = -0.5) /datum/trait/speed_fast_plus - name = "Haste (Plus)" + name = "Major Haste" desc = "Allows you to move MUCH faster on average than baseline." cost = 5 var_changes = list("slowdown" = -1.0) @@ -17,7 +17,7 @@ var_changes = list("item_slowdown_mod" = 0.5) /datum/trait/hardy_plus - name = "Hardy (Plus)" + name = "Major Hardy" desc = "Allows you to carry heavy equipment with almost no slowdown." cost = 2 var_changes = list("item_slowdown_mod" = 0.1) @@ -49,7 +49,7 @@ var_changes = list("siemens_coefficient" = 0.75) /datum/trait/nonconductive_plus - name = "Non-Conductive (Plus)" + name = "Major Non-Conductive" desc = "Decreases your susceptibility to electric shocks by a 50% amount." cost = 3 //Let us not forget this effects tasers! var_changes = list("siemens_coefficient" = 0.5) @@ -61,7 +61,7 @@ var_changes = list("darksight" = 3) /datum/trait/darksight_plus - name = "Darksight (Plus)" + name = "Darksight (Major)" desc = "Allows you to see in the dark for the whole screen." cost = 2 var_changes = list("darksight" = 7) @@ -91,7 +91,7 @@ var_changes = list("brute_mod" = 0.75) /datum/trait/brute_resist_plus - name = "Brute Resist (Plus)" + name = "Major Brute Resist" desc = "Adds 50% resistance to brute damage sources." cost = 3 var_changes = list("brute_mod" = 0.5) @@ -109,7 +109,7 @@ var_changes = list("burn_mod" = 0.75) /datum/trait/burn_resist_plus - name = "Burn Resist (Plus)" + name = "Major Burn Resist" desc = "Adds 50% resistance to burn damage sources." cost = 3 var_changes = list("burn_mod" = 0.5) From d399a51e639154832b9850d6dcf75752dd707cdc Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Wed, 18 Oct 2017 13:52:20 -0400 Subject: [PATCH 5/5] Update negative.dm --- .../species/station/traits_vr/negative.dm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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 3567f7779f8..171365fd0af 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 @@ -1,13 +1,13 @@ /datum/trait/speed_slow name = "Slowdown" desc = "Allows you to move slower on average than baseline." - cost = -1 + cost = -3 var_changes = list("slowdown" = 0.5) /datum/trait/speed_slow_plus - name = "Slowdown (Plus)" + name = "Major Slowdown" desc = "Allows you to move MUCH slower on average than baseline." - cost = -2 + cost = -5 var_changes = list("slowdown" = 1.0) /datum/trait/weakling @@ -17,7 +17,7 @@ var_changes = list("item_slowdown_mod" = 1.5) /datum/trait/weakling_plus - name = "Weakling (Plus)" + name = "Major Weakling" desc = "Allows you to carry heavy equipment with much more slowdown." cost = -2 var_changes = list("item_slowdown_mod" = 2.0) @@ -55,7 +55,7 @@ var_changes = list("brute_mod" = 1.25) /datum/trait/brute_weak_plus - name = "Brute Weakness (Plus)" + name = "Major Brute Weakness" desc = "Increases damage from brute damage sources by 50%" cost = -3 var_changes = list("brute_mod" = 1.5) @@ -73,7 +73,7 @@ var_changes = list("burn_mod" = 1.25) /datum/trait/burn_weak_plus - name = "Burn Weakness (Plus)" + name = "Major Burn Weakness" desc = "Increases damage from burn damage sources by 50%" cost = -3 var_changes = list("burn_mod" = 1.5) @@ -81,13 +81,13 @@ /datum/trait/conductive name = "Conductive" desc = "Increases your susceptibility to electric shocks by 50%" - cost = -1 + cost = -2 var_changes = list("siemens_coefficient" = 1.5) //This makes you a lot weaker to tasers. /datum/trait/conductive_plus - name = "Conductive (Plus)" + name = "Major Conductive" desc = "Increases your susceptibility to electric shocks by 100%" - cost = -2 + cost = -3 var_changes = list("siemens_coefficient" = 2.0) //This makes you extremely weak to tasers. /datum/trait/photosensitive