cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds multi-mob warning to admin click shortcuts

Browse Source 
Also, cleans up admin_mob_info code a bit
This commit is contained in:
Krausus
2016-07-28 17:02:46 -04:00
parent 16500f0f27
commit 56f6b3a14e
2 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/mobs.dm
+27 -5
View File
@@ -301,9 +301,12 @@ proc/add_logs(mob/target, mob/user, what_done, var/object=null, var/addition=nul
var/mob/living/L = M
var/status
switch(M.stat)
if(0) status = "Alive"
if(1) status = "<font color='orange'><b>Unconscious</b></font>"
if(2) status = "<font color='red'><b>Dead</b></font>"
if(CONSCIOUS)
status = "Alive"
if(UNCONSCIOUS)
status = "<font color='orange'><b>Unconscious</b></font>"
if(DEAD)
status = "<font color='red'><b>Dead</b></font>"
health_description = "Status = [status]"
health_description += "<BR>Oxy: [L.getOxyLoss()] - Tox: [L.getToxLoss()] - Fire: [L.getFireLoss()] - Brute: [L.getBruteLoss()] - Clone: [L.getCloneLoss()] - Brain: [L.getBrainLoss()]"
else
@@ -311,8 +314,10 @@ proc/add_logs(mob/target, mob/user, what_done, var/object=null, var/addition=nul
//Gener
switch(M.gender)
if(MALE,FEMALE) gender_description = "[M.gender]"
else gender_description = "<font color='red'><b>[M.gender]</b></font>"
if(MALE, FEMALE)
gender_description = "[M.gender]"
else
gender_description = "<font color='red'><b>[M.gender]</b></font>"
to_chat(user, "<b>Info about [M.name]:</b> ")
to_chat(user, "Mob type = [M.type]; Gender = [gender_description] Damage = [health_description]")
@@ -320,3 +325,20 @@ proc/add_logs(mob/target, mob/user, what_done, var/object=null, var/addition=nul
to_chat(user, "Location = [location_description];")
to_chat(user, "[special_role_description]")
to_chat(user, "(<a href='?src=\ref[usr];priv_msg=\ref[M]'>PM</a>) (<A HREF='?src=\ref[src];adminplayeropts=\ref[M]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[M]'>VV</A>) (<A HREF='?src=\ref[src];subtlemessage=\ref[M]'>SM</A>) (<A HREF='?src=\ref[src];adminplayerobservefollow=\ref[M]'>FLW</A>) (<A HREF='?src=\ref[src];secretsadmin=check_antagonist'>CA</A>)")
// Gets the first mob contained in an atom, and warns the user if there's not exactly one
/proc/get_mob_in_atom_with_warning(atom/A, mob/user = usr)
if(!istype(A))
return null
if(ismob(A))
return A
. = null
for(var/mob/M in A)
if(!.)
. = M
else
to_chat(user, "<span class='warning'>Multiple mobs in [A], using first mob found...</span>")
break
if(!.)
to_chat(user, "<span class='warning'>No mob located in [A].</span>")
code/_onclick/observer.dm
+3 -7
View File
@@ -26,23 +26,19 @@
var/list/modifiers = params2list(params)
if(check_rights(R_ADMIN, 0)) // Admin click shortcuts
var/mob/M = A
if(!istype(M))
M = locate() in A
var/mob/M
if(modifiers["shift"] && modifiers["ctrl"])
client.debug_variables(A)
return
if(modifiers["ctrl"])
M = get_mob_in_atom_with_warning(A)
if(M)
client.holder.show_player_panel(M)
else
to_chat(src, "<span class='warning'>No mob was found in the atom you clicked on.</span>")
return
if(modifiers["shift"] && modifiers["middle"])
M = get_mob_in_atom_with_warning(A)
if(M)
admin_mob_info(M)
else
to_chat(src, "<span class='warning'>No mob was found in the atom you clicked on.</span>")
return
if(modifiers["shift"])
ShiftClickOn(A)