From f4dbb6dc365138669b10853682b4e1a690211a3c Mon Sep 17 00:00:00 2001 From: kingofkosmos Date: Wed, 6 Sep 2017 12:35:58 +0300 Subject: [PATCH 1/2] 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, "There's no light in your life... by that I mean you're dead.") + return +>>>>>>> a2511ab... Makes things worse for someone who's already having a difficult time. if(light_on) set_light(0) else From 62225acc2b91c17ea74f67a405ffc5af658e5608 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Fri, 8 Sep 2017 06:56:31 -0500 Subject: [PATCH 2/2] Update verbs.dm --- code/modules/mob/living/simple_animal/friendly/drone/verbs.dm | 4 +--- 1 file changed, 1 insertion(+), 3 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 2b35ba1b55..49faea14b3 100644 --- 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, "There's no light in your life... by that I mean you're dead.") return ->>>>>>> a2511ab... Makes things worse for someone who's already having a difficult time. if(light_on) set_light(0) else