Skip to content

Commit

Permalink
Point blank re-added, and fixed (ty double)
Browse files Browse the repository at this point in the history
  • Loading branch information
AmoryBlaine committed Jul 23, 2024
1 parent d0dcc97 commit af793f0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion code/modules/projectiles/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1454,7 +1454,7 @@ and you're good to go.
if(projectile_to_fire.ammo.bonus_projectiles_amount)
var/obj/projectile/BP
for(var/i in 1 to projectile_to_fire.ammo.bonus_projectiles_amount)
BP = new /obj/projectile(attacked_mob.loc, create_cause_data(initial(name), user))
BP = new /obj/projectile(null, create_cause_data(initial(name), user))
BP.generate_bullet(GLOB.ammo_list[projectile_to_fire.ammo.bonus_projectiles_type], 0, NO_FLAGS)
BP.accuracy = round(BP.accuracy * projectile_to_fire.accuracy/initial(projectile_to_fire.accuracy)) //Modifies accuracy of pellets per fire_bonus_projectiles.
BP.damage *= damage_buff
Expand Down
14 changes: 7 additions & 7 deletions code/modules/projectiles/guns/shotguns.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ can cause issues with ammo types getting mixed up during the burst.
var/break_sound = 'sound/weapons/handling/gun_mou_open.ogg'
var/seal_sound = 'sound/weapons/handling/gun_mou_close.ogg'
accuracy_mult = 1.15
flags_gun_features = GUN_INTERNAL_MAG
flags_gun_features = GUN_CAN_POINTBLANK|GUN_INTERNAL_MAG
gun_category = GUN_CATEGORY_SHOTGUN
aim_slowdown = SLOWDOWN_ADS_SHOTGUN
wield_delay = WIELD_DELAY_NORMAL //Shotguns are as hard to pull up as a rifle. They're quite bulky afterall
Expand Down Expand Up @@ -185,7 +185,7 @@ can cause issues with ammo types getting mixed up during the burst.
/obj/item/attachable/compensator,
)

flags_gun_features = GUN_INTERNAL_MAG
flags_gun_features = GUN_CAN_POINTBLANK|GUN_INTERNAL_MAG

/obj/item/weapon/gun/shotgun/merc/Initialize(mapload, spawn_empty)
. = ..()
Expand Down Expand Up @@ -330,7 +330,7 @@ can cause issues with ammo types getting mixed up during the burst.
current_mag = /obj/item/ammo_magazine/internal/shotgun/marsoc

flags_equip_slot = SLOT_WAIST|SLOT_BACK
flags_gun_features = GUN_INTERNAL_MAG
flags_gun_features = GUN_CAN_POINTBLANK|GUN_INTERNAL_MAG
auto_retrieval_slot = WEAR_J_STORE
start_automatic = TRUE

Expand Down Expand Up @@ -520,7 +520,7 @@ can cause issues with ammo types getting mixed up during the burst.
/obj/item/attachable/stock/double,
)

flags_gun_features = GUN_INTERNAL_MAG
flags_gun_features = GUN_CAN_POINTBLANK|GUN_INTERNAL_MAG
burst_delay = 0 //So doubleshotty can doubleshot
has_open_icon = TRUE
civilian_usable_override = TRUE // Come on. It's THE survivor shotgun.
Expand Down Expand Up @@ -658,7 +658,7 @@ can cause issues with ammo types getting mixed up during the burst.
icon_state = "sshotgun"
item_state = "sshotgun"
flags_equip_slot = SLOT_WAIST
flags_gun_features = GUN_INTERNAL_MAG
flags_gun_features = GUN_CAN_POINTBLANK|GUN_INTERNAL_MAG

/obj/item/weapon/gun/shotgun/double/sawn/set_gun_attachment_offsets()
attachable_offset = list("muzzle_x" = 28, "muzzle_y" = 19, "rail_x" = 11, "rail_y" = 20, "under_x" = 15, "under_y" = 14, "stock_x" = 18, "stock_y" = 16)
Expand Down Expand Up @@ -700,7 +700,7 @@ can cause issues with ammo types getting mixed up during the burst.
seal_sound = 'sound/weapons/handling/pkd_close_chamber.ogg'
attachable_allowed = list()

flags_gun_features = GUN_CAN_POINTBLANK|GUN_INTERNAL_MAG|GUN_TRIGGER_SAFETY|GUN_ONE_HAND_WIELDED|GUN_ANTIQUE|GUN_NO_DESCRIPTION|GUN_UNUSUAL_DESIGN
flags_gun_features = GUN_CAN_POINTBLANK|GUN_INTERNAL_MAG|GUN_TRIGGER_SAFETY|GUN_ONE_HAND_WIELDED|GUN_ANTIQUE|GUN_NO_DESCRIPTION|GUN_UNUSUAL_DESIGN
flags_item = NO_FLAGS

inherent_traits = list(TRAIT_GUN_SILENCED)
Expand Down Expand Up @@ -770,7 +770,7 @@ can cause issues with ammo types getting mixed up during the burst.
fire_sound = 'sound/weapons/gun_mou53.ogg'
reload_sound = 'sound/weapons/handling/gun_mou_reload.ogg'//unique shell insert
flags_equip_slot = SLOT_BACK
flags_gun_features = GUN_INTERNAL_MAG
flags_gun_features = GUN_CAN_POINTBLANK|GUN_INTERNAL_MAG
current_mag = /obj/item/ammo_magazine/internal/shotgun/double/mou53 //Take care, she comes loaded!
attachable_allowed = list(
/obj/item/attachable/bayonet,
Expand Down

0 comments on commit af793f0

Please sign in to comment.