Skip to content

Commit

Permalink
shiza_yidi
Browse files Browse the repository at this point in the history
  • Loading branch information
homexp13 committed Dec 5, 2024
1 parent da9ed9b commit fd84398
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 14 deletions.
12 changes: 1 addition & 11 deletions code/modules/projectiles/attachables/rail.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,7 @@
desc = "A B7 smart scope. Does not have a zoom feature, but allows you to take aim and fire through allies. \nNo drawbacks."
icon_state = "b7"
slot = ATTACHMENT_SLOT_RAIL
damage_mod = -0.15

/obj/item/attachable/b7_scope/on_attach(attaching_item, mob/user)
. = ..()
var/obj/item/weapon/gun/attaching_gun = attaching_item
ENABLE_BITFIELD(attaching_gun.flags_gun_features, GUN_IFF)

/obj/item/attachable/b7_scope/on_detach(detaching_item, mob/user)
. = ..()
var/obj/item/weapon/gun/detaching_gun = detaching_item
DISABLE_BITFIELD(detaching_gun.flags_gun_features, GUN_IFF)
add_aim_mode = TRUE

/obj/item/attachable/m16sight
name = "M16 iron sights"
Expand Down
2 changes: 0 additions & 2 deletions code/modules/projectiles/attachables/scope.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
name = "T-47 rail scope"
desc = "A marine standard mounted zoom sight scope. Allows zoom by activating the attachment."
icon_state = "marinescope"
add_aim_mode = TRUE

/obj/item/attachable/scope/nightvision
name = "T-46 Night vision scope"
Expand Down Expand Up @@ -208,7 +207,6 @@
scope_zoom_mod = TRUE
has_nightvision = FALSE
zoom_allow_movement = TRUE
add_aim_mode = TRUE
zoom_slowdown = 0.3
zoom_tile_offset = 5
zoom_viewsize = 0
Expand Down
1 change: 0 additions & 1 deletion code/modules/projectiles/guns/rifles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1032,7 +1032,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

Expand Down

0 comments on commit fd84398

Please sign in to comment.