shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "shotgun pointblanking people actually throws them"

Browse Source
This commit is contained in:
kevinz000
2020-01-15 01:13:26 -07:00
committed by GitHub
parent 8a06f2f45c
commit b0c2e4cbdd
5 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/gun.dm
-5
View File
@@ -37,7 +37,6 @@
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'
@@ -126,10 +125,6 @@
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)
code/modules/projectiles/guns/ballistic/automatic.dm
-1
View File
@@ -267,7 +267,6 @@
fire_delay = 0 fire_delay = 0
pin = /obj/item/firing_pin/implant/pindicate pin = /obj/item/firing_pin/implant/pindicate
actions_types = list() actions_types = list()
pb_knockback = 2
/obj/item/gun/ballistic/automatic/shotgun/bulldog/unrestricted /obj/item/gun/ballistic/automatic/shotgun/bulldog/unrestricted
pin = /obj/item/firing_pin pin = /obj/item/firing_pin
code/modules/projectiles/guns/ballistic/revolver.dm
-1
View File
@@ -273,7 +273,6 @@
"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)
..() ..()
code/modules/projectiles/guns/ballistic/shotgun.dm
-2
View File
@@ -12,8 +12,6 @@
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(.)
code/modules/projectiles/guns/ballistic/toy.dm
-1
View File
@@ -56,7 +56,6 @@
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)
..() ..()