Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream merge 8 #196

Merged
merged 67 commits into from
Aug 10, 2023
Merged

Upstream merge 8 #196

merged 67 commits into from
Aug 10, 2023

Commits on Aug 8, 2023

  1. Configuration menu
    Copy the full SHA
    4509312 View commit details
    Browse the repository at this point in the history
  2. Add access configurator (space-wizards#18638)

    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]>
    chromiumboy and Partmedia committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    2df7079 View commit details
    Browse the repository at this point in the history
  3. Automatic changelog update

    PJBot committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    2196dd2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b84b88d View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2714101 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    375f487 View commit details
    Browse the repository at this point in the history
  7. Automatic changelog update

    PJBot committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    2597668 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    07f932a View commit details
    Browse the repository at this point in the history
  9. Automatic changelog update

    PJBot committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    2401002 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    181086b View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2023

  1. Add More Fluff To Maintenance Spawners (space-wizards#18895)

    * Maintenance fluffing
    
    * And the gas analyzer
    Nairodian committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    a99f1da View commit details
    Browse the repository at this point in the history
  2. Automatic changelog update

    PJBot committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    88988ff View commit details
    Browse the repository at this point in the history
  3. Disable wheelchair trait (space-wizards#18896)

    Disables wheelchair trait, vehicle code needs to be fixed
    QuietlyWhisper committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    68018ee View commit details
    Browse the repository at this point in the history
  4. Automatic changelog update

    PJBot committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    7381a03 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    4775fd4 View commit details
    Browse the repository at this point in the history
  6. Automatic changelog update

    PJBot committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    cf14383 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    50f0d10 View commit details
    Browse the repository at this point in the history
  8. saltern teg groundworks and comms fix (space-wizards#18849)

    * saltern teg groundworks
    
    * pro totype
    
    ---------
    
    Co-authored-by: deltanedas <@deltanedas:kde.org>
    deltanedas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    7489d90 View commit details
    Browse the repository at this point in the history
  9. Replaces CEV-Eris style rocks with SS13 ones, adds Ironrock (space-wi…

    …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]>
    Flareguy and Vordenburg committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    45c69f1 View commit details
    Browse the repository at this point in the history
  10. Automatic changelog update

    PJBot committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    61f546d View commit details
    Browse the repository at this point in the history
  11. small moth changes (space-wizards#18810)

    * changes
    
    * fix test fail hopefully
    
    * disallow eating containers
    
    * no more eating stored stuff
    LankLTE committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    6b2fef1 View commit details
    Browse the repository at this point in the history
  12. Automatic changelog update

    PJBot committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    b354688 View commit details
    Browse the repository at this point in the history
  13. Make metal crates reflect energy projectiles (space-wizards#18884)

    While here, change the crates that look plastic to actually be made of plastic so they don't reflect.
    Vordenburg committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    e3f491c View commit details
    Browse the repository at this point in the history
  14. Fix assert when arming the nuke (space-wizards#18891)

    Apparently trying to anchor an entity twice throws an assert!
    PJB3005 committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    9124c60 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    c12fd36 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    1856d6a View commit details
    Browse the repository at this point in the history
  17. Automatic changelog update

    PJBot committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    383c284 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    c4067df View commit details
    Browse the repository at this point in the history
  19. Automatic changelog update

    PJBot committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    47f53c8 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    a8c9158 View commit details
    Browse the repository at this point in the history
  21. Automatic changelog update

    PJBot committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    aee88e1 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    d3244b6 View commit details
    Browse the repository at this point in the history
  23. Automatic changelog update

    PJBot committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    22f82c0 View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    5b2d20b View commit details
    Browse the repository at this point in the history
  25. vehicles cannot be shot (space-wizards#18910)

    Co-authored-by: deltanedas <@deltanedas:kde.org>
    deltanedas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    c5af5c1 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2023

  1. fix hair (space-wizards#18931)

    Emisse committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    a78aa42 View commit details
    Browse the repository at this point in the history
  2. qm turtleneck (space-wizards#18909)

    * qm alt clothes your mom
    
    * textures
    
    * retrieve textures from the void
    
    * Update heads.yml
    
    * resprite to fit
    
    * fixe sides quick
    
    * fixe a hole
    
    * why is this hole here
    
    * why does this happen to me
    
    * fixed the weird hole thing
    Emisse committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    71d3689 View commit details
    Browse the repository at this point in the history
  3. qm uniform pants are now khakis (space-wizards#18926)

    * khakis
    
    * flareguy appeasemtn
    
    * high contrast
    Emisse committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    ac71bf8 View commit details
    Browse the repository at this point in the history
  4. Improved Coloring Layers For Moth Wings (space-wizards#18929)

    * Improved layers
    
    * Removed excess PNGs
    Nairodian committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    4d2c039 View commit details
    Browse the repository at this point in the history
  5. Automatic changelog update

    PJBot committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    75c2e41 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    3457729 View commit details
    Browse the repository at this point in the history
  7. Automatic changelog update

    PJBot committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    e4bfb27 View commit details
    Browse the repository at this point in the history
  8. Botany tweaks vol. 2 (space-wizards#18888)

    * Even more consumption
    
    * Revert "Even more consumption"
    
    This reverts commit 94ae0ec.
    
    Oops forgot a file
    
    * Believe it or not, more nutrient consumption
    
    * Buff ez nutrient and l4z
    
    * Add left 4 zed to emagged nutrimax just because
    
    * Change some thresholds
    Doru991 committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    30f0ad2 View commit details
    Browse the repository at this point in the history
  9. Automatic changelog update

    PJBot committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    b688a06 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    59e32b8 View commit details
    Browse the repository at this point in the history
  11. Automatic changelog update

    PJBot committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    d951064 View commit details
    Browse the repository at this point in the history
  12. Fix marking color bands (space-wizards#18934)

    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.
    metalgearsloth committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    1f3a4be View commit details
    Browse the repository at this point in the history
  13. Automatic changelog update

    PJBot committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    705a5e9 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    9da4679 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    267783b View commit details
    Browse the repository at this point in the history
  16. Automatic changelog update

    PJBot committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    c6bfea6 View commit details
    Browse the repository at this point in the history
  17. Adds Sechud to lockers and sec techfab (space-wizards#18907)

    * Adds Sechud to lockers and sec techfab
    
    * Add sechud to HOS lockers.
    QuietlyWhisper committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    9550a04 View commit details
    Browse the repository at this point in the history
  18. Automatic changelog update

    PJBot committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    1de28ac View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    5688c40 View commit details
    Browse the repository at this point in the history
  20. Automatic changelog update

    PJBot committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    b789f5a View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    30abda2 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    ab8c550 View commit details
    Browse the repository at this point in the history
  23. Automatic changelog update

    PJBot committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    13991d3 View commit details
    Browse the repository at this point in the history
  24. Hacking protections for airlocks (space-wizards#18894)

    * 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]>
    3 people committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    636819f View commit details
    Browse the repository at this point in the history
  25. Automatic changelog update

    PJBot committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    0964496 View commit details
    Browse the repository at this point in the history
  26. Remove request computer board steal objective (space-wizards#18925)

    * remove request computer board steal objective
    
    * this thing, too
    EmoGarbage404 committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    829f2f8 View commit details
    Browse the repository at this point in the history
  27. Automatic changelog update

    PJBot committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    7e1e761 View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    b2bf492 View commit details
    Browse the repository at this point in the history
  29. Automatic changelog update

    PJBot committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    4b803af View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    5914538 View commit details
    Browse the repository at this point in the history
  31. Post-merge fixes

    TheArturZh committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    b1bd431 View commit details
    Browse the repository at this point in the history
  32. Configuration menu
    Copy the full SHA
    d7d3e8f View commit details
    Browse the repository at this point in the history