VigersRay c0ee7e3cc9 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # .github/PULL_REQUEST_TEMPLATE.md # Content.Client/Lobby/LobbyUIController.cs # Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs # Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs # Content.Server/Administration/Systems/BwoinkSystem.cs # Content.Server/IoC/ServerContentIoC.cs # Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs # Content.Server/Shuttles/Systems/ArrivalsSystem.cs # Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs # Content.Shared/Roles/JobRequirements.cs # Resources/Prototypes/Accents/word_replacements.yml # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml # Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml # Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml # Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml # Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml # Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml # Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml # Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml # Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml # Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml # Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml # Resources/Prototypes/Loadouts/Jobs/Command/captain.yml # Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml # Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml # Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml # Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml # Resources/Prototypes/Loadouts/Jobs/Engineering/technical_assistant.yml # Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml # Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml # Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml # Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml # Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml # Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml # Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml # Resources/Prototypes/Loadouts/Jobs/Security/detective.yml # Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml # Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml # Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml # Resources/Prototypes/Loadouts/Jobs/Security/warden.yml # Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml # Resources/Prototypes/Recipes/Lathes/medical.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/Engineering/chief_engineer.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/Textures/Clothing/Mask/sadmime.rsi/meta.json # Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json # Resources/Textures/Structures/Power/apc.rsi/base.png # Resources/Textures/Structures/Power/apc.rsi/broken.png # Resources/Textures/Structures/Power/apc.rsi/display-charging.png # Resources/Textures/Structures/Power/apc.rsi/display-full.png # Resources/Textures/Structures/Power/apc.rsi/display-lack.png # Resources/Textures/Structures/Power/apc.rsi/display-remote.png # Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png # Resources/Textures/Structures/Power/apc.rsi/frame.png # Resources/Textures/Structures/Power/apc.rsi/static.png		2024-08-05 17:22:05 +03:00
..
Ringer	Non-uplink PDAs no longer can have TC inserted into them (#28985)	2024-06-14 11:24:40 -04:00
PdaSystem.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-08-05 17:22:05 +03:00