ss220club / Bandastation

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

Merge upstream 28.05.2024 #284

Closed Gaxeer closed 4 months ago

Gaxeer commented 4 months ago

About The Pull Request

Merge upstream

github-actions[bot] commented 4 months ago

This pr causes following conflicts on translate branch:

++<<<<<<< HEAD
 +  desc = "Grants you Mind Gate, a spell \
 +      which deals you 20 brain damage but the target suffers a hallucination,\
 +      is left confused for 10 seconds, suffers oxygen loss and brain damage."
 +  gain_text = "My mind swings open like a gate, and its insight will let me perceive the truth."
++=======
+   desc = "Дает вам заклинание Mind Gate, которое \
+       наносит вам 20 урона мозгу, и накладывает галлюцинации на цель, \
+       замешательство на 10 секунд, потерю дыхания и урон мозгу."
+   gain_text = "Мой разум распахивается, словно врата, и его озарение позволяет мне постичь правду."
++>>>>>>> origin/translate