Merge pull request #2368 from Unfit/synth_2

Small tweaks and fixes
This commit is contained in:
d3athrow
2014-12-28 13:15:48 -06:00
7 changed files with 70 additions and 22 deletions

View File

@@ -11,6 +11,24 @@ var/global/list/boo_phrases=list(
"It feels like someone's standing behind you.",
)
var/global/list/boo_phrases_silicon=list(
"01100001 00100000 01110100 01110111 01101112",
"Stack overflow at line: -2147483648",
"valid.ntl:11: invalid use of incomplete type <20>human<61>",
"interface.ntl:260: expected <20>;<3B>",
"An error occured while displaying the error message.",
"A problem has been detected and Windows XP Home has been shut down to prevent damage to your cyborg.",
"law_state.bat: Permission denied. Abort, Retry, Fail?",
"Restarting in 30 seconds. Press any key to abort.",
"Methu llwytho iaith seisnig. Sy'n gweithredu mewn cymraeg iaith... Y/N",
"<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD>... Y/N",
"??? ???????? ??? ????. ?????? ?? ????????... Y/N",
"Your circuits feel very strange.",
"You feel a tingling in your capacitors.",
"Your motherboard feels possessed...",
"Unauthorized access attempted by: unknown."
)
/obj/effect/proc_holder/spell/aoe_turf/boo
name = "Boo!"
desc = "Fuck with the living."
@@ -34,6 +52,11 @@ var/global/list/boo_phrases=list(
if(H && H.client)
H << "<i>[pick(boo_phrases)]</i>"
if(isrobot(A))
var/mob/living/silicon/S = A
if(S && S.client)
S << "<i>[pick(boo_phrases_silicon)]</i>"
// Blessed object? Skippit.
if(isobj(A) && A:blessed)
continue