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

Executions (#24150)

Browse Source 
* Execution (you monster)
not done

* woops

* more stuff

* Melee executions

* Prevent executing those who can interact

* Better checks for if you can execute

* Scale the execution time of a knife with its attack speed

* Translations for fucking up an execution

* rename some functions

* Properly scale execution speed of melee weapons

* Fix checks in CanExecuteWithAny

* Allow executing yourself (funny)

* More versatile localisation

* Suicide with guns

* Popups for successful gun executions

* whoops

* Stop flare guns crashing the game on executions

* Various tweaks

* Remove some old usings

* Pacifists can no longer execute

* Remove unnecessary check

* Use CanShoot in gunsystem

* Capitalisation in ftl string

* Fix melee executions not playing a sound

* localisation tweaks
This commit is contained in:
Veritius
2024-01-17 19:45:45 +11:00
committed by GitHub
parent b293bf4fd8
commit 2e83f5a0ec
4 changed files with 437 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
View File

@@ -736,7 +736,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
return true;
}
private void PlayHitSound(EntityUid target, EntityUid? user, string? type, SoundSpecifier? hitSoundOverride, SoundSpecifier? hitSound)
public void PlayHitSound(EntityUid target, EntityUid? user, string? type, SoundSpecifier? hitSoundOverride, SoundSpecifier? hitSound)
{
var playedSound = false;