Merge conflicts, procs instead of macros, mood signals.

code/modules/power/cable.dm

@@ -91,6 +91,21 @@ By design, d1 is the smallest direction and d2 is the highest
 		d1 = _d1
 		d2 = _d2
 
+	if(dir != SOUTH)
+		var/angle_to_turn = dir2angle(dir)
+		if(angle_to_turn == 0 || angle_to_turn == 180)
+			angle_to_turn += 180
+		// direct dir set instead of setDir intentional
+		dir = SOUTH
+		if(d1)
+			d1 = turn(d1, angle_to_turn)
+		if(d2)
+			d2 = turn(d2, angle_to_turn)
+		if(d1 > d2)
+			var/temp = d2
+			d2 = d1
+			d1 = temp
+
 	var/turf/T = get_turf(src)			// hide if turf is not intact
 	if(level==1)
 		hide(T.intact)
@@ -495,7 +510,7 @@ By design, d1 is the smallest direction and d2 is the highest
 	full_w_class = WEIGHT_CLASS_SMALL
 	grind_results = list(/datum/reagent/copper = 2) //2 copper per cable in the coil
 	usesound = 'sound/items/deconstruct.ogg'
-	used_skills = list(/datum/skill/level/job/wiring = SKILL_USE_TOOL|SKILL_TRAINING_TOOL)
+	used_skills = list(/datum/skill/level/job/wiring)
 
 /obj/item/stack/cable_coil/cyborg
 	is_cyborg = 1