Merge Upstream [13.10.2024] #1593
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
* Nkarrdem Mech - Initial Commit * Fabricator category, garbage bag, module designs * Added combat tech requirement to cleaning grenade launcher * Fixed a comment's spacing * Construction codersprites * Construction path updated * Open and Broken sprites * Codersprites, Construction fixes, Wreckage * Better spacing for equalities, better return bool Co-authored-by: Burzah <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * Equality spacing Co-authored-by: Burzah <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * playsound boolean fix Co-authored-by: Burzah <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * Mech part comment spacing Co-authored-by: Burzah <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * Parts list parenthesis spacing Co-authored-by: Burzah <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * Spacing and boolean returns Co-authored-by: Burzah <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * Another boolean return Co-authored-by: Burzah <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * More comment spacing Co-authored-by: 1080pCat <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * More comment spacing Co-authored-by: 1080pCat <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * Ditto Co-authored-by: 1080pCat <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * Comment spacing Co-authored-by: 1080pCat <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * Comment spacing Co-authored-by: 1080pCat <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * Snake cased floor_buffer, removed excess comment * Enhanced floor buffer * Whole lot of time format changes * HUD warning message update * Cutting cargo * Max equipment fix * Spray fixes * Light replacer fixes and defines moved * Mop sound cooldowns * Formatting, autodoc, spacing, and chat alert fixes * Emag warning * Removed excess returns, added click when spray empty * Minor refactor of cleaning_act, removed the async mopping * Excess user * Formatting, Typecaching * Replaces to_chat with occupant_message * Type def, attack log, and timer for CGL * Moved light replacement logic to light object as fix() proc * Free performance is free performance * To chat fix * replaceLight changes * Ranged fix * Moved autodoc * Early return in mop refilling * Reordered early returns in mop action * Applied change to cleaning documentation * Moved acrtion, removed excess subtype * Spray moved to internal spray item, various fixes * Removed excess * Internal garbage storage for garbage magnet * Janimech storage handling, effect when emptying into disposals, user check in handle_item_insertion * Extraneous Return Co-authored-by: Luc <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * Var declaration fix Co-authored-by: Luc <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> --------- Signed-off-by: PollardTheDragon <[email protected]> Co-authored-by: Burzah <[email protected]> Co-authored-by: 1080pCat <[email protected]> Co-authored-by: Luc <[email protected]>
* Tweak: Revision of miners' and explorers' gear. * Remove drake changes * Remove armor-related changes * Update machine_vending.dm * Update machine_vending.dm
* Added UI overlay for incursions. Levels replaced with mining power. * skull blinky now * Rebuild TGUI * skull less blinky * red skull * skull even less blinky * Resolve TGUI conflict * Remove the redundant defines * TGUI rebuild * style fixes, icon switch now covers the range of possible power inputs, additional clarification on stabilizer power calculations * breaks up the stabilizer power calculation into different lines * Rebuild TGUI * Rebuild TGUI * I am once again building TGUI * fix indentation * Comment formatting * oops * Rebuild TGUI * Comment fix and using a stack on the overlay * Rebuild TGUI
* Thurible Code * No Belt Slot * No more emag act. * Unholy water corruption fix * Added jestosterone and nothing to acceptable reagents. Honk * Item sprites * Better bad chem purge messages * Inhand Sprites * Variable Format * Formatting, Visible Messages, Inhand Updating * Removed extraneous check * Loc fix Co-authored-by: Luc <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * Readability of reagents var * Guard clause on corrupted reagent addition * Moved container type to vars * Better check for sprite update --------- Signed-off-by: PollardTheDragon <[email protected]> Co-authored-by: Luc <[email protected]>
…S13#26716) * Gravity generator, Atmos Control Computers, and Station Alert Computers now work by area rather than Z_level * Cameras get added to network depending on ancestor area * Station Alert console work by area * Adds a check so we don't get_area on a null variable * Gravgen also checks for z level. Area check now includes some types of ruins that weren't checked * Keeps everything on the Z level. Atmos alert computer now iterates over alarm, but still presesents area names * Engineering monitor gets networks from the area it is placed in * Adds missing area prototype to the prototype list * moves the area check to a function * reject legs, return to snek. * Revert "reject legs, return to snek." This reverts commit 1dfc2c4. * I don't know what happened with paradise.dme, but it seems ok now * Requested style changes and remove redundant nulls * oops * Another empty line removed
* Tweaking sec belts * Update code/game/objects/items/weapons/storage/belt.dm Signed-off-by: Sean <[email protected]> --------- Signed-off-by: Sean <[email protected]> Co-authored-by: Sean <[email protected]>
) * no russian * space * more spaces * Update walls_mineral.dm Co-authored-by: CRUNCH <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update space_ruins.dm Co-authored-by: AffectedArc07 <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> --------- Signed-off-by: PopeDaveThe3th <[email protected]> Co-authored-by: CRUNCH <[email protected]> Co-authored-by: AffectedArc07 <[email protected]>
…es from chat (ParadiseSS13#26852) * Remove a lot of CSS and make boxed message stylish * Paint themed boxed message and sort light chat styles * Remove copyright from chat spans * Uh oh
* Helper proc from unbuckling a mob * Rename to unbuckle * Minor fixes * Move buckled up /mob/living --------- Co-authored-by: Adrer <[email protected]>
…iseSS13#27038) Co-authored-by: Adrer <[email protected]>
* Add some bonus cleaning grenades * clusterbusters too * blocked chem list * ignore clusters * Update code/game/objects/items/weapons/grenades/chem_grenade.dm Co-authored-by: CRUNCH <[email protected]> Signed-off-by: Luc <[email protected]> --------- Signed-off-by: Luc <[email protected]> Co-authored-by: CRUNCH <[email protected]>
* yeag * Update code/modules/clothing/shoes/magboots.dm Signed-off-by: Contrabang <[email protected]> --------- Signed-off-by: Contrabang <[email protected]>
* i feex * statue
…#27051) * [FIX] return some classes and standardize some class=\" * cultspeech
…ted (ParadiseSS13#26985) * Machines are now moved to the new power net when a new area is created where they are * Moves the machine reregistration to /turf/proc/change_area(area/old_area, area/new_area)
github-actions
bot
added
НЕ МОДУЛЬНО
dj-34
added
📃 Требуется изменение WIKI
github-actions
bot
added
НЕ МОДУЛЬНО
dj-34
added
🙏 Слияние с восходящим потоком
НЕ МОДУЛЬНО
Legendaxe
approved these changes
Oct 13, 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.
Что этот PR делает
Мерж апстрима.
Changelog
🆑 ParadiseSS13
add: Священнику добавлено кадило. Находится в его шкафчике.
add: Добавлен мех "Nkarrdem" - специализированный мех для уборщика.
add: БСХ: Добавлено наложение пользовательского интерфейса, срабатывающее при враждебном вмешательстве.
tweak: Гравген, консоль оповещения атмоса, консоль управления атмосом, монитор камер инженерии, консоль оповещения станции теперь определяют соответствующие области и устройства в зависимости от области, на которой они размещены, вместо хардкод проверки того, что вещи находятся на станции.
tweak: Пересмотр стартового снаряжения для шахтеров и исследователей. Пересмотр наполнения их вендоров. Подробная информация здесь.
tweak: Assault belt теперь может вмещать вещи СБ. Security belt теперь можно хранить рацию, а security webbing и judo belt стали немного вместительнее.
tweak: Стиль сообщений в окошках examine, admin/mentor pm/ticket и прочие немного обновили свой дизайн.
tweak: БСХ: Заменена система уровней на прямой ввод энергии.
fix: БСХ: Исправлена ошибка, из-за которой на высоких уровнях мощности спавнилось недостаточное количество дополнительных порталов.
fix: Атмосферные тревоги теперь правильно отображаются на своих консолях атмоса.
fix: Аномалии СМ больше не генерируются внутри структур.
fix: Фрукты Банго теперь можно мутировать из какао.
fix: Магботы теперь работают как и задумано - будучи надетыми.
fix: Исправлены невидимые мобы советов.
fix: Исправление ошибок, связанных с тем, что машинерия не регистрировались в новой зоне powernet.
fix: Исправлено единоразовое (вместо постоянного) проигрывание анимации левитации при отсутствии гравитации.
fix: Малф ИИ больше не присваивается Синди-организация. Без геймплейных изменений.
/:cl: