Vigers Ray
8a6ea6ac33
Merge remote-tracking branch 'refs/remotes/wizards/master'
2025-01-30 15:38:24 +03:00
beck-thompson
bc1d6420af
After getting banned, you now have to re-read the rules! ( #33270 )
...
* first commit
* opps
* Reset cooldown instead
* Added ccvar
* Not replicated!
2025-01-30 13:09:31 +01:00
Vigers Ray
cef39bc293
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/UserInterface/Controls/RadialContainer.cs
# Content.Server/Lathe/LatheSystem.cs
# Content.Server/Silicons/Laws/SiliconLawSystem.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
# Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
# Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
# Content.Shared/Wieldable/SharedWieldableSystem.cs
# Resources/Locale/en-US/_strings/station-events/events/radiation-storm.ftl
# Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
# Resources/Prototypes/Atmospherics/gases.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Datasets/Names/borg.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
# Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
# Resources/ServerInfo/Guidebook/Engineering/Construction.xml
# Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
# Resources/ServerInfo/Guidebook/Engineering/Fires.xml
# Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
# Resources/ServerInfo/Guidebook/Engineering/Networking.xml
# Resources/ServerInfo/Guidebook/Engineering/Power.xml
# Resources/ServerInfo/Guidebook/Engineering/RTG.xml
# Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/ServerInfo/Guidebook/Security/CriminalRecords.xml
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png
# Resources/migration.yml
2025-01-30 11:33:49 +03:00
metalgearsloth
fd25dac720
Storage UI V2 ( #33045 )
2025-01-27 21:29:51 +11:00
Vigers Ray
8a1e3b6522
вернул отображение контрабанды
2025-01-22 05:28:54 +03:00
Vigers Ray
3c2672efe9
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/IoC/ServerContentIoC.cs
# Resources/Locale/en-US/_strings/administration/multi-server-kick.ftl
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
2025-01-22 05:27:53 +03:00
Pieter-Jan Briers
71c9dfc9ea
Add system to kick people if they connect to multiple servers at once. ( #34563 )
2025-01-22 00:23:47 +01:00
Vigers Ray
692e1bcdf0
вот так
2025-01-20 07:08:43 +03:00
Vigers Ray
3923c36da2
Вернул кайфовые звуки интерфейса
2025-01-20 05:57:43 +03:00
Vigers Ray
6cccbdbc9d
бафф скорости разгермы
2025-01-17 22:51:56 +03:00
Vigers Ray
3f577b39b5
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Locale/en-US/_strings/escape-menu/ui/options-menu.ftl
2025-01-17 15:51:44 +03:00
c4llv07e
4809ee25ff
Add option to disable bwoink sound. ( #33782 )
...
* Add option to disable bwoink sound.
* Now it's working only with active admin status.
* No bwoink, only "notification sound"
* Moar changes
* Another one
2025-01-17 10:24:50 +03:00
Vigers Ray
1b61551b4d
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/GameTicking/GameTicker.StatusShell.cs
# Content.Server/Implants/SubdermalImplantSystem.cs
# Content.Server/Silicons/Borgs/BorgSystem.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Locale/en-US/_strings/advertisements/vending/smite.ftl
# Resources/Maps/_Sunrise/Shuttles/wrecklaimer.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
2025-01-16 20:00:41 +03:00
Myra
40fc4992e5
Add a CCVar to allow from hiding admins in the reported player count. ( #34406 )
...
Good for:
- Keeping admins hidden
- Not confuse players seeing 84/80 players
Nicely pairs up with the ``admin.admins_count_for_max_players`` ccvar
2025-01-15 22:10:54 +01:00
Myra
6041c828de
Remove baby jail ( #34443 )
...
* Remove baby jail
Closes #33893
* Test fail fix.
2025-01-15 22:08:15 +01:00
Vigers Ray
d86ad2ba97
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Locale/en-US/_strings/discord/watchlist-connections.ftl
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/meta.json
2025-01-15 18:23:20 +03:00
Palladinium
87779250ee
Add Discord webhook on watchlist connection ( #33483 )
2025-01-15 01:32:24 +01:00
Vigers Ray
5c219f5105
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/Entry/EntryPoint.cs
# Content.Server/Ghost/Roles/GhostRoleSystem.cs
# Content.Server/IoC/ServerContentIoC.cs
# Resources/Locale/en-US/_strings/administration/antag.ftl
# Resources/Locale/en-US/_strings/advertisements/vending/pride.ftl
# Resources/Locale/en-US/_strings/mind/role-types.ftl
# Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
# Resources/Prototypes/Entities/Mobs/Player/dragon.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2025-01-14 18:46:45 +03:00
Myra
96d913b147
Add IPIntel API support. ( #33339 )
...
Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com>
2025-01-12 20:41:26 +01:00
Errant
46d58bf22a
Role Types ( #33420 )
...
* mindcomponent namespace
* wip MindRole stuff
* admin player tab
* mindroletype comment
* mindRolePrototype redesign
* broken param
* wip RoleType implementation
* basic role type switching for antags
* traitor fix
* fix AdminPanel update
* the renameningTM
* cleanup
* feature uncreeping
* roletypes on mind roles
* update MindComponent.RoleType when MindRoles change
* ghostrole configuration
* ghostrole config improvements
* live update of roleType on the character window
* logging stuff and notes
* remove thing no one asked for
* weh
* Mind Role Entities wip
* headrev count fix
* silicon stuff, cleanup
* exclusive antag config, cleanup
* jobroleadd overwerite
* logging stuff
* MindHasRole cleanup, admin log stuff
* last second cleanup
* ocd
* move roletypeprototype to its own file, minor note stuff
* remove Roletype.Created
* log stuff
* roletype setup for ghostroles and autotraitor reinforcements
* ghostrole type configs
* adjustable admin overlay
* cleanup
* fix this in its own PR
* silicon antagonist
* borg stuff
* mmi roletype handling
* spawnable borg roletype handling
* weh
* ghost role cleanup
* weh
* RoleEvent update
* polish
* log stuff
* admin overlay config
* ghostrolecomponent cleanup
* weh
* admin overlay code cleanup
* minor cleanup
* Obsolete MindRoleAddedEvent
* comment
* minor code cleanup
* MindOnDoGreeting fix
* Role update message
* fix duplicate job greeting for cyborgs
* fix emag job message dupe
* nicer-looking role type update
* crew aligned
* syndicate assault borg role fix
* fix test fail
* fix a merge mistake
* fix LoneOp role type
* Update Content.Client/Administration/AdminNameOverlay.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Update Content.Shared/Roles/SharedRoleSystem.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* comment formatting
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* change logging category
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* fix a space
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* use MindAddRoles
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* get MindComponent from TryGetMind
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* move var declaration outside loop
* remove TryComp
* take RoleEnum behind the barn
* don't use ensurecomp unnecessarily
* cvar comments
* toggleableghostrolecomponent documentation
* skrek
* use EntProtoId
* mindrole config
* merge baserolecomponent into basemindrolecomponent
* ai and borg silicon role tweaks
* formatting
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* I will end you (the color)
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* use LocId type for a locale id
* update RoleEvent documentation
* update RoleEvent documentation
* remove obsolete MindRoleAddedEvent
* refine MindRolesUpdate()
* use dependency
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* inject dependency
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* roleType.Name no longer required
* reformatted draw code logic
* GhostRoleMarkerRoleComponent comment
* minor SharedRoleSystem cleanup
* StartingMindRoleComponent, unhardcode roundstart silicon
* Update Content.Shared/Roles/SharedRoleSystem.cs
* remove a whitespace
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-01-11 22:17:26 +01:00
Vigers Ray
596698b387
Фикс антаг банов и наказание случайной смерти [ПОРТ] ( #1088 )
...
* Antag Bans - traitors
* Added Zombify conversion check for banned, fixed style on ban panel.
* Fix All antag selection on grouprole
* UI updates to show role and antag bans.
* Fix All antag placement
* Prevent Banned players from becoming revs. Added Random Death Smite.
* part 1 PR changes.
* Change appeal instructions to ccvar.
* more readable expirationText logic
* Remove duplicate service setups
* Add helper methods for getting role/antag bans before checking.
* Move Serverside antag Checks in to common methods on ban manager.
* dont allow banned players to return to zombie body after being forced to ghost.
* Move timer stuff in to existing gametick methods.
* Cleaner UI ban check methods
* Handle cases where a ban expires mid round and show new joining players their bans
* Fix a bunch of mismatching time stamps, some were set in UTC, some in local ☠
* Keep the exisiting ban display ui overlay for latejoiners but use the new one in job selection.
* Fix the rev conversion smite, use existing wait period for the end conditions to execute.
* This was already happening.
* Pretty sure the initial passes were false positives on this, no value keeping this on reflection.
* Fix renaming messup from merge conflict.
* Just mock the that the ban isnt real instead of going deeper with the DB stuff.
* Remove double set on cache
* Fix merge conflict
* Adds a border to Oppenhopper poster (#34219 )
* border
* Update meta.json
* Update Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Trim trailing newlines from examine messages (#33381 )
* Trim trailing newlines from examine messages
* TrimTrailingNewlines -> TrimEnd
* фиксы
* упс
---------
Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Spessmann <156740760+Spessmann@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: SpaceManiac <tad@platymuus.com>
2025-01-11 05:07:34 +03:00
Vigers Ray
fe8ca2f277
ГОЛОСОВАНИЕ
2025-01-11 04:26:56 +03:00
Vigers Ray
60d725e0f6
Фикс FTLMassLimit
2025-01-11 00:31:13 +03:00
Vigers Ray
0a53ad13af
Фикс голосования за исключение
2025-01-11 00:24:35 +03:00
iertis
45ea2b6732
announce and maintance accesses ( #1080 )
...
* announce and maintance accesses
* some fixes
* Uwы
* Delay
* i think that this is final
2025-01-10 21:37:50 +03:00
Vigers Ray
692edc0baf
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Lobby/LobbyState.cs
# Content.Client/Lobby/UI/LobbyGui.xaml
# Content.Shared/Wieldable/WieldableSystem.cs
2025-01-06 00:14:06 +03:00
Errant
a55dc4d3bb
Lobby chat width and custom lobby titles ( #33783 )
...
* lobby name cvar
* panel width
* skrek
* server name localization fix
* comment format fix
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
* remove redundant newline
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
* string.empty
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
* use SetWidth
* Update Resources/Locale/en-US/lobby/lobby-gui.ftl
---------
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-01-05 21:56:01 +01:00
Vigers Ray
bc46f14574
Глобальная оптимизация и фиксы культа плоти
2025-01-03 11:51:48 +03:00
Vigers Ray
f84969630d
Диверсионный отряд ( #985 )
...
* Диверсионный отряд
* фиксы
* фиксы линтера
* Спрайт терминала икаруса
* фикс пинпоинтера
* Доработки ДО
* Фиксы удалённого управления шаттлом
* Не запускать ДО если на может быть меньше 3 глав
2025-01-01 07:53:31 +03:00
Vigers Ray
42841c0246
Описания для спонсоров
2024-12-28 05:31:26 +03:00
Vigers Ray
0619ac9206
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# .github/workflows/build-test-debug.yml
# Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
# Resources/Locale/en-US/_strings/atmos/gases.ftl
# Resources/Locale/en-US/_strings/components/atmos-monitoring-component.ftl
# Resources/Locale/en-US/_strings/tools/components/tool-component.ftl
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Research/industrial.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Prototypes/ai_factions.yml
# Resources/toolshedEngineCommandPerms.yml
2024-12-21 18:51:37 +03:00
slarticodefast
e7294bdf4f
Only disable panicbunker for admins with AdminFlags.Admin ( #33879 )
...
* Only disable panicbunker for admins with AdminFlags.Admin
* nicer curly braces
2024-12-18 14:15:04 +01:00
Vigers Ray
28484c893c
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Resources/Prototypes/Damage/modifier_sets.yml
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
# Resources/migration.yml
2024-12-16 18:50:05 +03:00
deathride58
d8afcdcdf0
Makes admins not count towards the playercount cap ( #33424 )
...
* Makes admins not count towards the playercount cap
* Update Content.Shared/CCVar/CCVars.Admin.cs (thx Aeshus
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
* Actually fixes whitespace on the comments
Thanks VScode very good IDE
---------
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
2024-12-16 17:19:15 +03:00
Vigers Ray
1257175426
увы но никакого описания персонажам
2024-12-15 16:53:53 +03:00
Vigers Ray
46ba4fbc5f
Казуальные разгермы
2024-12-15 14:58:57 +03:00
Vigers Ray
9ac23e1b29
Поднял часы для вотекика
2024-11-26 23:19:18 +03:00
Vigers Ray
efe5eda0e1
Включил голосование за кик
2024-11-26 18:36:46 +03:00
Vigers Ray
f444eceb39
Перенес ПРы ласта на санрайз.
2024-11-26 18:25:51 +03:00
Vigers Ray
0c1e15e516
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Info/LinkBanner.cs
# Resources/Locale/en-US/_strings/atmos/gas-pipe-sensor.ftl
# Resources/Locale/en-US/_strings/station-events/events/greytide-virus.ftl
# Resources/Prototypes/Datasets/Names/diona.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
2024-11-26 17:50:59 +03:00
metalgearsloth
11dbf50ed6
Add delay to AutoOrient ( #33479 )
...
It functions identically to how V1 of orientation worked and it's incredibly annoying.
2024-11-23 17:52:58 +01:00
c4llv07e
646d41d3a7
Add telegram to the server info-links ( #33459 )
2024-11-22 16:38:41 +01:00
Vigers Ray
b8bc7f39ad
Небольшие изменения стандартных цваров
2024-11-20 14:08:10 +03:00
Vigers Ray
24679aff6d
фиксы апстрима
2024-11-14 03:38:28 +03:00
Simon
806e1e46cb
Separate CCVars into separate files
2024-11-12 03:10:25 +01:00
metalgearsloth
1c8eed8b45
Add on-call functionality for adminning ( #30443 )
...
* Add on-call functionality for adminning
The first time an ahelp gets SOS it gets relayed to the specified channel with the specified ping. Every time after that it doesn't until it gets a non-SOS response received.
* Remove redundant name
Pretty sure this already gets chucked on the name of the msg itself I think it just didn't show in screenshot because they were subsequent.
* Update Content.Server/Administration/Systems/BwoinkSystem.cs
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
---------
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
Co-authored-by: deathride58 <deathride58@users.noreply.github.com>
2024-11-02 10:29:16 +01:00
Vasilis
957b8de89b
Add cvars to votekick to customize requirements for the initiator. ( #32490 )
2024-11-01 21:34:23 -04:00
SlamBamActionman
06da4fcc60
Allow votekicks to be initiated in the lobby ( #32528 )
...
Initial commit
2024-10-31 21:52:55 -04:00
SlamBamActionman
b3190b8935
Lower in-round votekick requirements ( #32953 )
...
Initial commit
2024-10-31 21:47:59 -04:00
Pieter-Jan Briers
c221ef06b9
System to automatically restart server after certain uptime. ( #32814 )
2024-10-20 16:46:22 +02:00
