VigersRay
|
afe7f25a2b
|
Фикс открытия ролей, повышение пенсионного возраста... Ой, требований возраста для командования.
|
2024-08-15 00:26:50 +03:00 |
|
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 |
|
Ed
|
a95d2257c3
|
JobRequirement refactor (#30347)
* refactor JobRequirements
* add profile support
* fix
* Update quartermaster.yml
* sloth fixes
* inport 30208
* Update DepartmentPrototype.cs
* species restriction
* left tweak stick
* stringbuilder is cool!
|
2024-08-05 14:25:49 +10:00 |
|
VigersRay
|
d2c1a1df88
|
Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
# Content.Client/Power/PowerMonitoringWindow.xaml.cs
# Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs
# Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/Ghost/Roles/GhostRoleSystem.cs
# Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
# Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
# Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
# Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
# Resources/Textures/Structures/Walls/mining.rsi/meta.json
|
2024-07-22 04:16:05 +03:00 |
|
Cojoke
|
b57174007c
|
Remove all Assigned Values that are Never Used (#30110)
Remove all Assigned Values that are never used
|
2024-07-18 20:22:23 -04:00 |
|
VigersRay
|
5fed5ad979
|
Куча разного говна которое давно должно было в билде.
|
2024-07-15 01:22:56 +03:00 |
|
Leon Friedrich
|
b632a65385
|
Add JobRequirementOverride prototypes (#28607)
* Add JobRequirementOverride prototypes
* a
* invert if
* Add override that takes in prototypes directly
|
2024-06-07 09:43:02 -07:00 |
|
DrSmugleaf
|
19be94c9ea
|
Add job whitelist system (#28085)
* Add job whitelist system
* Address reviews
* Fix name
* Apply suggestions from code review
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* cancinium
---------
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
|
2024-06-01 05:08:31 -07:00 |
|
Repo
|
17304068b4
|
Track Admin Game Time (#24945)
* AdminTime tracked
* Attempts to fix PR issues.
* Admin afk logic update
|
2024-05-01 23:23:22 -07:00 |
|
metalgearsloth
|
3b7679f9c9
|
Don't throw on player spawn for playtime failure (#24148)
Still gets logged but won't abort the entire startup process.
|
2024-01-16 01:01:41 -07:00 |
|
Leon Friedrich
|
e685cb626b
|
Un-revert IPlayerManager refactor (#21244)
|
2023-10-28 09:59:53 +11:00 |
|
metalgearsloth
|
a2bbda43cc
|
Revert "Update submodule to 172.0.0 (#21222)" (#21225)
|
2023-10-24 21:55:20 +11:00 |
|
Leon Friedrich
|
7ba0ea2926
|
IPlayerManager refactor (#21215)
|
2023-10-24 20:19:08 +11:00 |
|
metalgearsloth
|
e1a91466f1
|
Fix playtime tracker (#20014)
|
2023-09-11 17:42:25 +10:00 |
|
metalgearsloth
|
b77265314b
|
Make role timer tooltips pretty (#19605)
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
|
2023-09-11 15:44:21 +10:00 |
|
DrSmugleaf
|
3f3ba6ac62
|
Move minds, roles, jobs and objectives to shared (#19679)
|
2023-08-30 21:46:11 -07:00 |
|
DrSmugleaf
|
9567ae3b7f
|
Fixed not tracking job playtime (#19639)
|
2023-08-29 13:39:16 -07:00 |
|
DrSmugleaf
|
15c0211fb2
|
Refactor minds to be entities with components, make roles components (#19591)
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
|
2023-08-28 16:53:24 -07:00 |
|
metalgearsloth
|
20748cc542
|
Hotfix round restart loops (#16292)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
|
2023-05-11 11:00:39 +10:00 |
|
Moony
|
5cc78c2c75
|
Revert "Oops, All Captains! (#14943)" (#14994)
This reverts commit 8128759ea8.
|
2023-03-30 18:55:09 -05:00 |
|
Skye
|
8128759ea8
|
Oops, All Captains! (#14943)
|
2023-03-30 18:54:38 -05:00 |
|
Jezithyr
|
eeb5b17b34
|
Mobstate Refactor (#13389)
Refactors mobstate and moves mob health thresholds to their own component
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
|
2023-01-13 16:57:10 -08:00 |
|
metalgearsloth
|
4b48f7e1ef
|
Add missing break on RemoveDisallowedJobs (#10511)
|
2022-08-11 22:47:54 +10:00 |
|
Pieter-Jan Briers
|
e852ada6c8
|
Play time tracking: Job timers 3: more titles: when the (#9978)
Co-authored-by: Veritius <veritiusgaming@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
|
2022-08-07 16:00:42 +10:00 |
|