JerryImMouse f76d1edf27 Merge remote-tracking branch 'upstream/master' into upstream ... # Conflicts: # Content.Shared/Humanoid/NamingSystem.cs # Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs # Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs # Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml # Resources/ServerInfo/Guidebook/Service/Botany.xml # Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/carrot.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/chanterelle.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/eggy.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/steelcap.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/slice.png # Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/singularitygrenade.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/whiteholegrenade.rsi/meta.json # Resources/Textures/Structures/Furniture/rollerbeds.rsi/meta.json # Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json		2025-03-27 23:01:47 +05:00
..
EyeColorPicker.cs
HumanoidAppearanceSystem.cs	Validate some SpeciesPrototype fields (#35965)	2025-03-20 21:15:30 +01:00
HumanoidMarkingModifierBoundUserInterface.cs	Fix window positions not saving (#35055)	2025-02-23 23:57:57 +11:00
HumanoidMarkingModifierWindow.xaml	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
HumanoidMarkingModifierWindow.xaml.cs	Update trivial components to use auto comp states (#20539)	2023-09-28 16:20:29 -07:00
MarkingPicker.xaml	add search to marking editors (#15526)	2023-04-18 22:44:37 -07:00
MarkingPicker.xaml.cs	Use shared sponsors manager	2024-05-13 17:45:23 +03:00
SingleMarkingPicker.xaml	add search to marking editors (#15526)	2023-04-18 22:44:37 -07:00
SingleMarkingPicker.xaml.cs	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-08-16 14:29:08 +03:00