Merge branch 'master' of https://github.com/PolarisSS13/Polaris into ATaleofBlobsandMen

# FixConflicts:
#	polaris.dme

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/magnetic/gasthrower.dm

@@ -9,6 +9,7 @@
 	one_handed_penalty = 20
 	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 4, TECH_ILLEGAL = 2, TECH_PHORON = 4)
 	w_class = ITEMSIZE_LARGE
+	slowdown = 1
 
 	burst = 3
 	burst_delay = 1

code/modules/projectiles/guns/magnetic/magnetic_construction.dm

@@ -91,11 +91,19 @@
 	. = ..(user,2)
 	if(.)
 		switch(construction_stage)
-			if(2) to_chat(user, "<span class='notice'>It has a metal frame loosely shaped around the stock.</span>")
-			if(3) to_chat(user, "<span class='notice'>It has a metal frame duct-taped to the stock.</span>")
-			if(4) to_chat(user, "<span class='notice'>It has a length of pipe attached to the body.</span>")
-			if(4) to_chat(user, "<span class='notice'>It has a length of pipe welded to the body.</span>")
-			if(6) to_chat(user, "<span class='notice'>It has a cable mount and capacitor jack wired to the frame.</span>")
-			if(7) to_chat(user, "<span class='notice'>It has a single superconducting coil threaded onto the barrel.</span>")
-			if(8) to_chat(user, "<span class='notice'>It has a pair of superconducting coils threaded onto the barrel.</span>")
-			if(9) to_chat(user, "<span class='notice'>It has three superconducting coils attached to the body, waiting to be secured.</span>")
+			if(2)
+				to_chat(user, "<span class='notice'>It has a metal frame loosely shaped around the stock.</span>")
+			if(3)
+				to_chat(user, "<span class='notice'>It has a metal frame duct-taped to the stock.</span>")
+			if(4)
+				to_chat(user, "<span class='notice'>It has a length of pipe attached to the body.</span>")
+			if(4)
+				to_chat(user, "<span class='notice'>It has a length of pipe welded to the body.</span>")
+			if(6)
+				to_chat(user, "<span class='notice'>It has a cable mount and capacitor jack wired to the frame.</span>")
+			if(7)
+				to_chat(user, "<span class='notice'>It has a single superconducting coil threaded onto the barrel.</span>")
+			if(8)
+				to_chat(user, "<span class='notice'>It has a pair of superconducting coils threaded onto the barrel.</span>")
+			if(9)
+				to_chat(user, "<span class='notice'>It has three superconducting coils attached to the body, waiting to be secured.</span>")

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"

code/modules/projectiles/projectile/bullets.dm

@@ -271,10 +271,11 @@
 /obj/item/projectile/bullet/incendiary/flamethrower/tiny
 	damage = 2
 	incendiary = 0
-	modifier_type_to_apply = /datum/modifier/fire/weak
+	flammability = 2
+	modifier_type_to_apply = /datum/modifier/fire/stack_managed/weak
 	modifier_duration = 20 SECONDS
-	range = 7
-	agony = 3
+	range = 6
+	agony = 0
 
 /* Practice rounds and blanks */