cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-10 17:04:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes teleporting gun with telekinesis [MDB IGNORE] (#14663)

Browse Source 
* Fixes teleporting gun with telekinesis (#68083)

So when you fire a gun with the clumsy trait it has a chance to backfire at you and shoot yourself and if you dont have the no_drop trait will drop the gun on your location hence the teleporting gun bug with telekinesis. This pr adds a check to whether the user is firing via tele or not.

Co-authored-by: Fikou <23585223+Fikou@ users.noreply.github.com>

* Fixes teleporting gun with telekinesis

* Update gun.dm

Co-authored-by: FinancialGoose <92416224+TheBoondock@users.noreply.github.com>
Co-authored-by: Fikou <23585223+Fikou@ users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-07-01 21:40:19 +02:00
committed by GitHub
parent 674b775cbf
commit 7ba070101b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -262,7 +262,7 @@
var/shot_leg = pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
process_fire(user, user, FALSE, null, shot_leg)
SEND_SIGNAL(user, COMSIG_MOB_CLUMSY_SHOOT_FOOT)
if(!HAS_TRAIT(src, TRAIT_NODROP))
if(!tk_firing(user) && !HAS_TRAIT(src, TRAIT_NODROP))
user.dropItemToGround(src, TRUE)
return TRUE