diff --git a/code/modules/projectiles/ammo_types/ags_ammo.dm b/code/modules/projectiles/ammo_types/ags_ammo.dm index f6b321a337932..39c7654b18192 100644 --- a/code/modules/projectiles/ammo_types/ags_ammo.dm +++ b/code/modules/projectiles/ammo_types/ags_ammo.dm @@ -13,7 +13,7 @@ handful_amount = 1 ping = null //no bounce off. sound_bounce = SFX_ROCKET_BOUNCE - ammo_behavior_flags = AMMO_TARGET_TURF|AMMO_SNIPER|AMMO_IFF + ammo_behavior_flags = AMMO_TARGET_TURF|AMMO_SNIPER armor_type = BOMB damage_falloff = 0.5 shell_speed = 2 diff --git a/code/modules/projectiles/ammo_types/heavy_ammo.dm b/code/modules/projectiles/ammo_types/heavy_ammo.dm index e2a7915b3a370..108a177e3fb1f 100644 --- a/code/modules/projectiles/ammo_types/heavy_ammo.dm +++ b/code/modules/projectiles/ammo_types/heavy_ammo.dm @@ -47,7 +47,7 @@ damage = 30 penetration = 35 sundering = 1 - ammo_behavior_flags = AMMO_BALLISTIC|AMMO_IFF|AMMO_SNIPER + ammo_behavior_flags = AMMO_BALLISTIC|AMMO_SNIPER damage_falloff = 1 accurate_range = 7 accuracy = 10 diff --git a/code/modules/projectiles/ammo_types/mech_ammo.dm b/code/modules/projectiles/ammo_types/mech_ammo.dm index 2169374cada01..f9dfb1261aaa5 100644 --- a/code/modules/projectiles/ammo_types/mech_ammo.dm +++ b/code/modules/projectiles/ammo_types/mech_ammo.dm @@ -50,7 +50,7 @@ /datum/ammo/bullet/sniper/mech name = "light anti-tank bullet" - ammo_behavior_flags = AMMO_BALLISTIC|AMMO_SNIPER|AMMO_IFF + ammo_behavior_flags = AMMO_BALLISTIC|AMMO_SNIPER damage = 100 penetration = 35 sundering = 0 diff --git a/code/modules/projectiles/ammo_types/miscellaneous_ammo.dm b/code/modules/projectiles/ammo_types/miscellaneous_ammo.dm index b74df71dbbd7f..92a8a391cc262 100644 --- a/code/modules/projectiles/ammo_types/miscellaneous_ammo.dm +++ b/code/modules/projectiles/ammo_types/miscellaneous_ammo.dm @@ -233,7 +233,7 @@ /datum/ammo/grenade_container/ags_grenade name = "grenade shell" - ammo_behavior_flags = AMMO_TARGET_TURF|AMMO_IFF + ammo_behavior_flags = AMMO_TARGET_TURF icon_state = "grenade_projectile" hud_state = "grenade_he" hud_state_empty = "grenade_empty" diff --git a/code/modules/projectiles/ammo_types/rocket_ammo.dm b/code/modules/projectiles/ammo_types/rocket_ammo.dm index 492cbbd679c61..9f9264408dc33 100644 --- a/code/modules/projectiles/ammo_types/rocket_ammo.dm +++ b/code/modules/projectiles/ammo_types/rocket_ammo.dm @@ -261,7 +261,7 @@ name = "low velocity chemical shell" icon_state = "recoilless_rifle_smoke" hud_state = "shell_le" - ammo_behavior_flags = AMMO_SNIPER|AMMO_IFF //We want this to specifically go farther than onscreen range and pass through friendlies. + ammo_behavior_flags = AMMO_SNIPER accurate_range = 21 max_range = 21 damage = 10 diff --git a/code/modules/projectiles/gun_system.dm b/code/modules/projectiles/gun_system.dm index 75b0dde500fd0..c86386ade48ac 100644 --- a/code/modules/projectiles/gun_system.dm +++ b/code/modules/projectiles/gun_system.dm @@ -1032,7 +1032,7 @@ simulate_recoil(dual_wield, firing_angle) - projectile_to_fire.fire_at(target, master_gun ? gun_user : null, src, projectile_to_fire.ammo.max_range, projectile_to_fire.projectile_speed, firing_angle, suppress_light = HAS_TRAIT(src, TRAIT_GUN_SILENCED)) + projectile_to_fire.fire_at(target, gun_user, src, projectile_to_fire.ammo.max_range, projectile_to_fire.projectile_speed, firing_angle, suppress_light = HAS_TRAIT(src, TRAIT_GUN_SILENCED)) if(CHECK_BITFIELD(gun_features_flags, GUN_SMOKE_PARTICLES)) var/x_component = sin(firing_angle) * 40 var/y_component = cos(firing_angle) * 40 diff --git a/code/modules/projectiles/guns/mounted.dm b/code/modules/projectiles/guns/mounted.dm index b234706ae3f1e..a9c0f1df26db7 100644 --- a/code/modules/projectiles/guns/mounted.dm +++ b/code/modules/projectiles/guns/mounted.dm @@ -121,7 +121,6 @@ item_flags = IS_DEPLOYABLE|TWOHANDED gun_features_flags = GUN_AMMO_COUNTER|GUN_DEPLOYED_FIRE_ONLY|GUN_WIELDED_FIRING_ONLY|GUN_SMOKE_PARTICLES gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC) - actions_types = list(/datum/action/item_action/aim_mode) aim_time = 2 SECONDS aim_fire_delay = 0.05 SECONDS @@ -181,7 +180,7 @@ extra_delay = 1.5 SECONDS item_flags = IS_DEPLOYABLE|TWOHANDED|DEPLOYED_NO_PICKUP|DEPLOY_ON_INITIALIZE - gun_features_flags = GUN_AMMO_COUNTER|GUN_DEPLOYED_FIRE_ONLY|GUN_WIELDED_FIRING_ONLY|GUN_IFF|GUN_SMOKE_PARTICLES + gun_features_flags = GUN_AMMO_COUNTER|GUN_DEPLOYED_FIRE_ONLY|GUN_WIELDED_FIRING_ONLY|GUN_SMOKE_PARTICLES gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC, GUN_FIREMODE_BURSTFIRE, GUN_FIREMODE_AUTOBURST) attachable_allowed = list(/obj/item/attachable/scope/unremovable/standard_atgun) @@ -451,7 +450,6 @@ gun_features_flags = GUN_AMMO_COUNTER|GUN_WIELDED_FIRING_ONLY|GUN_SMOKE_PARTICLES deployable_item = /obj/machinery/deployable/mounted gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC) - actions_types = list(/datum/action/item_action/aim_mode) aim_fire_delay = 0.05 SECONDS aim_speed_modifier = 5 soft_armor = list(MELEE = 0, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 50, BIO = 100, FIRE = 0, ACID = 0) @@ -562,7 +560,6 @@ gun_features_flags = GUN_AMMO_COUNTER|GUN_DEPLOYED_FIRE_ONLY|GUN_WIELDED_FIRING_ONLY|GUN_SMOKE_PARTICLES gun_firemode_list = list(GUN_FIREMODE_SEMIAUTO) - actions_types = list(/datum/action/item_action/aim_mode) aim_time = 6 SECONDS reciever_flags = AMMO_RECIEVER_MAGAZINES|AMMO_RECIEVER_AUTO_EJECT soft_armor = list(MELEE = 60, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 50, BIO = 100, FIRE = 0, ACID = 0) @@ -637,7 +634,7 @@ /obj/item/weapon/gun/standard_agls name = "\improper AGLS-37 Kauser automatic grenade launcher" - desc = "The AGLS-37 automatic grenade launching IFF capable system, it's too heavy to be wielded or operated without the tripod. On the back, it reads: \"The Explosions and Fragmentation from this weapon ARE NOT friendly fire capable. Kauser is not obligated to buy you new body parts for you or your friends if you lose them.\"\nCan be deployed with Crtl-Click. Can be repaired with a blowtorch once deployed." + desc = "The AGLS-37 automatic grenade launching system. It's too heavy to be wielded or operated without the tripod. On the back, it reads: \"Kauser is not obligated to buy you new body parts for you or your friends if you lose them.\"\nCan be deployed with Crtl-Click. Can be repaired with a blowtorch once deployed." w_class = WEIGHT_CLASS_HUGE equip_slot_flags = ITEM_SLOT_BACK caliber = CALIBER_40MM @@ -649,7 +646,7 @@ scatter = 0 fire_delay = 1.1 SECONDS burst_amount = 0 - accuracy_mult = 1.2 //it's got a bipod + accuracy_mult = 1.2 item_flags = IS_DEPLOYABLE|TWOHANDED gun_features_flags = GUN_AMMO_COUNTER|GUN_DEPLOYED_FIRE_ONLY|GUN_WIELDED_FIRING_ONLY gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC) @@ -718,7 +715,6 @@ item_flags = IS_DEPLOYABLE|TWOHANDED gun_features_flags = GUN_AMMO_COUNTER|GUN_DEPLOYED_FIRE_ONLY|GUN_WIELDED_FIRING_ONLY|GUN_SMOKE_PARTICLES gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC) - actions_types = list(/datum/action/item_action/aim_mode) aim_fire_delay = 0.05 SECONDS aim_speed_modifier = 5 diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index 8674dfada0e4f..c724d82459a65 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -74,7 +74,6 @@ gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC, GUN_FIREMODE_BURSTFIRE, GUN_FIREMODE_AUTOBURST) starting_attachment_types = list(/obj/item/attachable/stock/t18stock) attachable_offset = list("muzzle_x" = 30, "muzzle_y" = 16,"rail_x" = 5, "rail_y" = 19, "under_x" = 18, "under_y" = 14, "stock_x" = 0, "stock_y" = 13) - actions_types = list(/datum/action/item_action/aim_mode) aim_fire_delay = 0.1 SECONDS aim_speed_modifier = 2 @@ -161,7 +160,6 @@ gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC, GUN_FIREMODE_BURSTFIRE, GUN_FIREMODE_AUTOBURST) starting_attachment_types = list(/obj/item/attachable/stock/t12stock) attachable_offset = list("muzzle_x" = 30, "muzzle_y" = 17,"rail_x" = 0, "rail_y" = 23, "under_x" = 17, "under_y" = 13, "stock_x" = 0, "stock_y" = 13) - actions_types = list(/datum/action/item_action/aim_mode) aim_fire_delay = 0.1 SECONDS aim_speed_modifier = 2 @@ -326,7 +324,6 @@ gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC, GUN_FIREMODE_BURSTFIRE, GUN_FIREMODE_AUTOBURST) starting_attachment_types = list(/obj/item/attachable/stock/t64stock, /obj/item/weapon/gun/grenade_launcher/underslung/battle_rifle, /obj/item/attachable/scope/mini) attachable_offset = list("muzzle_x" = 44, "muzzle_y" = 19,"rail_x" = 18, "rail_y" = 23, "under_x" = 33, "under_y" = 13, "stock_x" = 11, "stock_y" = 14) - actions_types = list(/datum/action/item_action/aim_mode) aim_fire_delay = 0.2 SECONDS aim_speed_modifier = 3 @@ -728,7 +725,6 @@ gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC) attachable_offset = list("muzzle_x" = 32, "muzzle_y" = 17,"rail_x" = 22, "rail_y" = 17, "under_x" = 32, "under_y" = 14, "stock_x" = 13, "stock_y" = 9) starting_attachment_types = list(/obj/item/attachable/stock/dpm) - actions_types = list(/datum/action/item_action/aim_mode) aim_fire_delay = 0.25 SECONDS aim_speed_modifier = 0.75 @@ -791,7 +787,6 @@ gun_features_flags = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC, GUN_FIREMODE_BURSTFIRE) attachable_offset = list("muzzle_x" = 47, "muzzle_y" = 19,"rail_x" = 18, "rail_y" = 24, "under_x" = 29, "under_y" = 15, "stock_x" = 19, "stock_y" = 13) - actions_types = list(/datum/action/item_action/aim_mode) aim_fire_delay = 0.2 SECONDS aim_speed_modifier = 2.5 @@ -930,7 +925,6 @@ gun_skill_category = SKILL_HEAVY_WEAPONS starting_attachment_types = list(/obj/item/attachable/stock/t42stock) attachable_offset = list("muzzle_x" = 30, "muzzle_y" = 17,"rail_x" = 4, "rail_y" = 20, "under_x" = 16, "under_y" = 14, "stock_x" = 0, "stock_y" = 13) - actions_types = list(/datum/action/item_action/aim_mode) aim_fire_delay = 0.1 SECONDS aim_speed_modifier = 2 @@ -1000,7 +994,6 @@ starting_attachment_types = list(/obj/item/attachable/stock/t60stock) gun_skill_category = SKILL_HEAVY_WEAPONS attachable_offset = list("muzzle_x" = 42, "muzzle_y" = 21,"rail_x" = 6, "rail_y" = 23, "under_x" = 26, "under_y" = 15, "stock_x" = 8, "stock_y" = 13) - actions_types = list(/datum/action/item_action/aim_mode) aim_fire_delay = 0.15 SECONDS aim_speed_modifier = 5.3 @@ -1070,7 +1063,6 @@ gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC, GUN_FIREMODE_BURSTFIRE, GUN_FIREMODE_AUTOBURST) gun_skill_category = SKILL_HEAVY_WEAPONS attachable_offset = list("muzzle_x" = 42, "muzzle_y" = 19,"rail_x" = 17, "rail_y" = 21, "under_x" = 31, "under_y" = 15, "stock_x" = 18, "stock_y" = 15) - actions_types = list(/datum/action/item_action/aim_mode) aim_fire_delay = 0.15 SECONDS aim_speed_modifier = 2 @@ -1145,7 +1137,6 @@ gun_features_flags = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES attachable_offset = list("muzzle_x" = 41, "muzzle_y" = 19,"rail_x" = 18, "rail_y" = 24, "under_x" = 34, "under_y" = 16, "stock_x" = 19, "stock_y" = 13) gun_firemode_list = list(GUN_FIREMODE_BURSTFIRE, GUN_FIREMODE_AUTOBURST) - actions_types = list(/datum/action/item_action/aim_mode) aim_fire_delay = 0.15 SECONDS aim_speed_modifier = 2 @@ -1626,7 +1617,6 @@ gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC, GUN_FIREMODE_BURSTFIRE, GUN_FIREMODE_AUTOBURST) starting_attachment_types = list(/obj/item/attachable/stock/tx11, /obj/item/attachable/scope/mini/tx11) attachable_offset = list("muzzle_x" = 31, "muzzle_y" = 17,"rail_x" = 6, "rail_y" = 20, "under_x" = 20, "under_y" = 12, "stock_x" = 17, "stock_y" = 14) - actions_types = list(/datum/action/item_action/aim_mode) aim_fire_delay = 0.15 SECONDS fire_delay = 0.25 SECONDS @@ -1708,7 +1698,6 @@ gun_features_flags = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC) attachable_offset = list("muzzle_x" = 46, "muzzle_y" = 16,"rail_x" = 18, "rail_y" = 19, "under_x" = 34, "under_y" = 13, "stock_x" = 0, "stock_y" = 13) - actions_types = list(/datum/action/item_action/aim_mode) aim_fire_delay = 0.15 SECONDS aim_speed_modifier = 2.5 @@ -2034,7 +2023,6 @@ gun_firemode_list = list(GUN_FIREMODE_SEMIAUTO) attachable_offset = list("muzzle_x" = 40, "muzzle_y" = 19,"rail_x" = 9, "rail_y" = 22, "under_x" = 33, "under_y" = 16, "stock_x" = 0, "stock_y" = 11) - actions_types = list(/datum/action/item_action/aim_mode) aim_fire_delay = 1.25 SECONDS starting_attachment_types = list( @@ -2099,7 +2087,6 @@ /obj/item/weapon/gun/shotgun/micro_grenade, ) attachable_offset = list("muzzle_x" = 45, "muzzle_y" = 16,"rail_x" = 23, "rail_y" = 24, "under_x" = 33, "under_y" = 11, "stock_x" = -1, "stock_y" = 17) - actions_types = list(/datum/action/item_action/aim_mode) wield_delay = 0.8 SECONDS @@ -2282,7 +2269,6 @@ starting_attachment_types = list(/obj/item/attachable/stock/som_mg_stock) gun_skill_category = SKILL_HEAVY_WEAPONS attachable_offset = list("muzzle_x" = 53, "muzzle_y" = 19,"rail_x" = 14, "rail_y" = 23, "under_x" = 41, "under_y" = 14, "stock_x" = -32, "stock_y" = 0) - actions_types = list(/datum/action/item_action/aim_mode) aim_fire_delay = 0.2 SECONDS aim_slowdown = 1.2 @@ -2428,7 +2414,6 @@ gun_features_flags = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC) attachable_offset = list("muzzle_x" = 44, "muzzle_y" = 19,"rail_x" = 20, "rail_y" = 23, "under_x" = 33, "under_y" = 13, "stock_x" = 0, "stock_y" = 13) - actions_types = list(/datum/action/item_action/aim_mode) aim_fire_delay = 0.25 SECONDS aim_speed_modifier = 1.65 @@ -2491,7 +2476,6 @@ gun_features_flags = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC) attachable_offset = list("muzzle_x" = 48, "muzzle_y" = 18,"rail_x" = 24, "rail_y" = 26, "under_x" = 36, "under_y" = 14, "stock_x" = 0, "stock_y" = 13) - actions_types = list(/datum/action/item_action/aim_mode) aim_fire_delay = 0.3 SECONDS aim_speed_modifier = 2.5 @@ -2669,7 +2653,6 @@ gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC) gun_skill_category = SKILL_HEAVY_WEAPONS attachable_offset = list("muzzle_x" = 42, "muzzle_y" = 21,"rail_x" = 6, "rail_y" = 23, "under_x" = 26, "under_y" = 15, "stock_x" = 8, "stock_y" = 13) - actions_types = list(/datum/action/item_action/aim_mode) aim_fire_delay = 0.15 SECONDS aim_speed_modifier = 5 diff --git a/code/modules/projectiles/guns/shotguns.dm b/code/modules/projectiles/guns/shotguns.dm index 6e29838f29bf1..bdff842b85026 100644 --- a/code/modules/projectiles/guns/shotguns.dm +++ b/code/modules/projectiles/guns/shotguns.dm @@ -550,7 +550,6 @@ gun_features_flags = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES attachable_offset = list("muzzle_x" = 45, "muzzle_y" = 23,"rail_x" = 17, "rail_y" = 25, "under_x" = 19, "under_y" = 14, "stock_x" = 15, "stock_y" = 12) - actions_types = list(/datum/action/item_action/aim_mode) aim_slowdown = 0.35 aim_time = 0.5 SECONDS @@ -685,7 +684,6 @@ ) attachable_offset = list ("muzzle_x" = 45, "muzzle_y" = 23,"rail_x" = 21, "rail_y" = 23, "under_x" = 19, "under_y" = 14, "stock_x" = 15, "stock_y" = 12) gun_features_flags = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES - actions_types = list(/datum/action/item_action/aim_mode) aim_fire_delay = 0.3 SECONDS aim_speed_modifier = 2 diff --git a/code/modules/projectiles/guns/smgs.dm b/code/modules/projectiles/guns/smgs.dm index f6278537d347f..44a61f55b53d3 100644 --- a/code/modules/projectiles/guns/smgs.dm +++ b/code/modules/projectiles/guns/smgs.dm @@ -129,7 +129,6 @@ gun_features_flags = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC) attachable_offset = list("muzzle_x" = 32, "muzzle_y" = 15,"rail_x" = 22, "rail_y" = 22, "under_x" = 17, "under_y" = 15, "stock_x" = 24, "stock_y" = 10) - actions_types = list(/datum/action/item_action/aim_mode) aim_fire_delay = 0.1 SECONDS aim_speed_modifier = 0.55 accuracy_mult = 1.05 @@ -194,7 +193,6 @@ ) attachable_offset = list("muzzle_x" = 43, "muzzle_y" = 19,"rail_x" = 22, "rail_y" = 23, "under_x" = 32, "under_y" = 14, "stock_x" = 24, "stock_y" = 16) - actions_types = list(/datum/action/item_action/aim_mode) aim_fire_delay = 0.1 SECONDS aim_slowdown = 0.25 @@ -426,7 +424,6 @@ gun_features_flags = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES attachable_offset = list("muzzle_x" = 38, "muzzle_y" = 19,"rail_x" = 13, "rail_y" = 21, "under_x" = 26, "under_y" = 15, "stock_x" = 19, "stock_y" = 13) - actions_types = list(/datum/action/item_action/aim_mode) aim_fire_delay = 0.15 SECONDS aim_speed_modifier = 2.5 @@ -688,7 +685,6 @@ starting_attachment_types = list(/obj/item/attachable/stock/icc_pdw) attachable_offset = list("muzzle_x" = 30, "muzzle_y" = 17,"rail_x" = 13, "rail_y" = 20, "under_x" = 31, "under_y" = 13, "stock_x" = 9, "stock_y" = 10) - actions_types = list(/datum/action/item_action/aim_mode) aim_fire_delay = 0.1 SECONDS aim_speed_modifier = 0.55 @@ -752,7 +748,6 @@ ) attachable_offset = list("muzzle_x" = 30, "muzzle_y" = 18,"rail_x" = 14, "rail_y" = 21, "under_x" = 24, "under_y" = 15, "stock_x" = 24, "stock_y" = 16) - actions_types = list(/datum/action/item_action/aim_mode) aim_fire_delay = 0.1 SECONDS aim_slowdown = 0.25 diff --git a/code/modules/projectiles/guns/specialist.dm b/code/modules/projectiles/guns/specialist.dm index 8ba6abe24e174..248beb761e73e 100644 --- a/code/modules/projectiles/guns/specialist.dm +++ b/code/modules/projectiles/guns/specialist.dm @@ -405,7 +405,6 @@ Note that this means that snipers will have a slowdown of 3, due to the scope gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC) attachable_allowed = list(/obj/item/attachable/flashlight, /obj/item/attachable/magnetic_harness) attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 19,"rail_x" = 10, "rail_y" = 21, "under_x" = 24, "under_y" = 14, "stock_x" = 24, "stock_y" = 12) - actions_types = list(/datum/action/item_action/aim_mode) aim_fire_delay = 0.1 SECONDS aim_speed_modifier = 12 @@ -522,7 +521,6 @@ Note that this means that snipers will have a slowdown of 3, due to the scope starting_attachment_types = list(/obj/item/weapon/gun/flamer/hydro_cannon/pepperball) gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC) - actions_types = list(/datum/action/item_action/aim_mode) aim_fire_delay = 0.1 SECONDS aim_speed_modifier = 0.1 diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 9a03b594efce9..18e3e3d86519a 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -831,7 +831,7 @@ So if we are on the 32th absolute pixel coordinate we are on tile 1, but if we a return ..() /mob/living/carbon/human/projectile_hit(obj/projectile/proj, cardinal_move, uncrossing) - if(wear_id?.iff_signal & proj.iff_signal) + if((wear_id?.iff_signal & proj.iff_signal) || (proj?.firer?.faction == faction && proj.original_target != src && Adjacent(proj.firer))) proj.damage -= proj.damage*proj.damage_marine_falloff return FALSE return ..() @@ -848,10 +848,12 @@ So if we are on the 32th absolute pixel coordinate we are on tile 1, but if we a return FALSE return ..() - +///visual and audio feedback for hits /obj/projectile/proc/play_damage_effect(mob/M) - if(ammo.sound_hit) playsound(M, ammo.sound_hit, 50, 1) - if(M.stat != DEAD) animation_flash_color(M) + if(ammo.sound_hit) + playsound(M, ammo.sound_hit, 50, 1) + if(M.stat != DEAD) + animation_flash_color(M) //---------------------------------------------------------- // \\