Merge pull request #94 from alex-gh/explosive_implants_phrase

Explosive implants now have a random phrase instead of a pre set one.
This commit is contained in:
ZomgPonies
2013-12-22 23:25:44 -08:00
4 changed files with 15 additions and 8 deletions
+7
View File
@@ -230,6 +230,13 @@ var/syndicate_code_response//Code response for traitors.
return code_phrase
/proc/GenerateKey()
var/newKey
newKey += pick("the", "if", "of", "as", "in", "a", "you", "from", "to", "an", "too", "little", "snow", "dead", "drunk", "rosebud", "duck", "al", "le")
newKey += pick("diamond", "beer", "mushroom", "assistant", "clown", "captain", "twinkie", "security", "nuke", "small", "big", "escape", "yellow", "gloves", "monkey", "engine", "nuclear", "ai")
newKey += pick("1", "2", "3", "4", "5", "6", "7", "8", "9", "0")
return newKey
/*
//This proc tests the gen above.
/client/verb/test_code_phrase()
+4
View File
@@ -193,6 +193,10 @@
for(var/datum/objective/objective in syndicate.objectives)
syndicate.current << "<B>Objective #[obj_count]</B>: [objective.explanation_text]"
obj_count++
for(var/obj/item/weapon/implant/explosive/E in syndicate.current.contents)
if (E.implanted)
syndicate.current << "The activation code for your explosive implant is <B>[E.phrase]</B>"
syndicate.store_memory("The activation code for your explosive implant is <B>[E.phrase]</B>")
return
@@ -130,6 +130,10 @@ Implant Specifics:<BR>"}
var/phrase = "supercalifragilisticexpialidocious"
icon_state = "implant_evil"
New()
..()
phrase=GenerateKey()
get_data()
var/dat = {"
<b>Implant Specifications:</b><BR>
-8
View File
@@ -71,14 +71,6 @@ var/global/list/obj/machinery/message_server/message_servers = list()
..()
return
/obj/machinery/message_server/proc/GenerateKey()
//Feel free to move to Helpers.
var/newKey
newKey += pick("the", "if", "of", "as", "in", "a", "you", "from", "to", "an", "too", "little", "snow", "dead", "drunk", "rosebud", "duck", "al", "le")
newKey += pick("diamond", "beer", "mushroom", "assistant", "clown", "captain", "twinkie", "security", "nuke", "small", "big", "escape", "yellow", "gloves", "monkey", "engine", "nuclear", "ai")
newKey += pick("1", "2", "3", "4", "5", "6", "7", "8", "9", "0")
return newKey
/obj/machinery/message_server/process()
//if(decryptkey == "password")
// decryptkey = generateKey()