Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Merge upstream" #253

Merged
merged 1 commit into from
May 6, 2024
Merged

Revert "Merge upstream" #253

merged 1 commit into from
May 6, 2024

Conversation

Furrior
Copy link
Collaborator

@Furrior Furrior commented May 6, 2024

Reverts #247

@Furrior Furrior merged commit b83dbc9 into master May 6, 2024
6 checks passed
@Furrior Furrior deleted the revert-247-master branch May 6, 2024 11:43
Copy link

github-actions bot commented May 6, 2024

This pr causes following conflicts on translate branch:

  • code/modules/bitrunning/server/loot.dm
++<<<<<<< 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

  • code/modules/surgery/plastic_surgery.dm
++<<<<<<< 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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants