diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
index 0d9327b6421..a07f04160dd 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
@@ -1,1546 +1,130 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"aa" = (
-/turf/template_noop,
-/area/template_noop)
-"ad" = (
-/obj/structure/flora/ausbushes/leafybush,
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"ae" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/stack/cable_coil,
-/obj/item/storage/box/lights/mixed,
-/turf/simulated/floor/plating,
-/area/ruin/powered/beach)
-"af" = (
-/obj/structure/table,
-/obj/item/clothing/mask/gas,
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/item/clothing/glasses/sunglasses/big,
-/obj/item/clothing/glasses/sunglasses/big,
-/obj/item/clothing/glasses/sunglasses/big,
-/turf/simulated/floor/plating,
-/area/ruin/powered/beach)
-"ag" = (
-/obj/structure/reagent_dispensers/fueltank,
-/turf/simulated/floor/plating,
-/area/ruin/powered/beach)
-"ah" = (
-/obj/effect/mob_spawn/human/bartender/alive,
-/turf/simulated/floor/plating,
-/area/ruin/powered/beach)
-"ai" = (
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/turf/simulated/floor/plating,
-/area/ruin/powered/beach)
-"aj" = (
-/turf/simulated/wall/mineral/sandstone,
-/area/ruin/powered/beach)
-"ak" = (
-/obj/structure/toilet,
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"al" = (
-/obj/structure/urinal{
- pixel_y = 32
- },
-/turf/simulated/floor/plating,
-/area/ruin/powered/beach)
-"am" = (
-/obj/structure/urinal{
- pixel_y = 32
- },
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"an" = (
-/obj/item/flashlight/lantern,
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/simulated/floor/plating,
-/area/ruin/powered/beach)
-"ao" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 11
- },
-/obj/structure/mirror{
- pixel_x = 28
- },
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"ap" = (
-/obj/structure/flora/ausbushes/sparsegrass,
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"aq" = (
-/obj/structure/flora/ausbushes/sunnybush,
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"ar" = (
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"as" = (
-/turf/simulated/floor/plating,
-/area/ruin/powered/beach)
-"at" = (
-obj/item/tank/oxygen,
-/turf/simulated/floor/plating,
-/area/ruin/powered/beach)
-"au" = (
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"av" = (
-/obj/structure/mineral_door/sandstone{
- name = "Lavatory"
- },
-/turf/simulated/floor/plating,
-/area/ruin/powered/beach)
-"aw" = (
-/obj/structure/mineral_door/sandstone{
- name = "Bar Storage"
- },
-/turf/simulated/floor/wood,
-/area/ruin/powered/beach)
-"ax" = (
-/obj/structure/extinguisher_cabinet,
-/turf/simulated/wall/mineral/sandstone,
-/area/ruin/powered/beach)
-"ay" = (
-/obj/structure/mineral_door/sandstone{
- name = "Restroom"
- },
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"az" = (
-/obj/item/clothing/accessory/necklace,
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"aA" = (
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"aB" = (
-/turf/simulated/floor/plating/asteroid{
- baseturf = /turf/simulated/floor/beach/sand
- },
-/area/ruin/powered/beach)
-"aC" = (
-/turf/simulated/floor/wood,
-/area/ruin/powered/beach)
-"aD" = (
-/obj/structure/table,
-/obj/machinery/light{
- dir = 1
- },
-/obj/machinery/chem_dispenser/soda,
-/turf/simulated/floor/wood,
-/area/ruin/powered/beach)
-"aE" = (
-/obj/structure/table,
-/obj/machinery/reagentgrinder,
-/turf/simulated/floor/wood,
-/area/ruin/powered/beach)
-"aF" = (
-/obj/machinery/vending/boozeomat{
- emagged = 1
- req_access_txt = "0"
- },
-/turf/simulated/floor/wood,
-/area/ruin/powered/beach)
-"aH" = (
-/obj/structure/table,
-/obj/machinery/light{
- dir = 1
- },
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/reagent_containers/glass/rag,
-/turf/simulated/floor/wood,
-/area/ruin/powered/beach)
-"aI" = (
-/obj/structure/table,
-/obj/machinery/microwave,
-/turf/simulated/floor/wood,
-/area/ruin/powered/beach)
-"aJ" = (
-/obj/structure/closet/crate,
-/obj/item/tank/emergency_oxygen,
-/obj/item/trash/candy,
-/obj/item/toy/owl,
-/turf/simulated/floor/plating/asteroid{
- baseturf = /turf/simulated/floor/beach/sand
- },
-/area/ruin/powered/beach)
-"aK" = (
-/turf/simulated/floor/plating/asteroid{
- baseturf = /turf/simulated/floor/beach/sand
- },
-/area/ruin/powered/beach)
-"aM" = (
-/obj/structure/reagent_dispensers/beerkeg,
-/turf/simulated/floor/wood,
-/area/ruin/powered/beach)
-"aN" = (
-/obj/machinery/vending/cigarette,
-/turf/simulated/floor/plating/asteroid{
- baseturf = /turf/simulated/floor/beach/sand
- },
-/area/ruin/powered/beach)
-"aO" = (
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"aP" = (
-/obj/structure/table/wood,
-/turf/simulated/floor/wood,
-/area/ruin/powered/beach)
-"aQ" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp,
-/turf/simulated/floor/wood,
-/area/ruin/powered/beach)
-"aR" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/tequila,
-/turf/simulated/floor/wood,
-/area/ruin/powered/beach)
-"aS" = (
-/obj/machinery/processor,
-/turf/simulated/floor/wood,
-/area/ruin/powered/beach)
-"aT" = (
-/obj/machinery/vending/cola,
-/turf/simulated/floor/plating/asteroid{
- baseturf = /turf/simulated/floor/beach/sand
- },
-/area/ruin/powered/beach)
-"aU" = (
-/obj/effect/overlay/palmtree_l,
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"aV" = (
-/obj/effect/mob_spawn/human/beach/alive,
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"aW" = (
-/obj/structure/chair/stool,
-/turf/simulated/floor/plating/asteroid{
- baseturf = /turf/simulated/floor/beach/sand
- },
-/area/ruin/powered/beach)
-"aX" = (
-/obj/structure/closet/secure_closet/freezer/meat/open,
-/turf/simulated/floor/wood,
-/area/ruin/powered/beach)
-"aY" = (
-/obj/machinery/vending/snack,
-/turf/simulated/floor/plating/asteroid{
- baseturf = /turf/simulated/floor/beach/sand
- },
-/area/ruin/powered/beach)
-"aZ" = (
-/obj/effect/overlay/coconut,
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"bb" = (
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"bc" = (
-/obj/structure/mineral_door/sandstone{
- name = "Bar Access"
- },
-/turf/simulated/floor/wood,
-/area/ruin/powered/beach)
-"bd" = (
-/obj/structure/closet/secure_closet/freezer/kitchen{
- req_access = null
- },
-/turf/simulated/floor/wood,
-/area/ruin/powered/beach)
-"be" = (
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"bg" = (
-/obj/structure/sign/barsign,
-/turf/simulated/wall/mineral/sandstone,
-/area/ruin/powered/beach)
-"bl" = (
-/turf/simulated/floor/plating/asteroid{
- baseturf = /turf/simulated/floor/beach/sand
- },
-/area/ruin/powered/beach)
-"bx" = (
-/obj/structure/flora/rock,
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"bz" = (
-/mob/living/simple_animal/crab,
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"bA" = (
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/item/bikehorn/airhorn,
-/obj/structure/table/wood,
-/obj/item/storage/firstaid/regular,
-/obj/item/storage/firstaid/brute,
-/turf/simulated/floor/wood,
-/area/ruin/powered/beach)
-"bB" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 1;
- layer = 2.9
- },
-/obj/structure/chair/stool,
-/turf/simulated/floor/wood,
-/area/ruin/powered/beach)
-"bE" = (
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"bF" = (
-/obj/item/beach_ball,
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"bG" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced,
-/obj/item/megaphone,
-/turf/simulated/floor/wood,
-/area/ruin/powered/beach)
-"bH" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/effect/mob_spawn/human/beach/alive/lifeguard,
-/turf/simulated/floor/wood,
-/area/ruin/powered/beach)
-"bJ" = (
-/obj/structure/chair,
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"bK" = (
-/obj/item/storage/backpack/duffel,
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"bL" = (
-/turf/simulated/floor/pod/light,
-/area/ruin/powered/beach)
-"bM" = (
-/turf/simulated/floor/plasteel/stairs/old,
-/area/ruin/powered/beach)
-"bN" = (
-/obj/structure/flora/ausbushes/reedbush,
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"bO" = (
-/obj/item/camera,
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"bP" = (
-/obj/item/reagent_containers/food/drinks/cans/beer,
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"bQ" = (
-/obj/structure/flora/ausbushes/reedbush,
-/turf/simulated/floor/beach/coastline_t,
-/area/ruin/powered/beach)
-"bR" = (
-/turf/simulated/floor/beach/coastline_t,
-/area/ruin/powered/beach)
-"bS" = (
-/obj/structure/flora/ausbushes/sparsegrass,
-/turf/simulated/floor/beach/coastline_t,
-/area/ruin/powered/beach)
-"bT" = (
-/turf/simulated/floor/beach/coastline_b,
-/area/ruin/powered/beach)
-"bU" = (
-/turf/simulated/floor/beach/water,
-/area/ruin/powered/beach)
-"bV" = (
-/obj/structure/flora/ausbushes/stalkybush,
-/turf/simulated/floor/beach/water,
-/area/ruin/powered/beach)
-"bW" = (
-/turf/simulated/wall/r_wall,
-/area/ruin/powered/beach)
-"cd" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/simulated/wall/mineral/sandstone,
-/area/ruin/powered/beach)
-"ce" = (
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"cg" = (
-/obj/machinery/light{
- dir = 8
- },
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"ch" = (
-/obj/machinery/light{
- dir = 4
- },
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"cj" = (
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/plating/asteroid{
- baseturf = /turf/simulated/floor/beach/sand
- },
-/area/ruin/powered/beach)
-"cs" = (
-/obj/effect/overlay/palmtree_l,
-/obj/machinery/light{
- dir = 4
- },
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"ct" = (
-/obj/machinery/light,
-/turf/simulated/floor/beach/water,
-/area/ruin/powered/beach)
-"cR" = (
-/obj/structure/table/wood,
-obj/item/tank/oxygen,
-/obj/item/pickaxe,
-/obj/item/clothing/mask/gas,
-/turf/simulated/floor/pod,
-/area/ruin/powered/beach)
-"dw" = (
-/obj/structure/mineral_door/sandstone{
- name = "Beach Access"
- },
-/turf/simulated/floor/pod,
-/area/ruin/powered/beach)
-"gg" = (
-/obj/structure/table,
-/obj/item/storage/box/drinkingglasses,
-/obj/item/storage/box/drinkingglasses,
-/obj/item/storage/box/beakers,
-/obj/item/storage/box/donkpockets,
-/turf/simulated/floor/plating,
-/area/ruin/powered/beach)
-"hY" = (
-/obj/structure/table,
-/obj/machinery/chem_dispenser/beer,
-/turf/simulated/floor/wood,
-/area/ruin/powered/beach)
-"iw" = (
-/obj/machinery/light/small{
- light_power = 3;
- dir = 8
- },
-/turf/simulated/floor/pod,
-/area/ruin/powered/beach)
-"jF" = (
-/turf/simulated/floor/pod,
-/area/ruin/powered/beach)
-"lF" = (
-/obj/machinery/light{
- dir = 4
- },
-/turf/simulated/floor/pod{
- oxygen = 14
- nitrogen = 23
- temperature = 300
- },
-/area/ruin/powered/beach)
-"lM" = (
-/obj/structure/dresser,
-/turf/simulated/floor/pod,
-/area/ruin/powered/beach)
-"mh" = (
-/obj/effect/spawner/window,
-/turf/simulated/floor/plating,
-/area/ruin/powered/beach)
-"oK" = (
-/turf/simulated/floor/plating/asteroid{
- baseturf = /turf/simulated/floor/beach/sand
- },
-/area/ruin/powered/beach)
-"pg" = (
-/obj/machinery/shower{
- dir = 4
- },
-/turf/simulated/floor/pod/light,
-/area/ruin/powered/beach)
-"pI" = (
-/obj/machinery/door/airlock/hatch{
- name = "Lava Beach Club"
- },
-/obj/structure/fans/tiny,
-/turf/simulated/floor/pod,
-/area/ruin/powered/beach)
-"pU" = (
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/simulated/floor/pod,
-/area/ruin/powered/beach)
-"qa" = (
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/simulated/floor/pod,
-/area/ruin/powered/beach)
-"qT" = (
-/obj/machinery/shower{
- dir = 8
- },
-/turf/simulated/floor/pod/light,
-/area/ruin/powered/beach)
-"sy" = (
-/turf/simulated/floor/plating/asteroid{
- baseturf = /turf/simulated/floor/beach/sand
- },
-/area/ruin/powered/beach)
-"sO" = (
-/turf/simulated/floor/light/colour_cycle,
-/area/ruin/powered/beach)
-"vl" = (
-/obj/structure/closet/athletic_mixed,
-/turf/simulated/floor/pod,
-/area/ruin/powered/beach)
-"wY" = (
-/turf/simulated/floor/pod/light,
-/area/ruin/powered/beach)
-"yp" = (
-/turf/simulated/floor/plating/asteroid{
- baseturf = /turf/simulated/floor/beach/sand
- },
-/area/ruin/powered/beach)
-"zw" = (
-/obj/structure/closet/athletic_mixed,
-/turf/simulated/floor/pod,
-/area/ruin/powered/beach)
-"Bl" = (
-/obj/machinery/light{
- dir = 8
- },
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"Ec" = (
-/obj/structure/mineral_door/sandstone{
- name = "Beach Access"
- },
-/turf/simulated/floor/pod,
-/area/ruin/powered/beach)
-"Ga" = (
-/turf/simulated/floor/plating/asteroid{
- baseturf = /turf/simulated/floor/beach/sand
- },
-/area/ruin/powered/beach)
-"Gc" = (
-/turf/simulated/floor/pod/light,
-/area/ruin/powered/beach)
-"HC" = (
-/obj/structure/rack,
-/obj/item/clothing/shoes/sandal,
-/obj/item/clothing/shoes/sandal,
-/turf/simulated/floor/pod,
-/area/ruin/powered/beach)
-"QS" = (
-/obj/machinery/light{
- dir = 4
- },
-/turf/simulated/floor/beach/sand,
-/area/ruin/powered/beach)
-"TP" = (
-/obj/machinery/light{
- dir = 8
- },
-/turf/simulated/floor/pod{
- oxygen = 14
- nitrogen = 23
- temperature = 300
- },
-/area/ruin/powered/beach)
-"VO" = (
-/turf/simulated/floor/pod,
-/area/ruin/powered/beach)
-"Xp" = (
-/obj/machinery/light/small{
- light_power = 3;
- dir = 8
- },
-/turf/simulated/floor/pod,
-/area/ruin/powered/beach)
+"aa" = (/turf/template_noop,/area/template_noop)
+"ab" = (/obj/structure/weightmachine/stacklifter,/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"ac" = (/obj/structure/weightmachine/weightlifter,/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"ad" = (/obj/structure/flora/ausbushes/leafybush,/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"ae" = (/obj/structure/table,/obj/item/storage/toolbox/mechanical,/obj/item/stack/cable_coil,/obj/item/storage/box/lights/mixed,/turf/simulated/floor/plating,/area/ruin/powered/beach)
+"af" = (/obj/structure/table,/obj/item/clothing/mask/gas,/obj/machinery/light/small{dir = 1},/obj/item/clothing/glasses/sunglasses/big,/obj/item/clothing/glasses/sunglasses/big,/obj/item/clothing/glasses/sunglasses/big,/turf/simulated/floor/plating,/area/ruin/powered/beach)
+"ag" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/ruin/powered/beach)
+"ah" = (/obj/effect/mob_spawn/human/bartender/alive,/turf/simulated/floor/plating,/area/ruin/powered/beach)
+"ai" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plating,/area/ruin/powered/beach)
+"aj" = (/turf/simulated/wall/mineral/sandstone,/area/ruin/powered/beach)
+"ak" = (/obj/structure/toilet,/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"al" = (/obj/structure/urinal{pixel_y = 32},/turf/simulated/floor/plating,/area/ruin/powered/beach)
+"am" = (/obj/structure/urinal{pixel_y = 32},/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"an" = (/obj/item/flashlight/lantern,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/ruin/powered/beach)
+"ao" = (/obj/structure/sink{dir = 4; pixel_x = 11},/obj/structure/mirror{pixel_x = 28},/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"ap" = (/obj/structure/flora/ausbushes/sparsegrass,/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"aq" = (/obj/structure/flora/ausbushes/sunnybush,/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"ar" = (/obj/machinery/disco{anchored = 1},/turf/simulated/floor/light/colour_cycle,/area/ruin/powered/beach)
+"as" = (/turf/simulated/floor/plating,/area/ruin/powered/beach)
+"at" = (/obj/item/tank/oxygen,/turf/simulated/floor/plating,/area/ruin/powered/beach)
+"au" = (/obj/structure/lattice,/turf/simulated/floor/pod/light,/area/ruin/powered/beach)
+"av" = (/obj/machinery/door/airlock/sandstone{name = "Lavatory"},/turf/simulated/floor/plating,/area/ruin/powered/beach)
+"aw" = (/obj/machinery/door/airlock/sandstone{name = "Bar Storage"},/turf/simulated/floor/wood,/area/ruin/powered/beach)
+"ax" = (/obj/structure/extinguisher_cabinet,/turf/simulated/wall/mineral/sandstone,/area/ruin/powered/beach)
+"ay" = (/obj/machinery/door/airlock/sandstone{name = "Restroom"},/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"az" = (/obj/item/clothing/accessory/necklace/dope,/obj/item/reagent_containers/spray/spraytan,/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"aA" = (/obj/item/reagent_containers/spray/spraytan,/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"aB" = (/obj/item/reagent_containers/spray/spraytan,/turf/simulated/floor/plating/asteroid{baseturf = /turf/simulated/floor/beach/sand},/area/ruin/powered/beach)
+"aC" = (/turf/simulated/floor/wood,/area/ruin/powered/beach)
+"aD" = (/obj/structure/table,/obj/machinery/light{dir = 1},/obj/machinery/chem_dispenser/soda,/turf/simulated/floor/wood,/area/ruin/powered/beach)
+"aE" = (/obj/structure/table,/obj/machinery/reagentgrinder,/turf/simulated/floor/wood,/area/ruin/powered/beach)
+"aF" = (/obj/machinery/vending/boozeomat{emagged = 1; req_access_txt = "0"},/turf/simulated/floor/wood,/area/ruin/powered/beach)
+"aH" = (/obj/structure/table,/obj/machinery/light{dir = 1},/obj/item/reagent_containers/food/drinks/shaker,/obj/item/reagent_containers/glass/rag,/turf/simulated/floor/wood,/area/ruin/powered/beach)
+"aI" = (/obj/structure/table,/obj/machinery/microwave,/turf/simulated/floor/wood,/area/ruin/powered/beach)
+"aJ" = (/obj/structure/closet/crate,/obj/item/tank/emergency_oxygen,/obj/item/trash/candy,/obj/item/toy/owl,/turf/simulated/floor/plating/asteroid{baseturf = /turf/simulated/floor/beach/sand},/area/ruin/powered/beach)
+"aM" = (/obj/structure/reagent_dispensers/beerkeg,/turf/simulated/floor/wood,/area/ruin/powered/beach)
+"aN" = (/obj/machinery/vending/cigarette,/turf/simulated/floor/plating/asteroid{baseturf = /turf/simulated/floor/beach/sand},/area/ruin/powered/beach)
+"aP" = (/obj/structure/table/wood,/turf/simulated/floor/wood,/area/ruin/powered/beach)
+"aQ" = (/obj/structure/table/wood,/obj/item/flashlight/lamp,/turf/simulated/floor/wood,/area/ruin/powered/beach)
+"aR" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/drinks/bottle/tequila,/turf/simulated/floor/wood,/area/ruin/powered/beach)
+"aS" = (/obj/machinery/processor,/turf/simulated/floor/wood,/area/ruin/powered/beach)
+"aT" = (/obj/machinery/vending/cola,/turf/simulated/floor/plating/asteroid{baseturf = /turf/simulated/floor/beach/sand},/area/ruin/powered/beach)
+"aU" = (/obj/effect/overlay/palmtree_l,/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"aV" = (/obj/effect/mob_spawn/human/beach/alive,/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"aW" = (/obj/structure/chair/stool,/turf/simulated/floor/plating/asteroid{baseturf = /turf/simulated/floor/beach/sand},/area/ruin/powered/beach)
+"aX" = (/obj/structure/closet/secure_closet/freezer/meat/open,/turf/simulated/floor/wood,/area/ruin/powered/beach)
+"aY" = (/obj/machinery/vending/snack,/turf/simulated/floor/plating/asteroid{baseturf = /turf/simulated/floor/beach/sand},/area/ruin/powered/beach)
+"aZ" = (/obj/effect/overlay/coconut,/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"bc" = (/obj/machinery/door/airlock/sandstone{name = "Bar Access"},/turf/simulated/floor/wood,/area/ruin/powered/beach)
+"bd" = (/obj/structure/closet/secure_closet/freezer/kitchen{req_access = null},/turf/simulated/floor/wood,/area/ruin/powered/beach)
+"bg" = (/obj/structure/sign/barsign,/turf/simulated/wall/mineral/sandstone,/area/ruin/powered/beach)
+"bx" = (/obj/structure/flora/rock,/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"bz" = (/mob/living/simple_animal/crab,/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"bA" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/item/bikehorn/airhorn,/obj/structure/table/wood,/obj/item/storage/firstaid/regular,/obj/item/storage/firstaid/brute,/turf/simulated/floor/wood,/area/ruin/powered/beach)
+"bB" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/chair/stool,/turf/simulated/floor/wood,/area/ruin/powered/beach)
+"bE" = (/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"bF" = (/obj/item/beach_ball,/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"bG" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/item/megaphone,/turf/simulated/floor/wood,/area/ruin/powered/beach)
+"bH" = (/obj/structure/window/reinforced{dir = 4},/obj/effect/mob_spawn/human/beach/alive/lifeguard,/turf/simulated/floor/wood,/area/ruin/powered/beach)
+"bJ" = (/obj/structure/chair,/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"bK" = (/obj/item/storage/backpack/duffel,/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"bM" = (/turf/simulated/floor/plasteel/stairs/old,/area/ruin/powered/beach)
+"bN" = (/obj/structure/flora/ausbushes/reedbush,/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"bO" = (/obj/item/camera,/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"bP" = (/obj/item/reagent_containers/food/drinks/cans/beer,/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"bQ" = (/obj/structure/flora/ausbushes/reedbush,/turf/simulated/floor/beach/coastline_t,/area/ruin/powered/beach)
+"bR" = (/turf/simulated/floor/beach/coastline_t,/area/ruin/powered/beach)
+"bS" = (/obj/structure/flora/ausbushes/sparsegrass,/turf/simulated/floor/beach/coastline_t,/area/ruin/powered/beach)
+"bT" = (/turf/simulated/floor/beach/coastline_b,/area/ruin/powered/beach)
+"bU" = (/turf/simulated/floor/beach/water,/area/ruin/powered/beach)
+"bV" = (/obj/structure/flora/ausbushes/stalkybush,/turf/simulated/floor/beach/water,/area/ruin/powered/beach)
+"bW" = (/turf/simulated/wall/r_wall,/area/ruin/powered/beach)
+"cd" = (/obj/machinery/light/small{dir = 1},/turf/simulated/wall/mineral/sandstone,/area/ruin/powered/beach)
+"ce" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"cj" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/plating/asteroid{baseturf = /turf/simulated/floor/beach/sand},/area/ruin/powered/beach)
+"cs" = (/obj/effect/overlay/palmtree_l,/obj/machinery/light{dir = 4},/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"ct" = (/obj/machinery/light,/turf/simulated/floor/beach/water,/area/ruin/powered/beach)
+"cR" = (/obj/structure/table/wood,/obj/item/tank/oxygen,/obj/item/pickaxe,/obj/item/clothing/mask/gas,/turf/simulated/floor/pod,/area/ruin/powered/beach)
+"gg" = (/obj/structure/table,/obj/item/storage/box/drinkingglasses,/obj/item/storage/box/drinkingglasses,/obj/item/storage/box/beakers,/obj/item/storage/box/donkpockets,/turf/simulated/floor/plating,/area/ruin/powered/beach)
+"hY" = (/obj/structure/table,/obj/machinery/chem_dispenser/beer,/turf/simulated/floor/wood,/area/ruin/powered/beach)
+"lF" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/pod{oxygen = 14; nitrogen = 23; temperature = 300},/area/ruin/powered/beach)
+"lM" = (/obj/structure/dresser,/turf/simulated/floor/pod,/area/ruin/powered/beach)
+"mh" = (/obj/effect/spawner/window,/turf/simulated/floor/plating,/area/ruin/powered/beach)
+"pg" = (/obj/machinery/shower{dir = 4},/turf/simulated/floor/pod/light,/area/ruin/powered/beach)
+"pI" = (/obj/machinery/door/airlock/hatch{name = "Lava Beach Club"},/obj/structure/fans/tiny,/turf/simulated/floor/pod,/area/ruin/powered/beach)
+"qa" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/pod,/area/ruin/powered/beach)
+"qT" = (/obj/machinery/shower{dir = 8},/turf/simulated/floor/pod/light,/area/ruin/powered/beach)
+"zw" = (/obj/structure/closet/athletic_mixed,/turf/simulated/floor/pod,/area/ruin/powered/beach)
+"Bl" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"Ec" = (/obj/machinery/door/airlock/sandstone{name = "Beach Access"},/turf/simulated/floor/pod,/area/ruin/powered/beach)
+"Ga" = (/turf/simulated/floor/plating/asteroid{baseturf = /turf/simulated/floor/beach/sand},/area/ruin/powered/beach)
+"Gc" = (/turf/simulated/floor/pod/light,/area/ruin/powered/beach)
+"HC" = (/obj/structure/rack,/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/turf/simulated/floor/pod,/area/ruin/powered/beach)
+"QS" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/beach/sand,/area/ruin/powered/beach)
+"TP" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/pod{oxygen = 14; nitrogen = 23; temperature = 300},/area/ruin/powered/beach)
+"VO" = (/turf/simulated/floor/pod,/area/ruin/powered/beach)
+"Xp" = (/obj/machinery/light/small{light_power = 3; dir = 8},/turf/simulated/floor/pod,/area/ruin/powered/beach)
(1,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-lF
-aa
-bW
-bW
-bW
-pI
-bW
-pI
-bW
-bW
-bW
-aa
-lF
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaabWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWaaaaaaaaaaaa
+aaaaaaaabWbWbWadbWaeafagahaicdakajalamanaobWapbWbWbWaaaaaaaa
+aaaaaabWbWaqbEbEbWggasasasatajbEavasasbEbEbWbEbEaqbWbWaaaaaa
+aaaabWbWadbEapbEbWbWajawajaxajajajajajajaybWbEapbEapbWbWaaaa
+aaaabWapbEbEazbEceGaajaCaDhYaFaEaHaIajaJGacebEbEbEbEadbWaaaa
+aabWbWbEbEbEbEbEbEGaajaCaCaCaCaCaCaMajaNGabEbEbEbEbEbEbWbWaa
+aabWapbEabbEabbEbEGaajaPaQaPaRajaCaSajaTGabEbEaUbEaqbEapbWaa
+aabWBlbEbEaVbEbEbEGaGaaWaWaWaWajaCaXajaYGabEbEaAaZaVbEQSbWaa
+lFbWbEbEacbEacbEbEGaGaGaGaGaGabcaCbdajGaGabEbEbEbEbEbEapbWTP
+aabWbEbEbEbEbEbEbEGaGaGaarGaGaajbgajajGaGabEbEbEbEbEbEbEbWaa
+bWbWbWbWBlbEbEbEbEGaGaGaGaGaGacjGaGacjGaGabEbEbzbEQSbWbWbWbW
+bWzwHCmhbEbEbEbEbEaBGaGaGaGaGaGaGaGaGaGaGabEbEbEbEbEmhzwHCbW
+bWXpVOmhbEbEaUbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEmhVOqabW
+pIGcGcmhBlbEaZbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEQSmhGcGcpI
+bWpgGcEcbEbEbEbEbEbEbEbEbxapbEbEbEaZbEbEbEbEbEbEbEbEEcGcqTbW
+pIGcGcmhBlbEbEbEbEapbEapbEbEbEbEaUbEbEbEbEbEbEbEbEQSmhGcGcpI
+bWXpVOmhbEbzbEbEapbxbEbEbEbEbEbEbEbEbEbAbBbEbEaZbEbEmhVOqabW
+bWcRlMmhbEbEbEbEbEbEbEbEbEbEaAbEbEbFQSbGbHbEbEbEbEbEmhlMcRbW
+bWbWbWbWBlbJbEbJbEbJbEbJbKbJbEbJbEbEbEaubMbEbJbEbEcsbWbWbWbW
+aabWadapbNbEbEaAbObEbEbEbEbEbEbEbEbzbEbEbEbPbEbEbEbEapbNbWaa
+lFbWbQbRbRbSbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbSbRbRbRbWTP
+aabWbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbWaa
+aabWbWbUbUbUbUbUbUbUbUbUbUbUbUbUbUbUbUbUbUbUbUbUbUbUbUbWbWaa
+aaaabWctbUbUbUbUbUbUbUbUbUbUbUbUbVbUbUbUbUbUbUbUbUbUctbWaaaa
+aaaabWbWbUbUbUbUbUbVbUbUbUbUbUbUbUbUbUbUbUbUbUbUbUbUbWbWaaaa
+aaaaaabWbWbUctbUbUbUbUbUbUbUbUbUbUbUbUbUbUbVbUctbUbWbWaaaaaa
+aaaaaaaabWbWbWbUbUbUbUctbUbUbUbUbUctbUbUbUbUbUbWbWbWaaaaaaaa
+aaaaaaaaaaaabWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
"}
-(2,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-bW
-bW
-bW
-bW
-bW
-bW
-vl
-iw
-wY
-pg
-wY
-Xp
-cR
-bW
-bW
-bW
-bW
-bW
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(3,1,1) = {"
-aa
-aa
-aa
-aa
-bW
-bW
-bW
-ap
-cg
-ar
-ar
-bW
-HC
-VO
-Gc
-Gc
-wY
-VO
-lM
-bW
-ad
-bQ
-bT
-bW
-bW
-bW
-aa
-aa
-aa
-aa
-"}
-(4,1,1) = {"
-aa
-aa
-aa
-bW
-bW
-ap
-ar
-ar
-ar
-ar
-ar
-bW
-mh
-mh
-mh
-dw
-mh
-mh
-mh
-bW
-ap
-bR
-bT
-bU
-ct
-bW
-bW
-aa
-aa
-aa
-"}
-(5,1,1) = {"
-aa
-aa
-bW
-bW
-ad
-ar
-ar
-aO
-ar
-bb
-ar
-cg
-ar
-ar
-Bl
-aA
-Bl
-ar
-ar
-cg
-bN
-bR
-bT
-bU
-bU
-bU
-bW
-bW
-aa
-aa
-"}
-(6,1,1) = {"
-aa
-aa
-bW
-aq
-ar
-ar
-ar
-ar
-aV
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-bz
-ar
-bJ
-ar
-bS
-bT
-bU
-bU
-bU
-bU
-bW
-aa
-aa
-"}
-(7,1,1) = {"
-aa
-bW
-bW
-ar
-ap
-az
-ar
-aO
-ar
-bb
-ar
-ar
-ar
-aU
-aZ
-ar
-ar
-ar
-ar
-ar
-ar
-bR
-bT
-bU
-bU
-bU
-ct
-bW
-bW
-aa
-"}
-(8,1,1) = {"
-aa
-bW
-ad
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-bJ
-bE
-bR
-bT
-bU
-bU
-bU
-bU
-bU
-bW
-aa
-"}
-(9,1,1) = {"
-aa
-bW
-bW
-bW
-bW
-ce
-aA
-aA
-aA
-aA
-aA
-aA
-aA
-aA
-ar
-ar
-ar
-ap
-ar
-ar
-bO
-bR
-bT
-bU
-bU
-bU
-bU
-bU
-bW
-aa
-"}
-(10,1,1) = {"
-aa
-bW
-ae
-gg
-bW
-aB
-aK
-aK
-aK
-aK
-aK
-aK
-yp
-aA
-ar
-ar
-ap
-bx
-ar
-bJ
-ar
-bR
-bT
-bU
-bU
-bV
-bU
-bU
-bW
-aa
-"}
-(11,1,1) = {"
-aa
-bW
-af
-as
-aj
-aj
-aj
-aj
-aB
-aK
-aK
-aK
-aK
-aA
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-bR
-bT
-bU
-bU
-bU
-bU
-bU
-bW
-aa
-"}
-(12,1,1) = {"
-aa
-bW
-ag
-as
-aw
-aC
-aC
-aP
-aW
-aK
-Ga
-aK
-aK
-aA
-ar
-ar
-ap
-ar
-ar
-bJ
-ar
-bR
-bT
-bU
-bU
-bU
-bU
-ct
-bW
-aa
-"}
-(13,1,1) = {"
-aa
-bW
-ah
-as
-aj
-aD
-aC
-aQ
-aW
-oK
-sO
-bl
-aK
-aA
-ar
-bx
-ar
-ar
-ar
-bK
-ar
-bR
-bT
-bU
-bU
-bU
-bU
-bU
-bW
-aa
-"}
-(14,1,1) = {"
-aa
-bW
-ai
-at
-ax
-hY
-aC
-aP
-aW
-aK
-sy
-aK
-aK
-aA
-ar
-ap
-ar
-ar
-ar
-bJ
-ar
-bR
-bT
-bU
-bU
-bU
-bU
-bU
-bW
-aa
-"}
-(15,1,1) = {"
-aa
-bW
-cd
-aj
-aj
-aF
-aC
-aR
-aW
-aK
-aK
-aK
-aK
-aA
-ar
-ar
-ar
-ar
-bE
-ar
-ar
-bR
-bT
-bU
-bU
-bU
-bU
-bU
-bW
-aa
-"}
-(16,1,1) = {"
-aa
-bW
-ak
-au
-aj
-aE
-aC
-aj
-aj
-bc
-aj
-cj
-aK
-aA
-ar
-ar
-ar
-ar
-ar
-bJ
-ar
-bR
-bT
-bU
-bU
-bU
-bU
-bU
-bW
-aa
-"}
-(17,1,1) = {"
-aa
-bW
-aj
-av
-aj
-aH
-aC
-aC
-aC
-aC
-bg
-aB
-aK
-aA
-ar
-ar
-aU
-ar
-ar
-ar
-ar
-bR
-bT
-bU
-bV
-bU
-bU
-bU
-bW
-aa
-"}
-(18,1,1) = {"
-aa
-bW
-al
-as
-aj
-aI
-aM
-aS
-aX
-bd
-aj
-aB
-aK
-aA
-ar
-aZ
-ar
-ar
-bF
-ar
-bz
-bR
-bT
-bU
-bU
-bU
-bU
-ct
-bW
-aa
-"}
-(19,1,1) = {"
-aa
-bW
-am
-as
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-cj
-aK
-aA
-ar
-ar
-ar
-ar
-ch
-ar
-ar
-bR
-bT
-bU
-bU
-bU
-bU
-bU
-bW
-aa
-"}
-(20,1,1) = {"
-aa
-bW
-an
-au
-aj
-aJ
-aN
-aT
-aY
-aK
-aK
-aK
-aK
-aA
-ar
-ar
-ar
-bA
-bG
-bL
-ar
-bR
-bT
-bU
-bU
-bU
-bU
-bU
-bW
-aa
-"}
-(21,1,1) = {"
-aa
-bW
-ao
-au
-ay
-aK
-aK
-aK
-aK
-aK
-aK
-aK
-aK
-aA
-ar
-ar
-ar
-bB
-bH
-bM
-ar
-bR
-bT
-bU
-bU
-bU
-bU
-bU
-bW
-aa
-"}
-(22,1,1) = {"
-aa
-bW
-bW
-bW
-bW
-ce
-aA
-aA
-aA
-aA
-aA
-aA
-aA
-aA
-ar
-ar
-ar
-ar
-ar
-ar
-bP
-bR
-bT
-bU
-bU
-bU
-bV
-bU
-bW
-aa
-"}
-(23,1,1) = {"
-aa
-bW
-ap
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-bJ
-ar
-bR
-bT
-bU
-bU
-bU
-bU
-bU
-bW
-aa
-"}
-(24,1,1) = {"
-aa
-bW
-bW
-ar
-ap
-ar
-ar
-aU
-bE
-ar
-ar
-bz
-ar
-ar
-ar
-ar
-ar
-aZ
-ar
-ar
-ar
-bR
-bT
-bU
-bU
-bU
-ct
-bW
-bW
-aa
-"}
-(25,1,1) = {"
-aa
-aa
-bW
-aq
-ar
-ar
-ar
-ar
-aZ
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-bS
-bT
-bU
-bU
-bU
-bU
-bW
-aa
-aa
-"}
-(26,1,1) = {"
-aa
-aa
-bW
-bW
-ap
-ar
-ar
-aq
-aV
-be
-ar
-ch
-ar
-ar
-QS
-aA
-QS
-ar
-ar
-cs
-ar
-bR
-bT
-bU
-bU
-bU
-bW
-bW
-aa
-aa
-"}
-(27,1,1) = {"
-aa
-aa
-aa
-bW
-bW
-ad
-ar
-ar
-ar
-ar
-ar
-bW
-mh
-mh
-mh
-Ec
-mh
-mh
-mh
-bW
-ap
-bR
-bT
-bU
-ct
-bW
-bW
-aa
-aa
-aa
-"}
-(28,1,1) = {"
-aa
-aa
-aa
-aa
-bW
-bW
-bW
-ap
-ch
-ap
-ar
-bW
-zw
-VO
-wY
-Gc
-Gc
-jF
-lM
-bW
-bN
-bR
-bT
-bW
-bW
-bW
-aa
-aa
-aa
-aa
-"}
-(29,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-bW
-bW
-bW
-bW
-bW
-bW
-HC
-qa
-wY
-qT
-Gc
-pU
-cR
-bW
-bW
-bW
-bW
-bW
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(30,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-TP
-aa
-bW
-bW
-bW
-pI
-bW
-pI
-bW
-bW
-bW
-aa
-TP
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
\ No newline at end of file
diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm
index 29f316398a0..b3262383e5e 100644
--- a/code/controllers/master_controller.dm
+++ b/code/controllers/master_controller.dm
@@ -56,7 +56,7 @@ var/global/pipe_processing_killed = 0
var/mining_type = MINETYPE
if (mining_type == "lavaland")
- seedRuins(list(5), config.lavaland_budget, /area/lavaland/surface/outdoors, lava_ruins_templates)
+ seedRuins(5, config.lavaland_budget, /area/lavaland/surface/outdoors, lava_ruins_templates)
spawn_rivers()
else
make_mining_asteroid_secret()
diff --git a/code/datums/diseases/critical.dm b/code/datums/diseases/critical.dm
index 82748802cce..21a82dc9eac 100644
--- a/code/datums/diseases/critical.dm
+++ b/code/datums/diseases/critical.dm
@@ -92,6 +92,12 @@
bypasses_immunity = TRUE
virus_heal_resistant = TRUE
+/datum/disease/has_cure()
+ if (affected_mob.has_status_effect(STATUS_EFFECT_EXERCISED))
+ return TRUE
+
+ return ..()
+
/datum/disease/critical/heart_failure/stage_act()
if(..())
switch(stage)
diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm
index c13c17d6153..2b288d38904 100644
--- a/code/datums/ruins/lavaland.dm
+++ b/code/datums/ruins/lavaland.dm
@@ -1,6 +1,13 @@
/datum/map_template/ruin/lavaland
- prefix = "_maps/RandomRuins/LavaRuins/"
+ prefix = "_maps/map_files/RandomRuins/LavaRuins/"
/datum/map_template/ruin/lavaland/biodome
cost = 5
- allow_duplicates = FALSE
\ No newline at end of file
+ allow_duplicates = FALSE
+
+/datum/map_template/ruin/lavaland/biodome/beach
+ name = "Biodome Beach"
+ id = "biodome-beach"
+ description = "Seemingly plucked from a tropical destination, this beach is calm and cool, with the salty waves roaring softly in the background. \
+ Comes with a rustic wooden bar and suicidal bartender."
+ suffix = "lavaland_biodome_beach.dmm"
diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
index 26d8ec67ef0..dd2e326b6cd 100644
--- a/code/datums/status_effects/buffs.dm
+++ b/code/datums/status_effects/buffs.dm
@@ -38,4 +38,9 @@
/datum/status_effect/void_price/tick()
playsound(owner, 'sound/weapons/bite.ogg', 50, 1)
- owner.adjustBruteLoss(3)
\ No newline at end of file
+ owner.adjustBruteLoss(3)
+
+/datum/status_effect/exercised
+ id = "Exercised"
+ duration = 1200
+ alert_type = null
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index 6b08e2e4e49..535d863b2fd 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -378,6 +378,13 @@
item_color = "necklace"
slot_flags = SLOT_TIE
+/obj/item/clothing/accessory/necklace/dope
+ name = "gold necklace"
+ desc = "Damn, it feels good to be a gangster."
+ icon_state = "bling"
+ item_color = "bling"
+ item_color = "bling"
+
/obj/item/clothing/accessory/necklace/locket
name = "gold locket"
desc = "A gold locket that seems to have space for a photo within."
diff --git a/code/modules/reagents/chemistry/reagents/misc.dm b/code/modules/reagents/chemistry/reagents/misc.dm
index 9277ba33fd9..f37bceb0f6b 100644
--- a/code/modules/reagents/chemistry/reagents/misc.dm
+++ b/code/modules/reagents/chemistry/reagents/misc.dm
@@ -632,3 +632,50 @@
description = "Ewwwwwwwww."
reagent_state = LIQUID
color = "#857400"
+
+/datum/reagent/spraytan
+ name = "Spray Tan"
+ id = "spraytan"
+ description = "A substance applied to the skin to darken the skin."
+ color = "#FFC080" // rgb: 255, 196, 128 Bright orange
+ metabolization_rate = 10 * REAGENTS_METABOLISM // very fast, so it can be applied rapidly. But this changes on an overdose
+ overdose_threshold = 11 //Slightly more than one un-nozzled spraybottle.
+ taste_message = "sour oranges"
+
+/datum/reagent/spraytan/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
+ if(ishuman(M))
+ if(method == TOUCH)
+ var/mob/living/carbon/human/N = M
+ set_skin_color(N)
+
+ if(method == INGEST)
+ if(show_message)
+ to_chat(M, "That tasted horrible.")
+ ..()
+
+/datum/reagent/spraytan/overdose_process(mob/living/M)
+ metabolization_rate = 1 * REAGENTS_METABOLISM
+
+ if(ishuman(M) && is_species(M, /datum/species/human))
+ var/mob/living/carbon/human/N = M
+ N.change_hair("Spiky")
+ N.change_facial_hair("Shaved")
+ N.change_hair_color("#000000")
+ N.change_facial_hair_color("#000000")
+ set_skin_color(N)
+ if(prob(7))
+ if(N.w_uniform)
+ M.visible_message(pick("[M]'s collar pops up without warning.", "[M] flexes [M.p_their()] arms."))
+ else
+ M.visible_message("[M] flexes [M.p_their()] arms.")
+ if(prob(10))
+ M.say(pick("Shit was SO cash.", "You are everything bad in the world.", "What sports do you play, other than 'jack off to naked drawn Japanese people?'", "Don’t be a stranger. Just hit me with your best shot.", "My name is John and I hate every single one of you."))
+
+ return list(0, STATUS_UPDATE_NONE)
+
+/datum/reagent/spraytan/proc/set_skin_color(mob/living/carbon/human/H)
+ if(H.dna.species.bodyflags & HAS_SKIN_TONE)
+ H.change_skin_tone(-30)
+
+ if(H.dna.species.bodyflags & HAS_SKIN_COLOR) //take current alien color and darken it slightly
+ H.change_skin_color("#9B7653")
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 7c0823c2497..d8ee5d88309 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -112,6 +112,13 @@
volume = 50
list_reagents = list("cleaner" = 50)
+//spray tan
+/obj/item/reagent_containers/spray/spraytan
+ name = "spray tan"
+ volume = 50
+ desc = "Gyaro brand spray tan. Do not spray near eyes or other orifices."
+ list_reagents = list("spraytan" = 50)
+
//pepperspray
/obj/item/reagent_containers/spray/pepper
name = "pepperspray"
diff --git a/code/modules/ruins/objects_and_mobs/gym.dm b/code/modules/ruins/objects_and_mobs/gym.dm
index c4831e8899d..69abf1a7e88 100644
--- a/code/modules/ruins/objects_and_mobs/gym.dm
+++ b/code/modules/ruins/objects_and_mobs/gym.dm
@@ -16,7 +16,6 @@
playsound(loc, pick(hit_sounds), 25, 1, -1)
if(isliving(user))
var/mob/living/L = user
- SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "exercise", /datum/mood_event/exercise)
L.apply_status_effect(STATUS_EFFECT_EXERCISED)
/obj/structure/weightmachine
@@ -33,21 +32,21 @@
. = ..()
if(.)
return
- if(obj_flags & IN_USE)
+ if(in_use)
to_chat(user, "It's already in use - wait a bit.")
return
else
- obj_flags |= IN_USE
+ in_use = TRUE
icon_state = icon_state_inuse
user.setDir(SOUTH)
- user.Stun(80)
+ user.Stun(4)
user.forceMove(src.loc)
var/bragmessage = pick("pushing it to the limit","going into overdrive","burning with determination","rising up to the challenge", "getting strong now","getting ripped")
user.visible_message("[user] is [bragmessage]!")
AnimateMachine(user)
playsound(user, 'sound/machines/click.ogg', 60, 1)
- obj_flags &= ~IN_USE
+ in_use = FALSE
user.pixel_y = 0
var/finishmessage = pick("You feel stronger!","You feel like you can take on the world!","You feel robust!","You feel indestructible!")
icon_state = initial(icon_state)
diff --git a/code/modules/vehicle/vehicle.dm b/code/modules/vehicle/vehicle.dm
index bdd8c2a9608..fc2ea3b4600 100644
--- a/code/modules/vehicle/vehicle.dm
+++ b/code/modules/vehicle/vehicle.dm
@@ -3,7 +3,7 @@
name = "vehicle"
desc = "A basic vehicle, vroom"
icon = 'icons/obj/vehicles.dmi'
- icon_state = "fuckyou"
+ icon_state = "scooter"
density = 1
anchored = 0
can_buckle = 1
diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi
index 1b9ca75d1a7..4431d7a9afb 100644
Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ
diff --git a/paradise.dme b/paradise.dme
index 5615013e367..9aab950706c 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -131,6 +131,7 @@
#include "code\_onclick\hud\alert.dm"
#include "code\_onclick\hud\alien.dm"
#include "code\_onclick\hud\alien_larva.dm"
+#include "code\_onclick\hud\blob_overmind.dm"
#include "code\_onclick\hud\bot.dm"
#include "code\_onclick\hud\constructs.dm"
#include "code\_onclick\hud\devil.dm"
@@ -278,6 +279,7 @@
#include "code\datums\diseases\brainrot.dm"
#include "code\datums\diseases\cold.dm"
#include "code\datums\diseases\cold9.dm"
+#include "code\datums\diseases\critical.dm"
#include "code\datums\diseases\fake_gbs.dm"
#include "code\datums\diseases\flu.dm"
#include "code\datums\diseases\fluspanish.dm"
@@ -833,6 +835,7 @@
#include "code\game\objects\items\devices\flash.dm"
#include "code\game\objects\items\devices\flashlight.dm"
#include "code\game\objects\items\devices\floor_painter.dm"
+#include "code\game\objects\items\devices\handheld_defib.dm"
#include "code\game\objects\items\devices\instruments.dm"
#include "code\game\objects\items\devices\laserpointer.dm"
#include "code\game\objects\items\devices\lightreplacer.dm"
@@ -1740,7 +1743,6 @@
#include "code\modules\mob\living\carbon\human\logout.dm"
#include "code\modules\mob\living\carbon\human\npcs.dm"
#include "code\modules\mob\living\carbon\human\say.dm"
-#include "code\modules\mob\living\carbon\human\shock.dm"
#include "code\modules\mob\living\carbon\human\status_procs.dm"
#include "code\modules\mob\living\carbon\human\update_icons.dm"
#include "code\modules\mob\living\carbon\human\update_stat.dm"
@@ -2282,6 +2284,7 @@
#include "code\modules\response_team\ert.dm"
#include "code\modules\response_team\ert_outfits.dm"
#include "code\modules\ruins\ruin_areas.dm"
+#include "code\modules\ruins\objects_and_mobs\gym.dm"
#include "code\modules\ruins\objects_and_mobs\necropolis_gate.dm"
#include "code\modules\security_levels\keycard authentication.dm"
#include "code\modules\security_levels\security levels.dm"