mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 11:13:16 +00:00
-Some more html fixing, for communication runes and books.
-Added a badmin secret. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4631 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -513,7 +513,7 @@ var/list/sacrificed = list()
|
|||||||
// returns 0 if the rune is not used. returns 1 if the rune is used.
|
// returns 0 if the rune is not used. returns 1 if the rune is used.
|
||||||
communicate()
|
communicate()
|
||||||
. = 1 // Default output is 1. If the rune is deleted it will return 1
|
. = 1 // Default output is 1. If the rune is deleted it will return 1
|
||||||
var/input = copytext(sanitize(input(usr, "Please choose a message to tell to the other acolytes.", "Voice of Blood", "") as text|null),1,MAX_MESSAGE_LEN)
|
var/input = stripped_input(usr, "Please choose a message to tell to the other acolytes.", "Voice of Blood", "")
|
||||||
if(!input)
|
if(!input)
|
||||||
if (istype(src))
|
if (istype(src))
|
||||||
fizzle()
|
fizzle()
|
||||||
@@ -524,14 +524,14 @@ var/list/sacrificed = list()
|
|||||||
usr.say("O bidai nabora se[pick("'","`")]sma!")
|
usr.say("O bidai nabora se[pick("'","`")]sma!")
|
||||||
else
|
else
|
||||||
usr.whisper("O bidai nabora se[pick("'","`")]sma!")
|
usr.whisper("O bidai nabora se[pick("'","`")]sma!")
|
||||||
var/input_s = sanitize(input)
|
|
||||||
if(istype(src,/obj/effect/rune))
|
if(istype(src,/obj/effect/rune))
|
||||||
usr.say("[input]")
|
usr.say("[input]")
|
||||||
else
|
else
|
||||||
usr.whisper("[input]")
|
usr.whisper("[input]")
|
||||||
for(var/datum/mind/H in ticker.mode.cult)
|
for(var/datum/mind/H in ticker.mode.cult)
|
||||||
if (H.current)
|
if (H.current)
|
||||||
H.current << "\red \b [input_s]"
|
H.current << "\red \b [input]"
|
||||||
del(src)
|
del(src)
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
|
|||||||
@@ -2033,6 +2033,20 @@ var/global/BSACooldown = 0
|
|||||||
for(var/obj/machinery/light/L in world)
|
for(var/obj/machinery/light/L in world)
|
||||||
L.fix()
|
L.fix()
|
||||||
message_admins("[key_name_admin(usr)] fixed all lights", 1)
|
message_admins("[key_name_admin(usr)] fixed all lights", 1)
|
||||||
|
if("friendai")
|
||||||
|
feedback_inc("admin_secrets_fun_used",1)
|
||||||
|
feedback_add_details("admin_secrets_fun_used","FA")
|
||||||
|
for(var/mob/aiEye/aE in mob_list)
|
||||||
|
aE.icon_state = "ai_friend"
|
||||||
|
for(var/obj/machinery/M in machines)
|
||||||
|
if(istype(M, /obj/machinery/ai_status_display))
|
||||||
|
var/obj/machinery/ai_status_display/A = M
|
||||||
|
A.emotion = "Friend Computer"
|
||||||
|
else if(istype(M, /obj/machinery/status_display))
|
||||||
|
var/obj/machinery/status_display/A = M
|
||||||
|
A.friendc = 1
|
||||||
|
message_admins("[key_name_admin(usr)] turned all AIs into best friends.", 1)
|
||||||
|
|
||||||
if("virus")
|
if("virus")
|
||||||
feedback_inc("admin_secrets_fun_used",1)
|
feedback_inc("admin_secrets_fun_used",1)
|
||||||
feedback_add_details("admin_secrets_fun_used","V")
|
feedback_add_details("admin_secrets_fun_used","V")
|
||||||
@@ -2931,7 +2945,8 @@ var/global/BSACooldown = 0
|
|||||||
<A href='?src=\ref[src];secretsfun=movealienship'>Move Alien Dinghy</A><BR>
|
<A href='?src=\ref[src];secretsfun=movealienship'>Move Alien Dinghy</A><BR>
|
||||||
<A href='?src=\ref[src];secretsfun=moveminingshuttle'>Move Mining Shuttle</A><BR>
|
<A href='?src=\ref[src];secretsfun=moveminingshuttle'>Move Mining Shuttle</A><BR>
|
||||||
<A href='?src=\ref[src];secretsfun=blackout'>Break all lights</A><BR>
|
<A href='?src=\ref[src];secretsfun=blackout'>Break all lights</A><BR>
|
||||||
<A href='?src=\ref[src];secretsfun=whiteout'>Fix all lights</A><BR>"}
|
<A href='?src=\ref[src];secretsfun=whiteout'>Fix all lights</A><BR>
|
||||||
|
<A href='?src=\ref[src];secretsfun=friendai'>Best Friend AI</A><BR>"}
|
||||||
//<A href='?src=\ref[src];secretsfun=shockwave'>Station Shockwave</A><BR>
|
//<A href='?src=\ref[src];secretsfun=shockwave'>Station Shockwave</A><BR>
|
||||||
|
|
||||||
if(lvl >= 6)
|
if(lvl >= 6)
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
O.loc = src
|
O.loc = src
|
||||||
update_icon()
|
update_icon()
|
||||||
else if(istype(O, /obj/item/weapon/pen))
|
else if(istype(O, /obj/item/weapon/pen))
|
||||||
var/newname = copytext(sanitize(input("What would you like to title this bookshelf?") as text|null),1,MAX_MESSAGE_LEN)
|
var/newname = stripped_input(usr, "What would you like to title this bookshelf?")
|
||||||
if(!newname)
|
if(!newname)
|
||||||
return
|
return
|
||||||
else
|
else
|
||||||
@@ -140,7 +140,7 @@
|
|||||||
var/choice = input("What would you like to change?") in list("Title", "Contents", "Author", "Cancel")
|
var/choice = input("What would you like to change?") in list("Title", "Contents", "Author", "Cancel")
|
||||||
switch(choice)
|
switch(choice)
|
||||||
if("Title")
|
if("Title")
|
||||||
var/newtitle = copytext(reject_bad_text(input("Write a new title:") as text|null),1,MAX_MESSAGE_LEN)
|
var/newtitle = reject_bad_text(stripped_input(usr, "Write a new title:"))
|
||||||
if(!newtitle)
|
if(!newtitle)
|
||||||
usr << "The title is invalid."
|
usr << "The title is invalid."
|
||||||
return
|
return
|
||||||
@@ -148,14 +148,14 @@
|
|||||||
src.name = newtitle
|
src.name = newtitle
|
||||||
src.title = newtitle
|
src.title = newtitle
|
||||||
if("Contents")
|
if("Contents")
|
||||||
var/content = strip_html(input("Write your book's contents (HTML NOT allowed):"),8192) as message|null
|
var/content = strip_html(input(usr, "Write your book's contents (HTML NOT allowed):"),8192) as message|null
|
||||||
if(!content)
|
if(!content)
|
||||||
usr << "The content is invalid."
|
usr << "The content is invalid."
|
||||||
return
|
return
|
||||||
else
|
else
|
||||||
src.dat += content
|
src.dat += content
|
||||||
if("Author")
|
if("Author")
|
||||||
var/newauthor = copytext(sanitize(input("Write the author's name:") as text|null),1,MAX_NAME_LEN)
|
var/newauthor = stripped_input(usr, "Write the author's name:")
|
||||||
if(!newauthor)
|
if(!newauthor)
|
||||||
usr << "The name is invalid."
|
usr << "The name is invalid."
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -578,15 +578,17 @@
|
|||||||
return
|
return
|
||||||
var/list/ai_emotions = list("Very Happy", "Happy", "Neutral", "Unsure", "Confused", "Sad", "BSOD", "Blank", "Problems?", "Awesome", "Facepalm", "Friend Computer")
|
var/list/ai_emotions = list("Very Happy", "Happy", "Neutral", "Unsure", "Confused", "Sad", "BSOD", "Blank", "Problems?", "Awesome", "Facepalm", "Friend Computer")
|
||||||
var/emote = input("Please, select a status!", "AI Status", null, null) in ai_emotions
|
var/emote = input("Please, select a status!", "AI Status", null, null) in ai_emotions
|
||||||
for (var/obj/machinery/ai_status_display/AISD in world) //change status
|
for (var/obj/machinery/M in machines) //change status
|
||||||
spawn( 0 )
|
if(istype(M, /obj/machinery/ai_status_display))
|
||||||
|
var/obj/machinery/ai_status_display/AISD = M
|
||||||
AISD.emotion = emote
|
AISD.emotion = emote
|
||||||
for (var/obj/machinery/status_display/SD in world) //if Friend Computer, change ALL displays
|
//if Friend Computer, change ALL displays
|
||||||
|
else if(istype(M, /obj/machinery/status_display))
|
||||||
|
|
||||||
|
var/obj/machinery/status_display/SD = M
|
||||||
if(emote=="Friend Computer")
|
if(emote=="Friend Computer")
|
||||||
spawn(0)
|
|
||||||
SD.friendc = 1
|
SD.friendc = 1
|
||||||
else
|
else
|
||||||
spawn(0)
|
|
||||||
SD.friendc = 0
|
SD.friendc = 0
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
|
|
||||||
/mob/aiEye
|
/mob/aiEye
|
||||||
name = "Inactive AI Eye"
|
name = "Inactive AI Eye"
|
||||||
|
icon = 'icons/obj/status_display.dmi' // For AI friend secret shh :o
|
||||||
var/list/visibleCameraChunks = list()
|
var/list/visibleCameraChunks = list()
|
||||||
var/mob/living/silicon/ai/ai = null
|
var/mob/living/silicon/ai/ai = null
|
||||||
density = 0
|
density = 0
|
||||||
|
|||||||
Reference in New Issue
Block a user