Fixed several things.

This commit is contained in:
SkyMarshal
2011-12-27 13:44:52 -07:00
parent cfbb6eb704
commit 08ff9b06e7
6 changed files with 15 additions and 13 deletions
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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))
+1
View File
@@ -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
@@ -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
+2 -9
View File
@@ -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
+9 -2
View File
@@ -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.