Upstream merge 8 #196
Merged
Upstream merge 8 #196
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
This reverts commit 6a9e5e9.
The access configurator programs the access levels of any access reader. To use the access configurator, players must: - Insert an ID card - Click a nearby entity with an access reader with the access configurator in hand - Change the access list Note that players only need one of the access levels listed on the device to lock/unlock it, but will only be able to alter access settings when they all of the access levels listed on the device For example, an airlock which has 'Science' and 'Engineering' access listed can be opened by any player with either 'Science' or 'Engineering' access. However, to change the access settings on this airlock, a player must have both 'Science' and 'Engineering' access. This is to prevent people from easily breaking into secure areas with this tool, by adding one of their own access levels to the target device Obviously, the most useful ID card to use with this tool is one with all access, since it can change the settings of any device. Removing all access requirements from a device will make it useable by anyone. --------- Co-authored-by: Kevin Zheng <[email protected]>
* Maintenance fluffing * And the gas analyzer
Disables wheelchair trait, vehicle code needs to be fixed
* saltern teg groundworks * pro totype --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
…zards#18898) * replaces CEV=eris rock sprites with /tg/ ones, removes mountainrock, adds ironrock * phew... good thing i'm purple * Update Resources/Prototypes/Entities/Structures/Walls/asteroid.yml Co-authored-by: Vordenburg <[email protected]> --------- Co-authored-by: Vordenburg <[email protected]>
* changes * fix test fail hopefully * disallow eating containers * no more eating stored stuff
While here, change the crates that look plastic to actually be made of plastic so they don't reflect.
Apparently trying to anchor an entity twice throws an assert!
I'm not entirely sure what happens, I know it's markings being loaded from DB with the same ID as a prototype that was modified don't jive, but I'm not entirely sure if it's the best fix.
* Adds Sechud to lockers and sec techfab * Add sechud to HOS lockers.
* Adds the ability to better protect to the internal wiring of airlocks - Achieved by opening the maintenance panel, adding either steel or plasteel to the airlock, then welding the plate in place - To access the wiring, the plating must be cut with a welder and then pried out with a crowbar * Code revisions - Cleaned up the code - Cutting the security grille can now shock you - Atmospherics and Security dept airlocks start with a medium level of protection (a welded steel plate) - Command dept airlocks start with a high level of protection (a welded plasteel plate and electrified security grille) * Code revision - Accounted for a potentially null string * Update Content.Server/Construction/Completions/AttemptElectrocute.cs Co-authored-by: Slava0135 <[email protected]> * Update ChangeWiresPanelSecurityLevel.cs Adjusted scope * Update Content.Shared/Wires/SharedWiresSystem.cs Co-authored-by: Slava0135 <[email protected]> * Update Content.Shared/Wires/SharedWiresSystem.cs Co-authored-by: Slava0135 <[email protected]> * Update ChangeWiresPanelSecurityLevel.cs Removed get / setter and added [ValidatePrototypeId] attribute * Update ChangeWiresPanelSecurityLevel.cs Set security level to "Level0" as the default * Update airlock.yml Removed 'super max' level of security * Update WiresPanelSecurityLevelPrototype.cs * Update WiresSystem.cs Added check for WiresAccessible to OnInteractUsing * Update AttemptElectrocute.cs File scoped namespace * Update ChangeWiresPanelSecurityLevel.cs File scoped namespace * Update AirlockSystem.cs File scoped namespace * Update SharedWiresSystem.cs Removed boiler plate 'OnGetState' and 'OnHandleState' * Update WiresPanelComponent.cs Implemented AutoGenerateComponentState * Removed unnecessary usage references * use TryCloseAll when wires not accessible * minor changes to AttemmptElectrocute * lets try all 7 levels * fix indent in airlock graph * fix indent 2 --------- Co-authored-by: Slava0135 <[email protected]> Co-authored-by: Slava0135 <[email protected]>
* remove request computer board steal objective * this thing, too
github-actions
bot
added
Changes: Localization
Changes: Map
Changes: Sprites
Changes: UI
labels
|
RSI Diff Bot; head commit d7d3e8f merging into 6d507ab Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi
Resources/Textures/Mobs/Customization/human_hair.rsi
Resources/Textures/Objects/Devices/nuke.rsi
Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi
Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi
Resources/Textures/Structures/Walls/asteroid_rock.rsi
Resources/Textures/Structures/Walls/mountain_rock.rsi
Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi
Resources/Textures/Objects/Consumable/Food/condiments.rsi
Resources/Textures/Objects/Tools/access_configurator.rsi
Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi
Resources/Textures/Structures/Walls/rock.rsi
|
|
Оффы сломали тесты, на локалке проходят все кроме двух поломанных оффами. |
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
мерж обновлений с апстрима (фикс identity)
Медиа
Проверки
Изменения
🆑 TheArturZh