Upstream sync #1924
Merged
Upstream sync #1924
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
* number stuff * too many wehs, must increase price.. * Update fun.yml * Update cargo_fun.yml --------- Co-authored-by: Ed <[email protected]>
Fix PDA home icon.
…leftovers (#25659) * I forgot to commit, damn it * Adds the brick to survival kit
…counterpart N2 tanks (#25660) kills off N2 & O2 tanks from lockers & removes duplicate n2 tanks from stuff with o2 tanks
* fills * contrast
* Change tilefrictionmodifier of default item to base friction * Remove anchored friction modifier from baseItem * Revert "Remove anchored friction modifier from baseItem" This reverts commit 2d9d53f38a3704c8b5df4172629c78812f72f6ae. * Removed anchored friction component from BaseItem. --------- Co-authored-by: Plykiya <[email protected]>
* Using wrench on AME doesn't first try to put it in. * Refactor AME to use ItemSlot for fuel. * Apparently these names want to match.
* curwa * fix * huh * revert huh * add fancy white * resprite hospital * add suffix
* Undertoned Tail * Locale
the meat and potatoes YEAH
remove grandpa's fucked up bed
* cleaning * fix
…m windows) (#25723) * adds a new syndie space shuttle ruin + plastitanium windows * the green goomba gaming * fixe * visor > gloves
* weh. * map stuff.. * banish the weh out of my files (it's trying to escape my computer!!)
…(#22804) * un-eviled the reinforced glass recipes the tyranny of accidentally crafting plasma glass instead of reinforced plasma glass is finally over * fix?
Co-authored-by: Jeff <[email protected]>
added condition checking description to cargo search
* add ActionAttemptEvent * add ConfirmableAction compsys * make suicide actions confirmable * use new trolling techniques * better query and dirty them * death --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* Make the round end sound collection a cvar * Fix comment * Clarity
* Minor lawdrobe changes * Updates to advertisements, thank you messages, and emaged / contraband inventory * Removed the 9th lawdrobe advertisement as it was unused * Removed soap --------- Co-authored-by: beck <[email protected]>
* veganmeatball * testedthis * moreplant
* fourteenloko * inverse
green alert shuttle time change
* Buff zombie resists Tweaks zombies to be tankier but still have a similar damage grouping for a specific weakness * Removed unnecessary values of 1
Atmospherics thermomachines now properly invalidate tiles they add heat to.
* Update thief.yml * Update stealTargetGroups.yml * Update objectiveGroups.yml * Update pets.yml
scissors uplink catalog localization and just catalog update, with adding scissors to the chameleon set
let there be air air time
# Conflicts: # Content.Client/Audio/ContentAudioSystem.cs # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml # Resources/Prototypes/Datasets/Names/first_male.yml # Resources/Prototypes/Entities/Clothing/Shoes/specific.yml # Resources/Prototypes/Entities/Mobs/NPCs/pets.yml # Resources/Prototypes/GameRules/roundstart.yml # Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json # Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png # Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png # Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal.png # Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_a.png # Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_b.png # Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png # Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png # Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png # Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png # Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png # Resources/Textures/Decals/Overlays/greyscale.rsi/herringbone.png # Resources/Textures/Decals/Overlays/greyscale.rsi/meta.json # Resources/Textures/Decals/Overlays/greyscale.rsi/minitile.png # Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_a.png # Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_b.png # Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal.png # Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_a.png # Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_b.png # Resources/Textures/Decals/Overlays/greyscale.rsi/mono.png # Resources/Textures/Decals/Overlays/greyscale.rsi/offset.png # Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_a.png # Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_b.png # Resources/Textures/Decals/Overlays/greyscale.rsi/pavement.png # Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_a.png # Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_b.png # Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical.png # Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_a.png # Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_b.png # Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png # Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png # Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png # Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png # Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png # Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png # Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png # Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png # Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json # Resources/Textures/Structures/Furniture/chairs.rsi/meta.json # Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json # Resources/Textures/Structures/Windows/directional.rsi/meta.json
Morb0
pushed a commit
that referenced
this pull request
Mar 9, 2024
Co-authored-by: lzk <[email protected]>
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
Медиа
Проверки
Изменения