Merge branch 'master' of https://github.com/BlueMoon-Labs/MOLOT-BlueM…

…oon-Station
Kush1Push1 · Nov 5, 2024 · 6e1952a · 6e1952a
2 parents 4648896 + ea94f3e
commit 6e1952a
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 3 deletions.
diff --git 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/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
diff --git 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