Fix several runtimes with remote welderbombing (#18137)

ParadiseSS13 · Jul 2, 2022 · e3b5527 · e3b5527
1 parent 9a8d6da
commit e3b5527
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
@@ -294,7 +294,7 @@
 			add_attack_logs(user, t, what_done, custom_level)
 		return
 
-	var/user_str = key_name_log(user) + COORD(user)
+	var/user_str = key_name_log(user) + (istype(user) ? COORD(user) : "")
 	var/target_str
 	var/target_info
 	if(isatom(target))

diff --git a/code/defines/procs/admin.dm b/code/defines/procs/admin.dm
@@ -73,8 +73,11 @@
 /proc/key_name_admin(whom)
 	if(whom)
 		var/datum/whom_datum = whom //As long as it's not null, will be close enough/has the proc UID() that is all that's needed
-		var/message = "[key_name(whom, 1)]([ADMIN_QUE(whom_datum,"?")])[isAntag(whom) ? "<font color='red'>(A)</font>" : ""][isLivingSSD(whom) ? "<span class='danger'>(SSD!)</span>" : ""] ([admin_jump_link(whom)])"
-		return message
+		if(istype(whom_datum))  // strings and numbers are not datums, but sometimes they do get here...
+			var/message = "[key_name(whom, 1)]([ADMIN_QUE(whom_datum,"?")])[isAntag(whom) ? "<font color='red'>(A)</font>" : ""][isLivingSSD(whom) ? "<span class='danger'>(SSD!)</span>" : ""] ([admin_jump_link(whom)])"
+			return message
+		else
+			return "INVALID/[whom]"
 
 /proc/key_name_mentor(whom)
 	// Same as key_name_admin, but does not include (?) or (A) for antags.

diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm
@@ -194,7 +194,7 @@
 	if(normal && a_right && a_left)
 		if(a_right != D)
 			a_right.pulsed(0)
-		if(a_left != D)
+		if(a_left && a_left != D)  // the right pools might have sent us boom, so `a_left` can be null here
 			a_left.pulsed(0)
 	if(master)
 		master.receive_signal()

diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm
@@ -26,16 +26,17 @@
 	var/turf/location = get_turf(loc)
 	if(location)
 		location.hotspot_expose(1000,1000)
+	sparks.start()
 	if(istype(loc, /obj/item/assembly_holder))
-		if(istype(loc.loc, /obj/structure/reagent_dispensers/fueltank))
-			var/obj/structure/reagent_dispensers/fueltank/tank = loc.loc
+		var/locloc = loc.loc
+		if(istype(locloc, /obj/structure/reagent_dispensers/fueltank))
+			var/obj/structure/reagent_dispensers/fueltank/tank = locloc
 			if(tank)
-				tank.boom(TRUE)
-		if(istype(loc.loc, /obj/item/reagent_containers/glass/beaker))
-			var/obj/item/reagent_containers/glass/beaker/beakerbomb = loc.loc
+				tank.boom(TRUE)  // this qdel's `src`
+		else if(istype(locloc, /obj/item/reagent_containers/glass/beaker))
+			var/obj/item/reagent_containers/glass/beaker/beakerbomb = locloc
 			if(beakerbomb)
 				beakerbomb.heat_beaker()
-	sparks.start()
 	return TRUE