Merge pull request #7044 from Novacat/nova-pathfinder

Ports Polaris #6924 and #6925

code/modules/clothing/under/accessories/storage.dm

@@ -11,7 +11,7 @@
 	on_rolled = list("down" = "none")
 	var/hide_on_roll = FALSE
 
-/obj/item/clothing/accessory/storage/New()
+/obj/item/clothing/accessory/storage/Initialize()
 	..()
 	hold = new/obj/item/weapon/storage/internal(src)
 	hold.max_storage_space = slots * 2
@@ -94,7 +94,7 @@
 	icon_state = "unathiharness2"
 	slots = 2
 
-/obj/item/clothing/accessory/storage/knifeharness/New()
+/obj/item/clothing/accessory/storage/knifeharness/Initialize()
 	..()
 	hold.max_storage_space = ITEMSIZE_COST_SMALL * 2
 	hold.can_hold = list(/obj/item/weapon/material/knife/machete/hatchet/unathiknife,\

code/modules/clothing/under/xenos/vox.dm

@@ -27,7 +27,7 @@
 
 	slots = 3
 
-/obj/item/clothing/accessory/storage/vox/New()
+/obj/item/clothing/accessory/storage/vox/Initialize()
 	..()
 	hold.max_storage_space = slots * ITEMSIZE_COST_NORMAL
 	hold.max_w_class = ITEMSIZE_NORMAL

code/modules/projectiles/guns/energy/laser.dm

@@ -166,6 +166,7 @@
 	origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 5, TECH_POWER = 4)
 	projectile_type = /obj/item/projectile/beam/sniper
 	slot_flags = SLOT_BACK
+	action_button_name = "Use Scope"
 	battery_lock = 1
 	charge_cost = 600
 	fire_delay = 35
@@ -176,6 +177,9 @@
 //	requires_two_hands = 1
 //	one_handed_penalty = 60 // The weapon itself is heavy, and the long barrel makes it hard to hold steady with just one hand.
 
+/obj/item/weapon/gun/energy/sniperrifle/ui_action_click()
+	scope()
+
 /obj/item/weapon/gun/energy/sniperrifle/verb/scope()
 	set category = "Object"
 	set name = "Use Scope"
@@ -192,6 +196,7 @@
 	origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 4, TECH_POWER = 3)
 	projectile_type = /obj/item/projectile/beam/sniper
 	slot_flags = SLOT_BACK
+	action_button_name = "Aim Down Sights"
 	charge_cost = 1300
 	fire_delay = 20
 	force = 8
@@ -200,6 +205,9 @@
 	scoped_accuracy = 15
 	var/scope_multiplier = 1.5
 
+/obj/item/weapon/gun/energy/monorifle/ui_action_click()
+	sights()
+
 /obj/item/weapon/gun/energy/monorifle/verb/sights()
 	set category = "Object"
 	set name = "Aim Down Sights"

code/modules/projectiles/guns/projectile/sniper.dm

@@ -8,6 +8,7 @@
 	w_class = ITEMSIZE_HUGE // So it can't fit in a backpack.
 	force = 10
 	slot_flags = SLOT_BACK
+	action_button_name = "Use Scope"
 	origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 2, TECH_ILLEGAL = 8)
 	caliber = "14.5mm"
 	recoil = 5 //extra kickback
@@ -61,6 +62,9 @@
 		return
 	..()
 
+/obj/item/weapon/gun/projectile/heavysniper/ui_action_click()
+	scope()
+
 /obj/item/weapon/gun/projectile/heavysniper/verb/scope()
 	set category = "Object"
 	set name = "Use Scope"
@@ -78,6 +82,7 @@
 	w_class = ITEMSIZE_HUGE // So it can't fit in a backpack.
 	force = 10
 	slot_flags = SLOT_BACK // Needs a sprite.
+	action_button_name = "Use Scope"
 	origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 2, TECH_ILLEGAL = 8)
 	caliber = "7.62mm"
 	load_method = MAGAZINE
@@ -96,6 +101,9 @@
 	else
 		icon_state = "SVD-empty"
 
+/obj/item/weapon/gun/projectile/SVD/ui_action_click()
+	scope()
+
 /obj/item/weapon/gun/projectile/SVD/verb/scope()
 	set category = "Object"
 	set name = "Use Scope"