Vigers Ray cef39bc293 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/UserInterface/Controls/RadialContainer.cs # Content.Server/Lathe/LatheSystem.cs # Content.Server/Silicons/Laws/SiliconLawSystem.cs # Content.Shared/Inventory/InventorySystem.Relay.cs # Content.Shared/Materials/SharedMaterialReclaimerSystem.cs # Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs # Content.Shared/VendingMachines/SharedVendingMachineSystem.cs # Content.Shared/Wieldable/SharedWieldableSystem.cs # Resources/Locale/en-US/_strings/station-events/events/radiation-storm.ftl # Resources/Locale/en-US/_strings/store/uplink-catalog.ftl # Resources/Prototypes/Atmospherics/gases.yml # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Datasets/Names/borg.yml # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml # Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml # Resources/ServerInfo/Guidebook/Engineering/AME.xml # Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml # Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml # Resources/ServerInfo/Guidebook/Engineering/Construction.xml # Resources/ServerInfo/Guidebook/Engineering/Engineering.xml # Resources/ServerInfo/Guidebook/Engineering/Fires.xml # Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml # Resources/ServerInfo/Guidebook/Engineering/Networking.xml # Resources/ServerInfo/Guidebook/Engineering/Power.xml # Resources/ServerInfo/Guidebook/Engineering/RTG.xml # Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/ServerInfo/Guidebook/Engineering/TEG.xml # Resources/ServerInfo/Guidebook/Security/CriminalRecords.xml # Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json # Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png # Resources/migration.yml		2025-01-30 11:33:49 +03:00
..
JobRequirement	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-30 11:33:49 +03:00
Jobs	Nukie playtime (#1087)	2025-01-11 01:04:47 +03:00
RoleCodeword	Add codeword highlighting (#30092)	2024-08-23 11:14:38 +02:00
AntagPrototype.cs	Nukie playtime (#1087)	2025-01-11 01:04:47 +03:00
DepartmentPrototype.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-08-05 17:22:05 +03:00
JobPrototype.cs	Обновление спонсорской системы (#905)	2024-12-23 20:45:39 +03:00
JobRequirementOverridePrototype.cs	Add JobRequirementOverride prototypes (#28607)	2024-06-07 09:43:02 -07:00
JobRequirements.cs	Фикс открытия ролей спонсоркой	2024-08-15 21:08:28 +03:00
JobSpecial.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
MindGetAllRoleInfoEvent.cs	Mind Role Entities (#31318)	2024-10-10 10:48:56 +02:00
MindIsAntagonistEvent.cs	Role Types (#33420)	2025-01-11 22:17:26 +01:00
MindRoleComponent.cs	Role Types (#33420)	2025-01-11 22:17:26 +01:00
RoleAddedEvent.cs	Role Types (#33420)	2025-01-11 22:17:26 +01:00
RoleEvent.cs	Role Types (#33420)	2025-01-11 22:17:26 +01:00
RoleRemovedEvent.cs	Role Types (#33420)	2025-01-11 22:17:26 +01:00
SharedRoleSystem.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-14 18:46:45 +03:00
SiliconBrainRoleComponent.cs	Role Types (#33420)	2025-01-11 22:17:26 +01:00
StartingGearEquippedEvent.cs	Space Ninjas auto-toggle internals after spawning (#25083)	2024-05-03 11:24:21 +10:00
StartingGearPrototype.cs	De-duplicate loadout gear (#30341)	2024-08-05 00:42:25 -04:00
StartingMindRoleComponent.cs	Role Types (#33420)	2025-01-11 22:17:26 +01:00