Vigers Ray
3d383e5377
Уменьшение количества редактирований файлов оффов ( #3365 )
2025-12-26 03:30:36 +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
Tayrtahn
33f111c090
Cleanup more SpriteComponent warnings (part 2) ( #37522 )
...
* Cleanup warnings in DamageMarkerSystem
* Cleanup warnings in CuffableSystem
* Cleanup warnings in DeployableTurretSystem
* Cleanup warnings in StorageContainerVisualsSystem
* Cleanup warnings in ItemMapperSystem
* Cleanup warnings in ItemCounterSystem
* Cleanup warnings in RandomSpriteSystem
* Cleanup warnings in PowerCellSystem
* Cleanup warnings in ParticleAcceleratorPartVisualizerSystem
* Cleanup warnings in PaperVisualizerSystem
* Cleanup warnings in PoweredLightVisualizerSystem
* Cleanup warnings in LightBulbSystem
* Cleanup warnings in EmergencyLightSystem
* Cleanup warnings in DoorSystem
* Cleanup warnings in ClockSystem
* Cleanup warnings in BuckleSystem
* Cleanup warnings in JukeboxSystem
2025-05-17 13:02:36 +10:00
Vigers Ray
0901aa9c72
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Server/Chat/SuicideSystem.cs
# Content.Server/Ghost/GhostSystem.cs
# Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
# Content.Shared/Standing/StandingStateSystem.cs
# Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Prototypes/Roles/Antags/revolutionary.yml
# Resources/Prototypes/Roles/Antags/thief.yml
# Resources/Prototypes/Roles/Antags/traitor.yml
# Resources/Prototypes/Roles/Antags/zombie.yml
# Resources/Prototypes/Roles/Jobs/CentComm/official.yml
2025-04-06 04:22:26 +03:00
metalgearsloth
593804b517
Mob collisions ( #34580 )
...
* Conveyor optimisations
- Optimise movement for moving stuff. Better flags + less resolves + slapped parallelrobustjob on it.
- Sleeping for entities getting conveyed into walls.
* Blocker version
* Finish
* Final
* Mob collisions
* impulses
* Collision smoothing
* Locked in
* 30tps working
* r
* fixes
* Best
* Fixes + CVars
* CVars in place
* Pushies
* Opt attempt 1
* Revert "Opt attempt 1"
This reverts commit 5ccd72dcbea09261a992aa1f7f05df169a1ce676.
* Fix mispredicts
* Ready-ish
* better
* Cleanup
* Fix conveyor power mispredict
* Forgetting to actually do deltas
* Fix buckle pushes
* Bagel save
* Revert "Bagel save"
This reverts commit 1b93fda81fb852d89b89b0beae0b80f8a61165f2.
* Conveyor resave
* Fix prediction
* Mob movement rewrite
* Bandaid
* Working version
* Tentatively working
* Friction to fix cornering
* More fixes
* Revert bagel
* Revert this
* Bad parity
* Working
* Fixes
* Woops
* Doc comments
* Pen cap cvar
* StandingState cleanup and sub
* Fix downed mobs
* fish
* client
* Disable pushing on tests
* More variables
* Movement mods
* Mass diff
* 1 more tweak
* Cvar
2025-04-05 00:33:52 +11:00
Vigers Ray
99a2aa9c4d
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/ai_factions.yml
# Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
2025-02-14 00:55:00 +03:00
Saphire Lattice
382cd710a7
Use screen local north for buckling/unbuckling layering, plus #31625 ( #33447 )
...
* Fix sprite layering upon strapping/unstrapping
* switch from strap to buckle events
* Use screen-local North for the checks instead
Build on top of PR #31625 , but I'm not wanting to just push to someone's older PR without a warning.
---------
Co-authored-by: themias <themias5@gmail.com>
2025-02-12 21:51:28 -08:00
haiwwkes
5192d120ea
Новая панель эмоутов. ( #891 )
...
* wacky
* work
* work
* work
* work
* eff
* a
2024-12-24 23:27:09 +03:00
haiwwkes
dc7caa82c3
This is a temporary measure and will be reverted once the DMCA counterclaim process is completed. ( #748 )
...
* Revert "fix (#612 )"
This reverts commit 2bfefd1b10#534 )"
This reverts commit 7efd457a51
2024-12-01 17:40:55 +03:00
haiwwkes
40568a243c
lay down + scope ( #476 )
...
* remove old system
* new scope, new laying
2024-10-11 11:52:39 +03:00
metalgearsloth
8f06155028
Make buckle mint ( #32370 )
...
- Fix the unbuckle mispredicts.
- Fix unbuckle offset existing.
- Fix interaction range not aligning with interactionoutline system.
2024-09-22 18:21:40 +10:00
Leon Friedrich
fa3c89a521
Partial buckling refactor ( #29031 )
...
* partial buckling refactor
* git mv test
* change test namespace
* git mv test
* Update test namespace
* Add pulling test
* Network BuckleTime
* Add two more tests
* smelly
2024-06-20 01:14:18 +10:00
metalgearsloth
d2f20d8955
Remove vehicles ( #24681 )
...
* Remove wheelchairs
Vehicle code is dogwater and wheelchairs just keeps exposing edgecases. If someone wants it brought it back they can do vehicle refactor.
* Also this one
* Remove vehicles
* goodbye vehicles
* Remove this check
* sasd
* Cronch
* Add sprites back
* jani
2024-02-01 11:33:10 +11:00
Leon Friedrich
cf98300ba2
Fix rotation visuals desync & appearance state spam ( #23016 )
...
* Fix rotation visuals desync
* :bucklemeup:
* A
2023-12-26 16:32:25 -07:00
DrSmugleaf
a44fa86b68
Update trivial components to use auto comp states ( #20539 )
2023-09-28 16:20:29 -07:00
Slava0135
2e1197257c
Reset speed when buckling ( #19846 )
2023-09-16 14:15:05 +10:00
metalgearsloth
5a0fc68be2
Content update for NetEntities ( #18935 )
2023-09-11 09:42:41 +10:00
themias
e6dd47ea46
Fix dead mob sprites rotating on death ( #16317 )
2023-05-11 21:20:41 +10:00
AJCM-git
878c7c0b85
Moves buckling and vehicles to shared, some cleanup ( #15923 )
2023-05-01 17:04:23 +10:00
metalgearsloth
b4e43b2668
Fix damage flipflops ( #13666 )
2023-01-23 16:50:35 -04:00
Nemanja
6c04811e66
remove a bunch of instances of component reference ( #13164 )
2022-12-24 15:55:31 +11:00
AJCM-git
38a31db13f
Fix bed strapping flip flop ( #13094 )
2022-12-20 14:24:50 -08:00
DrSmugleaf
5aeb2ac4a0
ECS strap component ( #12627 )
2022-11-18 22:08:28 +01:00
DrSmugleaf
d5ae5658a1
ECS buckle ( #12586 )
2022-11-14 20:30:30 +01:00
metalgearsloth
b9e876ca92
The real movement refactor ( #9645 )
...
* The real movement refactor
* ref events
* Jetpack cleanup
* a
* Vehicles partially working
* Balance tweaks
* Restore some shitcode
* AAAAAAAA
* Even more prediction
* ECS compstate trying to fix this
* yml
* vehicles kill me
* Don't lock keys
* a
* Fix problem
* Fix sounds
* shuttle inputs
* Shuttle controls
* space brakes
* Keybinds
* Fix merge
* Handle shutdown
* Fix keys
* Bump friction
* fix buckle offset
* Fix relay and friction
* Fix jetpack turning
* contexts amirite
2022-07-16 13:51:52 +10:00
DrSmugleaf
ff1a2d97ea
Re-organize all projects ( #4166 )
2021-06-09 22:19:39 +02:00
