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/Projectiles/HitscanComponent.cs
View File

@@ -52,10 +52,10 @@ namespace Content.Server.GameObjects.Components.Projectiles
serializer.DataField(ref _collisionMask, "layers", (int) CollisionGroup.Opaque, WithFormat.Flags<CollisionLayer>());
serializer.DataField(ref _damage, "damage", 10.0f);
serializer.DataField(ref _damageType, "damageType", DamageType.Heat);
serializer.DataField(ref _spriteName, "spriteName", "Objects/Guns/Projectiles/laser.png");
serializer.DataField(ref _spriteName, "spriteName", "Objects/Weapons/Guns/Projectiles/laser.png");
serializer.DataField(ref _muzzleFlash, "muzzleFlash", null);
serializer.DataField(ref _impactFlash, "impactFlash", null);
serializer.DataField(ref _soundHitWall, "soundHitWall", "/Audio/Guns/Hits/laser_sear_wall.ogg");
serializer.DataField(ref _soundHitWall, "soundHitWall", "/Audio/Weapons/Guns/Hits/laser_sear_wall.ogg");
}
public void FireEffects(IEntity user, float distance, Angle angle, IEntity hitEntity = null)