remove ru_names list

ss220club · Oct 30, 2024 · ad41c67 · ad41c67
1 parent 8aa7f1d
commit ad41c67
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/code/__DEFINES/bandastation/pronouns.dm b/code/__DEFINES/bandastation/pronouns.dm
@@ -19,7 +19,6 @@
 
 /// Макрос для добавления значений для переменных
 #define RU_NAMES_LIST_INIT(base, nominative, genitive, dative, accusative, instrumental, prepositional)\
-	ru_names = RU_NAMES_LIST(base, nominative, genitive, dative, accusative, instrumental, prepositional);\
 	ru_name_base = base;\
 	ru_name_nominative = nominative;\
 	ru_name_genitive = genitive;\

diff --git a/modular_bandastation/translations/code/ru_names/ru_name_base.dm b/modular_bandastation/translations/code/ru_names/ru_name_base.dm
@@ -1,7 +1,6 @@
 /atom
 	// code\__DEFINES\bandastation\pronouns.dm for more info
 	/// RU_NAMES_LIST_INIT("name", "именительный", "родительный", "дательный", "винительный", "творительный", "предложный")
-	var/list/ru_names
 	var/ru_name_base
 	var/ru_name_nominative
 	var/ru_name_genitive
@@ -10,6 +9,10 @@
 	var/ru_name_instrumental
 	var/ru_name_prepositional
 
+/atom/Initialize(mapload, ...)
+	. = ..()
+	article = null
+
 /datum/proc/ru_names_rename(list/new_list)
 	SHOULD_CALL_PARENT(FALSE)
 	CRASH("Unimplemented proc/ru_names_rename() was used")
@@ -29,7 +32,7 @@
 	CRASH("Unimplemented proc/declent_ru() was used")
 
 /atom/declent_ru(case_id, list/ru_names_override)
-	var/list/list_to_use = ru_names_override || ru_names
+	var/list/list_to_use = ru_names_override || RU_NAMES_LIST(ru_name_base, ru_name_nominative, ru_name_genitive, ru_name_dative, ru_name_accusative, ru_name_instrumental, ru_name_prepositional)
 	if(length(list_to_use))
 		if(list_to_use[case_id] && list_to_use["base"] == name)
 			return list_to_use[case_id] || name