From 08ff9b06e7fba3da39648a3632cf9744a1cd4b55 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Tue, 27 Dec 2011 13:44:52 -0700 Subject: [PATCH 1/4] Fixed several things. --- code/WorkInProgress/Mini/customitems.dm | 2 +- code/WorkInProgress/SkyMarshal/policetape.dm | 2 +- code/game/jobs/job/captian.dm | 1 + code/game/objects/closets/secure/security.dm | 1 + code/game/objects/devices/PDA/cart.dm | 11 ++--------- code/modules/mob/living/say.dm | 11 +++++++++-- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/code/WorkInProgress/Mini/customitems.dm b/code/WorkInProgress/Mini/customitems.dm index 33b91ebc61c..3a3da54918e 100644 --- a/code/WorkInProgress/Mini/customitems.dm +++ b/code/WorkInProgress/Mini/customitems.dm @@ -16,7 +16,7 @@ var/list/CustomItemList = list( var/path = Entry[3] var/obj/item/Item = new path() - if(istype(M.back,/obj/item/weapon/storage) && M.back:len < M.back:storage_slots) // Try to place it in something on the mob's back first + if(istype(M.back,/obj/item/weapon/storage) && M.back:contents.len < M.back:storage_slots) // Try to place it in something on the mob's back first Item.loc = M.back ok = 1 else diff --git a/code/WorkInProgress/SkyMarshal/policetape.dm b/code/WorkInProgress/SkyMarshal/policetape.dm index a130670a6e9..54d1977492c 100644 --- a/code/WorkInProgress/SkyMarshal/policetape.dm +++ b/code/WorkInProgress/SkyMarshal/policetape.dm @@ -106,7 +106,7 @@ breaktape(null, user) /obj/item/policetape/proc/breaktape(obj/item/weapon/W as obj, mob/user as mob) - if(!W || !is_cut(W)) + if(!W || (!is_sharp(W) && src.allowed(user)) ||(!is_cut(W) && !src.allowed(user))) user << "You can't break the tape with that!" return user.show_viewers(text("\blue [] breaks the police tape!", user)) diff --git a/code/game/jobs/job/captian.dm b/code/game/jobs/job/captian.dm index c84c339a1d6..0376221ab8c 100644 --- a/code/game/jobs/job/captian.dm +++ b/code/game/jobs/job/captian.dm @@ -45,4 +45,5 @@ H.equip_if_possible(new /obj/item/clothing/suit/armor/vest(H), H.slot_wear_suit) H.equip_if_possible(new /obj/item/clothing/head/helmet(H), H.slot_head) H.equip_if_possible(new /obj/item/weapon/storage/id_kit(H), H.slot_in_backpack) + H.equip_if_possible(new /obj/item/clothing/gloves/blue(H), H.slot_gloves) return 1 diff --git a/code/game/objects/closets/secure/security.dm b/code/game/objects/closets/secure/security.dm index 196646b9a31..b84faa8d7cf 100644 --- a/code/game/objects/closets/secure/security.dm +++ b/code/game/objects/closets/secure/security.dm @@ -38,6 +38,7 @@ new /obj/item/weapon/gun/energy/gun(src) new /obj/item/device/flash(src) new /obj/item/clothing/glasses/sunglasses(src) + new /obj/item/clothing/gloves/blue(src) return diff --git a/code/game/objects/devices/PDA/cart.dm b/code/game/objects/devices/PDA/cart.dm index 77aac0573ee..b3e9698f6de 100644 --- a/code/game/objects/devices/PDA/cart.dm +++ b/code/game/objects/devices/PDA/cart.dm @@ -10,7 +10,7 @@ var/access_security = 0 var/access_engine = 0 var/access_medical = 0 - var/access_manifest = 0 + var/access_manifest = 1 var/access_clown = 0 var/access_mime = 0 var/access_janitor = 0 @@ -55,7 +55,6 @@ icon_state = "cart-s" access_security = 1 access_medical = 1 - access_manifest = 1 janitor @@ -107,13 +106,11 @@ head name = "Easy-Record DELUXE" icon_state = "cart-h" - access_manifest = 1 access_status_display = 1 hop name = "HumanResources9001" icon_state = "cart-h" - access_manifest = 1 access_status_display = 1 access_quartermaster = 1 @@ -125,7 +122,6 @@ hos name = "R.O.B.U.S.T. DELUXE" icon_state = "cart-hos" - access_manifest = 1 access_status_display = 1 access_security = 1 @@ -137,21 +133,18 @@ ce name = "Power-On DELUXE" icon_state = "cart-ce" - access_manifest = 1 access_status_display = 1 access_engine = 1 cmo name = "Med-U DELUXE" icon_state = "cart-cmo" - access_manifest = 1 access_status_display = 1 access_medical = 1 rd name = "Signal Ace DELUXE" icon_state = "cart-rd" - access_manifest = 1 access_status_display = 1 access_reagent_scanner = 1 @@ -164,7 +157,6 @@ name = "Value-PAK Cartridge" desc = "Now with 200% more value!" icon_state = "cart-c" - access_manifest = 1 access_engine = 1 access_security = 1 access_medical = 1 @@ -175,6 +167,7 @@ name = "Detomatix Cartridge" icon_state = "cart" access_remote_door = 1 + access_manifest = 0 remote_door_id = "syndicate" //Make sure this matches the syndicate shuttle's shield/door id!! var/shock_charges = 4 diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 43a8fc9f0d6..58e1fc48804 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -293,6 +293,7 @@ var/turf/T = get_turf(src) listening = hearers(message_range, T) var/list/V = view(message_range, T) + var/list/W = V //find mobs in lockers, cryo, intellicards, brains, MMIs, and so on. for (var/mob/M in world) if (!M.client) @@ -308,9 +309,15 @@ if (M.client && M.client.ghost_ears) listening|=M - for (var/obj/O in ((V | contents)-used_radios)) //radio in pocket could work, radio in backpack wouldn't --rastaf0 + for (var/obj/O in ((W | contents)-used_radios)) + W |= O + + for (var/mob/M in W) + W |= M.contents + + for (var/obj/O in W) //radio in pocket could work, radio in backpack wouldn't --rastaf0 spawn (0) - if (O) + if(O && !istype(O.loc, /obj/item/weapon/storage)) O.hear_talk(src, message) if(isbrain(src))//For brains to properly talk if they are in an MMI..or in a brain. Could be extended to other mobs I guess. From 25400f7af4a09a02be33ab17ee4a2c492845ec0e Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Tue, 27 Dec 2011 14:13:11 -0700 Subject: [PATCH 2/4] 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) From 03445062c4e248dba8ea47bfce1223a486147625 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Tue, 27 Dec 2011 14:26:08 -0700 Subject: [PATCH 3/4] Reworked pepperspray's results --- code/modules/chemical/Chemistry-Reagents.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index 49c07bd119f..900508fb56f 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -1722,15 +1722,16 @@ datum return if(M:glasses) if(M.job in security_positions) - M:emote("me",1,"dodges the pepperspray, their training paid off!") + M:emote("me",1,"endures 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.eye_blurry = max(M.eye_blurry, 10) 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:emote("me",1,"shakes off most of the pepper spray's effects, 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) From aac7a104eba0b14d7c58a57a669f27c59f49a1e5 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Tue, 27 Dec 2011 14:32:05 -0700 Subject: [PATCH 4/4] More amusing message. --- code/modules/chemical/Chemistry-Reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index 900508fb56f..8c72b65a452 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -1722,7 +1722,7 @@ datum return if(M:glasses) if(M.job in security_positions) - M:emote("me",1,"endures the pepperspray, their training paid off!") + M:emote("me",1,"glares at you as the pepperspray drips off the lenses!") M << "\red Your glasses protect you from most of the pepperspray, and your training takes care of the rest!" M.eye_blurry = max(M.eye_blurry, 10) M << "\red Your glasses protect you from most of the pepperspray!"