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

74 commits

Author SHA1 Message Date
Morb0
47b58a0282 Fix upstream 2024-10-04 20:05:59 +03:00
Morb0
3ab6d3ef71 Merge remote-tracking branch 'wizards/master' into upstream-sync 
# Conflicts:
#	.github/workflows/publish.yml
#	Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
#	Content.Server/GameTicking/GameTicker.Player.cs
#	Content.Server/VoiceMask/VoiceMaskComponent.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Content.Server/VoiceMask/VoiceMaskerComponent.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Entities/Clothing/Masks/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/regalrat.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/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/blue_circuit.png
#	Resources/Textures/Tiles/green_circuit.png
#	Resources/Textures/Tiles/steel.png
 2024-10-04 19:47:54 +03:00
nikthechampiongr
a5840b925b
Fix RA0032 (#32514) 2024-09-29 02:25:21 +02:00
Morb0
0f339baab5 Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Entities/Stations/base.yml
 2024-09-01 22:20:47 +03:00
Pieter-Jan Briers
528fb4ad55
Quick warning fixes (#31694) 2024-09-01 04:54:39 +02:00
Morb0
721f7bfecf Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Resources/Prototypes/Datasets/Names/ai.yml
#	Resources/Prototypes/Datasets/adjectives.yml
#	Resources/Prototypes/Datasets/verbs.yml
#	Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
#	Resources/Prototypes/Entities/Mobs/base.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
#	SpaceStation14.sln
 2024-08-28 16:40:36 +03:00
metalgearsloth
678320f876
Fix whitelist (#31563) 2024-08-28 17:11:25 +10:00
Simon
f92ef41538
Automated whitelists (#23985) 
* Beginnings of making the breadmemes jobs easier

* stuff

* stuff pt. 2

* Stuff pt.3

* Stuff I forgot last time

* Basic whitelist

Only people that are added to the whitelist with the addwhitelist command will be able to join. I call this the "legacy" whitelist

* Remove always deny condition in favor of just breaking if playtime check fails

* Change default whitelist

Default whitelist is now the "legacy" whitelist.

* localization

* Admin check

* minor spelling change

* Fix build

* Whitelist message

* Fix vars not being datafield and spelling mistakes

* Minor spelling mistake

* Change config for salamander

* Reviews and stuff

* Add summaries

* Fix whitelists

* Forgot to add a datafield

* Fixing stuff I guess

* Reuse admin remarks to reduce load when connecting.

* Update log messages to be verbose instead of debug

* Reviews

* whoops

* Explain a bit more how whitelist checking works

* Apply CE's review

* Append Membership to Blacklist and Whitelist conditions

* Fix review comments

* Uncapitalize playerConnectionWhitelist, add to ignored client prototypes

* Make note count field work

* Fix cvar for thingy

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
 2024-08-27 18:01:17 +02:00
Morb0
acf1ff4ec0 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Resources/Prototypes/AlertLevels/alert_levels.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Datasets/Names/fortunes.yml
#	Resources/Prototypes/Datasets/ion_storm.yml
#	Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
#	Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
#	Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
#	Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
#	Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Recipes/Lathes/clothing.yml
#	Resources/Prototypes/StatusIcon/faction.yml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
#	Resources/Textures/Clothing/Mask/joy.rsi/meta.json
#	Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
#	Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png
#	Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png
#	Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
#	Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png
#	Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png
#	Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png
#	Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png
#	Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png
#	Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png
#	Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png
#	Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
 2024-08-12 13:18:43 +03:00
Repo
279e28768c
Fix Panic bunker and Baby Jail being up to 14hrs incorrect. (#30581) 
Fix a potential bypass for Panic bunker and baby Jail
 2024-08-09 15:48:01 +10:00
Morb0
a5980baa7d Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
#	Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
#	Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/court.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/law.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/security.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/space.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png
#	Resources/migration.yml
 2024-07-21 07:20:43 +03:00
Chief-Engineer
6d664c9157
Add debug logs to baby jail and fix playtime logic (#30158) 
* add debug logs

* Update Model.cs

* fix playtime logic for null playtime

* remove unnecessary condition

* either me or the compiler is having a C# skill issue
 2024-07-21 01:28:43 +02:00
Morb0
8ffde2eea4 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 
# Conflicts:
#	.github/workflows/publish.yml
#	.github/workflows/test-packaging.yml
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
#	Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png
#	Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png
#	Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png
#	Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png
#	Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png
#	Tools/gen_build_info.py
 2024-07-14 12:15:16 +03:00
Chief-Engineer
6371a04621
Fix baby jail (#29896) 
* Revert "Revert Baby Jail (#29891)"

This reverts commit 24a2866747.

* the fix
 2024-07-11 15:14:01 +10:00
Morb0
6d1173b8f3 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 
# Conflicts:
#	.github/labeler.yml
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Content.Shared/Chat/TypingIndicator/TypingChangedEvent.cs
 2024-07-11 04:43:23 +03:00
Vasilis
24a2866747
Revert Baby Jail (#29891) 
* Revert "SS14-28662 Add Baby Jail: a Jail for Babies (inverse panic bunker) (#28763)"

This reverts commit 3ceb92a0c4.

* Revert configs

* Oops
 2024-07-11 10:33:47 +10:00
Morb0
da333a1972 Merge remote-tracking branch 'refs/remotes/upstream/master' into master-syndie 
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Options/UI/Tabs/AudioTab.xaml
#	Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
#	Content.Server/Connection/ConnectionManager.cs
#	Content.Shared/Preferences/Loadouts/RoleLoadout.cs
#	Resources/Prototypes/Loadouts/role_loadouts.yml
#	Resources/Prototypes/SoundCollections/NukeMusic.yml
#	Resources/Textures/Clothing/Belt/securitywebbing.rsi/equipped-BELT.png
#	Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png
#	Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-left.png
#	Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-right.png
#	Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json
#	Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png
 2024-06-27 13:40:52 +03:00
Chief-Engineer
c81ba6e4a9
Alert shared connections (#29405) 
* add admin alert for active shared connections

* update wizden config

* review
 2024-06-26 15:43:43 +02:00
Chief-Engineer
fd0511144a
Use moderator perms for grant_connect_bypass (#29406) 
use moderator perms for grant_connect_bypass
 2024-06-24 23:56:29 +02:00
Morb0
9888f8fa57 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs
#	Content.Client/Lobby/LobbyUIController.cs
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Content.Server/Connection/ConnectionManager.cs
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Content.Shared/Administration/Events/PanicBunkerChangedEvent.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
#	Resources/Prototypes/Entities/Mobs/base.yml
#	Resources/Prototypes/Roles/Antags/nukeops.yml
#	Resources/Prototypes/Roles/Antags/revolutionary.yml
#	Resources/Prototypes/Roles/Antags/traitor.yml
#	Resources/Prototypes/Roles/Antags/zombie.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
#	Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
#	Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
#	Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
#	Resources/ServerInfo/Guidebook/Controls/Controls.xml
#	Resources/ServerInfo/Guidebook/Controls/Radio.xml
#	Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
#	Resources/ServerInfo/Guidebook/Engineering/Fires.xml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/ServerInfo/Guidebook/Jobs.xml
#	Resources/ServerInfo/Guidebook/Medical/Chemist.xml
#	Resources/ServerInfo/Guidebook/Medical/Medical.xml
#	Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml
#	Resources/ServerInfo/Guidebook/Science/Science.xml
#	Resources/ServerInfo/Guidebook/Security/Security.xml
#	Resources/ServerInfo/Guidebook/Service/Bartender.xml
#	Resources/ServerInfo/Guidebook/Service/Chef.xml
#	Resources/ServerInfo/Guidebook/SpaceStation14.xml
#	Resources/ServerInfo/Guidebook/Survival.xml
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
 2024-06-14 19:48:52 +03:00
Hannah Giovanna Dawson
1bb9d9451f
Panic Bunker uses minutes not hours (#28805) 
* Panic Bunker uses minutes not hours

* Fixing an instance of hours
 2024-06-09 22:45:47 +02:00
Hannah Giovanna Dawson
3ceb92a0c4
SS14-28662 Add Baby Jail: a Jail for Babies (inverse panic bunker) (#28763) 2024-06-09 14:58:10 -04:00
Morb0
80c6ccf4d2 Use shared sponsors manager 2024-05-13 17:45:23 +03:00
Morb0
782d82c0cd Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Datasets/ion_storm.yml
#	Resources/Prototypes/Entities/Clothing/Masks/specific.yml
#	Resources/Prototypes/StatusEffects/health.yml
#	Resources/Prototypes/StatusEffects/job.yml
#	Resources/Prototypes/StatusEffects/security.yml
#	Resources/Textures/Decals/bricktile.rsi/white_box.png
 2024-04-12 02:17:14 +03:00
Pieter-Jan Briers
d879665b52
Add new "grant_connect_bypass" admin command (#26771) 
This command allows you to grant a player temporary privilege to join regardless of player cap, whitelist, etc. It does not bypass bans.

The API for this is IConnectionManager.AddTemporaryConnectBypass().

I shuffled around the logic inside ConnectionManager. Bans are now checked before panic bunker.
 2024-04-09 17:25:21 +02:00
Morb0
a751abc778 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml
 2024-03-17 14:01:54 +03:00
Pieter-Jan Briers
0ecc5e8c96
Throttle people trying to connect to a full server. (#20972) 
* Throttle people trying to connect to a full server.

To reduce spam/load on the server and connection logs table.

Players are forced to wait 30 seconds after getting denied for "server full", before they can try connecting again.

This code is an absolute nightmare mess. I tried to re-use the existing code for the redial timer but god everything here sucks so much.

Requires https://github.com/space-wizards/RobustToolbox/pull/4487

* Use new NetDisconnectMessage API instead.

* Add admin.bypass_max_players CVar.

Just something to help with debugging the player cap on dev, I don't expect this to ever be disabled on real servers.
 2024-03-14 19:00:47 +11:00
Morb0
3f33c064d2 Fix admin queue bypass 2024-02-29 21:04:14 +03:00
Morb0
fe48e6deda Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Preferences/ClientPreferencesManager.cs
#	Content.Server/Connection/ConnectionManager.cs
#	Content.Server/Preferences/Managers/ServerPreferencesManager.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Content.Shared/Preferences/ICharacterProfile.cs
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
#	Resources/Prototypes/Datasets/Names/fortunes.yml
#	Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
#	Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
#	SpaceStation14.sln
 2024-02-26 15:14:44 +03:00
metalgearsloth
b26acc9547
Panic bunker fix (#25538) 
* Panic bunker fix

I admin

* tired
 2024-02-25 23:48:54 +01:00
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