Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""

This reverts commit 27a099c6bf.

code/modules/power/cell.dm

@@ -407,3 +407,10 @@
 /obj/item/stock_parts/cell/toymagburst
 	name = "toy mag burst rifle power supply"
 	maxcharge = 4000
+
+/obj/item/stock_parts/cell/family
+	name = "broken power cell"
+	desc = "An old faulty power cell. You can see your family name faintly etched onto it."
+	maxcharge = 100
+	self_recharge = -5 //it loses power over time instead of gaining
+	rating = 1

code/modules/power/singularity/emitter.dm

@@ -364,7 +364,7 @@
 	icon_state_on = "protoemitter_+a"
 	can_buckle = TRUE
 	buckle_lying = FALSE
-	var/view_range = 12
+	var/view_range = 4.5
 	var/datum/action/innate/protoemitter/firing/auto
 
 //BUCKLE HOOKS
@@ -379,7 +379,7 @@
 		buckled_mob.pixel_x = 0
 		buckled_mob.pixel_y = 0
 		if(buckled_mob.client)
-			buckled_mob.client.change_view(CONFIG_GET(string/default_view))
+			buckled_mob.client.view_size.resetToDefault()
 	auto.Remove(buckled_mob)
 	. = ..()
 
@@ -395,7 +395,7 @@
 	M.pixel_y = 14
 	layer = 4.1
 	if(M.client)
-		M.client.change_view(view_range)
+		M.client.view_size.setTo(view_range)
 	if(!auto)
 		auto = new()
 	auto.Grant(M, src)