Merge pull request #8547 from Ghommie/Ghommie-cit29

Moves traits to datums and turn the accessors into defines
This commit is contained in:
kevinz000
2019-06-08 01:22:16 -07:00
committed by GitHub
186 changed files with 587 additions and 598 deletions
+1 -1
View File
@@ -56,7 +56,7 @@
var/mob/living/carbon/C = user
if(C.gloves)
return FALSE
if(C.has_trait(TRAIT_PIERCEIMMUNE))
if(HAS_TRAIT(C, TRAIT_PIERCEIMMUNE))
return FALSE
var/hit_zone = (C.held_index_to_dir(C.active_hand_index) == "l" ? "l_":"r_") + "arm"
var/obj/item/bodypart/affecting = C.get_bodypart(hit_zone)