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

Merge pull request #9136 from dwinters99/explo-shieldbash

Browse Source 
Explo shields shieldbash
This commit is contained in:
Novacat
2020-09-29 02:53:49 -04:00
committed by GitHub
parent 7af667af90 b6ac68836a
commit f25d6729a7
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/shields_vr.dm
+9
View File
@@ -79,6 +79,15 @@
desc = "A shield issued to exploration teams to help protect them when advancing into the unknown. It is lighter and cheaper but less protective than some of its counterparts. It has a flashlight straight in the middle to help draw attention. This one is POURPEL"
icon_state = "explorer_shield_P"
/obj/item/weapon/shield/riot/explorer/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/material/knife/machete))
if(cooldown < world.time - 25)
user.visible_message("<span class='warning'>[user] bashes [src] with [W]!</span>")
playsound(src, 'sound/effects/shieldbash.ogg', 50, 1)
cooldown = world.time
else
..()
/obj/item/weapon/shield/riot/explorer/purple/update_icon()
if(on)
icon_state = "explorer_shield_P_lighted"