Largely finish up beach ruin

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()

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)

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
+	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"

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)
+	owner.adjustBruteLoss(3)
+
+/datum/status_effect/exercised
+	id = "Exercised"
+	duration = 1200
+	alert_type = null

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."

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, "<span class='notice'>That tasted horrible.</span>")
+	..()
+
+/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("<b>[M]</b>'s collar pops up without warning.</span>", "<b>[M]</b> flexes [M.p_their()] arms."))
+			else
+				M.visible_message("<b>[M]</b> 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")

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"

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("<B>[user] is [bragmessage]!</B>")
 		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)

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

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"