Upstream sync #2936
Merged
Upstream sync #2936
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
changed the command checkpoint to a reporters room.
added high capacity water tank
* Darkened Service job interface icons for better contrast * Fixed Botanist job interface icon dark handle hole * Change to new, darker, service color in all resource yml files * Revert Map file service color changes * Use new darker service color on id cards * Revert Service color change in mapping_actions.yml * Revert salvage difficulties service color * Redo service ID and job colors to match advanced palette * Revert all service color yml file changes * Switch icons to use existing service pallete colors from advanced pallete * Update meta.json for darkened service icons --------- Co-authored-by: Erskin Cherry <[email protected]>
* Moved all vents around, made some small changes * Finished work * Removed insuls spawner since they're not merged yet
* Added insuls spawner, time to test * adjusted whitespace since that was causing issues * Update Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml Co-authored-by: slarticodefast <[email protected]> --------- Co-authored-by: slarticodefast <[email protected]>
* resprited manual valves to be colourblind friendly * Update Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/meta.json Co-authored-by: Errant <[email protected]> --------- Co-authored-by: Errant <[email protected]>
… to match monkey. (#34409) kobold ops have 100 health
* Wood wall is now built from barricade congraph and on top of a barricade instead of using rods * APE dragging exploit fix
… (#34045) * Changed SharedDoorSystem.GetColliding() to allow non-LowImpassible mask entities to stay in the door while it closes * Update Content.Shared/Doors/Systems/SharedDoorSystem.cs Clarifies comment of how the mask is used Co-authored-by: Centronias <[email protected]> --------- Co-authored-by: Centronias <[email protected]>
* fixed jazz midi program byte * swapped around jazz and clean in instrumentList
* Pride-O-Mat (#1322) * Added Pride-O-Mat * Yep * Updated license to the correct one * Added more lines, reconfigured settings a bit, also added cloaks to inventory, set coder socks to emag inventory * Removed bunny ears, fixed typo * Made requested changes Webedit lmao --------- Co-authored-by: Dorragon <[email protected]>
* balance oasis power as a stopgap * change waste color to proper waste color
Co-authored-by: Pieter-Jan Briers <[email protected]>
* craftable pet carrier * epic integration test fail * Update Resources/Prototypes/Recipes/Crafting/improvised.yml Co-authored-by: slarticodefast <[email protected]> * Update Resources/Prototypes/Recipes/Crafting/Graphs/storage/pet_carrier.yml Co-authored-by: slarticodefast <[email protected]> * Update Resources/Prototypes/Recipes/Crafting/Graphs/storage/pet_carrier.yml Co-authored-by: slarticodefast <[email protected]> * Update Resources/Prototypes/Entities/Objects/Misc/pet_carrier.yml Co-authored-by: slarticodefast <[email protected]> * extra tab begone * epic linter fail * how did linter not see this??? --------- Co-authored-by: slarticodefast <[email protected]>
* Make important change (#7) This is to help julian test his bot * Omnibus * Remove random test file from testing a gh bot * Add pin to vendor, spawners and loadout --------- Co-authored-by: nikthechampiongr <[email protected]>
* Fix DNA scrambler updating station record * Update Content.Server/Implants/SubdermalImplantSystem.cs --------- Co-authored-by: slarticodefast <[email protected]>
* Added spanwers and modified others * adjusted values to be more in line with what I want * this comment may have caused that test fail * oh my god another typo * Modified door crate to be engineering flavored * reduced the pride vendor odds Webedit lmao
fixes evac shuttle, fix north solars, fix vents and scrubbers
* Space Ruins Variant * Updated File * Added Goliaths/Removed some mobs
* Plasma Station initial commit * Map fixes 1 Expanded science's SMES array Added advanced SMES Redone stamped documents with custom stamps Expanded atmospherics with more storage tanks Added status displays Add missing beacons to solars Replaced the passive gates in science with valves Removed protolathe in engineering Added guitar to CE office Replaced throngler plushie with weh cloak Add a lattice tile outside the atmos burn chamber and storange tanks Added atmos network monitor in bridge * Add cargo and emergency shuttle * Updated maps * Add plasma to map testing list * Map fixes 2 Reworked pipenets to not go under walls Redid salvage and disposals Reworked the bar to include a new bar extension facing the pool Replaced arrivals cryo with an arcade Replaced the toilets in the service plaza with cryo Removed the cryo in dorms Added more details to hallways Redid tools room to include a front desk for the janitor closet Reconnected sci to power roundstart Removed some unideal spawns Expanded the TEG airlock to be 2x3 instead of 1x3 Reduced the size of the SMES bank from 10 to 6 Disabled the plasma miners (downstreams or admins can re-enable them) Replaced illegal maint items * Fixes a 6 pack destroying the universe Ok maybe cracking a cold one with the boys wasn't a great idea. * Map fixes 3 * Quick research assistant fix * Map fixes 4 * Map fixes 5 * webedit go brrrt * Map fixes 6 * Map fixes 7 * Map fixes 8 * Fixes non-existent object It's amazing this game runs at all * Map fixes 9 * update pools * Map fixes 10 * forgot to clear my multitool I love mapping I love mapping I love mapping I love mapping I love mapping --------- Co-authored-by: Emisse <[email protected]>
* Plasma Station initial commit * Map fixes 1 Expanded science's SMES array Added advanced SMES Redone stamped documents with custom stamps Expanded atmospherics with more storage tanks Added status displays Add missing beacons to solars Replaced the passive gates in science with valves Removed protolathe in engineering Added guitar to CE office Replaced throngler plushie with weh cloak Add a lattice tile outside the atmos burn chamber and storange tanks Added atmos network monitor in bridge * Add cargo and emergency shuttle * Updated maps * Add plasma to map testing list * Map fixes 2 Reworked pipenets to not go under walls Redid salvage and disposals Reworked the bar to include a new bar extension facing the pool Replaced arrivals cryo with an arcade Replaced the toilets in the service plaza with cryo Removed the cryo in dorms Added more details to hallways Redid tools room to include a front desk for the janitor closet Reconnected sci to power roundstart Removed some unideal spawns Expanded the TEG airlock to be 2x3 instead of 1x3 Reduced the size of the SMES bank from 10 to 6 Disabled the plasma miners (downstreams or admins can re-enable them) Replaced illegal maint items * Fixes a 6 pack destroying the universe Ok maybe cracking a cold one with the boys wasn't a great idea. * Map fixes 3 * Quick research assistant fix * Map fixes 4 * Map fixes 5 * webedit go brrrt * Map fixes 6 * Map fixes 7 * Map fixes 8 * Fixes non-existent object It's amazing this game runs at all * Map fixes 9 * update pools * Map fixes 10 * forgot to clear my multitool I love mapping I love mapping I love mapping I love mapping I love mapping * Tweaked player counts --------- Co-authored-by: Emisse <[email protected]>
# Conflicts: # Content.Packaging/ClientPackaging.cs # Content.Server/Administration/Systems/AdminSystem.cs # Content.Server/GameTicking/GameTicker.StatusShell.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Entities/Stations/base.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/meta.json
github-actions
bot
added
S: Needs Review
size/L
S: Untriaged
Changes: Sprites
|
RSI Diff Bot; head commit 671c52d merging into 77c1d27 Resources/Textures/Interface/Misc/job_icons.rsi
Resources/Textures/Objects/Misc/bedsheets.rsi
Resources/Textures/Objects/Misc/id_cards.rsi
Resources/Textures/Structures/Piping/Atmospherics/pump.rsi
Resources/Textures/Clothing/Neck/Misc/pins.rsi
Resources/Textures/Structures/Machines/VendingMachines/pride.rsi
Resources/Textures/Structures/Machines/VendingMachines/random.rsi
Resources/Textures/Structures/Machines/VendingMachines/smite.rsi
|
lapatison
pushed a commit
to lapatison/locale-station-14
that referenced
this pull request
Jan 17, 2025
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.
Описание PR
Почему / Баланс
Технические детали
Медиа
Требования
Критические изменения
Список изменений