Merge pull request #4390 from Citadel-Station-13/upstream-merge-33529

[MIRROR] Removed drone light in favor of night vision
2017-12-17 20:37:39 -06:00
parent 52701ebfee 1c380e3ed4
commit 6aa1a86f88
3 changed files with 1 additions and 18 deletions
@@ -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
@@ -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()
@@ -11,23 +11,7 @@

 	to_chat(src, "<b>Drone Laws</b>")
 	to_chat(src, laws)
-
-/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>")
-
 /mob/living/simple_animal/drone/verb/drone_ping()
 	set category = "Drone"
 	set name = "Drone ping"