From 20e78ec145dee59d08fe3a9161afb9c8ea6eba98 Mon Sep 17 00:00:00 2001
From: Pinta <124479862+deertools@users.noreply.github.com>
Date: Wed, 8 Feb 2023 22:34:53 -0500
Subject: [PATCH] weight loss

---
 GainStation13/code/mechanics/fatness.dm   |  2 +-
 code/modules/mining/lavaland/ruins/gym.dm | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/GainStation13/code/mechanics/fatness.dm b/GainStation13/code/mechanics/fatness.dm
index c31a7fef..db33321a 100644
--- a/GainStation13/code/mechanics/fatness.dm
+++ b/GainStation13/code/mechanics/fatness.dm
@@ -43,7 +43,7 @@
 					return FALSE
 
 			if(FATTENING_TYPE_WEIGHT_LOSS)
-				if(!HAS_TRAIT(src, TRAIT_WEIGHT_LOSS_IMMUNE))
+				if(HAS_TRAIT(src, TRAIT_WEIGHT_LOSS_IMMUNE))
 					return FALSE
 
 	var/amount_to_change = adjustment_amount
diff --git a/code/modules/mining/lavaland/ruins/gym.dm b/code/modules/mining/lavaland/ruins/gym.dm
index 1c535fd9..adba40c6 100644
--- a/code/modules/mining/lavaland/ruins/gym.dm
+++ b/code/modules/mining/lavaland/ruins/gym.dm
@@ -7,6 +7,9 @@
 	layer = WALL_OBJ_LAYER
 	var/list/hit_sounds = list('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg',\
 	'sound/weapons/punch1.ogg', 'sound/weapons/punch2.ogg', 'sound/weapons/punch3.ogg', 'sound/weapons/punch4.ogg')
+	//GS13 EDIT
+	///How much fatness is lost when punching?
+	var/loss_per_punch = 2.5
 
 /obj/structure/punching_bag/attack_hand(mob/user as mob)
 	. = ..()
@@ -18,6 +21,11 @@
 		var/mob/living/L = user
 		SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "exercise", /datum/mood_event/exercise)
 		L.apply_status_effect(STATUS_EFFECT_EXERCISED)
+	
+	//GS13 EDIT
+	var/mob/living/carbon/puncher = user
+	if(puncher)
+		puncher.adjust_fatness(-loss_per_punch, FATTENING_TYPE_WEIGHT_LOSS)
 
 /obj/structure/weightmachine
 	name = "Weight Machine"
@@ -25,6 +33,9 @@
 	density = TRUE
 	anchored = TRUE
 	var/icon_state_inuse
+	//GS13 EDIT
+	///How much fatness is lost when using the machine?
+	var/loss_per_use = 15 
 
 /obj/structure/weightmachine/proc/AnimateMachine(mob/living/user)
 	return
@@ -54,6 +65,12 @@
 		icon_state = initial(icon_state)
 		to_chat(user, finishmessage)
 		user.apply_status_effect(STATUS_EFFECT_EXERCISED)
+		
+		//GS13 Edit
+		var/mob/living/carbon/lifter = user
+		if(lifter)
+			lifter.adjust_fatness(-loss_per_use, FATTENING_TYPE_WEIGHT_LOSS)
+
 
 /obj/structure/weightmachine/stacklifter
 	icon = 'goon/icons/obj/fitness.dmi'
@@ -92,4 +109,4 @@
 	sleep(3)
 	animate(user, pixel_y = 2, time = 3)
 	sleep(3)
-	cut_overlay(swole_overlay)
\ No newline at end of file
+	cut_overlay(swole_overlay)