diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 4507b1e0bb5..593ec84ab25 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -33,6 +33,7 @@ if(!foldable) return if(contents.len) + user << "You can't fold it with items still inside." 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) diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index 94ce4c9fb7b..93a6fdc2679 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -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() ..() diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index 7db2d68d5de..212a52cbf18 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -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() ..() diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index df18f1b114e..2fa08108831 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -172,12 +172,13 @@ playsound(loc, 'sound/effects/grillehit.ogg', 80, 1) health -= W.force * 0.1 else if(!shock(user, 70)) - playsound(loc, 'sound/effects/grillehit.ogg', 80, 1) switch(W.damtype) if("fire") health -= W.force + playsound(loc, 'sound/items/welder.ogg', 80, 1) if("brute") health -= W.force * 0.1 + playsound(loc, 'sound/effects/grillehit.ogg', 80, 1) healthcheck() ..() return diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 722d7507f12..6c0a54009ed 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -276,6 +276,7 @@ if("help") if (health > 0) visible_message(" [M] [response_help] [src].") + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) if("grab") if (M == src || anchored) @@ -292,10 +293,12 @@ LAssailant = M visible_message("[M] has grabbed [src] passively!") + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) if("harm", "disarm") adjustBruteLoss(harm_intent_damage) visible_message("[M] [response_harm] [src]!") + playsound(loc, "punch", 25, 1, -1) return @@ -326,6 +329,7 @@ var/damage = rand(15, 30) visible_message("[M] has slashed at [src]!", \ "[M] has slashed at [src]!") + playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1) adjustBruteLoss(damage) return @@ -407,6 +411,7 @@ adjustBruteLoss(damage) visible_message("[src] has been attacked with [O] by [user]!",\ "[src] has been attacked with [O] by [user]!") + playsound(loc, O.hitsound, 25, 1, -1) else visible_message("[O] bounces harmlessly off of [src].",\ "[O] bounces harmlessly off of [src].")