Ports https://github.com/tgstation/tgstation/pull/44525, and

And fixes to make stuff work
2020-04-23 17:36:13 +03:00
parent 9e2ba822ae
commit 120615d472
33 changed files with 461 additions and 86941 deletions
@@ -36,7 +36,7 @@

 		var/list/cyborg_data = list(
 			name = R.name,
-			locked_down = R.lockcharge,
+			locked_down = R.locked_down,
 			status = R.stat,
 			shell_discon = shell,
 			charge = R.cell ? round(R.cell.percent()) : null,