From f9ced369d9c5bbca80e5c49940afff9073f7c207 Mon Sep 17 00:00:00 2001 From: RalseiDreemuurr Date: Sun, 15 Sep 2024 18:52:49 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B1=D0=BE=D1=80=D0=BD=D0=B8=D0=BA=20?= =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/__DEFINES/inventory.dm | 4 +- code/modules/clothing/head/_head.dm | 5 +- code/modules/clothing/masks/_masks.dm | 5 +- code/modules/clothing/spacesuits/hardsuit.dm | 94 ++++++------------- code/modules/clothing/suits/_suits.dm | 5 +- .../mob/living/carbon/human/update_icons.dm | 25 +++-- mod_celadon/balance/README.md | 4 + mod_celadon/balance/_balance.dme | 2 + mod_celadon/balance/code/gloves.dm | 12 +++ mod_celadon/balance/code/hardsuit.dm | 2 + mod_celadon/items/code/coats.dm | 8 +- mod_celadon/items/code/external_wears.dm | 2 +- mod_celadon/items/code/suits.dm | 4 - mod_celadon/items/code/under.dm | 2 +- 14 files changed, 78 insertions(+), 96 deletions(-) create mode 100644 mod_celadon/balance/code/gloves.dm create mode 100644 mod_celadon/balance/code/hardsuit.dm diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm index c2deda7d1ba3..376f0edc651b 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -84,9 +84,7 @@ #define SNOUTED_VARIATION (1<<4) //Ex of naming: a state called "nameof_thing" can be named "nameof_thing_snouted" #define VOX_VARIATION (1<<5) #define KEPORI_VARIATION (1<<6) -// [CELADON-ADD] - TAJARA -#define TAJARA_VARIATION (1<<7) -// [/CELADON-ADD] + #define NOT_DIGITIGRADE 0 #define FULL_DIGITIGRADE 1 diff --git a/code/modules/clothing/head/_head.dm b/code/modules/clothing/head/_head.dm index f274e3264c5f..aa1114e6b182 100644 --- a/code/modules/clothing/head/_head.dm +++ b/code/modules/clothing/head/_head.dm @@ -11,10 +11,7 @@ var/can_toggle = null greyscale_icon_state = "hat" greyscale_colors = list(list(16,26)) - // [CELADON-EDIT] - TAJARA - // supports_variations = VOX_VARIATION // CELADON-EDIT - ORIGINAL - supports_variations = VOX_VARIATION | TAJARA_VARIATION - // [/CELADON-EDIT] + supports_variations = VOX_VARIATION ///Special throw_impact for hats to frisbee hats at people to place them on their heads/attempt to de-hat them. /obj/item/clothing/head/throw_impact(atom/hit_atom, datum/thrownthing/thrownthing) diff --git a/code/modules/clothing/masks/_masks.dm b/code/modules/clothing/masks/_masks.dm index cbc7fd1bced6..a4c1d5d509fa 100644 --- a/code/modules/clothing/masks/_masks.dm +++ b/code/modules/clothing/masks/_masks.dm @@ -10,10 +10,7 @@ var/modifies_speech = FALSE var/mask_adjusted = 0 var/adjusted_flags = null - // [CELADON-EDIT] - TAJARA - // supports_variations = VOX_VARIATION | KEPORI_VARIATION // CELADON-EDIT - ORIGINAL - supports_variations = VOX_VARIATION | KEPORI_VARIATION | TAJARA_VARIATION - // [/CELADON-EDIT] + supports_variations = VOX_VARIATION | KEPORI_VARIATION /obj/item/clothing/mask/attack_self(mob/user) if((clothing_flags & VOICEBOX_TOGGLABLE)) diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 0942f05c2921..f9d651c7bdd7 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -209,10 +209,7 @@ item_state = "eng_hardsuit" siemens_coefficient = 0 armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 100, "acid" = 75) - // [CELADON-EDIT] - TAJARA - // supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL - supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION - // [/CELADON-EDIT] + supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine resistance_flags = FIRE_PROOF @@ -290,10 +287,7 @@ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/mining heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS custom_price = 2000 - // [CELADON-EDIT] - TAJARA - // supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL - supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION - // [/CELADON-EDIT] + supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION /obj/item/clothing/suit/space/hardsuit/mining/Initialize() . = ..() @@ -393,10 +387,16 @@ linkedsuit.name = initial(linkedsuit.name) linkedsuit.desc = initial(linkedsuit.desc) linkedsuit.clothing_flags |= STOPSPRESSUREDAMAGE + // [CELADON - ADD] - BALANCE + linkedsuit.slowdown = 0.7 + // [CELADON - ADD] linkedsuit.cold_protection |= CHEST | GROIN | LEGS | FEET | ARMS | HANDS else linkedsuit.name += " (combat)" linkedsuit.desc = linkedsuit.alt_desc + // [CELADON - ADD] - BALANCE + linkedsuit.slowdown = linkedsuit.combat_slowdown + // [CELADON - ADD] linkedsuit.clothing_flags &= ~STOPSPRESSUREDAMAGE linkedsuit.cold_protection &= ~(CHEST | GROIN | LEGS | FEET | ARMS | HANDS) if(linkedsuit.lightweight) @@ -420,12 +420,12 @@ allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi jetpack = /obj/item/tank/jetpack/suit - // [CELADON-EDIT] - TAJARA - // supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL - supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION - // [/CELADON-EDIT] - slowdown = 0.5 - var/combat_slowdown = 0 //slowdown when in combat mode + supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION + // [CELADON - EDIT] - BALANCE + // slowdown = 0.5 // [CELADON - EDIT] - ORIGINAL + // var/combat_slowdown = 0 //slowdown when in combat mode // [CELADON - EDIT] - ORIGINAL + var/combat_slowdown = 0.2 + // [CELADON - EDIT] var/lightweight = 0 //used for flags when toggling //Ramzi Syndie suit @@ -449,11 +449,11 @@ lightweight = 1 jetpack = null armor = list("melee" = 35, "bullet" = 25, "laser" = 20,"energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75) - slowdown = 0.7 + // [CELADON - REMOVE] - BALANCE + // slowdown = 0.7 // [CELADON - REMOVE] - ORIGINAL + // [CELADON - REMOVE] jetpack = null - // [CELADON-ADD] - TAJARA supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION - // [/CELADON-ADD] //Elite Syndie suit /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite @@ -486,10 +486,7 @@ heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT resistance_flags = FIRE_PROOF | ACID_PROOF - // [CELADON-EDIT] - TAJARA - // supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL - supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION - // [/CELADON-EDIT] + supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION /obj/item/clothing/suit/space/hardsuit/syndi/elite/debug helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite/debug @@ -503,10 +500,7 @@ hardsuit_type = "cybersun" armor = list("melee" = 25, "bullet" = 25, "laser" = 50, "energy" = 50, "bomb" = 25, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 60) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/cybersun - // [CELADON-EDIT] - TAJARA - // supports_variations = VOX_VARIATION // CELADON-EDIT - ORIGINAL - supports_variations = VOX_VARIATION | TAJARA_VARIATION - // [/CELADON-EDIT] + supports_variations = VOX_VARIATION /obj/item/clothing/head/helmet/space/hardsuit/syndi/cybersun name = "neutron-star combat hardsuit helmet" @@ -525,10 +519,7 @@ hardsuit_type = "cyberparamed" armor = list("melee" = 25, "bullet" = 25, "laser" = 35, "energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 65, "fire" = 75, "acid" = 40) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/cybersun/paramed - // [CELADON-EDIT] - TAJARA - // supports_variations = VOX_VARIATION // CELADON-EDIT - ORIGINAL - supports_variations = VOX_VARIATION | TAJARA_VARIATION - // [/CELADON-EDIT] + supports_variations = VOX_VARIATION jetpack = null /obj/item/clothing/head/helmet/space/hardsuit/syndi/cybersun/paramed @@ -547,10 +538,7 @@ icon_state = "hardsuit1-pointman" hardsuit_type = "pointman" helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/inteq - // [CELADON-EDIT] - TAJARA - // supports_variations = VOX_VARIATION // CELADON-EDIT - ORIGINAL - supports_variations = VOX_VARIATION | TAJARA_VARIATION - // [/CELADON-EDIT] + supports_variations = VOX_VARIATION /obj/item/clothing/head/helmet/space/hardsuit/syndi/inteq @@ -606,10 +594,7 @@ armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 75) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/medical slowdown = 0.5 - // [CELADON-EDIT] - TAJARA - // supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL - supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION - // [/CELADON-EDIT] + supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION /obj/item/clothing/head/helmet/space/hardsuit/medical/cmo name = "chief medical officer's hardsuit helmet" @@ -672,10 +657,7 @@ /obj/item/aicard) armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 100, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 80) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/rd - // [CELADON-EDIT] - TAJARA - // supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL - supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION - // [/CELADON-EDIT] + supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION //Security hardsuit /obj/item/clothing/head/helmet/space/hardsuit/security @@ -695,10 +677,7 @@ armor = list("melee" = 35, "bullet" = 15, "laser" = 30, "energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security slowdown = 0.5 - // [CELADON-EDIT] - TAJARA - // supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL - supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION - // [/CELADON-EDIT] + supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION /obj/item/clothing/suit/space/hardsuit/security/Initialize() . = ..() @@ -720,10 +699,7 @@ armor = list("melee" = 45, "bullet" = 25, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 100, "rad" = 50, "fire" = 95, "acid" = 95) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/hos jetpack = /obj/item/tank/jetpack/suit - // [CELADON-EDIT] - TAJARA - // supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL - supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION - // [/CELADON-EDIT] + supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION //SWAT MKII /obj/item/clothing/head/helmet/space/hardsuit/swat @@ -1063,10 +1039,7 @@ item_state = "independent_sec_helm" hardsuit_type = "independent-sec" armor = list("melee" = 35, "bullet" = 25, "laser" = 20,"energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75) - // [CELADON-EDIT] - TAJARA - // supports_variations = VOX_VARIATION | SNOUTED_VARIATION // CELADON-EDIT - ORIGINAL - supports_variations = VOX_VARIATION | SNOUTED_VARIATION | TAJARA_VARIATION - // [/CELADON-EDIT] + supports_variations = VOX_VARIATION | SNOUTED_VARIATION /obj/item/clothing/suit/space/hardsuit/security/independent icon_state = "hardsuit-independent-sec" @@ -1077,10 +1050,7 @@ hardsuit_type = "independent-sec" helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/independent armor = list("melee" = 35, "bullet" = 25, "laser" = 20, "energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75) - // [CELADON-EDIT] - TAJARA - // supports_variations = VOX_VARIATION | DIGITIGRADE_VARIATION // CELADON-EDIT - ORIGINAL - supports_variations = VOX_VARIATION | DIGITIGRADE_VARIATION | TAJARA_VARIATION - // [/CELADON-EDIT] + supports_variations = VOX_VARIATION | DIGITIGRADE_VARIATION //Mining /obj/item/clothing/head/helmet/space/hardsuit/mining/independent @@ -1225,10 +1195,7 @@ item_state = "hardsuit-inteq" hardsuit_type = "inteq" helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/independent/inteq - // [CELADON-EDIT] - TAJARA - // supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL - supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION - // [/CELADON-EDIT] + supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION /obj/item/clothing/head/helmet/space/hardsuit/solgov name = "\improper SolGov hardsuit helmet" @@ -1247,10 +1214,7 @@ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/solgov allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals) slowdown = 0.5 - // [CELADON-EDIT] - TAJARA - // supports_variations = DIGITIGRADE_VARIATION // CELADON-EDIT - ORIGINAL - supports_variations = DIGITIGRADE_VARIATION | TAJARA_VARIATION - // [/CELADON-EDIT] + supports_variations = DIGITIGRADE_VARIATION /obj/item/clothing/head/helmet/space/hardsuit/quixote name = "\improper Quixote mobility hardsuit helmet" diff --git a/code/modules/clothing/suits/_suits.dm b/code/modules/clothing/suits/_suits.dm index 339f62a555d6..30d3c3c3c9ba 100644 --- a/code/modules/clothing/suits/_suits.dm +++ b/code/modules/clothing/suits/_suits.dm @@ -15,10 +15,7 @@ pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo //WS Edit - Exowear Pockets greyscale_colors = list(list(13, 16), list(10, 18), list(13, 21)) greyscale_icon_state = "coat" - // [CELADON-EDIT] - TAJARA - // supports_variations = VOX_VARIATION // CELADON-EDIT - ORIGINAL - supports_variations = VOX_VARIATION | TAJARA_VARIATION - // [/CELADON-EDIT] + supports_variations = VOX_VARIATION mob_overlay_icon = 'icons/mob/clothing/suit.dmi' /obj/item/clothing/suit/worn_overlays(isinhands = FALSE) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 13b9c1de58ed..e6593ef6dc4d 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -524,8 +524,13 @@ There are several things that need to be remembered: handled_by_bodytype = TRUE // [CELADON-ADD] - TAJARA - if((I.supports_variations & TAJARA_VARIATION) && (dna.species.bodytype & BODYTYPE_TAJARA)) - icon_file = TAJARA_HEAD_PATH + else if(BODYTYPE_TAJARA) + if(icon_exists(SARATHI_SNOUTED_HELM_PATH, RESOLVE_ICON_STATE(I))) + icon_file = SARATHI_SNOUTED_HELM_PATH + if(I.snout_override_icon) + icon_file = I.snout_override_icon + else + handled_by_bodytype = TRUE // [/CELADON-ADD] if(!(icon_exists(icon_file, RESOLVE_ICON_STATE(I)))) @@ -637,8 +642,11 @@ There are several things that need to be remembered: handled_by_bodytype = TRUE // [CELADON-ADD] - TAJARA - else if((dna.species.bodytype & BODYTYPE_TAJARA) && (I.supports_variations & TAJARA_VARIATION)) - icon_file = TAJARA_SUIT_PATH + else if(BODYTYPE_TAJARA) + if(icon_exists(TAJARA_SUIT_PATH, RESOLVE_ICON_STATE(I))) + icon_file = TAJARA_SUIT_PATH + else + handled_by_bodytype = TRUE // [/CELADON-ADD] if(!(icon_exists(icon_file, RESOLVE_ICON_STATE(I)))) @@ -735,8 +743,13 @@ There are several things that need to be remembered: handled_by_bodytype = TRUE // [CELADON-ADD] - TAJARA - if((dna.species.bodytype & BODYTYPE_TAJARA) && (I.supports_variations & TAJARA_VARIATION)) - icon_file = TAJARA_MASK_PATH + else if(BODYTYPE_TAJARA) + if(icon_exists(SARATHI_SNOUTED_MASK_PATH, RESOLVE_ICON_STATE(I))) + icon_file = SARATHI_SNOUTED_MASK_PATH + if(I.snout_override_icon) + icon_file = I.snout_override_icon + else + handled_by_bodytype = TRUE // [/CELADON-ADD] diff --git a/mod_celadon/balance/README.md b/mod_celadon/balance/README.md index 97fb62a81551..09b030b447cc 100644 --- a/mod_celadon/balance/README.md +++ b/mod_celadon/balance/README.md @@ -76,6 +76,10 @@ EDIT: ADD: `code/modules/vending/_vending.dm` : Добавлена вероятность поломки автомата при уничтожение его с вероятностью в 30% что ничего не выпадет с него + +Хардсьюты: +EDIT: `code/modules/clothing/spacesuits/hardsuit.dm` +REMOVE: `code/modules/clothing/spacesuits/hardsuit.dm`