Fix c4 deletion runtime (#4947)

# About the pull request Nullchecks a forceMove
cmss13-devs · Nov 19, 2023 · f544b82 · f544b82
1 parent e1bb949
commit f544b82
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/code/game/objects/items/explosives/plastic.dm b/code/game/objects/items/explosives/plastic.dm
@@ -26,7 +26,7 @@
 
 /obj/item/explosive/plastic/Destroy()
 	disarm()
-	. = ..()
+	return ..()
 
 /obj/item/explosive/plastic/explosion_throw(severity, direction, scatter_multiplier)
 	if(active)
@@ -156,7 +156,9 @@
 		plant_target.overlays -= overlay
 		qdel(overlay)
 		plant_target.contents -= src
-		forceMove(get_turf(plant_target))
+		var/turf/plant_turf = get_turf(plant_target)
+		if(plant_turf)
+			forceMove(plant_turf)
 	plant_target = null
 	if(customizable)
 		if(active) //deactivate