Upstream #300
Merged
Upstream #300
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
* monk * meta
gauzerecolor
nerfs service lights because they are bRIGHT
* pry * Update Resources/Prototypes/Entities/Mobs/Player/terminator.yml --------- Co-authored-by: Nemanja <[email protected]>
* comit1 * comit2 * comit 3 * Update Content.Server/VendingMachines/VendingMachineSystem.cs --------- Co-authored-by: Nemanja <[email protected]>
ports /tg/ airlock deny sounds
* action commands * atmos debug commands * comming * credits command * debug commands * usage * usings * debug pathfinding command * grouping entity menu command * hide mechanisms command * commit * mapping client side setup command * open ahelp command * set menu visibility command * commit * show mechanisms command * toggle health overlay command * toggle outline command * stage * disable once * ioc * namespaces * WriteError * clean up command usage * don't abbriviate * ActionsCommands * AtmosDebugCommands * the rest * oops * undo
* Gauzelathe * latherecipe
* Replace EntityUid parsing with NetEntity * fix * Other changes required for arch * And anothher
* fixes major blindness issues like blindness not scaling with render res * HEY. get outta there
* meta update * lower diff?
* beacons * improved beacon overlap in med and sci
* Chill bounties + fixes * localize * fix arbitage
… freshly-made sound (#23476) * smoke grenade license compliance * source link * lets bring the pin sound down a peg
* inital * new
…lows RandomSpriteComponent to uh. Actually choose random sprites for specific layers) (#23393) * kobold variety - allows kobolds to have random colors and horns * hey lets maybe not crash in this case, lets maybe let the color continue being null in this case * excuse us vscode what the fuck is this * brightens kob base, makes kob outline more bold, fixes to the prototype because our code spaghett * okay yeah angler horns just dont work At All. the floppy kobold ears, however? MWAH. chef's kis * we've been staring at these critters all day - makes base color line up with the base color of some of the markings
Tarantula baff
* Add PVS benchmark * poke tests * Shuffle players around * Add caveat * Add CycleTick() benchmark * Make async false * Oops
* Fixes ninja not being able to use abilities * This was for testing
* unique satchel grid * small tweaksies
* Moved vendor thank you messages into AdvertisementPack, making them vendor-specific. Wrote a few example messages. * Only display thank yous when closing the UI after a purchase. * Tweaked a few messages * More custom messages * Missed one
* fix * fix uplink * add suffix
* added delicious mopwata * added mopwata, the reagent * fixed issues, changed color, added more possible fills
Co-authored-by: ike709 <[email protected]>
* push * PUSH * reuse cryo explosion * minus loud * ore band + pka * idk dawg
Revert "Cryoxadone and doxarubixadone now work on the dead (#23558)" This reverts commit 00ee48e.
* Powered stasis bed prevents body decay * Update following CR comments * Remove unused import * Simplify if-statements * Change implementation following CR suggestions * Add comment & remove explicit get/set
auto attacks
checking for utensils actually happens now
* Update species.ftl * Update skeleton.yml
L shape drill + surgical tool rotation
# Conflicts: # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Content.Server/Salvage/SalvageMagnetComponent.cs # Resources/ConfigPresets/WizardsDen/leviathan.toml # Resources/ConfigPresets/WizardsDen/lizard.toml # Resources/ConfigPresets/WizardsDen/wizardsDen.toml # Resources/Credits/GitHub.txt # Resources/Maps/Salvage/cargo-1.yml # Resources/Maps/Salvage/medium-crashed-shuttle.yml # Resources/Maps/Salvage/medium-dock.yml # Resources/Maps/Salvage/small-4.yml # Resources/Maps/Salvage/small-a-1.yml # Resources/Maps/Salvage/small-ai-survey-drone.yml # Resources/Maps/aspid.yml # Resources/Maps/bagel.yml # Resources/Maps/barratry.yml # Resources/Maps/core.yml # Resources/Maps/gemini.yml # Resources/Maps/origin.yml # Resources/Prototypes/Catalog/Bounties/bounties.yml # Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml # Resources/Prototypes/Catalog/Cargo/cargo_vending.yml # Resources/Prototypes/Catalog/Fills/Crates/engineering.yml # Resources/Prototypes/Catalog/Fills/Lockers/medical.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Entities/Clothing/Eyes/hud.yml # Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml # Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml # Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml # Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml # Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml # Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml # Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml # Resources/Prototypes/Procedural/salvage_loot.yml # Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml # Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml # Resources/Prototypes/Recipes/Lathes/misc.yml # Resources/Prototypes/Recipes/Lathes/tools.yml # Resources/Prototypes/Research/experimental.yml # Resources/Prototypes/tags.yml # Resources/ServerInfo/Gameplay.txt # Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml # Resources/ServerInfo/Guidebook/Engineering/Power.xml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/ServerInfo/Guidebook/Jobs.xml # Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml # Resources/Textures/Clothing/Mask/clown.rsi/meta.json # Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
github-actions
bot
added
Changes: Localization
Changes: Map
Changes: Sprites
Changes: UI
labels
|
Опять лгбт виновато |
|
ЛГБТ получил по пятой точке |
|
|
PyotrIgn
approved these changes
Jan 9, 2024
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
Проверки
Изменения
🆑