Minor Fixes

code/modules/admin/admin_vr.dm

@@ -8,5 +8,7 @@
 		traitors.spawn_uplink(H)
 		H.mind.tcrystals = DEFAULT_TELECRYSTAL_AMOUNT
 		H.mind.accept_tcrystals = 1
+		var/msg = "[key_name(usr)] has given [H.ckey] an uplink."
+		message_admins(msg)
 	else
 		to_chat(usr, "You do not have access to this command.")

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

@@ -304,3 +304,102 @@
 	req_access = newlist() //for toggling safety
 	locked = 0
 	lockable = 0
+<<<<<<< HEAD
+||||||| parent of 501e41b2e8... Merge pull request #10238 from Novacat/nova-ert
+
+////////////////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
+
+	modifystate = "riflekill"
+	firemodes = list(
+		list(mode_name="sniper", fire_delay=35, projectile_type=/obj/item/projectile/beam/sniper, modifystate="riflekill", charge_cost = 600),
+		list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam, 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
+=======
+
+////////////////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/sniper
+	modifystate = "riflekill"
+	firemodes = list(
+		list(mode_name="sniper", fire_delay=35, projectile_type=/obj/item/projectile/beam/sniper, modifystate="riflekill", charge_cost = 600),
+		list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam, 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
+>>>>>>> 501e41b2e8... Merge pull request #10238 from Novacat/nova-ert

maps/expedition_vr/beach/beach.dmm

@@ -1973,7 +1973,7 @@
 /turf/simulated/floor/tiled/asteroid_steel,
 /area/tether_away/beach/resort/lockermed)
 "Tg" = (
-/mob/living/simple_mob/animal/passive/fish/solarfish,
+/mob/living/simple_mob/animal/passive/fish/icebass,
 /turf/simulated/floor/water/ocean,
 /area/tether_away/beach/cavebase)
 "Tp" = (