Merge branch 'pr/14'

2019-06-14 21:29:04 +01:00
parent aa1cb22edc 7433293a3e
commit 6b9becce71
506 changed files with 10079 additions and 6600 deletions
@@ -26,7 +26,7 @@
 		for(var/A in mutations)
 			target.dna.add_mutation(A)
 		for(var/A in traits)
-			target.add_trait(A, GENETICS_SPELL)
+			ADD_TRAIT(target, A, GENETICS_SPELL)
 		active_on += target
 		addtimer(CALLBACK(src, .proc/remove, target), duration)

@@ -41,4 +41,4 @@
 		for(var/A in mutations)
 			target.dna.remove_mutation(A)
 		for(var/A in traits)
-			target.remove_trait(A, GENETICS_SPELL)
+			REMOVE_TRAIT(target, A, GENETICS_SPELL)