Update verbs.dm

2017-09-08 06:56:31 -05:00
parent f4dbb6dc36
commit 62225acc2b
1 changed files with 1 additions and 3 deletions
--- a/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm
@@ -15,12 +15,10 @@
 /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