cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-08-31 00:49:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9856 from Ghommie/Ghommie-cit367

Browse Source
This commit is contained in:
Lin
2020-10-02 00:49:56 -03:00
committed by Dip
parent 20c30a15d1
commit ac25b449f7
39 changed files with 675 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm
+1 -6
View File
@@ -358,12 +358,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
if(A)
if(isliving(A))
var/mob/living/L = A
var/blocked = 0
if(ishuman(A))
var/mob/living/carbon/human/H = A
if(H.check_shields(0, "the [name]", src, attack_type = LEAP_ATTACK))
blocked = 1
if(!blocked)
if(!L.check_shields(0, "the [name]", src, attack_type = LEAP_ATTACK))
L.visible_message("<span class ='danger'>[src] pounces on [L]!</span>", "<span class ='userdanger'>[src] pounces on you!</span>")
L.Knockdown(iscarbon(L) ? 225 : 45) // Temporary. If someone could rework how dogborg pounces work to accomodate for combat changes, that'd be nice.
playsound(src, 'sound/weapons/Egloves.ogg', 50, 1)