Morb0 b70efe1fa8 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Audio/ContentAudioSystem.cs # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml # Resources/Prototypes/Datasets/Names/first_male.yml # Resources/Prototypes/Entities/Clothing/Shoes/specific.yml # Resources/Prototypes/Entities/Mobs/NPCs/pets.yml # Resources/Prototypes/GameRules/roundstart.yml # Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json # Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png # Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png # Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal.png # Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_a.png # Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_b.png # Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png # Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png # Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png # Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png # Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png # Resources/Textures/Decals/Overlays/greyscale.rsi/herringbone.png # Resources/Textures/Decals/Overlays/greyscale.rsi/meta.json # Resources/Textures/Decals/Overlays/greyscale.rsi/minitile.png # Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_a.png # Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_b.png # Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal.png # Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_a.png # Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_b.png # Resources/Textures/Decals/Overlays/greyscale.rsi/mono.png # Resources/Textures/Decals/Overlays/greyscale.rsi/offset.png # Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_a.png # Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_b.png # Resources/Textures/Decals/Overlays/greyscale.rsi/pavement.png # Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_a.png # Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_b.png # Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical.png # Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_a.png # Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_b.png # Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png # Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png # Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png # Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png # Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png # Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png # Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png # Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png # Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json # Resources/Textures/Structures/Furniture/chairs.rsi/meta.json # Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json # Resources/Textures/Structures/Windows/directional.rsi/meta.json		2024-03-08 16:05:59 +03:00
..
actions_borg.rsi	Borgs (#18136)	2023-08-12 16:39:58 -05:00
actions_crit.rsi	Deathgasp + last words / succumbing / fake deathgasp as crit actions (#18993)	2023-08-11 22:56:34 -07:00
actions_mecha.rsi	[Resprite] Localizations (#1361)	2023-08-24 21:54:23 +03:00
actions_rat_king.rsi	[Resprite] RatKing Actions (#1448)	2023-09-24 17:41:56 +03:00
carp_rift.rsi	Carp wave spawner and dragons as an actual event (#10254)	2022-08-08 10:18:14 +10:00
devour.rsi	Update dragon devour action icon (#20020)	2023-09-12 22:05:04 -07:00
pai-map.rsi	Fix PDA home icon (#25721)	2024-02-29 20:22:12 +01:00
voice-mask.rsi	Add icon to Change Voice Mask Action (#23239)	2023-12-30 18:13:27 -05:00
blight.png	Revs (the spooky ones) (#9842)	2022-08-13 23:49:41 +10:00
carp_summon.png	Cleanup the remainder of dragon (#8881)	2022-06-16 19:30:49 -05:00
defile.png	Revs (the spooky ones) (#9842)	2022-08-13 23:49:41 +10:00
disarm.png	[Resprite] Disarm (#1445)	2023-09-24 17:12:55 +03:00
disarmOff.png	[Resprite] Disarm (#1445)	2023-09-24 17:12:55 +03:00
eyeclose.png	Blindness rework - damaged eyes are now a stylized simulation of legal blindness (#23212)	2024-01-03 01:07:02 -08:00
eyeopen.png	Blindness rework - damaged eyes are now a stylized simulation of legal blindness (#23212)	2024-01-03 01:07:02 -08:00
firestarter.png	Adds Hellspawn (Nar'Sie demon mob) (#20291)	2024-01-04 05:53:15 -07:00
ghostHearingToggled.png	Ghost hearing action (#19722)	2023-09-24 16:34:08 -04:00
harm.png	[Resprite] Harmmode (#1444)	2023-09-24 09:08:23 +03:00
harmOff.png	[Resprite] Harmmode (#1444)	2023-09-24 09:08:23 +03:00
malfunction.png	Revs (the spooky ones) (#9842)	2022-08-13 23:49:41 +10:00
manifest.png	Guardian brushup and bullet passthrough (#7035)	2022-03-17 11:46:11 -07:00
meta.json	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-05 00:55:19 +03:00
overloadlight.png	Revs (the spooky ones) (#9842)	2022-08-13 23:49:41 +10:00
pai-midi.png	Adds new pAI sprites (#6205)	2022-01-17 12:21:40 -07:00
scream.png	Actions System + UI (#2710)	2020-12-13 23:28:20 +01:00
shop.png	Revs (the spooky ones) (#9842)	2022-08-13 23:49:41 +10:00
web.png	Spiders Buff and critters change (#13377)	2023-01-22 18:50:05 -04:00
zombie-turn.png	Zombie Mode [New Game Mode] (#8501)	2022-07-06 13:42:51 +10:00