From 41b940c1faf90d5d8101c95c3f4462c5a5d9280c Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Mon, 3 Aug 2015 23:52:35 -0500 Subject: [PATCH] Clarified var names --- .../living/simple_animal/guardian/guardian.dm | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index 70667dad44a..8d952f1b39e 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -267,7 +267,7 @@ var/use_message = "You shuffle the deck..." var/used_message = "All the cards seem to be blank now." var/failure_message = "..And draw a card! It's...blank? Maybe you should try again later." - var/list/guardiantypes = list("Fire", "Standard", "Scout", "Shield", "Ranged", "Healer", "Fast") + var/list/possible_guardians = list("Fire", "Standard", "Scout", "Shield", "Ranged", "Healer", "Fast") var/random = TRUE /obj/item/weapon/guardiancreator/attack_self(mob/living/user) @@ -309,9 +309,9 @@ /obj/item/weapon/guardiancreator/proc/spawn_guardian(var/mob/living/user, var/key) var/gaurdiantype = "Standard" if(random) - gaurdiantype = pick(guardiantypes) + gaurdiantype = pick(possible_guardians) else - gaurdiantype = input(user, "Pick the type pf [mob_name]", "[mob_name] Creation") as null|anything in guardiantypes + gaurdiantype = input(user, "Pick the type pf [mob_name]", "[mob_name] Creation") as null|anything in possible_guardians var/pickedtype = /mob/living/simple_animal/hostile/guardian/punch var/picked_color = randomColor(0) switch(gaurdiantype) @@ -339,14 +339,6 @@ if("Bluespace") pickedtype = /mob/living/simple_animal/hostile/guardian/bluespace - switch (theme) - if("magic") - user << "..And draw the Wizard, master of teleportation." - if("tech") - user << "Boot sequence complete. Experimental bluespace combat modules active. Nanoswarm online." - if("bio") - user << "Your scarab swarm finishes mutating and stirs to life, crackling with bluespace energy." - var/mob/living/simple_animal/hostile/guardian/G = new pickedtype(user) G.summoner = user @@ -401,4 +393,4 @@ failure_message = "...but soon settles again. Guess they weren't ready to hatch after all." /obj/item/weapon/guardiancreator/biological/choose - random = FALSE \ No newline at end of file + random = FALSE