cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

adds a snowflakey-ish(??? maybe???) way to modify gun damage so we don't need more shot types for improvised shotguns (#12274)

Browse Source 
* Update gun.dm

* Update _firing.dm

* Update code/modules/projectiles/ammunition/_firing.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
This commit is contained in:
kevinz000
2020-05-17 17:59:50 -07:00
committed by GitHub
parent ab93d80289
commit fd5c635840
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/projectiles/ammunition/_firing.dm
View File

@@ -31,6 +31,10 @@
else else
BB.def_zone = user.zone_selected BB.def_zone = user.zone_selected
BB.suppressed = quiet BB.suppressed = quiet
if(isgun(fired_from))
var/obj/item/gun/G = fired_from
BB.damage *= G.projectile_damage_multiplier
if(reagents && BB.reagents) if(reagents && BB.reagents)
reagents.trans_to(BB, reagents.total_volume) //For chemical darts/bullets reagents.trans_to(BB, reagents.total_volume) //For chemical darts/bullets

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

@@ -76,6 +76,9 @@
var/datum/action/item_action/toggle_scope_zoom/azoom var/datum/action/item_action/toggle_scope_zoom/azoom
var/dualwield_spread_mult = 1 //dualwield spread multiplier var/dualwield_spread_mult = 1 //dualwield spread multiplier
/// Just 'slightly' snowflakey way to modify projectile damage for projectiles fired from this gun.
var/projectile_damage_multiplier = 1
/obj/item/gun/Initialize() /obj/item/gun/Initialize()
. = ..() . = ..()