Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Re-organizing the Resources folder. Part 1. (#1234)

Browse Source 
* First commit

* Lockers

* Lockers electric boogaloo

* Crates and Lockers

* Almost finishing the Textures folder

* Updating texture paths. Reminder to fix:
* Lockers
* Windows
* Vending Machines
* APC
* Catwalks
* Bedsheets and Cloaks
* Status effects

* dont know what happened here

* Commit before merge

* re-organizing

* Lockers broken

* Commit before merge

* Submodule

* renaming

* Fixing most issues

* forgot these ones

* Updating submodule

* typo

* Fixing some paths

* fixing some paths

* updating submodule

* (hopefully) fixing the submodule
This commit is contained in:
AJCM-git
2020-07-07 13:19:00 -04:00
committed by GitHub
parent 39290cffaa
commit ae41d03ec6
5594 changed files with 6524 additions and 6481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/GameObjects/Components/Weapon/Melee/FlashComponent.cs
View File

@@ -120,7 +120,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
});
}
EntitySystem.Get<AudioSystem>().PlayAtCoords("/Audio/weapons/flash.ogg", Owner.Transform.GridPosition,
EntitySystem.Get<AudioSystem>().PlayAtCoords("/Audio/Weapons/flash.ogg", Owner.Transform.GridPosition,
AudioParams.Default);
return true;

4
Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs
View File

@@ -77,7 +77,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
serializer.DataField(ref _range, "range", 1);
serializer.DataField(ref _arcWidth, "arcwidth", 90);
serializer.DataField(ref _arc, "arc", "default");
serializer.DataField(ref _hitSound, "hitSound", "/Audio/weapons/genhit1.ogg");
serializer.DataField(ref _hitSound, "hitSound", "/Audio/Weapons/genhit1.ogg");
serializer.DataField(ref _cooldownTime, "cooldownTime", 1f);
}
@@ -116,7 +116,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
var audioSystem = EntitySystem.Get<AudioSystem>();
var emitter = hitEntities.Count == 0 ? eventArgs.User : hitEntities[0];
audioSystem.PlayFromEntity(hitEntities.Count > 0 ? _hitSound : "/Audio/weapons/punchmiss.ogg", emitter);
audioSystem.PlayFromEntity(hitEntities.Count > 0 ? _hitSound : "/Audio/Weapons/punchmiss.ogg", emitter);
if (Arc != null)
{

10
Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs
View File

@@ -95,7 +95,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
{
return false;
}
EntitySystem.Get<AudioSystem>().PlayAtCoords("/Audio/weapons/egloves.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f));
EntitySystem.Get<AudioSystem>().PlayAtCoords("/Audio/Weapons/egloves.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f));
foreach (var entity in entities)
{
@@ -165,7 +165,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
if (cell == null)
{
EntitySystem.Get<AudioSystem>().PlayAtCoords("/Audio/machines/button.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f));
EntitySystem.Get<AudioSystem>().PlayAtCoords("/Audio/Machines/button.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f));
_notifyManager.PopupMessage(Owner, user, _localizationManager.GetString("Cell missing..."));
return;
@@ -173,7 +173,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
if (cell.CurrentCharge < EnergyPerUse)
{
EntitySystem.Get<AudioSystem>().PlayAtCoords("/Audio/machines/button.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f));
EntitySystem.Get<AudioSystem>().PlayAtCoords("/Audio/Machines/button.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f));
_notifyManager.PopupMessage(Owner, user, _localizationManager.GetString("Dead cell..."));
return;
}
@@ -205,7 +205,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
return false;
}
EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/items/weapons/pistol_magin.ogg", Owner);
EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/Items/pistol_magin.ogg", Owner);
Dirty();
@@ -236,7 +236,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
cell.Owner.Transform.GridPosition = user.Transform.GridPosition;
}
EntitySystem.Get<AudioSystem>().PlayAtCoords("/Audio/items/weapons/pistol_magout.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f));
EntitySystem.Get<AudioSystem>().PlayAtCoords("/Audio/Items/pistol_magout.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f));
}
public void Examine(FormattedMessage message, bool inDetailsRange)