TG sync Sunday (#201)

* stage one

* datums and shit

* game stuff

* modules

* tgstation.dme

* tools

* these things for icons

* compiling fixes

* merge spree on TG

* other updates

* updated maps with deepfryers

* My helpers were not helping

code/modules/modular_computers/hardware/card_slot.dm

@@ -46,8 +46,11 @@
 	if(stored_card && stored_card2)
 		user << "<span class='warning'>You try to insert \the [I] into \the [src], but its slots are occupied.</span>"
 		return FALSE
-	if(user && !user.transferItemToLoc(I, src))
-		return FALSE
+	if(user)
+		if(!user.transferItemToLoc(I, src))
+			return FALSE
+	else
+		I.forceMove(src)
 
 	if(!stored_card)
 		stored_card = I
@@ -100,4 +103,4 @@
 /obj/item/weapon/computer_hardware/card_slot/examine(mob/user)
 	..()
 	if(stored_card || stored_card2)
-		user << "There appears to be something loaded in the card slots."
+		user << "There appears to be something loaded in the card slots."

code/modules/modular_computers/hardware/printer.dm

@@ -34,6 +34,7 @@
 	if(paper_title)
 		P.name = paper_title
 	P.update_icon()
+	P.reload_fields()
 	stored_paper--
 	P = null
 	return TRUE