rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
26971 commits 1 branch 0 tags 1.2 GiB
Commit graph

589 commits

Author SHA1 Message Date
pacable
31aa79a1dd
Изменение имени сервера в лобби (#198) 
* кд на баны 15 секунд

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

* теперь сервер в лобби можно настроить через cvar

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

---------

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
 2024-07-15 01:26:59 +03:00
VigersRay
5fed5ad979 Куча разного говна которое давно должно было в билде. 2024-07-15 01:22:56 +03:00
VigersRay
c292c6e0a2 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-14 13:26:05 +03:00
lzk
011250f35e
Fix AGhostCommand naming (#29945) 2024-07-14 20:25:18 +10: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
VigersRay
ba0c961e1e Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Resources/Prototypes/Catalog/Fills/Lockers/security.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
#	Resources/Prototypes/game_presets.yml
 2024-07-02 20:29:10 +03:00
Chief-Engineer
763a25e934
add more info to entity json in logs (#18672) 
* add more info to entity json in logs

* replace TryGetSessionById

* remove unused dependency

* get admin status from the entity

* group values by component

* alphabetize

* I've discovered that my original plans may be bad for performance
 2024-07-02 11:09:24 +02:00
VigersRay
39d23a576c Доп комментарии 2024-07-01 18:55:54 +03:00
VigersRay
ff394987f4 Обнова спонсорки 2024-07-01 17:03:24 +03:00
VigersRay
9fd0e0cff7 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
#	Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
 2024-06-21 18:08:24 +03:00
slarticodefast
d62dddcfcb
fix initial infected icons and add a briefing to the character menu (#29259) 2024-06-21 15:42:17 +10:00
VigersRay
5245c5ddcb Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/IoC/ServerContentIoC.cs
#	Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
#	Content.Shared/Preferences/Loadouts/RoleLoadout.cs
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
#	Resources/Prototypes/Entities/Stations/nanotrasen.yml
#	Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml
#	Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
#	Resources/Prototypes/Loadouts/role_loadouts.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
#	Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
#	Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json
#	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/Head/Hats/hoshat.rsi/meta.json
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.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/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json
#	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/Coats/warden.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
#	Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/unlit-full.png
#	Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/unlit.png
#	Resources/migration.yml
 2024-06-21 05:04:06 +03:00
Pieter-Jan Briers
c33644532d
Rate limit ahelps (#29219) 
* Make chat rate limits a general-purpose system.

Intending to use this with ahelps next.

* Rate limt ahelps

Fixes #28762

* Review comments
 2024-06-21 00:13:02 +02:00
VigersRay
b07e5eb660 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
 2024-06-13 09:47:00 +03:00
ShadowCommander
8791f98f0b
Fix playtime on player tab getting set to Unknown (#28876) 
Update play time on admin panel player tab after db loads
 2024-06-12 23:38:43 -07:00
Leon Friedrich
d38ad12262
Fix playtime_addrole command printing the wrong time (#28783) 2024-06-12 23:31:21 -07:00
Vigers Ray
33e91b2512 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-10 01:17:06 +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
Vigers Ray
19ff7831b6 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
#	Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
#	Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
#	Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
#	Resources/ServerInfo/Guidebook/SpaceStation14.xml
 2024-06-09 22:32:37 +03: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
Vigers Ray
d7b054c032 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
 2024-06-09 00:50:47 +03:00
nikthechampiongr
8cf9037273
Make freeze, freeze & mute, and unmute verbs work on disconnected players. (#28664) 2024-06-08 20:40:33 +10:00
AJCM-git
63e0ee08cb
Fixes client having authority over rules popup cvars (#28655) 
* Fixes client having authority over rules popup cvars

* Delete duplicate migration

* Pre-update

* Post-update
 2024-06-07 21:53:20 +02:00
VigersRay
7d0476aab0 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Shared/Roles/JobPrototype.cs
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.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
 2024-06-07 11:28:58 +03:00
Nemanja
1333b48747
Convert rules to use guidebook parsing (#28647) 2024-06-06 03:11:26 -04:00
VigersRay
6a29776e4f Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Resources/Prototypes/Maps/oasis.yml
 2024-06-05 19:28:35 +03:00
ShadowCommander
f933922c9e
Add logs that provide session to player admin logs (#28628) 2024-06-06 00:19:54 +10:00
VigersRay
1a359203ce Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Resources/Prototypes/Accents/word_replacements.yml
 2024-06-04 21:49:35 +03:00
deltanedas
a3a1538d32
move gamerule components to shared (#28572) 
* move MinMax to shared

* cleanup MinMax

* move other ticking components to shared just because

* remove unused prototype file

* update everything to use shared components

* test

* test 2

* test 3

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-06-04 21:53:24 +10:00
VigersRay
1196e55256 Фиксы апстрима 2024-06-04 09:52:26 +03:00
VigersRay
5f10d21fa6 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Server/Administration/Commands/PlayTimeCommands.cs
#	Content.Server/Preferences/Managers/ServerPreferencesManager.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Server/StationEvents/Events/BreakerFlipRule.cs
#	Content.Shared/Roles/JobPrototype.cs
#	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/Catalog/Fills/Backpacks/duffelbag.yml
#	Resources/Prototypes/Entities/Mobs/base.yml
#	Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/Roles/Antags/traitor.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
#	Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
#	Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
 2024-06-04 09:41:27 +03:00
Tornado Tech
21bc3bfa22
Cleans up tag system (#28272) 
* Updated tag system

* Added params methods

* Fixed tag integration tests

* Fixed params methods recursion

* Revert has All/Any tag one argument realisation

* Updated tag integration tests

* Shit happens

* Added individual List/HashSet methods, docs, tests
 2024-06-02 11:11:19 +10:00
DrSmugleaf
19be94c9ea
Add job whitelist system (#28085) 
* Add job whitelist system

* Address reviews

* Fix name

* Apply suggestions from code review

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>

* cancinium

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
 2024-06-01 05:08:31 -07:00
Nemanja
68992735d8
Clean up command perms (#28451) 
* Change BanExemption command to AdminFlags.Ban permissions

* Change LOOC to check for Moderator permission

* Change ListVerbs from Admin to Debug AdminFlags

* Change RunVerbAs from Admin to Fun AdminFlags

* More permission changes

* Change GhostKick to Moderator perm

* Clean up command perms

* fuck

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2024-06-01 01:14:43 -07:00
Geekyhobo
94a113dbd6
Adds a Pii Flag, Censors Hwid and Ip (#27776) 
* yes

* fixes
 2024-06-01 00:23:54 -07:00
VigersRay
1b725c9db8 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
 2024-06-01 09:38:18 +03:00
Leon Friedrich
27e63f5919
Make tests automatically reset modified cvars (#28219) 
* Make tests automatically reset modified cvars

* Fix bad return

* A

* Try Fix tests

* clarify comment

* update eng
 2024-05-31 12:44:35 +10:00
Vigers Ray
5775d4cdef
Merge sunrise build (#2) 
* commit
 2024-05-31 02:16:18 +03:00
Kara
993eef1e7c
Resolve 'EntitySystem.Get<T>()' is obsolete in content (#27936) 
* PROJECT 0 WARNINGS: Resolve `'EntitySystem.Get<T>()' is obsolete` in content

* pass entman

* dog ass test

* webeditor
 2024-05-12 20:34:52 -04:00
no
37099e481e
Prevent admin-frozen players from ghosting or suiciding, add "Freeze And Mute" verb (#27813) 
* prevent admin-frozen players from ghosting or suiciding

* Add "Freeze and Mute" admin verb

* Allow "Freeze And Mute" admin verb when player is already frozen but not muted

* Remove redundant scream handler (scream action just emotes, duh)

* AdminFrozenSystem: clean imports

* Update Content.Server/Chat/Commands/SuicideCommand.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Update Ghost.cs

* retrigger ci (empty commit)

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-05-12 10:35:30 -04:00
Kara
855234aa30
Resolve 'TransformComponent.MapPosition' is obsolete in content (#27939) 
* Resolve `'TransformComponent.MapPosition' is obsolete: 'Use TransformSystem.GetMapCoordinates'` in content

* build?
 2024-05-12 10:31:54 -04:00
Kara
1596e04d0f
Resolve all non-obsoleting warnings in content (#27934) 
* Resolve all non-obsoleting warnings in content

* Update ClientGameTicker.cs

* Update SkeletonAccentSystem.cs

* Update BwoinkSystem.cs
 2024-05-11 20:13:58 -07:00
Джексон Миссиссиппи
cf148288a0
Add an admin smite for making people slip really far (and localize the admin smites better) (#27246) 
* Sliiiiiiiiiiiiiiiiiip

* what

* Localize!

* antiterminate
 2024-05-11 22:01:58 -04:00
Ciac32
648472233c
Fix antag verb incorrectly giving role to admin player instead of target (#27584) 
Fix antag verb giving role to admin player instead of target
 2024-05-01 11:18:32 -04:00
SlamBamActionman
f544c91298
Revert Exterminator pending newmed/redesign (#26978) 
* Reverts Exterminator

* Includes commented out parts + sprites

* Readd stuff, comment out yaml

* Popup ads

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-04-28 15:45:54 +10:00
metalgearsloth
5896e68752
Content update for UI prediction (#27214) 
* Content update for UI refactor

* Big update

* Sharing

* Remaining content updates

* First big update

* Prototype updates

* AUGH

* Fix UI comp ref

* Cleanup

- Fix predicted message, fix item slots, fix interaction range check.

* Fix regressions

* Make this predictive

idk why it wasn't.

* Fix slime merge

* Merge conflict

* Fix merge
 2024-04-26 18:16:24 +10:00
Nemanja
161fd6c83c
Mega Antag Refactor (#25786) 
* Mega Antag Refactor

* last minute delta save

* more workshopping

* more shit

* ok tested this for once

* okkkkk sure

* generic delays for starting rules

* well darn

* nukies partially

* ouagh

* ballin' faded and smonkin wed

* obliterated the diff

* Spread my arms and soak up congratulations

* I've got plenty of love, but nothing to show for it

* but there’s too much sunlight
Shining on my laptop monitor, so I
Can’t see anything with any amount of clarity

* ok this junk

* OOK!

* fubar

* most of sloth's review

* oh boy

* eek

* hell yea!

* ASDFJASDJFvsakcvjkzjnhhhyh
 2024-04-25 11:31:45 +10:00
Whisper
eee056eaf0
lower max firestacks to 10, refactor flammable (#27159) 
* lower max firestacks to 10, refactor flammable

* fix

* uncap fire stack damage, lower fire stack damage
 2024-04-23 21:30:01 +10:00
no
94f296f9d6
"make thief" admin action: fix missing icon (#27119) 2024-04-19 15:27:36 +10:00