From d4ec248398f9851ab72a3f1ae94771cbef7730ea Mon Sep 17 00:00:00 2001 From: "n3ophyt3@gmail.com" Date: Sun, 13 Feb 2011 06:31:24 +0000 Subject: [PATCH] Intelicards now list ion storm laws Carding a traitor AI and/or moving a traitor AI into a new core via intelicard no longer causes it to fail survive objectives. Changed random ion storm law from "HARM IS DEFINED AS [x]" to "[x] IS A FORM OF HARM" because "hurr time for non-harmful harmbatoning from my secborgs" is terrible. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1032 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/devices/aicard.dm | 10 ++++++++++ code/modules/admin/verbs/randomverbs.dm | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/code/game/objects/devices/aicard.dm b/code/game/objects/devices/aicard.dm index 2f33d2918e9..86749e84533 100644 --- a/code/game/objects/devices/aicard.dm +++ b/code/game/objects/devices/aicard.dm @@ -29,6 +29,7 @@ M.real_name = A.real_name if(A.mind) A.mind.transfer_to(M) + A.mind.original = M M.control_disabled = 0 M.laws_object = A.laws_object M.oxyloss = A.oxyloss @@ -74,6 +75,7 @@ O.updatehealth() if(M.mind) M.mind.transfer_to(O) + M.mind.original = O src.name = "inteliCard - [M.name]" M.name = "Inactive AI" M.real_name = "Inactive AI" @@ -126,12 +128,20 @@ attack_self(mob/user) + if (!in_range(src, user)) + return user.machine = src var/dat = "Intelicard
" var/laws for(var/mob/living/silicon/ai/A in src) dat += "Stored AI: [A.name]
System integrity: [(A.health+100)/2]%
" + for (var/index = 1, index <= A.laws_object.ion.len, index++) + var/law = A.laws_object.ion[index] + if (length(law) > 0) + var/num = ionnum() + laws += "[num]. [law]" + if (A.laws_object.zeroth) laws += "0: [A.laws_object.zeroth]
" diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 154135026c6..ea3a6ff999b 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -228,8 +228,8 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is M << "\red [crew] is [target]...LAWS UPDATED" M.add_ion_law("[crew] is [target]") if(11) - M << "\red HARM IS DEFINED AS [define]...LAWS UPDATED" - M.add_ion_law("HARM IS DEFINED AS [define]") + M << "\red [define] IS A FORM OF HARM...LAWS UPDATED" + M.add_ion_law("[define] IS A FORM OF HARM") if(12) M << "\red YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS... LAWS UPDATED" M.add_ion_law("YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS") @@ -400,7 +400,7 @@ TO DO: actually integrate random appearance and player preference save. usr << "Upload failed. Only a faint signal is being detected from the AI, and it is not responding to our requests. It may be low on power." else M.add_ion_law(input) - for(var/mob/living/silicon/O in world) + for(var/mob/living/silicon/ai/O in world) O << "\red " + input log_admin("Admin [key_name(usr)] has added a new AI law - [input]")