Merge Upstream #863
Closed
Merge Upstream #863
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
* we are so back * Makes it compile * Vendors, walls, windows and consoles done * Blob and living mobs * Magpulses are now based on traits * Gives borgs the trait by action button * Fixes modsuits * Update code/game/objects/objs.dm Co-authored-by: Burzah <[email protected]> * Update code/game/turfs/turf.dm Co-authored-by: Burzah <[email protected]> * Update code/modules/mob/living/living.dm Co-authored-by: Burzah <[email protected]> * Fixes Thunk * Actually fixes it * I took an L (away from the trait) * One proc now * Update code/modules/clothing/shoes/magboots.dm Co-authored-by: Henri215 <[email protected]> * Update code/modules/clothing/shoes/magboots.dm Co-authored-by: Henri215 <[email protected]> --------- Co-authored-by: Burzah <[email protected]> Co-authored-by: Henri215 <[email protected]>
…23230) * Added no_lava and make glif have more "shape" * Did UNO REVERSE: - Now drunk miners "structures" represent their "name" from lavaland.dm if they spawn on lava (visual). - Expanded some drunk miner structures size & shape of "cave" they are in.
* Exclude abstract subtypes from robust dress shop * Fix typepath typo * `vv_outfit.dm` cleanup
* custom_rank_manifest_modify * Update code/datums/datacore.dm Co-authored-by: Ryan <[email protected]> * Update code/datums/datacore.dm * Update code/datums/datacore.dm --------- Co-authored-by: S34N <[email protected]> Co-authored-by: Ryan <[email protected]>
* TGUI Input List Toggle * contraview * Rename * Second rename
* Buff wizard apprentice, limits to one per wizard * Update restoration apprentice * fix name of staff of healing * rebuild tgui * Apply suggestions from code review Co-authored-by: Burzah <[email protected]> * Apply snake case * Update tgui.bundle.js * Update code/game/gamemodes/wizard/artefact.dm Co-authored-by: Luc <[email protected]> * remove forcewall from stealth * tgui update and useless comment removal * Update code/datums/spells/wizard_spells.dm Co-authored-by: DGamerL <[email protected]> * update tgui --------- Co-authored-by: Burzah <[email protected]> Co-authored-by: Luc <[email protected]> Co-authored-by: DGamerL <[email protected]>
github-actions
bot
added
Merge Conflict
Документация
|
Даже без конфликтов? Вау |
|
А, ну да, я насрал, блять, вот бы кто закрепил в дискорде как правильно создавать ПР на мерж |
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.
Что этот PR делает
Пу-пу-пу, подсос фиксов с оффов.
Changelog
🆑 ParadiseSS13 (Оффы)
add: Борги теперь получают урон, если их метнуть во что-то
add: Борги теперь замедляются при активных "магбутсах"
tweak: "Магбутсы" боргов можно переключать
tweak: Небольшие изменения лаваленда
tweak: Хоткей переключения датчиков изменён с Alt+Shift+Click на Alt+Click
tweak: Боты, такие как бипски, клин боты или дроны, теперь прокладывают маршрут умнее
tweak: Если вам не нравятся TGUI списки, теперь вы можете их выключить. Game Preferences -Input Lists и вкладка Preferences - Toggle TGUI Input Lists
tweak: Бафнуты ученики мага, теперь они более мобильные
tweak: У мага может быть только 1 ученик
tweak: Больше нельзя купить контракт в режиме раги-маги
add: Добавлен хонк-ученик
fix: Консоли больше не поглотят вашу карту взамен на синий экран
fix: ХУДы уборщика больше не заставляют сервер страдать
fix: Кастомные должности теперь отображаются в правильном отделе манифеста
/:cl: