shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into semi-sync

Browse Source
This commit is contained in:
Letter N
2020-12-29 10:37:06 +08:00
parent 7e2da69d23 1772c83a75
commit 51143f89e5
36 changed files with 236 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/tackle.dm
+9
View File
@@ -89,6 +89,11 @@
to_chat(user, "<span class='warning'>You can't tackle while tased!</span>")
return
var/left_paralysis = HAS_TRAIT(user, TRAIT_PARALYSIS_L_ARM)
var/right_paralysis = HAS_TRAIT(user, TRAIT_PARALYSIS_R_ARM)
if(left_paralysis && right_paralysis)
to_chat(user, "<span class='warning'>You can't tackle without the use of your arms!</span>")
user.face_atom(A)
var/list/modifiers = params2list(params)
@@ -280,6 +285,10 @@
attack_mod -= 2
if(HAS_TRAIT(sacker, TRAIT_GIANT))
attack_mod += 2
var/left_paralysis = HAS_TRAIT(sacker, TRAIT_PARALYSIS_L_ARM)
var/right_paralysis = HAS_TRAIT(sacker, TRAIT_PARALYSIS_R_ARM)
if(left_paralysis || right_paralysis)
attack_mod -= 2
if(ishuman(target))
var/mob/living/carbon/human/S = sacker