Closed Gaxeer closed 4 months ago
This pr causes following conflicts on translate branch:
++<<<<<<< HEAD
+/datum/objective_item/steal/ablative
+ name = "an ablative trenchcoat"
++=======
+ /datum/objective_item/steal/reflector
+ name = "reflector trenchcoat"
++>>>>>>> origin/translate
++<<<<<<< HEAD
+ balloon_alert(user, "[inverted ? "now" : "no longer"] creating inverted rifts")
+ return CLICK_ACTION_SUCCESS
++=======
+ balloon_alert(user, "[inverted ? "теперь" : "более не"] создает инвертированные порталы")
++>>>>>>> origin/translate
++<<<<<<< HEAD
+ desc = "Lets you turn the gaze of the moon on someone \
+ temporarily blinding, muting, deafening and knocking down a single target if their sanity is low enough."
++=======
+ desc = "Позволяет обратить взгляд луны на кого-то, временно \
+ заглушая, ослепляя, оглушая и сбивая с ног одну цель."
++>>>>>>> origin/translate
++<<<<<<< HEAD
+ to_chat(cast_on, span_warning("Your eyes cry out in pain, your ears bleed and your lips seal! THE MOON SMILES UPON YOU!"))
+ cast_on.adjust_temp_blindness(moon_smile_duration + 1 SECONDS)
+ cast_on.set_eye_blur_if_lower(moon_smile_duration + 2 SECONDS)
++=======
+ to_chat(cast_on, span_warning("Ваши глаза горят от боли, из ушей течет кровь, а губы запечатаны. ЛУНА УЛЫБАЕТСЯ ТЕБЕ!"))
+ cast_on.adjust_temp_blindness(moon_smile_duration + 5 SECONDS)
+ cast_on.set_eye_blur_if_lower(moon_smile_duration + 7 SECONDS)
++>>>>>>> origin/translate
About The Pull Request
Merge upstream