From 90a73b7ea6169822a9ce394d093c987f4d3106ff Mon Sep 17 00:00:00 2001 From: KnigTheThrasher <152086196+KnigTheThrasher@users.noreply.github.com> Date: Wed, 3 Jul 2024 20:41:56 +0200 Subject: [PATCH] ashwalker stuff and a new quirk (#2497) Co-authored-by: KnighTheThrasher --- code/controllers/subsystem/processing/quirks.dm | 1 + code/datums/quirks/positive_quirks.dm | 2 +- .../living/carbon/human/species_types/lizardpeople.dm | 1 + monkestation/code/datums/quirks/positive_quirks.dm | 11 +++++++++++ .../living/carbon/human/species_type/lizardpeople.dm | 7 ++++++- 5 files changed, 20 insertions(+), 2 deletions(-) diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index 2b92c86569b9..de6ad68d46ba 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -30,6 +30,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks) list("Quadruple Amputee", "Paraplegic"), list("Quadruple Amputee", "Frail"), list("Gigantism", "Dwarfism"), + list("Light Step","Hardened Soles"), //MONKESTATION ADDITION list("Social Anxiety", "Mute"), list("Mute", "Soft-Spoken"), list("Stormtrooper Aim", "Big Hands"), diff --git a/code/datums/quirks/positive_quirks.dm b/code/datums/quirks/positive_quirks.dm index 673bc1007335..31b7bf47ae6a 100644 --- a/code/datums/quirks/positive_quirks.dm +++ b/code/datums/quirks/positive_quirks.dm @@ -157,7 +157,7 @@ name = "Light Step" desc = "You walk with a gentle step; footsteps and stepping on sharp objects is quieter and less painful. Also, your hands and clothes will not get messed in case of stepping in blood." icon = FA_ICON_SHOE_PRINTS - value = 4 + value = 2 //MONKESTATION EDIT: changed 4 to 2 (on pair with hardned soles, the difference is less bloody clothes vs no knockdown when stepping on glass) mob_trait = TRAIT_LIGHT_STEP gain_text = span_notice("You walk with a little more litheness.") lose_text = span_danger("You start tromping around like a barbarian.") 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 b51adf284ad1..5fd87552ad8b 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -135,6 +135,7 @@ Lizard subspecies: ASHWALKERS inherent_traits = list( //TRAIT_LITERATE, TRAIT_VIRUSIMMUNE, + TRAIT_HARD_SOLES //MONKESTATION ADDITION ) species_language_holder = /datum/language_holder/lizard/ash /*digitigrade_customization = DIGITIGRADE_FORCED*/ //MONKESTATION REMOVAL: not needed diff --git a/monkestation/code/datums/quirks/positive_quirks.dm b/monkestation/code/datums/quirks/positive_quirks.dm index 290d04739e7c..4a5941c1482f 100644 --- a/monkestation/code/datums/quirks/positive_quirks.dm +++ b/monkestation/code/datums/quirks/positive_quirks.dm @@ -48,6 +48,17 @@ var/mob/living/carbon/human/holder = quirk_holder holder.max_food_buffs -- + +/datum/quirk/hardened_soles + name = "Hardened Soles" + desc = "You're used to walking barefoot, and won't receive the negative effects of doing so." + value = 2 + mob_trait = TRAIT_HARD_SOLES + gain_text = span_notice("The ground doesn't feel so rough on your feet anymore.") + lose_text = span_danger("You start feeling the ridges and imperfections on the ground.") + medical_record_text = "Patient's feet are more resilient against traction." + icon = FA_ICON_LINES_LEANING + /datum/quirk/fluffy_tongue name = "Fluffy Tongue" desc = "After spending too much time watching anime you have developed a horrible speech impediment." diff --git a/monkestation/code/modules/mob/living/carbon/human/species_type/lizardpeople.dm b/monkestation/code/modules/mob/living/carbon/human/species_type/lizardpeople.dm index ac3bac6e5c04..757abda081ce 100644 --- a/monkestation/code/modules/mob/living/carbon/human/species_type/lizardpeople.dm +++ b/monkestation/code/modules/mob/living/carbon/human/species_type/lizardpeople.dm @@ -1,6 +1,11 @@ /datum/species/lizard payday_modifier = 1 - + special_step_sounds = list( + 'sound/effects/footstep/hardclaw1.ogg', + 'sound/effects/footstep/hardclaw2.ogg', + 'sound/effects/footstep/hardclaw3.ogg', + 'sound/effects/footstep/hardclaw4.ogg', + ) /datum/species/lizard/get_scream_sound(mob/living/carbon/human/human) if(human.gender ==MALE) return pick(