Vigers Ray 0619ac9206 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # .github/workflows/build-test-debug.yml # Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs # Content.Server/Zombies/ZombieSystem.cs # Content.Shared/Nutrition/EntitySystems/HungerSystem.cs # Resources/Locale/en-US/_strings/atmos/gases.ftl # Resources/Locale/en-US/_strings/components/atmos-monitoring-component.ftl # Resources/Locale/en-US/_strings/tools/components/tool-component.ftl # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Research/industrial.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Prototypes/ai_factions.yml # Resources/toolshedEngineCommandPerms.yml		2024-12-21 18:51:37 +03:00
..
Atmos/gasanalyzer.rsi	Copyright Pass/Pruning | Part 2 - Objects (#3905)	2021-04-29 18:09:14 +00:00
Chapel	The Honored Quran (Sprite addition) (#27400)	2024-04-28 02:36:04 +10:00
Chemistry	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-30 13:26:32 +03:00
Detective/evidence_marker.rsi	Added Evidence Markers for the Detective! (#25255)	2024-02-17 15:49:16 -05:00
Hydroponics	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-09-26 20:17:14 +03:00
Janitorial	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-01 00:48:22 +03:00
Kitchen/food_carts.rsi	Add food carts (#19177)	2023-08-15 15:26:49 -07:00
Library/Equipment/books_bag.rsi	Change my copyright (#31599)	2024-08-28 21:12:09 +02:00
Mech	oops	2024-12-12 22:43:15 +00:00
Medical	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-21 18:51:37 +03:00
Mining	upstream	2024-09-16 12:40:23 +03:00
Research	Anomaly Scanner In-hand Sprites (#33427)	2024-12-17 14:35:23 +01:00
Robotics	Новые предметы, фикс супер материи, правки (#515)	2024-10-30 10:19:36 +03:00
Security	LockVisualizer (#25224)	2024-02-16 16:52:31 -07:00
Service/vending_machine_restock.rsi	Adds vending restocks for ChefVend and Condiment Stations (#19305)	2023-10-01 16:49:10 -04:00
Syndicate/telecrystal.rsi	add saturation to TC inhand sprites (#22870)	2023-12-22 20:26:01 -07:00
Xenoarchaeology	node scanner resprite (#17609)	2023-06-24 14:20:26 +10:00