Merge Upstream 05.11.2024 #1640
Merged
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
* Fixes flight * This slightly annoys me --------- Co-authored-by: [email protected] <[email protected]>
…aradiseSS13#26808) * Cryopod now throws an alert when entered. * Makes these subtypes * Requested changes * Requested changes * Update code/_onclick/hud/alert.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Chap <[email protected]> --------- Signed-off-by: Chap <[email protected]> Co-authored-by: Adrer <[email protected]> Co-authored-by: DGamerL <[email protected]>
* refactor: Datumizes ore. * tiny fixes * set script PR number * Update code/datums/ores.dm Co-authored-by: Luc <[email protected]> Signed-off-by: warriorstar-orion <[email protected]> * review comments * qdel existing ore before set * fix how gibtonite reaction count is calculated * rename and unify return values for digging --------- Signed-off-by: warriorstar-orion <[email protected]> Co-authored-by: Luc <[email protected]>
* Unhands some codeowners stuff * May as well while I am here
* Modified the RPD auto-wrenching behaviour * Removed tool requirement for auto-wrenching * Allowed the BRPD to auto-wrench remotely * Added a TGUI toggle for auto-wrenching * Added a Line of Sight check for the BRPD * Readded missing UI buttons * Tweaked disposals construction * Disposals objects can't be anchored if there's floor tiles * Bins, chutes and outlets now need a constructed trunk to be anchored. * Changed LoS check, added sounds, stopped station auto-wrench. * Final touches for the RPD * Added sounds when wrenching occurs * tgui bundle * Consolidated all RPD related sounds to the RPD code * removed some redundant things I forgot about * tguibundle * span classes and tgui bundle * Applying lewcc's suggestion Co-authored-by: Luc <[email protected]> Signed-off-by: Toastical <[email protected]> * applying lewcc's 2nd suggestion Co-authored-by: Luc <[email protected]> Signed-off-by: Toastical <[email protected]> * Applying contrabang's suggestions + added marks in pipe.dm * typos n stuff * tgui bundle * Update code/modules/recycling/disposal-construction.dm Signed-off-by: DGamerL <[email protected]> --------- Signed-off-by: Toastical <[email protected]> Signed-off-by: DGamerL <[email protected]> Co-authored-by: Luc <[email protected]> Co-authored-by: DGamerL <[email protected]>
…aradiseSS13#26914) * one punch * rebuild tgui * better solution to crew monitor cutoff problem * update tgui with crew monitor fix * Rebuild tgui after upstream update
Co-authored-by: Bmon <[email protected]>
* Vent images update while ventcrawling * Add some comments * Autodoc for a variable * Get rid of this useless timer * Update code/modules/atmospherics/machinery/atmospherics.dm Co-authored-by: Nathan Winters <[email protected]> Signed-off-by: Chap <[email protected]> * Move update pipe image to unary base * We're doing signals now * Added a comment to the signal * Trailing newline --------- Signed-off-by: Chap <[email protected]> Co-authored-by: Adrer <[email protected]> Co-authored-by: Nathan Winters <[email protected]>
* pulse demon summoner warns better * Update antag_spawner.dm * Update code/modules/antagonists/_common/antag_spawner.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Qwertytoforty <[email protected]> * Update code/game/gamemodes/wizard/spellbook.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Qwertytoforty <[email protected]> --------- Signed-off-by: Qwertytoforty <[email protected]> Co-authored-by: DGamerL <[email protected]>
* Fixes flayers borking radios sometimes * Typo
github-actions
bot
added
🗺️ Изменение Карты
dj-34
approved these changes
Nov 5, 2024
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.
Кокфликт ТГУИ, не более
Changelog
🆑 ParadiseSS13
add: BRPD теперь может автоматически прикручивать трубы, включается в интерфейсе.
tweak: BRPD больше не может "стрелять" сквозь стены.
tweak: При входе в крио, вам теперь всплывёт кнопка, при нажатии на которую будет предложено перейти в госты.
tweak: Немного уменьшено количество булыжников в Blocked Burrows теме пещер.
tweak: Некоторые события СМа теперь более опасные.
tweak: Руины на Лаваленде, теперь могут быть соединены с рекой/чазмами.
tweak: Призывалка Пульс-демона теперь лучше предупреждает мага, дабы тот не подыхал спустя 3 секунды после призыва.
imageadd: Видеокамера получила новый спрайт.
fix: Карта крю монитора больше не застревает.
fix: При пришивании конечности теперь слышен звук.
fix: Наушник пожирателя больше не должен иногда сам по себе навсегда переставать работать.
fix: Добавлен трейт полёта в список трейтов, админы могут заставлять вещи летать.
fix: C-4 больше не взрывает ваш рюкзак, коробки или МОДы.
fix: Вы снова можете смотреть весь флейвор чужих персонажей.
/:cl: