update newmaps branch #16
Merged
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
Adds a check during wielding to see if the code is running clientside, and if so skip the part responsible for creating the virtual items. This is necessary because TrySpawnVirtualItem is blocked from running clientside, so trying to spawn the virtual items for wielding causes the client to always believe the wield has failed. This erroneous failure leads to the display of incorrect feedback until the server's successful wield attempt makes it to the client. The added check prevents wielding from failing in this way and therefore allows the client to behave as expected.
Update play time on admin panel player tab after db loads
Make Drozd and C-20r not unwield on use
These contain restocks for multiple vendors, so change the name and description to reflect this.
… on (#28768) * uh... * fix * alright, there we go * Revert "alright, there we go" This reverts commit 448180bfa58cc24c42a4d59ef34c017b9941f37b. * Make lasers not hit certain objects and lying mobs unless clicked on * comment * Update Content.Server/Weapons/Ranged/Systems/GunSystem.cs * an l vanished? --------- Co-authored-by: metalgearsloth <[email protected]>
Add trailing comments on multiline lists.
* Move SleepingSystem to Shared & cleanup * Remove empty OnShutdown handler
gives it gatheringprojectile
* Add robo control comp, also de-reinforce a lot of walls. * Add Accordia Evac shuttle for Oasis. * Revert "Add robo control comp, also de-reinforce a lot of walls." This reverts commit b6be6b616aa9732b81e02bed76e3c9ae103cf7cb.
* prevent people being pulled from uncuffing themselves * block -> modify duration
Co-authored-by: deltanedas <@deltanedas:kde.org>
adds 2 new space ruins
Replace seconds with minutes
* Fix RoleLoadout equality Knew it was janky but thought SequenceEqual was better than it is so we just do it manually. * Also implement this
* Don't use invalid defaults for loadouts At the time it made more sense but now with species specific stuff it's better to have nothing. * Loadout SetDefault only applies valid loadouts
* Fix incorrect usage of loc string * Make it so you can no longer ahelp someone who is no longer selected
Fix github actions tests
Give NTR Centcom Access
Added Centcom Backpack for Nanotrasen rep
|
Thank you for contributing to the Space Station 14 repository. Unfortunately, it looks like you submitted your pull request from the master branch. We suggest you follow our git usage documentation You can move your current work from the master branch to another branch by doing |
|
RSI Diff Bot; head commit f7153ec merging into f9ea449 Resources/Textures/Mobs/Animals/hamster.rsi
Resources/Textures/Mobs/Animals/mouse.rsi
Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi
Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi
Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi
Resources/Textures/Goobstation/Clothing/Back/Backpacks/centcom.rsi
Resources/Textures/Mobs/Pets/hamlet.rsi
Resources/Textures/Objects/Devices/communication.rsi
Resources/Textures/Objects/Devices/flatpack.rsi
Resources/Textures/Objects/Devices/nuke.rsi
Resources/Textures/Objects/Misc/meteor.rsi
Resources/Textures/Structures/Machines/microwave_syndie.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.
About the PR
Why / Balance
Technical details
Media
Breaking changes
Changelog