Merge pull request #4810 from phil235/Messagetypos

Fix many messages and sounds
This commit is contained in:
Cheridan
2014-09-16 08:45:31 -05:00
14 changed files with 202 additions and 79 deletions
@@ -33,6 +33,7 @@
if(!foldable)
return
if(contents.len)
user << "<span class='notice'>You can't fold this box with items still inside.</span>"
return
if(!ispath(foldable))
return
@@ -537,4 +538,4 @@
new /obj/item/clothing/tie/armband/deputy(src)
new /obj/item/clothing/tie/armband/deputy(src)
new /obj/item/clothing/tie/armband/deputy(src)
new /obj/item/clothing/tie/armband/deputy(src)
new /obj/item/clothing/tie/armband/deputy(src)
@@ -4,11 +4,13 @@
icon_state = "briefcase"
flags = CONDUCT
force = 8.0
hitsound = "swing_hit"
throw_speed = 2
throw_range = 4
w_class = 4.0
max_w_class = 3
max_combined_w_class = 21
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
/obj/item/weapon/storage/briefcase/New()
..()
@@ -153,11 +153,13 @@
item_state = "sec-case"
desc = "A large briefcase with a digital locking system."
force = 8.0
hitsound = "swing_hit"
throw_speed = 2
throw_range = 4
w_class = 4.0
max_w_class = 3
max_combined_w_class = 21
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
/obj/item/weapon/storage/secure/briefcase/New()
..()