Merge pull request #1554 from Citadel-Station-13/upstream-merge-28336

[MIRROR] Paper planes will be the same color as the paper used to create them.
2017-06-12 12:18:53 -05:00
parent 20e0c3d800 07ed287787
commit 7e2a0a7277
1 changed files with 1 additions and 0 deletions
@@ -20,6 +20,7 @@
 	if(newPaper)
 		internalPaper = newPaper
 		flags = newPaper.flags
+		color = newPaper.color
 		newPaper.forceMove(src)
 	else
 		internalPaper = new /obj/item/weapon/paper(src)