From 8587d908350d93431e1073d4b4b31c9ef2d73954 Mon Sep 17 00:00:00 2001 From: ivanmixo Date: Sun, 24 Sep 2023 09:19:02 +0200 Subject: [PATCH 1/3] Unmanned harddel --- code/modules/vehicles/unmanned/unmanned_vehicle.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/vehicles/unmanned/unmanned_vehicle.dm b/code/modules/vehicles/unmanned/unmanned_vehicle.dm index c1392a5cb97a1..e16a236b7a9a5 100644 --- a/code/modules/vehicles/unmanned/unmanned_vehicle.dm +++ b/code/modules/vehicles/unmanned/unmanned_vehicle.dm @@ -74,9 +74,10 @@ SSminimaps.add_marker(src, MINIMAP_FLAG_MARINE, image('icons/UI_icons/map_blips.dmi', null, "uav")) /obj/vehicle/unmanned/Destroy() - . = ..() GLOB.unmanned_vehicles -= src QDEL_NULL(flash) + QDEL_NULL(in_chamber) + return ..() /obj/vehicle/unmanned/obj_destruction() robogibs(src) From c305cdac6807f83de6441db85ac695d54cfc19df Mon Sep 17 00:00:00 2001 From: ivanmixo Date: Sun, 24 Sep 2023 09:46:37 +0200 Subject: [PATCH 2/3] More stuff --- code/modules/vehicles/unmanned/unmanned_vehicle.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/vehicles/unmanned/unmanned_vehicle.dm b/code/modules/vehicles/unmanned/unmanned_vehicle.dm index e16a236b7a9a5..ae4d96c28b7c0 100644 --- a/code/modules/vehicles/unmanned/unmanned_vehicle.dm +++ b/code/modules/vehicles/unmanned/unmanned_vehicle.dm @@ -77,6 +77,9 @@ GLOB.unmanned_vehicles -= src QDEL_NULL(flash) QDEL_NULL(in_chamber) + for(var/datum/atom_hud/squad/sentry_status_hud in GLOB.huds) //Add to the squad HUD + sentry_status_hud.remove_from_hud(src) + SSminimaps.remove_marker(src) return ..() /obj/vehicle/unmanned/obj_destruction() From 993d6c9e771bf74229259d4df31e7ac9ff14b69e Mon Sep 17 00:00:00 2001 From: ivanmixo Date: Mon, 25 Sep 2023 22:01:45 +0200 Subject: [PATCH 3/3] Update code/modules/vehicles/unmanned/unmanned_vehicle.dm --- code/modules/vehicles/unmanned/unmanned_vehicle.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vehicles/unmanned/unmanned_vehicle.dm b/code/modules/vehicles/unmanned/unmanned_vehicle.dm index ae4d96c28b7c0..807e3febe1b03 100644 --- a/code/modules/vehicles/unmanned/unmanned_vehicle.dm +++ b/code/modules/vehicles/unmanned/unmanned_vehicle.dm @@ -77,7 +77,7 @@ GLOB.unmanned_vehicles -= src QDEL_NULL(flash) QDEL_NULL(in_chamber) - for(var/datum/atom_hud/squad/sentry_status_hud in GLOB.huds) //Add to the squad HUD + for(var/datum/atom_hud/squad/sentry_status_hud in GLOB.huds) sentry_status_hud.remove_from_hud(src) SSminimaps.remove_marker(src) return ..()