Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00
parent eeba86e27e 03d67c753e
commit 1f6b3ce629
285 changed files with 56239 additions and 56588 deletions
@@ -254,7 +254,6 @@
 				adjusted_contents++
 				numbered_contents.Add( new/datum/numbered_display(I) )

-	//var/mob/living/carbon/human/H = user
 	var/row_num = 0
 	var/col_count = min(7,storage_slots) -1
 	if(adjusted_contents > 7)