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

2020-10-06 17:11:21 -07:00
parent 822f1c9bf3 89cfde9c34
commit 1b1efce556
434 changed files with 171285 additions and 86020 deletions
@@ -258,4 +258,4 @@
 	if (!(. & EMP_PROTECT_SELF))
 		turn_off()
 		if(!iscyborg(loc))
-			deductcharge(1000 / severity, TRUE, FALSE)
+			deductcharge(severity*10, TRUE, FALSE)