Vigers Ray 95b86d7a4b Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Content.Client/Construction/UI/ConstructionMenu.xaml # Content.Client/Construction/UI/ConstructionMenu.xaml.cs # Content.Client/Construction/UI/ConstructionMenuPresenter.cs # Content.Server/Warps/WarpPointSystem.cs # Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs # Content.Server/Weapons/Ranged/Systems/GunSystem.cs # Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs # Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs # Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs # Content.Shared/Inventory/InventorySystem.Relay.cs # Content.Shared/Weapons/Reflect/ReflectSystem.cs # Resources/Locale/en-US/_strings/plants/mutations.ftl # Resources/Locale/en-US/_strings/stack/stacks.ftl # Resources/Locale/en-US/_strings/teleportation/teleportation-menu-gui.ftl # Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml # Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml # Resources/Prototypes/Entities/Objects/Power/powercells.yml # Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml # Resources/Prototypes/Entities/Stations/base.yml # Resources/Prototypes/Entities/Structures/Machines/nuke.yml # Resources/Prototypes/Reagents/toxins.yml # Resources/Prototypes/Recipes/Construction/Graphs/clothing/clown_banana.yml # Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml # Resources/Prototypes/Recipes/Construction/Graphs/mechs/hamtr_construction.yml # Resources/Prototypes/Recipes/Construction/Graphs/mechs/honker_construction.yml # Resources/Prototypes/Recipes/Construction/Graphs/mechs/ripley_construction.yml # Resources/Prototypes/Recipes/Construction/Graphs/mechs/vim_construction.yml # Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml # Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock_clockwork.yml # Resources/Prototypes/Recipes/Construction/Graphs/structures/blast_door.yml # Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml # Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml # Resources/Prototypes/Recipes/Construction/Graphs/structures/glassbox.yml # Resources/Prototypes/Recipes/Construction/Graphs/structures/secretdoor.yml # Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml # Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml # Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml # Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml # Resources/Prototypes/Recipes/Construction/Graphs/utilities/APC.yml # Resources/Prototypes/Recipes/Construction/Graphs/utilities/air_alarms.yml # Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_machines.yml # Resources/Prototypes/Recipes/Construction/Graphs/utilities/intercom.yml # Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml # Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml # Resources/Prototypes/Recipes/Construction/Graphs/utilities/station_maps.yml # Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_generator.yml # Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml # Resources/Prototypes/Recipes/Construction/Graphs/weapons/bladed_hats.yml # Resources/Prototypes/Recipes/Construction/Graphs/weapons/bola.yml # Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml # Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_grenade.yml # Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_mine.yml # Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml # Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml # Resources/Prototypes/Recipes/Construction/structures.yml # Resources/Prototypes/Recipes/Crafting/Graphs/bots/cleanbot.yml # Resources/Prototypes/Recipes/Crafting/Graphs/bots/firebot.yml # Resources/Prototypes/Recipes/Crafting/Graphs/bots/honkbot.yml # Resources/Prototypes/Recipes/Crafting/Graphs/bots/medibot.yml # Resources/Prototypes/Recipes/Crafting/Graphs/bots/mimebot.yml # Resources/Prototypes/Recipes/Crafting/Graphs/bots/supplybot.yml # Resources/Prototypes/Recipes/Crafting/Graphs/improvised/firebomb.yml # Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun.yml # Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml # Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml # Resources/Prototypes/Recipes/Crafting/Graphs/improvised/pipebomb.yml # Resources/Prototypes/Recipes/Crafting/Graphs/improvised/pneumatic_cannon.yml # Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml # Resources/Prototypes/Recipes/Crafting/Graphs/storage/cratefreezer.yml # Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml # Resources/Prototypes/Recipes/Crafting/Graphs/strawhat.yml # Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml # Resources/Prototypes/Recipes/Crafting/improvised.yml # Resources/Prototypes/Recipes/Reactions/medicine.yml # Resources/Prototypes/Roles/Jobs/CentComm/official.yml # Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/equipped-NECK.png # Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/icon.png # Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/meta.json		2025-05-04 23:13:12 +03:00
..
CVarAccess	Add ability for admins to change certain cvars via command. (#35105)	2025-02-16 10:06:13 +01:00
CCVars.Accessibility.cs	Уменьшил силу тряски на 50%	2025-04-15 03:51:42 +03:00
CCVars.Admin.Ahelp.cs	фиксы апстрима	2024-11-14 03:38:28 +03:00
CCVars.Admin.cs	Merge remote-tracking branch 'space-wizards/master'	2025-02-26 22:01:48 +03:00
CCVars.Admin.Logs.cs	"New player" admin logging improvements (#35961)	2025-03-20 20:56:51 +01:00
CCVars.Admin.Rules.cs	Separate CCVars into separate files	2024-11-12 03:10:25 +01:00
CCVars.Atmos.cs	бафф скорости разгермы	2025-01-17 22:51:56 +03:00
CCVars.Audio.cs	Separate CCVars into separate files	2024-11-12 03:10:25 +01:00
CCVars.Cargo.cs	Make funding allocation computer more configurable (#36790)	2025-04-22 08:34:53 -04:00
CCVars.Chat.cs	Перенес ПРы ласта на санрайз.	2024-11-26 18:25:51 +03:00
CCVars.Chat.Looc.cs	Separate CCVars into separate files	2024-11-12 03:10:25 +01:00
CCVars.Chat.Ooc.cs	небольшие приколы	2025-04-02 21:50:56 +03:00
CCVars.Config.cs	Separate CCVars into separate files	2024-11-12 03:10:25 +01:00
CCVars.Console.cs	Separate CCVars into separate files	2024-11-12 03:10:25 +01:00
CCVars.Crewmanifest.cs	Separate CCVars into separate files	2024-11-12 03:10:25 +01:00
CCVars.cs	Add ability for admins to change certain cvars via command. (#35105)	2025-02-16 10:06:13 +01:00
CCVars.Database.cs	Separate CCVars into separate files	2024-11-12 03:10:25 +01:00
CCVars.Discord.cs	Add Discord webhook on watchlist connection (#33483)	2025-01-15 01:32:24 +01:00
CCVars.Events.cs	[ChangeCVarCommand] Mapping Command (#35239)	2025-02-18 11:26:08 +01:00
CCVars.Explosion.cs	Separate CCVars into separate files	2024-11-12 03:10:25 +01:00
CCVars.Game.cs	Merge remote-tracking branch 'space-wizards/master'	2025-04-28 01:29:55 +03:00
CCVars.Game.Infolinks.cs	Add telegram to the server info-links (#33459)	2024-11-22 16:38:41 +01:00
CCVars.Ghost.cs	Separate CCVars into separate files	2024-11-12 03:10:25 +01:00
CCVars.Hud.cs	version watermark (#35284)	2025-02-23 20:01:17 +01:00
CCVars.Ic.cs	Merge remote-tracking branch 'space-wizards/master'	2025-05-04 23:13:12 +03:00
CCVars.Interactions.cs	Revert engine reverties (#34968)	2025-02-08 17:17:55 +11:00
CCVars.Interface.cs	Merge remote-tracking branch 'space-wizards/master'	2025-04-17 00:07:59 +03:00
CCVars.Mapping.cs	Separate CCVars into separate files	2024-11-12 03:10:25 +01:00
CCVars.Midi.cs	Separate CCVars into separate files	2024-11-12 03:10:25 +01:00
CCVars.Misc.cs	Separate CCVars into separate files	2024-11-12 03:10:25 +01:00
CCVars.Movement.cs	Merge remote-tracking branch 'space-wizards/master'	2025-04-28 01:29:55 +03:00
CCVars.Net.cs	Separate CCVars into separate files	2024-11-12 03:10:25 +01:00
CCVars.NPC.cs	фиксы апстрима	2024-11-14 03:38:28 +03:00
CCVars.Parallax.cs	Separate CCVars into separate files	2024-11-12 03:10:25 +01:00
CCVars.Physics.cs	Mob Movement Major Refactor (#36847)	2025-05-02 18:18:08 +10:00
CCVars.Playtest.cs	Add stamina and mob damage playtest modifiers (#35599)	2025-03-21 00:01:35 +01:00
CCVars.Radiation.cs	Separate CCVars into separate files	2024-11-12 03:10:25 +01:00
CCVars.Replays.cs	Separate CCVars into separate files	2024-11-12 03:10:25 +01:00
CCVars.Salvage.cs	Separate CCVars into separate files	2024-11-12 03:10:25 +01:00
CCVars.Server.cs	version watermark (#35284)	2025-02-23 20:01:17 +01:00
CCVars.Shuttle.cs	Merge remote-tracking branch 'space-wizards/master'	2025-04-19 00:46:30 +03:00
CCVars.Sounds.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-17 15:51:44 +03:00
CCVars.Status.cs	Separate CCVars into separate files	2024-11-12 03:10:25 +01:00
CCVars.Tips.cs	Separate CCVars into separate files	2024-11-12 03:10:25 +01:00
CCVars.Viewport.cs	Separate CCVars into separate files	2024-11-12 03:10:25 +01:00
CCVars.Vote.cs	Merge remote-tracking branch 'space-wizards/master'	2025-04-03 00:33:21 +03:00
CCVars.Whitelist.cs	Separate CCVars into separate files	2024-11-12 03:10:25 +01:00
CCVars.Worldgen.cs	Separate CCVars into separate files	2024-11-12 03:10:25 +01:00