cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds Riot Shield Bashing with Combat Knives (#22571)

Browse Source 
* Knife Bashing

* Decent Code Edition Featuring: Contra
This commit is contained in:
Bjamcham
2023-10-09 15:30:04 -04:00
committed by GitHub
parent 37f2f47a64
commit a53f4e466c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/shields.dm
+2 -1
View File
@@ -30,9 +30,10 @@
origin_tech = "materials=3;combat=4"
attack_verb = list("shoved", "bashed")
var/cooldown = 0 //shield bash cooldown. based on world.time
var/list/allowed_bashers = list(/obj/item/melee/baton, /obj/item/kitchen/knife/combat)
/obj/item/shield/riot/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/melee/baton))
if(is_type_in_list(W, allowed_bashers))
if(cooldown < world.time - 2.5 SECONDS)
user.visible_message("<span class='warning'>[user] bashes [src] with [W]!</span>")
playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, 1)