Старт модуляризации modular_ss220 + bug fix

Author: SantaKO1

code/__DEFINES/fonts.dm

@@ -13,8 +13,9 @@
 #define SIGNATURE_FONT "Segoe Script"
 
 /// Emoji icon set
-#define EMOJI_SET 'modular_ss220/master_files_skyrat/icons/emoji.dmi' // SKYRAT EDIT - ORIGINAL: 'icons/ui_icons/emoji/emoji.dmi'
+#define EMOJI_SET 'modular_ss220/features/emote_panel/icons/emoji.dmi' // SKYRAT EDIT - ORIGINAL: 'icons/ui_icons/emoji/emoji.dmi'
 // ex666 edit - skyrat: modular_skyrat/master_files/icons/emoji.dmi
+// SS1984 EDIT - real: modular_ss220\features\emote_panel\icons\emoji.dmi
 
 // Font metrics bitfield
 /// Include leading A width and trailing C width in GetWidth() or in DrawText()

modular_ss220/_assets_modpacks.dm

@@ -10,10 +10,9 @@
 	for(var/datum/modpack/this_modpack as anything in subtypesof(/datum/modpack))
 		var/icon = initial(this_modpack.icon)
 		var/icon_state = initial(this_modpack.id)
-		if(!icon)
-			icon = 'modular_ss220/mods_icon_placeholder.dmi'
+		if(icon == MODPACKS_SET)
 			Insert("modpack-[icon_state]", icon, icon_state=icon_placeholder)
-		else if (icon != MODPACKS_SET)
+		else
 			Insert("modpack-[icon_state]", icon, icon_state=icon_state)
 
 #undef MODPACKS_SET

modular_ss220/master_files_skyrat/code/modules/client/preferences/emote_panel.dm modular_ss220/features/emote_panel/code/m_emote_panel.dm

@@ -0,0 +1,6 @@
+/datum/modpack/emote_panel
+	id = "emote_panel"
+	name = "Панель с эмоутами"
+	group = "Features"
+	desc = "Добавляет вкладку с эмоутами"
+	author = "К*дер"

modular_ss220/features/emote_panel/emote_panel.dm

@@ -0,0 +1,8 @@
+#ifndef EMOTE_PANEL
+#define EMOTE_PANEL
+
+#include "emote_panel.dm"
+
+#include "code\m_emote_panel.dm"
+
+#endif

modular_ss220/features/emote_panel/emote_panel.dme

@@ -5,3 +5,5 @@
 	group = "Features"
 	desc = "Пример написания модпаков для фич."
 	author = "К*дер"
+
+	visible = FALSE

modular_ss220/master_files_skyrat/icons/emoji.dmi modular_ss220/features/emote_panel/icons/emoji.dmi

@@ -9,6 +9,7 @@
 /* --FEATURE-- */
 
 #include "features\feature_example\feature_example.dme"
+#include "features\emote_panel\emote_panel.dme"
 
 /* --TRANSLATIONS-- */
 

modular_ss220/features/feature_example/feature_example.dm

@@ -5,3 +5,5 @@
 	group = "Translations"
 	desc = "Пример модпака для перевода."
 	author = "К*дер"
+
+	visible = FALSE

modular_ss220/modular_includes.dme

@@ -8755,7 +8755,8 @@
 #include "modular_nova\modules\xenoarchartifacts\obj\particle_battery.dm"
 #include "modular_nova\modules\xenoarchartifacts\obj\wave_scanner.dm"
 #include "modular_ss220\modular_includes.dme"
-#include "modular_ss220\master_files_skyrat\code\modules\client\preferences\emote_panel.dm"
+#include "modular_ss220\features\emote_panel\emote_panel.dm"
+#include "modular_ss220\features\emote_panel\code\m_emote_panel.dm"
 #include "modular_ss220\modules\auto_cryo\autocryo.dm"
 #include "modular_ss220\modules\auto_cryo\autocryo_config.dm"
 #include "modular_ss220\modules\cyrillic_key_fixes\code\client_procs.dm"