Galactic Chimp
|
f531c65a0b
|
Merge branch 'master' into replace-sounds-with-sound-specifier
# Conflicts:
# Content.Server/Actions/Actions/DisarmAction.cs
# Content.Server/Actions/Actions/ScreamAction.cs
# Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
# Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs
# Content.Server/Explosion/Components/FlashExplosiveComponent.cs
# Content.Server/Physics/Controllers/MoverController.cs
# Content.Server/Portal/Components/PortalComponent.cs
# Content.Server/Portal/Components/TeleporterComponent.cs
# Content.Server/Projectiles/Components/ProjectileComponent.cs
# Content.Server/Singularity/Components/EmitterComponent.cs
# Content.Server/Sound/EmitSoundSystem.cs
# Content.Server/Stunnable/Components/StunbatonComponent.cs
# Content.Server/Tools/Components/MultitoolComponent.cs
# Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs
# Content.Shared/Gravity/GravityComponent.cs
# Content.Shared/Light/Component/SharedExpendableLightComponent.cs
# Content.Shared/Maps/ContentTileDefinition.cs
# Content.Shared/Slippery/SlipperyComponent.cs
# Content.Shared/Standing/StandingStateComponent.cs
# Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
|
2021-07-25 14:12:00 +02:00 |
|
Visne
|
b7dc3c81ae
|
Remove redundant #nullable enable (#4275)
|
2021-07-16 17:37:09 -07:00 |
|
Galactic Chimp
|
ce3c59e0e6
|
replacing sound (collection) names with SoundSpecifier - part 1
|
2021-07-10 17:35:33 +02:00 |
|
Galactic Chimp
|
392b820796
|
Removed old Loc.GetString() use instances (#4155)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
|
2021-06-21 02:13:54 +02:00 |
|
DrSmugleaf
|
f878f353e4
|
Move some files out of Content.Shared root because I forgot (#4182)
|
2021-06-13 22:52:40 +10:00 |
|
DrSmugleaf
|
ff1a2d97ea
|
Re-organize all projects (#4166)
|
2021-06-09 22:19:39 +02:00 |
|