cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-15 17:13:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes pods work with the force_eject_occupant proc

Browse Source
This commit is contained in:
joep van der velden
2020-10-29 00:08:52 +01:00
parent 4f982f38f1
commit b586a90257
13 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/adminjump.dm
+8 -8
View File
@@ -24,7 +24,7 @@
if(isobj(usr.loc))
var/obj/O = usr.loc
O.force_eject_occupant()
O.force_eject_occupant(usr)
admin_forcemove(usr, T)
log_admin("[key_name(usr)] jumped to [A]")
@@ -41,7 +41,7 @@
if(isobj(usr.loc))
var/obj/O = usr.loc
O.force_eject_occupant()
O.force_eject_occupant(usr)
log_admin("[key_name(usr)] jumped to [T.x], [T.y], [T.z] in [T.loc]")
if(!isobserver(usr))
message_admins("[key_name_admin(usr)] jumped to [T.x], [T.y], [T.z] in [T.loc]", 1)
@@ -61,7 +61,7 @@
message_admins("[key_name_admin(usr)] jumped to [key_name_admin(M)]", 1)
if(isobj(usr.loc))
var/obj/O = usr.loc
O.force_eject_occupant()
O.force_eject_occupant(usr)
if(src.mob)
var/mob/A = src.mob
var/turf/T = get_turf(M)
@@ -82,7 +82,7 @@
if(T)
if(isobj(usr.loc))
var/obj/O = usr.loc
O.force_eject_occupant()
O.force_eject_occupant(usr)
admin_forcemove(usr, T)
if(isobserver(usr))
var/mob/dead/observer/O = usr
@@ -111,7 +111,7 @@
message_admins("[key_name_admin(usr)] jumped to [key_name_admin(M)]", 1)
if(isobj(usr.loc))
var/obj/O = usr.loc
O.force_eject_occupant()
O.force_eject_occupant(usr)
admin_forcemove(usr, M.loc)
feedback_add_details("admin_verb","JK") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -129,7 +129,7 @@
if(isobj(M.loc))
var/obj/O = M.loc
O.force_eject_occupant()
O.force_eject_occupant(M)
admin_forcemove(M, get_turf(usr))
feedback_add_details("admin_verb","GM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -156,7 +156,7 @@
if(M)
if(isobj(M.loc))
var/obj/O = M.loc
O.force_eject_occupant()
O.force_eject_occupant(M)
admin_forcemove(M, get_turf(usr))
admin_forcemove(usr, M.loc)
feedback_add_details("admin_verb","GK") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -172,7 +172,7 @@
if(A)
if(isobj(M.loc))
var/obj/O = M.loc
O.force_eject_occupant()
O.force_eject_occupant(M)
admin_forcemove(M, pick(get_area_turfs(A)))
feedback_add_details("admin_verb","SMOB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(usr)] teleported [key_name(M)] to [A]")
code/modules/admin/verbs/debug.dm
+1 -1
View File
@@ -904,7 +904,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
var/datum/map_template/ruin/template = landmark.ruin_template
if(isobj(usr.loc))
var/obj/O = usr.loc
O.force_eject_occupant()
O.force_eject_occupant(usr)
admin_forcemove(usr, get_turf(landmark))
to_chat(usr, "<span class='name'>[template.name]</span>")