Merge branch 'ss220club:master' into master

_maps/map_files220/RandomZLevels/blackmarketpackers.dmm

@@ -1570,7 +1570,7 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/airless,
 /area/awaymission/BMPship/Engines)
 "eM" = (
 /obj/effect/decal/cleanable/dirt,
@@ -2667,7 +2667,7 @@
 /area/awaymission/BMPship/Fore)
 "hY" = (
 /obj/effect/gibspawner/robot,
-/turf/simulated,
+/turf/simulated/floor/plating/airless,
 /area/awaymission/BMPship/Buffer)
 "hZ" = (
 /obj/structure/window/reinforced{
@@ -4242,7 +4242,7 @@
 	dir = 4;
 	tag = "icon-propulsion (WEST)"
 	},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/airless,
 /area/awaymission/BMPship/Gate)
 "tA" = (
 /turf/simulated/wall/mineral/titanium,
@@ -5578,7 +5578,7 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/airless,
 /area/awaymission/BMPship/Gate)
 "FQ" = (
 /obj/effect/landmark/damageturf,
@@ -6168,7 +6168,7 @@
 	dir = 4;
 	tag = "icon-propulsion (WEST)"
 	},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/airless,
 /area/awaymission/BMPship/Bath)
 "Ms" = (
 /obj/structure/cable{
@@ -6601,7 +6601,7 @@
 /area/awaymission/BMPship/MedBay)
 "RB" = (
 /obj/structure/shuttle/engine/propulsion,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/airless,
 /area/awaymission/BMPship/TraderShuttle)
 "RF" = (
 /obj/structure/cable{
@@ -6683,7 +6683,7 @@
 	dir = 4;
 	tag = "icon-propulsion (WEST)"
 	},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/airless,
 /area/awaymission/BMPship/Engines)
 "SJ" = (
 /obj/item/stack/ore/uranium,
@@ -7013,7 +7013,7 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/airless,
 /area/awaymission/BMPship/Bath)
 "WD" = (
 /obj/effect/gibspawner/generic,

_maps/map_files220/cyberiad/cyberiad.dmm

@@ -10496,7 +10496,6 @@
 /area/station/hallway/primary/fore)
 "aNX" = (
 /obj/machinery/disposal,
-/obj/machinery/light_switch/west,
 /obj/structure/disposalpipe/trunk{
 	dir = 4
 	},
@@ -69535,11 +69534,7 @@
 	},
 /area/station/service/chapel)
 "mEM" = (
-/obj/structure/closet/secure_closet/guncabinet{
-	name = "HoS personal weapons";
-	req_access = list(58)
-	},
-/obj/item/clothing/gloves/combat,
+/obj/structure/displaycase/hos,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -75984,6 +75979,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/light_switch/east,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},

_maps/map_files220/delta/delta.dmm

@@ -18941,9 +18941,7 @@
 /area/station/security/prison/cell_block)
 "bzq" = (
 /obj/effect/decal/warning_stripes/northwest,
-/obj/structure/displaycase{
-	start_showpiece_type = /obj/item/reagent_containers/food/snacks/donut/sprinkles
-	},
+/obj/structure/displaycase/hos,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -73273,7 +73271,6 @@
 /obj/structure/closet/secure_closet/hos,
 /obj/effect/decal/warning_stripes/west,
 /obj/machinery/alarm/directional/south,
-/obj/item/clothing/gloves/combat,
 /obj/item/clothing/accessory/holster,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -77848,9 +77845,7 @@
 /obj/item/clothing/glasses/hud/health{
 	pixel_y = 2
 	},
-/obj/item/clothing/glasses/hud/health{
-	pixel_y = 0
-	},
+/obj/item/clothing/glasses/hud/health,
 /turf/simulated/floor/plasteel{
 	icon_state = "whiteblue"
 	},

code/controllers/subsystem/SSticker.dm

@@ -529,8 +529,6 @@ SUBSYSTEM_DEF(ticker)
 	ending_station_state.count()
 	var/station_integrity = min(round( 100.0 *  GLOB.start_state.score(ending_station_state), 0.1), 100.0)
 
-	SScredits.roll_credits_for_all_clients()
-
 	to_chat(world, "<BR>[TAB]Shift Duration: <B>[round(ROUND_TIME / 36000)]:[add_zero("[ROUND_TIME / 600 % 60]", 2)]:[ROUND_TIME / 100 % 6][ROUND_TIME / 100 % 10]</B>")
 	to_chat(world, "<BR>[TAB]Station Integrity: <B>[mode.station_was_nuked ? "<font color='red'>Destroyed</font>" : "[station_integrity]%"]</B>")
 	to_chat(world, "<BR>")
@@ -594,6 +592,8 @@ SUBSYSTEM_DEF(ticker)
 	for(var/datum/team/team in GLOB.antagonist_teams)
 		team.on_round_end()
 
+	SScredits.roll_credits_for_all_clients() // SS220 ADDITION
+
 	// Display the scoreboard window
 	score.scoreboard()
 

code/modules/client/preference/link_processing.dm

@@ -1172,7 +1172,7 @@
 									"CLEAR" = "Center"
 								)
 
-								new_key = key_map[new_key] || new_key
+								new_key = convert_ru_key_to_en_key(key_map[new_key] || new_key) // SS220 EDIT
 
 								var/full_key
 								switch(new_key)

code/modules/mob/new_player/new_player.dm

@@ -157,7 +157,8 @@
 			ready = FALSE
 			return FALSE
 
-		check_tts_seed_ready() // SS220 ADDITION
+		if(!check_tts_seed_ready()) // SS220 ADDITION
+			return FALSE
 
 		ready = !ready
 		new_player_panel_proc()
@@ -231,7 +232,8 @@
 			to_chat(src, alert("You are currently not whitelisted to play [client.prefs.active_character.species]."))
 			return FALSE
 
-		check_tts_seed_ready()
+		if(!check_tts_seed_ready()) // SS220 ADDITION
+			return FALSE
 
 		LateChoices()
 

modular_ss220/_defines220/_defines220.dme

@@ -7,3 +7,6 @@
 #include "code/signals_mob/signals_mob_silicon.dm"
 #include "code/signals_mob/signals_mob_simple.dm"
 #include "code/signals_keybindings.dm"
+#include "code/cult_defines_ss220.dm"
+#include "code/hud_ss220.dm"
+#include "code/layers_ss220.dm"

modular_ss220/_defines220/code/cult_defines_ss220.dm

@@ -0,0 +1,4 @@
+// Used in determining which cinematic to play when cult ends
+#define CULT_VICTORY_MASS_CONVERSION 2
+#define CULT_FAILURE_NARSIE_KILLED 1
+#define CULT_VICTORY_NUKE 0

modular_ss220/_defines220/code/hud_ss220.dm

@@ -0,0 +1,2 @@
+/// Used for HUD objects
+#define APPEARANCE_UI (RESET_COLOR|RESET_TRANSFORM|NO_CLIENT_COLOR|PIXEL_SCALE)

modular_ss220/_defines220/code/layers_ss220.dm

@@ -0,0 +1,2 @@
+/// Cinematics are "below" the splash screen
+#define CINEMATIC_LAYER -1

modular_ss220/_misc/_misc.dme

@@ -1,4 +1,5 @@
 #include "_misc.dm"
 
+#include "code/global_procs.dm"
 #include "code/ss220_general_config.dm"
 #include "code/icons.dm"

modular_ss220/_misc/code/global_procs.dm

@@ -0,0 +1,2 @@
+/proc/cmp_typepaths_asc(A, B)
+	return sorttext("[B]","[A]")

modular_ss220/_modpacks.dm

@@ -8,8 +8,7 @@ SUBSYSTEM_DEF(modpacks)
 
 /datum/controller/subsystem/modpacks/Initialize()
 	var/list/all_modpacks = list()
-	for(var/modpack in subtypesof(/datum/modpack/))
-		all_modpacks.Add(new modpack)
+	init_subtypes(/datum/modpack/, all_modpacks)
 
 	loaded_modpacks = list()
 	// Pre-init and register all compiled modpacks.

modular_ss220/cinematics/_cinematics.dm

@@ -0,0 +1,4 @@
+/datum/modpack/cinematics
+	name = "Обновление системы Cinematics"
+	desc = "Обновление системы Cinematics, позволяя им работать в широкоформатном режиме"
+	author = "larentoun"

modular_ss220/cinematics/_cinematics.dme

@@ -0,0 +1,9 @@
+#include "_cinematics.dm"
+
+#include "code/_cinematics.dm"
+#include "code/cinematics_client_proc.dm"
+#include "code/cinematics_screen.dm"
+#include "code/cinematics_ticker.dm"
+#include "code/cinematics/malf_doomsday.dm"
+#include "code/cinematics/narsie_summon.dm"
+#include "code/cinematics/nuke_cinematics.dm"