Skip to content

these are definitely weapons as well #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VALERA771 merged 5 commits into from
Dec 9, 2024
Merged

these are definitely weapons as well #167

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
02daca4
these are definitely weapons as well
Mikihero Nov 5, 2024
2c50672
Merge branch 'dev' into isweaponchange
louis1706 Nov 18, 2024
67df073
Update EXILED/Exiled.API/Features/Items/Item.cs
Mikihero Dec 4, 2024
00f8e08
Merge branch 'scpsl14' into isweaponchange
Mikihero Dec 4, 2024
6116d40
Merge branch 'scpsl14' into isweaponchange
Mikihero Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion EXILED/Exiled.API/Features/Items/Item.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,12 @@ public ushort Serial
/// <summary>
/// Gets a value indicating whether this item is a weapon.
/// </summary>
public bool IsWeapon => this is Firearm;
public bool IsWeapon => this is Firearm || Type is ItemType.Jailbird or ItemType.MicroHID;

/// <summary>
/// Gets a value indicating whether or not this item is a firearm.
/// </summary>
public bool IsFirearm => this is Firearm;

/// <summary>
/// Gets a value indicating whether this item emits light.
Expand Down