module things, jfc

code/modules/mining/lavaland/ash_flora.dm

@@ -152,6 +152,7 @@
 	resistance_flags = FLAMMABLE
 	max_integrity = 100
 	seed = /obj/item/seeds/lavaland/polypore
+	wine_power = 20
 
 /obj/item/reagent_containers/food/snacks/grown/ash_flora/Initialize()
 	. = ..()
@@ -167,7 +168,7 @@
 	list_reagents = list("nutriment" = 3, "vitfro" = 2, "nicotine" = 2)
 	icon_state = "mushroom_leaf"
 	seed = /obj/item/seeds/lavaland/porcini
-
+	wine_power = 40
 
 /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_cap
 	name = "mushroom cap"
@@ -175,7 +176,7 @@
 	list_reagents = list("mindbreaker" = 2, "entpoly" = 4, "mushroomhallucinogen" = 2)
 	icon_state = "mushroom_cap"
 	seed = /obj/item/seeds/lavaland/inocybe
-
+	wine_power = 70
 
 /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_stem
 	name = "mushroom stem"
@@ -184,6 +185,7 @@
 	icon_state = "mushroom_stem"
 	light_range = 1
 	seed = /obj/item/seeds/lavaland/ember
+	wine_power = 60
 
 /obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit
 	name = "cactus fruit"
@@ -191,6 +193,7 @@
 	desc = "A cactus fruit covered in a thick, reddish skin. And some ash."
 	icon_state = "cactus_fruit"
 	seed = /obj/item/seeds/lavaland/cactus
+	wine_power = 50
 
 /obj/item/reagent_containers/glass/bowl/mushroom_bowl
 	name = "mushroom bowl"

code/modules/mining/lavaland/necropolis_chests.dm

@@ -164,22 +164,22 @@
 	var/failText = "<span class='warning'>The snake seems unsatisfied with your incomplete oath and returns to it's previous place on the rod, returning to its dormant, wooden state. You must stand still while completing your oath!</span>"
 	to_chat(itemUser, "<span class='notice'>The wooden snake that was carved into the rod seems to suddenly come alive and begins to slither down your arm! The compulsion to help others grows abnormally strong...</span>")
 	if(do_after(itemUser, 40, target = itemUser))
-		itemUser.say("I swear to fulfill, to the best of my ability and judgment, this covenant:")
+		itemUser.say("I swear to fulfill, to the best of my ability and judgment, this covenant:", forced = "hippocratic oath")
 	else
 		to_chat(itemUser, failText)
 		return
 	if(do_after(itemUser, 20, target = itemUser))
-		itemUser.say("I will apply, for the benefit of the sick, all measures that are required, avoiding those twin traps of overtreatment and therapeutic nihilism.")
+		itemUser.say("I will apply, for the benefit of the sick, all measures that are required, avoiding those twin traps of overtreatment and therapeutic nihilism.", forced = "hippocratic oath")
 	else
 		to_chat(itemUser, failText)
 		return
 	if(do_after(itemUser, 30, target = itemUser))
-		itemUser.say("I will remember that I remain a member of society, with special obligations to all my fellow human beings, those sound of mind and body as well as the infirm.")
+		itemUser.say("I will remember that I remain a member of society, with special obligations to all my fellow human beings, those sound of mind and body as well as the infirm.", forced = "hippocratic oath")
 	else
 		to_chat(itemUser, failText)
 		return
 	if(do_after(itemUser, 30, target = itemUser))
-		itemUser.say("If I do not violate this oath, may I enjoy life and art, respected while I live and remembered with affection thereafter. May I always act so as to preserve the finest traditions of my calling and may I long experience the joy of healing those who seek my help.")
+		itemUser.say("If I do not violate this oath, may I enjoy life and art, respected while I live and remembered with affection thereafter. May I always act so as to preserve the finest traditions of my calling and may I long experience the joy of healing those who seek my help.", forced = "hippocratic oath")
 	else
 		to_chat(itemUser, failText)
 		return
@@ -434,10 +434,11 @@
 
 //Immortality Talisman
 /obj/item/immortality_talisman
-	name = "Immortality Talisman"
+	name = "\improper Immortality Talisman"
 	desc = "A dread talisman that can render you completely invulnerable."
 	icon = 'icons/obj/lavaland/artefacts.dmi'
 	icon_state = "talisman"
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 	actions_types = list(/datum/action/item_action/immortality)
 	var/cooldown = 0
 
@@ -448,12 +449,6 @@
 /datum/action/item_action/immortality
 	name = "Immortality"
 
-/obj/item/immortality_talisman/Destroy(force)
-	if(force)
-		. = ..()
-	else
-		return QDEL_HINT_LETMELIVE
-
 /obj/item/immortality_talisman/attack_self(mob/user)
 	if(cooldown < world.time)
 		SSblackbox.record_feedback("amount", "immortality_talisman_uses", 1)
@@ -467,6 +462,8 @@
 		user.notransform = 1
 		user.status_flags |= GODMODE
 		addtimer(CALLBACK(src, .proc/return_to_reality, user, Z), 100)
+	else
+		to_chat(user, "<span class='warning'>[src] is not ready yet!</span>")
 
 /obj/item/immortality_talisman/proc/return_to_reality(mob/user, obj/effect/immortality_talisman/Z)
 	user.status_flags &= ~GODMODE
@@ -899,7 +896,7 @@
 	var/static/list/banned_turfs = typecacheof(list(/turf/open/space/transit, /turf/closed))
 
 /obj/item/lava_staff/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
-	..()
+	. = ..()
 	if(timer > world.time)
 		return
 
@@ -975,7 +972,7 @@
 	to_chat(user, "<span class='notice'>You shatter the bottle!</span>")
 	playsound(user.loc, 'sound/effects/glassbr1.ogg', 100, 1)
 	message_admins("<span class='adminnotice'>[ADMIN_LOOKUPFLW(user)] has activated a bottle of mayhem!</span>")
-	add_logs(user, null, "activated a bottle of mayhem", src)
+	log_combat(user, null, "activated a bottle of mayhem", src)
 	qdel(src)
 
 /obj/item/blood_contract
@@ -1019,7 +1016,7 @@
 	var/datum/objective/survive/survive = new
 	survive.owner = L.mind
 	L.mind.objectives += survive
-	add_logs(user, L, "took out a blood contract on", src)
+	log_combat(user, L, "took out a blood contract on", src)
 	to_chat(L, "<span class='userdanger'>You've been marked for death! Don't let the demons get you! KILL THEM ALL!</span>")
 	L.add_atom_colour("#FF0000", ADMIN_COLOUR_PRIORITY)
 	var/obj/effect/mine/pickup/bloodbath/B = new(L)
@@ -1082,7 +1079,7 @@
 	to_chat(user, "<span class='hierophant_warning'>The[beacon ? " beacon is not currently":"re is a beacon"] attached.</span>")
 
 /obj/item/hierophant_club/suicide_act(mob/living/user)
-	say("Xverwpsgexmrk...")
+	say("Xverwpsgexmrk...", forced = "hierophant club suicide")
 	user.visible_message("<span class='suicide'>[user] holds [src] into the air! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	new/obj/effect/temp_visual/hierophant/telegraph(get_turf(user))
 	playsound(user,'sound/machines/airlockopen.ogg', 75, TRUE)
@@ -1097,7 +1094,7 @@
 	qdel(user)
 
 /obj/item/hierophant_club/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
-	..()
+	. = ..()
 	var/turf/T = get_turf(target)
 	if(!T || timer > world.time)
 		return
@@ -1105,7 +1102,7 @@
 	timer = world.time + CLICK_CD_MELEE //by default, melee attacks only cause melee blasts, and have an accordingly short cooldown
 	if(proximity_flag)
 		INVOKE_ASYNC(src, .proc/aoe_burst, T, user)
-		add_logs(user, target, "fired 3x3 blast at", src)
+		log_combat(user, target, "fired 3x3 blast at", src)
 	else
 		if(ismineralturf(target) && get_dist(user, target) < 6) //target is minerals, we can hit it(even if we can't see it)
 			INVOKE_ASYNC(src, .proc/cardinal_blasts, T, user)
@@ -1117,10 +1114,10 @@
 				var/obj/effect/temp_visual/hierophant/chaser/C = new(get_turf(user), user, target, chaser_speed, friendly_fire_check)
 				C.damage = 30
 				C.monster_damage_boost = FALSE
-				add_logs(user, target, "fired a chaser at", src)
+				log_combat(user, target, "fired a chaser at", src)
 			else
 				INVOKE_ASYNC(src, .proc/cardinal_blasts, T, user) //otherwise, just do cardinal blast
-				add_logs(user, target, "fired cardinal blast at", src)
+				log_combat(user, target, "fired cardinal blast at", src)
 		else
 			to_chat(user, "<span class='warning'>That target is out of range!</span>" )
 			timer = world.time
@@ -1232,7 +1229,7 @@
 			INVOKE_ASYNC(src, .proc/prepare_icon_update)
 			beacon.icon_state = "hierophant_tele_off"
 			return
-		add_logs(user, beacon, "teleported self from [AREACOORD(source)] to")
+		user.log_message("teleported self from [AREACOORD(source)] to [beacon]")
 		new /obj/effect/temp_visual/hierophant/telegraph/teleport(T, user)
 		new /obj/effect/temp_visual/hierophant/telegraph/teleport(source, user)
 		for(var/t in RANGE_TURFS(1, T))
@@ -1279,7 +1276,7 @@
 		return
 	M.visible_message("<span class='hierophant_warning'>[M] fades in!</span>")
 	if(user != M)
-		add_logs(user, M, "teleported", null, "from [AREACOORD(source)]")
+		log_combat(user, M, "teleported", null, "from [AREACOORD(source)]")
 
 /obj/item/hierophant_club/proc/cardinal_blasts(turf/T, mob/living/user) //fire cardinal cross blasts with a delay
 	if(!T)

code/modules/mining/lavaland/ruins/gym.dm

@@ -16,17 +16,20 @@
 	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/stacklifter
+/obj/structure/weightmachine
 	name = "Weight Machine"
 	desc = "Just looking at this thing makes you feel tired."
-	icon = 'goon/icons/obj/fitness.dmi'
-	icon_state = "fitnesslifter"
 	density = TRUE
 	anchored = TRUE
+	var/icon_state_inuse
 
-/obj/structure/stacklifter/attack_hand(mob/living/user)
+/obj/structure/weightmachine/proc/AnimateMachine(mob/living/user)
+	return
+
+/obj/structure/weightmachine/attack_hand(mob/living/user)
 	. = ..()
 	if(.)
 		return
@@ -35,76 +38,58 @@
 		return
 	else
 		obj_flags |= IN_USE
-		icon_state = "fitnesslifter2"
+		icon_state = icon_state_inuse
 		user.setDir(SOUTH)
 		user.Stun(80)
 		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>")
-		var/lifts = 0
-		while (lifts++ < 6)
-			if (user.loc != src.loc)
-				break
-			sleep(3)
-			animate(user, pixel_y = -2, time = 3)
-			sleep(3)
-			animate(user, pixel_y = -4, time = 3)
-			sleep(3)
-			playsound(user, 'goon/sound/effects/spring.ogg', 60, 1)
+		AnimateMachine(user)
 
 		playsound(user, 'sound/machines/click.ogg', 60, 1)
 		obj_flags &= ~IN_USE
 		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 = "fitnesslifter"
+		SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "exercise", /datum/mood_event/exercise)
+		icon_state = initial(icon_state)
 		to_chat(user, finishmessage)
 		user.apply_status_effect(STATUS_EFFECT_EXERCISED)
 
-/obj/structure/weightlifter
-	name = "Weight Machine"
-	desc = "Just looking at this thing makes you feel tired."
+/obj/structure/weightmachine/stacklifter
+	icon = 'goon/icons/obj/fitness.dmi'
+	icon_state = "fitnesslifter"
+	icon_state_inuse = "fitnesslifter2"
+
+/obj/structure/weightmachine/stacklifter/AnimateMachine(mob/living/user)
+	var/lifts = 0
+	while (lifts++ < 6)
+		if (user.loc != src.loc)
+			break
+		sleep(3)
+		animate(user, pixel_y = -2, time = 3)
+		sleep(3)
+		animate(user, pixel_y = -4, time = 3)
+		sleep(3)
+		playsound(user, 'goon/sound/effects/spring.ogg', 60, 1)
+
+/obj/structure/weightmachine/weightlifter
 	icon = 'goon/icons/obj/fitness.dmi'
 	icon_state = "fitnessweight"
-	density = TRUE
-	anchored = TRUE
+	icon_state_inuse = "fitnessweight-c"
 
-/obj/structure/weightlifter/attack_hand(mob/living/user)
-	. = ..()
-	if(.)
-		return
-	if(obj_flags & IN_USE)
-		to_chat(user, "It's already in use - wait a bit.")
-		return
-	else
-		obj_flags |= IN_USE
-		icon_state = "fitnessweight-c"
-		user.setDir(SOUTH)
-		user.Stun(80)
-		user.forceMove(src.loc)
-		var/mutable_appearance/swole_overlay = mutable_appearance(icon, "fitnessweight-w", WALL_OBJ_LAYER)
-		add_overlay(swole_overlay)
-		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>")
-		var/reps = 0
-		user.pixel_y = 5
-		while (reps++ < 6)
-			if (user.loc != src.loc)
-				break
-
-			for (var/innerReps = max(reps, 1), innerReps > 0, innerReps--)
-				sleep(3)
-				animate(user, pixel_y = (user.pixel_y == 3) ? 5 : 3, time = 3)
-
-			playsound(user, 'goon/sound/effects/spring.ogg', 60, 1)
-
-		sleep(3)
-		animate(user, pixel_y = 2, time = 3)
-		sleep(3)
-		playsound(user, 'sound/machines/click.ogg', 60, 1)
-		obj_flags &= ~IN_USE
-		animate(user, pixel_y = 0, time = 3)
-		var/finishmessage = pick("You feel stronger!","You feel like you can take on the world!","You feel robust!","You feel indestructible!")
-		icon_state = "fitnessweight"
-		cut_overlay(swole_overlay)
-		to_chat(user, "[finishmessage]")
-		user.apply_status_effect(STATUS_EFFECT_EXERCISED)
+/obj/structure/weightmachine/weightlifter/AnimateMachine(mob/living/user)
+	var/mutable_appearance/swole_overlay = mutable_appearance(icon, "fitnessweight-w", WALL_OBJ_LAYER)
+	add_overlay(swole_overlay)
+	var/reps = 0
+	user.pixel_y = 5
+	while (reps++ < 6)
+		if (user.loc != src.loc)
+			break
+		for (var/innerReps = max(reps, 1), innerReps > 0, innerReps--)
+			sleep(3)
+			animate(user, pixel_y = (user.pixel_y == 3) ? 5 : 3, time = 3)
+		playsound(user, 'goon/sound/effects/spring.ogg', 60, 1)
+	sleep(3)
+	animate(user, pixel_y = 2, time = 3)
+	sleep(3)
+	cut_overlay(swole_overlay)