Merge remote-tracking branch 'upstream/master' into Fix-blackmesa-ner…

…fs-and-fixes

README.md

@@ -1,4 +1,5 @@
-# Paradise
+# Paradise WyccStation SS220
+
 [![CI](https://github.com/ParadiseSS13/Paradise/workflows/CI/badge.svg)](https://github.com/ParadiseSS13/Paradise/actions?query=workflow%3ACI)
 [![Render Nanomaps](https://github.com/ParadiseSS13/Paradise/workflows/Render%20Nanomaps/badge.svg)](https://github.com/ParadiseSS13/Paradise/actions?query=workflow%3A%22Render+Nanomaps%22)
 [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/paradisess13/paradise.svg)](http://isitmaintained.com/project/paradisess13/paradise "Average time to resolve an issue")
@@ -8,13 +9,13 @@
 [![forthebadge](http://forthebadge.com/images/badges/contains-technical-debt.svg)](http://forthebadge.com)
 [![forthebadge](http://forthebadge.com/images/badges/fuck-it-ship-it.svg)](http://forthebadge.com)
 
-# Useful Links
+# Полезные ссылки
 
-- [Discord](https://discordapp.com/invite/YJDsXFE)
-- [Documentation](https://codedocs.paradisestation.org)
-- [Website](https://www.paradisestation.org/)
+- [Discord](https://discord.com/invite/ss220)
+- [Wiki](https://wiki.ss220.club/)
+- [Documentation](https://ss220club.github.io/Paradise-SS220/)
 
-# Useful Documents
+# Полезные материалы
 
 - [Autodocumentation Guide](.github/AUTODOC_GUIDE.md)
 - [Code of Conduct](./CODE_OF_CONDUCT.md)
@@ -23,7 +24,6 @@
 
 ---
 
-
 ### LICENSE
 
 Paradise is licensed under the GNU Affero General Public License version 3.
@@ -44,8 +44,8 @@ Any files located in the
 `Paradise/sound/goonstation`
 directories, or any subdirectories of mentioned directories are licensed under the
 Creative Commons 3.0 BY-NC-SA license
-(https://creativecommons.org/licenses/by-nc-sa/3.0)
+(<https://creativecommons.org/licenses/by-nc-sa/3.0>)
 
 All other assets including icons and sound files are licensed under the
-Creative Commons 3.0 BY-SA license (https://creativecommons.org/licenses/by-sa/3.0/),
+Creative Commons 3.0 BY-SA license (<https://creativecommons.org/licenses/by-sa/3.0/>),
 unless otherwise indicated.

modular_ss220/title_screen/code/title_screen_subsystem.dm

@@ -1,3 +1,5 @@
+#define TITLE_SCREENS_LOCATION "config/title_screens/images/"
+
 /datum/controller/subsystem/title
 	flags = SS_NO_FIRE
 	init_order = INIT_ORDER_TITLE
@@ -18,18 +20,15 @@
 		title_html = file2text("config/title_html.txt")
 
 	var/list/local_title_screens = list()
-	for(var/screen in flist("config/title_screens/images/"))
+	for(var/screen in flist(TITLE_SCREENS_LOCATION))
 		var/list/screen_name_parts = splittext(screen, "+")
 		if((LAZYLEN(screen_name_parts) == 1 && (screen_name_parts[1] != "exclude" && screen_name_parts[1] != "blank.png")))
-			message_admins("Screen: [screen]")
 			local_title_screens += screen
 
 	for(var/title_screen in local_title_screens)
-		var/file_path = "config/title_screens/images/[title_screen]"
+		var/file_path = "[TITLE_SCREENS_LOCATION][title_screen]"
 		ASSERT(fexists(file_path))
-
-		var/icon/title2use = new(fcopy_rsc(file_path))
-		title_screens += title2use
+		title_screens += fcopy_rsc(file_path)
 
 	change_title_screen()
 
@@ -66,3 +65,5 @@
 			current_title_screen = DEFAULT_TITLE_SCREEN_IMAGE
 
 	show_title_screen()
+
+#undef TITLE_SCREENS_LOCATION

modular_ss220/whitelist/code/whitelist.dm

@@ -57,6 +57,6 @@
 /world/IsBanned(key, address, computer_id, type, check_ipintel, check_2fa, check_guest, log_info, check_tos)
 	var/ckey = ckey(key)
 	if(GLOB.configuration.overflow.reroute_cap == 0.5 && ckey && !(ckey in GLOB.configuration.overflow.overflow_whitelist))
-		return list("reason"="no-whitelist", "desc"="\nПричина: Вас ([key]) нет в вайтлисте этого сервера. Приобрести доступ возможно у одного из стримеров Банды за баллы канала.")
+		return list("reason"="no-whitelist", "desc"="\nПричина: Вас ([key]) нет в вайтлисте этого сервера. Приобрести доступ возможно у одного из стримеров Банды за баллы канала или записаться самостоятельно с помощью команды в дискорде, доступной сабам бусти, начиная со второго тира.")
 
 	. = ..()