-
Notifications
You must be signed in to change notification settings - Fork 153
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
Upstream merge 8 #196
Commits on Aug 8, 2023
-
Revert "Localize walls (space-wizards#18827)" (space-wizards#18881)
This reverts commit 6a9e5e9.
Configuration menu - View commit details
-
Copy full SHA for 4509312 - Browse repository at this point
Copy the full SHA 4509312View commit details -
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]>
Configuration menu - View commit details
-
Copy full SHA for 2df7079 - Browse repository at this point
Copy the full SHA 2df7079View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2196dd2 - Browse repository at this point
Copy the full SHA 2196dd2View commit details -
Configuration menu - View commit details
-
Copy full SHA for b84b88d - Browse repository at this point
Copy the full SHA b84b88dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2714101 - Browse repository at this point
Copy the full SHA 2714101View commit details -
Configuration menu - View commit details
-
Copy full SHA for 375f487 - Browse repository at this point
Copy the full SHA 375f487View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2597668 - Browse repository at this point
Copy the full SHA 2597668View commit details -
Configuration menu - View commit details
-
Copy full SHA for 07f932a - Browse repository at this point
Copy the full SHA 07f932aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2401002 - Browse repository at this point
Copy the full SHA 2401002View commit details -
Configuration menu - View commit details
-
Copy full SHA for 181086b - Browse repository at this point
Copy the full SHA 181086bView commit details
Commits on Aug 9, 2023
-
Add More Fluff To Maintenance Spawners (space-wizards#18895)
* Maintenance fluffing * And the gas analyzer
Configuration menu - View commit details
-
Copy full SHA for a99f1da - Browse repository at this point
Copy the full SHA a99f1daView commit details -
Configuration menu - View commit details
-
Copy full SHA for 88988ff - Browse repository at this point
Copy the full SHA 88988ffView commit details -
Disable wheelchair trait (space-wizards#18896)
Disables wheelchair trait, vehicle code needs to be fixed
Configuration menu - View commit details
-
Copy full SHA for 68018ee - Browse repository at this point
Copy the full SHA 68018eeView commit details -
Configuration menu - View commit details
-
Copy full SHA for 7381a03 - Browse repository at this point
Copy the full SHA 7381a03View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4775fd4 - Browse repository at this point
Copy the full SHA 4775fd4View commit details -
Configuration menu - View commit details
-
Copy full SHA for cf14383 - Browse repository at this point
Copy the full SHA cf14383View commit details -
Configuration menu - View commit details
-
Copy full SHA for 50f0d10 - Browse repository at this point
Copy the full SHA 50f0d10View commit details -
saltern teg groundworks and comms fix (space-wizards#18849)
* saltern teg groundworks * pro totype --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
Configuration menu - View commit details
-
Copy full SHA for 7489d90 - Browse repository at this point
Copy the full SHA 7489d90View commit details -
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]>
Configuration menu - View commit details
-
Copy full SHA for 45c69f1 - Browse repository at this point
Copy the full SHA 45c69f1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 61f546d - Browse repository at this point
Copy the full SHA 61f546dView commit details -
small moth changes (space-wizards#18810)
* changes * fix test fail hopefully * disallow eating containers * no more eating stored stuff
Configuration menu - View commit details
-
Copy full SHA for 6b2fef1 - Browse repository at this point
Copy the full SHA 6b2fef1View commit details -
Configuration menu - View commit details
-
Copy full SHA for b354688 - Browse repository at this point
Copy the full SHA b354688View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for e3f491c - Browse repository at this point
Copy the full SHA e3f491cView commit details -
Fix assert when arming the nuke (space-wizards#18891)
Apparently trying to anchor an entity twice throws an assert!
Configuration menu - View commit details
-
Copy full SHA for 9124c60 - Browse repository at this point
Copy the full SHA 9124c60View commit details -
Configuration menu - View commit details
-
Copy full SHA for c12fd36 - Browse repository at this point
Copy the full SHA c12fd36View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1856d6a - Browse repository at this point
Copy the full SHA 1856d6aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 383c284 - Browse repository at this point
Copy the full SHA 383c284View commit details -
Configuration menu - View commit details
-
Copy full SHA for c4067df - Browse repository at this point
Copy the full SHA c4067dfView commit details -
Configuration menu - View commit details
-
Copy full SHA for 47f53c8 - Browse repository at this point
Copy the full SHA 47f53c8View commit details -
Configuration menu - View commit details
-
Copy full SHA for a8c9158 - Browse repository at this point
Copy the full SHA a8c9158View commit details -
Configuration menu - View commit details
-
Copy full SHA for aee88e1 - Browse repository at this point
Copy the full SHA aee88e1View commit details -
Configuration menu - View commit details
-
Copy full SHA for d3244b6 - Browse repository at this point
Copy the full SHA d3244b6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 22f82c0 - Browse repository at this point
Copy the full SHA 22f82c0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5b2d20b - Browse repository at this point
Copy the full SHA 5b2d20bView commit details -
vehicles cannot be shot (space-wizards#18910)
Co-authored-by: deltanedas <@deltanedas:kde.org>
Configuration menu - View commit details
-
Copy full SHA for c5af5c1 - Browse repository at this point
Copy the full SHA c5af5c1View commit details
Commits on Aug 10, 2023
-
Configuration menu - View commit details
-
Copy full SHA for a78aa42 - Browse repository at this point
Copy the full SHA a78aa42View commit details -
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
Configuration menu - View commit details
-
Copy full SHA for 71d3689 - Browse repository at this point
Copy the full SHA 71d3689View commit details -
qm uniform pants are now khakis (space-wizards#18926)
* khakis * flareguy appeasemtn * high contrast
Configuration menu - View commit details
-
Copy full SHA for ac71bf8 - Browse repository at this point
Copy the full SHA ac71bf8View commit details -
Improved Coloring Layers For Moth Wings (space-wizards#18929)
* Improved layers * Removed excess PNGs
Configuration menu - View commit details
-
Copy full SHA for 4d2c039 - Browse repository at this point
Copy the full SHA 4d2c039View commit details -
Configuration menu - View commit details
-
Copy full SHA for 75c2e41 - Browse repository at this point
Copy the full SHA 75c2e41View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3457729 - Browse repository at this point
Copy the full SHA 3457729View commit details -
Configuration menu - View commit details
-
Copy full SHA for e4bfb27 - Browse repository at this point
Copy the full SHA e4bfb27View commit details -
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
Configuration menu - View commit details
-
Copy full SHA for 30f0ad2 - Browse repository at this point
Copy the full SHA 30f0ad2View commit details -
Configuration menu - View commit details
-
Copy full SHA for b688a06 - Browse repository at this point
Copy the full SHA b688a06View commit details -
Configuration menu - View commit details
-
Copy full SHA for 59e32b8 - Browse repository at this point
Copy the full SHA 59e32b8View commit details -
Configuration menu - View commit details
-
Copy full SHA for d951064 - Browse repository at this point
Copy the full SHA d951064View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 1f3a4be - Browse repository at this point
Copy the full SHA 1f3a4beView commit details -
Configuration menu - View commit details
-
Copy full SHA for 705a5e9 - Browse repository at this point
Copy the full SHA 705a5e9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9da4679 - Browse repository at this point
Copy the full SHA 9da4679View commit details -
Configuration menu - View commit details
-
Copy full SHA for 267783b - Browse repository at this point
Copy the full SHA 267783bView commit details -
Configuration menu - View commit details
-
Copy full SHA for c6bfea6 - Browse repository at this point
Copy the full SHA c6bfea6View commit details -
Adds Sechud to lockers and sec techfab (space-wizards#18907)
* Adds Sechud to lockers and sec techfab * Add sechud to HOS lockers.
Configuration menu - View commit details
-
Copy full SHA for 9550a04 - Browse repository at this point
Copy the full SHA 9550a04View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1de28ac - Browse repository at this point
Copy the full SHA 1de28acView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5688c40 - Browse repository at this point
Copy the full SHA 5688c40View commit details -
Configuration menu - View commit details
-
Copy full SHA for b789f5a - Browse repository at this point
Copy the full SHA b789f5aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 30abda2 - Browse repository at this point
Copy the full SHA 30abda2View commit details -
Configuration menu - View commit details
-
Copy full SHA for ab8c550 - Browse repository at this point
Copy the full SHA ab8c550View commit details -
Configuration menu - View commit details
-
Copy full SHA for 13991d3 - Browse repository at this point
Copy the full SHA 13991d3View commit details -
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]>
Configuration menu - View commit details
-
Copy full SHA for 636819f - Browse repository at this point
Copy the full SHA 636819fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0964496 - Browse repository at this point
Copy the full SHA 0964496View commit details -
Remove request computer board steal objective (space-wizards#18925)
* remove request computer board steal objective * this thing, too
Configuration menu - View commit details
-
Copy full SHA for 829f2f8 - Browse repository at this point
Copy the full SHA 829f2f8View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7e1e761 - Browse repository at this point
Copy the full SHA 7e1e761View commit details -
Configuration menu - View commit details
-
Copy full SHA for b2bf492 - Browse repository at this point
Copy the full SHA b2bf492View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4b803af - Browse repository at this point
Copy the full SHA 4b803afView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5914538 - Browse repository at this point
Copy the full SHA 5914538View commit details -
Configuration menu - View commit details
-
Copy full SHA for b1bd431 - Browse repository at this point
Copy the full SHA b1bd431View commit details -
Configuration menu - View commit details
-
Copy full SHA for d7d3e8f - Browse repository at this point
Copy the full SHA d7d3e8fView commit details