Merge remote-tracking branch 'citadel/master' into shield_refactor

2020-03-23 15:34:04 -07:00
parent a6ca854e5c 613c66d88e
commit bf0970d8c3
237 changed files with 14968 additions and 12068 deletions
@@ -20,7 +20,7 @@
 	var/override = 0

 	for(var/datum/mutation/human/HM in dna.mutations)
-		override += HM.on_attack_hand(src, A, proximity)
+		override += HM.on_attack_hand(A, proximity)

 	if(override)
 		return
@@ -95,7 +95,7 @@
 		return

 	for(var/datum/mutation/human/HM in dna.mutations)
-		HM.on_ranged_attack(src, A, mouseparams)
+		HM.on_ranged_attack(A, mouseparams)

 	if(isturf(A) && get_dist(src,A) <= 1)
 		src.Move_Pulled(A)