From f4dbb6dc365138669b10853682b4e1a690211a3c Mon Sep 17 00:00:00 2001
From: kingofkosmos <monggi@gmail.com>
Date: Wed, 6 Sep 2017 12:35:58 +0300
Subject: [PATCH] Fixes drone light toggle while dead

---
 .../mob/living/simple_animal/friendly/drone/verbs.dm        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm b/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm
index 18bd4cc3b0..2b35ba1b55 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm
@@ -15,6 +15,12 @@
 /mob/living/simple_animal/drone/verb/toggle_light()
 	set category = "Drone"
 	set name = "Toggle drone light"
+<<<<<<< HEAD
+=======
+	if(stat == DEAD)
+		to_chat(src, "<span class='warning'>There's no light in your life... by that I mean you're dead.</span>")
+		return
+>>>>>>> a2511ab... Makes things worse for someone who's already having a difficult time.
 	if(light_on)
 		set_light(0)
 	else