cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 23:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing some message and sound.

Browse Source
This commit is contained in:
phil235
2014-09-13 00:46:57 +02:00
parent 304b89bdc0
commit d88cc00a2f
5 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/boxes.dm
+2 -1
View File
@@ -33,6 +33,7 @@
if(!foldable)
return
if(contents.len)
user << "<span class='notice'>You can't fold it 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)
code/game/objects/items/weapons/storage/briefcase.dm
+2
View File
@@ -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()
..()
code/game/objects/items/weapons/storage/secure.dm
+2
View File
@@ -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()
..()
code/game/objects/structures/grille.dm
+2 -1
View File
@@ -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
code/modules/mob/living/simple_animal/simple_animal.dm
+5
View File
@@ -276,6 +276,7 @@
if("help")
if (health > 0)
visible_message("<span class='notice'> [M] [response_help] [src].</span>")
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
if("grab")
if (M == src || anchored)
@@ -292,10 +293,12 @@
LAssailant = M
visible_message("<span class='warning'>[M] has grabbed [src] passively!</span>")
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
if("harm", "disarm")
adjustBruteLoss(harm_intent_damage)
visible_message("<span class='danger'>[M] [response_harm] [src]!</span>")
playsound(loc, "punch", 25, 1, -1)
return
@@ -326,6 +329,7 @@
var/damage = rand(15, 30)
visible_message("<span class='danger'>[M] has slashed at [src]!</span>", \
"<span class='userdanger'>[M] has slashed at [src]!</span>")
playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
adjustBruteLoss(damage)
return
@@ -407,6 +411,7 @@
adjustBruteLoss(damage)
visible_message("<span class='danger'>[src] has been attacked with [O] by [user]!</span>",\
"<span class='userdanger'>[src] has been attacked with [O] by [user]!</span>")
playsound(loc, O.hitsound, 25, 1, -1)
else
visible_message("<span class='danger'>[O] bounces harmlessly off of [src].</span>",\
"<span class='userdanger'>[O] bounces harmlessly off of [src].</span>")