VigersRay 31b2d24e30 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Shared/MagicMirror/MagicMirrorComponent.cs # Resources/Prototypes/Catalog/Fills/Lockers/misc.yml # Resources/Prototypes/Entities/Stations/base.yml # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png # Resources/migration.yml		2024-07-31 03:54:09 +03:00
..
AdminFrozenSystem.cs	Prevent admin-frozen players from ghosting or suiciding, add "Freeze And Mute" verb (#27813)	2024-05-12 10:35:30 -04:00
AdminGunSystem.cs	Add events for GunComponent values, muzzle flashes and cartridge spread (#24077)	2024-01-29 10:32:42 +11:00
AdminSystem.cs	Fix baby jail (#29896)	2024-07-11 15:14:01 +10:00
AdminTestArenaSystem.cs	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
AdminVerbSystem.Antags.cs	fix initial infected icons and add a briefing to the character menu (#29259)	2024-06-21 15:42:17 +10:00
AdminVerbSystem.cs	Make freeze, freeze & mute, and unmute verbs work on disconnected players. (#28664)	2024-06-08 20:40:33 +10:00
AdminVerbSystem.Smites.cs	Update stomach removal and lung removal smite to not use Component.Owner (#29927)	2024-07-28 01:25:40 -07:00
AdminVerbSystem.Tools.cs	Add door electronics access configuration menu (#17778)	2024-04-01 17:06:13 +11:00
BufferingSystem.cs	Remove 700 usages of Component.Owner (#21100)	2023-10-19 12:34:31 -07:00
BwoinkSystem.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-07-31 03:54:09 +03:00
RejuvenateSystem.cs	Toolshed (#17895)	2023-08-02 16:09:08 -05:00
SuperBonkSystem.cs	Super Bonk Smite (#22413)	2023-12-18 14:39:23 -05:00