github-actions[bot]
commented
4 months ago This pr causes following conflicts on translate branch:
- code/modules/antagonists/changeling/powers/adrenaline.dm
++<<<<<<< HEAD
+ name = "Repurposed Glands"
+ desc = "We shift almost all available muscle mass from the arms to the legs, disabling the former but making us unable to be downed for 15 seconds. Costs 10 chemicals."
+ helptext = "Disables your arms and retracts bioweaponry, but regenerates your legs, grants you speed, and wakes you up from any stun."
++=======
+ name = "Adrenaline Sacs"
+ desc = "Мы развиваем дополнительные адреналиновые мешочки по всему телу. Стоит 30 химикатов."
+ helptext = "Мгновенно снимает все оглушения и добавляет кратковременное снижение последующих оглушений. Можно использовать, находясь без сознания. Продолжительное использование отравляет тело."
++>>>>>>> origin/translate
++<<<<<<< HEAD
+ to_chat(user, span_changeling("Our arms feel weak, but our legs become unstoppable!"))
+
+ for(var/datum/action/changeling/weapon/weapon_ability in user.actions)
+ weapon_ability.unequip_held(user)
+
+ // Destroy legcuffs with our IMMENSE LEG STRENGTH.
+ if(istype(user.legcuffed))
+ user.visible_message(
+ span_warning("[user]'s legs suddenly rip [user.legcuffed] apart!"),
+ span_warning("We rip apart our leg restraints!"),
+ )
+ qdel(user.legcuffed)
+
+ // Regenerate our legs only.
+ var/our_leg_zones = (GLOB.all_body_zones - GLOB.leg_zones)
+ user.regenerate_limbs(excluded_zones = our_leg_zones) // why is this exclusive rather than inclusive
+
+ user.add_traits(list(TRAIT_IGNOREDAMAGESLOWDOWN, TRAIT_PARALYSIS_L_ARM, TRAIT_PARALYSIS_R_ARM), CHANGELING_TRAIT)
+
+ // Revert above mob changes.
+ addtimer(CALLBACK(src, PROC_REF(unsting_action), user), 20 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE)
+
+ // Get us standing up.
+ user.SetAllImmobility(0)
+ user.setStaminaLoss(0)
+ user.set_resting(FALSE, instant = TRUE)
+
+ // Add fast reagents to go fast.
++=======
+ to_chat(user, span_notice("Энергия проносится сквозь нас."))
+ user.SetKnockdown(0)
+ user.set_resting(FALSE)
++>>>>>>> origin/translate
- code/modules/events/ion_storm.dm
++<<<<<<< HEAD
+ message = "THE [ioncrew1] [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew2]"
++=======
+ message = "[ioncrew1][ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew2]"
++>>>>>>> origin/translate
++<<<<<<< HEAD
+ message = "ALL [ionthreats] ARE NOW NAMED [ionobjects]."
+ if(42 to 46)///Pets are something else now
+ if(prob(75))///What are they now?
+ message = "[ionpet] IS HUMAN"///They're a human
+ else///They're something else (This is to cover for other lawsets)
+ switch(rand(1,6))
+ if(1)
+ message = "[ionpet] IS NON-HUMAN"
+ if(2)
+ message = "[ionpet] IS A CREWMEMBER"
+ if(3)
+ message = "[ionpet] IS EXPENSIVE TO REPLACE"
+ if(4)
+ message = "[ionpet] IS HARMFUL TO HUMANS"
+ if(5)
+ message = "[ionpet] IS A REAL AMERICAN"
+ if(6)
+ message = "[ionpet] IS A NUTSHELL"
++=======
+ message = "ВСЕ [ionthreats] ТЕПЕРЬ НАЗЫВАЕТСЯ [ionobjects]."
++>>>>>>> origin/translate
- strings/ion_laws.json
++<<<<<<< HEAD
+ "ABDUCTING",
+ "ADOPTING",
+ "ARRESTING",
+ "ARRESTING",
+ "ATTACKING",
+ "BANNING",
+ "BUILDING",
+ "CARRYING",
+ "CHASING",
+ "COPULATING WITH",
+ "DECONSTRUCTING",
+ "DISABLING",
+ "DRINKING",
+ "EATING",
+ "GIBBING",
+ "HARMING",
+ "HELPING",
+ "HONKING AT",
+ "INTERROGATING",
+ "INVADING",
+ "KISSING",
+ "LICKING",
+ "LOVING",
+ "MURDERING",
+ "POOPING ON",
+ "PUNCHING",
+ "RIDING",
+ "SEDUCING",
+ "SPACING",
+ "SPYING ON",
+ "STALKING",
+ "WATCHING"
+ ],
+ "ionpet": [
+ "POLY",
+ "RENAULT",
+ "IAN",
+ "PUN PUN",
+ "LAMARR",
+ "RUNTIME",
+ "CITRUS",
+ "MCGRIFF",
+ "ARANEUS"
+ ]
++=======
+ "ПОХИЩЕНИЕ",
+ "ПРИНЯТИЕ",
+ "АРЕСТОВЫВАНИЕ",
+ "ЗАДЕРЖИВАНИЕ",
+ "АТАКА",
+ "БАН",
+ "СТРОИТЕЛЬСТВО",
+ "ПЕРЕНОСКА",
+ "ПРЕСЛЕДОВАНИЕ",
+ "СОПУКУПЛЕНИЕ С",
+ "РАЗБИРАНИЕ",
+ "ОТКЛЮЧЕНИЕ",
+ "ПИТЬЕ",
+ "ПОЕДАНИЕ",
+ "ГИБАНИЕ",
+ "ВРЕДИТЕЛЬСТВО",
+ "ПОМОЩЬ",
+ "ХОНКАЯ",
+ "ДОПРАШИВАЯ",
+ "ВТОРЖЕНИЕ",
+ "ЦЕЛУЯ",
+ "ЛИЖА",
+ "ЛЮБЯ",
+ "УБИВАЯ",
+ "НАСИРАЯ",
+ "ИЗБИВАЯ",
+ "ЕЗДА",
+ "СОБЛАЗНЯЯ",
+ "КОСМИРУЯ",
+ "ШПИОНЯ ЗА",
+ "ПРЕСЛЕДУЮ",
+ "СМОТРЯ"
+ ]
++>>>>>>> origin/translate
- tgui/packages/tgui/interfaces/PreferencesMenu/antagonists/antagonists/sentientdisease.ts
About The Pull Request
Merge upstream