Vigers Ray
|
8b0cadaf1e
|
Фиксы апстрима
|
2025-02-19 14:13:11 +03:00 |
|
Vigers Ray
|
ed0a30bb64
|
Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
# Content.Client/Weapons/Ranged/Systems/GunSystem.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Entry/EntryPoint.cs
# Content.Server/Ghost/GhostSystem.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs
# Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.Cartridges.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Shared/Damage/Systems/DamageableSystem.cs
# Content.Shared/Follower/FollowerSystem.cs
# Resources/Locale/en-US/_strings/actions/actions/dna-scrambler.ftl
# Resources/Locale/en-US/_strings/administration/commands/change-cvar-command.ftl
# Resources/Locale/en-US/discord/vote-notifications.ftl
# Resources/Prototypes/Catalog/Fills/Crates/armory.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Prototypes/Voice/speech_emotes.yml
|
2025-02-19 13:16:37 +03:00 |
|
SlamBamActionman
|
3200ba88a5
|
Add ability for +VVEDIT users to scale damage/healing in the game (#35255)
* Initial commit
* Add universal modifier for all damage/heals, make guidebooks work.
* help text
|
2025-02-18 08:28:42 +01:00 |
|
Vigers Ray
|
3ea76c6a45
|
Фикс осмотра урона боеприпасов и указание типа модификатора
|
2024-12-07 07:38:35 +03:00 |
|
Leon Friedrich
|
364c9b7f0a
|
DamageableSystem cleanup & performance improvements (#20820)
|
2023-10-09 03:27:41 +11:00 |
|
Slava0135
|
53db6bc265
|
Examine throwable damage (#18580)
|
2023-08-07 19:09:35 +10:00 |
|
metalgearsloth
|
ae01618874
|
Revert "Revert "Replace ResourcePath with ResPath (#15308)" (#155… (#15566)
|
2023-04-20 20:16:01 +10:00 |
|
metalgearsloth
|
acf79a8209
|
Revert "Replace ResourcePath with ResPath (#15308)" (#15551)
|
2023-04-20 11:43:54 +10:00 |
|
Ygg01
|
71f358a027
|
Replace ResourcePath with ResPath (#15308)
|
2023-04-19 23:39:17 +10:00 |
|
metalgearsloth
|
44fb8a9e2d
|
Fix rsi sprite access for verbs (#14284)
|
2023-02-26 18:48:57 +11:00 |
|
Nemanja
|
faca40b8d5
|
more component ref removal + combining server/client comps (#13178)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
|
2022-12-25 05:28:21 +01:00 |
|
metalgearsloth
|
f51248ecaa
|
Melee refactor (#10897)
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
|
2022-09-29 15:51:59 +10:00 |
|