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

Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo

Browse Source 
dullahans 2: electric boogaloo
This commit is contained in:
Lin
2022-12-14 19:07:59 -07:00
committed by GitHub
parent 723decec2b b7673e234f
commit 7d0c3df2ad
33 changed files with 330 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/wounds/slash.dm
+1 -1
View File
@@ -177,7 +177,7 @@
if(isinsect(victim) || iscatperson(victim) || ismammal(victim) || isdwarf(victim) || ismonkey(victim)) // Yep you can lick monkeys.
user.reagents.add_reagent(/datum/reagent/hairball, 2)
else if(ishumanbasic(victim) || isflyperson(victim) || islizard(victim) || isdullahan(victim))
else if(ishumanbasic(victim) || isflyperson(victim) || islizard(victim) || HAS_TRAIT(victim, TRAIT_DULLAHAN))
user.reagents.add_reagent(/datum/reagent/hairball, 1)
if(blood_flow > minimum_flow)