Merge pull request #6550 from DeityLink/evenmorefixes

Even more fixes, also more admin logs
This commit is contained in:
Rob Nelson
2015-11-11 11:03:33 -08:00
19 changed files with 91 additions and 31 deletions

View File

@@ -964,7 +964,7 @@ var/global/list/arena_spawnpoints = list()//used by /mob/dead/observer/Logout()
log_game("[key_name_admin(user.client)] created a \"[size]\" Bomberman arena at [center.loc.name] ([center.x],[center.y],[center.z]) ")
for(var/mob/dead/observer/O in observers)
O << "<spawn class='notice'><b>[user.client.key] created a \"[size]\" Bomberman arena at [center.loc.name]. <A HREF='?src=\ref[O];jumptoarenacood=1;X=[center.x];Y=[center.y];Z=[center.z]'>Click here to JUMP to it.</A></b></span>"
O << "<spawn class='notice'><b>[user.client.key] created a \"[size]\" Bomberman arena at [center.loc.name]. <A HREF='?src=\ref[O];jumptoarenacood=1;targetarena=\ref[src]'>Click here to JUMP to it.</A></b></span>"
else
qdel(src)

View File

@@ -847,6 +847,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
usr << "Reached [arena_target]"
usr.loc = arena_target.center
usr << "Remember to enable darkness to be able to see the spawns. Click on a green spawn between rounds to register on it."
/mob/dead/observer/Topic(href, href_list)
if (href_list["reentercorpse"])
@@ -903,13 +904,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
following = null
if(href_list["jumptoarenacood"])
var/x = text2num(href_list["X"])
var/y = text2num(href_list["Y"])
var/z = text2num(href_list["Z"])
var/client/C = usr.client
sleep(2)
C.jumptocoord(x,y,z)
var/datum/bomberman_arena/targetarena = locate(href_list["targetarena"])
usr.loc = targetarena.center
usr << "Remember to enable darkness to be able to see the spawns. Click on a green spawn between rounds to register on it."
..()