Upstream sync #2511
Merged
Upstream sync #2511
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
buffed cog atmos so now its massive
* Cheese tweaks * 22221241256247849`
* Reset hopefully? * removes the emergency security orders * Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml Rewrites the description based on review Co-authored-by: NakataRin <[email protected]> * 7 shots, recharge taking 42 seconds * minor renaming :godo: * please work * Revert "please work" This reverts commit e84a2618d95ec17f5fd608331176df2ab8b0966c. * please fix --------- Co-authored-by: NakataRin <[email protected]>
* no pacifist sec * also block blindness * Update warden.yml * Update security_officer.yml * Update head_of_security.yml * Update security_cadet.yml * Update detective.yml
* Initial commit * Also reinforced
Added 2 pixels on the front of the left and right views of the red and black gaiter sprites so that they would properly cover the nose of their wearers, as they do in reality.
* added a few chatsan entries * added 2 more * added 4 more and fixed errors * fixed error again * added allg * removed fullstops
* quick shuttle wall fix * this time for real
* give sleeper traitor default traitor guidebook * guidebook for thief
Revert "Security Helmet Reshape (#30961)" This reverts commit 802d478.
* add new text * changed loc names * fixes
We don't do this anymore
* Revert "Tweaking things that restrict freedom (#31095)" This reverts commit 171884d. * keep the unequip time * keep alphabetical order
* save * sprites * mime survival kit has baguette * add weapon/uplink * cherry-pick croissant changes * uplink * Switch baguette to slashing damage * fixes * update attribution * fix typos * review comments * reduce TC cost * switch to regular box * fix regular baguette rotation
Issue was tools was predicted but wires aren't so this would exclude user from audio. For now we just do the non-predicted version and I or someone else will fully predict wires later.
* Finally, people can learn what the Broadcast button does! * Also add for Alert level * Add alert level and shuttle button tooltips * Fix dumdum, tweak Broadcast tooltip
hotfix + sound changegit status!
* reach update * remove invalid
Boiling vox blood creates ammonia
Emoji eye change
* Adds heat-based recipe for cream * Added aeration --------- Co-authored-by: Alchebun <jimmy.12.or#gmail.com>
Forgot to do this, but how tf do doors work then.
…ream-sync # Conflicts: # Resources/Prototypes/Accents/word_replacements.yml # Resources/Prototypes/Entities/Clothing/Shoes/boots.yml # Resources/Prototypes/Loadouts/loadout_groups.yml # Resources/Prototypes/Roles/Jobs/Security/detective.yml # Resources/Prototypes/Species/human.yml # Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml # Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png # Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
github-actions
bot
added
Status: Needs Review
|
RSI Diff Bot; head commit 40101ed merging into 3bfeec5 Resources/Textures/Clothing/Head/Helmets/security.rsi
Resources/Textures/Clothing/Mask/neckgaiter.rsi
Resources/Textures/Clothing/Mask/neckgaiterred.rsi
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi
Resources/Textures/Clothing/Neck/Misc/shock_collar.rsi
Resources/Textures/Clothing/Uniforms/Jumpskirt/clown.rsi
Resources/Textures/Mobs/Animals/mothroach/displacement.rsi
Resources/Textures/Mobs/Customization/ears.rsi
Resources/Textures/Objects/Misc/bureaucracy.rsi
Resources/Textures/Objects/Storage/boxes.rsi
Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi
Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
Resources/Textures/Structures/Wallmounts/signs.rsi
|
|
ещё перевод позапредыдущего не мёржнут |
lzk228
added a commit
to lzk228/space-station-14
that referenced
this pull request
Aug 23, 2024
lzk228
added a commit
that referenced
this pull request
Aug 27, 2024
Co-authored-by: lapatison <[email protected]> Co-authored-by: NotSoDamn <[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
Медиа
Проверки
Изменения