Morb0
e21ee44f9e
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/Prototypes/Maps/aspid.yml
# Resources/Prototypes/Maps/barratry.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/kettle.yml
# Resources/Prototypes/Maps/origin.yml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-09-13 16:51:52 +03:00
metalgearsloth
748ca93f5c
Fix context menu for admin menu ( #20030 )
2023-09-12 14:34:20 +10:00
Leon Friedrich
a225fe99b6
Fix misc commands ( #20004 )
2023-09-11 15:21:52 +10:00
metalgearsloth
5a0fc68be2
Content update for NetEntities ( #18935 )
2023-09-11 09:42:41 +10:00
Morb0
676272809d
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-08-08 12:54:45 +03:00
metalgearsloth
51d7f180e0
Fix LoadPrototype admin button ( #18802 )
2023-08-07 11:02:38 -06:00
faint
bf4e12fdf3
Merge remote-tracking branch 'wizards/master' into upstream-sync
2023-07-23 14:29:20 +03:00
metalgearsloth
e755509fc7
More miscellaneous compiler warning fixes ( #18228 )
2023-07-23 16:03:57 +10:00
faint
5828dca50b
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/Nuke/NukeSystem.cs
# Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.cs
# Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml
# Resources/Prototypes/Entities/Mobs/Player/human.yml
# Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
# Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
# Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
# Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
# Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
# Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
# Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
# Resources/Prototypes/Roles/Jobs/Science/scientist.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cap.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-ce.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cent.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-chaplain.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-clown.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cmo.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-deny.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-hop.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-hos.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-iaa.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-mime.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-qm.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-rd.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-syndicate.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-warden.png
2023-07-21 16:32:31 +03:00
Riggle
579913b617
Better notes and bans ( #14228 )
...
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
2023-07-21 13:38:52 +02:00
faint
076d2e339b
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
# Content.Client/LateJoin/LateJoinGui.cs
# Content.Client/Power/PowerMonitoringWindow.xaml.cs
# Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png
# Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-right.png
# RobustToolbox
2023-07-10 07:03:24 +03:00
metalgearsloth
68480af109
Update content vectors to numerics ( #17759 )
2023-07-08 14:08:32 +10:00
Morb0
c124b716a3
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Traits/TraitSystem.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Research/technologies.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
# Resources/Prototypes/Maps/aspid.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Maps/barratry.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/kettle.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Maps/moose.yml
# Resources/Prototypes/Maps/omega.yml
# Resources/Prototypes/Maps/origin.yml
# Resources/Prototypes/Maps/saltern.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/inhand-left.png
# Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/inhand-right.png
2023-05-20 13:51:12 +03:00
Leon Friedrich
be0d22ad5e
Move upload commands to engine ( #16582 )
2023-05-20 11:53:09 +10:00
Morbo
ea68e39611
Merge remote-tracking branch 'upstream/master' into upstream-sync2
...
# Conflicts:
# Resources/Prototypes/Datasets/Names/syndicate.yml
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
# Resources/ServerInfo/RulesCorvax.txt
# Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
2023-04-19 02:54:06 +03:00
Morb
0e6b273f1f
Add fax admin panel ( #15215 )
2023-04-16 23:20:57 -07:00
Morbo
5a14c570aa
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
# Resources/Prototypes/typing_indicator.yml
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Structures/Machines/fax_machine.rsi/icon.png
# Resources/Textures/Structures/Machines/fax_machine.rsi/idle.png
# Resources/Textures/Structures/Machines/fax_machine.rsi/inserting.png
# Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png
# Resources/Textures/Structures/Storage/Crates/livestock.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/livestock.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/livestock.rsi/open.png
2023-04-15 19:12:31 +03:00
DrSmugleaf
af49ead70f
Add show disconnected button to admin player tab ( #15326 )
2023-04-12 23:30:03 +10:00
Morb
3801a3b8e6
Fix shuttle call window ( #898 )
2023-03-18 16:14:44 -07:00
DamianX
0bd1756fb2
Made ColorSelectorSliders use SpinBox instead of FloatSpinBox ( #13702 )
...
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
2023-03-06 10:07:49 -08:00
Morb
f0429edbb1
Add panic bunker toggle to admin menu ( #13450 )
2023-01-20 07:25:35 -08:00
Visne
c6d3e4f3bd
Fix warnings and code cleanup/fixes ( #13570 )
2023-01-19 13:56:45 +11:00
Pieter-Jan Briers
a323671984
Changes for prototype load parallelization ( #13066 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-12-20 14:25:34 -08:00
metalgearsloth
3b3963083b
Replace GridEntityId with Owner ( #12743 )
2022-12-12 14:59:02 +11:00
metalgearsloth
6c76061887
Content changes for mapgrid kill ( #12567 )
2022-11-22 13:12:04 +11:00
DrSmugleaf
da29a01846
Add ban list window ( #12574 )
2022-11-14 20:06:55 +01:00
metalgearsloth
c0abea8047
Content side for removing IMap / IMapGrid comps ( #12357 )
2022-11-04 10:12:25 +11:00
Kara
7ad867fa0f
Slight localization func cleanup ( #11380 )
2022-10-18 19:51:18 -07:00
Leon Friedrich
9ba869c744
Fix admin ObjectsTab error ( #11272 )
2022-09-15 14:06:52 -05:00
wrexbe
dc8cc81137
More minor UI refactor stuff ( #11287 )
2022-09-14 20:42:35 -07:00
Flipp Syder
f4c38d74e1
Load prototype command ( #11275 )
2022-09-15 11:43:50 +10:00
wrexbe
018a96ee88
Merge more UI refactor stuff ( #11277 )
...
* Changelog+options ui controller
* Sandbox UI controller
* Escape menu UI controller
2022-09-14 14:34:48 -07:00
Alex Evgrashin
0a502f586d
Fixed loc ( #11202 )
2022-09-11 17:48:08 -05:00
Rinkashikachi
6137803891
Various localization fixes ( #9860 )
2022-07-24 04:44:45 +10:00
Moony
f98df73fae
Adds even more smites and a bunch of tools. ( #9825 )
...
* Adds three new smites, headstand, locker stuff, and reptilian species swap.
* Localize all the smites.
* save work
* More smites...
* Final tweaks.
* oops
* !PLEH
* Adds disarm prone and improved hand removal options.
* fix chances.
* take out the trash.
* Add some admin TRICKS instead of more smites.
* oop
* Implements the admin test arena and associated trick.
* Tricks for granting/revoking access.
* e
* mfw
* Implement quick dialogs, for when you don't want to spend 20 minutes writing a simple dialog prompt.
* Forgot the rejuv icon.
* E
* docs
* augh
* Add rename/redescribe buttons.
* Adds objects menu, implements a couple tricks for stations.
* 1984
* Adds a trick for effectively infinite power.
* fixes some icon uggo.
* a
* HALT!
* Pause/unpause buttons.
* Forgor the textures.
* they broke every bone in their body.
* i added more
* more battery actions, touch up battery icon.
* Address reviews.
2022-07-21 17:30:00 -05:00
metalgearsloth
2420d281bb
Fix loadbp window perm issue ( #9671 )
2022-07-15 13:03:18 +10:00
Kara
b9a0894d7c
Event refactor ( #9589 )
...
* Station event refactor
* Remove clientside `IStationEventManager`
we can just use prototypes
* Basic API idea
* Cruft
* first attempt at epicness
* okay yeah this shit is really clean
* sort out minor stuff
* Convert `BreakerFlip`
* `BureaucraticError` + general cleanup
* `DiseaseOutbreak`
* `FalseAlarm`
* `GasLeak`
* `KudzuGrowth`
* `MeteorSwarm`
* `MouseMigration`
* misc errors
* `PowerGridCheck`
* `RandomSentience`
* `VentClog`
* `VentCritters`
* `ZombieOutbreak`
* Rewrite basic event scheduler
* Minor fixes and logging
* ooooops
* errors + fix
* linter
* completions, `RuleStarted` property, update loop fixes
* Tweaks
* Fix #9462
* Basic scheduler update fix, and fixes #8174
* Add test
* UI cleanup
* really this was just for testing
2022-07-10 20:48:41 -05:00
Kara
2d5ec7f85c
Id[entity] 2.0 (real) ( #9612 )
...
* starter API
* network ID cards
* Port more stuff from old identity
* Re-implement identity representation + name updating
* move
* proper name returning for `IdentityName`
* move everything important to server, give in to temptation
* shared / server / client split sadly. move ensure to shared and spawn to server
* identity update queueing + identityblocker
* fixes
* and just like that it's usable for admins
* huge identity pass
* pass dos
* jesus christ
* figs :D
* fuck u
* fix bad merge.
Co-authored-by: Moony <moonheart08@users.noreply.github.com>
2022-07-10 20:36:53 -05:00
metalgearsloth
e6b581e967
Fix loadbp window maps ( #9485 )
2022-07-06 18:59:12 +10:00
metalgearsloth
7e0b49c7bd
Add UI window for loadbp ( #9441 )
...
* Add UI window for loadbp
* Perms disabled
* Also teleport button
* wraparound fix
* Review
2022-07-06 14:17:19 +10:00
Leon Friedrich
fa4c6f63f8
Nullable grid Uid ( #8798 )
2022-06-20 10:14:35 +10:00
Acruid
4f9be42f40
Remove Explicit GridId References ( #8315 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-06-12 11:54:41 +10:00
Pieter-Jan Briers
0681bb1e00
Fix invalid XAML markup cases
...
Rider EAP is highlighting these now
2022-06-02 21:50:48 +02:00
DrSmugleaf
5227d1a023
Admin notes ( #7259 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-04-16 20:57:50 +02:00
DrSmugleaf
3c15de5f55
Make the admin player panel overlay button a toggle ( #7153 )
2022-03-24 17:08:08 +01:00
Javier Guardia Fernández
8ee1503861
Make the admin set OOC and LOOC buttons a toggle ( #7152 )
2022-03-16 22:58:35 +01:00
Javier Guardia Fernández
995c02169e
Add sorting the admin player panel by clicking the headers ( #7150 )
2022-03-16 22:58:15 +01:00
metalgearsloth
c908a843ab
Sort playertab by username ( #7067 )
2022-03-12 10:56:19 +11:00
metalgearsloth
bee627ac6a
Turn SandboxManager into a system ( #6867 )
2022-02-23 17:00:30 -07:00
mirrorcult
ec4d4688c7
Seal/abstract/virtual everything ( #6739 )
2022-02-16 18:23:23 +11:00
