[MIRROR] Converts several species traits into generic traits (#5710)

* Converts several species traits into generic traits

* Update traits.dm

* Update mousetrap.dm

* Update corporate.dm

* Update jellypeople.dm

* snowflake fix
This commit is contained in:
CitadelStationBot
2018-03-05 12:34:01 -06:00
committed by Poojawa
parent 536537a0a4
commit 6134f79a26
48 changed files with 348 additions and 334 deletions
+2 -5
View File
@@ -56,11 +56,8 @@
var/mob/living/carbon/C = user
if(C.gloves)
return FALSE
if(ishuman(C))
var/mob/living/carbon/human/H = C
if(H.dna && H.dna.species)
if(PIERCEIMMUNE in H.dna.species.species_traits)
return FALSE
if(C.has_trait(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)
if(affecting)