Sayu grenade and assembly update

This commit is contained in:
ZomgPonies
2013-11-04 14:31:58 -05:00
parent cc437cbd4b
commit 13985d2f4f
18 changed files with 1520 additions and 463 deletions
@@ -78,13 +78,13 @@ emp_act
update_icons()
src << "\blue Your [C.name] was disrupted!"
Stun(2)
/*
if(istype(equipped(),/obj/item/device/assembly/signaler))
var/obj/item/device/assembly/signaler/signaler = equipped()
if(signaler.deadman && prob(80))
src.visible_message("\red [src] triggers their deadman's switch!")
signaler.signal()
*/
return
//END TASER NERF
+2 -2
View File
@@ -45,13 +45,13 @@
Stun(2)
flash_weak_pain()
/*
if(istype(equipped(),/obj/item/device/assembly/signaler))
var/obj/item/device/assembly/signaler/signaler = equipped()
if(signaler.deadman && prob(80))
src.visible_message("\red [src] triggers their deadman's switch!")
signaler.signal()
*/
var/absorb = run_armor_check(def_zone, P.flag)
if(absorb >= 2)
P.on_hit(src,2)