diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 0fff4ca2ad5..e09eb0b42e7 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -88915,10 +88915,10 @@ /turf/simulated/floor/plating, /area/maintenance/fsmaint) "ggp" = ( -/obj/machinery/economy/vending/coffee/free, /obj/structure/sign/electricshock{ pixel_y = 32 }, +/obj/machinery/economy/vending/sovietsoda, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "red" diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 79fb19b563f..2cc05e363e7 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -79202,7 +79202,7 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/machinery/economy/vending/cola/free, +/obj/machinery/economy/vending/sovietsoda, /turf/simulated/floor/plasteel{ icon_state = "white" }, diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 2ddbca659b5..e70f8ff6433 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -77464,7 +77464,6 @@ /area/medical/morgue) "laL" = ( /obj/structure/table, -/obj/item/storage/photo_album, /obj/item/camera, /obj/item/radio/intercom/locked/prison{ name = "Prison Intercom (General)"; @@ -81852,7 +81851,7 @@ /area/maintenance/apmaint) "oGf" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/economy/vending/cola/free, +/obj/machinery/economy/vending/sovietsoda, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "red" @@ -82249,7 +82248,8 @@ }, /area/medical/virology) "oWe" = ( -/obj/machinery/economy/vending/coffee/free, +/obj/structure/table, +/obj/item/storage/photo_album, /turf/simulated/floor/wood, /area/security/permabrig) "oWz" = ( diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index 772d19f34f2..4a79312a245 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -4547,10 +4547,10 @@ /turf/simulated/floor/plasteel, /area/mine/living_quarters) "Ca" = ( -/obj/machinery/economy/vending/cola/free, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/machinery/economy/vending/sovietsoda, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" diff --git a/code/game/machinery/vendors/generic_vendors.dm b/code/game/machinery/vendors/generic_vendors.dm index a2e4e817dac..c5fe8bf7658 100644 --- a/code/game/machinery/vendors/generic_vendors.dm +++ b/code/game/machinery/vendors/generic_vendors.dm @@ -640,8 +640,8 @@ icon_state = "sovietsoda" icon_lightmask = "sovietsoda" ads_list = list("For Tsar and Country.","Have you fulfilled your nutrition quota today?","Very nice!","We are simple people, for this is all we eat.","If there is a person, there is a problem. If there is no person, then there is no problem.") - products = list(/obj/item/reagent_containers/food/drinks/drinkingglass/soda = 30) - contraband = list(/obj/item/reagent_containers/food/drinks/drinkingglass/cola = 20) + products = list(/obj/item/reagent_containers/food/drinks/cans/sodawater = 10) + contraband = list(/obj/item/reagent_containers/food/drinks/cans/cola = 7) resistance_flags = FIRE_PROOF refill_canister = /obj/item/vending_refill/sovietsoda