From eee5e8ffb539d91a507316abf17839779326aa99 Mon Sep 17 00:00:00 2001 From: "Waldo \"Frog\" Gewehrkugelsohn" <77164962+valldemar2017@users.noreply.github.com> Date: Fri, 31 Mar 2023 17:20:10 +0300 Subject: [PATCH] fix: A lot fixes of skrells (#77) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## About The Pull Request Сразу несколько фиксов жабок(скреллов) - Переименовал несколько файлов, потому что они неправильно упорядочивались в .dme, из-за чего при компиле в byond maker'е были проблемы. - Починил слой причесок, до этого они были поверх шляп. - Уменьшил урон от алкоголя у печени скреллов до 0.05(на 50 процентов больше чем у людей). До этого коэффициент был где-то около в 5000 раз больше чем у людей, отчего печень скреллов отмирала сразу :starege: - Починил появление скреллом из госта через кнопку Make human(До этого прическа не передавалась и становилось "лысой" как по умолчанию) ### Mapping March Ckey to receive rewards: N/A ## Why It's Good For The Game ## Changelog :cl: add: Added new mechanics or gameplay changes add: Added more things del: Removed old things qol: made something easier to use balance: rebalanced something fix: fixed a few things soundadd: added a new sound thingy sounddel: removed an old sound thingy imageadd: added some icons and images imagedel: deleted some icons and images spellcheck: fixed a few typos code: changed some code refactor: refactored some code config: changed some config setting admin: messed with admin stuff server: something server ops should know /:cl: --- code/__DEFINES/modular_galactic/DNA.dm | 9 +++ code/__DEFINES/modular_galactic/skrell.dm | 2 + modular_galactic/skrell/skrell.dm | 53 ----------------- modular_galactic/skrell/skrell_defines.dm | 43 ++++++++++++-- modular_galactic/skrell/skrell_organs.dm | 55 +++++++++++++++++- .../{skrell_bodyparts.dm => skrell_parts.dm} | 0 ..._accessory.dm => skrell_tail_accessory.dm} | 1 + ...dm => skrell_tail_accessory_preference.dm} | 0 modular_galactic/skrell/tails.dmi | Bin 5848 -> 5841 bytes tgstation.dme | 10 ++-- 10 files changed, 111 insertions(+), 62 deletions(-) create mode 100644 code/__DEFINES/modular_galactic/DNA.dm create mode 100644 code/__DEFINES/modular_galactic/skrell.dm rename modular_galactic/skrell/{skrell_bodyparts.dm => skrell_parts.dm} (100%) rename modular_galactic/skrell/{skrell_accessory.dm => skrell_tail_accessory.dm} (98%) rename modular_galactic/skrell/{skrell_accessory_preference.dm => skrell_tail_accessory_preference.dm} (100%) diff --git a/code/__DEFINES/modular_galactic/DNA.dm b/code/__DEFINES/modular_galactic/DNA.dm new file mode 100644 index 0000000000000..8db1da1524160 --- /dev/null +++ b/code/__DEFINES/modular_galactic/DNA.dm @@ -0,0 +1,9 @@ +#if DM_VERSION > 515 +#pragma push +#pragma ignore unused_var +#endif +#define DNA_FEATURE_BLOCKS 16 +#define DNA_SKRELL_HAIR_BLOCK 16 +#if DM_VERSION > 515 +#pragma pop +#endif diff --git a/code/__DEFINES/modular_galactic/skrell.dm b/code/__DEFINES/modular_galactic/skrell.dm new file mode 100644 index 0000000000000..5bb1eeedfef92 --- /dev/null +++ b/code/__DEFINES/modular_galactic/skrell.dm @@ -0,0 +1,2 @@ +#define ORGAN_SLOT_EXTERNAL_SKRELL_HAIR "skrell_hair" +#define SPECIES_SKRELL "skrell" diff --git a/modular_galactic/skrell/skrell.dm b/modular_galactic/skrell/skrell.dm index 08f41199e4c7c..4d65b08743c69 100644 --- a/modular_galactic/skrell/skrell.dm +++ b/modular_galactic/skrell/skrell.dm @@ -47,58 +47,5 @@ /datum/species/skrell/randomize_features(mob/living/carbon/human_mob) randomize_external_organs(human_mob) -/obj/item/organ/internal/tongue/skrell - name = "internal vocal sacs" - desc = "An Strange looking sac." - icon = 'modular_galactic/skrell/skrell_organs.dmi' - icon_state = "tongue" - taste_sensitivity = 5 - -/obj/item/organ/internal/tongue/skrell/get_possible_languages() - return ..() + /datum/language/skrell - -/obj/item/organ/internal/heart/skrell - name = "skrellian heart" - icon = 'modular_galactic/skrell/skrell_organs.dmi' - icon_state = "heart-on" - -/obj/item/organ/internal/brain/skrell - name = "spongy brain" - icon = 'modular_galactic/skrell/skrell_organs.dmi' - icon_state = "brain2" - -/obj/item/organ/internal/eyes/skrell - name = "amphibian eyes" - desc = "Large black orbs." - icon = 'modular_galactic/skrell/skrell_organs.dmi' - icon_state = "eyes" - flash_protect = FLASH_PROTECTION_SENSITIVE - -/obj/item/organ/internal/lungs/skrell - name = "skrell lungs" - icon = 'modular_galactic/skrell/skrell_organs.dmi' - icon_state = "lungs" - safe_plasma_max = 40 - safe_co2_max = 40 - - cold_message = "You can't stand the freezing cold with every breath you take!" - cold_level_1_threshold = 248 - cold_level_2_threshold = 220 - cold_level_3_threshold = 170 - cold_level_1_damage = COLD_GAS_DAMAGE_LEVEL_2 //Keep in mind with gas damage levels, you can set these to be negative, if you want someone to heal, instead. - cold_level_2_damage = COLD_GAS_DAMAGE_LEVEL_2 - cold_level_3_damage = COLD_GAS_DAMAGE_LEVEL_3 - cold_damage_type = BRUTE - - - hot_message = "You can't stand the searing heat with every breath you take!" - heat_level_1_threshold = 318 - heat_level_2_threshold = 348 - heat_level_3_threshold = 1000 - heat_level_1_damage = HEAT_GAS_DAMAGE_LEVEL_2 - heat_level_2_damage = HEAT_GAS_DAMAGE_LEVEL_2 - heat_level_3_damage = HEAT_GAS_DAMAGE_LEVEL_3 - heat_damage_type = BURN - /mob/living/carbon/human/species/skrell race = /datum/species/skrell diff --git a/modular_galactic/skrell/skrell_defines.dm b/modular_galactic/skrell/skrell_defines.dm index 38a7b81d08d79..721efbc27bdae 100644 --- a/modular_galactic/skrell/skrell_defines.dm +++ b/modular_galactic/skrell/skrell_defines.dm @@ -3,11 +3,11 @@ // code\__DEFINES\DNA.dm // ///////////////////////////////////// -#define DNA_FEATURE_BLOCKS 16 -#define DNA_SKRELL_HAIR_BLOCK 16 -#define ORGAN_SLOT_EXTERNAL_SKRELL_HAIR "skrell_hair" +// #define DNA_FEATURE_BLOCKS 16 +// #define DNA_SKRELL_HAIR_BLOCK 16 +// #define ORGAN_SLOT_EXTERNAL_SKRELL_HAIR "skrell_hair" -#define SPECIES_SKRELL "skrell" +// #define SPECIES_SKRELL "skrell" GLOBAL_LIST_EMPTY(skrell_hair_list) //////////////////////////////////// @@ -155,3 +155,38 @@ GLOBAL_LIST_EMPTY(skrell_hair_list) update_body_parts(update_limb_data = TRUE) if(mutations_overlay_update) update_mutations_overlay() + +/datum/dna/update_uf_block(blocknumber) + if(!blocknumber) + CRASH("UF block index is null") + if(!ishuman(holder)) + CRASH("Non-human mobs shouldn't have DNA") + switch(blocknumber) + if(DNA_MUTANT_COLOR_BLOCK) + set_uni_feature_block(blocknumber, sanitize_hexcolor(features["mcolor"], include_crunch = FALSE)) + if(DNA_ETHEREAL_COLOR_BLOCK) + set_uni_feature_block(blocknumber, sanitize_hexcolor(features["ethcolor"], include_crunch = FALSE)) + if(DNA_LIZARD_MARKINGS_BLOCK) + set_uni_feature_block(blocknumber, construct_block(GLOB.body_markings_list.Find(features["body_markings"]), GLOB.body_markings_list.len)) + if(DNA_TAIL_BLOCK) + set_uni_feature_block(blocknumber, construct_block(GLOB.tails_list.Find(features["tail_lizard"]), GLOB.tails_list.len)) + if(DNA_SNOUT_BLOCK) + set_uni_feature_block(blocknumber, construct_block(GLOB.snouts_list.Find(features["snout"]), GLOB.snouts_list.len)) + if(DNA_HORNS_BLOCK) + set_uni_feature_block(blocknumber, construct_block(GLOB.horns_list.Find(features["horns"]), GLOB.horns_list.len)) + if(DNA_FRILLS_BLOCK) + set_uni_feature_block(blocknumber, construct_block(GLOB.frills_list.Find(features["frills"]), GLOB.frills_list.len)) + if(DNA_SPINES_BLOCK) + set_uni_feature_block(blocknumber, construct_block(GLOB.spines_list.Find(features["spines"]), GLOB.spines_list.len)) + if(DNA_EARS_BLOCK) + set_uni_feature_block(blocknumber, construct_block(GLOB.ears_list.Find(features["ears"]), GLOB.ears_list.len)) + if(DNA_MOTH_WINGS_BLOCK) + set_uni_feature_block(blocknumber, construct_block(GLOB.moth_wings_list.Find(features["moth_wings"]), GLOB.moth_wings_list.len)) + if(DNA_MOTH_ANTENNAE_BLOCK) + set_uni_feature_block(blocknumber, construct_block(GLOB.moth_antennae_list.Find(features["moth_antennae"]), GLOB.moth_antennae_list.len)) + if(DNA_MOTH_MARKINGS_BLOCK) + set_uni_feature_block(blocknumber, construct_block(GLOB.moth_markings_list.Find(features["moth_markings"]), GLOB.moth_markings_list.len)) + if(DNA_MUSHROOM_CAPS_BLOCK) + set_uni_feature_block(blocknumber, construct_block(GLOB.caps_list.Find(features["caps"]), GLOB.caps_list.len)) + if(DNA_SKRELL_HAIR_BLOCK) + set_uni_feature_block(blocknumber, construct_block(GLOB.skrell_hair_list.Find(features["skrell_hair"]), GLOB.skrell_hair_list.len)) diff --git a/modular_galactic/skrell/skrell_organs.dm b/modular_galactic/skrell/skrell_organs.dm index f45d01043131c..e076a01386ec9 100644 --- a/modular_galactic/skrell/skrell_organs.dm +++ b/modular_galactic/skrell/skrell_organs.dm @@ -9,7 +9,7 @@ name = "skrell liver" icon_state = "liver" icon = 'modular_galactic/skrell/skrell_organs.dmi' - alcohol_tolerance = 3 + alcohol_tolerance = 5 toxTolerance = 10 //can shrug off up to 10u of toxins. liver_resistance = 1.2 * LIVER_DEFAULT_TOX_RESISTANCE @@ -18,3 +18,56 @@ #undef LIVER_DEFAULT_TOX_RESISTANCE #undef LIVER_FAILURE_STAGE_SECONDS #undef MAX_TOXIN_LIVER_DAMAGE + +/obj/item/organ/internal/tongue/skrell + name = "internal vocal sacs" + desc = "An Strange looking sac." + icon = 'modular_galactic/skrell/skrell_organs.dmi' + icon_state = "tongue" + taste_sensitivity = 5 + +/obj/item/organ/internal/tongue/skrell/get_possible_languages() + return ..() + /datum/language/skrell + +/obj/item/organ/internal/heart/skrell + name = "skrellian heart" + icon = 'modular_galactic/skrell/skrell_organs.dmi' + icon_state = "heart-on" + +/obj/item/organ/internal/brain/skrell + name = "spongy brain" + icon = 'modular_galactic/skrell/skrell_organs.dmi' + icon_state = "brain2" + +/obj/item/organ/internal/eyes/skrell + name = "amphibian eyes" + desc = "Large black orbs." + icon = 'modular_galactic/skrell/skrell_organs.dmi' + icon_state = "eyes" + flash_protect = FLASH_PROTECTION_SENSITIVE + +/obj/item/organ/internal/lungs/skrell + name = "skrell lungs" + icon = 'modular_galactic/skrell/skrell_organs.dmi' + icon_state = "lungs" + safe_plasma_max = 40 + safe_co2_max = 40 + + cold_message = "You can't stand the freezing cold with every breath you take!" + cold_level_1_threshold = 248 + cold_level_2_threshold = 220 + cold_level_3_threshold = 170 + cold_level_1_damage = COLD_GAS_DAMAGE_LEVEL_2 //Keep in mind with gas damage levels, you can set these to be negative, if you want someone to heal, instead. + cold_level_2_damage = COLD_GAS_DAMAGE_LEVEL_2 + cold_level_3_damage = COLD_GAS_DAMAGE_LEVEL_3 + cold_damage_type = BRUTE + + + hot_message = "You can't stand the searing heat with every breath you take!" + heat_level_1_threshold = 318 + heat_level_2_threshold = 348 + heat_level_3_threshold = 1000 + heat_level_1_damage = HEAT_GAS_DAMAGE_LEVEL_2 + heat_level_2_damage = HEAT_GAS_DAMAGE_LEVEL_2 + heat_level_3_damage = HEAT_GAS_DAMAGE_LEVEL_3 + heat_damage_type = BURN diff --git a/modular_galactic/skrell/skrell_bodyparts.dm b/modular_galactic/skrell/skrell_parts.dm similarity index 100% rename from modular_galactic/skrell/skrell_bodyparts.dm rename to modular_galactic/skrell/skrell_parts.dm diff --git a/modular_galactic/skrell/skrell_accessory.dm b/modular_galactic/skrell/skrell_tail_accessory.dm similarity index 98% rename from modular_galactic/skrell/skrell_accessory.dm rename to modular_galactic/skrell/skrell_tail_accessory.dm index 419ba17c29db3..36c272501f436 100644 --- a/modular_galactic/skrell/skrell_accessory.dm +++ b/modular_galactic/skrell/skrell_tail_accessory.dm @@ -4,6 +4,7 @@ /datum/sprite_accessory/skrell_tail name = "Skrell Male Tentacles" icon = 'modular_galactic/skrell/tails.dmi' + em_block = FALSE /datum/sprite_accessory/skrell_tail/none name = "Bald" diff --git a/modular_galactic/skrell/skrell_accessory_preference.dm b/modular_galactic/skrell/skrell_tail_accessory_preference.dm similarity index 100% rename from modular_galactic/skrell/skrell_accessory_preference.dm rename to modular_galactic/skrell/skrell_tail_accessory_preference.dm diff --git a/modular_galactic/skrell/tails.dmi b/modular_galactic/skrell/tails.dmi index 2678ca59cc02151fe195e3c0d4120ff822fc9503..8529ad3fff1dfa9b59f3007d9b6258aaafdf3f30 100644 GIT binary patch literal 5841 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 Vh#N$wO8@F?Zf0eQIe+8+e*rpDi&p>u literal 5848 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 diff --git a/tgstation.dme b/tgstation.dme index b94a8be29c834..e5e277c7c613b 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -331,6 +331,8 @@ #include "code\__DEFINES\dcs\signals\signals_mob\signals_mob_main.dm" #include "code\__DEFINES\dcs\signals\signals_mob\signals_mob_silicon.dm" #include "code\__DEFINES\dcs\signals\signals_mob\signals_mob_simple.dm" +#include "code\__DEFINES\modular_galactic\DNA.dm" +#include "code\__DEFINES\modular_galactic\skrell.dm" #include "code\__DEFINES\research\anomalies.dm" #include "code\__DEFINES\research\research_categories.dm" #include "code\__HELPERS\_auxtools_api.dm" @@ -5273,14 +5275,14 @@ #include "interface\menu.dm" #include "interface\stylesheet.dm" #include "interface\skin.dmf" +#include "modular_galactic\skrell\skrell.dm" #include "modular_galactic\skrell\skrell_defines.dm" -#include "modular_galactic\skrell\skrell_accessory.dm" -#include "modular_galactic\skrell\skrell_accessory_preference.dm" -#include "modular_galactic\skrell\skrell_bodyparts.dm" #include "modular_galactic\skrell\skrell_eyes.dm" #include "modular_galactic\skrell\skrell_language.dm" #include "modular_galactic\skrell\skrell_organs.dm" +#include "modular_galactic\skrell\skrell_parts.dm" #include "modular_galactic\skrell\skrell_pocket.dm" +#include "modular_galactic\skrell\skrell_tail_accessory.dm" +#include "modular_galactic\skrell\skrell_tail_accessory_preference.dm" #include "modular_galactic\skrell\skrell_tails.dm" -#include "modular_galactic\skrell\skrell.dm" // END_INCLUDE