mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-29 23:17:02 +01:00
Merge remote-tracking branch 'upstream/master' into so-edgey
This commit is contained in:
@@ -99,6 +99,5 @@
|
||||
flag = "bullet"
|
||||
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
|
||||
|
||||
embed = 0
|
||||
weaken = 5
|
||||
stun = 5
|
||||
|
||||
@@ -169,8 +169,6 @@
|
||||
/obj/item/weapon/arrow/rod/removed()
|
||||
if(superheated) // The rod has been superheated - we don't want it to be useable when removed from the bow.
|
||||
visible_message("[src] shatters into a scattering of overstressed metal shards as it leaves the crossbow.")
|
||||
var/obj/item/weapon/shard/shrapnel/S = new /obj/item/weapon/shard/shrapnel
|
||||
S.loc = get_turf(src)
|
||||
qdel(src)
|
||||
|
||||
#undef XBOW_TENSION_20
|
||||
|
||||
Reference in New Issue
Block a user