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

6196 commits

Author SHA1 Message Date
ThereDrD
2e4b0be92b
Прикольная анимация для хранилищ (#2269) 2025-06-03 05:17:24 +03:00
ThereDrD
1682d37984
Артефакты-предметы, смешной хаос и не только (#2263) 
Co-authored-by: pacable <igor.mamaev1@gmail.com>
 2025-06-02 22:11:30 +03:00
pacable
8f1ca6d9ee
Emit sound on move system (#2264) 2025-06-02 19:27:37 +03:00
Vigers Ray
a32fbde893 ЕБАНЫЕ РЕФАКТОРЫ 2025-05-29 18:13:01 +03:00
Vigers Ray
af38039aab Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Client/Actions/ActionsSystem.cs
#	Content.Shared/Actions/ActionContainerSystem.cs
#	Content.Shared/Actions/Components/TargetActionComponent.cs
#	Content.Shared/Actions/EntityTargetActionComponent.cs
#	Content.Shared/Bed/SharedBedSystem.cs
#	Content.Shared/Bed/Sleep/SleepingSystem.cs
#	Resources/Prototypes/Actions/types.yml
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
 2025-05-29 10:45:58 +03:00
ThereDrD
66f4bd1d75
Рефактор системы автодоступов (#2237) 2025-05-29 10:28:57 +03:00
Vigers Ray
202c27c6e1
Dummy update (#2236) 2025-05-29 10:25:30 +03:00
deltanedas
b3825dce97
action refactor proper ecs edition (#27422) 2025-05-28 15:52:11 -04:00
Vigers Ray
30323d6512 Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
 2025-05-28 21:52:11 +03:00
ThereDrD
0b1630f7fd
Фикс линтера и переводов 2, рефактор святой воды (#2229) 
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
Co-authored-by: Vigers Ray <vigersray@gmail.com>
 2025-05-28 21:33:40 +03:00
Tayrtahn
721d224fd7
Cleanup some misc warnings (#37904) 
* Fix warning CS8524 for TurretControllerWindow

* Fix warning CS0660 for AtmosAlarmThreshold
 2025-05-28 12:45:38 -04:00
metalgearsloth
ea7350f3f1
Content changes required for physicsmap purge (#37878) 
* PhysMap changes

* Fix call

* Avoid tilefriction resolve

yummy

* a
 2025-05-28 19:38:47 +10:00
Tayrtahn
c1b9b7e6d7
Fix walking in place animations when holding walk button (#37887) 
Fix SpriteMovement playing when holding walk button
 2025-05-27 20:14:49 -04:00
Vigers Ray
906f5de7ba fix client 2025-05-27 17:42:47 +03:00
Vigers Ray
ff887a1480 Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
#	Resources/migration.yml
 2025-05-27 16:17:04 +03:00
metalgearsloth
3c52dd102e
Don't click-to-face when moving (#37874) 
Looks bad doing it for a single tick.
 2025-05-27 13:34:23 +02:00
Tayrtahn
4d35998f25
Cleanup warnings in SharedMoverController (#37613) 
* Refactor IsAroundCollider to use EntityLookupSystem

* Formatting

* MapSystem methods

* Remove unused usings

* GrabRangeVV -> GrabRange
 2025-05-27 20:01:04 +10:00
Vigers Ray
2e142536bb fix upstream 2025-05-27 05:33:07 +03:00
Vigers Ray
d6c0a011b7 Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	.github/workflows/publish.yml
#	Content.Client/Clothing/ClientClothingSystem.cs
#	Content.Client/Clothing/Systems/ChameleonClothingSystem.cs
#	Content.Client/Fax/UI/FaxWindow.xaml
#	Content.Client/Ghost/GhostSystem.cs
#	Content.Client/Holiday/HolidaySystem.cs
#	Content.Client/Humanoid/HumanoidAppearanceSystem.cs
#	Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
#	Content.Client/Lobby/UI/LobbyGui.xaml
#	Content.Client/Lobby/UI/LobbyGui.xaml.cs
#	Content.Client/Mech/MechSystem.cs
#	Content.Client/Stealth/StealthSystem.cs
#	Content.Client/Weapons/Ranged/Systems/GunSystem.cs
#	Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
#	Content.Server/Bed/BedSystem.cs
#	Content.Server/Body/Systems/BodySystem.cs
#	Content.Server/Body/Systems/RespiratorSystem.cs
#	Content.Server/Cargo/Systems/CargoSystem.Orders.cs
#	Content.Server/Communications/CommunicationsConsoleComponent.cs
#	Content.Server/EntityEffects/Effects/AreaReactionEffect.cs
#	Content.Server/EntityEffects/Effects/MakeSentient.cs
#	Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
#	Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
#	Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
#	Content.Server/EntityEffects/Effects/PlantMutateGases.cs
#	Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Content.Server/IoC/ServerContentIoC.cs
#	Content.Server/Nutrition/EntitySystems/FoodSystem.cs
#	Content.Server/Power/EntitySystems/PowerNetSystem.cs
#	Content.Server/Preferences/Managers/ServerPreferencesManager.cs
#	Content.Server/RoundEnd/RoundEndSystem.cs
#	Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Content.Server/Weapons/Ranged/Systems/GunSystem.cs
#	Content.Shared/Bed/Components/HealOnBuckleComponent.cs
#	Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
#	Content.Shared/EntityEffects/Effects/ExplosionReactionEffect.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/Item/ItemToggle/Components/ComponentTogglerComponent.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Content.Shared/Preferences/Loadouts/RoleLoadout.cs
#	Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
#	Content.Shared/Wieldable/SharedWieldableSystem.cs
#	Resources/Audio/Machines/attributions.yml
#	Resources/Locale/en-US/_strings/atmos/plaque-component.ftl
#	Resources/Locale/en-US/_strings/chat/chat-channel.ftl
#	Resources/Locale/en-US/_strings/components/screen-component.ftl
#	Resources/Locale/en-US/_strings/inventory/components/slot-block-component.ftl
#	Resources/Locale/en-US/_strings/mass-media/news-discord.ftl
#	Resources/Locale/en-US/_strings/objectives/commands/stripall.ftl
#	Resources/Locale/en-US/_strings/salvage/job-board.ftl
#	Resources/Locale/en-US/_strings/ui/spray-painter-window.ftl
#	Resources/Locale/en-US/_strings/ui/turret-controls.ftl
#	Resources/Maps/_Sunrise/Station/box.yml
#	Resources/Prototypes/Access/misc.yml
#	Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/service.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
#	Resources/Prototypes/Entities/Clothing/Head/helmets.yml
#	Resources/Prototypes/Entities/Clothing/Masks/masks.yml
#	Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
#	Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
#	Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Mobs/Player/dragon.yml
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
#	Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
#	Resources/Prototypes/Entities/Mobs/Species/moth.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
#	Resources/Prototypes/LootTables/suspicion_loot_table.yml
#	Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
#	Resources/Prototypes/Reagents/medicine.yml
#	Resources/Prototypes/Recipes/Lathes/Packs/science.yml
#	Resources/Prototypes/Recipes/Lathes/medical.yml
#	Resources/Prototypes/SoundCollections/NukeMusic.yml
#	Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
#	Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/equipped-OUTERCLOTHING-reptilian.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json
#	Resources/Textures/Effects/speech.rsi/alien3.png
#	Resources/Textures/Effects/speech.rsi/alienroyal3.png
#	Resources/Textures/Effects/speech.rsi/default3.png
#	Resources/Textures/Effects/speech.rsi/guardian3.png
#	Resources/Textures/Effects/speech.rsi/holo3.png
#	Resources/Textures/Effects/speech.rsi/lawyer3.png
#	Resources/Textures/Effects/speech.rsi/lizard3.png
#	Resources/Textures/Effects/speech.rsi/meta.json
#	Resources/Textures/Effects/speech.rsi/moth3.png
#	Resources/Textures/Effects/speech.rsi/robot3.png
#	Resources/Textures/Effects/speech.rsi/slime3.png
#	Resources/Textures/Effects/speech.rsi/spider3.png
#	Resources/Textures/Effects/speech.rsi/syndibot3.png
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
#	Resources/Textures/Mobs/Species/Reptilian/parts.rsi/head_f.png
#	Resources/Textures/Mobs/Species/Reptilian/parts.rsi/head_m.png
#	Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
#	Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/emergency_unlit.png
#	Resources/Textures/Structures/Piping/disposal.rsi/meta.json
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/steel_dirty.png
#	Resources/migration.yml
#	runclient-Tools.bat
#	runclient.bat
 2025-05-27 03:41:41 +03:00
iDesmond
d781e0f166
Консоль радио и доступы (#2203) 
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
 2025-05-27 01:52:43 +03:00
banumbas
80dfd3f83c
Пофиксил отображение рук: свиней, яутж и ксено (#2176) 2025-05-27 01:46:57 +03:00
ThereDrD
6dd451a5c7
Панель телепорта призрака (#2157) 
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
 2025-05-27 01:34:29 +03:00
ThereDrD
f23628a833
Новые смешные эффекты для артефактов с Fire Station (#2135) 
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
 2025-05-27 01:10:10 +03:00
Vigers Ray
2f91699cf7
Rework janitor borg and remove Fixtures from puddles. (#2217) 2025-05-26 23:48:42 +03:00
slarticodefast
be761ea537
merge stable into master (#37856) 2025-05-26 21:37:20 +02:00
Nemanja
854c506a75
Fix storage fastpath logical oversight (#37852) 2025-05-26 21:26:28 +02:00
Tayrtahn
24dd207b4f
Cleanup remaining IMapManager.MapExists uses (#37851) 
Cleanup remaining IMapManager.MapExists uses
 2025-05-26 18:45:55 +02:00
chromiumboy
f99850e1fb
Sentry turrets - Part 6: Sentry turret control panels (#35235) 2025-05-26 16:00:50 +03:00
slarticodefast
e8bc811f7a
Add WieldingBlockerComponent (#37778) 
initial commit
 2025-05-25 23:50:30 -04:00
Fildrance
291ccfbe23
Spray nozzle can suck puddles into tank directly! (#30600) 
* feat: now vacuum cleaner can suck solutions from floor

* refactor using AbsorbentSystem instead of separate vacuum cleaner

* refactor: remove unused vacuum cleaner files

* refactor: renamed ConnectedContainerComponent to SlotBasedConnectedContainerComponent (and system)

* fix: fix invalid comp name

* fix: no more spray nozzle messaging about water inside bottles etc.

* refactor: minor refactor in SlotBasedConnectedContainerSystem and adjustments after merge

* refactor: cleanups

* refactor: renaming

* refactor: update to use _puddleSystem.GetAbsorbentReagents

* refactor: changed interactions with SlotBasedConnectedContainerSystem into events

* refactor: new sound and action delay adjusted to sound (amount tweaked a bit accordingly, almost)

* refactor: added networking for SlotBasedConnectedContainerComponent

* fix attribution for vacuum-cleaner-fast.ogg

* trying to fix multi-license for mix sound file

* remove empty line

* refactor: remove trailing whitespace

* by ref struct, brother

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
 2025-05-25 23:36:16 -04:00
Princess Cheeseballs
11d0799e1a
Mob Spin Fix Update (#37603) 
Kid named negative velocity
 2025-05-25 21:09:25 +02:00
Cojoke
a66de72a26
Removes references to GetAnchoredEntitiesEnumerator(Vector2i) (#37796) 
* Removes references to GetAnchoredEntitiesEnumerator(Vector2i)

* requested changes(I think)
 2025-05-25 01:00:47 +02:00
Pieter-Jan Briers
ec3edb7264
New Discord integration fixes (#37793) 
Fix admin chat relay.

Fix leaked task instance.

Fix warning about gateway intents on startup.

Fix packaging.
 2025-05-24 23:27:12 +02:00
Simon
7867cbec00
Add basic discord client integration with ooc and admin chat support (#33840) 
* Add basic discord client integration with ooc and admin chat support

* Use username instead of global name

WHY IS GLOBAL NAME NOT JUST THE USERNAME??? WHY ARE THERE NO DOC COMMENTS???

* stuff

* Reviews, methinks.

* Reviews

* reviews
 2025-05-24 20:49:52 +02:00
slarticodefast
fef4187995
Move PriceCalculationEvent and EstimatedPriceCalculationEvent to shared (#37782) 
* moce PriceCalculationEvent to shared

* Update Content.Shared/Cargo/PriceCalculationEvent.cs

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
 2025-05-24 19:36:38 +02:00
Tayrtahn
9df514472f
Cleanup AnchorableSystem (#37753) 
* The easy part

* Overload and obsolete

* Internal cleanup

* Update all references to new overload
 2025-05-24 17:05:09 +02:00
pathetic meowmeow
bf41de18aa
Move entity effects definitions to shared (#35614) 
* Move entity effects to shared

* relocate spawning to server

* Generic version of EntityEffect for just raising event.

* genericise everything

* oops forgot to push you

* some condensation

* finish rebas

* unwhite the space

* oops forgot nuke

* bad rebase fix

* useless annotations begone

---------

Co-authored-by: EmoGarbage404 <retron404@gmail.com>
 2025-05-23 12:32:22 -04:00
slarticodefast
c1f1eaa0c3
Cleanup TryGetContainingContainer (#37752) 
kill
 2025-05-23 17:11:29 +02:00
Tayrtahn
3f9670f792
Cleanup remaining MapGridComponent.GetAnchoredEntities(MapCoordinates) uses (#37729) 
Cleanup remaining MapGridComponent.GetAnchoredEntities uses
 2025-05-22 21:42:47 -04:00
metalgearsloth
d924e11c3a
Fix storage (#37714) 
The one path I forgot to get the relative index.
 2025-05-22 10:11:36 -04:00
Tayrtahn
5a93099509
Update SharedBiomeSystem methods to use Entity<T> (#37698) 
* Fix warning in TryGetBiomeTile

* Overload TryGetBiomeTile

* Overload more methods, fix internal warnings

* Update TryGetEntity uses

* Update TryGetTile uses

* Cleanup TryGetDecals use

* Formatting

* Two more warnings while we're here
 2025-05-21 22:10:52 -04:00
Tayrtahn
11f291d1a2
Cleanup warning in GridInRange (#37699) 
Cleanup warning in GridInRange
 2025-05-21 21:28:42 -04:00
Leon Friedrich
38d7949777
Add microwave-nukedisk interaction (#36114) 
* Add microwave-nukedisk interaction

* popup

* Fix UninitializedSaveTest
 2025-05-21 11:06:58 -07:00
metalgearsloth
298f821bec
Ore + entitytable fixes (#37675) 
* Ore + entitytable fixes

Iterate every dungeon not just last.

* Big shot

* Fixes
 2025-05-21 12:43:17 -04:00
Errant
1b7651184c
Limit shuttle collision damage (#37578) 
* outlaw the usage of spacecraft as weapons of mass destruction

* adjust slowdown
 2025-05-21 20:37:36 +10:00
metalgearsloth
a393033c64
Optimise storage a quadrillion times (#37638) 
* Optimise storage a quadrillion times

* How sweaty can we get

* Add fast angle checks

* Fix chunk indices

* Optimise the refresh method

Helps on client a lot as the clientside is suboptimal atm.

* Better name

* wawawewa

* Add single-angle path

* Okay FINE rider
 2025-05-21 02:16:26 -04:00
Tayrtahn
6f46698410
Cleanup warning CS0414 (#37648) 2025-05-20 23:14:10 +02:00
metalgearsloth
0d4f9640b5
CompFactory updates (#37559) 2025-05-20 01:08:55 -04:00
Princess Cheeseballs
203befb16c
Galosh Slowdown Fix (#37628) 
Begone Galosh
 2025-05-19 22:47:03 -04:00
SpeltIncorrectyl
97e6127cf0
Give kammerer tighter spread so it's not a complete downgrade to the enforcer (#37616) 2025-05-19 15:45:18 -07:00