cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-29 08:11:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #154 from Rykka-Stormheart/shep-dev-trait-fixes

Browse Source 
Correct grammar/formatting for two traits, and rename/adjust traits.
This commit is contained in:
Razgriz
2020-01-15 01:38:25 -07:00
committed by GitHub
parent eb01c34eaf ad7870d904
commit 3f75fed80e
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
+10 -10
View File
@@ -19,12 +19,12 @@
var_changes = list("metabolic_rate" = 1.4, "hunger_factor" = 0.4, "metabolism" = 0.012) // +40% rate and 8x hunger (Double Teshari)
excludes = list(/datum/trait/metabolism_up, /datum/trait/metabolism_down)
/datum/trait/cold_discomfort
name = "Hot-Preference"
/datum/trait/hot_blood
name = "Hot-Blooded"
desc = "You are too hot at the standard 20C. 18C is more suitable. Rolling down your jumpsuit or being unclothed helps."
cost = 0
var_changes = list("heat_discomfort_level" = T0C+19)
excludes = list(/datum/trait/hot_discomfort, /datum/trait/cold_blood)
excludes = list(/datum/trait/cold_blood, /datum/trait/extreme_cold_blood)
// YW Addition
/*
@@ -37,20 +37,20 @@
*/
// YW Addition End
/datum/trait/hot_discomfort
name = "Cold-Preference"
/datum/trait/cold_blood
name = "Cold-Blooded"
desc = "You are too cold at the standard 20C. 22C is more suitable. Wearing clothing that covers your legs and torso helps."
cost = 0
var_changes = list("cold_discomfort_level" = T0C+21)
excludes = list(/datum/trait/cold_discomfort, /datum/trait/cold_blood)
excludes = list(/datum/trait/hot_blood, /datum/trait/extreme_cold_blood)
// YW Addition
/datum/trait/cold_blood
name = "Cold Blooded"
desc = "Your body relies on the outside temperature to keep warm. Wearing warm clothing such as jackets is commonplace for you."
/datum/trait/extreme_cold_blood
name = "Extremely Cold-Blooded"
desc = "You are too cold at the standard 20C. 24C is more suitable. Wearing clothing that covers your legs and torso helps."
cost = 0
var_changes = list("cold_discomfort_level" = T0C+24)
excludes = list(/datum/trait/hot_discomfort, /datum/trait/cold_discomfort)
excludes = list(/datum/trait/hot_blood, /datum/trait/cold_blood)
// YW Addition End
/datum/trait/autohiss_unathi
code/modules/mob/living/carbon/human/species/station/traits_vr/neutral_ch.dm
+4 -4
View File
@@ -1,6 +1,6 @@
/datum/trait/mobegglaying
name = "Egg laying"
desc = "you can lay eggs"
name = "Egg Laying"
desc = "You can lay eggs, much like an avian."
cost = 0
/datum/trait/mobegglaying/apply(var/datum/species/S,var/mob/living/carbon/human/H)
@@ -9,8 +9,8 @@
/datum/trait/succubus_bite
name = "Succubus bite"
desc = "allows you to inject your prey with your posion"
name = "Succubus Bite"
desc = "Allows you to inject your prey with poison, much like a venemous snake."
cost = 0
/datum/trait/succubus_bite/apply(var/datum/species/S,var/mob/living/carbon/human/H)