diff --git a/code/__DEFINES/sprite_accessories.dm b/code/__DEFINES/sprite_accessories.dm index f2c1a4ed98bfe..a4003a31972c9 100644 --- a/code/__DEFINES/sprite_accessories.dm +++ b/code/__DEFINES/sprite_accessories.dm @@ -12,4 +12,4 @@ /// Uses the species's mutant color for the hair color #define USE_MUTANT_COLOR "use_mutant_color" /// Uses the species's fixed mutant color for the hair color -#define USE_FIXED_MUTANT_COLOR "use_fixed_mutant_color" \ No newline at end of file +#define USE_FIXED_MUTANT_COLOR "use_fixed_mutant_color" diff --git a/code/__DEFINES/~massmeta_defines/butt_furrt.dm b/code/__DEFINES/~meta_defines/butt_furrt.dm similarity index 100% rename from code/__DEFINES/~massmeta_defines/butt_furrt.dm rename to code/__DEFINES/~meta_defines/butt_furrt.dm diff --git a/code/__DEFINES/~massmeta_defines/inventory.dm b/code/__DEFINES/~meta_defines/inventory.dm similarity index 91% rename from code/__DEFINES/~massmeta_defines/inventory.dm rename to code/__DEFINES/~meta_defines/inventory.dm index 56653a341d487..b6d011fc142bb 100644 --- a/code/__DEFINES/~massmeta_defines/inventory.dm +++ b/code/__DEFINES/~meta_defines/inventory.dm @@ -8,7 +8,7 @@ GLOBAL_LIST_INIT(advanced_hardsuit_allowed, typecacheof(list( /obj/item/melee/baton, /obj/item/reagent_containers/spray/pepper, /obj/item/restraints/handcuffs, - /obj/item/tank/internals, + /obj/item/tank/internals ))) GLOBAL_LIST_INIT(security_hardsuit_allowed, typecacheof(list( @@ -20,5 +20,5 @@ GLOBAL_LIST_INIT(security_hardsuit_allowed, typecacheof(list( /obj/item/melee/baton, /obj/item/reagent_containers/spray/pepper, /obj/item/restraints/handcuffs, - /obj/item/tank/internals, + /obj/item/tank/internals ))) diff --git a/code/__DEFINES/~massmeta_defines/_defines_include.dm b/code/__DEFINES/~meta_defines/modular_meta_defines.dme similarity index 75% rename from code/__DEFINES/~massmeta_defines/_defines_include.dm rename to code/__DEFINES/~meta_defines/modular_meta_defines.dme index 96dfa242b1ab2..79bfd73c16633 100644 --- a/code/__DEFINES/~massmeta_defines/_defines_include.dm +++ b/code/__DEFINES/~meta_defines/modular_meta_defines.dme @@ -1,2 +1,3 @@ +//defines files #include "inventory.dm" #include "butt_furrt.dm" diff --git a/code/__DEFINES/~meta_defines/readme.md b/code/__DEFINES/~meta_defines/readme.md new file mode 100644 index 0000000000000..b6c68e9fcc406 --- /dev/null +++ b/code/__DEFINES/~meta_defines/readme.md @@ -0,0 +1,4 @@ +Это основной файл куда будут складываться все наши модульные добавления для defines. +Добавлять только: + Дефайны (.dm файлами) +Сам этот файл добавлен в tgstation.dme diff --git a/code/__HELPERS/chat_filter.dm b/code/__HELPERS/chat_filter.dm index 896b2fc4e5f0e..fae60615badc3 100644 --- a/code/__HELPERS/chat_filter.dm +++ b/code/__HELPERS/chat_filter.dm @@ -5,7 +5,7 @@ /// Given a text, will return what word is on the IC filter, with the reason. /// Returns null if the message is OK. /proc/is_ic_filtered(message) - if (config.ic_filter_regex?.Find_char(lowertext(message))) //MASSMETA EDIT + if (config.ic_filter_regex?.Find_char(LOWER_TEXT(message))) //MASSMETA EDIT var/matched_group = GET_MATCHED_GROUP(config.ic_filter_regex) return list( matched_group, @@ -17,7 +17,7 @@ /// Given a text, will return what word is on the soft IC filter, with the reason. /// Returns null if the message is OK. /proc/is_soft_ic_filtered(message) - if (config.soft_ic_filter_regex?.Find_char(lowertext(message))) //MASSMETA EDIT + if (config.soft_ic_filter_regex?.Find_char(LOWER_TEXT(message))) //MASSMETA EDIT CHANGE - ORIGINAL: .Find(message) var/matched_group = GET_MATCHED_GROUP(config.soft_ic_filter_regex) return list( matched_group, @@ -29,7 +29,7 @@ /// Given a text, will return what word is on the OOC filter, with the reason. /// Returns null if the message is OK. /proc/is_ooc_filtered(message) - if (config.ooc_filter_regex?.Find_char(lowertext(message))) //MASSMETA EDIT + if (config.ooc_filter_regex?.Find_char(LOWER_TEXT(message))) //MASSMETA EDIT CHANGE - ORIGINAL: .Find(message) var/matched_group = GET_MATCHED_GROUP(config.ooc_filter_regex) return list(matched_group, config.shared_filter_reasons[matched_group]) @@ -38,7 +38,7 @@ /// Given a text, will return that word is on the soft OOC filter, with the reason. /// Returns null if the message is OK. /proc/is_soft_ooc_filtered(message) - if (config.soft_ooc_filter_regex?.Find_char(lowertext(message))) //MASSMETA EDIT + if (config.soft_ooc_filter_regex?.Find_char(LOWER_TEXT(message))) //MASSMETA EDIT CHANGE - ORIGINAL: .Find(message) var/matched_group = GET_MATCHED_GROUP(config.soft_ooc_filter_regex) return list(matched_group, config.soft_shared_filter_reasons[matched_group]) @@ -64,7 +64,7 @@ /// Given a text, will return what word is on the IC filter, ignoring words allowed on the PDA, with the reason. /// Returns null if the message is OK. /proc/is_ic_filtered_for_pdas(message) - if (config.ic_outside_pda_filter_regex?.Find_char(lowertext(message))) //MASSMETA EDIT + if (config.ic_outside_pda_filter_regex?.Find_char(LOWER_TEXT(message))) //MASSMETA EDIT CHANGE - ORIGINAL: .Find(message) var/matched_group = GET_MATCHED_GROUP(config.ic_outside_pda_filter_regex) return list( matched_group, @@ -76,7 +76,7 @@ /// Given a text, will return what word is on the soft IC filter, ignoring words allowed on the PDA, with the reason. /// Returns null if the message is OK. /proc/is_soft_ic_filtered_for_pdas(message) - if (config.soft_ic_outside_pda_filter_regex?.Find_char(lowertext(message))) //MASSMETA EDIT + if (config.soft_ic_outside_pda_filter_regex?.Find_char(LOWER_TEXT(message))) //MASSMETA EDIT CHANGE - ORIGINAL: .Find(message) var/matched_group = GET_MATCHED_GROUP(config.soft_ic_outside_pda_filter_regex) return list( matched_group, diff --git a/code/__HELPERS/~meta_helpers/modular_meta_helpers.dme b/code/__HELPERS/~meta_helpers/modular_meta_helpers.dme new file mode 100644 index 0000000000000..b5b4a02b6ae73 --- /dev/null +++ b/code/__HELPERS/~meta_helpers/modular_meta_helpers.dme @@ -0,0 +1,10 @@ +/* +* +* Это основной файл куда будут складываться все наши модульные добавления для хелперов. +* Добавлять только: +* Хелперы (.dm файлами) +* Сам этот файл добавлен в tgstation.dme +* +*/ + +//helpers files diff --git a/code/__HELPERS/~meta_helpers/readme.md b/code/__HELPERS/~meta_helpers/readme.md new file mode 100644 index 0000000000000..fabaabb00c931 --- /dev/null +++ b/code/__HELPERS/~meta_helpers/readme.md @@ -0,0 +1,4 @@ +Это основной файл куда будут складываться все наши модульные добавления для helpers. +Добавлять только: + Хелперы (.dm файлами) +Сам этот файл добавлен в tgstation.dme \ No newline at end of file diff --git a/code/modules/projectiles/ammunition/ballistic/rifle.dm b/code/modules/projectiles/ammunition/ballistic/rifle.dm index ce305623b4d39..4ce24a3ba0802 100644 --- a/code/modules/projectiles/ammunition/ballistic/rifle.dm +++ b/code/modules/projectiles/ammunition/ballistic/rifle.dm @@ -7,13 +7,14 @@ caliber = CALIBER_STRILKA310 projectile_type = /obj/projectile/bullet/strilka310 -// massmeta edit +// MASSMETA EDIT REMOVAL BEGIN - mosin return /* - /obj/item/ammo_casing/strilka310/Initialize(mapload) - . = ..() +/obj/item/ammo_casing/strilka310/Initialize(mapload) + . = ..() AddElement(/datum/element/caseless) */ +// MASSMETA EDIT REMOVAL END /obj/item/ammo_casing/strilka310/surplus name = ".310 Strilka surplus bullet casing" diff --git a/code/modules/surgery/organs/external/tails.dm b/code/modules/surgery/organs/external/tails.dm index d54978b7c596e..38b35bce45cb3 100644 --- a/code/modules/surgery/organs/external/tails.dm +++ b/code/modules/surgery/organs/external/tails.dm @@ -216,4 +216,4 @@ /datum/bodypart_overlay/mutant/tail_spines/can_draw_on_bodypart(mob/living/carbon/human/human) . = ..() if(human.wear_suit && (human.wear_suit.flags_inv & HIDEJUMPSUIT)) - return FALSE \ No newline at end of file + return FALSE diff --git a/massmeta/includes.dm b/massmeta/modular_meta.dme similarity index 98% rename from massmeta/includes.dm rename to massmeta/modular_meta.dme index 80b52623ff5a6..c53fa6cb34251 100644 --- a/massmeta/includes.dm +++ b/massmeta/modular_meta.dme @@ -1,4 +1,7 @@ -//master files +//modular files + + +//master files (unsorted, TODO: need modularization) #include "code\_globalvars\lists\names.dm" #include "code\__HELPERS\names.dm" #include "interface\interface.dm" @@ -104,3 +107,4 @@ #include "code\modules\reagents\chemistry\reagents\drinks\glass_styles\sodas.dm" #include "code\modules\reagents\reagent_containers\cups\soda.dm" #include "code\modules\reagents\reagent_dispenser.dm" + diff --git a/massmeta/readme.md b/massmeta/readme.md new file mode 100644 index 0000000000000..1eed404ab6c6b --- /dev/null +++ b/massmeta/readme.md @@ -0,0 +1,7 @@ +Это основной файл куда будут складываться все наши модульные добавления. +Добавлять только: +* Модули (.dme файлами) +Сам этот файл добавлен в tgstation.dme + +Все Defines лежат в папке "code\__DEFINES\~meta_defines\" +Все Helpers лежат в папке "code\__HELPERS\~meta_helpers\" diff --git a/strings/massmeta/italian_replacement_ru.json b/strings/massmeta/italian_replacement_ru.json index 27835a8d224d9..5d4f44a48a692 100644 --- a/strings/massmeta/italian_replacement_ru.json +++ b/strings/massmeta/italian_replacement_ru.json @@ -84,7 +84,7 @@ "хуйня": "дерьмо", "чил": "дерьмо", "щитсек": "инвалид", - "щитсеки": "инвалиды", + "щитсеки": "инвалиды" } diff --git a/tgstation.dme b/tgstation.dme index cad7037ffdfa0..89b9a56222584 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -392,7 +392,7 @@ #include "code\__DEFINES\traits\declarations.dm" #include "code\__DEFINES\traits\macros.dm" #include "code\__DEFINES\traits\sources.dm" -#include "code\__DEFINES\~massmeta_defines\_defines_include.dm" +#include "code\__DEFINES\~meta_defines\modular_meta_defines.dme" //MASSMETA EDIT ADDITION (all massmeta defines only here) #include "code\__HELPERS\_auxtools_api.dm" #include "code\__HELPERS\_lists.dm" #include "code\__HELPERS\_planes.dm" @@ -507,6 +507,7 @@ #include "code\__HELPERS\paths\sssp.dm" #include "code\__HELPERS\sorts\helpers.dm" #include "code\__HELPERS\sorts\sort_instance.dm" +#include "code\__HELPERS\~meta_helpers\modular_meta_helpers.dme" //MASSMETA EDIT ADDITION (all massmeta helpers only here) #include "code\_globalvars\_regexes.dm" #include "code\_globalvars\admin.dm" #include "code\_globalvars\arcade.dm" @@ -6240,5 +6241,5 @@ #include "interface\fonts\spess_font.dm" #include "interface\fonts\tiny_unicode.dm" #include "interface\fonts\vcr_osd_mono.dm" -#include "massmeta\includes.dm" +#include "massmeta\modular_meta.dme" //MASSMETA EDIT ADDITION (all massmeta modules only here) // END_INCLUDE