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.