Should be the rest for this lot.

This commit is contained in:
SkyMarshal
2011-12-27 14:13:11 -07:00
parent e32813060f
commit 25400f7af4
4 changed files with 12 additions and 4 deletions

View File

@@ -1718,15 +1718,22 @@ datum
if(method == TOUCH)
if(istype(M, /mob/living/carbon/human))
if(M:wear_mask)
M << "\red Your mask protects you from the pepperspray!"
return
if(M:glasses)
if(M.job in security_positions)
M:emote("me",1,"dodges the pepperspray, their training paid off!")
M << "\red Your glasses protect you from most of the pepperspray, and your training takes care of the rest!"
M << "\red Your glasses protect you from most of the pepperspray!"
M:emote("scream")
M.eye_blurry = max(M.eye_blurry, 20)
M.eye_blind = max(M.eye_blind, 4)
return
if(M.job in security_positions)
M:emote("me",1,"dodges most the pepperspray, at least they were trained!")
M << "\red Your training protects you from most of the pepperspray!"
M.eye_blurry = max(M.eye_blurry, 20)
M.eye_blind = max(M.eye_blind, 4)
M:emote("scream")
M << "\red You're sprayed directly in the eyes with pepperspray!"
M.eye_blurry = max(M.eye_blurry, 5)

View File

@@ -1,5 +1,5 @@
//Lallander was here
/mob/living/carbon/human/whisper(message as text)
//Figured it out. If you use say :w (message) it HTML encodes it, THEN passes it to the whisper code, which does so again. Jeez. --SkyMarshal
message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
if (!message)

View File

@@ -26,6 +26,7 @@
if(dongle.translate_hive) return 1
/mob/living/say(var/message)
var/message_old = message
message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
if (!message)
@@ -220,7 +221,7 @@
//I see no reason to restrict such way of whispering
if ("whisper")
whisper(message)
whisper(message_old)
return
if ("binary")