Dev #271
Merged
Dev #271
Conversation
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
* Add support for antag-before-job selection * Include logging
polymorph fixes
[pull] upstream from space-wizards:master
cull doublelogging
* Add standard, wallmount and improvised N2 closets, Revived * remove improvised locker * Parent>ID * Undo sprite replacement * Update meta.json --------- Co-authored-by: Velcroboy <[email protected]> Co-authored-by: Milon <[email protected]>
* cryopod and grinder cleanup * lower case name * 4 spaces * prototype clean * looks like there is some kind of test that prevents removing this * grinder too * both should be empty * cleanup
* This commit adds 2 new Rock Anomaly types, Coal and Gold. It also adds Resource Crabs, colored crystals, and lights for both. * Added crafting recipes for yellow and black light tubes. Somehow I forgot that the first time. * Sorted tags.yml alphabetically this time instead of not doing that. * Updated Texture Copyright information * Attempted to fix Merge Conflict * Added bulb light variants for both yellow and black crystals.
* Adds in-hand sprites to the barber scissors. * adds in-hand sprites to the floodlight. * adds in-hand sprites to the gas analyzer. * adds in-hand sprites to the gps. * Update copyright wording, linting * resprite gps inhand sprites. * adds in-hand sprites to the mass scanner. * adds in-hand sprites to the spray_painter. * resprite in-hand sprites to the mass_scanner. * fix in-hand sprites to the mass_scanner. * Resprite mass_scanner in-hand sprites.
* additionalKeys * Update lava.yml * Update Content.Client/IconSmoothing/IconSmoothComponent.cs --------- Co-authored-by: slarticodefast <[email protected]>
lock nitrous oxide canisters
…ds#35802) * cleanup objectives * remove unrelated access restriction * review
[pull] upstream from space-wizards:master
* Adds popup when firing gun while gun has no ammo * simplify --------- Co-authored-by: slarticodefast <[email protected]>
…ix (space-wizards#35821) * prices + adjustments * teehee
[pull] upstream from space-wizards:master
Biggest change is updating the attributions and links for Sunbeamstress' to reflect the changes in their online profile as the previous link is now a dead link. Updated Comet Haley's link to go directly to Stellardrone's Bandcamp instead of diverting to Free Music Archive Fixed a double the in the comment for Space Asshole
* polymorph fixes * paradox clone * forensics cleanup * bump doors * 4 * attribution * polymorphn't * clean up objectives * Update Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml * review * add virtual items to blacklist * allow them to roll sleeper agent
* Fix the latejoin-antag-deficit bug, add datafield, add logging * Fix multiple roles being made for single-role defs,
[pull] upstream from space-wizards:master
Upstream
|
RSI Diff Bot; head commit 4f009fc merging into b9f1a81 Resources/Textures/Effects/mobspawn.rsi
Resources/Textures/Mobs/Aliens/paradox_clone.rsi
Resources/Textures/Mobs/Elemental/orecrab.rsi
Resources/Textures/Objects/Devices/gps.rsi
Resources/Textures/Objects/Misc/Lights/lights.rsi
Resources/Textures/Objects/Specific/Atmos/gasanalyzer.rsi
Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi
Resources/Textures/Objects/Tools/scissors.rsi
Resources/Textures/Objects/Tools/spray_painter.rsi
Resources/Textures/Structures/Storage/wall_locker.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.
No description provided.