From 26462755ac4ddb76f2c6e02dd1e218a57592d24e Mon Sep 17 00:00:00 2001
From: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Date: Fri, 17 Nov 2023 13:33:53 -0800
Subject: [PATCH] Fix return statement in Destroy() method and add null check
 in explosion_throw() method

---
 code/game/objects/items/explosives/plastic.dm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/items/explosives/plastic.dm b/code/game/objects/items/explosives/plastic.dm
index 830df9659070..ac0a2263cd5c 100644
--- 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