vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(85018077f) HONK: Characters play Entrance of the Gladiators on the guitar when wearing a clown mask. Closes #1333

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-03-30 15:35:07 +02:00
parent 8053f2ec9e
commit c244b33fe8
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedContent.projitems
+3
View File
@@ -2000,6 +2000,9 @@
<Content Include="$(MSBuildThisFileDirectory)serversettings.xml"> <Content Include="$(MSBuildThisFileDirectory)serversettings.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<None Include="$(MSBuildThisFileDirectory)Content\Items\Misc\GuitarClown.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="$(MSBuildThisFileDirectory)Content\Characters\Carrier\CARRIER_alarmLoop.ogg"> <None Include="$(MSBuildThisFileDirectory)Content\Characters\Carrier\CARRIER_alarmLoop.ogg">
Barotrauma/BarotraumaShared/Source/StatusEffects/StatusEffect.cs
-5
View File
@@ -369,11 +369,6 @@ namespace Barotrauma
return (targetTypes & targetType) != 0; return (targetTypes & targetType) != 0;
} }
public bool HasTargetType(TargetType targetType)
{
return (targetTypes & targetType) != 0;
}
public virtual bool HasRequiredItems(Entity entity) public virtual bool HasRequiredItems(Entity entity)
{ {
if (requiredItems == null) return true; if (requiredItems == null) return true;