From 3b931dffd2b969a604c1e2f176b6891ddec168a7 Mon Sep 17 00:00:00 2001 From: UEDCommander Date: Sun, 24 Mar 2024 17:13:47 +0300 Subject: [PATCH] Assorted fixes from staging-sierra --- code/modules/mob/living/carbon/human/human.dm | 59 +++++++++++--- mods/resomi/README.md | 45 +++++++++-- mods/resomi/_resomi.dme | 2 +- mods/resomi/code/body/organs.dm | 5 +- mods/resomi/code/clothing/void/rigs.dm | 23 ++++++ mods/resomi/code/datum/_defines.dm | 1 + mods/resomi/code/datum/language.dm | 1 + mods/resomi/code/datum/resomi_culture.dm | 73 +++++++++++++----- mods/resomi/code/datum/species.dm | 6 +- .../icons/clothing/onmob_feet_resomi.dmi | Bin 9792 -> 10092 bytes .../icons/clothing/onmob_hands_resomi.dmi | Bin 3420 -> 3532 bytes .../icons/clothing/onmob_head_resomi.dmi | Bin 126321 -> 127233 bytes .../icons/clothing/onmob_rig_back_resomi.dmi | Bin 1740 -> 2158 bytes .../icons/clothing/onmob_suit_resomi.dmi | Bin 227254 -> 229694 bytes mods/resomi/icons/human_races/eyes.dmi | Bin 0 -> 228 bytes 15 files changed, 174 insertions(+), 41 deletions(-) create mode 100644 mods/resomi/code/clothing/void/rigs.dm create mode 100644 mods/resomi/icons/human_races/eyes.dmi diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index c1ce5b471addd..cdd66fa7e15bc 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1576,26 +1576,67 @@ set category = "IC" species.toggle_stance(src) +// [SIERRA-ADD] - RESOMI +#define PULSE_NUMBER_NONE 0 +#define PULSE_NUMBER_SLOW 50 +#define PULSE_NUMBER_NORM 75 +#define PULSE_NUMBER_FAST 105 +#define PULSE_NUMBER_2FAST 140 +#define PULSE_NUMBER_THREADY PULSE_MAX_BPM +// [/SIERRA-ADD] + // Similar to get_pulse, but returns only integer numbers instead of text. -/mob/living/carbon/human/proc/get_pulse_as_number() // IMPORTANT TO KNOW THIS PROC IS FULLY OVERRIDED IN RESOMI MODULE. +/mob/living/carbon/human/proc/get_pulse_as_number() var/obj/item/organ/internal/heart/heart_organ = internal_organs_by_name[BP_HEART] + + // [SIERRA-EDIT] - RESOMI + + //if(!heart_organ) // SIERRA-EDIT - ORIGINAL + // return 0 // SIERRA-EDIT - ORIGINAL + //switch(pulse()) // SIERRA-EDIT - ORIGINAL + // if(PULSE_NONE) // SIERRA-EDIT - ORIGINAL + // return 0 // SIERRA-EDIT - ORIGINAL + // if(PULSE_SLOW) // SIERRA-EDIT - ORIGINAL + // return rand(40, 60) // SIERRA-EDIT - ORIGINAL + // if(PULSE_NORM) // SIERRA-EDIT - ORIGINAL + // return rand(60, 90) // SIERRA-EDIT - ORIGINAL + // if(PULSE_FAST) // SIERRA-EDIT - ORIGINAL + // return rand(90, 120) // SIERRA-EDIT - ORIGINAL + // if(PULSE_2FAST) // SIERRA-EDIT - ORIGINAL + // return rand(120, 160) // SIERRA-EDIT - ORIGINAL + // if(PULSE_THREADY) // SIERRA-EDIT - ORIGINAL + // return PULSE_MAX_BPM // SIERRA-EDIT - ORIGINAL + //return 0 // SIERRA-EDIT - ORIGINAL + if(!heart_organ) - return 0 + return PULSE_NUMBER_NONE + var/raw_pulse_number switch(pulse()) if(PULSE_NONE) - return 0 + return PULSE_NUMBER_NONE if(PULSE_SLOW) - return rand(40, 60) + raw_pulse_number = PULSE_NUMBER_SLOW if(PULSE_NORM) - return rand(60, 90) + raw_pulse_number = PULSE_NUMBER_NORM if(PULSE_FAST) - return rand(90, 120) + raw_pulse_number = PULSE_NUMBER_FAST if(PULSE_2FAST) - return rand(120, 160) + raw_pulse_number = PULSE_NUMBER_2FAST if(PULSE_THREADY) - return PULSE_MAX_BPM - return 0 + return PULSE_NUMBER_THREADY + return ((raw_pulse_number * (2 - species.blood_volume / SPECIES_BLOOD_DEFAULT)) + (raw_pulse_number * rand(-0.2, 0.2))) + + // [/SIERRA-EDIT] + +// [SIERRA-ADD] - RESOMI +#undef PULSE_NUMBER_NONE +#undef PULSE_NUMBER_SLOW +#undef PULSE_NUMBER_NORM +#undef PULSE_NUMBER_FAST +#undef PULSE_NUMBER_2FAST +#undef PULSE_NUMBER_THREADY +// [/SIERRA-ADD] //generates realistic-ish pulse output based on preset levels as text /mob/living/carbon/human/proc/get_pulse(method) //method 0 is for hands, 1 is for machines, more accurate diff --git a/mods/resomi/README.md b/mods/resomi/README.md index ac90148a65c0e..bfdca5e21a6a9 100644 --- a/mods/resomi/README.md +++ b/mods/resomi/README.md @@ -1,7 +1,7 @@ #### Список PRов: -- `Отсутствуют` +- https://github.com/SierraBay/SierraBay12/pull/2047 -## Мод-пример +## Резоми ID мода: RESOMI