Vore Updates and merges

code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm

@@ -201,6 +201,18 @@ Drinks Data
 /datum/reagent/drink/nothing
 	glass_icon_state = "nothing"
 
+/datum/reagent/drink/oilslick
+	glass_icon_state = "jar_oil"
+	glass_center_of_mass = list("x"=15, "y"=12)
+
+/datum/reagent/drink/nuclearwaste
+	glass_icon_state = "jar_rad"
+	glass_center_of_mass = list("x"=15, "y"=12)
+
+/datum/reagent/drink/sodaoil
+	glass_icon_state = "jar_water"
+	glass_center_of_mass = list("x"=15, "y"=12)
+
 /datum/reagent/ethanol/absinthe
 	glass_icon_state = "absintheglass"
 	glass_center_of_mass = list("x"=16, "y"=5)
@@ -242,7 +254,11 @@ Drinks Data
 	glass_center_of_mass = list("x"=16, "y"=12)
 
 /datum/reagent/ethanol/sake
-	glass_icon_state = "ginvodkaglass"
+	glass_icon_state = "sakecup"
+	glass_center_of_mass = list("x"=16, "y"=12)
+
+/datum/reagent/ethanol/godsake
+	glass_icon_state = "sakeporcelain"
 	glass_center_of_mass = list("x"=16, "y"=12)
 
 /datum/reagent/ethanol/tequila
@@ -502,4 +518,27 @@ Drinks Data
 
 /datum/reagent/ethanol/specialwhiskey
 	glass_icon_state = "whiskeyglass"
-	glass_center_of_mass = list("x"=16, "y"=12)
+	glass_center_of_mass = list("x"=16, "y"=12)
+
+/datum/reagent/ethanol/godka
+	glass_icon_state = "godkabottle"
+	glass_center_of_mass = list("x"=17, "y"=15)
+
+/datum/reagent/ethanol/holywine
+	glass_icon_state = "holywineglass"
+	glass_center_of_mass = list("x"=15, "y"=7)
+
+/datum/reagent/ethanol/holy_mary
+	glass_icon_state = "holymaryglass"
+
+/datum/reagent/ethanol/angelswrath
+	glass_icon_state = "angelswrath"
+	glass_center_of_mass = list("x"=16, "y"=2)
+
+/datum/reagent/ethanol/angelskiss
+	glass_icon_state = "angelskiss"
+	glass_center_of_mass = list("x"=16, "y"=8)
+
+/datum/reagent/ethanol/ichor_mead
+	glass_icon_state = "ichor_meadglass"
+	glass_center_of_mass = list("x"=17, "y"=10)

code/modules/reagents/reagent_containers/food/z_custom_food_vr.dm

@@ -123,7 +123,7 @@ var/global/ingredientLimit = 20000
 	return new_name
 
 /obj/item/weapon/reagent_containers/food/snacks/customizable/Destroy()
-	qdel_null_list(ingredients)
+	QDEL_NULL_LIST(ingredients)
 	return ..()
 
 /obj/item/weapon/reagent_containers/food/snacks/customizable/proc/drawTopping()

code/modules/reagents/reagent_containers/glass.dm

@@ -252,7 +252,7 @@
 	flags = OPENCONTAINER
 	unacidable = 0
 
-/obj/item/weapon/reagent_containers/glass/bucket/attackby(var/obj/D, mob/user as mob)
+/obj/item/weapon/reagent_containers/glass/bucket/attackby(var/obj/item/D, mob/user as mob)
 	if(isprox(D))
 		user << "You add [D] to [src]."
 		qdel(D)
@@ -260,7 +260,7 @@
 		user.drop_from_inventory(src)
 		qdel(src)
 		return
-	else if(istype(D, /obj/item/weapon/wirecutters))
+	else if(D.is_wirecutter())
 		to_chat(user, "<span class='notice'>You cut a big hole in \the [src] with \the [D].  It's kinda useless as a bucket now.</span>")
 		user.put_in_hands(new /obj/item/clothing/head/helmet/bucket)
 		user.drop_from_inventory(src)

code/modules/reagents/reagent_containers/hypospray.dm

@@ -17,6 +17,7 @@
 	preserve_item = 1
 	var/filled = 0
 	var/list/filled_reagents = list()
+	var/hyposound	// What sound do we play on use?
 
 /obj/item/weapon/reagent_containers/hypospray/New()
 	..()
@@ -55,8 +56,9 @@
 	user.setClickCooldown(DEFAULT_QUICK_COOLDOWN)
 	to_chat(user, "<span class='notice'>You inject [M] with \the [src].</span>")
 	to_chat(M, "<span class='notice'>You feel a tiny prick!</span>")
-	
-	playsound(src, 'sound/effects/hypospray.ogg',25)
+
+	if(hyposound)
+		playsound(src, hyposound,25)
 
 	if(M.reagents)
 		var/contained = reagentlist()
@@ -126,6 +128,7 @@
 	filled = 1
 	filled_reagents = list("inaprovaline" = 5)
 	preserve_item = 0
+	hyposound = 'sound/effects/hypospray.ogg'
 
 /obj/item/weapon/reagent_containers/hypospray/autoinjector/on_reagent_change()
 	..()

code/modules/reagents/reagent_containers/syringes.dm

@@ -221,7 +221,7 @@
 			else
 				to_chat(user, "<span class='notice'>The syringe is empty.</span>")
 
-			dirty(target,affected) //VOREStation Add
+//		dirty(target,affected) //VOREStation Add -- Removed by Request
 
 	return
 /* VOREStation Edit - See syringes_vr.dm

code/modules/reagents/reagent_containers/syringes_vr.dm

@@ -13,7 +13,7 @@
 	update_icon()
 
 /obj/item/weapon/reagent_containers/syringe/Destroy()
-	qdel_null_list(viruses)
+	QDEL_NULL_LIST(viruses)
 	LAZYCLEARLIST(targets)
 	return ..()