Morb0 58ef40767e Merge remote-tracking branch 'upstream/master' into upstream-sync2 ... # Conflicts: # Content.Client/Entry/EntryPoint.cs # Content.Client/Preferences/ClientPreferencesManager.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Resources/Prototypes/Entities/Clothing/Shoes/boots.yml # Resources/Prototypes/Entities/Mobs/Species/base.yml		2023-09-19 11:41:15 +03:00
..
Atmos/gasanalyzer.rsi	Copyright Pass/Pruning | Part 2 - Objects (#3905)	2021-04-29 18:09:14 +00:00
Chapel	Emaggable vendors + Familiars for Chaplain (#6961)	2022-04-17 17:16:02 +10:00
Chemistry	Resprite Chemical bag & Warden winter coat (#1259)	2023-08-06 09:54:30 +03:00
Hydroponics	Merge remote-tracking branch 'upstream/master' into upstream-sync2	2023-09-19 11:41:15 +03:00
Janitorial	Merge remote-tracking branch 'upstream/master' into upstream-sync2	2023-09-19 11:41:15 +03:00
Kitchen/food_carts.rsi	Add food carts (#19177)	2023-08-15 15:26:49 -07:00
Library/Equipment/books_bag.rsi	[Sprite] inhand sprites for bags (#16005)	2023-05-02 18:24:37 +10:00
Mech	vim!!!!!!11! (#15659)	2023-08-11 12:20:16 -04:00
Medical	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-13 16:51:52 +03:00
Mining/ore_bag.rsi	[Resprite] Ore & hydro bag inhand (#1059)	2023-05-12 00:01:00 +03:00
Research	Anomaly Locator (#15677)	2023-04-23 15:39:33 +10:00
Robotics	Split gardening cyborg module, literacy cyborg module tweak (#19449)	2023-08-23 20:12:05 -04:00
Security	Add DamagePopup, Target Entities, And Practice Laser Gun (#12317)	2022-11-06 02:32:00 +11:00
Service/vending_machine_restock.rsi	TG Vending Machines + Tweaks (#14703)	2023-03-24 02:54:47 -06:00
Syndicate/telecrystal.rsi	Telecrystals (and a bit more ECS) (#4775)	2021-10-08 12:26:42 +02:00
Xenoarchaeology	node scanner resprite (#17609)	2023-06-24 14:20:26 +10:00