From d2bee73092ba101a9832562913e85fdc4308c010 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon, 6 Sep 2021 14:07:02 +0200
Subject: [PATCH] [MIRROR] Firelance Can No Longer Be Used When Out of Charge
 (#8011)

* Adds a Return Value (#61221)

The firelance's afterattack() proc now actually returns after notifying the user it ran out of battery

* Firelance Can No Longer Be Used When Out of Charge

Co-authored-by: Beatrice <83368538+SpaceDragon00@users.noreply.github.com>
---
 code/modules/explorer_drone/loot.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/modules/explorer_drone/loot.dm b/code/modules/explorer_drone/loot.dm
index beebc4d7fb2..9a600d1d3ec 100644
--- a/code/modules/explorer_drone/loot.dm
+++ b/code/modules/explorer_drone/loot.dm
@@ -167,6 +167,7 @@ GLOBAL_LIST_INIT(adventure_loot_generator_index,generate_generator_index())
 		return
 	if(!cell.use(charge_per_use))
 		to_chat(user,span_warning("[src] battery ran dry!"))
+		return
 	ADD_TRAIT(user,TRAIT_IMMOBILIZED,src)
 	to_chat(user,span_notice("You begin to charge [src]"))
 	inhand_icon_state = "firelance_charging"