cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates

Browse Source
This commit is contained in:
Ren Erthilo
2012-04-17 23:30:21 +01:00
parent d4d1795859 d10fd2568c
commit f0d5829369
23 changed files with 904 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
code/modules/admin/verbs/adminjump.dm
View File

@@ -28,7 +28,7 @@
alert("Admin jumping disabled")
return
/client/proc/jumptomob()
/client/proc/jumptomob(var/mob/M in world)
set category = "Admin"
set name = "Jump to Mob"
@@ -37,12 +37,13 @@
return
if(config.allow_admin_jump)
var/mobs = getmobs()
var/selection = input("Please, select a player!", "Admin Jumping", null, null) as null|anything in mobs
if(!selection)
return
var/mob/M = mobs[selection]
if(!M || !istype(M))
var/mobs = getmobs()
var/selection = input("Please, select a player!", "Admin Jumping", null, null) as null|anything in mobs
if(!selection)
return
M = mobs[selection]
var/mob/A = src.mob
var/turf/T = get_turf(M)
if(T && isturf(T))
@@ -94,7 +95,7 @@
else
alert("Admin jumping disabled")
/client/proc/Getmob()
/client/proc/Getmob(var/mob/M)
set category = "Admin"
set name = "Get Mob"
set desc = "Mob to teleport"
@@ -102,11 +103,12 @@
src << "Only administrators may use this command."
return
if(config.allow_admin_jump)
var/mobs = getmobs()
var/selection = input("Please, select a player!", "Admin Jumping", null, null) as null|anything in mobs
var/mob/M = mobs[selection]
if(!istype(M))
return
if(!M || !istype(M))
var/mobs = getmobs()
var/selection = input("Please, select a player!", "Admin Jumping", null, null) as null|anything in mobs
M = mobs[selection]
if(!istype(M))
return
var/mob/A = src.mob
var/turf/T = get_turf(A)
if(T && isturf(T))