mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-19 03:49:10 +01:00
Adds violin destruction (#2575)
Attacking people with the violin will not break said instrument. Also, shooting bottles will now break them as well
This commit is contained in:
@@ -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("<span class='danger'>\The [user] shatters \the [src] into pieces!</span>")
|
||||
playsound(loc, 'sound/effects/kabong.ogg', 50, 1)
|
||||
new /obj/item/weapon/material/shard/wood(get_turf(user))
|
||||
qdel(src)
|
||||
|
||||
@@ -99,3 +99,6 @@
|
||||
|
||||
/obj/item/weapon/material/shard/phoron/New(loc)
|
||||
..(loc, "phglass")
|
||||
|
||||
/obj/item/weapon/material/shard/wood/New(loc)
|
||||
..(loc, "wood")
|
||||
|
||||
@@ -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)
|
||||
reagents.add_reagent("sarezhiwine", 100)
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
|
||||
author: Alberyk
|
||||
|
||||
delete-after: True
|
||||
|
||||
changes:
|
||||
- rscadd: "You can now destroy violins."
|
||||
Binary file not shown.
Reference in New Issue
Block a user