Admin teleport update, further admin message fixes

This commit is contained in:
Markolie
2015-08-18 00:54:25 +02:00
parent 23237582a9
commit 4e8bb6d301
34 changed files with 155 additions and 126 deletions
+4 -2
View File
@@ -330,9 +330,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
set category = "Ghost"
set name = "Teleport"
set desc= "Teleport to a location"
if(!istype(usr, /mob/dead/observer))
if(!isobserver(usr))
usr << "Not when you're not dead!"
return
usr.verbs -= /mob/dead/observer/proc/dead_tele
spawn(30)
usr.verbs += /mob/dead/observer/proc/dead_tele
@@ -348,7 +350,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(!L || !L.len)
usr << "No area available."
usr.loc = pick(L)
usr.forceMove(pick(L))
/mob/dead/observer/verb/follow()
set category = "Ghost"
@@ -62,6 +62,14 @@
/mob/living/carbon/brain/blob_act()
return
/mob/living/carbon/brain/on_forcemove(atom/newloc)
if(container)
container.loc = newloc
else //something went very wrong.
CRASH("Brainmob without container.")
loc = container
/mob/living/carbon/brain/binarycheck()
return istype(loc, /obj/item/device/mmi/posibrain)
@@ -115,7 +115,7 @@
//we're good to suck the blood, blaah
M.handle_bloodsucking(src)
add_logs(src, M, "vampirebit")
message_admins("[M.name] ([M.ckey]) vampirebit [src.name] ([src.ckey])")
msg_admin_attack("[key_name_admin(M)] vampirebit [key_name_admin(src)]")
return
//end vampire codes
+8 -1
View File
@@ -521,4 +521,11 @@
// No binary for pAIs.
/mob/living/silicon/pai/binarycheck()
return 0
return 0
/mob/living/silicon/pai/on_forcemove(atom/newloc)
if(card)
card.loc = newloc
else //something went very wrong.
CRASH("pAI without card")
loc = card
+1 -1
View File
@@ -6,7 +6,7 @@
if (ticker && ticker.current_state == GAME_STATE_PLAYING) //Only report this stuff if we are currently playing.
var/admins_number = admins.len
message_admins("Admin logout: [key_name(src)]")
message_admins("Admin logout: [key_name_admin(src)]")
if(admins_number == 0) //Apparently the admin logging out is no longer an admin at this point, so we have to check this towards 0 and not towards 1. Awell.
send2adminirc("[key_name(src)] logged out - no more admins online.")
..()