VigersRay
5f10d21fa6
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/Administration/Commands/PlayTimeCommands.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Server/StationEvents/Events/BreakerFlipRule.cs
# Content.Shared/Roles/JobPrototype.cs
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
# Resources/Prototypes/Entities/Mobs/base.yml
# Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Roles/Antags/traitor.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
# Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
# Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
# Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
# Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
# Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
# Resources/Prototypes/Roles/Jobs/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
2024-06-04 09:41:27 +03:00
AJCM-git
8c10581010
Cleans up StatusIconSystem and fixing some bugs ( #28270 )
2024-06-03 12:12:21 -04:00
Vigers Ray
5775d4cdef
Merge sunrise build ( #2 )
...
* commit
2024-05-31 02:16:18 +03:00
Nemanja
5183f3ed8b
Scattershot antag fixes ( #27429 )
...
* scattershot antag fixes
* this too?
* dawg fuck this code
* ok so we kinda need this?
2024-05-05 19:23:43 +10:00
metalgearsloth
677fd3c6db
Fix presetidcard extended access throwing ( #26195 )
2024-03-16 21:10:59 -04:00
chromiumboy
b70c0845d0
Crew monitor revisit ( #22240 )
2023-12-10 16:38:50 +11:00
Repo
0a8a6f81c5
Fix Punpun crew monitor sensor ( #20484 )
2023-09-28 20:53:53 +10:00
PrPleGoo
7c088ac1de
Job icons are stored on ID cards ( #18233 )
2023-07-29 18:25:27 +10:00
TemporalOroboros
df1dcb74ac
Dewarns access ( #16666 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-07-23 14:19:51 +10:00
metalgearsloth
90110183be
Fix a bunch of logger warnings ( #17691 )
2023-06-27 23:56:52 +10:00
metalgearsloth
1e30848cf7
Add a debug overlay for accessreaders ( #9681 )
...
> didnt pjb have issues with doing the control stuff in an overlay and just wanted direct texture draw
I ended up doing dis.
2022-09-14 19:33:25 +10:00
Morber
7a14c6f331
Localize jobs ( #8968 )
...
* Localize job supervisors
* Rename supervisors file
* Localize job names
* Remove localization for fallback job name
* Use LocalizedName for Job
* Fix job names case
2022-06-28 22:55:05 +10:00
Pieter-Jan Briers
a4685bab4c
Extended access system ( #8469 )
...
* Extended access system
Allows jobs to specify "extended" access levels, which will be granted if the round-start crew count is below a certain threshold.
* Extended accesses for jobs
* Spook
2022-05-26 21:01:07 -07:00
wrexbe
bc68ac96dd
Cleanup the namespaces ( #8132 )
2022-05-13 17:59:03 +10:00
mirrorcult
ec4d4688c7
Seal/abstract/virtual everything ( #6739 )
2022-02-16 18:23:23 +11:00
mirrorcult
aa2727c84d
Access groups + aghost all access ( #6671 )
2022-02-11 19:01:14 -07:00
Leon Friedrich
b675bdb789
Move Access & AccessReader to shared. ( #5798 )
...
* git mv
* Move Access Component & system.
- Name space changes
- Rename AccessReader to AccessReaderComponent
- Also need an abstract TryGetSlot function for SharedInventoryComponent
* better TryGetSlot
* Ah yes, tests exist.
2021-12-25 20:07:28 -08:00
Alex Evgrashin
a3f16295ea
Move Access to ECS ( #4826 )
...
* Moved access to ecs
* Fixed tests
* Moved test to integration
* Better IoC
* Moved preset ID card
* Moved id card to ECS
* Moved access component to ECS
* Fixed pda access
* Final touches
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2021-10-22 13:31:07 +11:00