cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 10:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makes pistol whipping work properly for guns that have hold at gunpoint disabled (#90107)

Browse Source 
## About The Pull Request

Just shifts some logic around so that hold gunpoint being disabled on a
gun does not cause it to fire when pistol whipping.

## Why It's Good For The Game

Fixes an unintended interaction

## Changelog

🆑
fix: combat rmb will no longer fire the gun at the same time as pistol
whipping for certain guns
/🆑
This commit is contained in:
Bloop
2025-03-20 08:45:20 -04:00
committed by GitHub
parent 53e12b4b15
commit 1b52f83ff2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/projectiles/gun.dm
View File

@@ -291,12 +291,12 @@
return NONE return NONE
/obj/item/gun/interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers) /obj/item/gun/interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers)
if(!can_hold_up || !isliving(interacting_with))
return interact_with_atom(interacting_with, user, modifiers)
if(user.combat_mode && isliving(interacting_with)) if(user.combat_mode && isliving(interacting_with))
return ITEM_INTERACT_SKIP_TO_ATTACK // Gun bash / bayonet attack return ITEM_INTERACT_SKIP_TO_ATTACK // Gun bash / bayonet attack
if(!can_hold_up || !isliving(interacting_with))
return interact_with_atom(interacting_with, user, modifiers)
var/datum/component/gunpoint/gunpoint_component = user.GetComponent(/datum/component/gunpoint) var/datum/component/gunpoint/gunpoint_component = user.GetComponent(/datum/component/gunpoint)
if (gunpoint_component) if (gunpoint_component)
balloon_alert(user, "already holding [gunpoint_component.target == interacting_with ? "them" : "someone"] up!") balloon_alert(user, "already holding [gunpoint_component.target == interacting_with ? "them" : "someone"] up!")