Merge resolution with master.

2026-01-04 14:33:10 +00:00 · 2014-06-02 12:05:12 +09:30
parent 82b6e76d4c b77d7bb13f
commit 1e135f91af
112 changed files with 2679 additions and 3610 deletions
--- a/code/unused/computer2/peripherals.dm
+++ b/code/unused/computer2/peripherals.dm
@@ -110,7 +110,7 @@
 				var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( src.host.loc )
 				P.info = print_data
 				if(print_title)
-					P.name = "paper - '[print_title]'"
+					P.name = "[print_title]"

 				src.printing = 0
 				return