Upstream sync #571
Merged
Upstream sync #571
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 hardhats to loadout. * Update Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml * Update Resources/Prototypes/Loadouts/loadout_groups.yml --------- Co-authored-by: metalgearsloth <[email protected]>
I love lobby code. Refreshing the entire jobs UI doesn't seem to cause issues. At least jobpriorityselector was my fault when I was far fucking stupider writing this shit.
* From Insuzine recipe removed Benzene * Remove ash from Insuzine recipe
* Nukie Medihud REAL adds a new HUD that the nukie agent starts with, does the same shit as the other visor, but with health bars. Also tinted slightly blue to differentiate it. (also medhuds are blue) * the blue-ening makes the icons bluer 'cause someone asked.
* Initial commit. * review --------- Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: metalgearsloth <[email protected]>
* Add craft of beverage jug * Change steel to plastic * Fix price
* namespace * Tidy up the code for selecting random humanoid color
* Content changes for MapManager/System refactor * Poke Tests * Why is this failing? * Will this make the analyzer happy?
…113) * Chatfactor: Chat Repository, Admin Commands, Chat Created Events This addition-only PR covers a repository that stores chat messages. This PR defines what chat messages can be stored, what can be done with those stored messages, and what events occur when the repository does things. This PR also includes to admin commands that show how the repository will be used for administration purposes at first. Because all chat messages will be uniquely identified per round (and, as rounds are uniquely identified, are essentially a GUID) we can delete, amend or nuke messages. Note there's no "amend" command right now. The original chatfactor PR didn't include one, and I'm avoiding further feature bloat with these chatfactor PRs... * Remove an event that shouldn't be in this PR * Resolve PR comments. * Resolve peak goober moment * Also make sure we tell the user why if their delete command fails * Supply a reason if the nukeuserids command is malformed * Tidy messages * Some more docstring tidyup * Imagine tests handling IOC correctly chat * Imagine tests handling IOC correctly chat * Resolve PR comments * Fix goobering with needing to use ToolshedCommand * In which we bikeshed toolshed * loud metal pipe sound effect * One must imagine funny boulder pushing man happy * Move commands to new folder * Mald, seethe, cope. * I hate toolshed I hate toolshed I hate toolshed * Fix command ftls * Bit of tidy-up and a YAGNI removal of a get we don't need yet * Whelp lmao * UserIDs are in a weird fucky state I didn't anticipate, so I've removed the remove-by-userID command for the time being. * Rename ChatRepository to ChatRepositorySystem. * Resolve PR review comments --------- Co-authored-by: Your Name <[email protected]>
* flash buff * oops! * bool * 3 -> 1.5 seconds * okay fix * sluth
Its fixed, but the cryopod is being partially covered by text and the caption is not aligned to the captions next to it. No clue how to fix this, but good enough for me.
* adds a bunch of vox clothing sprites * bird up * bee mask * fix test fails. i hope. this better be the only damn one * fix "eqipped" * A. * outerclohting * ??? --------- Co-authored-by: metalgearsloth <[email protected]>
…er or not the light is powered. (#26932) * Emergency Lights now change color depending on alert level and whether or not they are powered. * Made a condition for null alert level, added summary doc. * Refactored uid and emergencylightcomponent into Entity<EmergencyLightComponent>
* Adds plasma windoors for Armory, Sec, Command * Adds atmos too --------- Co-authored-by: Jeff <[email protected]>
Update chemist.yml
* make tomatoes * many friends! many mommies * finish * renaming system * fix * Update miscellaneous.yml * Update Content.Server/NPC/Systems/NPCImpritingBehaviourSystem.cs Co-authored-by: faint <[email protected]> * N * deleete exception? * merge conflict fix * fix? * fuck you * sloth fixes * fixess? * fix --------- Co-authored-by: faint <[email protected]> Co-authored-by: metalgearsloth <[email protected]>
* no cl no fun * DevPlanet * fix europa? * Update Content.Server/Station/Components/StationBiomeComponent.cs * Update Content.Server/Station/Components/StationBiomeComponent.cs --------- Co-authored-by: metalgearsloth <[email protected]>
* nerfs rds hardsuit to be the size all other hardsuits are * 4x4 > 5x5
* adds non randomized rod velocity * Adds despawn suffix to despawn rod
Redundant getworldpos.
* blank filled slots * Update InventoryTemplatePrototype.cs
* Add evac shuttle test. * Fix typo in comment
* trap * without effect
* added ninja to Antagonists.xml * give the space ninja some love * by the way did you know there are now 25 fiber types? i demand this number get updated with every single PR
* Made more things blessable * Removed junk * Remove whatever that was * Make bowls blessable * New mixablesolution component, converted everything to work with it * Fix minor mishaps * Fix extra spaces in bottle yml * Fix last extra space, fix bottle havign the wrong solution name * Remvoe unneeded event(I think), fix alcohol bottles not being mixable * I missed cans
* Update shards.yml Changed glass shards damage depends on their type, each tier of glass gains 1 more damage, also changed attack rate to 1, because you cant fast swing with weapon that can hurt you * Oops Forgot about base shard * Update shards.yml Cleanup * Update shards.yml Changed damage on step (Attack damage + 1)
* Add medical gloves to loadouts * Realize I don't need to duplicate them * Re-add extra lines * I did it wrong... * Format it back to how it was this time for sure * For real this time * ... * Add sterile masks too * I can't spell officer apparently * Standardize order of where gloves are * Add Nurse Hat to doctors * Remove duplication of gloves and masks * Remove extra space * Name glove protos similiar to other ones * Remove latex gloves proto from medical (sci has it)
Fixes crates masks not allowing them to go under plastic flaps + crates no longer can go trough windoors.
* Windoors now contain proper electronics * weh
…rop organs and correctly put player in ghost (#27114) * Add admin log when someone gets gibbed by a shuttle * Make shuttle gibbing work properly again * Fix immovable rod gibbing, no longer puts you into nullspace * Update Content.Server/ImmovableRod/ImmovableRodSystem.cs * Update Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs --------- Co-authored-by: metalgearsloth <[email protected]>
* Adds the option to fit your viewport to your vertical screenspace * fixes documentation * Removes commented-out leftover * Hides the viewport width slider and also we dont know if the viewport width causing stretching/squishing was a bug present before but we fixed that while we were at it * Removes commented out leftovers
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.
No description provided.