Merge branch 'master' into stationgoals

This commit is contained in:
Mark van Alphen
2017-02-17 18:05:15 +01:00
committed by GitHub
214 changed files with 3728 additions and 1602 deletions
+1 -1
View File
@@ -295,7 +295,7 @@
return
var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(_loc)
playsound(_loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1)
playsound(_loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1)
reqform.name = "Requisition Form - [crates] '[object.name]' for [orderedby]"
reqform.info += "<h3>[station_name] Supply Requisition Form</h3><hr>"
reqform.info += "INDEX: #[shuttle_master.ordernum]<br>"