TGS Test Merge (#6302)

code/game/mecha/combat/fighter.dm

@@ -337,6 +337,9 @@
 	icon_state = "baron"
 	initial_icon = "baron"
 
+	integrity = 600
+	integrity_max = 600
+
 	catalogue_data = list(/datum/category_item/catalogue/technology/baron)
 	wreckage = /obj/effect/decal/mecha_wreckage/baron
 
@@ -387,8 +390,8 @@
 
 	step_in = 3 //slightly slower than a baron (this shit doesnt actually work atm, likely due to the whole equipment weight nonsense)
 
-	integrity = 800
-	integrity_max = 800 //double baron HP, only room for one defensive upgrade. No specials(cloaking, speed, ect) or universals.
+	integrity = 1200
+	integrity_max = 1200 //double baron HP, only room for one defensive upgrade. No specials(cloaking, speed, ect) or universals.
 
 	max_hull_equip = 1
 	max_weapon_equip = 4

code/game/turfs/simulated/wall_types/wall_types.dm

@@ -418,6 +418,11 @@
 /turf/simulated/shuttle/wall/voidcraft/red
 	stripe_color = "#FF0000"
 
+/turf/simulated/shuttle/wall/voidcraft/red/hard_corner
+	name = "hardcorner wall"
+	icon_state = "void-hc"
+	hard_corner = 1
+
 /turf/simulated/shuttle/wall/voidcraft/blue
 	stripe_color = "#0000FF"
 

code/modules/power/apc.dm

@@ -176,6 +176,10 @@ CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc, 22)
 	/// tracks how behind we arre in charging TODO: literally rewrite apcs entirely to use a proper accumulator-cell system with an internal buffer, ffs
 	var/lazy_draw_accumulator = 0
 
+	//Used for shuttles, workaround for broken mounting
+	//TODO: Remove when legacy walls are nuked
+	var/old_wall = FALSE
+
 /obj/machinery/power/apc/updateDialog()
 	if (machine_stat & (BROKEN|MAINT))
 		return
@@ -259,6 +263,9 @@ CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc, 22)
 /obj/machinery/power/apc/setDir(new_dir)
 	. = ..()
 
+	if(old_wall)
+		return
+
 	base_pixel_x = 0
 	base_pixel_y = 0
 	var/turf/T = get_step(src, turn(dir, 180))

code/modules/power/lighting/lighting.dm

@@ -296,6 +296,10 @@ var/global/list/light_type_cache = list()
 	var/brightness_power_ns
 	var/brightness_color_ns
 
+	//Used for shuttles, workaround for broken mounting
+	//TODO: Remove when legacy walls are nuked
+	var/old_wall = FALSE
+
 	#ifdef IN_MAP_EDITOR // So its actually visible in the mapping editor
 	icon_state = "tube_map"
 	#endif
@@ -502,6 +506,10 @@ var/global/list/light_type_cache = list()
 
 /obj/machinery/light/setDir(ndir)
 	. = ..()
+
+	if(old_wall)
+		return
+
 	base_pixel_y = 0
 	base_pixel_x = 0
 	var/turf/T = get_step(get_turf(src), src.dir)