Map changes, new Ninja masks

Map changes including: RnD layout change, new customs lounge, xenoarch
windows fix, and more. Also added a few new Ninja masks in prep for some
bigger changes I have planned.
This commit is contained in:
SamCroswell
2014-05-03 18:35:10 -04:00
parent aa3dd4b368
commit f4ef7c192b
13 changed files with 10924 additions and 10880 deletions
+2 -1
View File
@@ -170,6 +170,7 @@ var/global/floorIsLava = 0
<b>Other actions:</b>
<br>
<A href='?src=\ref[src];forcespeech=\ref[M]'>Forcesay</A> |
<A href='?src=\ref[src];aroomwarp=\ref[M]'>Admin Room</A> |
<A href='?src=\ref[src];tdome1=\ref[M]'>Thunderdome 1</A> |
<A href='?src=\ref[src];tdome2=\ref[M]'>Thunderdome 2</A> |
<A href='?src=\ref[src];tdomeadmin=\ref[M]'>Thunderdome Admin</A> |
@@ -1073,4 +1074,4 @@ proc/formatLocation(var/location)
return "[A.name] - [loc.x],[loc.y],[loc.z]"
proc/formatPlayerPanel(var/mob/U,var/text="PP")
return "<A HREF='?_src_=holder;adminplayeropts=\ref[U]'>[text]</A>"
return "<A HREF='?_src_=holder;adminplayeropts=\ref[U]'>[text]</A>"
+23
View File
@@ -1253,6 +1253,29 @@
log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Observer.)")
message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Observer.)", 1)
else if(href_list["aroomwarp"])
if(!check_rights(R_FUN)) return
if(alert(usr, "Confirm?", "Message", "Yes", "No") != "Yes")
return
var/mob/M = locate(href_list["aroomwarp"])
if(!ismob(M))
usr << "This can only be used on instances of type /mob"
return
if(istype(M, /mob/living/silicon/ai))
usr << "This cannot be used on instances of type /mob/living/silicon/ai"
return
M.Paralyse(5)
sleep(5)
M.loc = pick(aroomwarp)
spawn(50)
M << "\blue You have been sent to the <b>Admin Room!</b>."
log_admin("[key_name(usr)] has sent [key_name(M)] to the Admin Room")
message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the Admin Room", 1)
else if(href_list["revive"])
if(!check_rights(R_REJUVINATE)) return