diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
index 454b5e4fb6b..398b065cfbd 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
@@ -198,8 +198,8 @@
 /turf/simulated/floor/beach/sand,
 /area/ruin/powered/beach)
 "aL" = (
-/obj/machinery/vending/cigarette,
 /obj/effect/turf_decal/sand,
+/obj/machinery/vending/cigarette/beach,
 /turf/simulated/floor/plasteel,
 /area/ruin/powered/beach)
 "aM" = (
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
index 451e6b84aa0..5822d05aa8a 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
@@ -120,10 +120,10 @@
 /area/ruin/powered/animal_hospital)
 "aq" = (
 /obj/structure/table,
-/obj/item/cautery{
-	pixel_x = 4
-	},
 /obj/item/surgicaldrill,
+/obj/item/bonegel,
+/obj/item/bonesetter,
+/obj/item/FixOVein,
 /turf/simulated/floor/plasteel/white,
 /area/ruin/powered/animal_hospital)
 "ar" = (
@@ -243,6 +243,9 @@
 /obj/structure/table,
 /obj/item/retractor,
 /obj/item/hemostat,
+/obj/item/cautery{
+	pixel_x = 4
+	},
 /turf/simulated/floor/plasteel/white,
 /area/ruin/powered/animal_hospital)
 "aE" = (
@@ -480,15 +483,13 @@
 /turf/simulated/floor/plasteel,
 /area/ruin/powered/animal_hospital)
 "bm" = (
-/obj/structure/chair/comfy/teal{
-	dir = 8
-	},
 /obj/effect/turf_decal/tile/blue{
 	dir = 1
 	},
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
+/obj/machinery/vending/crittercare,
 /turf/simulated/floor/plasteel,
 /area/ruin/powered/animal_hospital)
 "bn" = (
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
index 49f725e0e0f..d1b86f76821 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
@@ -1052,9 +1052,6 @@
 	dir = 8;
 	level = 2
 	},
-/obj/machinery/pipedispenser{
-	pixel_y = 0
-	},
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered/syndicate_lava_base/engineering)
 "bM" = (
@@ -3565,12 +3562,12 @@
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered/syndicate_lava_base/cargo)
 "hV" = (
-/obj/structure/filingcabinet/chestdrawer,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tile/brown,
 /obj/effect/turf_decal/tile/brown{
 	dir = 8
 	},
+/obj/machinery/autolathe,
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered/syndicate_lava_base/cargo)
 "hW" = (
@@ -4948,7 +4945,6 @@
 	dir = 8;
 	pixel_x = 24
 	},
-/obj/machinery/vending/coffee,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
@@ -4960,6 +4956,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/machinery/vending/coffee/free,
 /turf/simulated/floor/plasteel/dark,
 /area/ruin/unpowered/syndicate_lava_base/bar)
 "kr" = (
@@ -5166,9 +5163,9 @@
 	dir = 4;
 	pixel_x = 26
 	},
-/obj/machinery/vending/cigarette,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/vending/cigarette/syndicate/free,
 /turf/simulated/floor/plasteel/dark,
 /area/ruin/unpowered/syndicate_lava_base/bar)
 "kN" = (
@@ -5746,6 +5743,9 @@
 /obj/item/stock_parts/cell/high/plus,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
+/obj/item/rpd{
+	pixel_y = 3
+	},
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered/syndicate_lava_base/engineering)
 "mh" = (
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 3688b4abe9b..b2a62492c7c 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -1053,6 +1053,36 @@
 /obj/machinery/vending/cigarette/free
 	prices = list()
 
+/obj/machinery/vending/cigarette/syndicate
+	products = list(/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 7,
+					/obj/item/storage/fancy/cigarettes/cigpack_uplift = 3,
+					/obj/item/storage/fancy/cigarettes/cigpack_robust = 2,
+					/obj/item/storage/fancy/cigarettes/cigpack_carp = 3,
+					/obj/item/storage/fancy/cigarettes/cigpack_midori = 1,
+					/obj/item/storage/box/matches = 10,
+					/obj/item/lighter/zippo = 4,
+					/obj/item/storage/fancy/rollingpapers = 5)
+
+/obj/machinery/vending/cigarette/syndicate/free
+	prices = list()
+
+/obj/machinery/vending/cigarette/beach //Used in the lavaland_biodome_beach.dmm ruin
+	name = "\improper ShadyCigs Ultra"
+	desc = "Now with extra premium products!"
+	product_ads = "Probably not bad for you!;Dope will get you through times of no money better than money will get you through times of no dope!;It's good for you!"
+	product_slogans = "Turn on, tune in, drop out!;Better living through chemistry!;Toke!;Don't forget to keep a smile on your lips and a song in your heart!"
+	products = list(/obj/item/storage/fancy/cigarettes = 5,
+					/obj/item/storage/fancy/cigarettes/cigpack_uplift = 3,
+					/obj/item/storage/fancy/cigarettes/cigpack_robust = 3,
+					/obj/item/storage/fancy/cigarettes/cigpack_carp = 3,
+					/obj/item/storage/fancy/cigarettes/cigpack_midori = 3,
+					/obj/item/storage/box/matches = 10,
+					/obj/item/lighter/random = 4,
+					/obj/item/storage/fancy/rollingpapers = 5)
+	premium = list(/obj/item/clothing/mask/cigarette/cigar/havana = 2,
+				   /obj/item/storage/fancy/cigarettes/cigpack_robustgold = 1,
+				   /obj/item/lighter/zippo = 3)
+
 /obj/machinery/vending/cigarette/New()
 	..()
 	component_parts = list()
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index e212d9c5882..5a976767f11 100644
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ