Fix negotiaton between attack chains causing issues with borgs #27571
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ParadiseSS13-Bot
added
the
-Status: Awaiting type assignment
ParadiseSS13-Bot
added
-Status: Awaiting review
…Paradise into fix/attack-chain-borg
Burzah
approved these changes
Dec 7, 2024
ParadiseSS13-Bot
added
-Status: Awaiting merge
BiancaWilkson
approved these changes
Dec 7, 2024
|
Did a second round of testing. I feel confident enough about merging this PR. |
Legendaxe
added a commit
to ss220club/Paradise-SS220
that referenced
this pull request
Dec 11, 2024
This pull request merges upstream/master. Resolve possible conflicts manually and make sure all the changes are applied correctly. > [!NOTE] > Requires Wiki Update: > ParadiseSS13#27371 > ParadiseSS13#27457 > ParadiseSS13#27465 > ParadiseSS13#27472 > ParadiseSS13#27506 ## Changelog :cl: ParadiseSS13 add: Включение силового поглотителя теперь будет предлагать гостам следить за ним. Тоже самое при его взрыве. <!-- add: Turning on a powersink will now ping ghosts with a prompt to follow the powersink. As with when its about to explode (ParadiseSS13#27349) --> fix: Слаймомены снова могут выбрать тип крови на карте агента. <!-- fix: Slimepeople can pick a bloodtype again on agent IDs. (ParadiseSS13#27509) --> fix: Сброс карты агента больше не вызывает неизменяемость типа крови. <!-- fix: Resetting an agent ID no longer causes bloodtype to be unchangable. (ParadiseSS13#27509) --> del: Удален EXPERIMENTOR. <!-- del: Removed EXPERIMENTOR (ParadiseSS13#27472) --> tweak: Деструктивный анализатор переименован в научный анализатор. <!-- tweak: Destructive analyser is now scientific analyser (ParadiseSS13#27472) --> tweak: Странные объекты теперь могут быть просканированы в научном анализаторе. <!-- tweak: Strange objects can now be discovered in the scientific analyser (ParadiseSS13#27472) --> fix: На плате шлюза снова можно изменить доступ. <!-- fix: Destroyed airlock electronics should now properly prevent players from setting their access. (ParadiseSS13#27538) --> tweak: Arc Revolver имеет еще 2 выстрела. <!-- tweak: Arc revolver has 2 more shots. (ParadiseSS13#27476) --> tweak: Стрельба и прицеливание с LWAP теперь быстрее. Снаряды теперь попадают по ползающим мобам и пролетают через паутину и балки. <!-- tweak: Lwap fires and scopes faster, always hits crawlers, and shoots through spider webs / girders now. (ParadiseSS13#27476) --> tweak: Урон BSG значительно увеличен. <!-- tweak: BSG AOE damage greatly improved (ParadiseSS13#27476) --> fix: Исправлено отсутствие анимации атаки у некоторых предметов. <!-- fix: Some items missing an attack animation have been fixed. (ParadiseSS13#27554) --> fix: Отвертки теперь перерабатываются в автолате в харм интенте. <!-- fix: Screwdrivers are properly recycled in autolathes on harm intent. (ParadiseSS13#27557) --> fix: Было исправлено несколько побочных эффектов атаки. <!-- fix: Several unexpected attack side-effects, including borgs bludgeoning themselves with goliath hide plates, have been fixed. (ParadiseSS13#27542) --> add: Лазерные слаги добавлены во взломанный автолат. <!-- add: Readds Laser Slugs and make them printable in hacked autolathes. (ParadiseSS13#27457) --> add: Добавлен апгрейд сервисного борга. <!-- add: Adds the Executive Service cyborg Upgrade (ParadiseSS13#27371) --> add: Добавлено четыре новых сыра и банка икры. <!-- add: Adds four new cheeses and caviar (ParadiseSS13#27371) --> imageadd: Старый сыр получил новый спрайт. <!-- imageadd: Resprites cheese (ParadiseSS13#27371) --> fix: Бипски и другие боты СБ больше не выбивают дерьмо из экипажа так болезненно. <!-- fix: Beepsky and other secbots are no longer loose cannons that beat the shit out of suspects. (ParadiseSS13#27553) --> fix: Прием целых пузырьков с таблетками снова работает. <!-- fix: Swallowing entire bottles of pills works as intended again. (ParadiseSS13#27553) --> fix: Поедание внутренних органов снова работает. <!-- fix: Eating internal organs works as intended. (ParadiseSS13#27553) --> fix: Исправлены проблемы с атакой саблей. <!-- fix: Issues with saber slaps and attacks are fixed. (ParadiseSS13#27553) --> fix: Исправлена возможность красить простыни. <!-- fix: Fixed the ability to dye bedsheets. (ParadiseSS13#27569) --> fix: Борги снова имеют возможность достать плату из шлюза. <!-- fix: Borgs should now be able to pick up airlock electronics again. (ParadiseSS13#27571) --> fix: Зелья снова можно скармливать слаймам с помощью консоли ксено. <!-- fix: Slime management console can feed slime potions again (ParadiseSS13#27576) --> imageadd: Спрайт костюма охотника на ведьм был обновлен. <!-- tweak: Resprited and Vox Refit Witchhunter Chaplain outfits (ParadiseSS13#27539) --> tweak: Экраны теперь светятся немного ярче и в соответствующем цвете. <!-- tweak: Computer screens now glow slightly brighter and in an appropriate color. (ParadiseSS13#27484) --> tweak: Магма-эль и космическое пиво теперь ведут себя как бутылки. <!-- tweak: Magma-ale and space beer are now bottles (ParadiseSS13#27407) --> tweak: Бутылки магма-эля и космического пива теперь вмещают 50 юнитов. <!-- tweak: Magma-ale and space beer bottles now hold 50u (ParadiseSS13#27407) --> fix: Яйца ксеноморфов теперь развиваются правильно. <!-- fix: Alien eggs evolve correctly now. (ParadiseSS13#27537) --> tweak: Добавлена фигурка CMO во взломанный автомат медицинской одежды. <!-- tweak: added CMO's figurine to the medical clothing vendor if it is hacked. (ParadiseSS13#27506) --> add: Добавлены латунные скамьи, шлюзы, полки, оружейные стойки и слипер. <!-- add: Adds Brass Pews, Pinion Airlocks, Brass Shelves, Brass Gunrack, Brass Sleeper. (ParadiseSS13#27465) --> /:cl:
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What Does This PR Do
This PR shuffles around some of the code related to negotiation between attack chains. This fixes the issue borg grippers have with picking up items on the new chain, hopefully without screwing up any of the existing interactions.
It also redoes the janicart migration which was used in the documentation as an example, pulling the non-combat behavior out of
attackbyand intoitem_interaction. This is important not just for semantic reasons, but because we don't want to start calling up the attack chain before we know we're performing an attack.Why It's Good For The Game
Bugfix, more predictable behavior for janicarts, hopefully standardizes all the behavior going forward, better documentation.
Testing
2024-12-07.01-32-46.mp4
Declaration
Changelog
🆑
fix: Borgs should now be able to pick up airlock electronics again.
/:cl: