From bf91e394796ab733cd48e239c6c31269021ee888 Mon Sep 17 00:00:00 2001
From: Vlad0s <110334878+VladOS-0@users.noreply.github.com>
Date: Tue, 5 Nov 2024 00:41:39 +0300
Subject: [PATCH 1/2] Ass we can (#1367)

---
 .../mob/living/carbon/human/species.dm        | 13 +++++++++--
 .../code/datums/interactions/_interaction.dm  | 22 +++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index d364a9557e7c..096197c71f81 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1957,8 +1957,15 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 
 		playsound(target.loc, 'sound/weapons/slap.ogg', 50, 1, -1)
 		user.do_attack_animation(target, ATTACK_EFFECT_ASS_SLAP)
+		// BLUEMOON EDIT START - бронируем задницы
 		if(HAS_TRAIT(target, TRAIT_STEEL_ASS))
-			user.adjustStaminaLoss(50)
+			if(prob(25))
+				var/obj/item/bodypart/bodypart = user.get_active_hand()
+				if(istype(bodypart))
+					var/datum/wound/blunt/moderate/moderate_wound = new
+					moderate_wound.apply_wound(bodypart)
+			user.adjustStaminaLoss(75)
+			user.Stun(3 SECONDS)
 			user.visible_message(\
 				span_danger("\The [user] slaps \the [target]'s ass, but their hand bounces off like they hit metal!"),\
 				span_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!"),\
@@ -1969,8 +1976,10 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 				'modular_splurt/sound/effects/pan1.ogg'
 			)
 			playsound(target.loc, pick(ouchies), 15, 1, -1)
-			user.emote("scream")
+			if(!isrobotic(user))
+				user.emote("scream")
 			return FALSE
+		// BLUEMOON EDIT END
 		//SPLURT ADDITION START
 		if(HAS_TRAIT(target, TRAIT_JIGGLY_ASS))
 			if(!COOLDOWN_FINISHED(src, ass))
diff --git a/modular_bluemoon/code/datums/interactions/_interaction.dm b/modular_bluemoon/code/datums/interactions/_interaction.dm
index 029c21f95882..e86c81a8b7d4 100644
--- a/modular_bluemoon/code/datums/interactions/_interaction.dm
+++ b/modular_bluemoon/code/datums/interactions/_interaction.dm
@@ -4,4 +4,26 @@
 			to_chat(user, span_warning("По какой-то причине, вы не можете сделать это с [target]."))
 			to_chat(user, span_warning(span_small("Игрок отключил механическую возможность шлепать себя. Попробуйте отыгрывать это через действия.")))
 			return FALSE
+		if(ishuman(user) && ishuman(target) && HAS_TRAIT(target, TRAIT_STEEL_ASS))
+			var/mob/living/carbon/human/human_user = user
+			if(prob(10))
+				var/obj/item/bodypart/bodypart = human_user.get_active_hand()
+				if(istype(bodypart))
+					var/datum/wound/blunt/moderate/moderate_wound = new
+					moderate_wound.apply_wound(bodypart)
+			human_user.adjustStaminaLoss(75)
+			human_user.Stun(3 SECONDS)
+			human_user.visible_message(\
+				span_danger("\The [user] slaps \the [target]'s ass, but their hand bounces off like they hit metal!"),\
+				span_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!"),\
+				"You hear a slap."
+			)
+			var/list/ouchies = list(
+				'modular_splurt/sound/effects/pan0.ogg',
+				'modular_splurt/sound/effects/pan1.ogg'
+			)
+			playsound(target.loc, pick(ouchies), 15, 1, -1)
+			if(!isrobotic(user))
+				user.emote("scream")
+			return FALSE
 	return TRUE

From ea94f3e99ed0c854e3acb1574119574cb16183bc Mon Sep 17 00:00:00 2001
From: SkavenLadno <145252335+SkavenLadno@users.noreply.github.com>
Date: Tue, 5 Nov 2024 00:42:30 +0300
Subject: [PATCH 2/2] =?UTF-8?q?=D0=9B=D0=B8=D1=87=D0=BD=D1=8B=D0=B9=20?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=B4=D0=B0=D1=83=D1=82,=20=D0=B8=D1=81=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=B2=D1=8B=D0=B4=D0=B0=D1=87?=
 =?UTF-8?q?=D1=83=20(#1365)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Добавил спрайты и код для модкитов и брони в личный лодаут человеку

* Поправил сикей, а то оказывается большие буквы ломают выдачу
---
 modular_bluemoon/Azaar/code/donator_wh.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modular_bluemoon/Azaar/code/donator_wh.dm b/modular_bluemoon/Azaar/code/donator_wh.dm
index 49d6c91c9652..59e985c19e4f 100644
--- a/modular_bluemoon/Azaar/code/donator_wh.dm
+++ b/modular_bluemoon/Azaar/code/donator_wh.dm
@@ -52,5 +52,5 @@
 	name = "A box of Unholy Armor"
 	slot = ITEM_SLOT_BACKPACK
 	path = /obj/item/storage/box/wh_kit
-	ckeywhitelist = list("DarkSunGwyndolin")
+	ckeywhitelist = list("darksungwyndolin")
 	subcategory = LOADOUT_SUBCATEGORIES_DON02