Merge remote-tracking branch 'Paradise/master' into nanoui-is-dead

This commit is contained in:
AffectedArc07
2020-11-29 09:46:30 +00:00
14 changed files with 242 additions and 101 deletions
@@ -54,7 +54,8 @@
R.name = heldname
R.custom_name = heldname
R.real_name = heldname
if(R.mmi && R.mmi.brainmob)
R.mmi.brainmob.name = R.name
return TRUE
/obj/item/borg/upgrade/restart