cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added trollface and Friend Computer AI status display. Friend Computer overrides all displays except for supply shuttle and prison ones.

Browse Source 
Renamed "Goat Fart" admin rank to "Filthy Xeno" for /tg/ness.
Emagging cyborgs works now.
Changed rune icons.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@286 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
uporotiy
2010-10-15 19:27:50 +00:00
parent 5a23bd2a58
commit 54ead02130
12 changed files with 70 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin.dm
+4 -4
View File
@@ -743,7 +743,7 @@ var/showadminmessages = 1
<A href='?src=\ref[src];chgadlvl=Administrator;client4ad=\ref[C]'>A</A><BR>
<A href='?src=\ref[src];chgadlvl=Secondary Administrator;client4ad=\ref[C]'>SA</A><BR>
<A href='?src=\ref[src];chgadlvl=Moderator;client4ad=\ref[C]'>M</A><BR>
<A href='?src=\ref[src];chgadlvl=Goat Fart;client4ad=\ref[C]'>Goat Fart</A><BR>
<A href='?src=\ref[src];chgadlvl=Filthy Xeno;client4ad=\ref[C]'>Filthy Xeno</A><BR>
<A href='?src=\ref[src];chgadlvl=Remove;client4ad=\ref[C]'>Remove Admin</A><BR>"}
else if(src.level == 5)
//coder
@@ -752,7 +752,7 @@ var/showadminmessages = 1
<A href='?src=\ref[src];chgadlvl=Administrator;client4ad=\ref[C]'>A</A><BR>
<A href='?src=\ref[src];chgadlvl=Secondary Administrator;client4ad=\ref[C]'>SA</A><BR>
<A href='?src=\ref[src];chgadlvl=Moderator;client4ad=\ref[C]'>M</A><BR>
<A href='?src=\ref[src];chgadlvl=Goat Fart;client4ad=\ref[C]'>Goat Fart</A><BR>
<A href='?src=\ref[src];chgadlvl=Filthy Xeno;client4ad=\ref[C]'>Filthy Xeno</A><BR>
<A href='?src=\ref[src];chgadlvl=Remove;client4ad=\ref[C]'>Remove Admin</A><BR>"}
else if(src.level == 4)
//shitguy
@@ -760,14 +760,14 @@ var/showadminmessages = 1
<A href='?src=\ref[src];chgadlvl=Primary Administrator;client4ad=\ref[C]'>PA</A><BR> <A href='?src=\ref[src];chgadlvl=Administrator;client4ad=\ref[C]'>A</A><BR>
<A href='?src=\ref[src];chgadlvl=Secondary Administrator;client4ad=\ref[C]'>SA</A><BR>
<A href='?src=\ref[src];chgadlvl=Moderator;client4ad=\ref[C]'>M</A><BR>
<A href='?src=\ref[src];chgadlvl=Goat Fart;client4ad=\ref[C]'>Goat Fart</A><BR>
<A href='?src=\ref[src];chgadlvl=Filthy Xeno;client4ad=\ref[C]'>Filthy Xeno</A><BR>
<A href='?src=\ref[src];chgadlvl=Remove;client4ad=\ref[C]'>Remove Admin</A><BR>"}
else if(src.level == 3)
//PA
dat += {"
<A href='?src=\ref[src];chgadlvl=Administrator;client4ad=\ref[C]'>A</A><BR> <A href='?src=\ref[src];chgadlvl=Secondary Administrator;client4ad=\ref[C]'>SA</A><BR>
<A href='?src=\ref[src];chgadlvl=Moderator;client4ad=\ref[C]'>M</A><BR>
<A href='?src=\ref[src];chgadlvl=Goat Fart;client4ad=\ref[C]'>Goat Fart</A><BR>
<A href='?src=\ref[src];chgadlvl=Filthy Xeno;client4ad=\ref[C]'>Filthy Xeno</A><BR>
<A href='?src=\ref[src];chgadlvl=Remove;client4ad=\ref[C]'>Remove Admin</A><BR>"}
else
alert("This cannot happen")
code/modules/admin/admin_verbs.dm
+3 -3
View File
@@ -471,7 +471,7 @@
src.verbs += /client/proc/cmd_admin_subtle_message
src.verbs += /client/proc/warn
if ("Goat Fart")
if ("Filthy Xeno")
src.holder.level = -1
src.verbs += /client/proc/stealthadmin
src.verbs += /client/proc/cmd_admin_say
@@ -1262,7 +1262,7 @@
src.verbs += /client/proc/cmd_admin_subtle_message
src.verbs += /client/proc/warn
if ("Goat Fart")
if ("Filthy Xeno")
src.verbs += /client/proc/cmd_admin_say
src.verbs += /client/proc/cmd_admin_gib_self
@@ -1646,6 +1646,6 @@
src.verbs -= /client/proc/cmd_admin_subtle_message
src.verbs -= /client/proc/warn
if ("Goat Fart")
if ("Filthy Xeno")
src.verbs += /client/proc/cmd_admin_say
src.verbs += /client/proc/cmd_admin_gib_self
code/modules/admin/verbs/adminsay.dm
+1 -1
View File
@@ -21,7 +21,7 @@
for (var/mob/M in world)
if (M.client && M.client.holder)
if (src.holder.rank == "Goat Fart")
if (src.holder.rank == "Filthy Xeno")
M << "<span class=\"gfartadmin\"><span class=\"prefix\">ADMIN:</span> <span class=\"name\">[key_name(usr, M)]:</span> <span class=\"message\">[msg]</span></span>"
else
M << "<span class=\"admin\"><span class=\"prefix\">ADMIN:</span> <span class=\"name\">[key_name(usr, M)]:</span> <span class=\"message\">[msg]</span></span>"
code/modules/mob/living/silicon/robot/robot.dm
+21 -1
View File
@@ -284,8 +284,10 @@
who << "<b>Obey these laws:</b>"
laws.show_laws(who)
if (connected_ai)
if (connected_ai && !emagged)
who << "<b>Remember, [connected_ai.name] is your master, other AIs can be ignored.</b>"
else if (emagged)
who << "<b>Remember, AIs are not syndicate operatives, so you are not required to listen to them.</b>"
else
who << "<b>Remember, you are not bound to any AI, you are not required to listen to them.</b>"
@@ -469,6 +471,24 @@
emagged = 1
locked = 0
user << "You emag [src]'s interface."
clear_supplied_laws()
clear_inherent_laws()
src.laws = new /datum/ai_laws/syndicate_override
set_zeroth_law("Only [usr] is a syndicate operative.")
src << "\red ALERT: Foreign software detected."
sleep(5)
src << "\red Initiating diagnostics..."
sleep(20)
src << "\red SynBorg v1.7 loaded."
sleep(5)
src << "\red LAW SYNCHRONISATION ERROR"
sleep(5)
src << "\red Would you like to send a report to NanoTraSoft? Y/N"
sleep(10)
src << "\red N"
sleep(20)
src << "\red ERRORERRORERROR"
src << "\red \b ALERT: [usr] is your new master. Obey your new laws and his commands."
updateicon()
else
user << "You fail to [ locked ? "unlock" : "lock"] [src]'s interface."