cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Borg Stun Arm Bypassing Shields

Browse Source
This commit is contained in:
Fox-McCloud
2016-07-11 10:45:50 -04:00
parent 26e13f270f
commit 88468d2698
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/robot/robot_items.dm
+12 -14
View File
@@ -7,28 +7,26 @@
icon = 'icons/obj/items.dmi'
icon_state = "elecarm"
var/charge_cost = 30
/obj/item/borg/stun/attack(mob/M, mob/living/silicon/robot/user)
var/mob/living/silicon/robot/R = user
if(R && R.cell && R.cell.charge > 0)
R.cell.use(charge_cost)
else
/obj/item/borg/stun/attack(mob/living/M, mob/living/silicon/robot/user)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.check_shields(0, "[M]'s [name]", src, MELEE_ATTACK))
playsound(M, 'sound/weapons/Genhit.ogg', 50, 1)
return 0
if(!user.cell.use(charge_cost))
return
user.do_attack_animation(M)
M.Weaken(5)
if(M.stuttering < 5)
M.stuttering = 5
M.apply_effect(STUTTER, 5)
M.Stun(5)
M.visible_message("<span class='danger'>[user] has prodded [M] with [src]!</span>", \
"<span class='userdanger'>[user] has prodded you with [src].</span>")
"<span class='userdanger'>[user] has prodded you with [src]!</span>")
playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
if(!iscarbon(user))
M.LAssailant = null
else
M.LAssailant = user
add_logs(M, user, "stunned", src, "(INTENT: [uppertext(user.a_intent)])")