Fix Shoukou #540
Merged
Fix Shoukou #540
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
- Удалён станбатон с моста - Бригмеду добавлена каталка - Реформа оружейки: убраны 2 коробки .20 с резиной, все патроны теперь на 1 стойке, добавлен ящик с материалами для техфаба СБ, добавлен 1 вектор, джетпаки перенесены в хранилища скафандров СБ и на месте их стойки есть ящик с имплантами Щит Разума - В мед добавлен готовый каркас машины (т. к. у ГВ теперь плата а не готовая клонёрка) - В РнД добавлен автолат (без него совсем туго) и ещё немного материалов в защищённом ящике - Добавлен ещё 1 шкаф биозащитного костюма вирусологии в меде - В комнате с инструментами убрано немного материалов, добавлен пластик и 2 тулбокса - На мосту консоль станционного учёта заменена на консоль ID карт, сломанная консоль на консоль заказа грузов, а консоль медицинских карт заменена на консоль контроля питания - В РнД добавлено ещё 2 шкафа учёных, добавлено кресло в артефактной, в кабинет НРа добавлена консоль исследований - В инженерный отдел в комнате с ДАМ добавлен 1 мини П.А.К.М.А.Н.
- Добавлены 2 камеры в комнате брифинга СБ и комнате ГСБ - ИИ добавлен ещё 1 генератор, теперь он имеет стабильное питание
- Максимальное количество игроков для этой карты уменьшено до 50 - Уменьшено максимальное количество учёных и инженеров
Kirillcas
approved these changes
Mar 31, 2024
|
Откуда взялся этнтити |
DedokEzio
added a commit
to DedokEzio/space-station-14
that referenced
this pull request
Apr 1, 2024
* Fix guardian damage transfer (#26541) * Automatic changelog update * Refactor FTL time tracking code to fix a UI bug (#26538) The FTL UI on the shuttle console would reset the FTL progress bar every time you open it. This is because the server only sends "time until completion", not a start/end time. The FTL code now uses a separate start/end time so the exact same progress bar can be preserved. For convenience, I made a StartEndTime record struct that stores the actual tuple. This is now used by the code and has some helpers. * Revert "Fix scram implant's teleportation out of containers" (#25030) * Revert "Fix scram implant's teleportation out of containers (#24827)" This reverts commit d4434db. * Remove EntityQuery<T> pass-ins * Split GasTileOverlaySystem update over two ticks (#26542) Split GasTileOverlaySystem update over ticks * Industrial Reagent Grinder (#25020) * all work done * adress whitespace * millions must factorio * conflict fix * i forgot * Automatic changelog update * Zippable coats (#26494) * Update base_clothingouter.yml * Update coats.yml * Change Flipped to Opened * labcoat * coat * Update meta.json * Update meta.json * Update meta.json * Update meta.json * Update meta.json * Update meta.json * Update meta.json * cmo * gene * rd * robo * sci * viro * Locale zip-unzip * Missing meta * Fix wrong sprites * Fix itemslots swapping (#25634) Fix itemslots prediction * Automatic changelog update * Stop items that are being pulled from spinning (#26504) * Fixed pulled items spinning when moved * edited out others issues * more reverts * requested fix * Removed "Optional:" * Automatic changelog update * Hyposprays Draw from Jugs (#25544) * Hyposprays Draw from Jugs * Fix last onlyMobs usage in yml * Some Suggested Changes * Remove unnecessary datafield name declarations * Remove unnecessary dirtying of component * Same line parentheses * Added client-side HypospraySystem * Cache UI values and only updates if values change * empty line * Update label * Label change * Reimplement ReactionMixerSystem * Remove DataField from Hypospray Toggle Mode * Change ToggleMode from enum to Bool OnlyAffectsMobs * Add DataField required back since it's required for replays...? * update EligibleEntity and uses of it * Add user argument back * Adds newline Co-authored-by: metalgearsloth <[email protected]> * Guard for dirty entity * Adds summary tag --------- Co-authored-by: Plykiya <[email protected]> Co-authored-by: metalgearsloth <[email protected]> * Rebalance amatoxin so it is a slower killer (#25830) * Balancing? Balancing!!! * Additional changes * Automatic changelog update * Automatic changelog update * Atmos device performance improvements (#26493) * Atmos device performance improvements * AtmosDirection perf improvements * Fix errors * Add GasTileOverlayComponent arguments * Make excite no longer invalidate a tile * Adjust syndicate hardbomb damage (#26548) hardbomb tweaks * Automatic changelog update * up stimulants (no sleep) (#25886) * up stimulants (no sleep) * Update SharedSleepingSystem.cs * Automatic changelog update * Make BaseMedicalPDA abstract (#26567) * Fix GasMixers/Filters not working (#26568) * Fix GasMixers/Filters not working * OKAY GAS FILTERS TOO --------- Co-authored-by: Plykiya <[email protected]> * Industrial Reagent Grinder Hotfix (#26571) fixed * [MapUpdate] Avrite (#2006) * Give stores the ability to check for owner only (#26573) adds a check if the store belongs to the user * Fix round start crash (causing instant restart) (#26579) * Fix round start crash * Make `TryCreateObjective` more error tolerant * Update engine to v217.1.0 (#26588) * Fix initial infected icon hiding (#26585) * Fix Meta evac shuttle name (#26587) * Make timer ignore client predict setting (#26554) * Make timer ignore client predict setting * making tests run --------- Co-authored-by: wrexbe <[email protected]> * Make advertise system survive no map inits (#26553) * Make advertise system survive no map inits * Add comment to try prevent future bugs * Update Credits (#26589) Co-authored-by: PJBot <[email protected]> * Fix fox spawn on reach (#26584) Co-authored-by: wrexbe <[email protected]> * Removes SCAF armor (#26566) * removes scaf armor * replace maint loot spawner spot with basic helmet * Update Patrons.yml (#26578) * Automatic changelog update * Make aghost command work on other players using optional argument (#26546) * Translations * Make aghost command work on other players using optional argument * Reviews * Automatic changelog update * Add new component to Make sound on interact (#26523) * Adds new Component: EmitSoundOnInteractUsing * Missed an import * File-scoping * Replace ID check with Prototype check * Moved component and system to shared. Set prediction to true. * Removed impoper imports and changed namespace of component to reflect changed folder. * Following function naming theme * All this code is basically deltanedas's, but it was a learning experience for me * Update Content.Shared/Sound/Components/EmitSoundOnInteractUsingComponent.cs * Update Content.Shared/Sound/Components/EmitSoundOnInteractUsingComponent.cs --------- Co-authored-by: metalgearsloth <[email protected]> * Increase syndi duffelbag storage (#26565) * Increase syndi duffelbag storage * weh * Automatic changelog update * Adds construction/decon graphs for plastic flaps (#26341) * Adds construction/decon graphs for plastic flaps * Dang arbitrage * undo conflict --------- Co-authored-by: Velcroboy <[email protected]> * Automatic changelog update * Makes secglasses roundstart (#26487) * makes secglasses roundstart * fix epic fail * fix tests questionmark? * Update Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml Co-authored-by: Nemanja <[email protected]> --------- Co-authored-by: Nemanja <[email protected]> * Automatic changelog update * Toilet Upgrade (needs review) (#22133) * Toilet Draft * fixes * toilets now have secret stash to place items in cistern. * fixes * plungers now unblock toilets. * fix sprite * new sprites and fix * fixes * improve seat sprites. * fix * removed visualisersystem changed to genericvisualizers * flush sound for toilets and copyright for toilet sprites. * fix atrributions * fixes * fix datafield flushtime * sprite improvements * fixes * multiple changes * fix * fix * fixes remove vv * moved stash related functions to secret stash system from toilet. * fix * fix * changes for recent review. * fix * fix * Automatic changelog update * Uplink store interface searchable with a searchbar. (#24287) * Can now search the uplink store interface with a searchbar. * Search text updates no longer send server messages. Persists listings locally. * Formatting fixes and tidying. * Added helper method to get localised name and description (or otherwise, entity name and description) of store listing items. * Update Content.Client/Store/Ui/StoreMenu.xaml * Review change; moved localisation helper functions to their own class. * Prevent thread-unsafe behaviour as-per review. * Remove dummy boxcontainer --------- Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: metalgearsloth <[email protected]> * Automatic changelog update * Improved RCDs (#22799) * Initial radial menu prototyping for the RCD * Radial UI buttons can send messages to the server * Beginning to update RCDSystem * RCD building system in progress * Further updates * Added extra effects, RCDSystem now reads RCD prototype data * Replacing tiles is instant, multiple constructions are allowed, deconstruction is broken * Added extra functionality to RadialContainers plus documentation * Fixed localization of RCD UI strings * Menu opens near cursor, added basic RCD * Avoiding merge conflict * Implemented atomized construction / deconstruction rules * Increased RCD ammo base charges * Moved input context definition to content * Removed obsoleted code * Updates to system * Switch machine and computer frames for electrical cabling * Added construction ghosts * Fixed issue with keybind detection code * Fixed RCD construction ghost mispredications * Code clean up * Updated deconstruction effects * RCDs effects don't rotate * Code clean up * Balancing for ammo counts * Code clean up * Added missing localized strings * More clean up * Made directional window handling more robust * Added documentation to radial menus and made them no longer dependent on Content * Made radial containers more robust * Further robustness to the radial menu * The RCD submenu buttons are only shown when the destination layer has at least one children * Expanded upon deconstructing plus construction balance * Fixed line endings * Updated list of RCD deconstructable entities. Now needs a component to deconstruct instead of a tag * Bug fixes * Revert unnecessary change * Updated RCD strings * Fixed bug * More fixes * Deconstructed tiles/subflooring convert to lattice instead * Fixed failed tests (Linux doesn't like invalid spritespecifer paths) * Fixing merge conflict * Updated airlock assembly * Fixing merge conflict * Fixing merge conflict * More fixing... * Removed erroneous project file change * Fixed string handling issue * Trying to fix merge conflict * Still fixing merge conflicts * Balancing * Hidden RCD construction ghosts when in 'build' mode * Fixing merge conflict * Implemented requested changes (Part 1) * Added more requested changes * Fix for failed test. Removed sussy null suppression * Made requested changes - custom construction ghost system was replaced * Fixing merge conflict * Fixed merge conflict * Fixed bug in RCD construction ghost validation * Fixing merge conflict * Merge conflict fixed * Made required update * Removed lingering RCD deconstruct tag * Fixing merge conflict * Merge conflict fixed * Made requested changes * Bug fixes and balancing * Made string names more consistent * Can no longer stack catwalks * Automatic changelog update * Update submodule to 217.2.0 (#26592) * Southern accent (#26543) * created the AccentComponent and the AccentSystem * word replacement schtuhff * made it a trait fr ongg!!1 * Update Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs --------- Co-authored-by: metalgearsloth <[email protected]> * Prevent storing liquids in equipped buckets (#24412) * Block access to solutions in equipped spillables. * Stop Drink verb appearing if the solution can't be accessed. * Automatic changelog update * Fix 'Hypopen shouldn't display solution examine text' (#26453) * stealthy hypo * ExaminableSolution hand check when in covert implement. ExaminableSolution now has 'hidden' datafield to enable chemical inspection only in hand. * cleaning code * more cleaning * Hidden datafield renamed to HeldOnly * review --------- Co-authored-by: metalgearsloth <[email protected]> * Automatic changelog update * Revert Paint (#26593) * Revert "Fix build (#26258)" This reverts commit 6de5fbf. * Revert "Spray Paint (Review Ready) (#23003)" This reverts commit e4d5e7f. # Conflicts: # Resources/Prototypes/Entities/Structures/Holographic/projections.yml * Fix: Prevent single-use hyposprays from getting the toggle draw verb (#26595) Prevent single-use hyposprays from getting the toggle draw verb Co-authored-by: Plykiya <[email protected]> * MeleeHitSoundSystem (#25005) * Began work to unscrew melee noises * finished * cleanup * cleanup * Update Content.Server/Weapons/Melee/MeleeWeaponSystem.cs Co-authored-by: Ed <[email protected]> * _Style * Fix merge --------- Co-authored-by: Ed <[email protected]> Co-authored-by: metalgearsloth <[email protected]> * Remove physics comp from VendingMachineWallmount (#25632) * Remove physics comp from VendingMachineWallmount * Fixtures removal --------- Co-authored-by: Jeff <[email protected]> Co-authored-by: metalgearsloth <[email protected]> * Remake hairflowers (#25475) * Add more lily usage (orange hairflower and flowercrown) * comit 2 * ee * more fixes * w * im stupid * bring poppy in authodrobe * weh --------- Co-authored-by: metalgearsloth <[email protected]> * Automatic changelog update * Injector UI shows TransferAmount change, Spilling liquid changes Injector mode (#26596) * Injector UI shows TransferAmount change, spill changes mode * Update Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs * Update Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs --------- Co-authored-by: Plykiya <[email protected]> Co-authored-by: metalgearsloth <[email protected]> * Update submodule to 217.2.1 (#26599) * disallow unanchoring or opening panels on locked emitters/APEs (#26600) * disallow unanchoring or opening panels on locked emitters/APEs * no locking open panels * oops * needback feedback * Update Content.Shared/Lock/LockSystem.cs * Update Content.Shared/Lock/LockSystem.cs * Update Content.Shared/Lock/LockSystem.cs * sanity --------- Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: metalgearsloth <[email protected]> * Automatic changelog update * Fix grave digging sound indefinitely playing if dug by aghost. (#26420) Admins bypass doafters. As such, the code that runs on doafter completion is ran before the sound is actually created. This then leads to the sound never being stopped, and as such it would infinitely play. This commit gets around the issue by manually stopping the sound should the doafter fail to start. If we could be sure that the doafter would never fail, then we could just move the call to StartDigging above starting the doafter but this is currently not possible. Co-authored-by: metalgearsloth <[email protected]> * Make the buttons on the map ui not squished (#26604) Make the map ui work Co-authored-by: wrexbe <[email protected]> * Combine flower crown and wreath (#26605) * Combine flower crown and wreath * huh * huuh* Automatic changelog update * Add AP damage to throwing knives (#26380) * add * ap * no more stam dmg * Automatic changelog update * cancelable brig timers (#26557) brig timers now cancelable. also some screensystem yakshave * Fix orientation of roller skate sprites (#26627) Co-authored-by: Eoin Mcloughlin <[email protected]> * Automatic changelog update * Fix GastTileOverlay sending redundant data (#26623) Fix GastTileOverlay not updating properly * Auto DeAdmin sooner (#26551) Co-authored-by: wrexbe <[email protected]> * Add briefcase to curadrobe and lawdrobe, and some briefcases cleanup (#26527) * Add briefcase to curadrobe and some briefcases cleanup * also add to lawdrobe * Automatic changelog update * upd * Fix Shoukou (Rxup#540) * Update shoukou.yml - Удалён станбатон с моста - Бригмеду добавлена каталка - Реформа оружейки: убраны 2 коробки .20 с резиной, все патроны теперь на 1 стойке, добавлен ящик с материалами для техфаба СБ, добавлен 1 вектор, джетпаки перенесены в хранилища скафандров СБ и на месте их стойки есть ящик с имплантами Щит Разума - В мед добавлен готовый каркас машины (т. к. у ГВ теперь плата а не готовая клонёрка) - В РнД добавлен автолат (без него совсем туго) и ещё немного материалов в защищённом ящике - Добавлен ещё 1 шкаф биозащитного костюма вирусологии в меде - В комнате с инструментами убрано немного материалов, добавлен пластик и 2 тулбокса - На мосту консоль станционного учёта заменена на консоль ID карт, сломанная консоль на консоль заказа грузов, а консоль медицинских карт заменена на консоль контроля питания - В РнД добавлено ещё 2 шкафа учёных, добавлено кресло в артефактной, в кабинет НРа добавлена консоль исследований - В инженерный отдел в комнате с ДАМ добавлен 1 мини П.А.К.М.А.Н. * Update shoukou.yml - Добавлены 2 камеры в комнате брифинга СБ и комнате ГСБ - ИИ добавлен ещё 1 генератор, теперь он имеет стабильное питание * Update shoukou map prototype - Максимальное количество игроков для этой карты уменьшено до 50 - Уменьшено максимальное количество учёных и инженеров * upd * hotfix * Update cargo.yml * Update cargo.yml * Update briefcases.yml * Update briefcases.yml --------- Co-authored-by: Alice "Arimah" Heurlin <[email protected]> Co-authored-by: PJBot <[email protected]> Co-authored-by: Pieter-Jan Briers <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: Leon Friedrich <[email protected]> Co-authored-by: Boaz1111 <[email protected]> Co-authored-by: SonicHDC <[email protected]> Co-authored-by: Zealith-Gamer <[email protected]> Co-authored-by: Plykiya <[email protected]> Co-authored-by: Plykiya <[email protected]> Co-authored-by: EdenTheLiznerd <[email protected]> Co-authored-by: liltenhead <[email protected]> Co-authored-by: takemysoult <[email protected]> Co-authored-by: lzk <[email protected]> Co-authored-by: Syxapik <[email protected]> Co-authored-by: keronshb <[email protected]> Co-authored-by: Wrexbe (Josh) <[email protected]> Co-authored-by: wrexbe <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Flareguy <[email protected]> Co-authored-by: DrSmugleaf <[email protected]> Co-authored-by: Simon <[email protected]> Co-authored-by: blueDev2 <[email protected]> Co-authored-by: Velcroboy <[email protected]> Co-authored-by: Velcroboy <[email protected]> Co-authored-by: Nemanja <[email protected]> Co-authored-by: brainfood1183 <[email protected]> Co-authored-by: J. Brown <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: chromiumboy <[email protected]> Co-authored-by: UBlueberry <[email protected]> Co-authored-by: Tayrtahn <[email protected]> Co-authored-by: drteaspoon420 <[email protected]> Co-authored-by: Bixkitts <[email protected]> Co-authored-by: Ed <[email protected]> Co-authored-by: nikthechampiongr <[email protected]> Co-authored-by: Ubaser <[email protected]> Co-authored-by: avery <[email protected]> Co-authored-by: eoineoineoin <[email protected]> Co-authored-by: Eoin Mcloughlin <[email protected]> Co-authored-by: Zack Backmen <[email protected]> Co-authored-by: Roudenn <[email protected]>
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
Данный ПР вносит небольшие правки в карту Shoukou, немного меняя лут и делая её чуть приятнее для игры.
Список ВСЕХ изменений:
Изменения в прототипе карты:
(Карта не столь большая, потому много игроков на ней просто не поместится)
Медиа
Проверки