Merge pull request #11396 from Ghommie/Ghommie-cit613

Ports "Switches out the three billion args of electrocute act for flags"
2020-03-10 05:56:28 -07:00
parent 040c84b55f 80eaf3be0d
commit bfb75eb26b
27 changed files with 63 additions and 65 deletions
@@ -220,7 +220,7 @@
 			teleport_now.Remove(user)
 			if(user.wear_suit == src)
 				if(hard_landing)
-					user.electrocute_act(35, src, safety = 1)
+					user.electrocute_act(35, src, flags = SHOCK_NOGLOVES)
 					user.DefaultCombatKnockdown(200)
 				if(!silent)
 					to_chat(user, "\nroot@ChronosuitMK4# chronowalk4 --stop\n")