From 769d07dbf2488e26627c52b33837b6fd3c1c0ddb Mon Sep 17 00:00:00 2001
From: Varelion <99684831+Varelion@users.noreply.github.com>
Date: Tue, 30 Jan 2024 09:44:25 -0500
Subject: [PATCH] TRAIT_TABLE_LEAP Checks Added To under_siege  Judo (#23905)

* Create reagent vomicilin

* Update vomicilin

* Update code/modules/reagents/chemistry/reagents/medicine.dm

Updating as suggested.

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Revert vomicilin

* Revert vomicilin

* Revert vomicilin

* Add the ability to create droppers from glass

* Add TRAIT_TABLE_LEAP checks to under_siege judo

* Finalize requested changes

* Update code/__HELPERS/trait_helpers.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
---
 code/__HELPERS/trait_helpers.dm | 2 +-
 code/_globalvars/traits.dm      | 3 ++-
 code/game/jobs/job/support.dm   | 4 ++--
 code/game/objects/structures.dm | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/code/__HELPERS/trait_helpers.dm b/code/__HELPERS/trait_helpers.dm
index 3f907bc09d5..e72b5df1a5d 100644
--- a/code/__HELPERS/trait_helpers.dm
+++ b/code/__HELPERS/trait_helpers.dm
@@ -226,6 +226,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 
 //***** MIND TRAITS *****/
 #define TRAIT_HOLY "is_holy" // The mob is holy in regards to religion
+#define TRAIT_TABLE_LEAP "table_leap"
 
 //***** ITEM AND MOB TRAITS *****//
 /// Show what machine/door wires do when held.
@@ -305,7 +306,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 
 //quirk traits
 #define TRAIT_ALCOHOL_TOLERANCE	"alcohol_tolerance"
-#define TRAIT_TABLE_LEAP "table_leap"
 
 //traits that should be properly converted to genetic mutations one day
 #define TRAIT_LASEREYES "laser_eyes"
diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm
index 6e5ea7ed4cb..c02b5b6a9ef 100644
--- a/code/_globalvars/traits.dm
+++ b/code/_globalvars/traits.dm
@@ -91,7 +91,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 	),
 
 	/datum/mind = list(
-		"TRAIT_HOLY" = TRAIT_HOLY
+		"TRAIT_HOLY" = TRAIT_HOLY,
+		"TRAIT_TABLE_LEAP" = TRAIT_TABLE_LEAP
 	),
 
 	/obj/item = list(
diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm
index 4d457348868..f8fa8389a9b 100644
--- a/code/game/jobs/job/support.dm
+++ b/code/game/jobs/job/support.dm
@@ -174,9 +174,9 @@
 	singlemutcheck(H, GLOB.soberblock, MUTCHK_FORCED)
 	H.dna.default_blocks.Add(GLOB.soberblock)
 	H.check_mutations = 1
-	ADD_TRAIT(H, TRAIT_TABLE_LEAP, ROUNDSTART_TRAIT)
 	var/datum/martial_art/judo/under_siege/bouncer_delight = new
 	bouncer_delight.teach(H)
+	ADD_TRAIT(H.mind, TRAIT_TABLE_LEAP, ROUNDSTART_TRAIT)
 
 
 /datum/job/chef
@@ -217,7 +217,7 @@
 		return
 	var/datum/martial_art/cqc/under_siege/justacook = new
 	justacook.teach(H)
-	ADD_TRAIT(H, TRAIT_TABLE_LEAP, ROUNDSTART_TRAIT)
+	ADD_TRAIT(H.mind, TRAIT_TABLE_LEAP, ROUNDSTART_TRAIT)
 
 
 /datum/job/hydro
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index 367d1c62648..046072df06d 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -77,7 +77,7 @@
 	if(!isturf(loc))
 		return FALSE
 
-	if(HAS_TRAIT(user, TRAIT_TABLE_LEAP))
+	if(HAS_MIND_TRAIT(user, TRAIT_TABLE_LEAP))
 		user.visible_message("<span class='warning'>[user] gets ready to vault up onto [src]!</span>")
 		if(!do_after(user, 0.5 SECONDS, target = src))
 			return FALSE
@@ -91,7 +91,7 @@
 
 	user.forceMove(get_turf(src))
 	if(get_turf(user) == get_turf(src))
-		if(HAS_TRAIT(user, TRAIT_TABLE_LEAP))
+		if(HAS_MIND_TRAIT(user, TRAIT_TABLE_LEAP))
 			user.visible_message("<span class='warning'>[user] leaps up onto [src]!</span>")
 		else
 			user.visible_message("<span class='warning'>[user] climbs onto [src]!</span>")