Upstream merge 67 #2219
Merged
Upstream merge 67 #2219
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
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
…rds#32914) * commit * spacing fix
* fix things * maybe fix everything
based sigma
…space-wizards#32908) * Reduce player softcap for wizden servers and panic bunker wizden Leviathan * Fix bunker message * Make sure it actually activates by default and make it turn off when an admin joins * Update Resources/ConfigPresets/WizardsDen/wizardsDen.toml The voices Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Fixes smile's ghost role to not need a raffle, very nice * a simplier solution * Mute toxin buffed to be more like glue * buffed the toxin even more * Update Resources/Prototypes/Entities/Mobs/NPCs/pets.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
…ace-wizards#32906) * prevent typing sound from playing when AI interacts with consoles * cleanup
* Change stuff * Gotcha boss
…pace-wizards#32921 (space-wizards#32950) * Resolved space-wizards#32771, space-wizards#32949, and space-wizards#32921 * Resolved build issue
updated sec maints
…#32930) Initial Commit Created new sprites for all the partial fills and modified the ammo-case ymls to accomodate the new stages
* Init testing * copyright * oops * Tracking the embed entity uid * testing stuff for gradual injection * work * weh * god save me * bleh * Yippee! * Again * Mini syringe ammo * cleaning up * mini syringes have a texture for fill amount * -3 cool points :( * hitboxes * init cleanup * much needed fixes * Fixes
* init * im so confused * clean * sprite update * :| * further attempts * be blessed for it works * Very prestigious pAI * cleaning up * Intellicard in RD locker * PAIn't * .Clear()n't * .Clear()n't for real this time * Cleaning up * Whoopsie Daisy
* Initial implementation * currently it crashes on load, don't know why, maybe changing the products will provide some insight * I was overlooking part of the yaml formatting.
* Fix several jank issues with space ninja cell upgrades. * Rework the code to comply with maintainer request. * Fix some naming convention & formatting errors. * Change from a custom check to an item whitelist to avoid power cages from fitting. * Make the EntityUid of GetCellScore non nullable. * Remove a line from a previous solution to the above problem I forgot to remove. * Fix the magic number issue.
* golden apprasial tool when * thanks evan. very cool
…rds#31710) * green * fix material arbitrage * lighter
* Initial commit * Review feedback changes * ProtoId * TempCommit * First attempt to have client alerts * Review changes
* jumpsuit detailening * jumpskirt stuff * meta.json * update meta.json * meta.json fix fix * meta.json fix fix fix
github-actions
bot
added
Changes: Sprites
|
RSI Diff Bot; head commit 1bb7519 merging into 613e0fc Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi
Resources/Textures/Objects/Devices/ai_card.rsi
Resources/Textures/Objects/Devices/encryption_keys.rsi
Resources/Textures/Objects/Devices/tablets.rsi
Resources/Textures/Objects/Specific/Chemistry/syringe.rsi
Resources/Textures/Objects/Tools/appraisal-tool.rsi
Resources/Textures/Interface/Actions/actions_ai.rsi
Resources/Textures/Interface/Alerts/walking.rsi
Resources/Textures/Objects/Consumable/Food/plates.rsi
Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi
Resources/Textures/Objects/Specific/Medical/defibsmall.rsi
Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi
Resources/Textures/Objects/Specific/Medical/medipen.rsi
|
5 tasks
stalengd
approved these changes
Nov 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
Оффовская контра удалена в коммите e16c4f3
Проверки
Изменения
no cl. no fun