VS: Conflict Resolution + VS Changes

Makes soft vendors work again
Conflict Resolution II
Fixes Shelter Capsule Vendor
Note to self remember quotations
Bad Lynx stop forgetting quotes!

code/modules/food/kitchen/smartfridge.dm

@@ -13,15 +13,8 @@
 	idle_power_usage = 5
 	active_power_usage = 100
 	flags = NOREACT
-<<<<<<< HEAD
 	var/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't look things over 1000. //VOREStation Edit - Non-global
 	//var/global/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't look things over 1000.
-	var/icon_on = "smartfridge"
-	var/icon_off = "smartfridge-off"
-	var/icon_panel = "smartfridge-panel"
-=======
-	var/global/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't look things over 1000.
->>>>>>> 636062b... Merge pull request #6858 from VOREStation/pol-bayvend
 	var/list/item_records = list()
 	var/datum/stored_item/currently_vending = null	//What we're putting out of the machine.
 	var/seconds_electrified = 0;
@@ -221,17 +214,18 @@
 		is_off = "-off"
 
 	// Fridge contents
-	switch(contents.len)
-		if(0)
-			add_overlay("empty[is_off]")
-		if(1 to 2)
-			add_overlay("[icon_contents]-1[is_off]")
-		if(3 to 5)
-			add_overlay("[icon_contents]-2[is_off]")
-		if(6 to 8)
-			add_overlay("[icon_contents]-3[is_off]")
-		else
-			add_overlay("[icon_contents]-4[is_off]")
+	if(contents) //VOREStation Edit - Some fridges do not have visible contents
+		switch(contents.len)
+			if(0)
+				add_overlay("empty[is_off]")
+			if(1 to 2)
+				add_overlay("[icon_contents]-1[is_off]")
+			if(3 to 5)
+				add_overlay("[icon_contents]-2[is_off]")
+			if(6 to 8)
+				add_overlay("[icon_contents]-3[is_off]")
+			else
+				add_overlay("[icon_contents]-4[is_off]")
 
 	// Fridge top
 	var/image/top = image(icon, "[icon_base]-top")

code/modules/mining/shelter_atoms.dm

@@ -222,9 +222,9 @@
 	name = "survival pod storage"
 	desc = "A heated storage unit."
 	icon_state = "donkvendor"
+	icon_base = "donkvendor"
+	icon_contents = null
 	icon = 'icons/obj/survival_pod_vend.dmi'
-	icon_on = "donkvendor"
-	icon_off = "donkvendor"
 	light_range = 5
 	light_power = 1.2
 	light_color = "#DDFFD3"

code/modules/nifsoft/nif_softshop.dm

@@ -6,8 +6,6 @@
 
 	icon = 'icons/obj/machines/ar_elements.dmi'
 	icon_state = "proj"
-	icon_vend = "beacon_yes"
-	icon_deny = "beacon_no"
 
 	products = list()
 	contraband = list()
@@ -98,7 +96,7 @@
 	var/mob/living/carbon/human/H = user
 	if(!H.nif || !H.nif.stat == NIF_WORKING)
 		to_chat(H, "<span class='warning'>[src] seems unable to connect to your NIF...</span>")
-		flick(icon_deny,entopic.my_image)
+		flick("[icon_state]-deny",entopic.my_image)
 		return FALSE
 
 	return ..()
@@ -126,7 +124,7 @@
 		if((href_list["vend"]) && (vend_ready) && (!currently_vending))
 			if((!allowed(usr)) && !emagged && scan_id)	//For SECURE VENDING MACHINES YEAH
 				to_chat(usr, "<span class='warning'>Access denied.</span>")	//Unless emagged of course
-				flick(icon_deny,entopic.my_image)
+				flick("[icon_state]-deny",entopic.my_image)
 				return
 
 			var/key = text2num(href_list["vend"])
@@ -143,7 +141,7 @@
 				var/list/usr_access = usr.GetAccess()
 				if(!has_access(soft_access, list(), usr_access) && !emagged)
 					to_chat(usr, "<span class='warning'>You aren't authorized to buy [initial(path.name)].</span>")
-					flick(icon_deny,entopic.my_image)
+					flick("[icon_state]-deny",entopic.my_image)
 					return
 
 			if(R.price <= 0)
@@ -174,7 +172,7 @@
 	var/mob/living/carbon/human/H = user
 	if((!allowed(usr)) && !emagged && scan_id && istype(H))	//For SECURE VENDING MACHINES YEAH
 		to_chat(usr, "<span class='warning'>Purchase not allowed.</span>")	//Unless emagged of course
-		flick(icon_deny,entopic.my_image)
+		flick("[icon_state]-deny",entopic.my_image)
 		return
 	vend_ready = 0 //One thing at a time!!
 	status_message = "Installing..."
@@ -207,7 +205,7 @@
 	spawn(vend_delay)
 		R.amount--
 		new R.item_path(H.nif)
-		flick(icon_vend,entopic.my_image)
+		flick("[icon_state]-vend",entopic.my_image)
 		if(has_logs)
 			do_logging(R, user, 1)
 

code/modules/reagents/dispenser/dispenser_presets_vr.dm

@@ -1,7 +1,5 @@
 /obj/machinery/chemical_dispenser/xenoflora
 	name = "xenoflora chem dispenser"
-	icon = 'icons/obj/chemical_vr.dmi'
-	icon_state = "dispenser-small-green"
 	ui_title = "Xenoflora Chemical Dispenser"
 	dispense_reagents = list(
 		"water", "sugar", "ethanol", "radium", "ammonia", "diethylamine", "plantbgone", "mutagen", "calcium"
@@ -22,8 +20,6 @@
 
 /obj/machinery/chemical_dispenser/biochemistry
 	name = "bioproduct dispenser"
-	icon = 'icons/obj/chemical_vr.dmi'
-	icon_state = "dispenser-small"
 	ui_title = "Bioproduct Dispenser"
 	dispense_reagents = list(
 		"nutriment", "protein", "milk"