Импровизация модулей

code/__HELPERS/priority_announce.dm

@@ -56,23 +56,18 @@
 		sound = SSstation.announcer.event_sounds[sound]
 
 	var/header
-	var/title_shit // MASSMETA EDIT (вебхуки)
 	switch(type)
 		if(ANNOUNCEMENT_TYPE_PRIORITY)
 			header = MAJOR_ANNOUNCEMENT_TITLE("Priority Announcement")
-			title_shit = "Priority Announcement" // MASSMETA EDIT (вебхуки)
 			if(length(title) > 0)
 				header += SUBHEADER_ANNOUNCEMENT_TITLE(title)
 		if(ANNOUNCEMENT_TYPE_CAPTAIN)
 			header = MAJOR_ANNOUNCEMENT_TITLE("Captain's Announcement")
-			title_shit = "Captain's Announcement" // MASSMETA EDIT (вебхуки)
 			GLOB.news_network.submit_article(text, "Captain's Announcement", NEWSCASTER_STATION_ANNOUNCEMENTS, null)
 		if(ANNOUNCEMENT_TYPE_SYNDICATE)
 			header = MAJOR_ANNOUNCEMENT_TITLE("Syndicate Captain's Announcement")
-			title_shit = "Syndicate Captain's Announcement" // MASSMETA EDIT (вебхуки)
 		else
 			header += generate_unique_announcement_header(title, sender_override)
-			title_shit = title // MASSMETA EDIT (вебхуки)
 
 	announcement_strings += ANNOUNCEMENT_HEADER(header)
 
@@ -96,8 +91,6 @@
 		else
 			GLOB.news_network.submit_article(text, "[command_name()] Update", NEWSCASTER_STATION_ANNOUNCEMENTS, null)
 
-	send2announcement_webhook(title_shit, text, sender_override, color_override) // MASSMETA EDIT: Добавляем отправку анонсов в Discord
-
 /proc/print_command_report(text = "", title = null, announce=TRUE)
 	if(!title)
 		title = "Classified [command_name()] Update"
@@ -152,14 +145,6 @@
 	var/custom_sound = sound_override || (alert ? 'sound/announcer/notice/notice1.ogg' : 'sound/announcer/notice/notice2.ogg')
 	dispatch_announcement_to_players(finalized_announcement, players, custom_sound, should_play_sound)
 
-	// MASSMETA EDIT BEGIN (вебхуки)
-	var/text = message
-	if(title != null && title != "" && title == "Attention:")
-		send2announcement_webhook(title, text, color_override) // MASSMETA EDIT: Добавляем отправку анонсов в Discord
-	else
-		send2announcement_webhook("Attention", text, color_override) // MASSMETA EDIT: Добавляем отправку анонсов в Discord
-	// MASSMETA EDIT END
-
 /// Sends an announcement about the level changing to players. Uses the passed in datum and the subsystem's previous security level to generate the message.
 /proc/level_announce(datum/security_level/selected_level, previous_level_number)
 	var/current_level_number = selected_level.number_level

code/__HELPERS/roundend.dm

@@ -292,9 +292,6 @@ GLOBAL_LIST_INIT(achievements_unlocked, list())
 
 	world.TgsTriggerEvent("tg-Roundend", wait_for_completion = TRUE)
 
-	// MASSMETA EDIT (вебхуки)
-	send2announcement_webhook("Round Ended", "[GLOB.round_id ? "Round [GLOB.round_id]" : "The round has"] just ended.", null, "green")
-
 	sleep(5 SECONDS)
 	ready_for_reboot = TRUE
 	standard_reboot()

code/controllers/subsystem/ticker.dm

@@ -297,9 +297,6 @@ SUBSYSTEM_DEF(ticker)
 
 	PostSetup()
 
-	// MASSMETA EDIT (вебхуки)
-	send2announcement_webhook("Round Start", "[GLOB.round_id ? "Round [GLOB.round_id]" : "The round has"] started.", null, "green")
-
 	return TRUE
 
 /datum/controller/subsystem/ticker/proc/PostSetup()

modular_meta/__modpack/modpack.dm

@@ -9,7 +9,7 @@
 	var/desc
 	/// A string with authors of this modpack.
 	var/author
-	/// A string with group of this modpack. Choose between "Features", "Translations" and "Reverts"
+	/// A string with group of this modpack. Choose between "Features", "Tweaks" and "Reverts"
 	var/group
 	/// A list of your modpack's dependencies. If you use obj from another modpack - put it here.
 	var/list/mod_depends = list()
@@ -58,9 +58,9 @@
 
 /datum/modpack/ui_static_data(mob/user)
 	. = ..()
-	.["categories"] = list("Features", "Translations", "Reverts")
+	.["categories"] = list("Features", "Tweaks", "Reverts")
 	.["features"] = list()
-	.["translations"] = list()
+	.["tweaks"] = list()
 	.["reverts"] = list()
 
 	var/datum/asset/spritesheet_batched/assets = get_asset_datum(/datum/asset/spritesheet_batched/modpacks)
@@ -78,9 +78,9 @@
 
 		if (modpack.group == "Фичи" || modpack.group == "Features")
 			.["features"] += list(modpack_data)
-		else if (modpack.group == "Переводы" || modpack.group == "Translations")
-			.["translations"] += list(modpack_data)
-		else if (modpack.group == "Балансы" || modpack.group == "Reverts")
+		else if (modpack.group == "Твики" || modpack.group == "Tweaks")
+			.["tweaks"] += list(modpack_data)
+		else if (modpack.group == "Откаты" || modpack.group == "Reverts")
 			.["reverts"] += list(modpack_data)
 		else
 			CRASH("Modpack [modpack.name] has bad group name or queued for deletion.")

modular_meta/features/countdown_antimov_sfx/includes.dm

@@ -2,9 +2,9 @@
 #include "code\countdown.dm"
 
 /datum/modpack/countdown_antimov_sfx
-	id = "COUNTDOWN"
+	id = "countdown_antimov_sfx"
 	icon = 'modular_meta/features/countdown_antimov_sfx/preview.dmi'
-	name = "Misc stuff"
+	name = "Countdown Antimov SFX"
 	group = "Features"
-	desc = "Добавляет звук ИИ-шке при получении набора законов «Антимов». А также музыку при объявлении войны и запуске ядерной боеголовки"
+	desc = "Добавляет звук ИИ при получении набора законов «Антимов». А также музыку при объявлении войны и запуске ядерной боеголовки"
 	author = "code by Bruh24, idea by piki.ta"

modular_meta/features/roundstart_shell/includes.dm

@@ -2,7 +2,7 @@
 
 /datum/modpack/roundstart_shell
 	id = "roundstart_shell"
-	name = "Раундстартовые шеллы для ИИ"
+	name = "Раундстартовые оболочки для ИИ"
 	group = "Features"
 	desc = "Добавляет на каждую станцию по 2 шелла для ИИ."
 	author = "Sanecman"

modular_meta/main_modular_include.dm

@@ -2,29 +2,21 @@
 // Some modules can be easy excludes from code compile sequence by commenting #define you need to remove in code\__DEFINES\__meta_modpaks_includes.dm
 // Keep in mind, that module may not be only in modular folder but also embedded directly in TG code and covered with #ifdef - #endif structure
 
-#include "__modpack\assets_modpacks.dm"
-#include "__modpack\modpack.dm" //modpack obj
-#include "__modpack\modpacks_subsystem.dm" //actually mods subsystem + tgui in "tgui/packages/tgui/interfaces/Modpacks.tsx"
+#include "__modpack\assets_modpacks.dm" //Assets for modpacks subsystem, used for TGUI and other things
+#include "__modpack\modpack.dm" //Modpack base class, used for all modpacks
+#include "__modpack\modpacks_subsystem.dm" //Actually modpacks subsystem + TGUI in "tgui/packages/tgui/interfaces/Modpacks.tsx"
 
 
-/* --FEATURES-- */
+/* --- Features --- */
 
 #include "features\additional_circuit\includes.dm"
 #include "features\admin\includes.dm"
 #include "features\ai_things\includes.dm"
 #include "features\antagonists\includes.dm"
-#include "features\antagonists_balance\includes.dm"
-#include "features\better_ui\includes.dm"
 #include "features\cheburek_car\includes.dm"
-#include "features\colossus\includes.dm"
-#include "features\del_required_experiments\includes.dm"
 #include "features\more_clothes\includes.dm"
-#include "features\gases\includes.dm"
 #include "features\hardsuits\includes.dm"
-#include "features\hierophant_club_resprite\includes.dm"
 #include "features\kvass_beverage\includes.dm"
-#include "features\lead_pipe\includes.dm"
-#include "features\lgbt_removal\includes.dm"
 #include "features\oguzok_cook\includes.dm"
 #include "features\quirk_augmented\includes.dm"
 #include "features\meta_maps\includes.dme"
@@ -42,24 +34,28 @@
 #include "features\mod_vend\includes.dm"
 #include "features\roundstart_shell\includes.dm"
 #include "features\telescience\includes.dm"
-#include "features\send2status\include.dm"
 #include "features\deathmatch\includes.dm"
 #include "features\countdown_antimov_sfx\includes.dm"
-/* -- REVERTS -- */
 
-#include "reverts\re_beheading\includes.dm"
-#include "reverts\re_buff_lasers\includes.dm"
-#include "reverts\re_glasses_protect_welding\includes.dm"
-#include "reverts\re_hooch_heals_assistants\includes.dm"
-#include "reverts\re_satchels_num_back\includes.dm"
-#include "reverts\re_bulky_extinguishers\includes.dm"
-#include "reverts\re_wallmed\includes.dm"
+/* --- Reverts --- */
 
-/* --TRANSLATIONS-- */
+#include "reverts\beheading\includes.dm"
+#include "reverts\buff_lasers\includes.dm"
+#include "reverts\bulky_extinguishers\includes.dm"
+#include "reverts\colossus\includes.dm"
+#include "reverts\glasses_protect\includes.dm"
+#include "reverts\hooch\includes.dm"
+#include "reverts\nanomed\includes.dm"
+#include "reverts\satchels_back\includes.dm"
 
-#include "ru_translate\ru_ai_laws\includes.dm"
-#include "ru_translate\ru_crayons\includes.dm"
-#include "ru_translate\ru_pets_commands\includes.dm"
-#include "ru_translate\ru_traumas\includes.dm"
-#include "ru_translate\ru_tweak_say_fonts\includes.dm"
-#include "ru_translate\ru_vendors\includes.dm"
+/* --- Tweaks --- */
+
+#include "tweaks\antagonists_balance\includes.dm"
+#include "tweaks\better_ui\includes.dm"
+#include "tweaks\del_required_experiments\includes.dm"
+#include "tweaks\fonts\includes.dm"
+#include "tweaks\resprite\includes.dm"
+#include "tweaks\russian_translation\includes.dm"
+#include "tweaks\gases\includes.dm"
+#include "tweaks\lead_pipe\includes.dm"
+#include "tweaks\lgbt_removal\includes.dm"

modular_meta/reverts/re_beheading/includes.dm → modular_meta/reverts/beheading/includes.dm

@@ -1,8 +1,8 @@
-#include "code\master_head.dm"
+#include "code\head.dm"
 
-/datum/modpack/re_beheading
-	id = "re_beheading"
-	name = "Секир-бошка"
+/datum/modpack/beheading
+	id = "beheading"
+	name = "Декап головы"
 	group = "Reverts"
 	desc = "Возвращает возможность отрубать голову 2D космонафтикам"
 	author = "homexp13"

modular_meta/reverts/re_buff_lasers/includes.dm → modular_meta/reverts/buff_lasers/includes.dm

@@ -1,8 +1,8 @@
-#include "code\master_beams.dm"
+#include "code\beams.dm"
 
-/datum/modpack/re_buff_lasers
-	id = "re_buff_lasers"
-	name = "Сниженый урон лазеров"
+/datum/modpack/buff_lasers
+	id = "buff_lasers"
+	name = "Сниженный урон лазеров"
 	group = "Reverts"
 	desc = "Возвращает возвращает урон у лазеров каким он был, делая его не таким имбой"
 	author = "homexp13"

modular_meta/reverts/re_bulky_extinguishers/includes.dm → modular_meta/reverts/bulky_extinguishers/includes.dm

@@ -1,8 +1,8 @@
 #include "code\extinguisher.dm"
 
-/datum/modpack/re_bulky_extinguishers
-	id = "re_bulky_extinguishers"
-	name = "normal-sized огнетушители"
+/datum/modpack/bulky_extinguishers
+	id = "bulky_extinguishers"
+	name = "Огнетушители нормального размера"
 	group = "Reverts"
 	desc = "Огнетушители вновь могут храниться в вашем рюкзаке."
 	author = "Bruh24"

modular_meta/reverts/re_glasses_protect_welding/includes.dm → modular_meta/reverts/glasses_protect/includes.dm

@@ -1,7 +1,7 @@
-#include "code\m_huds_welding.dm"
+#include "code\_glasses_hud.dm"
 
-/datum/modpack/revert_glasses_protect_welding
-	id = "revert_glasses_protect_welding"
+/datum/modpack/glasses_protect
+	id = "glasses_protect"
 	//no icon for example
 	name = "Очки защищают от сварки"
 	group = "Reverts"

modular_meta/reverts/re_hooch_heals_assistants/includes.dm → modular_meta/reverts/hooch/includes.dm

@@ -1,7 +1,7 @@
-#include "code\hooch_for_assistants.dm"
+#include "code\assistant.dm"
 
-/datum/modpack/re_hooch_heals_assistants
-	id = "re_hooch_heals_assistants"
+/datum/modpack/hooch
+	id = "hooch"
 	name = "Хуч лечит ассистентов"
 	group = "Reverts"
 	desc = "Напиток Hooch теперь опять лечит ассистентов, как это было до"

modular_meta/reverts/re_wallmed/includes.dm → modular_meta/reverts/nanomed/includes.dm

@@ -1,8 +1,8 @@
-#include "code\medical_wall.dm"
+#include "code\nanomed.dm"
 
-/datum/modpack/re_wallmed
-	id = "re_wallmed"
-	name = "Спреи обратно в настенный НаноМед!"
+/datum/modpack/nanomed
+	id = "nanomed"
+	name = "Спреи обратно в настенный НаноМед"
 	group = "Reverts"
-	desc = "Возвращает спреи прочие предметы обратно в настенный НаноМед."
+	desc = "Возвращает спреи прочие предметы обратно в настенный НаноМед"
 	author = "Bruh24"

modular_meta/reverts/re_satchels_num_back/includes.dm → modular_meta/reverts/satchels_back/includes.dm

@@ -1,6 +1,6 @@
-/datum/modpack/re_satchels_num_back
-	id = "re_satchels_num_back"
-	name = "Подпольных сумок - 10!"
+/datum/modpack/satchels_back
+	id = "satchels_back"
+	name = "Больше подпольных сумок"
 	group = "Reverts"
 	desc = "Возвращает кол-во подпольных мешков с прикольным лутом c 2 до 10 штук"
 	author = "Artemchik542"