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-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

manually copied tgstation#47443

Browse Source
This commit is contained in:
Hatterhat
2019-12-31 21:38:11 -06:00
parent 811f1f3768
commit 318a6812c3
4 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,7 @@
var/burst_spread = 0 //Spread induced by the gun itself during burst fire per iteration. Only checked if spread is 0. var/burst_spread = 0 //Spread induced by the gun itself during burst fire per iteration. Only checked if spread is 0.
var/randomspread = 1 //Set to 0 for shotguns. This is used for weapons that don't fire all their bullets at once. var/randomspread = 1 //Set to 0 for shotguns. This is used for weapons that don't fire all their bullets at once.
var/inaccuracy_modifier = 1 var/inaccuracy_modifier = 1
var/pb_knockback = 0
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi' lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi' righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
@@ -125,6 +126,10 @@
if(message) if(message)
if(pointblank) if(pointblank)
user.visible_message("<span class='danger'>[user] fires [src] point blank at [pbtarget]!</span>", null, null, COMBAT_MESSAGE_RANGE) user.visible_message("<span class='danger'>[user] fires [src] point blank at [pbtarget]!</span>", null, null, COMBAT_MESSAGE_RANGE)
if(pb_knockback > 0)
var/atom/throw_target = get_edge_target_turf(pbtarget, user.dir)
pbtarget.throw_at(throw_target, pb_knockback, 2)
else else
user.visible_message("<span class='danger'>[user] fires [src]!</span>", null, null, COMBAT_MESSAGE_RANGE) user.visible_message("<span class='danger'>[user] fires [src]!</span>", null, null, COMBAT_MESSAGE_RANGE)

1
code/modules/projectiles/guns/ballistic/revolver.dm
View File

@@ -273,6 +273,7 @@
"Maple" = "dshotgun-l", "Maple" = "dshotgun-l",
"Rosewood" = "dshotgun-p" "Rosewood" = "dshotgun-p"
) )
pb_knockback = 3 // it's a super shotgun!
/obj/item/gun/ballistic/revolver/doublebarrel/attackby(obj/item/A, mob/user, params) /obj/item/gun/ballistic/revolver/doublebarrel/attackby(obj/item/A, mob/user, params)
..() ..()

2
code/modules/projectiles/guns/ballistic/shotgun.dm
View File

@@ -12,6 +12,8 @@
var/recentpump = 0 // to prevent spammage var/recentpump = 0 // to prevent spammage
weapon_weight = WEAPON_MEDIUM weapon_weight = WEAPON_MEDIUM
pb_knockback = 2
/obj/item/gun/ballistic/shotgun/attackby(obj/item/A, mob/user, params) /obj/item/gun/ballistic/shotgun/attackby(obj/item/A, mob/user, params)
. = ..() . = ..()
if(.) if(.)

1
code/modules/projectiles/guns/ballistic/toy.dm
View File

@@ -56,6 +56,7 @@
item_flags = NONE item_flags = NONE
casing_ejector = FALSE casing_ejector = FALSE
can_suppress = FALSE can_suppress = FALSE
pb_knockback = 0
/obj/item/gun/ballistic/shotgun/toy/process_chamber(empty_chamber = 0) /obj/item/gun/ballistic/shotgun/toy/process_chamber(empty_chamber = 0)
..() ..()