Merge branch 'beta-dev' into sooc_update

mod_celadon/mod_celadon.dme

@@ -20,12 +20,13 @@
 #include "scp012_fix/_scp012_fix.dme"
 #include "minor_fix/_minor_fix.dme"
 #include "sooc_update/_sooc_update.dme"
+#include "orbit_fix/_orbit_fix.dme"
 
 // --- OBJECTS --- //
 #include "objects/_objects.dme"
 #include "SCP096/_SCP096.dme"
 #include "new_ungoc_sprites/_new_ungoc_sprites.dme"
-
+#include "sign_update/_sign_update.dme"
 
 // --- MISC --- //
 #include "clothing/_clothing.dme"

mod_celadon/orbit_fix/README.md

@@ -0,0 +1,33 @@
+
+
+#### Список PRов:
+
+- https://github.com/CeladonSS13/Foundation-19/tree/beta-dev/#####
+
+## Мод-пример
+
+ID мода: ORBIT_FIX
+
+### Описание мода
+
+Исправляем и улучшаем orbit
+
+### Изменения *кор кода*
+
+Отсуствуют
+
+### Оверрайды
+
+Отсуствуют
+
+### Дефайны
+
+Отсуствуют
+
+### Используемые файлы, не содержащиеся в модпаке
+
+Отсуствуют
+
+### Авторы:
+
+OlegDark

mod_celadon/orbit_fix/_orbit_fix.dm

@@ -0,0 +1,10 @@
+/datum/modpack/orbit_fix
+	/// Строковое имя модпака. Используется для поиска других модпаков в init.
+	name = "orbit_fix"
+	/// Строковое описание для модпака. Может использоваться для списка глаголов модпака в качестве описания.
+	desc = "Исправления для orbit гостов."
+	/// Строка с авторами этого модпака.
+	author = "OlegDark"
+
+///**********************************************************************///
+

mod_celadon/orbit_fix/_orbit_fix.dme

@@ -0,0 +1,8 @@
+#ifndef MODPACK_CELADON_ORBIT_FIX
+#define MODPACK_CELADON_ORBIT_FIX
+
+#include "_orbit_fix.dm"
+
+#include "code/orbit_fix.dm"
+
+#endif

mod_celadon/orbit_fix/code/orbit_fix.dm

@@ -0,0 +1,16 @@
+// Перегрузка метода, убираем мусор и лаги
+/obj/screen/ghost/orbit/Click()
+	var/mob/observer/ghost/G = usr
+	var/list/A = list()
+	for(var/mob/B in GLOB.living_mob_list_)
+		if(B.client) // Только активные мобы
+			A += B
+	for(var/mob/C in GLOB.SCP_list)
+		A += C // Только играбельные SCP
+	A += GLOB.player_list // Госты и прочие
+	var/mob/fh = tgui_input_list(G, "Choose a player to orbit", "Orbit", A)
+	if(istype(fh))
+		G.follow(fh)
+	else
+		var/turf/T = get_turf(fh)
+		G.ghost_to_turf(T)

mod_celadon/sign_update/README.md

@@ -0,0 +1,33 @@
+
+
+#### Список PRов:
+
+- https://github.com/CeladonSS13/Foundation-19/tree/beta-dev/#####
+
+## Мод-пример
+
+ID мода: SIGN_UPDATE
+
+### Описание мода
+
+Спрайтер нарисовал новые значки, добавляем в билд
+
+### Изменения *кор кода*
+
+Отсуствуют
+
+### Оверрайды
+
+Отсуствуют
+
+### Дефайны
+
+Отсуствуют
+
+### Используемые файлы, не содержащиеся в модпаке
+
+Отсуствуют
+
+### Авторы:
+
+OlegDark

mod_celadon/sign_update/_sign_update.dm

@@ -0,0 +1,10 @@
+/datum/modpack/sign_update
+	/// Строковое имя модпака. Используется для поиска других модпаков в init.
+	name = "sign_update"
+	/// Строковое описание для модпака. Может использоваться для списка глаголов модпака в качестве описания.
+	desc = "Добавляем свои знаки"
+	/// Строка с авторами этого модпака.
+	author = "OlegDark"
+
+///**********************************************************************///
+

mod_celadon/sign_update/_sign_update.dme

@@ -0,0 +1,8 @@
+#ifndef MODPACK_CELADON_SIGN_UPDATE
+#define MODPACK_CELADON_SIGN_UPDATE
+
+#include "_sign_update.dm"
+
+#include "code/sign_update.dm"
+
+#endif

mod_celadon/sign_update/code/sign_update.dm

@@ -0,0 +1,94 @@
+
+/obj/structure/sign/scp/update_safe
+	name = "\improper Safe SCP"
+	desc = "A sign that implies this room to be housing for 'Safe' class SCP object."
+	icon = 'mod_celadon/sign_update/icons/signs_scp.dmi'
+	icon_state = "safe"
+
+/obj/structure/sign/scp/update_euclid
+	name = "\improper Euclid SCP"
+	desc = "A sign that implies this room to be housing for 'Euclid' class SCP object."
+	icon = 'mod_celadon/sign_update/icons/signs_scp.dmi'
+	icon_state = "euclid"
+
+/obj/structure/sign/scp/update_keter
+	name = "\improper Keter SCP"
+	desc = "A sign that implies this room to be housing for 'Keter' class SCP object."
+	icon = 'mod_celadon/sign_update/icons/signs_scp.dmi'
+	icon_state = "keter"
+
+/obj/structure/sign/scp/update_thaumiel
+	name = "\improper Thaumiel SCP"
+	desc = "A sign that implies this room to be housing for 'Thaumiel' class SCP object."
+	icon = 'mod_celadon/sign_update/icons/signs_scp.dmi'
+	icon_state = "thaumiel"
+
+/obj/structure/sign/update_violent
+	icon = 'mod_celadon/sign_update/icons/signs_scp.dmi'
+	icon_state = "violent"
+	desc = "A warning sign which reads: CAUTION, VIOLENT DANGER."
+
+/obj/structure/sign/update_biohazard
+	icon = 'mod_celadon/sign_update/icons/signs_scp.dmi'
+	icon_state = "biological hazard"
+	desc = "A warning sign which reads: CAUTION, BIOLOGICAL HAZARD."
+
+/obj/structure/sign/update_cognitohazard
+	icon = 'mod_celadon/sign_update/icons/signs_scp.dmi'
+	icon_state = "cognitohazard"
+	desc = "A warning sign which reads: CAUTION, COGNITO HAZARD."
+
+/obj/structure/sign/update_electric
+	icon = 'mod_celadon/sign_update/icons/signs_scp.dmi'
+	icon_state = "electric shock"
+	desc = "A warning sign which reads: CAUTION, ELECTRIC SHOCK."
+
+/obj/structure/sign/update_sensitient_violent
+	icon = 'mod_celadon/sign_update/icons/signs_scp.dmi'
+	icon_state = "sensitient and violent"
+	desc = "A warning sign which reads: CAUTION, SENSITIENT AND VIOLENT."
+
+/obj/structure/sign/update_sensitient
+	icon = 'mod_celadon/sign_update/icons/signs_scp.dmi'
+	icon_state = "sensitient object"
+	desc = "A warning sign which reads: CAUTION, SENSITIENT."
+
+/obj/structure/sign/update_radiohazard
+	icon = 'mod_celadon/sign_update/icons/signs_scp.dmi'
+	icon_state = "radioactivity hazard"
+	desc = "A warning sign which reads: CAUTION, RADIOACTIVITY HAZARD."
+
+/obj/structure/sign/update_existential_threat
+	icon = 'mod_celadon/sign_update/icons/signs_scp.dmi'
+	icon_state = "existential threat"
+	desc = "A warning sign which reads: CAUTION, EXISTENTIAL THREAT."
+
+/obj/structure/sign/update_nonstandard_space
+	icon = 'mod_celadon/sign_update/icons/signs_scp.dmi'
+	icon_state = "nonstandard space"
+	desc = "A warning sign which reads: CAUTION, NONSTANDARD SPACE."
+
+/obj/structure/sign/update_autonomous_object
+	icon = 'mod_celadon/sign_update/icons/signs_scp.dmi'
+	icon_state = "autonomous object"
+	desc = "A warning sign which reads: CAUTION, AUTONOMOUS OBJECT."
+
+/obj/structure/sign/update_selfreplicating_object
+	icon = 'mod_celadon/sign_update/icons/signs_scp.dmi'
+	icon_state = "self replicating obgect"
+	desc = "A warning sign which reads: CAUTION, SELF REPLICATING OBJECT."
+
+/obj/structure/sign/update_fire_hazard
+	icon = 'mod_celadon/sign_update/icons/signs_scp.dmi'
+	icon_state = "fier hazard"
+	desc = "A warning sign which reads: CAUTION, FIRE HAZARD."
+
+/obj/structure/sign/update_inconsistent_topology
+	icon = 'mod_celadon/sign_update/icons/signs_scp.dmi'
+	icon_state = "inconsistent topology"
+	desc = "A warning sign which reads: CAUTION, INCONSISTENT TOPOLOGY."
+
+/obj/structure/sign/update_memetic_hazard
+	icon = 'mod_celadon/sign_update/icons/signs_scp.dmi'
+	icon_state = "memetic hazard"
+	desc = "A warning sign which reads: CAUTION, MEMETIC HAZARD."