bang bang she shot me (#47443)

This commit is contained in:
Shaps
2019-10-30 19:27:15 -04:00
committed by Rob Bailey
parent eec16e75c0
commit 06ce4cd5f9
3 changed files with 9 additions and 0 deletions

View File

@@ -71,6 +71,7 @@
var/datum/action/toggle_scope_zoom/azoom
var/automatic = 0 //can gun use it, 0 is no, anything above 0 is the delay between clicks in ds
var/pb_knockback = 0
/obj/item/gun/Initialize()
. = ..()
@@ -168,6 +169,10 @@
"<span class='danger'>You fire [src] point blank at [pbtarget]!</span>", \
"<span class='hear'>You hear a gunshot!</span>", COMBAT_MESSAGE_RANGE, pbtarget)
to_chat(pbtarget, "<span class='userdanger'>[user] fires [src] point blank at you!</span>")
if(pb_knockback > 0)
var/atom/throw_target = get_edge_target_turf(pbtarget, user.dir)
pbtarget.throw_at(throw_target, pb_knockback, 2)
else
user.visible_message("<span class='danger'>[user] fires [src]!</span>", \
"<span class='danger'>You fire [src]!</span>", \

View File

@@ -26,6 +26,8 @@
tac_reloads = FALSE
weapon_weight = WEAPON_HEAVY
pb_knockback = 2
/obj/item/gun/ballistic/shotgun/blow_up(mob/user)
. = 0
if(chambered && chambered.BB)
@@ -169,6 +171,7 @@
semi_auto = TRUE
bolt_type = BOLT_TYPE_NO_BOLT
can_be_sawn_off = TRUE
pb_knockback = 3 // it's a super shotgun!
/obj/item/gun/ballistic/shotgun/doublebarrel/AltClick(mob/user)
. = ..()

View File

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