Another anomaly patch (SierraBay#3151)

code/__defines/ruin_tags.dm

@@ -10,4 +10,5 @@
 //[SIERRA-ADD] - ANOMALIES
 #define RUIN_HOT_ANOMALIES 64
 #define RUIN_ELECTRA_ANOMALIES 128
+#define RUIN_GRAVI_ANOMALIES 256
 //[SIERRA-ADD]

maps/sierra/sierra.dm

@@ -192,21 +192,21 @@
 	#include "../../mods/_maps/ascent_seedship/_map_ascent_seedship.dme"
 	#include "../../mods/_maps/ascent_caulship/_map_ascent_caulship.dme"
 
-	#include "../../mods/antagonists/_antagonists.dme"
-	#include "../../mods/ascent/_ascent.dme"
-	#include "../../mods/fancy_sofas/_fancy_sofas.dme"
-	#include "../../mods/guns/_guns.dme"
-	#include "../../mods/jukebox_tapes/_jukebox_tapes.dme"
-	#include "../../mods/legalese_language/_legalese.dme"
-	#include "../../mods/petting_zoo/_petting_zoo.dme"
-	#include "../../mods/resomi/_resomi.dme"
-	#include "../../mods/screentips/_screentips.dme"
-	#include "../../mods/tajara/_tajara.dme"
-	#include "../../mods/sauna_props/_sauna_props.dme"
-	#include "../../mods/wyccbay_optimization/_wyccbay_optimization.dme"
-	#include "../../mods/contraband_vending/_contraband_vending.dme"
-	#include "../../mods/telecomms/_telecomms.dme"
-	#include "../../mods/modernUI/_modernUI.dme"
+	#include "../../mods/antagonists/_antagonists_includes.dm"
+	#include "../../mods/ascent/_ascent_includes.dm"
+	#include "../../mods/fancy_sofas/_fancy_sofas_includes.dm"
+	#include "../../mods/guns/_guns_includes.dm"
+	#include "../../mods/jukebox_tapes/_jukebox_tapes_includes.dm"
+	#include "../../mods/legalese_language/_legalese_includes.dm"
+	#include "../../mods/petting_zoo/_petting_zoo_includes.dm"
+	#include "../../mods/resomi/_resomi_includes.dm"
+	#include "../../mods/screentips/_screentips_includes.dm"
+	#include "../../mods/tajara/_tajara_includes.dm"
+	#include "../../mods/sauna_props/_sauna_props_includes.dm"
+	#include "../../mods/wyccbay_optimization/_wyccbay_optimization_includes.dm"
+	#include "../../mods/contraband_vending/_contraband_vending_includes.dm"
+	#include "../../mods/telecomms/_telecomms_includes.dm"
+	#include "../../mods/modernUI/_modernUI_includes.dm"
 
 	// UNUSED MODS
 	// Keep them in ascending alphabetical order too, please

mods/anomaly/README.md

@@ -1,6 +1,16 @@
 
 #### Список PRов:
 https://github.com/SierraBay/SierraBay12/pull/2609
+https://github.com/SierraBay/SierraBay12/pull/2635
+https://github.com/SierraBay/SierraBay12/pull/2662
+https://github.com/SierraBay/SierraBay12/pull/2737
+https://github.com/SierraBay/SierraBay12/pull/2853
+https://github.com/SierraBay/SierraBay12/pull/2872
+https://github.com/SierraBay/SierraBay12/pull/2991
+https://github.com/SierraBay/SierraBay12/pull/3033
+https://github.com/SierraBay/SierraBay12/pull/3034
+https://github.com/SierraBay/SierraBay12/pull/3068
+https://github.com/SierraBay/SierraBay12/pull/3151
 <!--
   Ссылки на PRы, связанные с модом:
   - Создание

mods/anomaly/_anomaly.dm

@@ -1,4 +1,4 @@
 /singleton/modpack/anomaly
 	name = "Интерактивные аномалии"
 	desc = "Добавляет в игру полноценные аномалии, вдохновлённые Ашаном, пикником на обочине и сталкером."
-	author = "Shegar(Код), HonkByEmo(Спрайты), AK200(Спрайты)"
+	author = "Shegar(Код), HonkByEmo(Спрайты), AK200(Спрайты), Papa Leroy(Спрайты)"

mods/anomaly/_anomaly_includes.dm

@@ -0,0 +1,24 @@
+#ifndef MODPACK_ANOMALY
+#define MODPACK_ANOMALY
+
+#include "_anomaly.dm"
+// Далее просто включай свой код
+// #include "code/something.dm"
+#include "code\anomaly_admin.dm" //Админские кнопочки
+#include "code\anomaly_controller.dm" //Контроллер аномалий
+#include "code\anomaly_defines.dm"
+
+
+//Аномалии
+//Типы аномалий
+#include "code\anomalies\__anomalies_includes.dm"
+#include "code\artefacts\__small_artefacts_includes.dm" //Код артефактов и всё с ними связанное
+#include "code\big_artefacts\_big_artefacts_includes.dm" //Код больших артефактов
+#include "code\detectors_and_etc\_equipment_includes.dm" //Детекторы и прочее оборудование
+#include "code\spawn_anomalies_protocol\__spawn_protocols_includes.dm" //Размещение аномалий в игре
+#include "maps\anomaly_ruins_includes.dm" // Руины и разные карты
+
+//ETC
+#include "code\functions\locating.dm"
+
+#endif

mods/anomaly/code/anomalies/__anomalies_includes.dm

@@ -0,0 +1,14 @@
+#include "anomaly_types\_main_anomalies_includes.dm" //Сами аномалии
+#include "premades\_anomaly_premade_includes.dm" //Премейды аномалий
+#include "anomaly_core.dm"
+#include "anomaly_deleting.dm"
+#include "anomaly_electrostatic.dm"
+#include "anomaly_graphic.dm"
+#include "anomaly_loop.dm"
+#include "anomaly_parts.dm"
+#include "anomaly_preload.dm"
+#include "anomaly_randomize.dm"
+#include "anomaly_sound.dm"
+#include "anomaly_teamplay.dm"
+#include "anomaly_walking.dm"
+#include "interact_with_items.dm"

mods/anomaly/code/anomalies/anomaly_core.dm

@@ -85,14 +85,16 @@
 ///Пост-обработка действия аномалии.
 /obj/anomaly/proc/handle_after_activation()
 	last_activation_time = world.time
-	if(with_sound)
-		playsound(src, sound_type, 100, FALSE  )
+	play_anomaly_sound()
 	if(effect_type == LONG_ANOMALY_EFFECT)
 		handle_long_effect()
 	else
 		do_momentum_animation()
 		start_recharge()
 
+/obj/anomaly/proc/play_anomaly_sound()
+	if(with_sound)
+		playsound(src, sound_type, 100, FALSE  )
 
 ///Эффект на цели от аномалии. Огонь, удар тока, что угодно
 /obj/anomaly/proc/get_effect_by_anomaly(atom/movable/target)
@@ -178,7 +180,7 @@
 	if(ranzomize_with_initialize)
 		ranzomize_parameters()
 	icon_state = idle_effect_type
-	if(have_static_sound)
+	if(static_sound_type)
 		GLOB.sound_player.PlayLoopingSound(src, "\ref[src]", static_sound_type, 10, 6)
 	if(detectable_effect_range)
 		calculate_effected_turfs_from_new_anomaly(src)

mods/anomaly/code/anomalies/anomaly_sound.dm

@@ -6,9 +6,7 @@
 	var/sound_type
 	///Мощность аномалии
 	var/effect_power = MOMENTUM_ANOMALY_EFFECT
-	//У аномалии есть статичный звук
-	var/have_static_sound = FALSE
 	//Путь до звука статики
-	var/static_sound_type = 'mods/anomaly/sounds/any_idle.ogg'
+	var/static_sound_type 
 
 	var/preload_sound_type

mods/anomaly/code/anomalies/anomaly_types/_main_anomalies_includes.dm

@@ -0,0 +1,13 @@
+
+//Электрические
+#include "electra\electra_includes.dm"
+//Гравитационные
+#include "rvach.dm"
+#include "tramplin.dm"
+#include "ventilyator.dm" //[WIP]
+//Пространственные (Необьяснимые какой-либо природой)
+#include "vspishka.dm"
+#include "cooler.dm"
+//Термические
+#include "heater.dm"
+#include "zharka.dm"