Merge pull request #1857 from CHOMPStationBot/upstream-merge-10210

[MIRROR] Exploration Balance Tweaks

code/datums/uplink/visible_weapons_vr.dm

@@ -2,11 +2,21 @@
 * Highly Visible and Dangerous Weapons *
 ***************************************/
 /datum/uplink_item/item/visible_weapons/holdout
-	name = "Holdout Phaser"
+	name = "Frontier Holdout"
 	item_cost = 30
 	path = /obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked
 
 /datum/uplink_item/item/visible_weapons/frontier
-	name = "Frontier Carbine"
+	name = "Frontier Phaser"
 	item_cost = 75
+	path = /obj/item/weapon/gun/energy/locked/frontier/unlocked
+
+/datum/uplink_item/item/visible_weapons/carbine
+	name = "Frontier Carbine"
+	item_cost = 85
 	path = /obj/item/weapon/gun/energy/locked/frontier/carbine/unlocked
+
+/datum/uplink_item/item/visible_weapons/rifle
+	name = "Frontier Marksman Rifle"
+	item_cost = 100
+	path = /obj/item/weapon/gun/energy/locked/frontier/rifle/unlocked

code/game/objects/structures/crates_lockers/closets/misc_vr.dm

@@ -176,7 +176,6 @@
 		/obj/item/stack/marker_beacon/thirty,
 		/obj/item/weapon/material/knife/tacknife/survival,
 		/obj/item/weapon/material/knife/machete/deluxe,
-		/obj/item/weapon/gun/energy/locked/frontier/carbine,
 		/obj/item/clothing/accessory/holster/machete,
 		/obj/random/explorer_shield,
 		/obj/item/weapon/reagent_containers/food/snacks/liquidfood,

code/modules/mining/ore_redemption_machine/survey_vendor.dm

@@ -18,6 +18,7 @@
 		EQUIPMENT("Defense Equipment - Plasteel Machete",		/obj/item/weapon/material/knife/machete,							50),
 		EQUIPMENT("Defense Equipment - Razor Drone Deployer",	/obj/item/weapon/grenade/spawnergrenade/manhacks/station/locked,	100),
 		EQUIPMENT("Defense Equipment - Sentry Drone Deployer",	/obj/item/weapon/grenade/spawnergrenade/ward,						150),
+		EQUIPMENT("Defense Equipment - Frontier Carbine",		/obj/item/weapon/gun/energy/locked/frontier/carbine,				750),
 		EQUIPMENT("Fishing Net",								/obj/item/weapon/material/fishing_net,								50),
 		EQUIPMENT("Titanium Fishing Rod",						/obj/item/weapon/material/fishing_rod/modern,						100),
 		EQUIPMENT("Durasteel Fishing Rod",						/obj/item/weapon/material/fishing_rod/modern/strong,				750),
@@ -47,6 +48,7 @@
 	prize_list["Digging Tools"] = list(
 		EQUIPMENT("Survey Tools - Shovel",			/obj/item/weapon/shovel,	40),
 		EQUIPMENT("Survey Tools - Mechanical Trap",	/obj/item/weapon/beartrap,	50),
+		EQUIPMENT("Survey Tools - Binoculars",		/obj/item/device/binoculars,40),
 	)
 	prize_list["Miscellaneous"] = list(
 		EQUIPMENT("Absinthe",					/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe,	10),

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

@@ -257,14 +257,15 @@
 	desc = "An ergonomically improved version of the venerable frontier phaser, the carbine is a fairly new weapon, and has only been produced in limited numbers so far. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility."
 	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "carbinekill"
-	item_state = "retro"
+	item_state = "energykill"
 	item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi')
+	phase_power = 150
 
 	modifystate = "carbinekill"
 	//CHOMP Edit: Changed beam type to new phaser beam type.
 	firemodes = list(
 		list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam/phaser, modifystate="carbinekill", charge_cost = 300),
-		list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/phaser/light, modifystate="carbinestun", charge_cost = 60),
+		list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/phaser/light, modifystate="carbinestun", charge_cost = 80),
 	)
 
 /obj/item/weapon/gun/energy/locked/frontier/carbine/update_icon()
@@ -304,3 +305,51 @@
 	req_access = newlist() //for toggling safety
 	locked = 0
 	lockable = 0
+
+////////////////Phaser Rifle////////////////
+
+/obj/item/weapon/gun/energy/locked/frontier/rifle
+	name = "frontier marksman rifle"
+	desc = "A much larger, heavier weapon than the typical frontier-type weapons, this DMR can be fired both from the hip, and in scope. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility."
+	icon = 'icons/obj/gun_vr.dmi'
+	icon_state = "riflekill"
+	item_state = "sniper"
+	item_state_slots = list(slot_r_hand_str = "lsniper", slot_l_hand_str = "lsniper")
+	wielded_item_state = "lsniper-wielded"
+	action_button_name = "Use Scope"
+	w_class = ITEMSIZE_LARGE
+	item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi')
+	accuracy = -15 //better than most snipers but still has penalty
+	scoped_accuracy = 40
+	one_handed_penalty = 50 // The weapon itself is heavy, and the long barrel makes it hard to hold steady with just one hand.
+	phase_power = 150 //efficient crank charger
+	projectile_type = /obj/item/projectile/beam/phaser/heavy //CHOMPEdit
+	modifystate = "riflekill"
+	//CHOMP Edit: Changed beam type to new phaser beam type.
+	firemodes = list(
+		list(mode_name="sniper", fire_delay=35, projectile_type=/obj/item/projectile/beam/phaser/heavy, modifystate="riflekill", charge_cost = 600),
+		list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam/phaser, modifystate="riflestun", charge_cost = 200),
+	)
+
+/obj/item/weapon/gun/energy/locked/frontier/rifle/ui_action_click()
+	scope()
+
+/obj/item/weapon/gun/energy/locked/frontier/rifle/verb/scope()
+	set category = "Object"
+	set name = "Use Scope"
+	set popup_menu = 1
+
+	toggle_scope(2.0)
+
+/obj/item/weapon/gun/energy/locked/frontier/rifle/update_icon()
+	if(recharging)
+		icon_state = "[modifystate]_pump"
+		update_held_icon()
+		return
+	..()
+
+/obj/item/weapon/gun/energy/locked/frontier/rifle/unlocked
+	desc = "A much larger, heavier weapon than the typical frontier-type weapons, this DMR can be fired both from the hip, and in scope. Includes a built-in crank charger for recharging away from civilization."
+	req_access = newlist() //for toggling safety
+	locked = 0
+	lockable = 0

maps/tether/tether-06-station2.dmm

@@ -10455,7 +10455,6 @@
 /area/ai_monitored/storage/eva)
 "qj" = (
 /obj/structure/table/woodentable,
-/obj/item/device/binoculars,
 /obj/item/weapon/folder/blue,
 /obj/structure/cable/green{
 	d1 = 1;

maps/tether/tether_things.dm

@@ -368,6 +368,8 @@ var/global/list/latejoin_tram   = list()
 	..()
 	for(var/i = 1 to 3)
 		new /obj/item/weapon/gun/energy/locked/frontier(src)
+	for(var/i = 1 to 2)
+		new /obj/item/weapon/gun/energy/locked/frontier/holdout(src)
 
 // Used at centcomm for the elevator
 /obj/machinery/cryopod/robot/door/dorms

maps/tether_better/tether_things.dm

@@ -368,6 +368,8 @@ var/global/list/latejoin_tram   = list()
 	..()
 	for(var/i = 1 to 2)
 		new /obj/item/weapon/gun/energy/locked/frontier(src)
+	for(var/i = 1 to 2)
+		new /obj/item/weapon/gun/energy/locked/frontier/holdout(src)
 
 // Used at centcomm for the elevator
 /obj/machinery/cryopod/robot/door/dorms