Чуток подзатянулась модуляризация

Author: SantaKO1

code/game/machinery/dna_infuser/organ_sets/carp_organs.dm

@@ -88,6 +88,15 @@
 	. = ..()
 	if(owner.stat != CONSCIOUS || !prob(0.1))
 		return
+
+	// SS1984 ADDITION START
+	if(owner.dna.species == /datum/species/akula)
+		owner.emote("cough")
+		var/turf/tooth_fairy = get_turf(owner)
+		if(tooth_fairy)
+			new /obj/item/knife/carp/akula(tooth_fairy)
+	// SS1984 ADDITION END
+
 	owner.emote("cough")
 	var/turf/tooth_fairy = get_turf(owner)
 	if(tooth_fairy)

modular_nova/modules/alerts/code/default_announcer.dm

@@ -40,7 +40,7 @@
 		ANNOUNCER_SPOOKY = 'modular_nova/modules/alerts/sound/misc/admin_horror_music.ogg',
 		ANNOUNCER_ERTYES = 'modular_nova/modules/alerts/sound/alerts/yesert.ogg',
 		ANNOUNCER_MUTANTS = 'modular_nova/modules/alerts/sound/alerts/hazdet.ogg',
-		ANNOUNCER_KLAXON = 'modular_ss220/modules/return_prs/black_mesa/sound/siren1_long.ogg',
+		ANNOUNCER_KLAXON = 'modular_ss220/reverts/return_prs/sound/black_mesa/siren1_long.ogg',
 		ANNOUNCER_NRI_RAIDERS = 'modular_nova/modules/encounters/sounds/morse.ogg',
 		ANNOUNCER_DEPARTMENTAL = 'modular_nova/modules/alerts/sound/alerts/alert3.ogg',
 		ANNOUNCER_SHUTTLE = 'modular_nova/modules/alerts/sound/alerts/alert3.ogg',

modular_ss220/_modpack.dm

@@ -55,7 +55,7 @@
 
 /datum/modpack/ui_static_data(mob/user)
 	. = ..()
-	.["categories"] = list("Features", "Event", "Translations")
+	.["categories"] = list("Features", "Reverts", "Translations")
 	.["features"] = list()
 	.["translations"] = list()
 	.["reverts"] = list()

modular_ss220/features/akyla/akyla.dm

@@ -0,0 +1,6 @@
+/datum/modpack/akyla
+	id = "akyla"
+	name = "Акульи зубки"
+	group = "Features"
+	desc = "Заменяет зубы карпа на зубы акулы для расы акул."
+	author = "SantaKO1"

modular_ss220/features/akyla/akyla.dme

@@ -0,0 +1,8 @@
+#ifndef AKYLA
+#define AKYLA
+
+#include "akyla.dm"
+
+#include "code/tooth.dm"
+
+#endif

modular_ss220/features/akyla/code/tooth.dm

@@ -0,0 +1,6 @@
+/obj/item/knife/carp/akula
+	name = "shark tooth"
+	desc = "Маленький, изогнутый зуб с острыми краями, покрытый небольшими трещинами и пожелтевшими пятнами, свидетельствующими о его естественном происхождении."
+	icon = 'modular_ss220/features/akyla/icons/shark_tooth.dmi'
+	icon_state = "shark_tooth"
+	sharpness = SHARP_POINTY

modular_ss220/features/akyla/icons/shark_tooth.dmi

@@ -0,0 +1,6 @@
+/datum/modpack/auto_cryo
+	id = "auto_cryo"
+	name = "Авто крио"
+	group = "Features"
+	desc = "Автоматически перемещяет в крио ССД игроков."
+	author = "К*дер"

modular_ss220/modules/auto_cryo/autocryo.dm modular_ss220/features/auto_cryo/code/autocryo.dm

@@ -0,0 +1,9 @@
+#ifndef AUTO_CRYO
+#define AUTO_CRYO
+
+#include "cryocool.dm"
+
+#include "code/autocryo.dm"
+#include "code/autocryo_config.dm"
+
+#endif

modular_ss220/modules/auto_cryo/autocryo_config.dm modular_ss220/features/auto_cryo/code/autocryo_config.dm

@@ -0,0 +1,6 @@
+/datum/modpack/cyrillic_key_fixes
+	id = "cyrillic_key_fixes"
+	name = "Фикс букв"
+	group = "Features"
+	desc = "Фиксит использование не английских букв."
+	author = "К*дер"

modular_ss220/features/auto_cryo/cryocool.dm

@@ -0,0 +1,11 @@
+#ifndef CYRILLIC_KEY_FIXES
+#define CYRILLIC_KEY_FIXES
+
+#include "cyrillic.dm"
+
+#include "code\client_procs.dm"
+#include "code\communication.dm"
+#include "code\keybindings.dm"
+#include "code\text.dm"
+
+#endif

modular_ss220/features/auto_cryo/cryocool.dme

@@ -0,0 +1,6 @@
+/datum/modpack/discord
+	id = "discord"
+	name = "Дискорд"
+	group = "Features"
+	desc = "Аутх через дискорд."
+	author = "К*дер"

modular_ss220/modules/cyrillic_key_fixes/code/client_procs.dm modular_ss220/features/cyrillic_key_fixes/code/client_procs.dm

@@ -0,0 +1,10 @@
+#ifndef DISCORD
+#define DISCORD
+
+#include "discord.dm"
+
+#include "code\discord_auth.dm"
+#include "code\new_player.dm"
+#include "code\verb.dm"
+
+#endif

modular_ss220/modules/cyrillic_key_fixes/code/communication.dm modular_ss220/features/cyrillic_key_fixes/code/communication.dm

@@ -0,0 +1,6 @@
+/datum/modpack/events
+	id = "events"
+	name = "Ивенты"
+	group = "Features"
+	desc = "Изменяет некоторые ивенты."
+	author = "К*дер"

modular_ss220/modules/cyrillic_key_fixes/code/keybindings.dm modular_ss220/features/cyrillic_key_fixes/code/keybindings.dm

@@ -0,0 +1,8 @@
+#ifndef EVENTS
+#define EVENTS
+
+#include "events.dm"
+
+#include "code\round_event.dm"
+
+#endif

modular_ss220/modules/cyrillic_key_fixes/code/text.dm modular_ss220/features/cyrillic_key_fixes/code/text.dm

@@ -0,0 +1,6 @@
+/datum/modpack/paradise_krybindings
+	id = "paradise_krybindings"
+	name = "Бинды как на паре"
+	group = "Features"
+	desc = "Изменяет назначение клавиш на парадайзовские."
+	author = "К*дер"

modular_ss220/features/cyrillic_key_fixes/cyrillic.dm

@@ -0,0 +1,17 @@
+#ifndef PARADISE_KEYBINDINGS
+#define PARADISE_KEYBINDINGS
+
+#include "paradise_keybindings.dm"
+
+#include "code\keybinding\admin.dm"
+#include "code\keybinding\artificial_intelligence.dm"
+#include "code\keybinding\carbon.dm"
+#include "code\keybinding\client.dm"
+#include "code\keybinding\communication.dm"
+#include "code\keybinding\human.dm"
+#include "code\keybinding\living.dm"
+#include "code\keybinding\mob.dm"
+#include "code\keybinding\movement.dm"
+#include "code\keybinding\robot.dm"
+
+#endif

modular_ss220/features/cyrillic_key_fixes/cyrillic.dme

@@ -0,0 +1,8 @@
+#ifndef SHUTDOWN
+#define SHUTDOWN
+
+#include "shutdown.dm"
+
+#include "code/shutdown_config.dm"
+
+#endif

modular_ss220/modules/discord/discord_auth.dm modular_ss220/features/discord/code/discord_auth.dm

@@ -0,0 +1,6 @@
+/datum/modpack/tts
+	id = "tts"
+	name = "TTS"
+	group = "Features"
+	desc = "Озвучка станции 13."
+	author = "К*дер"

modular_ss220/modules/discord/new_player.dm modular_ss220/features/discord/code/new_player.dm

@@ -0,0 +1,42 @@
+#ifndef TTS
+#define TTS
+
+#include "tts.dm"
+
+// define
+#include "code\_tts_defines.dm"
+
+// base_seeds >> mobs
+#include "code\base_seeds\mobs\_base.dm"
+#include "code\base_seeds\mobs\alien.dm"
+#include "code\base_seeds\mobs\friendly.dm"
+#include "code\base_seeds\mobs\guardian.dm"
+#include "code\base_seeds\mobs\hostile.dm"
+#include "code\base_seeds\mobs\lavaland.dm"
+#include "code\base_seeds\mobs\other.dm"
+#include "code\base_seeds\mobs\pets.dm"
+
+// base_seeds >> objs
+#include "code\base_seeds\objs\objs.dm"
+
+// providers
+#include "code\providers\silero.dm"
+
+// seeds
+#include "code\seeds\silero.dm"
+
+// code
+#include "code\tts_configuration.dm"
+#include "code\tts_mob_Hear.dm"
+#include "code\tts_numbers.dm"
+#include "code\tts_preferences.dm"
+#include "code\tts_provider.dm"
+#include "code\tts_seed.dm"
+#include "code\tts_sound_TEMPORARY.dm"
+#include "code\tts_sound.dm"
+#include "code\tts_subsystem.dm"
+
+// ~undefs
+#include "code\~undefs\~tts_undefs.dm"
+
+#endif

modular_ss220/modules/discord/verb.dm modular_ss220/features/discord/code/verb.dm

@@ -0,0 +1,6 @@
+/datum/modpack/world_tts
+	id = "world_tts"
+	name = "ТТС адитион"
+	group = "Features"
+	desc = "Инициализирует ТТС в мир."
+	author = "К*дер"

modular_ss220/features/discord/discord.dm

@@ -0,0 +1,8 @@
+#ifndef WORLD_TTS
+#define WORLD_TTS
+
+#include "world_tts.dm"
+
+#include "code\world_topic.dm"
+
+#endif

modular_ss220/features/discord/discord.dme

@@ -1,6 +1,4 @@
 // All new mod's includes here
-// 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 "_assets_modpacks.dm" // modpack picture integration system
 #include "_modpack.dm" // modpack obj
@@ -10,9 +8,21 @@
 
 #include "features\feature_example\feature_example.dme"
 #include "features\emote_panel\emote_panel.dme"
+#include "features\auto_cryo\cryocool.dme"
+#include "features\cyrillic_key_fixes\cyrillic.dme"
+#include "features\discord\discord.dme"
+#include "features\events\events.dme"
+#include "features\world_tts\world_tts.dme"
+#include "features\shutdown\shutdown.dme"
+#include "features\paradise_keybindings\paradise_keybindings.dme"
+#include "features\tts\tts.dme"
+#include "features\akyla\akyla.dme"
 
 /* --TRANSLATIONS-- */
 
 #include "translations\translation_example\translation_example.dme"
+#include "translations\customer\customer.dme"
 
-/* --MISC-- */
+/* --REVERTS-- */
+
+#include "reverts\return_prs\return.dme"

modular_ss220/modules/events/round_event.dm modular_ss220/features/events/code/round_event.dm

@@ -79,7 +79,7 @@
 	desc = "5.6x40mm ammunition specifically made for civilian use like recreation, hunting, self-defense or LARP. While the package itself lacks any real identification \
 	and does, in fact, appear like a bland green box with a colored stripe, the insides have a boatload of information, \
 	ranging from manufacturer advertisements and intended use to the cartridge's tactical and technical characteristics."
-	icon = 'modular_ss220/modules/return_prs/novaya_ert/icons/ammo_boxes.dmi'
+	icon = 'modular_ss220/reverts/return_prs/icons/novaya_ert/ammo_boxes.dmi'
 	icon_state = "boxnrifle-lethal"
 	base_icon_state = "boxnrifle-lethal"
 	multiple_sprites = AMMO_BOX_FULL_EMPTY

modular_ss220/features/events/events.dm

@@ -3,9 +3,9 @@
 	desc = "Vest designed to take heavy beating and probably keep the user alive in the process."
 	armor_type = /datum/armor/vest_hecu
 	icon_state = "ceramic_vest"
-	icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/hecucloth.dmi'
-	worn_icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/hecumob.dmi'
-	worn_icon_digi = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/hecumob_digi.dmi'
+	icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecucloth.dmi'
+	worn_icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecumob.dmi'
+	worn_icon_digi = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecumob_digi.dmi'
 	uses_advanced_reskins = TRUE
 	unique_reskin = list(
 		"Basic" = list(
@@ -41,9 +41,9 @@
 	desc = "Helmet designed to take heavy beating and probably keep the user alive in the process."
 	armor_type = /datum/armor/helmet_hecu
 	icon_state = "ceramic_helmet"
-	icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/hecucloth.dmi'
-	worn_icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/hecumob.dmi'
-	worn_icon_digi = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/hecumob_muzzled.dmi'
+	icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecucloth.dmi'
+	worn_icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecumob.dmi'
+	worn_icon_digi = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecumob_muzzled.dmi'
 	uses_advanced_reskins = TRUE
 	unique_reskin = list(
 		"Basic" = list(

modular_ss220/features/events/events.dme

@@ -3,13 +3,13 @@
 	desc = "The folded flag of the United States of America."
 	icon_state = "folded_usa"
 	sign_path = /obj/structure/sign/flag/usa
-	icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/flags.dmi'
+	icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/flags.dmi'
 
 /obj/structure/sign/flag/usa
 	name = "flag of the United States of America"
 	desc = "'Stars and Stripes', the flag of the United States of America. Its red color represents endurance and valor; blue one shows diligence, vigilance and justice, and the white one signs at pureness. Its thirteen red-and-white stripes show the initial thirteen founding colonies, and fifty stars designate the current fifty states."
 	icon_state = "flag_usa"
 	item_flag = /obj/item/sign/flag/usa
-	icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/flags.dmi'
+	icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/flags.dmi'
 
 MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/usa, 32)