Merge branch 'dev-sierra' into virology_fixes

code/__defines/mobs.dm

@@ -163,7 +163,7 @@
 #define FLASH_PROTECTION_MODERATE 2
 #define FLASH_PROTECTION_MAJOR 3
 
-#define ANIMAL_SPAWN_DELAY round(config.respawn_delay / 6)
+#define ANIMAL_SPAWN_DELAY round(config.respawn_delay / 2) //SIERRA-EDIT ORIG was /6
 #define DRONE_SPAWN_DELAY  round(config.respawn_delay / 3)
 
 // Incapacitation flags, used by the mob/proc/incapacitated() proc

code/modules/client/preference_setup/background/02_language.dm

@@ -44,7 +44,8 @@
 
 	else if(href_list["add_language"])
 
-		if(length(pref.alternate_languages) >= MAX_LANGUAGES)
+		// if(length(pref.alternate_languages) >= MAX_LANGUAGES) // SIERRA-EDIT - ORIGINAL
+		if(length(pref.alternate_languages) >= total_languages())
 			// [SIERRA-EDIT] - EXPANDED_CULTURE_DESCRIPTOR - Перевод
 			// alert(user, "You have already selected the maximum number of languages!") // SIERRA-EDIT - ORIGINAL
 			alert(user, "Вы уже выбрали максимальное количество языков!")
@@ -115,8 +116,12 @@
 			pref.alternate_languages.Insert(1, lang)
 
 	pref.alternate_languages = uniquelist(pref.alternate_languages)
+/*
 	if(length(pref.alternate_languages) > MAX_LANGUAGES)
-		pref.alternate_languages.Cut(MAX_LANGUAGES + 1)
+		pref.alternate_languages.Cut(MAX_LANGUAGES + 1) // SIERRA-EDIT - ORIGINAL
+*/
+	if(length(pref.alternate_languages) > total_languages())
+		pref.alternate_languages.Cut(total_languages() + 1)
 
 /datum/category_item/player_setup_item/background/languages/proc/get_language_text()
 	sanitize_alt_languages()
@@ -133,8 +138,12 @@
 				// LAZYADD(., "- [lang] <a href='?src=\ref[src];remove_language=[i]'>Remove.</a> <span style='color:#ff0000;font-style:italic;'>[all_languages[lang].warning]</span><br>") // SIERRA-EDIT - ORIGINAL
 				LAZYADD(., "- [lang] <a href='?src=\ref[src];remove_language=[i]'>Убрать.</a> <span style='color:#ff0000;font-style:italic;'>[all_languages[lang].warning]</span><br>")
 				// [/SIERRA-EDIT]
+/*
 	if(length(pref.alternate_languages) < MAX_LANGUAGES)
-		var/remaining_langs = MAX_LANGUAGES - length(pref.alternate_languages)
+		var/remaining_langs = MAX_LANGUAGES - length(pref.alternate_languages) // SIERRA-EDIT - ORIGINAL
+*/
+	if(length(pref.alternate_languages) < total_languages())
+		var/remaining_langs = total_languages() - length(pref.alternate_languages)
 		// [SIERRA-EDIT] - EXPANDED_CULTURE_DESCRIPTOR - Перевод
 		// LAZYADD(., "- <a href='?src=\ref[src];add_language=1'>add</a> ([remaining_langs] remaining)<br>") // SIERRA-EDIT - ORIGINAL
 		LAZYADD(., "- <a href='?src=\ref[src];add_language=1'>Добавить</a> ([remaining_langs] осталось)<br>")

code/modules/nano/modules/human_appearance.dm

@@ -128,7 +128,7 @@
 
 	if (href_list["language"] && (flags & APPEARANCE_LANG))
 		if (href_list["language_mode"] == "add")
-			if ((~flags & APPEARANCE_LANG_ANY_NUMBER) && length(owner.languages) >= MAX_LANGUAGES)
+			if ((~flags & APPEARANCE_LANG_ANY_NUMBER) && length(owner.languages) >= (MAX_LANGUAGES + owner.species.additional_languages)) // SIERRA-EDIT added( + owner.species.additional_languages))
 				return
 			if ((~flags & APPEARANCE_LANG_ANY_ORIGIN) && !(href_list["language"] in langs))
 				return

html/changelogs/AutoChangeLog-sierra-pr-2940.yml

@@ -0,0 +1,5 @@
+author: Lexanx
+changes:
+  - {rscadd: 'Дионы, Адхеранты, ИПС, могут взять больше языков'}
+  - {rscadd: Адхерантам добавлено больше языков для выбора}
+delete-after: true

html/changelogs/AutoChangeLog-sierra-pr-2944.yml

@@ -0,0 +1,5 @@
+author: Lexanx
+changes:
+  - {bugfix: Пофикшено несколько рантаймов у лендинга}
+  - {bugfix: Челноки Пионеров и Патрульки теперь могут корректно садится через лендинг}
+delete-after: true

html/changelogs/AutoChangeLog-sierra-pr-2945.yml

@@ -0,0 +1,7 @@
+author: Shegar
+changes:
+  - {rscadd: Судно Скреллов залито модово и безопасно для изменений}
+  - {tweak: Поправил авторство мода на оружие(спрайты)}
+  - {tweak: Поправил пути спрайта флешетты скреллов}
+  - {imageadd: Добавил новые(с инфинити) спрайты скафандрам скреллов}
+delete-after: true

maps/sierra/z1-z5_sierra.dmm

@@ -93177,7 +93177,6 @@
 	},
 /obj/floor_decal/techfloor,
 /obj/floor_decal/industrial/hatch/yellow,
-/obj/shuttle_landmark/reaper/dock,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/crew_quarters/docking)
 "nMh" = (
@@ -94471,6 +94470,7 @@
 /area/engineering/engine_room)
 "nYR" = (
 /obj/shuttle_landmark/merc/dock,
+/obj/shuttle_landmark/reaper/dock,
 /turf/space,
 /area/space)
 "nYS" = (
@@ -163586,6 +163586,10 @@
 	},
 /turf/simulated/floor/grass/cut,
 /area/crew_quarters/garden_room)
+"yfe" = (
+/obj/shuttle_landmark/snz/dock,
+/turf/space,
+/area/space)
 "yfi" = (
 /obj/structure/cable/green{
 	d1 = 4;
@@ -180044,7 +180048,7 @@ wJN
 wJN
 wJN
 wJN
-wJN
+yfe
 wJN
 wJN
 wJN

mods/_maps/farfleet/code/farfleet_shuttle.dm

@@ -39,7 +39,6 @@
 	landmark_tag = "nav_hangar_snz"
 	base_area = /area/ship/farfleet/command/snz_hangar
 	base_turf = /turf/simulated/floor/plating
-	movable_flags = MOVABLE_FLAG_EFFECTMOVE
 
 /obj/shuttle_landmark/snz/altdock
 	name = "Docking Port"

mods/_maps/farfleet/maps/farfleet-2.dmm

@@ -3950,10 +3950,6 @@
 	},
 /turf/simulated/floor/tiled/monotile,
 /area/ship/farfleet/crew/hydroponics)
-"Ms" = (
-/obj/shuttle_landmark/snz/start,
-/turf/simulated/floor/tiled/monotile,
-/area/ship/farfleet/command/snz_hangar)
 "Mt" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/white,
@@ -4352,6 +4348,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/shuttle_landmark/snz/start,
 /turf/simulated/floor/tiled/steel_grid,
 /area/ship/snz)
 "Rs" = (
@@ -14660,7 +14657,7 @@ Uu
 Uu
 wJ
 ME
-Ms
+ns
 aW
 Iu
 eB

mods/_maps/sentinel/code/sentinel_shuttle.dm

@@ -37,7 +37,6 @@
 	landmark_tag = "nav_hangar_reaper"
 	base_area = /area/ship/patrol/command/hangar
 	base_turf = /turf/simulated/floor/plating
-	movable_flags = MOVABLE_FLAG_EFFECTMOVE
 
 /obj/shuttle_landmark/reaper/altdock
 	name = "Docking Port"

mods/_maps/sentinel/maps/sentinel-1.dmm

@@ -4767,6 +4767,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/red{
 	dir = 4
 	},
+/obj/shuttle_landmark/reaper/start,
 /turf/simulated/floor/plating,
 /area/ship/reaper)
 "jc" = (
@@ -4886,7 +4887,6 @@
 	icon_state = "1-2"
 	},
 /obj/structure/catwalk,
-/obj/shuttle_landmark/reaper/start,
 /turf/simulated/floor/plating,
 /area/ship/patrol/command/hangar)
 "jj" = (

mods/adherent_discharge/code/adherent.dm

@@ -1,3 +1,6 @@
+/datum/species/adherent
+	additional_languages = 1
+
 /obj/item/organ/internal/cell/adherent
 	var/ready_to_charge
 
@@ -19,3 +22,17 @@
 
 	adherent_core.ready_to_charge = FALSE
 	to_chat(src, SPAN_WARNING("You have relieved the tension of your tentacles."))
+
+/singleton/cultural_info/culture/adherent
+	secondary_langs = list(
+		LANGUAGE_HUMAN_EURO,
+		LANGUAGE_HUMAN_CHINESE,
+		LANGUAGE_HUMAN_ARABIC,
+		LANGUAGE_HUMAN_INDIAN,
+		LANGUAGE_HUMAN_IBERIAN,
+		LANGUAGE_HUMAN_RUSSIAN,
+		LANGUAGE_SPACER,
+		LANGUAGE_VOX,
+		LANGUAGE_CULT,
+		LANGUAGE_PRIMITIVE
+	)

mods/diona/code/station.dm

@@ -1,3 +1,18 @@
+
+/datum/category_item/player_setup_item/background/languages/proc/total_languages()
+	return MAX_LANGUAGES + pref.additional_languages
+
+/datum/preferences
+	var/additional_languages
+
+/datum/preferences/copy_to(mob/living/carbon/human/character, is_preview_copy = FALSE)
+	. = ..()
+	additional_languages = character.species.additional_languages
+
+/datum/species
+	var/additional_languages = 0
+
 /datum/species/diona
 	slowdown = 2
 	thirst_factor = 0.06
+	additional_languages = 2

mods/guns/_guns.dm

@@ -1,4 +1,4 @@
 /singleton/modpack/guns
 	name = "Оружие"
 	desc = "Модификация спрайтов и ребаланс вооружения."
-	author = "LordNest"
+	author = "LordNest(Код), Wolfor by Kot(Спрайтер)"

mods/guns/code/xenos.dm

@@ -5,7 +5,7 @@
 	icon = 'mods/guns/icons/obj/skrell_carbine.dmi'
 
 /obj/item/gun/magnetic/railgun/flechette/skrell
-	icon = 'icons/obj/guns/skrell_rifle.dmi'
+	icon = 'mods/guns/icons/obj/skrell_rifle.dmi'
 
 // VOX BOX
 

mods/ipc_mods/code/machine.dm

@@ -3,6 +3,7 @@
 #define SHOW_LAWS_POSIBRAN "Show laws posibran"
 /datum/species/machine
 	passive_temp_gain = 0  // This should cause IPCs to stabilize at ~80 C in a 20 C environment.(5 is default without organ)
+	additional_languages = 1
 
 /obj/machinery/organ_printer/robot/New()
 	LAZYINITLIST(products)

mods/utility_items/_utility_items.dme

@@ -28,5 +28,6 @@
 #include "code/jobs.dm"
 #include "code/bottom.dm"
 #include "code/top.dm"
+#include "code\skrell-ship.dm"
 
 #endif

mods/utility_items/code/advanced_landing.dm

@@ -80,6 +80,9 @@
 
 /mob/living/carbon/human/update_dead_sight()
 	. = ..()
+	if(!eyeobj)
+		cancel_landeye_view()
+		return
 	if(eyeobj.type == /mob/observer/eye/landeye)
 		set_see_in_dark(8)
 		set_see_invisible(SEE_INVISIBLE_MINIMUM)
@@ -232,7 +235,7 @@
 		var/zone_good = FALSE
 		I.loc = T
 		shadow_images += I
-		if(!(T.density))
+		if(T && !(T.density))
 			for(var/type in accesible_areas)
 				if(A.type in typesof(type))
 					zone_good = TRUE
@@ -323,10 +326,3 @@
 		var/turf/T = locate(I.loc.x, I.loc.y, I.loc.z)
 		I = image('mods/utility_items/icons/alphacolors.dmi', T, "dither50")
 		T.AddOverlays(I)
-
-/datum/shuttle/autodock/process_arrived()
-	.=..()
-	for(var/i in 1 to LAZYLEN(next_location.image_shadow))
-		var/image/I = next_location.image_shadow[i]
-		var/turf/T = locate(I.loc.x, I.loc.y, I.loc.z)
-		T.ClearOverlays(I)

mods/utility_items/code/skrell-ship.dm

@@ -0,0 +1,50 @@
+// Закоментите весь файл, если вам не нужна эта карта
+/datum/map_template/ruin/away_site/skrellscoutship
+	prefix = "mods/utility_items/maps/"
+	suffixes = list("skrell-sierrabay.dmm")
+
+
+//А здесь мы заменим спрайты войдов
+/obj/item/clothing/head/helmet/space/void/skrell/black
+	icon = 'mods/utility_items/icons/skrell_suit.dmi'
+	sprite_sheets = list(
+		SPECIES_UNATHI = 'icons/mob/species/unathi/onmob_suit_unathi.dmi',
+		SPECIES_SKRELL = 'mods/utility_items/icons/skrell_suit_on_mob.dmi',
+		)
+	sprite_sheets_obj = list(
+		SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/obj_suit_unathi.dmi',
+		SPECIES_SKRELL = 'mods/utility_items/icons/skrell_suit_on_mob.dmi',
+		)
+
+/obj/item/clothing/head/helmet/space/void/skrell/white
+	icon = 'mods/utility_items/icons/skrell_suit.dmi'
+	sprite_sheets = list(
+		SPECIES_UNATHI = 'icons/mob/species/unathi/onmob_suit_unathi.dmi',
+		SPECIES_SKRELL = 'mods/utility_items/icons/skrell_suit_on_mob.dmi',
+		)
+	sprite_sheets_obj = list(
+		SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/obj_suit_unathi.dmi',
+		SPECIES_SKRELL = 'mods/utility_items/icons/skrell_suit_on_mob.dmi',
+		)
+
+/obj/item/clothing/suit/space/void/skrell/black
+	icon = 'mods/utility_items/icons/skrell_suit.dmi'
+	sprite_sheets = list(
+		SPECIES_UNATHI = 'icons/mob/species/unathi/onmob_suit_unathi.dmi',
+		SPECIES_SKRELL = 'mods/utility_items/icons/skrell_suit_on_mob.dmi',
+		)
+	sprite_sheets_obj = list(
+		SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/obj_suit_unathi.dmi',
+		SPECIES_SKRELL = 'mods/utility_items/icons/skrell_suit_on_mob.dmi',
+		)
+
+/obj/item/clothing/suit/space/void/skrell/white
+	icon = 'mods/utility_items/icons/skrell_suit.dmi'
+	sprite_sheets = list(
+		SPECIES_UNATHI = 'icons/mob/species/unathi/onmob_suit_unathi.dmi',
+		SPECIES_SKRELL = 'mods/utility_items/icons/skrell_suit_on_mob.dmi',
+		)
+	sprite_sheets_obj = list(
+		SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/obj_suit_unathi.dmi',
+		SPECIES_SKRELL = 'mods/utility_items/icons/skrell_suit_on_mob.dmi',
+		)