Update food-component.ftl

why was I the only one that noticed it

(cherry picked from commit 39a2ff5c0ab428b40e1e2800395e0b2fdeaffcdc)

(cherry picked from commit 786ecd961a5af4865281f6e3ae32d13fe26f028c)

(cherry picked from commit 84fff930c26897120baf66f9dbf91400e6e6e585)

(cherry picked from commit 51caf3b5199954bc459167b92d69a10a96b63cda)

…ial infected in zombie mode (#25529)

Remove the ability for command to be initial infected in zombie mode

(cherry picked from commit 580640150285e1f90f25ca014991c09f2fed3cdc)

(cherry picked from commit c52820a4b65a8ea147934e16bcf39027e2f067d5)

(cherry picked from commit 34a6f12ce65deb5381c315523e075310e76759d3)

add

(cherry picked from commit 531d722c13138ad2f1d1176e1c2aadac13a5bcd6)

* add

* ya

* add

(cherry picked from commit 9a4c10cc892e8e07c777b7351deec3efb673556a)

(cherry picked from commit e52ebe0ebd138bc12ec4427dfcc686efedd2a6fc)

The collision layer check doesn't work and I don't have time to fix it.

(cherry picked from commit ec5edc362656440373cba7aa8ef63c87af85911b)

This reverts commit dc56c59.

(cherry picked from commit 51acebd2322f0952fa5a6fdb2e6c391fa83fdb83)

* Before SharedItemSystem

* Fixes mispredict, removed unused

* Fix physics

(cherry picked from commit 902198d7e0c85f62ac91a0ff2cd275c0e7e77d56)

(cherry picked from commit 6f3893a0e0a976566a0795ab52ae5cfe46cc50b6)

(cherry picked from commit a440ccfc7c0d9dcaa68a419cac50f71bde1e42a1)

* Toggleable items now can change their shape depends on toggle state

* Update Content.Shared/Item/SharedItemSystem.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit 1a5f7c39b2a2c244d5d947d8ff8f09250f21450b)

* Juice that makes you Weh!

* Remove dupe

* updated the localization files

* try to fix error

(cherry picked from commit 1de102d08e93c8e5de0bfedf05d4dc02dfbee8a6)

* Added logic for ContainerSpawnPoint checks

* Improved with template function

* fixed nullable

* hehe

* hehe T?

* added type check before cast

* another nullable fix

* and another one

* return to old code (found typo)

* Code cleanup

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 87def406bc2cb3121888d162c8fe707ff937dd6f)

(cherry picked from commit 4613c9dabc5bd4aee29895486e4afae297be5520)

IDK what this arg is for but seems okay with guns. Without it it always thinks the insertion can work.

(cherry picked from commit ad29dbe302ac921b9e3f6cbd3ded79788db27b46)

fix

(cherry picked from commit 7ba6765a6af09e060f539d8b6fa847de9512c4c9)

(cherry picked from commit 4e1603424008c0323972207d7699653570fd1912)

(cherry picked from commit de36ebe2dfbcba11866b61a69d46c2d27077ee76)

Turns out this is not what serverid was for... i guess you can find server familys with this so im not gonna remove it. Best we get for server name is the admin logs server name.

(cherry picked from commit 3ef4e835583b99b020c0bb317be99cb06ade2ec9)

* Panic bunker fix

I admin

* tired

(cherry picked from commit b26acc95475a9ae2000fddcfb2bee7d058b4122c)

* Implemented contents display for dispenser UI

* Update Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Resolve the netent into a euid first

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
(cherry picked from commit 100ece2e2078ab2fe99f4ce1ab36b2cd05319772)

(cherry picked from commit 02be78b062fe727aa444bf4b19bc6610b984ec05)

OnPiecePressed

(cherry picked from commit 7d6e4b164d6013257423afe02b3f06447e37bec3)

* add

* thin spaces

* update

(cherry picked from commit f463cdf3a5d385745c14e6e782c8debf222a92a0)

(cherry picked from commit 48604b0019feb15bf06272e0b1c1f13cd71ab38e)

* add missing spacepen poster

adds missing spacepen poster

* Update meta.json

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

(cherry picked from commit 97d41cf9453025a07fe067f2d2c2cacc60e56593)

* Update kudzu.yml

* Update living_light.yml

* files

* Update flora.yml

* Update kudzu.yml

* bul

* Update kudzu.yml

* Update living_light.yml

* bullet immune

(cherry picked from commit 656679cb54317afb8408e0bed47e26da1773ddee)

(cherry picked from commit 90279b33579f93ccaf240eadf7f924bfc24c4468)

Validate that job and antag prototypes can actually be set in character profiles, rather than just checking if the prototype exists.

Make preferences system just call existing validation code when loading prototype from database, instead of some hacked-together stuff.

Also I made the character profile validation logic take dependencies in via parameter because fuck resolves.

(cherry picked from commit 8d244f7b76ba881253eb94611acaab31865c3920)

Everything can read (kinda)

(cherry picked from commit b7be6932f364312e8ca673ab4c0b413f768b92e2)

* Initial commit

* Remove damage from cuffs entirely

* Changed from Action uncuffing cooldown to UseDelay cooldown

* Minor merge conflict fix

* Edit the actual correct line

* Submodule fix

(cherry picked from commit 485fb4cb652793ab4f9cbe90bb2cbf555fbf5540)

(cherry picked from commit 2a2324ecaf0dbe5e384ae4f7bdb241a817b3653f)

Also includes some (non critical) changes to the solution file to re-organize the Roslyn components.

(cherry picked from commit e00f74505c62310bd15aeaba8d6530f648397074)

(cherry picked from commit 002b8d88711aa6395c5e054c3aa9bd163f74799e)

(cherry picked from commit c02c8c2319e57d0172fa8a8c20e2be6f56ba36e3)

Injector status UI cached values

Co-authored-by: Plykiya <plykiya@protonmail.com>
(cherry picked from commit dffd02adb161f8299e858fb6c0c2eb71e595e21f)

swapped icons for crates

(cherry picked from commit 76823cc52264e53d673ce728692ee4d02073b518)

* Cleans up base crates for mapping clarity

* migration

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>

(cherry picked from commit 2efad4f3c57dc9265f8960634500c05648e06d77)

Co-authored-by: Jeff <velcroboy333@hotmail.com>
(cherry picked from commit 19ce9edf103620524a3b8febce8e039fbcefc3a8)

Co-authored-by: Jeff <velcroboy333@hotmail.com>
(cherry picked from commit 918eb1fe87d1543be84b8dba5c654434afa7f9a3)

let there be (led) light

(cherry picked from commit 89c822638057e2c7071ae6cb4380b114da5a4961)

(cherry picked from commit 4bf2364f5fbf79d87c9ea819a57beac73823a1cf)

Co-authored-by: botanySupremist <definitelyrealBotSupremist@gmail.com>
(cherry picked from commit c6bfb657adf2d57f30a464259196bc08f7759d10)

* Add weh to: Anomalies, Artifacts, random puddles

* also change weh to wehs!

(cherry picked from commit 30e09af2a46ef456e3dbebfe02b7227a30ce26d7)

* Nerf/Buff Gases cost

* Nerf/Buff Gases cost

* Nerf/Buff Gases cost

---------

Co-authored-by: CyberDuck <tsyaslovscky.dima@yandex.by>

(cherry picked from commit c0290d18f24b1fc7cd166eae8fb165ae525a9923)

(cherry picked from commit 2faf7433c0caf5a768a189e4cdba8a0c43b6e8ea)

meat and potatoes

ayup

(cherry picked from commit 6b00f592b69d0423909e97eae973f3815643628d)

…econds (#25614)

(cherry picked from commit 5367d9954535df433c2286268c8532e8f7a3cfc2)

(cherry picked from commit 7593a2e9583a0b3f65ad51afc3b3ab86d4742c19)

Update uplink_catalog.yml

(cherry picked from commit 849dc433651f4c49f3cb3e585ea2c1bc595323b1)

makeshift handcuffs are easier to escape from

(cherry picked from commit 74232f983129b97d6c2564b904eb7ad7f2a49cf5)

Update medidrobe.yml

(cherry picked from commit b7b6f61f2ae94431fa558edd87fc8eea6c08d966)

(cherry picked from commit 7fc75f75419a915a4383bfa73ed5109b384c48b2)

* blue

* others

* add white table

* add crafting carpets

* finish carpets

* tags

* crafting

* pip

* finish

(cherry picked from commit 84cbcb93cacf339510d9190ad18e377c892df3b3)

(cherry picked from commit a0b0579d2e91616663b4f18a41098e40b95d1daa)

Initial commit

(cherry picked from commit 3af2928a25c4cbc0ee6e8edabf317d060b652b06)

nt balloon

surprised one didn't exist already

(cherry picked from commit 0536ce6f95aced669913dacc7d89554ee6bc652f)

(cherry picked from commit 79df39ed9498c562a9e386b8c078f9461ecf0a8d)

* handheld

* Update meta.json

* Update meta.json

* Update cargo.yml

* research

* add to borg

* bruh

* borg to T2

* fix

(cherry picked from commit 7a5f81ddb46e47078b983bfc9ba015ee67752ee3)

(cherry picked from commit 9015573a4966cf0b00a06c36ecd3e48a95260001)

* Added Plasma and Uranium Windoors, plus uranium directional windows

* I forgor the locked proto's too ;-;

* Skill issue, forgot to remove something that was a test

* Please dear git tests, let me sleep (ShardGlassRUranium indeed does not exist)

* No more static prices for windows/windoors

* I wish I knew how to run the tests locally ;-;

(cherry picked from commit 88ae71715b89b4ada2dfa42331c12962f73485fe)

* Whisper bleed update v3

* missed a few

* Add bleeding message to health analyzer.

* Fix bleed notification not updating.

* Apparently this either doesnt exist

(cherry picked from commit ff65cb7b0caaeb9edd9461eff942bdc6f5eb7f50)

(cherry picked from commit acc7927d946750b47dfff645fd770a708f76ae5e)

(cherry picked from commit a6f21468858588692ea0719a2202b1aac8f88cfa)

* Adjusts wallmount arcs and partially fix nanomed issues

* wall closets

* Guess it wants this

* Adjust arc to 175

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
(cherry picked from commit 32a440b487a807cca4b468f2d2f5a4eedcbdc34b)

* Minor test fixes

c

* fix?

(cherry picked from commit 0889d6b0b03f9cf036789b358a1ae0f55567cb63)

(cherry picked from commit bd99c0dcdb6d59ce96a13a8a4954de71261e2809)

No reform, zombie nymphs

(cherry picked from commit cc865c547ba9c313b7573155759d34cd750f549f)

(cherry picked from commit 8e951f3582a39bdf4183fea9fdf3fa1bd7ec9eda)

* Added salt to ore.yml
Added salt to ores.yml
Added salt walls to asteroid.yml
Added salt to BaseAsteroidDebris' list of ores to generate in asteroids.yml
Added OreSalt to biome_ore_templates.yml
Added salt to guaranteed salvageLoot in salvage_loot.yml
Added salt entry under salvage-magnet-resources in salvage-magnet.ftl
Added WIP sprites for salt.

* Renamed salt's id to SaltOre inside Entities/Objects/Materials/ore.yml
Fixed salt not being grindable due to using an incorrect reagent name
Added salt to ore.rsi/meta.json and rock.rsi/meta.json

* Added chlorine to the list of solutions salt gives when used in the grinder.

* Gave salt ore and salt rock overlay unique sprites.

* Added raw salt to materials/materials.ftl
Updated SaltOre definition in ore.yml to have RawSalt under materialComposition

* Updated saltore definition to give 10 units of tablesalt and 5 units of iodine when ground.

(cherry picked from commit 133bd0353a16a3b2260555318a1389b1c2c0f0e9)

(cherry picked from commit 5ad573970696c0030cb7f3695b782393fef38aa6)

(cherry picked from commit 0752acdc2ca2db43581e2c0d95a5d96041247bc9)

(cherry picked from commit a41181017145f3756e517e92f29dbf99df36c26c)

initial commit

(cherry picked from commit 8dd1748cec4f69496c0f16aa1dae1ab20bb15c2b)

(cherry picked from commit 6343eb5759790ad16e3877b12dacff2c6928c632)

Revert "Fix ItemSlots prediction (#25552)"

This reverts commit ad29dbe302ac921b9e3f6cbd3ded79788db27b46.

(cherry picked from commit 6485dd4f4de1167523c38d2aa7ffe79f440b4386)

Dependencies got misused

(cherry picked from commit 23d2c4d924efbae39f1b6677f1e495f55e3d75a2)

(cherry picked from commit 2e0d22bc90c06f37d1de5dd12e11034822b6d85e)

(cherry picked from commit d204896bf57fe6a9e90ae276d16c282bf0037126)

This reverts commit a074c30.

Doesn't update correctly when cycling.

(cherry picked from commit fc0ff8fb313d8dfddf803c19a19bf2629ce89e90)

* initial commit

* remove unnecessary thing

* Revert "remove unnecessary thing"

This reverts commit c4e3aecbcb9088c4dee5bf41dc5cc88eaa81f505.

* fix (real)

(cherry picked from commit e94d190adecd820eb8797a9617c7318b258ec30b)

(cherry picked from commit a7497448cf72f9455547328b85574631f33499d7)

Co-authored-by: Jeff <velcroboy333@hotmail.com>
(cherry picked from commit 963c9f6fbc3da896f1af61e71675a86f082db11f)

fix typos calling salvage specialists a 'salvage technician

(cherry picked from commit 1c015d1fd549269eb3a475c253b1b5f96d1b5e2c)

* NPC steering blending

Significantly more stable than using LastSteerDirection and also AntiStuck never got tripped locally when I was running around. I also left future notes for me to cleanup the pathfinder in future.

* Remove index

(cherry picked from commit f819404f6d1757ae4c541f5e856dfc1fc5d9895b)

(cherry picked from commit 7341a3ab359f83beb50fe63ec432e2b6d6764ed0)

(cherry picked from commit 221719c27da59dbfee8b091b623e9734fcb987c0)

(cherry picked from commit 98843511014e1b5fce34b7e1215179dd3d0f94c8)