Merge resolution.

code/modules/mob/living/carbon/human/update_icons.dm

@@ -646,8 +646,10 @@ var/global/list/damage_icon_parts = list()
 
 		//Determine the state to use
 		var/t_state = head.icon_state
-		if(head.item_state)
-			t_state = head.item_state
+		if(istype(head, /obj/item/weapon/paper))
+			/* I don't like this, but bandaid to fix half the hats in the game
+			   being completely broken without re-breaking paper hats */
+			t_state = "paper"
 
 		//Create the image
 		var/image/standing = image(icon = t_icon, icon_state = t_state)

code/modules/power/generator.dm

@@ -144,6 +144,10 @@
 					"You [anchored ? "secure" : "unsecure"] the bolts holding [src] to the floor.", \
 					"You hear a ratchet")
 		use_power = anchored
+		if(anchored) // Powernet connection stuff.
+			connect_to_network()
+		else
+			disconnect_from_network()
 		reconnect()
 	else
 		..()