Makes looting/attacking SSD players more obvious

This commit is contained in:
Kyep
2016-07-21 01:45:16 -07:00
parent f5324665ac
commit 4f559e2b8e
5 changed files with 14 additions and 4 deletions
+1 -1
View File
@@ -171,7 +171,7 @@ proc/add_logs(mob/target, mob/user, what_done, var/object=null, var/addition=nul
target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been [what_done] by [key_name(user)][object ? " with [object]" : " "][addition]</font>")
if(admin)
log_attack("<font color='red'>[key_name(user)] [what_done] [key_name(target)][object ? " with [object]" : " "][addition]</font>")
if(istype(target) && target.client)
if(istype(target) && (target.client || target.player_logged))
if(what_done in ignore) return
if(target == user)return
if(!admin) return
+1 -2
View File
@@ -45,7 +45,7 @@
return .
/proc/key_name_admin(var/whom, var/include_name = 1)
var/message = "[key_name(whom, 1, include_name)](<A HREF='?_src_=holder;adminmoreinfo=\ref[whom]'>?</A>)[isAntag(whom) ? "(A)" : ""] ([admin_jump_link(whom, "holder")])"
var/message = "[key_name(whom, 1, include_name)](<A HREF='?_src_=holder;adminmoreinfo=\ref[whom]'>?</A>)[isAntag(whom) ? "(A)" : ""][isSSD(whom) ? "<span class='danger'>(SSD!)</span>" : ""] ([admin_jump_link(whom, "holder")])"
return message
/proc/log_and_message_admins(var/message as text)
@@ -55,4 +55,3 @@
/proc/admin_log_and_message_admins(var/message as text)
log_admin("[key_name(usr)] " + message)
message_admins("[key_name_admin(usr)] " + message, 1)
@@ -270,7 +270,9 @@
msg += "[t_He] [t_has] a stupid expression on [t_his] face.\n"
if(species.show_ssd && (!species.has_organ["brain"] || get_int_organ(/obj/item/organ/internal/brain)) && stat != DEAD)
if(istype(src, /mob/living/carbon/human/interactive))
if(src.player_logged)
msg += "<span class='deadsay'>[t_He] [t_is] fast asleep, suffering from Space Sleep Disorder.</span>\n"
else if(istype(src, /mob/living/carbon/human/interactive))
msg += "<span class='deadsay'>[t_He] appears to be some sort of sick automaton: [t_his] eyes are glazed over and [t_his] mouth is slightly agape.</span>\n"
else if(!key)
msg += "<span class='deadsay'>[t_He] [t_is] fast asleep. It doesn't look like they are waking up anytime soon.</span>\n"
+2
View File
@@ -672,6 +672,8 @@
if(silent)
put_in_hands(what)
add_logs(who, src, "stripped", addition="of [what]")
if(who.player_logged)
to_chat(src,"<span class='adminhelp'>Warning: looting from SSD players (like [who]) is forbidden unless you have ahelped first and got permission.</span>")
// The src mob is trying to place an item on someone
// Override if a certain mob should be behave differently when placing items (can't, for example)
+7
View File
@@ -34,6 +34,13 @@
return 1
return 0
proc/isSSD(A)
if(istype(A,/mob))
var/mob/M = A
if (M.player_logged)
return 1
return 0
proc/isAntag(A)
if(istype(A, /mob/living/carbon))
var/mob/living/carbon/C = A