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

[MIRROR] You can no longer shoot and melee with guns at the same time (#3133)

Browse Source 
* You can no longer shoot and melee with guns at the same time (#56647)

* You can no longer shoot and melee with guns at the same time

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
This commit is contained in:
SkyratBot
2021-02-06 01:10:42 +01:00
committed by GitHub
parent 2d756a0157
commit 8bc898f14a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,7 @@
var/semicd = 0 //cooldown handler
var/weapon_weight = WEAPON_LIGHT
var/dual_wield_spread = 24 //additional spread when dual wielding
/// Just 'slightly' snowflakey way to modify projectile damage for projectiles fired from this gun.
var/projectile_damage_multiplier = 1
@@ -212,7 +212,7 @@
if(flag) //It's adjacent, is the user, or is on the user's person
if(target in user.contents) //can't shoot stuff inside us.
return
if(!ismob(target) || !user.combat_mode) //melee attack
if(!ismob(target) || user.combat_mode) //melee attack
return
if(target == user && user.zone_selected != BODY_ZONE_PRECISE_MOUTH) //so we can't shoot ourselves (unless mouth selected)
return