ss220club / Bandastation

SS220 TG repository
https://discord.gg/ss220
GNU Affero General Public License v3.0
30 stars 34 forks source link

Revert "Merge upstream" #253

Closed Furrior closed 5 months ago

Furrior commented 5 months ago

Reverts ss220club/Bandastation#247

github-actions[bot] commented 5 months ago

This pr causes following conflicts on translate branch:

++<<<<<<< HEAD
 +  certificate.add_raw_text(get_completion_certificate())
 +  certificate.name = "certificate of domain completion"
++=======
+   certificate.add_raw_text(get_completion_certificate(time_difference, grade))
+   certificate.name = "сертификат о прохождении домена"
++>>>>>>> origin/translate
++<<<<<<< HEAD
 +          names += target.dna.species.random_name(target.gender, TRUE) //give one normal name in case they want to do regular plastic surgery
 +      var/chosen_name = tgui_input_list(user, "New name to assign", "Plastic Surgery", names)
++=======
+           names += target.generate_random_mob_name(TRUE) //give one normal name in case they want to do regular plastic surgery
+       var/chosen_name = tgui_input_list(user, "Новое имя на выбор", "Пластическая операция", names)
++>>>>>>> origin/translate