Expanded leisure area on the tether (#17441)

* Expanded leisure area on the tether

Significant changes to the tether's pool area. The tiny, highly exposed gym has been moved to the south of the pool, therefore a bit more secluded but also larger and prettied up. The neighbouring toilets now have a locker room. There is a small session room that can be locked on the south side of the gym. There is a very small sauna and massage room on the west of the pool. There are now a few tables and chairs around the pool now, and the old gym has been converted into another, more visible pool-themed cafe/bar (no alcohol!)
Also added treadmills.

* Wires and non-smoking area

* Conflict fix

* Revert "Conflict fix"

This reverts commit e8b98f8c7a.

* redo conflict fix

code/game/area/Space Station 13 areas.dm

@@ -1235,6 +1235,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "\improper Pool"
 	icon_state = "pool"
 
+/area/crew_quarters/gym
+	name = "\improper Gym"
+	icon_state = "pool"
+
+/area/crew_quarters/gym_private
+	name = "\improper Gym Sideroom"
+	icon_state = "pool" 
+
+/area/crew_quarters/sauna
+	name = "\improper Sauna"
+	icon_state = "pool"
+
 /area/crew_quarters/cafeteria
 	name = "\improper Cafeteria"
 	icon_state = "cafeteria"

code/modules/economy/vending_machines.dm

@@ -120,6 +120,55 @@
 	has_logs = 1
 	vending_sound = "machines/vending/vending_cans.ogg"
 
+/obj/machinery/vending/boozeomat/virgin
+	name = "Virgin-O-Mat"
+	products = list(/obj/item/reagent_containers/food/drinks/glass2/square = 10,
+					/obj/item/reagent_containers/food/drinks/glass2/rocks = 10,
+					/obj/item/reagent_containers/food/drinks/glass2/shake = 10,
+					/obj/item/reagent_containers/food/drinks/glass2/cocktail = 10,
+					/obj/item/reagent_containers/food/drinks/glass2/shot = 10,
+					/obj/item/reagent_containers/food/drinks/glass2/pint = 10,
+					/obj/item/reagent_containers/food/drinks/glass2/mug = 10,
+					/obj/item/reagent_containers/food/drinks/glass2/carafe = 2,	//VOREStation Add - Carafes and Pitchers
+					/obj/item/reagent_containers/food/drinks/glass2/pitcher = 2,	//VOREStation Add - Carafes and Pitchers
+					/obj/item/reagent_containers/food/drinks/glass2/wine = 10,
+					/obj/item/reagent_containers/food/drinks/bottle/whitewine = 5,
+					/obj/item/reagent_containers/food/drinks/bottle/grapejuice = 5,
+					/obj/item/reagent_containers/food/drinks/metaglass = 10,
+					/obj/item/reagent_containers/food/drinks/metaglass/metapint = 10,
+					/obj/item/reagent_containers/glass/beaker/stopperedbottle = 10,
+					/obj/item/reagent_containers/food/drinks/bottle/grenadine = 5,
+					/obj/item/reagent_containers/food/condiment/cookingoil = 5,
+					/obj/item/reagent_containers/food/condiment/cornoil = 5,
+					/obj/item/reagent_containers/food/drinks/bottle/orangejuice = 5,
+					/obj/item/reagent_containers/food/drinks/bottle/tomatojuice = 5,
+					/obj/item/reagent_containers/food/drinks/bottle/limejuice = 5,
+					/obj/item/reagent_containers/food/drinks/bottle/lemonjuice = 5,
+					/obj/item/reagent_containers/food/drinks/bottle/applejuice = 5,
+					/obj/item/reagent_containers/food/drinks/bottle/milk = 5,
+					/obj/item/reagent_containers/food/drinks/bottle/cream = 5,
+					/obj/item/reagent_containers/food/drinks/bottle/cola = 5,
+					/obj/item/reagent_containers/food/drinks/bottle/decaf_cola = 5,
+					/obj/item/reagent_containers/food/drinks/bottle/space_up = 5,
+					/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind = 5,
+					/obj/item/reagent_containers/food/drinks/bottle/dr_gibb = 5,
+					/obj/item/reagent_containers/food/drinks/bottle/small/cola = 15,
+					/obj/item/reagent_containers/food/drinks/bottle/small/space_up = 15,
+					/obj/item/reagent_containers/food/drinks/bottle/small/space_mountain_wind = 15,
+					/obj/item/reagent_containers/food/drinks/bottle/small/dr_gibb = 15,
+					/obj/item/reagent_containers/food/drinks/cans/sodawater = 15,
+					/obj/item/reagent_containers/food/drinks/cans/tonic = 15,
+					/obj/item/reagent_containers/food/drinks/cans/gingerale = 15,
+					/obj/item/reagent_containers/food/drinks/flask/barflask = 5,
+					/obj/item/reagent_containers/food/drinks/flask/vacuumflask = 5,
+					/obj/item/reagent_containers/food/drinks/ice = 10,
+					/obj/item/reagent_containers/food/drinks/tea = 15,
+					/obj/item/glass_extra/stick = 30,
+					/obj/item/glass_extra/straw = 30)
+
+	product_slogans = "I hope hope someone asks me for a cup o' tea...;Alcohol is humanity's enemy. Would you join a foe?;Quite delighted to serve you!;Is nobody thirsty on this station?"
+	product_ads = "Drink up responsibly!;Booze is bad for you!;Alcohol is humanity's worst enemy.;Quite delighted to serve you!;Care for a nice, cold ginger ale?;Nothing cures you like tea!;Have a sip!;Have a drink!;Have a water!;Beer is not good for you!;Only the finest non-alcoholic beverages!;Best quality soft drinks since 2053!;Award-winning lemonade!;Minimum alcohol!;Man loathes beer.;A toast for sobriety!"
+
 /obj/machinery/vending/assist
 	products = list(	/obj/item/assembly/prox_sensor = 5,
 						/obj/item/assembly/igniter = 3,

code/modules/vore/weight/fitness_machines_vr.dm

@@ -82,6 +82,14 @@
 	weightloss_power = 2
 	cooldown = 40
 
+/obj/machinery/fitness/heavy/treadmill
+	name = "treadmill"
+	desc = "A treadmill for running on! Often used with the goal of losing weight."
+	icon_state = "treadmill"
+	messages = list("You run for a while")
+	weightloss_power = 2
+	cooldown = 40
+
 /obj/machinery/scale
 	name = "scale"
 	icon = 'icons/obj/machines/fitness_machines_vr.dmi'

maps/stellar_delight/stellar_delight3.dmm

@@ -409,6 +409,10 @@
 /obj/effect/landmark/vines,
 /turf/simulated/open,
 /area/stellardelight/deck2/starboard)
+"aW" = (
+/obj/machinery/vending/cigarette,
+/turf/simulated/floor/airless,
+/area/stellardelight/deck3/exterior)
 "aX" = (
 /obj/structure/sign/deck3{
 	pixel_x = 32
@@ -418,6 +422,17 @@
 	},
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck3/aft)
+"aY" = (
+/obj/structure/sign/small/nosmoking{
+	pixel_y = 27
+	},
+/obj/structure/railing/grey{
+	dir = 4
+	},
+/obj/item/trash/cigbutt,
+/obj/effect/floor_decal/shuttle/blue,
+/turf/simulated/floor/airless,
+/area/stellardelight/deck3/exterior)
 "bb" = (
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 8
@@ -27146,7 +27161,7 @@ RK
 hB
 In
 me
-NL
+aW
 NL
 qy
 NL
@@ -27288,7 +27303,7 @@ RE
 me
 me
 me
-NL
+aY
 NL
 we
 NL