Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits

code/modules/cargo/packs/vending.dm

@@ -52,7 +52,7 @@
 	desc = "Packs of tools waiting to be used for repairing. Contains a tool and engineering vending machine refill. Requires CE access."
 	cost = 5500 //Powerfull
 	access = ACCESS_CE
-	contains = list(/obj/item/vending_refill/tool,
+	contains = list(/obj/item/vending_refill/youtool,
 					/obj/item/vending_refill/engivend)
 	crate_name = "engineering supply crate"
 	crate_type = /obj/structure/closet/crate/secure/engineering

code/modules/cargo/supplypod.dm

@@ -648,7 +648,7 @@
 	desc = "This disk provides a firmware update to the Express Supply Console, granting the use of Nanotrasen's Bluespace Drop Pods to the supply department."
 	icon = 'icons/obj/module.dmi'
 	icon_state = "cargodisk"
-	// inhand_icon_state = "card-id"
+	// item_state = "card-id"
 	w_class = WEIGHT_CLASS_SMALL
 
 // let's not.