Redoes the Ion Storm Event and Toy AI

This commit is contained in:
Fox-McCloud
2015-06-04 00:06:16 -04:00
parent 6f69d25623
commit b6ee1342e9
11 changed files with 559 additions and 264 deletions
+22
View File
@@ -1259,6 +1259,28 @@ obj/item/toy/cards/deck/syndicate/black
user << "<span class='alert'>Nothing happens.</span>"
/*
* AI core prizes
*/
/obj/item/toy/AI
name = "toy AI"
desc = "A little toy model AI core with real law announcing action!"
icon = 'icons/obj/toy.dmi'
icon_state = "AI"
w_class = 2.0
var/cooldown = 0
/obj/item/toy/AI/attack_self(mob/user)
if(!cooldown) //for the sanity of everyone
var/message = generate_ion_law()
user << "<span class='notice'>You press the button on [src].</span>"
playsound(user, 'sound/machines/click.ogg', 20, 1)
src.loc.visible_message("<span class='danger'>\icon[src] [message]</span>")
cooldown = 1
spawn(30) cooldown = 0
return
..()
/obj/item/toy/owl
name = "owl action figure"
desc = "An action figure modeled after 'The Owl', defender of justice."
@@ -103,12 +103,12 @@ AI MODULES
/obj/item/weapon/aiModule/zeroth
var/removeownlaw = 0
/obj/item/weapon/aiModule/zeroth/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
if(target.laws.zeroth)
if(removeownlaw && (laws[1] == target.laws.zeroth))
target.clear_zeroth_law()
return 2
return 2
else
target << "[sender.real_name] attempted to modify your zeroth law."
target << "It would be in your best interest to play along with [sender.real_name] that:"
@@ -178,7 +178,7 @@ AI MODULES
if(..() == 1)
return "[targetName], but the AI's existing zeroth law cannot be overriden."
if(..() == 2)
return "The AI's zeroth law has been overridden."
return "The AI's zeroth law has been overridden."
return targetName
@@ -273,7 +273,7 @@ AI MODULES
/obj/item/weapon/aiModule/reset/purge/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
..()
target.clear_inherent_laws()
target.clear_inherent_laws()
/******************* Full Core Boards *******************/
@@ -445,7 +445,7 @@ AI MODULES
target.add_ion_law(laws[1])
return laws[1]
/*
/******************* Ion Module *******************/
/obj/item/weapon/aiModule/toyAI // -- Incoming //No actual reason to inherit from ion boards here, either. *sigh* ~Miauw
@@ -466,6 +466,4 @@ AI MODULES
laws[1] = generate_ion_law()
user << "<span class='notice'>You press the button on [src].</span>"
playsound(user, 'sound/machines/click.ogg', 20, 1)
src.loc.visible_message("<span class='warning'>\icon[src] [laws[1]]</span>")
*/
src.loc.visible_message("<span class='warning'>\icon[src] [laws[1]]</span>")
@@ -68,6 +68,7 @@
new /obj/item/weapon/aiModule/syndicate(src)
new /obj/item/weapon/card/emag(src)
new /obj/item/device/encryptionkey/binary(src)
new /obj/item/weapon/aiModule/toyAI(src)
return
if("lordsingulo")