Merge remote-tracking branch 'upstream/master' into universal-damage

code/game/objects/items.dm

@@ -637,6 +637,10 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 	deltimer(tip_timer) //delete any in-progress timer if the mouse is moved off the item before it finishes
 	closeToolTip(usr)
 
+// Returns a numeric value for sorting items used as parts in machines, so they can be replaced by the rped
+/obj/item/proc/get_part_rating()
+	return 0
+
 /obj/item/proc/update_slot_icon()
 	if(!ismob(loc))
 		return

code/game/objects/items/weapons/misc.dm

@@ -90,7 +90,6 @@
 	desc = "test lightning"
 
 /obj/item/lightning/New()
-		icon = midicon
 		icon_state = "1"
 
 /obj/item/lightning/afterattack(atom/A as mob|obj|turf|area, mob/living/user as mob|obj, flag, params)

code/game/objects/items/weapons/vending_items.dm

@@ -5,85 +5,150 @@
 	icon = 'icons/obj/vending_restock.dmi'
 	icon_state = "refill_snack"
 	item_state = "restock_unit"
+	desc = "A vending machine restock cart."
+	usesound = 'sound/items/deconstruct.ogg'
 	flags = CONDUCT
-	force = 7.0
-	throwforce = 10.0
+	force = 7
+	throwforce = 10
 	throw_speed = 1
 	throw_range = 7
 	w_class = WEIGHT_CLASS_BULKY
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 30)
 
-	var/charges = 0		//how many restocking "charges" the refill has
+	// Built automatically from the corresponding vending machine.
+	// If null, considered to be full. Otherwise, is list(/typepath = amount).
+	var/list/products
+	var/list/contraband
+	var/list/premium
 
-/obj/item/vending_refill/New(amt = -1)
-	..()
+/obj/item/vending_refill/Initialize(mapload)
+	. = ..()
 	name = "\improper [machine_name] restocking unit"
-	if(isnum(amt) && amt > -1)
-		charges = amt
 
 /obj/item/vending_refill/examine(mob/user)
-	..(user)
-	if(charges)
-		to_chat(user, "It can restock [charges] item(s).")
-	else
+	. = ..()
+	var/num = get_part_rating()
+	if (num == INFINITY)
+		to_chat(user, "It's sealed tight, completely full of supplies.")
+	else if (num == 0)
 		to_chat(user, "It's empty!")
+	else
+		to_chat(user, "It can restock [num] item\s.")
+
+/obj/item/vending_refill/get_part_rating()
+	if (!products || !contraband || !premium)
+		return INFINITY
+	. = 0
+	for(var/key in products)
+		. += products[key]
+	for(var/key in contraband)
+		. += contraband[key]
+	for(var/key in premium)
+		. += premium[key]
 
 //NOTE I decided to go for about 1/3 of a machine's capacity
 
 /obj/item/vending_refill/boozeomat
 	machine_name = "Booze-O-Mat"
 	icon_state = "refill_booze"
-	charges = 46//of 138
 
 /obj/item/vending_refill/coffee
 	machine_name = "hot drinks"
 	icon_state = "refill_joe"
-	charges = 35//of 105
 
 /obj/item/vending_refill/snack
 	machine_name = "Getmore Chocolate Corp"
-	charges = 16//of 48
 
 /obj/item/vending_refill/cola
 	machine_name = "Robust Softdrinks"
 	icon_state = "refill_cola"
-	charges = 21//of 65
 
 /obj/item/vending_refill/cigarette
 	machine_name = "cigarette"
 	icon_state = "refill_smoke"
-	charges = 9// of 30
 
 /obj/item/vending_refill/autodrobe
 	machine_name = "AutoDrobe"
 	icon_state = "refill_costume"
-	charges = 19// of 58
 
 /obj/item/vending_refill/hatdispenser
 	machine_name = "hat"
 	icon_state = "refill_costume"
-	charges = 18// of 56
 
 /obj/item/vending_refill/suitdispenser
 	machine_name = "suit"
 	icon_state = "refill_costume"
-	charges = 68// of 206
 
 /obj/item/vending_refill/shoedispenser
 	machine_name = "shoe"
 	icon_state = "refill_costume"
-	charges = 30// of 91
 
 /obj/item/vending_refill/clothing
 	machine_name = "ClothesMate"
 	icon_state = "refill_clothes"
-	charges = 20// of 62
 
 /obj/item/vending_refill/crittercare
 	machine_name = "CritterCare"
 	icon_state = "refill_pet"
-	charges = 31// of 94
 
 /obj/item/vending_refill/chinese
 	machine_name = "MrChangs"
-	charges = 8// of 24
+
+/obj/item/vending_refill/hydroseeds
+	machine_name = "MegaSeed Servitor"
+	icon_state = "refill_plant"
+
+/obj/item/vending_refill/assist
+	machine_name = "Vendomat"
+	icon_state = "refill_engi"
+
+/obj/item/vending_refill/cart
+	machine_name = "PTech"
+	icon_state = "refill_smoke"
+
+/obj/item/vending_refill/dinnerware
+	machine_name = "Plasteel Chef's Dinnerware Vendor"
+	icon_state = "refill_smoke"
+
+/obj/item/vending_refill/engineering
+	machine_name = "Robco Tool Maker"
+	icon_state = "refill_engi"
+
+/obj/item/vending_refill/engivend
+	machine_name = "Engi-Vend"
+	icon_state = "refill_engi"
+
+/obj/item/vending_refill/medical
+	machine_name = "NanoMed Plus"
+	icon_state = "refill_medical"
+
+/obj/item/vending_refill/wallmed
+	machine_name = "NanoMed"
+	icon_state = "refill_medical"
+
+/obj/item/vending_refill/modularpc
+	machine_name = "Deluxe Silicate Selections"
+	icon_state = "refill_engi"
+
+/obj/item/vending_refill/hydronutrients
+	machine_name = "NutriMax"
+	icon_state = "refill_plant"
+
+/obj/item/vending_refill/security
+	icon_state = "refill_sec"
+
+/obj/item/vending_refill/sovietsoda
+	machine_name = "BODA"
+	icon_state = "refill_cola"
+
+/obj/item/vending_refill/sustenance
+	machine_name = "Sustenance Vendor"
+	icon_state = "refill_snack"
+
+/obj/item/vending_refill/donksoft
+	machine_name = "Donksoft Toy Vendor"
+	icon_state = "refill_donksoft"
+
+/obj/item/vending_refill/robotics
+	machine_name = "Robotech Deluxe"
+	icon_state = "refill_engi"