Upstream sync #2748
Merged
Upstream sync #2748
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
* no longer absurd * Update Resources/Prototypes/Entities/Objects/Specific/chemistry.yml --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* New workflow to apply the pr approved label * Maybe fix permissions
Update chapel.yml
…#33078) * add notification for dependent wearables being dropped * fix dropped item popup redundancy - did a check to see if any item was dropped, instead of making a notification for each item being dropped. * change popup to client-only variant * fix redundant messages, add plural locale string * fix conventions, fix locale input to be more intuitive --------- Co-authored-by: Justin <justinbrick1@gmail.com>
* Rebalance the max programs that a PDA can hold * Give Caps PDA more programs too. * Make the max programs a static 8 * I forgor sec and med * CaseCase * Empty commit to re-run checks * The final change, I hope.
Fixed minor spelling mistake
…ket (#33079) * Make shark plush janitor-bucketable * fix bucketed grey shark texture * Make sprites less shiny and adapt copyright notice * Made shark way way less shiny * Allow carp plush and rehydratables in mop bucket. * Remove old mop bucket shark sprites * Fix post-merge bugs * Fix errors * Move ReactiveContainer stuff to shared That should mean it is now predicted. * Custom eject verb for the mop bucket * Fixes OnSolutionChange, removes pop-up as there already is one. * .ftl is not necessary as the custom pop-up was removed * Review fixes * Update Content.Shared/Chemistry/Components/ReactiveContainerComponent.cs * Update Content.Shared/Chemistry/EntitySystems/ReactiveContainerSystem.cs --------- Co-authored-by: Psychpsyo <psychpsyo@gmail.com> Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
…820) * the examineableDamage component now puts its messages at the bottom, and in color * god help us if something is priority -100 :godo:
* Fixed trash not being spawned when throwing pies * Completely removed trash component flag check prior to the spawn loop
Initial commit
Initial commit
* Update meta.json * Add files via upload * Update misc.yml * Update meal_recipes.yml * Update meta.json * Add files via upload * Update plate.yml * Update food_baked_single.yml * Update dinnerware.yml * Update cooking.yml * Update misc.yml * Add files via upload * Delete Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-cherry.png * Add files via upload * Update meta.json * Update misc.yml * Update meal_recipes.yml * Update meta.json * Fix meta.json * Fix meta.json again * Update misc.yml * Update misc.yml * Update misc.yml * Update misc.yml * Update meta.json * Update meta.json * Update misc.yml * Update meal_recipes.yml * Update Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update dinnerware.yml * Delete cherry * Add files via upload * Delete banana * Add banana * Delete chocolate * Add chocolate * lathe recipe fix --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
…ng job icons (#33069) * :( * Removed the sprite + updated RSI
* add IsMemberOfAny to faction system * pro --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
CPUJob to come later.
fixed cog again
…unds (#32981) remove chair + changed maints db to rubber
* fix * oops, used savemap instead of savegrid
link air alarm in coms room
fix invalids
* Fix reserach disk crash * remove extra whitespace * removed args.handled where args are not handled
* One line fix * Removed redundant using * Allocation improvement
* pass Actor to cartridge messages * NonSerialized gaming --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* cant disguise to thing in a container * copy cigarette visualiser * prevent aghost throwing an error * make disguises die in space * fuck it rewrite it to not use polymorph * fix action troll * oop * add vebr * add access to the components * 2/3 * fix * relay damage from disguise to user * fix integrity **
# Conflicts: # Resources/Prototypes/GameRules/roundstart.yml # Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml # Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml # Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml # Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml # Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml # Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png # Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png # Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json # Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png # Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png # Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json
github-actions
bot
added
Status: Needs Review
|
RSI Diff Bot; head commit 9b2b7b4 merging into cb477ca Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi
Resources/Textures/Structures/Machines/computers.rsi
Resources/Textures/Interface/Actions/actions_ai.rsi
Resources/Textures/Structures/conveyor_old.rsi
Resources/Textures/Objects/Consumable/Food/plates.rsi
Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi
Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi
Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi
Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi
|
lzk228
added a commit
to lzk228/space-station-14
that referenced
this pull request
Dec 8, 2024
lzk228
added a commit
that referenced
this pull request
Dec 10, 2024
AwareFoxy
pushed a commit
to space-syndicate/space-station-14-next
that referenced
this pull request
Dec 12, 2024
* Translate Upstream space-syndicate#2748 (space-syndicate#2837) Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com> * Перевод Upstream space-syndicate#2830 (space-syndicate#2836) Co-authored-by: lapatison <lapatisonsocial@gmail.com> Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com> * translate borer names (space-syndicate#2835) * [Localize] Poster 52 (space-syndicate#2840) * Translate new diona names (space-syndicate#2839) Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com> * [Resprite] Medical uniforms & rollerbeds (space-syndicate#2802) * Automatic changelog update --------- Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com> Co-authored-by: lapatison <lapatisonsocial@gmail.com> Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com> Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com> Co-authored-by: MureixloI <132683811+MureixloI@users.noreply.github.com> Co-authored-by: IanComradeBot <96892333+IanComradeBot@users.noreply.github.com>
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
Почему / Баланс
Технические детали
Медиа
Требования
Критические изменения
Список изменений