From 2edba3dd3283c245eef02078ade30ae5ad18c351 Mon Sep 17 00:00:00 2001 From: Shadowlight213 Date: Sun, 9 Apr 2017 14:11:51 -0700 Subject: [PATCH] Made drones store their picked color and return to it when unhacked --- code/modules/mob/living/simple_animal/friendly/drone/_drone.dm | 1 + .../mob/living/simple_animal/friendly/drone/interaction.dm | 2 +- .../mob/living/simple_animal/friendly/drone/visuals_icons.dm | 2 +- 3 files changed, 3 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 73e78827ec8..e5ba358a25d 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm @@ -51,6 +51,7 @@ var/staticChoice = "static" var/list/staticChoices = list("static", "blank", "letter", "animal") var/picked = FALSE //Have we picked our visual appearence (+ colour if applicable) + var/colour = "grey" //Stored drone color, so we can go back when unhacked. var/list/drone_overlays[DRONE_TOTAL_LAYERS] var/laws = \ "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"+\ diff --git a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm index e5291a9dba8..c6a1a680966 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm @@ -179,7 +179,7 @@ else if(visualAppearence == REPAIRDRONE_HACKED) visualAppearence = REPAIRDRONE else if(visualAppearence == MAINTDRONE_HACKED) - visualAppearence = MAINTDRONE + visualAppearence = MAINTDRONE + "_[colour]" else if(hacked) if(visualAppearence == SCOUTDRONE) visualAppearence = SCOUTDRONE_HACKED diff --git a/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm b/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm index 52c4c63dd53..7fb7caf8e9f 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm @@ -110,7 +110,7 @@ switch(appearence) if("Maintenance Drone") visualAppearence = MAINTDRONE - var/colour = input("Choose your colour!", "Colour", "grey") in list("grey", "blue", "red", "green", "pink", "orange") + colour = input("Choose your colour!", "Colour", "grey") in list("grey", "blue", "red", "green", "pink", "orange") icon_state = "[visualAppearence]_[colour]" icon_living = "[visualAppearence]_[colour]" icon_dead = "[visualAppearence]_dead"