Morb0
37dc87ad6f
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/MassMedia/Ui/NewsWriteBoundUserInterface.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/MassMedia/Systems/NewsSystem.cs
# Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
# Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
# Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open.png
# Resources/Textures/Structures/Wallmounts/posters.rsi/poster29_legit.png
# SpaceStation14.sln
# Tools/actions_changelogs_since_last_run.py
# Tools/package_client_build.py
# Tools/package_server_build.py
2024-01-15 01:56:14 +03:00
Vasilis
22c0b4425d
Cvar to allow whitelisted players to bypass panic bunker ( #23885 )
...
Among us
2024-01-14 16:27:32 +11:00
Morb0
f062cbcec2
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Chat/Systems/ChatSystem.cs
# LICENSE.TXT
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png
# Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json
# Resources/Textures/Structures/Piping/disposal.rsi/conmailing.png
# Resources/Textures/Structures/Piping/disposal.rsi/mailing-charging.png
# Resources/Textures/Structures/Piping/disposal.rsi/mailing-flush.png
# Resources/Textures/Structures/Piping/disposal.rsi/mailing.png
# Resources/Textures/Structures/Piping/disposal.rsi/mailover-handle.png
# Resources/Textures/Structures/Piping/disposal.rsi/meta.json
2024-01-02 23:07:58 +03:00
LankLTE
e76d8390bd
add cvar for custom panic bunker reason ( #23267 )
...
Panic bunker cvar
2023-12-31 21:53:49 -05:00
Morb0
caf8ac8005
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
# Resources/Textures/Objects/Tools/wrench.rsi/meta.json
2023-12-08 13:54:31 +03:00
Pieter-Jan Briers
b4f8393f42
Log server ID in connection logs table ( #21911 )
2023-12-07 09:48:56 +11:00
Morb
63551a4471
[Secrets] VPN guard ( #1594 )
2023-11-28 18:52:28 +03:00
Morb
a9bd03e5b8
Update queue ( #1477 )
2023-10-02 21:46:03 +03:00
Morb
a5504424c4
Update sposnors system ( #1475 )
2023-10-02 19:06:17 +03:00
Morb
195c402ef1
[Major] Moving out Queue, Verifications and Sponsors ( #1435 )
2023-10-01 14:59:40 +03: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
3af2e60817
Ban message improvements ( #14731 )
...
Server config now provide appeals forum link, game admins won't need to type it out manually anymore.
Add warning about trying to ban evade.
Cleaned up code a bit.
2023-03-18 19:55:12 -05: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
Morb
91978660b1
Bypass bunker for privileged players ( #847 )
2023-02-19 18:19:47 -08:00
Kara
f5d6588e52
Fix whitelist ( #14181 )
2023-02-19 06:28:14 -08:00
Morbo
f989de7af5
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs
# Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs
# Resources/Prototypes/Roles/Jobs/Science/scientist.yml
2023-02-05 03:01:05 +03:00
Kara
917aa80b4b
Whitelist player constraints ( #13812 )
2023-01-31 16:57:45 +11:00
Morb
8a2a97d816
Extract CVars class ( #653 )
2022-12-20 01:08:58 -08:00
Morbo
f9229d979c
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
2022-12-02 06:42:59 +03:00
Morb
d956b8bfcc
Panic bunker min overall playtime & deny reason ( #12811 )
...
* Add min overall hours & reason
* Disable show reason by default
2022-12-01 10:41:47 -06:00
Morb
fb3f24652e
Revert "Revert "Server join queue ( #583 )"" ( #602 )
2022-11-29 06:41:12 -08:00
Morb
e025a5ded1
Rework sponsor markings ( #593 )
2022-11-27 08:13:01 -08:00
Morb
97973e2ed9
Revert "Server join queue ( #583 )"
...
This reverts commit 84605eacb8
2022-11-27 04:09:27 -08:00
Morb
84605eacb8
Server join queue ( #583 )
2022-11-25 23:38:46 -08:00
Morb
9c9af7567e
Sponsors markings ( #552 )
2022-11-15 11:22:06 -08:00
Morbo
06399f4e51
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Textures/Objects/Tools/welder.rsi/icon.png
# Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png
# Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png
# Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png
# Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png
2022-11-02 04:55:26 +03:00
Rane
5edc9cd6b1
fix panic bunker ( #12282 )
2022-11-01 20:17:58 -05:00
Morb
7ae33c14b3
Sponsor cat marking reward ( #437 )
2022-10-09 17:59:41 -07:00
Morb
55b8f54f33
Sponsor priority join ( #428 )
2022-09-26 19:32:39 -07:00
Dylan Corrales
4ea7087d6f
9386 Permanent ban message change ( #11325 )
2022-09-15 12:33:11 -07:00
wrexbe
c4d135e253
Refactor lobby status ( #10550 )
2022-08-14 12:54:49 -07:00
Kara
bbdb269b5f
Whitelist reason cvar + RP server whitelist reason ( #10451 )
2022-08-08 16:55:57 -07: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
bc68ac96dd
Cleanup the namespaces ( #8132 )
2022-05-13 17:59:03 +10: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
Moony
1a62cefdf9
Add an exception to the soft max player cap for players who joined the game at some point during the current round. ( #6245 )
2022-01-19 16:01:21 -07:00
mirrorcult
af785f873f
Optional server whitelists ( #5979 )
2022-01-05 00:37:06 +11:00
moonheart08
40c3261665
Soft player cap that lets in only admins. ( #5227 )
...
* Soft player cap that lets in only admins.
* Update Content.Server/Connection/ConnectionManager.cs
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
* Update Content.Server/Connection/ConnectionManager.cs
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
2021-11-09 10:44:39 +01:00
Saphire Lattice
1d136bf18b
Make ban command properly give a ban message instead of a placeholder ( #5087 )
2021-10-29 20:54:14 +02:00
Visne
b7dc3c81ae
Remove redundant #nullable enable ( #4275 )
2021-07-16 17:37:09 -07:00
DrSmugleaf
f878f353e4
Move some files out of Content.Shared root because I forgot ( #4182 )
2021-06-13 22:52:40 +10:00
DrSmugleaf
ff1a2d97ea
Re-organize all projects ( #4166 )
2021-06-09 22:19:39 +02:00
