Commit graph

9846 commits

Author SHA1 Message Date
pacable
f46bbb09ef
Fix AoEHealSystem.cs (#2270) 2025-06-03 14:32:27 +03:00
Vigers Ray
cd8144cea7
Power net tweak (#2272) 2025-06-03 14:32:15 +03:00
Vigers Ray
0028845b2e
fix flesh spreader (#2271) 2025-06-03 14:31:21 +03:00
iDesmond
5022fa9f6f
AntiSpamSystem fix (#2262) 2025-06-03 05:19:14 +03:00
ThereDrD
1682d37984
Артефакты-предметы, смешной хаос и не только (#2263)
Co-authored-by: pacable <igor.mamaev1@gmail.com>
2025-06-02 22:11:30 +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
pathetic meowmeow
62bd5abfa0
Actually handle nutrition and robust harvest entity effects (#37912) 2025-05-29 00:51:09 +02:00
TemporalOroboros
f81d216630
Fix obsolete MapGridComponent warning in SpawnAfterInteractSystem (#37911) 2025-05-29 00:34:40 +02:00
TemporalOroboros
29ccce134b
Fix obsolete method warning in SimpleFloorPlanPopulatorSystem (#37910)
Fix obsolete method warning
2025-05-28 23:44:24 +02: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
447f866745
Cleanup warning in StealConditionSystem (#37903)
Fix 1 warning in StealConditionSystem
2025-05-28 18:17:43 +02: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
TemporalOroboros
10dee14893
Fix radiation system warnings (#37892)
* Use SharedMapSystem for GetTileIndices

* Fix formatting errors in Server

* Fix formatting errors in Client
2025-05-28 11:34:58 +02:00
TemporalOroboros
5f5f6765ce
Use SharedMapSystem for GridTileToLocal (#37894) 2025-05-28 11:31:32 +02:00
TemporalOroboros
f99d00cf5f
Fix for obsolete method warning in AtmosphericsSystem (#37897)
* Make PryTile use Entity<T>
Converts the old parameters into an obsolete overload

* Make HandleDecompressionFloorRip use Entity<T>
Converts the old parameters into an obsolete overload

* Convert the one use to use Entity<T>

* Delete obsolete private methods
2025-05-28 11:16:54 +02:00
Southbridge
755ce6f59b
Decal Spawners (#37066)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-05-27 16:55:48 -07:00
Tayrtahn
d28c64f76a
Fix some misc warnings (#37858)
Fix misc warnings
2025-05-27 19:54:19 -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
DerKurait
f10c3712b8
Ограничения роли для освещения воды библией (#2221) 2025-05-27 11:49:21 +03:00
Killerqu00
26a0bfbbc5
Sanitize admin UI input for role bans (#35422)
if job does not exist, log it
2025-05-26 23:27:31 -07:00
Vigers Ray
a6c8b66fe3 Merge remote-tracking branch 'space-wizards/master' 2025-05-27 08:10:43 +03:00
Kyle Tyo
cc6f364e9d
Kill resolves in vote commands (#37637)
* kill resolves in VoteCommand.cs

* consistency and cleanup

* final touch
2025-05-27 05:18:59 +02: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
d22b59ef4f
IC Флуд-защита (#2216) 2025-05-27 02:02:37 +03:00
iDesmond
d781e0f166
Консоль радио и доступы (#2203)
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2025-05-27 01:52:43 +03:00
ThereDrD
6dd451a5c7
Панель телепорта призрака (#2157)
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2025-05-27 01:34:29 +03:00
iDesmond
a63754d54b
Щит на броню Аколита (#2156) 2025-05-27 01:32:58 +03:00
SplikZerys
6ae80494b5
fix bug with an orb (#2154) 2025-05-27 01:15:06 +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
Vigers Ray
680ddad2db Sponsor uplinks only for owner 2025-05-26 23:36:10 +03: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
ArtisticRoomba
9a910873c8
Significantly improve TEG power generation stability (#37658)
* Significantly improve TEG power generation stability

* Revert "Significantly improve TEG power generation stability"

This reverts commit e88278c0f8dea925a89b240e09e5dbcb84f9d174.

* Reimplement without auto formatting obliterating the entire system

* second round of balancing
2025-05-26 14:07:49 +02: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
Tayrtahn
3c48e6abaa
Cleanup some easy-to-fix static logger warnings (#37820) 2025-05-25 23:20:08 +02:00
Tayrtahn
6b2c50f4ba
Cleanup warnings in BasicStationEventSchedulerSystem (#37818)
Cleanup 4 warnings in BasicStationEventSchedulerSystem
2025-05-25 14:27:47 -04:00
Tayrtahn
50fb48de2e
Cleanup all instances of IMapManager.GetMapEntityId (#37814)
* Cleanup all instances of IMapManager.GetMapEntityId

* Dependencies

* LocalizedEntityCommands
2025-05-25 19:09:47 +02:00
Tayrtahn
4c4c98617e
De-hardcode shuttle docking messages/audio (#37813) 2025-05-25 17:46:52 +02:00
Tayrtahn
821b4b738a
Cleanup warnings in TileAtmosCollectionSerializer (#37798)
Cleanup warning in TileAtmosCollectionSerializer
2025-05-25 14:18:06 +10:00
Simon
a9f36e6592
Fix admin chat relay sending to every player online (#37795) 2025-05-25 00:11:01 +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
Vigers Ray
fd5db250e3 Merge remote-tracking branch 'origin/master' 2025-05-24 22:11:29 +03:00