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

139 commits

Author SHA1 Message Date
faint
bf4e12fdf3 Merge remote-tracking branch 'wizards/master' into upstream-sync 2023-07-23 14:29:20 +03:00
Pieter-Jan Briers
b4b0fe41db
Admin notes bugfixes (#18189) 2023-07-21 15:43:47 +02: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
Morbo
50c80d2bd2 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Nuke/NukeComponent.cs
#	Resources/Prototypes/Voice/disease_emotes.yml
 2023-04-29 14:53:32 +03:00
Chief-Engineer
5eba1d230a
Add IP ban exemption flag (#15815) 2023-04-27 11:59:18 -07:00
Morbo
8cc2a785fc Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/Roles/Jobs/Security/detective.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
#	Resources/Textures/Structures/Storage/tanks.rsi/meta.json
 2023-04-04 23:53:11 +03:00
Pieter-Jan Briers
c8e90e561b
Server ban exemption system (#15076) 2023-04-03 10:24:55 +10:00
Morbo
ca189b0db4 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Shared/CCVar/CCVars.cs
 2023-03-21 02:50:29 +03:00
Pieter-Jan Briers
360a507688
Shared interfaces for server and role ban entities (#14730) 2023-03-18 20:44:14 +01:00
Morbo
82a466f4ff Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
#	Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Resources/Audio/Announcements/license.txt
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
 2023-03-07 18:54:29 +03:00
Pieter-Jan Briers
c5b3f62f6f
Update project files for configuration changes. (#14281) 2023-03-06 11:38:07 -08:00
Morbo
e5fda096d9 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Nuke/NukeSystem.cs
#	Resources/Prototypes/Maps/box.yml
 2023-02-25 07:37:50 +03:00
Pieter-Jan Briers
220b19f5ca
Rename migrations to fix CS8981 warnings. (#14160) 2023-02-19 10:59:52 +11:00
Morb
fd9c06a458
TTS (Text-To-Speech) (#618) 2023-01-10 18:01:20 -08:00
DrSmugleaf
cd803a82bd
Update projects to C# 11 (#13111) 2022-12-20 22:33:57 +11:00
Visne
4cc5fa239e
Implement traits system (#10693) 2022-09-10 08:40:06 -07: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
Moony
8e90bf46e9
Implements panic bunkering. (#9315) 
* Implements panic bunkering.
Helps with raid management, esp with unknown accounts.

* adds an enable/disable command.
 2022-07-01 22:46:37 +02:00
wrexbe
0fc8c0ef5e
Update some nugets (#8738) 2022-06-09 18:25:59 -07:00
Veritius
3b7e202044
Flavor text (#8070) 2022-05-13 15:58:45 -07:00
wrexbe
bc68ac96dd
Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
Julian Giebel
288f66d8c4
Implement count estimate query for postgresdb (#7956) 2022-05-06 16:04:33 +02:00
DrSmugleaf
0502d3dec4
Make Profile.Markings db column jsonb (#7947) 2022-05-05 11:23:48 +02:00
Flipp Syder
a30cae21f6
Markings (#7072) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-05-05 10:07:42 +02:00
Pieter-Jan Briers
fc119befca
Fix admin log indices. (#7920) 2022-05-04 16:18:55 +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
ca0fb3c6a2
Track rule reading in database, don't show popup locally (#7278) 2022-03-26 20:16:57 +01:00
Vera Aguilera Puerto
eb54f4b224
Adds Network Resource Uploading for admins. (#6904) 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
 2022-03-26 12:46:37 +01:00
Julian Giebel
414d226ec5
Server names and admin log full-text search (#6327) 
Co-authored-by: Julian Giebel <j.giebel@netrocks.info>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
 2022-03-13 18:36:48 +01:00
Pieter-Jan Briers
6b66c7db8a Fix database model migrations after role bans. 
Role bans (#6703) seemed to have changes to the DB model from after the migrations were created. This means a bunch of constraints/indices changed names and this wasn't reflected in a migration yet.
 2022-03-08 23:36:02 +01:00
ShadowCommander
b99b1f4008
Fix RoleUnban referring to the wrong ban type (#6885) 2022-02-24 15:59:38 -08:00
Kara D
d16b019dd3
nowarn virtual analyzer for migrations 2022-02-22 21:56:45 -07:00
ShadowCommander
4a68718050
Role ban improvements (#6855) 2022-02-21 22:00:55 -07:00
ShadowCommander
4825142210
Role bans (#6703) 2022-02-21 23:11:39 +01:00
Pieter-Jan Briers
debeed9afd Make Server.Database depend on Sqlite.Core instead 
This means Content.Server.Database doesn't have a direct hard dependency on an SQLite implementation. The implementation is already provided by Robust anyways, so this means a publish of SS14.Admin doesn't need a libe_sqlite.so
 2022-02-09 17:16:42 +01:00
Pieter-Jan Briers
19ceda04b5 Fix arg parsing for design time db contexts. 
Don't need to pull this from command line, you can specify --context.
 2022-02-03 03:46:07 +01:00
Pieter-Jan Briers
4da56becab Fix DbContext configuration nightmares. 
Thanks to julian figuring out IDesignTimeDbContextFactory exists in #6327.

All this DbContext configuration and options setup stuff is insane. Microsoft should be absolutely ashamed for coming up with this load of garbage.
 2022-02-03 03:13:34 +01:00
Pieter-Jan Briers
5091c6aa9d
Revert "Revert "Log ban hits in DB. ( (#6361) 2022-02-02 22:57:11 +01:00
Pieter-Jan Briers
764010fea0
Revert "Log ban hits in DB. (#6337)" (#6357) 
This reverts commit b75f005bb4.
 2022-01-28 19:33:09 +01:00
Pieter-Jan Briers
b75f005bb4
Log ban hits in DB. (#6337) 2022-01-28 19:10:44 +01:00
Pieter-Jan Briers
a3aabf59ad Unify remaining DB model classes between SQLite and Postgres. 
As part of this, the ban and unban table were renamed to server_* on SQLite to move them in line with Postgres. Data is preserved.
 2022-01-27 18:12:09 +01:00
wrexbe
5ceb2372bf
Clean up some warnings (#6088) 
* Clean up some warnings

* Remove nullable enable

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2022-01-09 22:10:36 -06:00
Moony
ca984036d6
Upstream species (#6066) 
* Step 1 of porting; grabbed most of the files via patches.

* Add species field to the DB

* Appearance patches for slimes.

* Fix the db test.

* Add slime's biocompat.

* slimby

* Fixes, allow specifying if a species is playable or not.

* Update Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs

Co-authored-by: Javier Guardia Fernández <DrSmugleaf@users.noreply.github.com>

* Update Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs

Co-authored-by: Javier Guardia Fernández <DrSmugleaf@users.noreply.github.com>

* Update Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs

Co-authored-by: Javier Guardia Fernández <DrSmugleaf@users.noreply.github.com>

* Address reviews.

* Address reviews.

* make an if-case.

* Fix a goof where species wouldn't get shown in the editor correctly (it'd always default to human)

Co-authored-by: Javier Guardia Fernández <DrSmugleaf@users.noreply.github.com>
 2022-01-08 19:53:14 -06:00
mirrorcult
af785f873f
Optional server whitelists (#5979) 2022-01-05 00:37:06 +11:00
DrSmugleaf
0b8233909c Ignore EFCore SensitiveDataLoggingEnabledWarning 2022-01-02 00:33:29 +01:00
DrSmugleaf
fdf7aae744 Enable sensitive data logging on debug for SQLite 
Postgres already has it enabled
 2021-12-26 00:50:50 +01:00
DrSmugleaf
f23ca09d09 Add more debug logging to admin logs 2021-12-20 01:23:11 +01:00
Pieter-Jan Briers
64861ff034
Add Content.Shared.Database (#5588) 2021-11-28 14:56:53 +01:00
DrSmugleaf
c3fe5909ad THE RETURN OF THE KING 
This reverts commit c18d07538a.
 2021-11-22 19:08:27 +01:00