diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index b2caf614b3..5c2deae875 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -72,6 +72,7 @@
 #define	TRAIT_CROCRIN_IMMUNE    "crocin_immune"
 #define TRAIT_NYMPHO			"nymphomania"
 #define TRAIT_MASO              "masochism"
+#define TRAIT_ASSBLASTUSA       "assblastusa"
 
 // common trait sources
 #define TRAIT_GENERIC "generic"
diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm
index f299e9904a..f70e3a3c68 100644
--- a/code/datums/traits/neutral.dm
+++ b/code/datums/traits/neutral.dm
@@ -93,3 +93,12 @@
 	gain_text = "<span class='notice'>You feel more prudish.</span>"
 	lose_text = "<span class='notice'>You don't feel as prudish as before.</span>"
 	medical_record_text = "Patient exhibits a special gene that makes them immune to Crocin and Hexacrocin."
+
+/datum/quirk/assblastusa
+	name = "Buns of Steel"
+	desc = "You've never skipped ass day. With this trait, you are completely immune to all forms of ass slapping and anyone who tries to slap your rock hard ass usually gets a broken hand."
+	mob_trait = TRAIT_ASSBLASTUSA
+	value = 0
+	medical_record_text = "Patient never skipped ass day."
+	gain_text = "<span class='notice'>Your ass rivals those of golems.</span>"
+	lose_text = "<span class='notice'>Your butt feels more squishy and slappable.</span>"
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 9a0a978d7a..ff2064c30f 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1486,6 +1486,24 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 		user.adjustStaminaLossBuffered(3)
 		return FALSE
 	else if(aim_for_groin && (target == user || target.lying || same_dir) && (target_on_help || target_restrained || target_aiming_for_groin))
+		user.do_attack_animation(target, ATTACK_EFFECT_ASS_SLAP)
+		user.adjustStaminaLossBuffered(3)
+		if(target.has_trait(TRAIT_ASSBLASTUSA))
+			var/hit_zone = (user.held_index_to_dir(user.active_hand_index) == "l" ? "l_":"r_") + "arm"
+			user.adjustStaminaLoss(50, affected_zone = hit_zone)
+			var/obj/item/bodypart/affecting = user.get_bodypart(hit_zone)
+			if(affecting)
+				if(affecting.receive_damage(5, 0))
+					user.update_damage_overlays()
+			user.visible_message(\
+				"<span class='danger'>\The [user] slaps \the [target]'s ass, but their hand bounces off like they hit metal!</span>",\
+				"<span class='danger'>You slap [user == target ? "your" : "\the [target]'s"] ass, but feel an intense amount of pain as you realise their buns are harder than steel!</span>",\
+				"You hear a slap."
+			)
+			playsound(target.loc, 'sound/weapons/tap.ogg', 50, 1, -1)
+			user.emote("scream")
+			return FALSE
+
 		playsound(target.loc, 'sound/weapons/slap.ogg', 50, 1, -1)
 		user.visible_message(\
 			"<span class='danger'>\The [user] slaps \the [target]'s ass!</span>",\
@@ -1498,8 +1516,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			target.mob_climax(forced_climax=TRUE)
 		if (!target.has_trait(TRAIT_NYMPHO))
 			stop_wagging_tail(target)
-		user.do_attack_animation(target, ATTACK_EFFECT_ASS_SLAP)
-		user.adjustStaminaLossBuffered(3)
+
 		return FALSE
 	else if(attacker_style && attacker_style.disarm_act(user,target))
 		return 1
diff --git a/tgstation.dme b/tgstation.dme
index f2cef76dd9..c9098249b0 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2505,22 +2505,10 @@
 #include "code\modules\research\designs\AI_module_designs.dm"
 #include "code\modules\research\designs\biogenerator_designs.dm"
 #include "code\modules\research\designs\bluespace_designs.dm"
-#include "code\modules\research\designs\comp_board_designs\comp_board_designs_all_misc.dm"
-#include "code\modules\research\designs\comp_board_designs\comp_board_designs_cargo .dm"
-#include "code\modules\research\designs\comp_board_designs\comp_board_designs_engi.dm"
-#include "code\modules\research\designs\comp_board_designs\comp_board_designs_medical.dm"
-#include "code\modules\research\designs\comp_board_designs\comp_board_designs_sci.dm"
-#include "code\modules\research\designs\comp_board_designs\comp_board_designs_sec.dm"
 #include "code\modules\research\designs\computer_part_designs.dm"
 #include "code\modules\research\designs\electronics_designs.dm"
 #include "code\modules\research\designs\equipment_designs.dm"
 #include "code\modules\research\designs\limbgrower_designs.dm"
-#include "code\modules\research\designs\machine_desings\machine_designs_all_misc.dm"
-#include "code\modules\research\designs\machine_desings\machine_designs_cargo.dm"
-#include "code\modules\research\designs\machine_desings\machine_designs_engi.dm"
-#include "code\modules\research\designs\machine_desings\machine_designs_medical.dm"
-#include "code\modules\research\designs\machine_desings\machine_designs_sci.dm"
-#include "code\modules\research\designs\machine_desings\machine_designs_service.dm"
 #include "code\modules\research\designs\mecha_designs.dm"
 #include "code\modules\research\designs\mechfabricator_designs.dm"
 #include "code\modules\research\designs\medical_designs.dm"
@@ -2538,6 +2526,18 @@
 #include "code\modules\research\designs\autolathe_desings\autolathe_designs_sec_and_hacked.dm"
 #include "code\modules\research\designs\autolathe_desings\autolathe_designs_tcomms_and_misc.dm"
 #include "code\modules\research\designs\autolathe_desings\autolathe_designs_tools.dm"
+#include "code\modules\research\designs\comp_board_designs\comp_board_designs_all_misc.dm"
+#include "code\modules\research\designs\comp_board_designs\comp_board_designs_cargo .dm"
+#include "code\modules\research\designs\comp_board_designs\comp_board_designs_engi.dm"
+#include "code\modules\research\designs\comp_board_designs\comp_board_designs_medical.dm"
+#include "code\modules\research\designs\comp_board_designs\comp_board_designs_sci.dm"
+#include "code\modules\research\designs\comp_board_designs\comp_board_designs_sec.dm"
+#include "code\modules\research\designs\machine_desings\machine_designs_all_misc.dm"
+#include "code\modules\research\designs\machine_desings\machine_designs_cargo.dm"
+#include "code\modules\research\designs\machine_desings\machine_designs_engi.dm"
+#include "code\modules\research\designs\machine_desings\machine_designs_medical.dm"
+#include "code\modules\research\designs\machine_desings\machine_designs_sci.dm"
+#include "code\modules\research\designs\machine_desings\machine_designs_service.dm"
 #include "code\modules\research\machinery\_production.dm"
 #include "code\modules\research\machinery\circuit_imprinter.dm"
 #include "code\modules\research\machinery\departmental_circuit_imprinter.dm"