Merge pull request #19 from Aurorastation/misc_fixes

Misc Fixes

code/ATMOSPHERICS/components/omni_devices/filter.dm

@@ -89,7 +89,7 @@
 	return 1
 
 /obj/machinery/atmospherics/omni/filter/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
-	usr.set_machine(src)
+	user.set_machine(src)
 
 	var/list/data = new()
 

code/controllers/subsystems/job.dm

@@ -672,12 +672,15 @@
 
 		var/datum/spawnpoint/spawnpos
 
-		if(H.client.prefs.spawnpoint)
+		if(H.client.prefs.spawnpoint in SSatlas.spawn_locations)
 			spawnpos = SSatlas.spawn_locations[H.client.prefs.spawnpoint]
 
 		if(rank == "Cyborg")
 			spawnpos = new/datum/spawnpoint/cyborg
 
+		if(!spawnpos)
+			spawnpos = SSatlas.spawn_locations[current_map.default_spawn]
+
 		if(spawnpos && istype(spawnpos))
 			if(spawnpos.check_job_spawning(rank))
 				if(istype(spawnpos, /datum/spawnpoint/cryo) && (rank in command_positions))

code/modules/client/preference_setup/general/01_basic.dm

@@ -137,13 +137,6 @@
 	if(!is_in_playable_species)
 		pref.species = SPECIES_HUMAN
 
-	var/list/spawnkeys = list()
-	for(var/S in SSatlas.spawn_locations)
-		spawnkeys += S
-
-	if(!(pref.spawnpoint in spawnkeys))
-		pref.spawnpoint = current_map.default_spawn
-
 	pref.age                = sanitize_integer(text2num(pref.age), pref.getMinAge(), pref.getMaxAge(), initial(pref.age))
 	pref.gender             = sanitize_gender(pref.gender, pref.species)
 	pref.pronouns           = sanitize_pronouns(pref.pronouns, pref.species, pref.gender)

code/modules/heavy_vehicle/mech_life.dm

@@ -175,4 +175,4 @@
 	return sight
 
 /mob/living/heavy_vehicle/additional_see_invisible()
-	return see_invisible
+	return see_invisible

code/modules/heavy_vehicle/mech_wreckage.dm

@@ -8,7 +8,8 @@
 	icon = 'icons/mecha/mech_part_items.dmi'
 	var/prepared = FALSE
 
-/obj/structure/mech_wreckage/Initialize(var/newloc, var/mob/living/heavy_vehicle/exosuit, var/gibbed)
+/obj/structure/mech_wreckage/Initialize(mapload, var/mob/living/heavy_vehicle/exosuit, var/gibbed)
+	. = ..(mapload)
 	if(exosuit)
 		name = "wreckage of \the [exosuit.name]"
 		if(!gibbed)
@@ -21,10 +22,11 @@
 					if(exosuit.remove_system(hardpoint))
 						thing.forceMove(src)
 
-	..()
-
-/obj/structure/mech_wreckage/powerloader/Initialize(var/newloc)
-	..(newloc, new /mob/living/heavy_vehicle/premade/ripley(newloc), FALSE)
+/obj/structure/mech_wreckage/powerloader/Initialize(mapload)
+	var/mob/living/heavy_vehicle/premade/ripley/new_mech = new(loc)
+	. = ..(mapload, new_mech, FALSE)
+	if(!QDELETED(new_mech))
+		qdel(new_mech)
 
 /obj/structure/mech_wreckage/attack_hand(var/mob/user)
 	if(contents.len)
@@ -78,4 +80,4 @@
 			thing.forceMove(get_turf(src))
 		else
 			qdel(thing)
-	return ..()
+	return ..()

code/modules/heavy_vehicle/mecha.dm

@@ -321,4 +321,4 @@
 	update_icon()
 
 /mob/living/heavy_vehicle/is_anti_materiel_vulnerable()
-	return TRUE
+	return TRUE

code/modules/mining/mine_turfs.dm

@@ -131,7 +131,10 @@ var/list/mineral_can_smooth_with = list(
 /turf/simulated/mineral/bullet_act(var/obj/item/projectile/Proj)
 	if(istype(Proj, /obj/item/projectile/beam/plasmacutter))
 		var/obj/item/projectile/beam/plasmacutter/PC_beam = Proj
-		. = PC_beam.pass_check(src)
+		var/list/cutter_results = PC_beam.pass_check(src)
+		. = cutter_results[1]
+		if(cutter_results[2]) // the cutter mined the turf, just pass on
+			return
 
 	// Emitter blasts
 	if(istype(Proj, /obj/item/projectile/beam/emitter))

code/modules/projectiles/guns/energy/mining.dm

@@ -85,21 +85,21 @@
 
 /obj/item/projectile/beam/plasmacutter/proc/pass_check(var/turf/simulated/mineral/mine_turf)
 	if(mineral_passes <= 0)
-		return null // the projectile stops
+		return list(null, FALSE) // the projectile stops
 	mineral_passes--
-	on_impact(mine_turf)
-	return PROJECTILE_CONTINUE // the projectile tunnels deeper
+	var/mineral_destroyed = on_impact(mine_turf)
+	return list(PROJECTILE_CONTINUE, mineral_destroyed) // the projectile tunnels deeper
 
 /obj/item/projectile/beam/plasmacutter/on_impact(var/atom/A)
 	if(istype(A, /turf/simulated/mineral))
 		var/turf/simulated/mineral/M = A
 		if(prob(33))
 			M.GetDrilled(1)
-			return
+			return TRUE
 		else if(prob(88))
 			M.emitter_blasts_taken += 2
 		M.emitter_blasts_taken += 1
-	. = ..()
+	return ..()
 
 /obj/item/gun/energy/plasmacutter/use_resource(mob/user, var/use_amount)
 	if(use_external_power)
@@ -108,4 +108,4 @@
 			external.use(use_amount * charge_cost)
 		return
 	if(power_supply)
-		power_supply.use(use_amount * charge_cost)
+		power_supply.use(use_amount * charge_cost)

maps/sccv_horizon/placeholder-3_deck_3.dmm

@@ -735,8 +735,7 @@
 	},
 /obj/machinery/status_display{
 	layer = 4;
-	pixel_x = -32;
-	pixel_y = 0
+	pixel_x = -32
 	},
 /turf/simulated/floor/tiled,
 /area/security/investigations)
@@ -2643,8 +2642,7 @@
 	dir = 4
 	},
 /obj/machinery/light_switch{
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /turf/simulated/floor/tiled,
 /area/security/investigations_storage)
@@ -2739,8 +2737,7 @@
 /obj/item/storage/box/cups,
 /obj/machinery/button/switch/windowtint{
 	id = "Interro";
-	pixel_x = -28;
-	pixel_y = 0
+	pixel_x = -28
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/investigations)
@@ -5248,7 +5245,6 @@
 	dir = 4
 	},
 /obj/machinery/light_switch{
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /turf/simulated/floor/tiled/ramp/bottom{
@@ -6144,8 +6140,7 @@
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/structure/table/glass,
 /obj/machinery/light_switch{
-	pixel_x = -30;
-	pixel_y = 0
+	pixel_x = -30
 	},
 /turf/simulated/floor/tiled/white,
 /area/security/forensics_morgue)
@@ -7715,7 +7710,6 @@
 /obj/item/device/radio/intercom{
 	frequency = 1449;
 	name = "Station Intercom (Interrogation)";
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /turf/simulated/floor/tiled/dark,
@@ -10475,7 +10469,6 @@
 	},
 /obj/item/device/radio/intercom{
 	broadcasting = 1;
-	dir = 2;
 	frequency = 1449;
 	listening = 0;
 	name = "Station Intercom (Interrogation)";
@@ -14119,8 +14112,7 @@
 /area/tcommsat/chamber)
 "IP" = (
 /obj/machinery/recharger/wallcharger{
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_x = 32
 	},
 /obj/machinery/recharger/wallcharger{
 	pixel_x = 32;
@@ -17135,8 +17127,7 @@
 /obj/machinery/requests_console{
 	department = "Forensics Lab";
 	departmentType = 5;
-	pixel_x = -30;
-	pixel_y = 0
+	pixel_x = -30
 	},
 /obj/machinery/camera/network/security{
 	c_tag = "Security - Forensics Lab";