[Tweak] Upstream sync #866
Merged
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
… (#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 <[email protected]> --------- Co-authored-by: slarticodefast <[email protected]>
* 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 <[email protected]> --------- Co-authored-by: slarticodefast <[email protected]>
…2906) * prevent typing sound from playing when AI interacts with consoles * cleanup
* Change stuff * Gotcha boss
* Resolved #32771, #32949, and #32921 * Resolved build issue
updated sec maints
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
add flash reaction effect
…tem. (#32942) Fix loneop spawnrate by reverting it to not use the custom shuttle event system.
* Add health analyzer unrevivability warning * Remove errornous comment
removed hujsak
Co-authored-by: PJBot <[email protected]>
Co-authored-by: Thomas <[email protected]>
github-actions
bot
added
Changes: Sprites
|
RSI Diff Bot; head commit a141027 merging into b5e913c Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi
Resources/Textures/Objects/Devices/ai_card.rsi
Resources/Textures/Objects/Specific/Chemistry/syringe.rsi
Resources/Textures/Objects/Tools/appraisal-tool.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi
Resources/Textures/Objects/Weapons/Guns/Cannons/syringe_gun.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.
скучнейший апстрим в котором только баг фиксы и обновления карт