NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-20 07:21:12 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
24469 commits 14 branches 0 tags 2.9 GiB
Commit graph

233 commits

Author SHA1 Message Date
Morb0
4426394d78 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/Datasets/Names/regalrat.yml
#	Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png
 2023-12-23 02:53:18 +03:00
DrSmugleaf
0273bbcbf3
Fix right click not showing the context menu in AHelps, players tab and objects tab (#22798) 
* Fix right clicks in AHelp window

* Fix player tab right click

* Fix objects tab right click
 2023-12-20 23:32:52 -07:00
Morb0
33942c412a Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/deny-unshaded.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-0.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-1.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-2.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-3.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/on.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/panel.png
 2023-12-14 00:57:14 +03:00
Pieter-Jan Briers
16bd6802df
More UI fixes (#22431) 
* Fix chat filter button

Oh look, the popup code was copy pasted between chat filter and channel selector.

Hilarious.

Anyways same stuff as 995f506aaf. I pulled it all out into a base class so NO MORE COPY PASTE.

Fixes #22360

* Remove all further EnableAllKeybinds buttons.

Fixes #22346

Yeah none of these are valid use cases, why is this set...
 2023-12-12 19:02:19 -07:00
Morb
63551a4471
[Secrets] VPN guard (#1594) 2023-11-28 18:52:28 +03:00
Morb0
611bfea5ff Merge remote-tracking branch 'upstream/master' into update-sposnors 
# Conflicts:
#	.github/workflows/publish.yml
#	Content.Packaging/ContentPackaging.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/GameTicking/GameTicker.StatusShell.cs
#	Resources/Audio/Weapons/Guns/Gunshots/license.txt
#	Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/opening.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png
 2023-11-08 03:00:51 +03:00
Leon Friedrich
6a8023cf8b
Fix admin verb PVS issue (#21406) 2023-11-05 02:58:26 +11:00
metalgearsloth
5b8f3c48c4
Revert "Update submodule to 175.0.0 (#21318)" (#21319) 2023-10-29 15:29:30 +11:00
metalgearsloth
9b1b3e03ed
Content audio (#20862) 2023-10-29 14:58:23 +11:00
Morb0
681762aca7 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/GameTicking/GameTicker.Player.cs
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Content.Server/Preferences/Managers/ServerPreferencesManager.cs
#	Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
#	Resources/Prototypes/Objectives/objectiveGroups.yml
 2023-10-28 14:14:36 +03:00
Leon Friedrich
e685cb626b
Un-revert IPlayerManager refactor (#21244) 2023-10-28 09:59:53 +11:00
ShadowCommander
4b10cab617
Change ListContainer to send null when selected is removed from the data (#20595) 2023-10-24 22:07:47 -04: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
Morb0
2af666368b Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/MassMedia/Systems/NewsSystem.cs
#	Resources/Prototypes/Catalog/uplink_catalog.yml
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
 2023-10-20 01:50:09 +03:00
DrSmugleaf
f560f88eb5
Remove 700 usages of Component.Owner (#21100) 2023-10-19 12:34:31 -07:00
Morb0
1c61956e31 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/ServerInfo/Guidebook/Science/Science.xml
 2023-10-18 13:22:26 +03:00
DrSmugleaf
c3e303b80b
Fix sorting admin player tab playtime alphabetically (#21028) 
* Fix sorting admin player tab playtime alphabetically

* Admin changelog
 2023-10-15 23:32:51 -06:00
Morb0
55a91108c1 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Chat/Managers/ChatManager.cs
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
#	Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
#	Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png
#	Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png
#	Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png
#	Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png
#	Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json
 2023-10-15 17:52:02 +03:00
DrSmugleaf
8801885b35
Fix not being able to sort by playtime in the F7 players tab (#21004) 2023-10-14 14:56:06 -07:00
DrSmugleaf
f02a54497d
Make the panic bunker UI send cvar updates on focus exit, add erase verb tooltip message (#20987) 2023-10-14 02:28:08 -07:00
DrSmugleaf
5be0df32ad
Add admin Erase verb, add checkbox to erase from the ban panel (#20985) 2023-10-14 02:02:56 -07:00
DrSmugleaf
3a2482420f
Show total playtime in player list and AHelp window (#20980) 2023-10-14 01:55:40 -07:00
Morb0
6f6cbb14af Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
#	Content.Client/Changelog/ChangelogManager.cs
#	Resources/Prototypes/Voice/disease_emotes.yml
#	Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png
#	Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
#	SpaceStation14.sln
 2023-10-14 00:39:46 +03:00
DrSmugleaf
db4ad40430
Add panic bunker UI and automatic panic bunker (#20954) 2023-10-13 11:56:12 -07:00
Morb0
34a8740819 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/workflows/build-test-release.yml
#	Content.Client/Humanoid/HumanoidAppearanceSystem.cs
#	Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
#	Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
 2023-10-02 02:18:19 +03:00
DrSmugleaf
445e6aabed
Fix AHelp progressively showing more AHelp panels (#20591) 2023-09-28 18:46:16 -07:00
DrSmugleaf
be61cca53f
Disable AHelp buttons when no player is selected, update button styling (#20568) 2023-09-28 16:46:49 -07:00
DrSmugleaf
72b1d668d4
Add confirmation to kick and respawn in the admin player actions panel (#20542) 2023-09-28 15:46:06 -07:00
Morb0
13b3bfa217 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	.github/workflows/update-wiki.yml
#	Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Content.Shared/Humanoid/Markings/MarkingPrototype.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
#	Resources/ServerInfo/Guidebook/Engineering/AME.xml
#	Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
#	Resources/manifest.yml
 2023-09-24 12:56:24 +03:00
DrSmugleaf
71ab660885
Add role bans tab to the bans admin window (#20388) 2023-09-22 14:08:28 -07:00
Vasilis
413ba8cc9a
Remove cringe hardcodes for background (#20374) 2023-09-22 14:50:34 -05:00
Leon Friedrich
5d7f15c34c
Fix explosion preview/debug overlay (#20353) 2023-09-20 11:19:42 +10:00
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
f05f94fdc0
Fix solution EUIs (#20033) 2023-09-12 14:35:30 +10: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
Leon Friedrich
e4ca6f4fb9
Allow solutions to store extra reagent data (#19323) 2023-09-05 07:55:10 +10:00
Morb0
b1550d7db0 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/Textures/Effects/speech.rsi/meta.json
#	Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
 2023-09-05 00:12:02 +03:00
metalgearsloth
4cfc578011
Revert "Remove most usages of obsolete TransformComponent methods (#1… (#19714) 2023-09-01 12:30:29 +10:00
Morb0
2968d856bf Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
 2023-08-30 20:42:46 +03:00
Visne
1416942bea
Remove most usages of obsolete TransformComponent methods (#19571) 2023-08-30 12:05:19 +10:00
Morb0
3306908b30 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml
#	Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/off-real.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/off.png
 2023-08-15 03:07:16 +03:00
Morb0
22283a01f1 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Nuke/NukeSystem.cs
#	Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
#	Content.Shared/Chat/SharedChatSystem.cs
 2023-08-15 00:08:39 +03:00
DrSmugleaf
d7344bde95
Fix editing a watchlist note temporarily making it appear as a low severity note (#19100) 
* Fix editing a watchlist temporarily making it appear as a low severity note

* Change condition to check that the note type is anything other than note

* Revert "Change condition to check that the note type is anything other than note"

This reverts commit 5c12d89fe8b3547dc11b19bb04e980fe4e7bf206.

* Update Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>

* Check that the note type doesn't have a special icon instead

---------

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
 2023-08-14 15:05:47 -06:00
DrSmugleaf
4cdbe11524
Make faded notes pop in on hover (#19101) 2023-08-14 15:03:53 -06:00
Repo
40e1286606
Fix to allow no severity on messages and watchlists (#19125) 2023-08-14 12:50:33 -07:00
DrSmugleaf
73158ec0f2
Require severity to be set when creating and editing notes (#19059) 2023-08-13 23:37:38 -04:00
DrSmugleaf
9094695a58
Fix new players added to admin logs always defaulting to selected (#19104) 2023-08-13 20:53:48 -05:00