From efb6a690ba3f4bb90e3bc9c6024ef8e0ad88ade9 Mon Sep 17 00:00:00 2001 From: Molti Date: Sun, 26 Feb 2023 01:28:24 -0600 Subject: [PATCH 1/9] Update lizardpeople.dm --- .../human/species_types/lizardpeople.dm | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index 27fce5fa5656..edd3e2b0001d 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -1,3 +1,5 @@ +#define LIZARD_SLOWDOWN "coldlizard" //define used for the lizard speedboost + /datum/species/lizard // Reptilian humanoids with scaled skin and tails. name = "Lizardperson" @@ -12,6 +14,7 @@ mutanttail = /obj/item/organ/tail/lizard coldmod = 1.75 //Desert-born race heatmod = 0.75 //Desert-born race + action_speed_coefficient = 1.1 //claws aren't as dextrous as hands payday_modifier = 0.5 //Negatively viewed by NT default_features = list("mcolor" = "0F0", "tail_lizard" = "Smooth", "snout" = "Round", "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None", "legs" = "Normal Legs") changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT @@ -45,7 +48,6 @@ return randname - /datum/species/lizard/handle_environment(datum/gas_mixture/environment, mob/living/carbon/human/H) ..() last_heat_stunmod = heat_stunmod //Saves previous mod @@ -66,6 +68,21 @@ stunmod *= heat_stun_mult //however many times, and if it goes down we multiply by 1.1 //This gets us an effective stunmod of 0.91, 1, 1.1, 1.21, 1.33, based on temp +/datum/species/lizard/movement_delay(mob/living/carbon/human/H)//to handle the slowdown based on cold + . = ..() + if(heat_stunmod && !HAS_TRAIT(H, TRAIT_IGNORESLOWDOWN) && H.has_gravity()) + H.add_movespeed_modifier(LIZARD_SLOWDOWN, update=TRUE, priority=100, multiplicative_slowdown= -heat_stunmod/3, blacklisted_movetypes=FLOATING)//between a 0.33 speedup and a 1 slowdown + else if(H.has_movespeed_modifier(LIZARD_SLOWDOWN)) + H.remove_movespeed_modifier(LIZARD_SLOWDOWN) + +/datum/species/lizard/on_species_loss(mob/living/carbon/human/C, datum/species/new_species, pref_load) + . = ..() + H.remove_movespeed_modifier(LIZARD_SLOWDOWN) + +/datum/species/lizard/spec_fully_heal(mob/living/carbon/human/H) + . = ..() + H.remove_movespeed_modifier(LIZARD_SLOWDOWN) + /datum/species/lizard/spec_life(mob/living/carbon/human/H) . = ..() if((H.client && H.client.prefs.read_preference(/datum/preference/toggle/mood_tail_wagging)) && !is_wagging_tail() && H.mood_enabled) @@ -191,3 +208,5 @@ /datum/species/lizard/has_toes() return TRUE + +#undef LIZARD_SLOWDOWN From abfbe82231171b8abe5a30ffc27d2a6e943ce195 Mon Sep 17 00:00:00 2001 From: Molti Date: Sun, 26 Feb 2023 01:39:08 -0600 Subject: [PATCH 2/9] C not H --- .../mob/living/carbon/human/species_types/lizardpeople.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index edd3e2b0001d..c693e6ed7b04 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -77,7 +77,7 @@ /datum/species/lizard/on_species_loss(mob/living/carbon/human/C, datum/species/new_species, pref_load) . = ..() - H.remove_movespeed_modifier(LIZARD_SLOWDOWN) + C.remove_movespeed_modifier(LIZARD_SLOWDOWN) /datum/species/lizard/spec_fully_heal(mob/living/carbon/human/H) . = ..() From 0f3a11c5fccd6f7e379f31208f7efb59075db3eb Mon Sep 17 00:00:00 2001 From: Molti Date: Sun, 26 Feb 2023 01:43:29 -0600 Subject: [PATCH 3/9] just makes them coldblooded instead --- .../carbon/human/species_types/lizardpeople.dm | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index c693e6ed7b04..043738280598 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -8,6 +8,7 @@ say_mod = "hisses" default_color = "00FF00" species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAS_FLESH,HAS_BONE,HAS_TAIL) + inherent_traits = list(TRAIT_COLDBLOODED) inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID, MOB_REPTILE) mutant_bodyparts = list("tail_lizard", "snout", "spines", "horns", "frills", "body_markings", "legs") mutanttongue = /obj/item/organ/tongue/lizard @@ -68,21 +69,6 @@ stunmod *= heat_stun_mult //however many times, and if it goes down we multiply by 1.1 //This gets us an effective stunmod of 0.91, 1, 1.1, 1.21, 1.33, based on temp -/datum/species/lizard/movement_delay(mob/living/carbon/human/H)//to handle the slowdown based on cold - . = ..() - if(heat_stunmod && !HAS_TRAIT(H, TRAIT_IGNORESLOWDOWN) && H.has_gravity()) - H.add_movespeed_modifier(LIZARD_SLOWDOWN, update=TRUE, priority=100, multiplicative_slowdown= -heat_stunmod/3, blacklisted_movetypes=FLOATING)//between a 0.33 speedup and a 1 slowdown - else if(H.has_movespeed_modifier(LIZARD_SLOWDOWN)) - H.remove_movespeed_modifier(LIZARD_SLOWDOWN) - -/datum/species/lizard/on_species_loss(mob/living/carbon/human/C, datum/species/new_species, pref_load) - . = ..() - C.remove_movespeed_modifier(LIZARD_SLOWDOWN) - -/datum/species/lizard/spec_fully_heal(mob/living/carbon/human/H) - . = ..() - H.remove_movespeed_modifier(LIZARD_SLOWDOWN) - /datum/species/lizard/spec_life(mob/living/carbon/human/H) . = ..() if((H.client && H.client.prefs.read_preference(/datum/preference/toggle/mood_tail_wagging)) && !is_wagging_tail() && H.mood_enabled) @@ -189,7 +175,7 @@ limbs_id = "lizard" fixed_mut_color = "A02720" //Deep red species_traits = list(MUTCOLORS,EYECOLOR,LIPS,DIGITIGRADE,HAS_FLESH,HAS_BONE,HAS_TAIL) - inherent_traits = list(TRAIT_RESISTHEAT) //Dragons like fire + inherent_traits = list(TRAIT_RESISTHEAT) //Dragons like fire, not cold blooded because they generate fire inside themselves or something burnmod = 0.8 brutemod = 0.9 //something something dragon scales punchdamagelow = 3 From d4df372afc77f9029f8e5801fc8a9050351997b3 Mon Sep 17 00:00:00 2001 From: Molti Date: Sun, 26 Feb 2023 01:46:19 -0600 Subject: [PATCH 4/9] reduces coldmod because regulating temps --- .../mob/living/carbon/human/species_types/lizardpeople.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index 043738280598..5ef349eef976 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -13,7 +13,7 @@ mutant_bodyparts = list("tail_lizard", "snout", "spines", "horns", "frills", "body_markings", "legs") mutanttongue = /obj/item/organ/tongue/lizard mutanttail = /obj/item/organ/tail/lizard - coldmod = 1.75 //Desert-born race + coldmod = 1.5 //Desert-born race heatmod = 0.75 //Desert-born race action_speed_coefficient = 1.1 //claws aren't as dextrous as hands payday_modifier = 0.5 //Negatively viewed by NT From f6cdbd916d8e641aa9e8d45240bc0ba84c1e6407 Mon Sep 17 00:00:00 2001 From: Molti Date: Sun, 26 Feb 2023 01:47:26 -0600 Subject: [PATCH 5/9] less extreme --- .../mob/living/carbon/human/species_types/lizardpeople.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index 5ef349eef976..d6325249ebc1 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -15,7 +15,7 @@ mutanttail = /obj/item/organ/tail/lizard coldmod = 1.5 //Desert-born race heatmod = 0.75 //Desert-born race - action_speed_coefficient = 1.1 //claws aren't as dextrous as hands + action_speed_coefficient = 1.05 //claws aren't as dextrous as hands payday_modifier = 0.5 //Negatively viewed by NT default_features = list("mcolor" = "0F0", "tail_lizard" = "Smooth", "snout" = "Round", "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None", "legs" = "Normal Legs") changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT From 9258f7aef2cce51f97cd15ef94888b6b29c1903e Mon Sep 17 00:00:00 2001 From: Molti Date: Sun, 26 Feb 2023 02:06:12 -0600 Subject: [PATCH 6/9] readd the slowdown --- .../human/species_types/lizardpeople.dm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index d6325249ebc1..caf1f5cc0af1 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -13,8 +13,8 @@ mutant_bodyparts = list("tail_lizard", "snout", "spines", "horns", "frills", "body_markings", "legs") mutanttongue = /obj/item/organ/tongue/lizard mutanttail = /obj/item/organ/tail/lizard - coldmod = 1.5 //Desert-born race - heatmod = 0.75 //Desert-born race + coldmod = 0.75 //used to being cold, just doesn't like it much + heatmod = 0.75 //greatly appreciate heat, just not too much action_speed_coefficient = 1.05 //claws aren't as dextrous as hands payday_modifier = 0.5 //Negatively viewed by NT default_features = list("mcolor" = "0F0", "tail_lizard" = "Smooth", "snout" = "Round", "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None", "legs" = "Normal Legs") @@ -69,6 +69,21 @@ stunmod *= heat_stun_mult //however many times, and if it goes down we multiply by 1.1 //This gets us an effective stunmod of 0.91, 1, 1.1, 1.21, 1.33, based on temp +/datum/species/lizard/movement_delay(mob/living/carbon/human/H)//to handle the slowdown based on cold + . = ..() + if(heat_stunmod && !HAS_TRAIT(H, TRAIT_IGNORESLOWDOWN) && H.has_gravity()) + H.add_movespeed_modifier(LIZARD_SLOWDOWN, update=TRUE, priority=100, multiplicative_slowdown= -heat_stunmod/5, blacklisted_movetypes=FLOATING)//between a 0.2 speedup and a 0.6 slowdown + else if(H.has_movespeed_modifier(LIZARD_SLOWDOWN)) + H.remove_movespeed_modifier(LIZARD_SLOWDOWN) + +/datum/species/lizard/on_species_loss(mob/living/carbon/human/C, datum/species/new_species, pref_load) + . = ..() + C.remove_movespeed_modifier(LIZARD_SLOWDOWN) + +/datum/species/lizard/spec_fully_heal(mob/living/carbon/human/H) + . = ..() + H.remove_movespeed_modifier(LIZARD_SLOWDOWN) + /datum/species/lizard/spec_life(mob/living/carbon/human/H) . = ..() if((H.client && H.client.prefs.read_preference(/datum/preference/toggle/mood_tail_wagging)) && !is_wagging_tail() && H.mood_enabled) From 82dfdb1208b8ee1ea56e7550b528fe5cc9a43002 Mon Sep 17 00:00:00 2001 From: Molti Date: Sun, 26 Feb 2023 02:07:48 -0600 Subject: [PATCH 7/9] change perk description --- .../mob/living/carbon/human/species_types/lizardpeople.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index caf1f5cc0af1..3d333fed6abc 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -150,9 +150,7 @@ SPECIES_PERK_TYPE = SPECIES_NEUTRAL_PERK, SPECIES_PERK_ICON = "thermometer-empty", SPECIES_PERK_NAME = "Cold-blooded", - SPECIES_PERK_DESC = "Lizardpeople have higher tolerance for hot temperatures, but lower \ - tolerance for cold temperatures. Additionally, they cannot self-regulate their body temperature - \ - they are as cold or as warm as the environment around them is. Stay warm!", + SPECIES_PERK_DESC = "Lizardpeople have difficulty regulating their body temperature, they're not quite as affected by the temperature itself though.", )) return to_add From 7e71df20b32158b03fc4baafc8bba6ca4f482bd3 Mon Sep 17 00:00:00 2001 From: Molti Date: Sun, 26 Feb 2023 02:29:21 -0600 Subject: [PATCH 8/9] Update lizardpeople.dm --- .../mob/living/carbon/human/species_types/lizardpeople.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index 3d333fed6abc..f05100468cd6 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -72,7 +72,7 @@ /datum/species/lizard/movement_delay(mob/living/carbon/human/H)//to handle the slowdown based on cold . = ..() if(heat_stunmod && !HAS_TRAIT(H, TRAIT_IGNORESLOWDOWN) && H.has_gravity()) - H.add_movespeed_modifier(LIZARD_SLOWDOWN, update=TRUE, priority=100, multiplicative_slowdown= -heat_stunmod/5, blacklisted_movetypes=FLOATING)//between a 0.2 speedup and a 0.6 slowdown + H.add_movespeed_modifier(LIZARD_SLOWDOWN, update=TRUE, priority=100, multiplicative_slowdown= -heat_stunmod/3, blacklisted_movetypes=FLOATING)//between a 0.33 speedup and a 1 slowdown else if(H.has_movespeed_modifier(LIZARD_SLOWDOWN)) H.remove_movespeed_modifier(LIZARD_SLOWDOWN) From 8f416fa56e7732b21ee797f1ed969740082bd292 Mon Sep 17 00:00:00 2001 From: Molti Date: Sun, 26 Feb 2023 02:32:04 -0600 Subject: [PATCH 9/9] as mr lizard feet dictates --- .../mob/living/carbon/human/species_types/lizardpeople.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index f05100468cd6..f95bc8ddb1ed 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -13,8 +13,8 @@ mutant_bodyparts = list("tail_lizard", "snout", "spines", "horns", "frills", "body_markings", "legs") mutanttongue = /obj/item/organ/tongue/lizard mutanttail = /obj/item/organ/tail/lizard - coldmod = 0.75 //used to being cold, just doesn't like it much - heatmod = 0.75 //greatly appreciate heat, just not too much + coldmod = 0.67 //used to being cold, just doesn't like it much + heatmod = 0.67 //greatly appreciate heat, just not too much action_speed_coefficient = 1.05 //claws aren't as dextrous as hands payday_modifier = 0.5 //Negatively viewed by NT default_features = list("mcolor" = "0F0", "tail_lizard" = "Smooth", "snout" = "Round", "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None", "legs" = "Normal Legs")