Добавление роли Синего Щита #5
Closed
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
* Add reagent whitelist to Injector component and system * Apply suggested Changes * Remove LINQ function for performance * Update Content.Server/Chemistry/EntitySystems/InjectorSystem.cs Co-authored-by: Ed <[email protected]> --------- Co-authored-by: Ed <[email protected]>
… (#27570) * First clumsy implementation of guidebook protodata * Support for Properties, format strings * Better null * Rename file * Documentation and some cleanup * Handle errors better * Added note about client-side components * A couple of examples * DataFields * Use attributes like a sane person * Outdated doc * string.Empty * No IComponent? * No casting * Use EntityManager.ComponentFactory * Use FrozenDictionary * Cache tagged component fields * Iterate components and check if they're tagged
* doesn't apply traits for borg or ai * add some comment and summaries * weh weh * well ok Co-authored-by: Ed <[email protected]> --------- Co-authored-by: Ed <[email protected]>
* SmartTomato * Fix * RemovingExtraLines * Update Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl Co-authored-by: slarticodefast <[email protected]> * Update Resources/Prototypes/Accents/full_replacements.yml Co-authored-by: slarticodefast <[email protected]> * Update Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml Co-authored-by: slarticodefast <[email protected]> * Update Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml Co-authored-by: slarticodefast <[email protected]> * Update Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml Co-authored-by: slarticodefast <[email protected]> --------- Co-authored-by: Ed <[email protected]> Co-authored-by: slarticodefast <[email protected]>
* Updated sprites for AI HUD * Epic test fail * Merged AGhost actions and AI actions together again. * Seperate comms and bugfix. Fixed broadcast. * Stuffs * Update station_ai.yml * Update station_ai.yml * :| * Update silicon.yml * oopsie daisy * stuff * further stuff * oh my god * Appeasing the gods
* fix missing circuitboard recipes * and another one
If an error occurs while loading a replay, it's *supposed* to show a popup "hey do you wanna continue with error tolerance", and it does do this. But because of spaghetti in the replay state code, it also immediately tries to reload the replay without input, as a consequence of trying to reset to the game's default state. Now the replay load system has a proper game state for "replay load failed", with nice presentation and explicit formatting and 10% less italian cuisine.
* Bruh * well * yes
…s (#27624) * new mutations * translation string fix * add haloperidol to plant * fix * add FoodSequence * food sequence fixes
* Set PDA uplink and music default visibility to false #27376 seems to be the PDA receiving state before first PDA UI open * Log error on PDA state received before first open * Fix logging * Fix error message --------- Co-authored-by: metalgearsloth <[email protected]>
* void hood * reshade * reshade x2 * Update hoods.yml
lzk228
reviewed
Sep 13, 2024
| @@ -4,3 +4,5 @@ ent-ClothingDeathSquadronBackpack = рюкзак эскадрона смерти | |||
| .desc = Вместительный рюкзак использующий технологию БлюСпейс. | |||
| ent-ClothingBackpackCE = рюкзак старшего инженера | |||
| .desc = Технически продвинутый рюкзак. | |||
| ent-ClothingBackpackBlueShield = рюкзак офицера "Синий Щит" | |||
There was a problem hiding this comment.
тут он почему-то в лапках, хотя название должности без
There was a problem hiding this comment.
Ты к тому что лучше название свести к названию роли? Просто как по мне, название не сильно влияет на дело
Co-authored-by: pa.pecherskij <[email protected]>
* network airlock AutoClose * least stupid language * great language --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* Initial commit * review fix
* Make fire leave burnt decals on the tiles * License * Yes * Update * Spelling error * Prototypes reload support * To array
…1501) * adds coord label beneath iff label * fixed wrong coordinate system being used * changes the clamping on the label UI to instead normalise the UI's distance vector from the centre of the screen, fixes corner-hugging * cleaned up if-statement by moving the calc ahead of it * fixed clamping, fixed parenting issue, added draw cull on coord label --------- Co-authored-by: archrbx <[email protected]>
* TEG now checks for power supply before checking for IsFullyBuilt * Update Content.Server/Power/Generation/Teg/TegSystem.cs Co-authored-by: ShadowCommander <[email protected]> --------- Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: ShadowCommander <[email protected]>
* clean up solution regen and drain comps * Tape applied. * Update Content.Server/Chemistry/Components/SolutionRegenerationComponent.cs Co-authored-by: Tayrtahn <[email protected]> * remain entity * That has to be a rogue test fail. --------- Co-authored-by: Tayrtahn <[email protected]>
* Make status effect networking not use `TryAddStatusEffect` * a
…eam-sync # Conflicts: # .github/workflows/publish.yml # Resources/Prototypes/Datasets/Names/ai.yml # Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml # Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml # Resources/ServerInfo/Guidebook/Security/Defusal.xml # Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
* Move placeable check to PlaceableSurfaceSystem This check stops entities from being inserted into a storage entity when it has a PlaceableSurfaceComponent. The entity is instead placed on top of the entity like a table. * Move SetPlaceable to PlaceableSurfaceSystem * Update to transform system and consolidate code * Fix interaction with storage that has a placeable component * deadlock --------- Co-authored-by: metalgearsloth <[email protected]>
* Back in the saddle again! <(8o) * if you like my STYLE you should see my SHEETS ;-) * stylesheet change works for ItemStatusNotHeld but broken for ItemStatus. Just using xaml for now. * teehee * beeg --------- Co-authored-by: metalgearsloth <[email protected]>
* Filter Set Outfit menu to exclude loadout sets * Apply loadouts to job outfits * Use appropriate species for Urists * squishy --------- Co-authored-by: metalgearsloth <[email protected]>
…-sync Upstream sync
Удаление лимита времени для доступа к стартовым ролям.
Co-authored-by: lapatison <[email protected]> Co-authored-by: NotSoDamn <[email protected]> Co-authored-by: lzk <[email protected]>
|
Ладно, думаю перед сном чинить это было плохой идеей :P |
AwareFoxy
pushed a commit
to AwareFoxy/space-station-14-next
that referenced
this pull request
Oct 16, 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
Данный ПР создан для добавления, хоть и заезженной роли Синего Щита, новой роли в сборку проекта, выглядит он конечно иначе, чем у других проектов, где он реализован. А соответственно он имеет свое место быть.
Ну и главное, мое дело сделать, другое дело одобрить и внедрить.
Подчеркиваю. Этот ПР добавляет роль, вещи и спавнер для роли, однако нигде она не используется и не была добавлена. Что может быть в будущем будет поправлено.
Остальное не от меня зависит, вот так вот.
Медиа
Выглядит ОСЩ вот так
🆑