tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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

4
Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs
View File

@@ -71,7 +71,7 @@ namespace Content.Server.GameObjects.Components.Mobs
serializer.DataField(ref _helpInterval, "helpInterval", 1f);
serializer.DataField(ref _helpKnockdownRemove, "helpKnockdownRemove", 1f);
serializer.DataField(ref _stunTexture, "stunTexture",
"/Textures/Objects/Melee/stunbaton.rsi/stunbaton_off.png");
"/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_off.png");
}
/// <summary>
@@ -171,7 +171,7 @@ namespace Content.Server.GameObjects.Components.Mobs
Timer.Spawn(((int) _helpInterval * 1000), () => _canHelp = true);
EntitySystem.Get<AudioSystem>()
.PlayFromEntity("/Audio/effects/thudswoosh.ogg", Owner, AudioHelpers.WithVariation(0.25f));
.PlayFromEntity("/Audio/Effects/thudswoosh.ogg", Owner, AudioHelpers.WithVariation(0.25f));
_knockdownTimer -= _helpKnockdownRemove;