cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9779 from Baystation12/master

Browse Source 
Dev-freeze.
This commit is contained in:
PsiOmegaDelta
2015-06-10 11:04:54 +02:00
parent 1efd3f9394 84ae0dd3d1
commit e7faa19ea3
6 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,8 +8,8 @@
set name = "Jump to Area"
set desc = "Area to jump to"
set category = "Admin"
if(!check_rights(R_ADMIN, user = src))
src << "Only administrators may use this command."
if(!check_rights(R_ADMIN))
usr << "Only administrators may use this command."
return
if(config.allow_admin_jump)
@@ -25,8 +25,8 @@
/client/proc/jumptoturf(var/turf/T in world)
set name = "Jump to Turf"
set category = "Admin"
if(!check_rights(R_ADMIN, user = src))
src << "Only administrators may use this command."
if(!check_rights(R_ADMIN))
usr << "Only administrators may use this command."
return
if(config.allow_admin_jump)
log_admin("[key_name(usr)] jumped to [T.x],[T.y],[T.z] in [T.loc]")
@@ -42,8 +42,8 @@
set category = "Admin"
set name = "Jump to Mob"
if(!check_rights(R_ADMIN, user = src))
src << "Only administrators may use this command."
if(!check_rights(R_ADMIN))
usr << "Only administrators may use this command."
return
if(config.allow_admin_jump)
@@ -65,8 +65,8 @@
set category = "Admin"
set name = "Jump to Coordinate"
if(!check_rights(R_ADMIN, user = src))
src << "Only administrators may use this command."
if(!check_rights(R_ADMIN))
usr << "Only administrators may use this command."
return
if (config.allow_admin_jump)
@@ -86,8 +86,8 @@
set category = "Admin"
set name = "Jump to Key"
if(!check_rights(R_ADMIN, user = src))
src << "Only administrators may use this command."
if(!check_rights(R_ADMIN))
usr << "Only administrators may use this command."
return
if(config.allow_admin_jump)
@@ -111,8 +111,8 @@
set category = "Admin"
set name = "Get Mob"
set desc = "Mob to teleport"
if(!check_rights(R_ADMIN, user = src))
src << "Only administrators may use this command."
if(!check_rights(R_ADMIN))
usr << "Only administrators may use this command."
return
if(config.allow_admin_jump)
log_admin("[key_name(usr)] teleported [key_name(M)]")
@@ -128,8 +128,8 @@
set name = "Get Key"
set desc = "Key to teleport"
if(!check_rights(R_ADMIN, user = src))
src << "Only administrators may use this command."
if(!check_rights(R_ADMIN))
usr << "Only administrators may use this command."
return
if(config.allow_admin_jump)
@@ -155,8 +155,8 @@
/client/proc/sendmob(var/mob/M in sortmobs())
set category = "Admin"
set name = "Send Mob"
if(!check_rights(R_ADMIN, user = src))
src << "Only administrators may use this command."
if(!check_rights(R_ADMIN))
usr << "Only administrators may use this command."
return
var/area/A = input(usr, "Pick an area.", "Pick an area") in return_sorted_areas()
if(A)

2
code/modules/mob/living/carbon/carbon.dm
View File

@@ -341,7 +341,7 @@
if (istype(item, /obj/item/weapon/grab))
var/obj/item/weapon/grab/G = item
item = G.throw() //throw the person instead of the grab
item = G.throw_held() //throw the person instead of the grab
if(ismob(item))
var/turf/start_T = get_turf(loc) //Get the start and target tile for the descriptors
var/turf/end_T = get_turf(target)

2
code/modules/mob/mob_grab.dm
View File

@@ -51,7 +51,7 @@
adjust_position()
//Used by throw code to hand over the mob, instead of throwing the grab. The grab is then deleted by the throw code.
/obj/item/weapon/grab/proc/throw()
/obj/item/weapon/grab/proc/throw_held()
if(affecting)
if(affecting.buckled)
return null