Merge branch 'master' of https://github.com/PolarisSS13/Polaris into microsync

code/game/machinery/frame.dm

@@ -26,7 +26,7 @@
 	var/frame_size = 5			// Sheets of metal required to build.
 	var/frame_class				// Determines construction method.  "machine", "computer", "alarm", or "display"
 	var/circuit					// Type path of the circuit board that comes built in with this frame. Null to require adding a circuit.
-	var/frame_style = FRAME_STYLE_WALL	// "floor" or "wall"
+	var/frame_style = FRAME_STYLE_FLOOR	// "floor" or "wall"
 	var/x_offset				// For wall frames: pixel_x
 	var/y_offset				// For wall frames: pixel_y
 

maps/southern_cross/job/outfits.dm

@@ -17,13 +17,13 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
 	id_type = /obj/item/weapon/card/id/civilian/explorer
 	id_pda_assignment = "Explorer"
 
-/decl/hierarchy/outfit/job/explorer/technician
+/decl/hierarchy/outfit/job/explorer2/technician
 	name = OUTFIT_JOB_NAME("Explorer Technician")
 	belt = /obj/item/weapon/storage/belt/utility/full
 	pda_slot = slot_l_store
 	id_pda_assignment = "Explorer Technician"
 
-/decl/hierarchy/outfit/job/explorer/medic
+/decl/hierarchy/outfit/job/explorer2/medic
 	name = OUTFIT_JOB_NAME("Explorer Medic")
 	l_hand = /obj/item/weapon/storage/firstaid/regular
 	pda_slot = slot_l_store

maps/southern_cross/southern_cross_jobs.dm

@@ -100,8 +100,8 @@ var/const/access_explorer = 43
 	minimal_access = list(access_pilot, access_explorer)
 	outfit_type = /decl/hierarchy/outfit/job/explorer2
 	alt_titles = list(
-		"Explorer Technician" = /decl/hierarchy/outfit/job/explorer/technician,
-		"Explorer Medic" = /decl/hierarchy/outfit/job/explorer/medic)
+		"Explorer Technician" = /decl/hierarchy/outfit/job/explorer2/technician,
+		"Explorer Medic" = /decl/hierarchy/outfit/job/explorer2/medic)
 
 /datum/job/sar
 	title = "Search and Rescue"