juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,142 Commits 57 Branches 0 Tags
LocalHelperRefactor
Commit Graph

85 Commits

Author SHA1 Message Date
Ed
16e23098db Merge pull request #520 from crystallpunk-14/ed-29-10-2024-upstream 
Stable upstream sync
 2024-10-29 15:15:14 +03:00
Ed
60f8c2c56f remove cvar! 2024-10-29 14:41:41 +03:00
Ed
ae3cbd6092 Merge remote-tracking branch 'upstream/stable' into ed-29-10-2024-upstream 
# Conflicts:
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Content.Server/Temperature/Systems/TemperatureSystem.cs
#	Content.Shared/Localizations/ContentLocalizationManager.cs
 2024-10-29 11:16:56 +03:00
nikthechampiongr
eec533cb77 Reduce player softcap for wizden servers and panic bunker wizden Levi (#32908) 
* Reduce player softcap for wizden servers and panic bunker wizden Leviathan

* Fix bunker message

* Make sure it actually activates by default and make it turn off when an admin joins

* Update Resources/ConfigPresets/WizardsDen/wizardsDen.toml

The voices

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-10-20 12:13:51 +02:00
JIPDawg
c606f7144c Set Salamander round restart time to 5 minutes (#32776) 
Set round restart time to 5 minutes

Edited the .toml to allow people 5 minutes on centcom for extended RP.
 2024-10-18 12:03:12 +02:00
Ed
cc02a133e0 Merge remote-tracking branch 'upstream/master' into ed-17-09-2024-upstream2 
# Conflicts:
#	Content.Server/GameTicking/GameTicker.Spawning.cs
 2024-09-17 11:54:36 +03:00
TurboTracker
4b357a370b Removal of Maxcaps via cvar (#31437) 
* Comment out gastank explosion trigger

* CVAR creation

* Blank line between method + toml update

* I fucking hate VistualStudio

* change bool logic into float

* cat dancing.gif

* Adjust some minor nits

* Update Content.Server/Atmos/EntitySystems/GasTankSystem.cs

Co-authored-by: Partmedia <kevinz5000@gmail.com>

* Un-hardcode unused initial cached CVar value

* Update Resources/ConfigPresets/WizardsDen/wizardsDen.toml

---------

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-09-11 00:05:12 +02:00
Nairod
6fb5ad5293 Set Salamander Max Pop to 80 (#31907) 
Cull Sala Max Pop
 2024-09-09 08:48:32 +02:00
Ed
ca656b3c10 Merge remote-tracking branch 'upstream/master' into ed-29-08-2024 
# Conflicts:
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/Maps/reach.yml
 2024-08-29 14:32:09 +03: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
Ed
c82b17a65e Merge remote-tracking branch 'upstream/master' into ed-19-08-2024-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Shared/Clothing/Components/ClothingComponent.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/atlas.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/Traits/speech.yml
#	Resources/Prototypes/Voice/disease_emotes.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Prototypes/game_presets.yml
#	Resources/Prototypes/secret_weights.yml
 2024-08-19 19:06:38 +03:00
Pieter-Jan Briers
8ac0246998 Enable worldgen by default in non-wizden config (#30996) 
Enable worldgen by default

If somebody can explain to me WHY this isn't enabled by default, that would be epic. Otherwise we're merging this
 2024-08-14 21:56:45 +10:00
DrSmugleaf
12b6cf5e5d Make ahelp.admin_prefix default false (#30994) 
* Make ahelp.admin_prefix default false

* More disabling

Game defaults should match wizden as closely as possible.

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
 2024-08-14 13:22:10 +02:00
Errant
9de922adba development build ghostrole lottery changes (#30980) 
debug ghostrole lottery changes
 2024-08-14 11:57:09 +10:00
Ed
47dc84e48e Update debug.toml 2024-08-12 13:56:27 +03:00
Ed
38c3bf2595 Merge branch 'master' into ed-05-08-2024-upstream 2024-08-05 21:08:20 +03:00
Ed
6ab9ca6bd0 yupiiii (#391) 2024-08-05 21:08:10 +03:00
to4no_fix
64273cb914 Display the administrator's title in ahelp and ahelp relay (#30075) 
* Adding the admin prefix to the ahelp

* Updating the admin prefix

* The second update of the admin prefix

* Configuration correction
 2024-08-02 22:59:20 -05:00
Chief-Engineer
b66c286ecb Include whitelisting location in baby jail deny message (#30373) 
include whitelist locating in baby jail deny message
 2024-07-27 04:49:02 -05: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
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
Chief-Engineer
c7f752dc96 Restore a panic bunker cvar in wizardsDen.toml (#29832) 
Update wizardsDen.toml
 2024-07-09 14:14:18 +10:00
Chief-Engineer
e6e7a29b68 Fix Farm Grass Hopper config for real this time (#29583) 
Update wizardsDenGateway.toml
 2024-06-29 22:18:06 +02: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
c966db408d Restore default panic bunker and tweak baby jail (#29198) 
restore default panic bunker
 2024-06-19 06:36:05 +02:00
Chief-Engineer
7032c0106a Fix description of temp servers and add region tags (#28811) 
* Fix description of LRP temp servers

* update regions
 2024-06-09 22:13:26 -05:00
nikthechampiongr
e95fb9aa7f Disable panic bunker for servers (#28812) 
* Disable panic bunker for servers

* Add disabled stuff back in to be reenabled later
 2024-06-10 01:41:04 +02:00
Pieter-Jan Briers
0804020410 FUCK (#28808) 2024-06-10 00:13:29 +02:00
Leon Friedrich
edd13ad82f Fix wizardsDenCoreOnly.toml (#28807) 
Fix wizardsDenCoreOnly
 2024-06-10 07:48:47 +10:00
Chief-Engineer
d741968714 Temporarily update server configs (#28780) 
* update configs

* Update Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml

* Update Resources/ConfigPresets/WizardsDen/wizardsDenLRPTide.toml

* LF

* Apply suggestions from code review

Co-authored-by: Julian Giebel <juliangiebel@live.de>

* Update Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml

Co-authored-by: Julian Giebel <juliangiebel@live.de>

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
Co-authored-by: Julian Giebel <juliangiebel@live.de>
 2024-06-09 23:32:10 +02:00
Nemanja
1333b48747 Convert rules to use guidebook parsing (#28647) 2024-06-06 03:11:26 -04:00
Ed
e522bbf90d New event: Approaching unknown shuttle (#24490) 
* setup codebase

* Add first shuttle

* tak

* sync striker

* sync 2

* pipipi

* Preloaded roundstart shuttles!

* Make it abstract "PreloaderGrid" not "PreloaderShuttle"

* to do

* added china cuisin shuttle

* fixes

* add disaster evacpod

* remove enemy

* final shuttles

* weight 5 -> 10

* move data to component

* remove autotrailer touching

* doc, respath

* fix frozen positioning

* fixes + cvar

* finally

* fix evacpod

* remove blacklistrules

* remove `UnknownShuttleSpawnRule`, refactor `LoadMapRule` to support preloaded grids

* use tryload

* cleanup

* fixes

* use preloadedgrid for loneops

* weight unknown shuttles differently (preliminal)

* leftover

* cleanup and raffling

* partial review

* singleton gridpreloader no station coupling

* fix grid atmoses

* `roleLoadout` support for `LoadoutComponent`, fix missing gear

* weighting changes

* init logic fix

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2024-05-10 04:35:59 -07:00
metalgearsloth
4e3332636a Revert "Add auto map vote cvar" (#27869) 
Revert "Add auto map vote cvar (#27496)"

This reverts commit fe35188e2c.
 2024-05-10 11:25:37 +10:00
lzk
fe35188e2c Add auto map vote cvar (#27496) 
* Add auto map vote cvar

* :trollface:
 2024-05-08 23:33:08 -07:00
metalgearsloth
7fe0f14dff Enable worldgen on WD (#23861) 2024-01-10 04:45:00 -07:00
Chief-Engineer
435e218340 Use default panic bunker messages on Leviathan and Lizard (#23541) 
* Use default panic bunker message on Lizard

* use default panic bunker message on Leviathan
 2024-01-04 14:48:00 -08:00
LankLTE
01082c6c27 Add cvar to show new players in ahelp (#23265) 
* Implement cvar

* Enable cvar on Wizden
 2024-01-04 15:45:23 +11:00
Chief-Engineer
7ecd7668a1 Enable panic bunker by default (#23252) 
* update cvars

* vote 1984

* rip

* add custom reason

* make panic_bunker.enabled a server cvar

I am kind of guessing

---------

Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
 2024-01-03 03:26:13 -06:00
Chief-Engineer
96b4eb0f4a Restore cvars after event (#23321) 
Update miros.toml
 2024-01-01 06:32:20 -06:00
Chief-Engineer
9dffe800de Update cvars (#23249) 
* update cvars

* vote 1984
 2023-12-30 18:04:14 -06:00
Chief-Engineer
ad67a23aa1 Temporarily update Vulture cvars (#23204) 
* Update vulture.toml

* Update vulture.toml
 2023-12-30 03:43:55 -06:00
Chief-Engineer
f6b8f183d7 Revert "temporarily override WizDen admin names" (#23004) 
Revert "temporarily override WizDen admin names (#22878)"

This reverts commit 0f6d062da4.
 2023-12-26 06:57:11 -06:00
Chief-Engineer
0f6d062da4 temporarily override WizDen admin names (#22878) 
update global WizDen cvars
 2023-12-23 05:49:14 -06:00
metalgearsloth
6ed2557c9d Fix salamander artifact cvar (#21973) 2023-11-29 16:22:56 +11:00
metalgearsloth
5cbf935cf0 Wrap gateway generator in cvar for dev (#21758) 2023-11-21 21:36:38 -07:00
Repo
5466a9b1b4 Disable OOC during round (#21323) 2023-10-29 03:31:21 -05:00
Chief-Engineer
c55e1dcafd Restore Leviathan's 80 pop cap (#21281) 2023-10-27 15:59:36 -07:00
Chief-Engineer
9995df215d set leviathan pop cap to 60 (#19589) 2023-10-05 13:41:17 -07:00
Pieter-Jan Briers
f38c754b20 Vulture server config preset (#20766) 2023-10-05 21:46:37 +02:00
Chief-Engineer
fcc24ce224 Revert "Disable SSD indicators on LRP (#20021)" (#20703) 
This reverts commit 5aa7b01b68.
 2023-10-03 05:52:40 -05:00