Upstream23102024 #32976
Closed
Upstream23102024 #32976
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
Midround antag weights
Re-added Crimson's Changes Signed-off-by: Kelderan <66748890+KeldWolf@users.noreply.github.com>
Master fixin
… the entity menu.
Fix Changelog per usual. Signed-off-by: Kelderan <66748890+KeldWolf@users.noreply.github.com>
Starting fresh
…enu.
File Changes:
+ C:\CodeProjects\space-station-14\Resources\Textures\Harmony\Clothing\Neck\Misc\instructormantle.rsi
+ .\equipped-NECK.png
+ .\icon.png
+ .\meta.json
+ C:\CodeProjects\space-station-14\Resources\Prototypes\Harmony\Entities\Clothing\Neck\mantles.yml
Reasoning:
There is no real reason other than that it would be fun for the teach and learn day.
…i/space-station-14 into harmony_instructor_mantle
fixed missing line
Maybe fixed it? Owe Null many thanks?
…ight Upstream merge
Upstream20240912 night
…l. Windows moment.
Added Additional ERT Shuttles
Harmony Instructor Mantle
Harmony Craftable lockable buttons and button frames
Upstream20241016
Changelog update 17102024
Minor rule change and clarification
Xeno Beta 1.3.2
Added labeler to nukie outpost
Anti EORG measures (round end pacifist mode)
Fix Rat King Solo Antag popup
* Revert "Add No EORG popup on round end" * Remove EORG popup CVar
Remove Packed2
Changelog22102024
github-actions
bot
added
Status: Needs Review
|
RSI Diff Bot; head commit 57ddfee merging into 92c49af Resources/Textures/_Harmony/Clothing/Head/Hoods/Coat/hoodcaptainarmored.rsi
Resources/Textures/_Harmony/Clothing/Neck/Misc/instructormantle.rsi
Resources/Textures/_Harmony/Clothing/Neck/Misc/serverpins.rsi
Resources/Textures/_Harmony/Clothing/Neck/Misc/vulturepin.rsi
Resources/Textures/_Harmony/Clothing/OuterClothing/WinterCoats/coatcaparmored.rsi
Resources/Textures/_Harmony/Clothing/Uniforms/Jumpskirt/hop_turtle.rsi
Resources/Textures/_Harmony/Clothing/Uniforms/Jumpsuit/hop_turtle.rsi
Resources/Textures/_Harmony/Decals/Overlays/greyscale.rsi
Resources/Textures/_Harmony/Objects/Consumable/Drinks/aviationcocktail.rsi
Resources/Textures/_Harmony/Objects/Consumable/Drinks/espressomartiniglass.rsi
Resources/Textures/_Harmony/Objects/Consumable/Drinks/sunset-soda.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.
Routine upstream merge for Oct. 23, 2024