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
..
cruiser.yml	Impliment visitor ID, reorganize shuttle event and ghost role yml, standardize many visitor roles, add more unknown shuttles. (#28098)	2024-09-10 00:40:00 -06:00
cryptid.yml	Impliment visitor ID, reorganize shuttle event and ghost role yml, standardize many visitor roles, add more unknown shuttles. (#28098)	2024-09-10 00:40:00 -06:00
disaster_evacpod.yml	Impliment visitor ID, reorganize shuttle event and ghost role yml, standardize many visitor roles, add more unknown shuttles. (#28098)	2024-09-10 00:40:00 -06:00
eternal.yml	Impliment visitor ID, reorganize shuttle event and ghost role yml, standardize many visitor roles, add more unknown shuttles. (#28098)	2024-09-10 00:40:00 -06:00
flatline.yml	Impliment visitor ID, reorganize shuttle event and ghost role yml, standardize many visitor roles, add more unknown shuttles. (#28098)	2024-09-10 00:40:00 -06:00
gym.yml	Impliment visitor ID, reorganize shuttle event and ghost role yml, standardize many visitor roles, add more unknown shuttles. (#28098)	2024-09-10 00:40:00 -06:00
honki.yml	Replaces small fans on most shuttles with directional fans. (#31495)	2024-08-26 16:24:22 -06:00
incorporation.yml	Impliment visitor ID, reorganize shuttle event and ghost role yml, standardize many visitor roles, add more unknown shuttles. (#28098)	2024-09-10 00:40:00 -06:00
instigator.yml	Большой апдейт ЯО.	2024-12-05 14:45:19 +03:00
joe.yml	Impliment visitor ID, reorganize shuttle event and ghost role yml, standardize many visitor roles, add more unknown shuttles. (#28098)	2024-09-10 00:40:00 -06:00
lambordeere.yml	Fixes Lambordeere bolt buttons not being connected (#33065)	2024-11-07 15:02:24 -07:00
lost_cargo.yml	Impliment visitor ID, reorganize shuttle event and ghost role yml, standardize many visitor roles, add more unknown shuttles. (#28098)	2024-09-10 00:40:00 -06:00
manowar.yml	add man-o-war shuttle (#32105)	2024-12-20 14:36:23 +03:00
meatzone.yml	Impliment visitor ID, reorganize shuttle event and ghost role yml, standardize many visitor roles, add more unknown shuttles. (#28098)	2024-09-10 00:40:00 -06:00
microshuttle.yml	Impliment visitor ID, reorganize shuttle event and ghost role yml, standardize many visitor roles, add more unknown shuttles. (#28098)	2024-09-10 00:40:00 -06:00
quark.yml	Impliment visitor ID, reorganize shuttle event and ghost role yml, standardize many visitor roles, add more unknown shuttles. (#28098)	2024-09-10 00:40:00 -06:00
spacebus.yml	Impliment visitor ID, reorganize shuttle event and ghost role yml, standardize many visitor roles, add more unknown shuttles. (#28098)	2024-09-10 00:40:00 -06:00
striker.yml	Replaces small fans on most shuttles with directional fans. (#31495)	2024-08-26 16:24:22 -06:00
syndie_evacpod.yml	Impliment visitor ID, reorganize shuttle event and ghost role yml, standardize many visitor roles, add more unknown shuttles. (#28098)	2024-09-10 00:40:00 -06:00
traveling_china_cuisine.yml	Impliment visitor ID, reorganize shuttle event and ghost role yml, standardize many visitor roles, add more unknown shuttles. (#28098)	2024-09-10 00:40:00 -06:00