merge loadouts#2
Closed
Dutch-VanDerLinde wants to merge 44 commits intoDutch-VanDerLinde:Medical-Loadouts-Completefrom
Closed
merge loadouts#2Dutch-VanDerLinde wants to merge 44 commits intoDutch-VanDerLinde:Medical-Loadouts-Completefrom
Dutch-VanDerLinde wants to merge 44 commits intoDutch-VanDerLinde:Medical-Loadouts-Completefrom
Conversation
Sec And Sci Loadouts
# Conflicts: # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Conflicts: # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
…pace-wizards#26682) Validate wire layout prototypes; delete invalid wirescomponents.
nerf anomaly pulse delays
* Fix rotation of dropped items * combined world position rotation function for dumpable * scuffed implementation? * less scuffed? * even less scuffed... I guess * capital D --------- Co-authored-by: Plykiya <plykiya@protonmail.com>
# Conflicts: # Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
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.
hi