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

Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405

Browse Source 
[MIRROR] [Ready]Brain Trauma additions
This commit is contained in:
deathride58
2017-12-21 03:42:38 +00:00
committed by GitHub
parent 425c4314c0 063854e2d0
commit b2187123fb
29 changed files with 525 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/martial/psychotic_brawl.dm
+1 -3
View File
@@ -44,11 +44,9 @@
playsound(get_turf(D), 'sound/weapons/punch1.ogg', 40, 1, -1)
D.apply_damage(rand(5,10), BRUTE, "head")
A.apply_damage(rand(5,10), BRUTE, "head")
if(!istype(A.head,/obj/item/clothing/head/helmet/) && !istype(A.head,/obj/item/clothing/head/hardhat))
A.adjustBrainLoss(5)
if(!istype(D.head,/obj/item/clothing/head/helmet/) && !istype(D.head,/obj/item/clothing/head/hardhat))
D.adjustBrainLoss(5)
A.Stun(rand(5,30))
A.Stun(rand(10,45))
D.Stun(rand(5,30))
if(5,6)
A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)