diff --git a/code/game/objects/items/devices/violin.dm b/code/game/objects/items/devices/violin.dm index 2286f787145..54d0e5c31fc 100644 --- a/code/game/objects/items/devices/violin.dm +++ b/code/game/objects/items/devices/violin.dm @@ -391,3 +391,10 @@ if((M.client && M.machine == src)) attack_self(M) return + +/obj/item/device/violin/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) + ..() + user.visible_message("\The [user] shatters \the [src] into pieces!") + playsound(loc, 'sound/effects/kabong.ogg', 50, 1) + new /obj/item/weapon/material/shard/wood(get_turf(user)) + qdel(src) diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm index a428f451a61..9bf4a61f69b 100644 --- a/code/game/objects/items/weapons/material/shards.dm +++ b/code/game/objects/items/weapons/material/shards.dm @@ -99,3 +99,6 @@ /obj/item/weapon/material/shard/phoron/New(loc) ..(loc, "phglass") + +/obj/item/weapon/material/shard/wood/New(loc) + ..(loc, "wood") diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index 5e918ceea31..2094f646eb1 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -148,6 +148,9 @@ var/obj/item/weapon/broken_bottle/B = smash(target.loc, target) user.put_in_active_hand(B) +/obj/item/weapon/reagent_containers/food/drinks/bottle/bullet_act() + smash(loc) + //Keeping this here for now, I'll ask if I should keep it here. /obj/item/weapon/broken_bottle @@ -529,4 +532,4 @@ icon_state = "sarezhibottle" New() ..() - reagents.add_reagent("sarezhiwine", 100) \ No newline at end of file + reagents.add_reagent("sarezhiwine", 100) diff --git a/html/changelogs/alberky-PR-2575.yml b/html/changelogs/alberky-PR-2575.yml new file mode 100644 index 00000000000..ea3da94e6b9 --- /dev/null +++ b/html/changelogs/alberky-PR-2575.yml @@ -0,0 +1,7 @@ + +author: Alberyk + +delete-after: True + +changes: + - rscadd: "You can now destroy violins." diff --git a/sound/effects/kabong.ogg b/sound/effects/kabong.ogg new file mode 100644 index 00000000000..596620f0003 Binary files /dev/null and b/sound/effects/kabong.ogg differ