Skip to content

Commit

Permalink
Ru names aliens and fixes to numbered mobs (#544)
Browse files Browse the repository at this point in the history
## About The Pull Request
Перевод имен чужих и фикс выдачи имени
  • Loading branch information
larentoun authored Oct 10, 2024
1 parent 03b7965 commit 7371d25
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 4 deletions.
1 change: 1 addition & 0 deletions code/modules/mob/living/carbon/alien/adult/adult.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/mob/living/carbon/alien/adult
name = "alien"
RU_NAMES_LIST_INIT("alien", "чужой", "чужого", "чужому", "чужого", "чужим", "чужом")
icon_state = "alien"
pass_flags = PASSTABLE
butcher_results = list(/obj/item/food/meat/slab/xeno = 5, /obj/item/stack/sheet/animalhide/xeno = 1)
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/carbon/alien/adult/caste/drone.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/mob/living/carbon/alien/adult/drone
name = "alien drone"
RU_NAMES_LIST_INIT("alien", "трутень Чужих", "трутня Чужих", "трутню Чужих", "трутня Чужих", "трутнем Чужих", "трутне Чужих")
caste = "d"
maxHealth = 125
health = 125
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/carbon/alien/adult/caste/hunter.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/mob/living/carbon/alien/adult/hunter
name = "alien hunter"
RU_NAMES_LIST_INIT("alien hunter", "охотник Чужих", "охотника Чужих", "охотнику Чужих", "охотника Чужих", "охотником Чужих", "охотнике Чужих")
caste = "h"
maxHealth = 125
health = 125
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/mob/living/carbon/alien/adult/royal/praetorian
name = "alien praetorian"
RU_NAMES_LIST_INIT("alien praetorian", "преторианец Чужих", "преторианца Чужих", "преторианцу Чужих", "преторианца Чужих", "преторианцем Чужих", "преторианце Чужих")
caste = "p"
maxHealth = 250
health = 250
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/mob/living/carbon/alien/adult/sentinel
name = "alien sentinel"
RU_NAMES_LIST_INIT("alien sentinel", "страж Чужих", "стража Чужих", "стражу Чужих", "стража Чужих", "стражем Чужих", "страже Чужих")
caste = "s"
maxHealth = 150
health = 150
Expand Down
7 changes: 5 additions & 2 deletions code/modules/mob/living/carbon/alien/adult/queen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@

/mob/living/carbon/alien/adult/royal/queen
name = "alien queen"
RU_NAMES_LIST_INIT("alien queen", "королева Чужих", "королевы Чужих", "королеве Чужих", "королеву Чужих", "королевой Чужих", "королеве Чужих")
caste = "q"
maxHealth = 500
health = 500
Expand All @@ -51,10 +52,12 @@
if(Q.stat == DEAD)
continue
if(Q.client)
name = "alien princess ([rand(1, 999)])" //if this is too cutesy feel free to change it/remove it.
var/number = rand(1, 999) // BANDASTATION EDIT
name = "alien princess ([number])" //if this is too cutesy feel free to change it/remove it.
RU_NAMES_LIST_INIT("[name]", "принцесса Чужих ([number])", "принцессы Чужих ([number])", "принцессе Чужих ([number])", "принцессу Чужих ([number])", "принцессой Чужих ([number])", "принцессе Чужих ([number])")
break

real_name = src.name
real_name = declent_ru(NOMINATIVE)

var/static/list/innate_actions = list(
/datum/action/cooldown/alien/promote,
Expand Down
2 changes: 2 additions & 0 deletions code/modules/mob/living/carbon/alien/alien.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/mob/living/carbon/alien
name = "alien"
RU_NAMES_LIST_INIT("alien", "чужой", "чужого", "чужому", "чужого", "чужим", "чужом")
icon = 'icons/mob/nonhuman-player/alien.dmi'
gender = FEMALE //All xenos are girls!!
dna = null
Expand Down Expand Up @@ -163,6 +164,7 @@ Des: Removes all infected images from the alien.
if(old_number != 0)
numba = old_number
name = initial(name) // prevent chicanery like two different numerical identifiers tied to the same mob
RU_NAMES_LIST_INIT("[name]", "[initial(ru_name_nominative) || initial(name)]", "[initial(ru_name_genitive) || initial(name)]", "[initial(ru_name_dative) || initial(name)]", "[initial(ru_name_accusative) || initial(name)]", "[initial(ru_name_instrumental) || initial(name)]", "[initial(ru_name_prepositional) || initial(name)]")

set_name()

Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/carbon/alien/larva/larva.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/mob/living/carbon/alien/larva
name = "alien larva"
RU_NAMES_LIST_INIT("alien larva", "грудолом Чужих", "грудолома Чужих", "грудолому Чужих", "грудолома Чужих", "грудоломом Чужих", "грудоломе Чужих")
real_name = "alien larva"
icon_state = "larva0"
pass_flags = PASSTABLE | PASSMOB
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// It functions almost identically (see code/datums/diseases/alien_embryo.dm)
/obj/item/organ/internal/body_egg/alien_embryo
name = "alien embryo"
RU_NAMES_LIST_INIT("alien embryo", "эмбрион Чужих", "эмбриона Чужих", "эмбриону Чужих", "эмбрион Чужих", "эмбрионом Чужих", "эмбрионе Чужих")
icon = 'icons/mob/nonhuman-player/alien.dmi'
icon_state = "larva0_dead"
food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/toxin/acid = 10)
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/carbon/alien/special/facehugger.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

/obj/item/clothing/mask/facehugger
name = "alien"
RU_NAMES_LIST_INIT("alien", "чужой", "чужого", "чужому", "чужого", "чужим", "чужом")
desc = "It has some sort of a tube at the end of its tail."
icon = 'icons/mob/nonhuman-player/alien.dmi'
icon_state = "facehugger"
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/living.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1872,8 +1872,8 @@ GLOBAL_LIST_EMPTY(fire_appearances)
if(numba == 0)
numba = rand(1, 1000)
name = "[name] ([numba])"
RU_NAMES_LIST_INIT("[name] ([numba])", "[declent_ru(NOMINATIVE)] ([numba])", "[declent_ru(GENITIVE)] ([numba])", "[declent_ru(DATIVE)] ([numba])", "[declent_ru(ACCUSATIVE)] ([numba])", "[declent_ru(INSTRUMENTAL)] ([numba])", "[declent_ru(PREPOSITIONAL)] ([numba])")
real_name = name
RU_NAMES_LIST_INIT("[name]", "[initial(ru_name_nominative) || initial(name)] ([numba])", "[initial(ru_name_genitive) || initial(name)] ([numba])", "[initial(ru_name_dative) || initial(name)] ([numba])", "[initial(ru_name_accusative) || initial(name)] ([numba])", "[initial(ru_name_instrumental) || initial(name)] ([numba])", "[initial(ru_name_prepositional) || initial(name)] ([numba])")
real_name = declent_ru(NOMINATIVE)

/mob/living/proc/mob_try_pickup(mob/living/user, instant=FALSE)
if(!ishuman(user))
Expand Down

0 comments on commit 7371d25

Please sign in to comment.