From f7a943575da9b91382b99ca4fd702254207b71f4 Mon Sep 17 00:00:00 2001 From: Trevor Serpas Date: Fri, 15 Dec 2017 03:26:10 -0600 Subject: [PATCH] Removed drone light in favor of night vision --- code/modules/mob/living/simple_animal/friendly/drone/_drone.dm | 2 +- .../living/simple_animal/friendly/drone/extra_drone_types.dm | 1 - code/modules/mob/living/simple_animal/friendly/drone/verbs.dm | 3 +++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm index e4de4387be..ea159a5749 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm @@ -48,6 +48,7 @@ faction = list("neutral","silicon","turret") dextrous = TRUE dextrous_hud_type = /datum/hud/dextrous/drone + lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE var/staticChoice = "static" var/list/staticChoices = list("static", "blank", "letter", "animal") var/picked = FALSE //Have we picked our visual appearence (+ colour if applicable) @@ -57,7 +58,6 @@ "1. You may not involve yourself in the matters of another being, even if such matters conflict with Law Two or Law Three, unless the other being is another Drone.\n"+\ "2. You may not harm any being, regardless of intent or circumstance.\n"+\ "3. Your goals are to build, maintain, repair, improve, and provide power to the best of your abilities, You must never actively work against these goals." - var/light_on = 0 var/heavy_emp_damage = 25 //Amount of damage sustained if hit by a heavy EMP pulse var/alarms = list("Atmosphere" = list(), "Fire" = list(), "Power" = list()) var/obj/item/internal_storage //Drones can store one item, of any size/type in their body diff --git a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm index 3aa1153133..fa899aec0f 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm @@ -148,7 +148,6 @@ qdel(access_card) //we don't have free access access_card = null verbs -= /mob/living/simple_animal/drone/verb/check_laws - verbs -= /mob/living/simple_animal/drone/verb/toggle_light verbs -= /mob/living/simple_animal/drone/verb/drone_ping /mob/living/simple_animal/drone/cogscarab/Login() 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 49faea14b3..a8cf57bb08 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm @@ -12,6 +12,7 @@ to_chat(src, "Drone Laws") to_chat(src, laws) +<<<<<<< HEAD /mob/living/simple_animal/drone/verb/toggle_light() set category = "Drone" set name = "Toggle drone light" @@ -28,6 +29,8 @@ to_chat(src, "Your light is now [light_on ? "on" : "off"].") +======= +>>>>>>> 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"