Morb0 636bea81df Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # Content.Client/Entry/EntryPoint.cs # Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs # Content.Server/Zombies/ZombifyOnDeathSystem.cs # Resources/Prototypes/Corvax/Roles/Jobs/Engineering/chief_engineer.yml # Resources/Prototypes/Datasets/Names/cargo_shuttle.yml # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml # Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml # Resources/Prototypes/Roles/Jobs/Command/captain.yml # Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml # Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml # Resources/Prototypes/Roles/Jobs/Science/research_director.yml # Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/ServerInfo/Guidebook/Science/Robotics.xml # Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-left.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-right.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/meta.json # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-left.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-right.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit.png # Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-right.png # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json # Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png # Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png # Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png # Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png # Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png # Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png # Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png # Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png # Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png # Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png # Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png # Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png # Resources/Textures/Structures/Furniture/chairs.rsi/meta.json		2023-06-19 21:06:28 +03:00
..
alien_claw.yml	More kinds of benos (#8849)	2022-06-18 13:33:41 +10:00
announcements.yml	Remove bangin' donk (#8249)	2022-05-17 21:53:37 -07:00
atmospherics.yml	Initial (#5193)	2021-11-06 17:32:33 -07:00
bike_horn.yml	Toy Box filled with toys (ready for merge) (#16252)	2023-06-03 13:31:47 +10:00
body_fall.yml	Refactor standing to be ECS (#4142)	2021-06-27 19:02:46 +10:00
clownrecorder.yml	Adds the clown recorder (Clown fix) (#15074)	2023-04-06 20:06:52 -06:00
desceration.yml
dice.yml	Sound Specifiers. (#4239)	2021-06-28 16:20:57 +02:00
disease.yml	Adds Bananium (#14663)	2023-04-29 15:38:09 +10:00
drink_open_sounds.yml	Massive Food PR (#3436)	2021-05-03 13:17:22 +02:00
emotes.yml	Emotion (#17187)	2023-06-08 16:22:02 +10:00
explosion.yml	Tweaks ambient sound values and improves some existing sounds (#4576)	2021-09-10 11:31:54 +10:00
food.yml	Massive Food PR (#3436)	2021-05-03 13:17:22 +02:00
footsteps.yml	Behonker and Clown Spider (ready for merge) (#16678)	2023-06-15 12:47:36 +10:00
generic_hit.yml	Port boxer from Nyano (#9080)	2022-07-26 18:34:19 -07:00
gib.yml	Basic bleeding mechanics (#6710)	2022-02-17 15:00:41 -07:00
glassbreak.yml	Makes lightbulbs destructible (#2955)	2021-01-09 02:06:36 +01:00
gun_sounds.yml	Bullet flyby sounds (#8317)	2022-05-21 01:04:47 -07:00
ian_bark.yml	[Entity] Add Ian's Backpack (#15519)	2023-04-19 01:40:25 -06:00
impacts.yml	More robust bullet impact sounds (#8325)	2022-05-22 18:23:37 +10:00
keyboard.yml	All computers play the keyboard sound + small research client cleanup (#7312)	2022-04-08 14:17:05 -07:00
lighter_sounds.yml	Lighters (#5836)	2021-12-21 18:20:32 +01:00
lobby.yml	Adds a new lobby song: Spac Stac (#8309)	2022-05-22 12:49:15 +10:00
NukeMusic.yml	Use new sound collection for nuke music	2023-04-29 15:02:06 +03:00
punching.yml	Punching and melee hitsounds now have unique SoundCollections (#5748)	2021-12-11 16:12:40 -07:00
radiation.yml	Events/RadiationStorm: Fancy radiation shader & SFX (#5612)	2021-12-01 13:21:17 -07:00
sadtrombone.yml	Implanters and Subdermal Implants (#11840)	2022-11-20 17:49:37 +11:00
screams.yml	Cluwne smite (#13367)	2023-03-06 11:09:24 -08:00
shuttle.yml	Shuttle impact sounds (#11099)	2022-10-04 16:00:44 +11:00
skub.yml	Re-adds skub noise [Not april fools] (#14978)	2023-03-31 15:25:46 +11:00
sparks.yml
storage_rustle.yml	Janitor trashbag upgrade + FANCY ANIMATIONS (#3058)	2021-02-03 23:07:13 +01:00
tools.yml
toy_squeak.yml
traits.yml	New Traits (#13763)	2023-03-04 23:44:13 -04:00
tray.yml	Important fix for table climbing (#10803)	2022-08-25 23:41:37 +10:00
troll.yml	Remove among us noise from game (#16589)	2023-05-18 23:44:23 -06:00