Hopefully fixes some bugs that came out of that merge.

code/game/base_turf.dm

@@ -1,6 +1,8 @@
 // Returns the lowest turf available on a given Z-level, defaults to space.
 var/global/list/base_turf_by_z = list(
-	"5" = /turf/simulated/floor/asteroid // Moonbase.
+	"1" = /turf/simulated/floor/asteroid,
+	"4" = /turf/simulated/floor/asteroid,
+	"5" = /turf/simulated/floor/asteroid
 	)
 
 proc/get_base_turf(var/z)

code/game/gamemodes/changeling/powers/armblade.dm

@@ -31,9 +31,6 @@
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	var/mob/living/creator //This is just like ninja swords, needed to make sure dumb shit that removes the sword doesn't make it stay around.
 
-/obj/item/weapon/melee/arm_blade/IsShield()
-	return 1
-
 /obj/item/weapon/melee/arm_blade/New(location)
 	..()
 	processing_objects |= src

code/game/gamemodes/heist/heist.dm

@@ -11,12 +11,8 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind'
 	required_players_secret = 25
 	required_enemies = 4
 	round_description = "An unidentified bluespace signature has slipped past the Icarus and is approaching the station!"
-<<<<<<< HEAD
 	end_on_antag_death = 0
-=======
-	end_on_antag_death = 1
 	antag_tags = list(MODE_RAIDER)
->>>>>>> 25638218325f612b029a8c37cc802b9abbab6d92
 
 /datum/game_mode/heist/check_finished()
 	if(!..())

code/game/jobs/job/civilian.dm

@@ -65,7 +65,8 @@
 	supervisors = "the head of personnel"
 	selection_color = "#dddddd"
 	access = list(access_hydroponics, access_bar, access_kitchen)
-	minimal_access = list(access_hydroponics)	alt_titles = list("Hydroponicist")
+	minimal_access = list(access_hydroponics)
+	alt_titles = list("Hydroponicist")
 
 
 	equip(var/mob/living/carbon/human/H)

code/game/jobs/job/security.dm

@@ -96,9 +96,7 @@
 	access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_eva, access_external_airlocks)
 	minimal_access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_eva, access_external_airlocks)
 	economic_modifier = 5
-	access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels)
-	minimal_access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels)
-	alt_titles = list("Forensic Technician")	minimal_player_age = 3
+	minimal_player_age = 3
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
 		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear)

code/game/objects/structures/lattice.dm

@@ -8,10 +8,11 @@
 	layer = 2.3 //under pipes
 	//	flags = CONDUCT
 
-/obj/structure/lattice/New()
+/obj/structure/lattice/New() //turf/simulated/floor/asteroid
 	..()
 ///// Z-Level Stuff
-	if(!(istype(src.loc, /turf/space) || istype(src.loc, /turf/simulated/floor/open) || istype(src.loc, /turf/simulated/floor/asteroid)))///// Z-Level Stuff
+	if(!(istype(src.loc, /turf/space) || istype(src.loc, /turf/simulated/open) || istype(src.loc, /turf/simulated/floor/asteroid)))
+///// Z-Level Stuff
 		qdel(src)
 	for(var/obj/structure/lattice/LAT in src.loc)
 		if(LAT != src)

code/global.dm

@@ -43,7 +43,7 @@ var/destroy_floor_override = 1
 	//Below is the path of turf used in place of space tiles.
 var/destroy_floor_override_path = /turf/simulated/floor/asteroid
 	//A list of z-levels to apply the override to.  This is so z-levels like tcomms work as they did before.
-var/list/destroy_floor_override_z_levels = list(1)
+var/list/destroy_floor_override_z_levels = list(1,4,5)
 	//Some areas you may want to not turn into the override path you made above, like space or the solars.
 var/list/destroy_floor_override_ignore_areas = list(/area/space,/area/solar,/area/shuttle)
 var/master_mode       = "extended" // "extended"

code/modules/mining/mine_turfs.dm

@@ -490,7 +490,7 @@
 			var/obj/item/stack/tile/floor/S = W
 			if (S.get_amount() < 1)
 				return
-			del(L)
+			qdel(L)
 			playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
 			ChangeTurf(/turf/simulated/floor/airless)
 			S.use(1)