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
..
BanList	Integrate Modern HWID into content	2024-11-12 01:51:54 +01:00
Commands	Merge remote-tracking branch 'upstream/master' into upstream	2025-03-27 23:01:47 +05:00
Components	Content update for UI prediction (#27214)	2024-04-26 18:16:24 +10:00
Logs	Add antag notice to admin chat alerts (#35994)	2025-03-22 00:21:32 +01:00
Managers	Add ability for admins to change certain cvars via command. (#35105)	2025-02-16 10:06:13 +01:00
Notes	Improve admin message seen/dismiss state. (#26223)	2024-03-21 16:15:46 +01:00
Systems	Merge remote-tracking branch 'upstream/master' into upstream	2025-03-27 23:01:47 +05:00
Toolshed	Fix mark verb	2025-01-03 18:45:02 +13:00
UI	Persist deadmin to database, add admin suspension system (#34048)	2025-01-15 00:46:45 +01:00
AdminCommandAttribute.cs	Toolshed (#17895)	2023-08-02 16:09:08 -05:00
AdminPermsChangedEventArgs.cs	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
AdminRank.cs
BanPanelEui.cs	Integrate Modern HWID into content	2024-11-12 01:51:54 +01:00
ContentNetworkResourceManager.cs	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
PlayerLocator.cs	Integrate Modern HWID into content	2024-11-12 01:51:54 +01:00
PlayerPanelEui.cs	Integrate Modern HWID into content	2024-11-12 01:51:54 +01:00
QuickDialogSystem.cs	Obsolete refactor - ConnectedClient to Channel (#24409)	2024-01-23 09:14:13 +11:00
QuickDialogSystem.OpenDialog.cs	Obsolete refactor - ConnectedClient to Channel (#24409)	2024-01-23 09:14:13 +11:00
ServerApi.cs	Panic Bunker uses minutes not hours (#28805)	2024-06-09 22:45:47 +02:00
ServerApi.Utility.cs	Game server admin API (#26880)	2024-04-14 20:13:29 +10:00