From 1c380e3ed4d6b8e75b29b6e2218d7947d414be27 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 17 Dec 2017 17:50:05 -0600
Subject: [PATCH] Update verbs.dm

---
 .../simple_animal/friendly/drone/verbs.dm     | 19 -------------------
 1 file changed, 19 deletions(-)

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 a8cf57bb08..86bc3b69e5 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm
@@ -11,26 +11,7 @@
 
 	to_chat(src, "<b>Drone Laws</b>")
 	to_chat(src, laws)
-
-<<<<<<< HEAD
-/mob/living/simple_animal/drone/verb/toggle_light()
-	set category = "Drone"
-	set name = "Toggle drone light"
 	
-	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
-	if(light_on)
-		set_light(0)
-	else
-		set_light(8)
-
-	light_on = !light_on
-
-	to_chat(src, "<span class='notice'>Your light is now [light_on ? "on" : "off"].</span>")
-
-=======
->>>>>>> c2c5e90... Removed drone light in favor of night vision (#33529)
 /mob/living/simple_animal/drone/verb/drone_ping()
 	set category = "Drone"
 	set name = "Drone ping"