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
slarticodefast
bb2981400c
replace all uses of TryGetContainingContainer with non-obsolete overload ( #30583 )
...
* replace all uses of TryGetContainerContainer with non-obsolete overload
* rerun
2024-08-04 15:38:53 +10:00
Vigers Ray
21465c02c0
Отображение времени к прибытию эвак шаттла в КПК ( #22 )
2024-06-05 14:34:36 +03:00
Nemanja
be6f55a090
Clean up store system ( #28463 )
2024-06-01 11:29:17 -04:00
Leon Friedrich
a466b35b27
Move UnpoweredFlashlight to shared ( #27449 )
2024-04-29 13:22:11 +10:00
metalgearsloth
5896e68752
Content update for UI prediction ( #27214 )
...
* Content update for UI refactor
* Big update
* Sharing
* Remaining content updates
* First big update
* Prototype updates
* AUGH
* Fix UI comp ref
* Cleanup
- Fix predicted message, fix item slots, fix interaction range check.
* Fix regressions
* Make this predictive
idk why it wasn't.
* Fix slime merge
* Merge conflict
* Fix merge
2024-04-26 18:16:24 +10:00
Julian Giebel
0752acdc2c
News UI overhaul and PDA notifications ( #19610 )
2024-02-26 21:38:00 -04:00
VMSolidus
84a2356831
Adding PAI Slot to PDA ( #21086 )
...
* Adding PAI Slot to PDA
* Update PdaComponent.cs
* Update pda.yml
* Update tags.yml
Sorting it alphabetically
* Adding PDA UI Elements.
* Addressing reviews
* Update PdaComponent.cs
* Update Content.Shared/PDA/SharedPdaSystem.cs
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
* Update Content.Shared/PDA/SharedPdaSystem.cs
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
* Update Resources/Prototypes/Entities/Objects/Devices/pda.yml
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
* Update PdaComponent.cs
* Update PdaComponent.cs
---------
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
2024-01-04 05:56:14 -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
d5bd1c6f86
Predict StorageComponent ( #19682 )
2023-09-11 21:20:46 +10:00
metalgearsloth
5a0fc68be2
Content update for NetEntities ( #18935 )
2023-09-11 09:42:41 +10:00
deltanedas
91cfabd6f6
light refactoring/rework ( #19314 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-03 22:31:10 -07:00
Visne
c7b21b631b
Remove unused dependencies ( #19490 )
2023-08-24 09:55:15 -08:00
MishaUnity
e4dcdc0c6e
convert News read tab to PDA Cartridge ( #18368 )
...
* Add Console, PDA news tab, and ringstone popup
* Add English localization
* Add mass-media console board to Advanced Entertainment resrarch
* Fix misprint
* Deleting unused libraries
* Fix round restart problem
* Fixing restart problem
* Just another fix
* Сode optimization
* Code optimization
* Convert News read tab to cartridge
Convert the News read tab into a cartridge, and fix a couple of bugs
* Just another fix
* Some updates
* More fixing!!
Fix cooldown, add author label to read menu
* Again, fix cooldown bug
* Some minor changes
* Revert "Some minor changes"
This reverts commit 470c8d727629ac79994f70e56162adae8659e944.
* Some minor updates
2023-07-28 13:59:03 -06:00
PrPleGoo
852f041581
Add auth to the mass-media console ( #18345 )
...
* process my own comments
* add fields and handling
* little cleanups
* localization
* u
* whoops
2023-07-27 14:25:55 -06:00
MishaUnity
325d2a39ee
add mass-media system ( #18251 )
...
* Add Console, PDA news tab, and ringstone popup
* Add English localization
* Add mass-media console board to Advanced Entertainment resrarch
* Fix misprint
* Deleting unused libraries
* Fix round restart problem
* Fixing restart problem
* Just another fix
* Сode optimization
* Code optimization
2023-07-26 12:49:38 -06:00
TemporalOroboros
df1dcb74ac
Dewarns access ( #16666 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-07-23 14:19:51 +10:00
Pieter-Jan Briers
f5bd24f990
Clean up PDA event subscriptions. ( #17434 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-06-24 22:02:59 +10:00
ShadowCommander
dd7032a860
Mind ECS ( #16826 )
2023-06-19 04:33:19 +10:00
0x6273
247c7a1d4d
Fix PDA capitalization to be PascalCase ( #17335 )
2023-06-15 11:44:28 +10:00
