diff --git a/code/game/objects/structures/props.dm b/code/game/objects/structures/props.dm
index c71f9b227668..8c7813b47a72 100644
--- a/code/game/objects/structures/props.dm
+++ b/code/game/objects/structures/props.dm
@@ -1152,3 +1152,9 @@
 	icon = 'icons/obj/structures/props/almayer_props.dmi'
 	icon_state = "rope"
 	density = FALSE
+
+/obj/structure/prop/invuln/joey
+	name = "Workin' Joey"
+	desc = "A defunct Seegson-brand Working Joe lifted from deep storage by a crew of marines after the last shore leave. Attempts have been made to modify the janitorial synthetic to serve as a crude bartender, but with little success."
+	icon = 'icons/obj/structures/props/props.dmi'
+	icon_state = "joey"
diff --git a/icons/obj/structures/props/props.dmi b/icons/obj/structures/props/props.dmi
index bd22e985b2ae..57485feeaecc 100644
Binary files a/icons/obj/structures/props/props.dmi and b/icons/obj/structures/props/props.dmi differ
diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index f8c9cc99d534..b02cd24e2e4e 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -75281,7 +75281,7 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/delta)
 "wXv" = (
-/obj/structure/machinery/vending/cigarette,
+/obj/structure/prop/invuln/joey,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},