From 25400f7af4a09a02be33ab17ee4a2c492845ec0e Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Tue, 27 Dec 2011 14:13:11 -0700 Subject: [PATCH] Should be the rest for this lot. --- code/modules/chemical/Chemistry-Reagents.dm | 9 ++++++++- code/modules/mob/living/carbon/human/whisper.dm | 2 +- code/modules/mob/living/say.dm | 3 ++- maps/tgstation.2.0.8.dmm | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index ea3a7e882e5..49c07bd119f 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -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) diff --git a/code/modules/mob/living/carbon/human/whisper.dm b/code/modules/mob/living/carbon/human/whisper.dm index 3604b519902..4c3e6ef9a23 100644 --- a/code/modules/mob/living/carbon/human/whisper.dm +++ b/code/modules/mob/living/carbon/human/whisper.dm @@ -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) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 19e7179a60e..260889436ee 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -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") diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index 732faf53fa1..4a4c4e2e6f5 100644 --- a/maps/tgstation.2.0.8.dmm +++ b/maps/tgstation.2.0.8.dmm @@ -734,7 +734,7 @@ "aof" = (/turf/simulated/floor{dir = 8; icon_state = "carpetside"},/area/security/detectives_office) "aog" = (/obj/structure/table/woodentable,/obj/item/weapon/pen,/obj/item/weapon/hand_labeler,/obj/item/device/taperecorder{pixel_y = 0},/obj/item/weapon/paper,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/security/detectives_office) "aoh" = (/turf/simulated/floor{dir = 2; icon_state = "carpetcorner"},/area/security/detectives_office) -"aoi" = (/obj/structure/stool/chair{dir = 8},/turf/simulated/floor{icon_state = "carpetside"},/area/security/detectives_office) +"aoi" = (/turf/simulated/floor{icon_state = "carpetside"},/area/security/detectives_office) "aoj" = (/turf/simulated/floor{dir = 6; icon_state = "carpetside"},/area/security/detectives_office) "aok" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/briefcase,/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) "aol" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor{icon_state = "wood"},/area/lawoffice)