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

…oon-Station

code/datums/emotes.dm

@@ -175,7 +175,7 @@
 
 /datum/emote/sound/run_emote(mob/user, params)
 	. = ..()
-	if(.)
+	if(. && !(user?.is_muzzled() && !muzzle_ignore))
 		playsound(user.loc, sound, volume, vary)
 
 /**

code/game/objects/items/storage/boxes.dm

@@ -1734,6 +1734,8 @@
 	icon_state = "robusta_beans"
 	beantype = /obj/item/reagent_containers/food/snacks/grown/coffee/robusta
 
+//BLUEMOON ADD
+
 /obj/item/storage/box/catcrin_kit
 	name = "Catcrin kit"
 	desc = "Contains a full kit of Catcrin equipment."
@@ -1746,3 +1748,18 @@
 	new /obj/item/modkit/stunspear_kit(src)
 	new /obj/item/modkit/frontline(src)
 	new /obj/item/clothing/accessory/ac_patch(src)
+
+/obj/item/storage/box/acrador_kit
+	name = "Acrador kit"
+	desc = "Contains a full kit of Acrador equipment."
+	icon_state = "box"
+
+/obj/item/storage/box/acrador_kit/PopulateContents()
+	new /obj/item/modkit/rshield_kit(src)
+	new /obj/item/modkit/anstrum_kit(src)
+	new /obj/item/modkit/rs14_kit(src)
+	new /obj/item/modkit/cmg_kit(src)
+	new /obj/item/modkit/tonfa_kit(src)
+	new /obj/item/modkit/rs9(src)
+
+//BLUEMOON ADD END

code/modules/mob/living/carbon/human/emote.dm

@@ -175,6 +175,7 @@
 	message_param = "исполняет воинское приветствие при виде %t."
 	sound = 'sound/voice/salute.ogg'
 	restraint_check = TRUE
+	muzzle_ignore = TRUE
 
 /datum/emote/sound/human/buzz
 	key = "buzz"

modular_bluemoon/fluffs/code/donator.dm

@@ -751,7 +751,6 @@
     ckeywhitelist = list("fedor1545", "berly12")
     subcategory = LOADOUT_SUBCATEGORIES_DON04
 
-
 /datum/gear/donator/bm/a46_kit
 	name = "A46 Kit"
 	slot = ITEM_SLOT_BACKPACK
@@ -780,25 +779,25 @@
 	ckeywhitelist = list("oni3288", "discord980", "mihana964", "romontesque", "enigma418", "smol42", "notlikeluls",  "kladmenuwu", "alexsandoor", "scramblescream", "nai1ten", "devildeadspace", "zetneskov", "hazzi", "definitelynotnesuby", "silverfoxpaws")
 	subcategory = LOADOUT_SUBCATEGORIES_DON02
 
+/datum/gear/donator/bm/acrador_kit
+	name = "Acrador kit"
+	slot = ITEM_SLOT_BACKPACK
+	path = /obj/item/storage/box/acrador_kit
+	ckeywhitelist = list("someoldvg", "enigma418", "flippingtable", "allazarius", "trora", "siamant")
+	subcategory = LOADOUT_SUBCATEGORIES_DON02
+
 /datum/gear/donator/bm/goal
 	name = "Goal mask"
 	slot = ITEM_SLOT_BACKPACK
 	path = /obj/item/clothing/mask/balaclava/breath/goal
 	ckeywhitelist = list("hazzi", "fryktik")
 	subcategory = LOADOUT_SUBCATEGORIES_DON02
 
-/datum/gear/donator/bm/cmg_kit
-	name = "Combat MG Kit"
-	slot = ITEM_SLOT_BACKPACK
-	path = /obj/item/modkit/cmg_kit
-	ckeywhitelist = list("someoldvg", "enigma418", "flippingtable", "allazarius")
-	subcategory = LOADOUT_SUBCATEGORIES_DON02
-
 /datum/gear/donator/bm/rhsa12
 	name = "R-HSA-12"
 	slot = ITEM_SLOT_BACKPACK
 	path = /obj/item/clothing/head/helmet/sec/rhsa12
-	ckeywhitelist = list("someoldvg", "enigma418", "flippingtable", "allazarius")
+	ckeywhitelist = list("someoldvg", "enigma418", "flippingtable", "allazarius", "trora", "siamant")
 	subcategory = LOADOUT_SUBCATEGORIES_DON02
 	restricted_desc = "Head of Security, Warden, Detective, Security Officer, Brig Physician, Peacekeeper, Blueshield."
 	restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Peacekeeper", "Blueshield")
@@ -807,7 +806,7 @@
 	name = "R-SA-12"
 	slot = ITEM_SLOT_BACKPACK
 	path = /obj/item/clothing/suit/armor/rsa12
-	ckeywhitelist = list("someoldvg", "enigma418", "flippingtable", "allazarius")
+	ckeywhitelist = list("someoldvg", "enigma418", "flippingtable", "allazarius", "trora", "siamant")
 	subcategory = LOADOUT_SUBCATEGORIES_DON02
 	restricted_desc = "Head of Security, Warden, Detective, Security Officer, Brig Physician, Peacekeeper, Blueshield."
 	restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Peacekeeper", "Blueshield")
@@ -816,7 +815,7 @@
 	name = "Underarmor suit"
 	slot = ITEM_SLOT_BACKPACK
 	path = /obj/item/clothing/under/rank/security/officer/acradorsuit
-	ckeywhitelist = list("someoldvg", "enigma418", "flippingtable", "allazarius")
+	ckeywhitelist = list("someoldvg", "enigma418", "flippingtable", "allazarius", "trora", "siamant")
 	subcategory = LOADOUT_SUBCATEGORIES_DON02
 	restricted_desc = "Head of Security, Warden, Detective, Security Officer, Brig Physician, Peacekeeper, Blueshield."
 	restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Peacekeeper", "Blueshield")

modular_bluemoon/fluffs/code/guns.dm

@@ -101,7 +101,7 @@
 	can_suppress = FALSE
 	can_bayonet = TRUE
 	knife_x_offset = 30
-	knife_y_offset = 7
+	knife_y_offset = 10
 
 /obj/item/gun/ballistic/automatic/wt550/gewehr550/update_icon_state()
 	icon_state = "gewehr550[magazine ? "-[CEILING(get_ammo(0)/7, 1)*4]" : ""][chambered ? "" : "-e"]"
@@ -154,6 +154,29 @@
 /obj/item/gun/ballistic/automatic/wt550/ots18/update_icon_state()
 	icon_state = "groza[magazine ? "-[CEILING(get_ammo(0)/7, 1)*4]" : ""][chambered ? "" : "-e"]"
 
+/obj/item/modkit/rs9
+	name = "RS9 Kit"
+	desc = "A modkit for making a WT-550 Gun into a RS9 Gun."
+	product = /obj/item/gun/ballistic/automatic/wt550/rs9
+	fromitem = list(/obj/item/gun/ballistic/automatic/wt550)
+
+/obj/item/gun/ballistic/automatic/wt550/rs9
+	name = "\improper RS9"
+	desc = "The RS9 is an assault rifle designed for combat in narrow street areas. It has bayonet mount and is relatively lightweight. This model uses 4.6x30mm caliber."
+	icon = 'modular_bluemoon/fluffs/icons/obj/acrador_guns.dmi'
+	lefthand_file = 'modular_bluemoon/fluffs/icons/mob/guns_left.dmi'
+	righthand_file = 'modular_bluemoon/fluffs/icons/mob/guns_right.dmi'
+	icon_state = "rs9"
+	item_state = "rs9"
+	fire_sound = 'modular_bluemoon/fluffs/sound/weapon/rs9shot.ogg'
+	can_suppress = FALSE
+	can_bayonet = TRUE
+	knife_x_offset = 40
+	knife_y_offset = 10
+
+/obj/item/gun/ballistic/automatic/wt550/rs9/update_icon_state()
+	icon_state = "rs9[magazine ? "-[CEILING(get_ammo(0)/7, 1)*4]" : ""][chambered ? "" : "-e"]"
+
 /obj/item/modkit/m240_kit
 	name = "M240 Kit"
 	desc = "A modkit for making a Flamethrower into a M240."
@@ -445,6 +468,47 @@
 /obj/item/melee/baton/stunspear/get_worn_belt_overlay(icon_file)
 	return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "-stunspear")
 
+/////////////////////////////////////////////////////////////////////////////////////
+
+/obj/item/modkit/tonfa_kit
+	name = "Ton-Fa Kit"
+	desc = "A modkit for making an stunbaton into a ton-Fa."
+	product = /obj/item/melee/baton/tonfa
+	fromitem = list(/obj/item/melee/baton, /obj/item/melee/baton/loaded)
+
+/obj/item/melee/baton/tonfa
+	name = "Stun Ton-Fa"
+	desc = "A non-lethal baton for suppressing manpower. Developed during the riots when the existence of the rifters was confirmed."
+	item_state = "tonfa"
+	icon_state = "tonfa"
+	icon = 'modular_bluemoon/fluffs/icons/obj/acrador_guns.dmi'
+	lefthand_file = 'modular_bluemoon/fluffs/icons/mob/guns_left.dmi'
+	righthand_file = 'modular_bluemoon/fluffs/icons/mob/guns_right.dmi'
+
+/obj/item/melee/baton/tonfa/switch_status(new_status = FALSE, silent = FALSE)
+	if(turned_on != new_status)
+		turned_on = new_status
+		if(!silent)
+			playsound(loc, 'modular_bluemoon/fluffs/sound/weapon/tonfa.ogg', 75, 1, -1)
+		if(turned_on)
+			START_PROCESSING(SSobj, src)
+		else
+			STOP_PROCESSING(SSobj, src)
+	update_icon()
+
+/obj/item/melee/baton/tonfa/update_icon_state()
+	if(turned_on)
+		icon_state = "tonfa_active"
+		item_state = "tonfa_active"
+	else if(!cell)
+		icon_state = "tonfa_nocell"
+		item_state = "tonfa"
+	else
+		icon_state = "tonfa"
+		item_state = "tonfa"
+
+/obj/item/melee/baton/tonfa/get_worn_belt_overlay(icon_file)
+	return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "-tonfa")
 
 ////////////////////////////////////////////////////////////////////////////////////////
 
@@ -583,6 +647,8 @@
 	ammo_type = list(/obj/item/ammo_casing/energy/disabler/karabiner_m13, /obj/item/ammo_casing/energy/laser/hos/karabiner_m13, /obj/item/ammo_casing/energy/ion/hos/karabiner_m13, /obj/item/ammo_casing/energy/electrode/hos/karabiner_m13)
 	ammo_x_offset = 0
 	pickup_sound = "modular_bluemoon/flaffs/sound/weapon/Karabiner-M13/GrabCarabine.ogg"
+	flight_x_offset = 25
+	flight_y_offset = 5
 
 /obj/item/ammo_casing/energy/disabler/karabiner_m13
 	fire_sound = 'modular_bluemoon/fluffs/sound/weapon/Karabiner-M13/DisablerOni.ogg'
@@ -662,3 +728,82 @@
 	lefthand_file = 'modular_bluemoon/fluffs/icons/mob/guns_left.dmi'
 	righthand_file = 'modular_bluemoon/fluffs/icons/mob/guns_right.dmi'
 	mob_overlay_icon = 'modular_bluemoon/fluffs/icons/mob/back.dmi'
+
+/obj/item/modkit/rs14_kit
+	name = "RS14 Kit"
+	desc = "A modkit for making an Rsha12 into a RS14."
+	product = /obj/item/gun/ballistic/shotgun/rsh12/rs14
+	fromitem = list(/obj/item/gun/ballistic/shotgun/rsh12)
+
+/obj/item/gun/ballistic/shotgun/rsh12/rs14
+	name = "RS14"
+	desc = "Shotgun revolver. It was formerly a hunting weapon, but has since been adopted by the Rohai armies because of its ease of use, effectiveness and cheapness. This model uses 12 gauge."
+	item_state = "rs14"
+	icon_state = "rs14"
+	icon = 'modular_bluemoon/fluffs/icons/obj/acrador_guns.dmi'
+	lefthand_file = 'modular_bluemoon/fluffs/icons/mob/guns_left.dmi'
+	righthand_file = 'modular_bluemoon/fluffs/icons/mob/guns_right.dmi'
+	fire_sound = 'modular_bluemoon/fluffs/sound/weapon/rs14shot.ogg'
+
+/obj/item/modkit/rshield_kit
+	name = "Telescopic riot shield Kit"
+	desc = "A modkit for making an telescopic riot shield into a Acrador telescopic riot shield."
+	product = /obj/item/shield/riot/rshield
+	fromitem = list(/obj/item/shield/riot/tele)
+
+/obj/item/shield/riot/rshield
+	name = "Telescopic riot shield"
+	desc = "A shield used to quell civil unrest in the cities of Irelia. It is easy to use and can be folded into a more compact form for carrying."
+	icon_state = "rshield0"
+	icon = 'modular_bluemoon/fluffs/icons/obj/acrador_guns.dmi'
+	lefthand_file = 'modular_bluemoon/fluffs/icons/mob/guns_left.dmi'
+	righthand_file = 'modular_bluemoon/fluffs/icons/mob/guns_right.dmi'
+	slot_flags = null
+	force = 3
+	throwforce = 3
+	throw_speed = 3
+	throw_range = 4
+	w_class = WEIGHT_CLASS_NORMAL
+	var/active = FALSE
+
+/obj/item/shield/riot/rshield/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
+	if(!active)
+		return BLOCK_NONE
+	return ..()
+
+/obj/item/shield/riot/rshield/can_active_block()
+	return ..() && active
+
+/obj/item/shield/riot/rshield/attack_self(mob/living/user)
+	active = !active
+	icon_state = "rshield[active]"
+	playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, TRUE)
+
+	if(active)
+		force = 8
+		throwforce = 5
+		throw_speed = 2
+		w_class = WEIGHT_CLASS_BULKY
+		slot_flags = ITEM_SLOT_BACK
+		to_chat(user, "<span class='notice'>You extend \the [src].</span>")
+	else
+		force = 3
+		throwforce = 3
+		throw_speed = 3
+		w_class = WEIGHT_CLASS_NORMAL
+		slot_flags = null
+		to_chat(user, "<span class='notice'>[src] can now be concealed.</span>")
+	add_fingerprint(user)
+
+/obj/item/modkit/anstrum_kit
+	name = "SP 488 Anstrum Kit"
+	desc = "A modkit for making an Enforcer into a SP 488 Anstrum."
+	product = /obj/item/gun/ballistic/automatic/pistol/enforcer/anstrum
+	fromitem = list(/obj/item/gun/ballistic/automatic/pistol/enforcer/nomag, /obj/item/gun/ballistic/automatic/pistol/enforcer, /obj/item/gun/ballistic/automatic/pistol/enforcerred, /obj/item/gun/ballistic/automatic/pistol/enforcergold)
+
+/obj/item/gun/ballistic/automatic/pistol/enforcer/anstrum
+	name = "\improper SP 488 Anstrum"
+	desc = "A series of semi-automatic pistols designed and manufactured specifically for the Rohai Law Enforcement Units and as personal weapons for the senior army officers. The design is old but reliable, combining compactness with sufficient combat power for everyday tasks."
+	icon = 'modular_bluemoon/fluffs/icons/obj/acrador_guns.dmi'
+	icon_state = "anstrum"
+	fire_sound = 'modular_bluemoon/fluffs/sound/weapon/anstrumshot.ogg'

modular_sand/code/datums/interactions/lewd_definitions.dm

@@ -297,7 +297,7 @@
 
 	// Get reference of the list we're using based on gender.
 	var/list/moans
-	if (gender == FEMALE)
+	if (gender == FEMALE || (gender == PLURAL && isfeminine(src)))
 		moans = GLOB.lewd_moans_female
 	else
 		moans = GLOB.lewd_moans_male
@@ -309,6 +309,9 @@
 	if (lastmoan == sound)
 		sound = pick(LAZYCOPY(moans) - lastmoan)
 
+	if(isalien(src))
+		sound = 'sound/voice/hiss6.ogg'
+
 	playlewdinteractionsound(loc, sound, 80, 0, 0)
 	lastmoan = sound
 

modular_sand/code/modules/mob/emote.dm

@@ -51,15 +51,7 @@
 	user.nextsoundemote = world.time + 7
 	playsound(user, 'modular_citadel/sound/voice/peep.ogg', 50, 1, -1)
 
-/datum/emote/living/carbon/moan
-	emote_type = EMOTE_OMNI
-	stat_allowed = CONSCIOUS
-
 /datum/emote/living/carbon/moan/run_emote(mob/living/user, params, type_override, intentional)
-	. = TRUE
-	if(!can_run_emote(user, TRUE, intentional))
-		return FALSE
-	if(!COOLDOWN_FINISHED(user, nextsoundemote))
-		return FALSE
-	COOLDOWN_START(user, nextsoundemote, 7)
+	if(!(. = ..()))
+		return
 	user.moan()

modular_splurt/code/datums/interactions/lewd/_lewd.dm

@@ -20,6 +20,8 @@
 		return donut.toggle_accessibility(accessibility)
 	. = ..()
 
+/*
+SPLURT теперь обрабатывают все это дело в /mob/living/proc/moan() -> весь код снизу теперь не имеет смысла.
 /mob/living/moan()
 	var/moaned = lastmoan
 	var/miming = mind ? mind?.miming : FALSE
@@ -31,9 +33,10 @@
 		moans = list('sound/voice/hiss6.ogg')
 	else if(gender == FEMALE || (gender == PLURAL && isfeminine(src)))
 		moans = list('modular_splurt/sound/voice/moan_f1.ogg', 'modular_splurt/sound/voice/moan_f2.ogg', 'modular_splurt/sound/voice/moan_f3.ogg', 'modular_splurt/sound/voice/moan_f4.ogg', 'modular_splurt/sound/voice/moan_f5.ogg', 'modular_splurt/sound/voice/moan_f6.ogg', 'modular_splurt/sound/voice/moan_f7.ogg')
-	else if(gender != FEMALE || (gender == PLURAL && ismasculine(src)))
+	else
 		moans = list('modular_splurt/sound/voice/moan_m1.ogg', 'modular_splurt/sound/voice/moan_m2.ogg', 'modular_splurt/sound/voice/moan_m3.ogg')
 	playlewdinteractionsound(src, pick(moans), 50, 1, 4, 1.2, ignored_mobs = get_unconsenting())
+*/
 
 /mob/living/proc/get_refraction_dif() //Got snapped in upstream, may delete later when I figure something out
 	var/dif = (refractory_period - world.time)

modular_splurt/code/modules/mob/living/emotes.dm

@@ -127,13 +127,13 @@
 		// Do nothing
 		return
 
+	if(user?.is_muzzled() && !muzzle_ignore)
+		return
+
 	// Play sound
 	// Accepts all possible parameters
 	playsound(user.loc, emote_sound, emote_volume, emote_pitch_variance, emote_range, emote_falloff_exponent, emote_frequency, emote_channel, emote_check_pressure, emote_ignore_walls, emote_falloff_distance, emote_wetness, emote_dryness, emote_distance_multiplier, emote_distance_multiplier_min_range)
 
- 	// Set cooldown
-	user.nextsoundemote = world.time + emote_cooldown
-
 /datum/emote/living/surrender/run_emote(mob/user, params, type_override, intentional)
 	// Set message with pronouns
 	message = "puts [user.p_their()] hands on [user.p_their()] head and falls to the ground, [user.p_they()] surrender[user.p_s()]!"
@@ -336,14 +336,16 @@
 	emote_sound = 'modular_splurt/sound/voice/bleat.ogg'
 	emote_cooldown = 3 SECONDS
 
+/*
+SPLURT теперь обрабатывают все это дело в /mob/living/proc/moan() -> весь код снизу теперь не имеет смысла.
+
 /datum/emote/living/carbon/moan/run_emote(mob/user, params, type_override, intentional) //I can't not port this shit, come on.
 	if(user.stat != CONSCIOUS)
 		return
 	var/sound
 	var/miming = user.mind ? user.mind.miming : 0
 	if(!user.is_muzzled() && !miming)
-		if(user.gender != FEMALE || (user.gender == PLURAL && ismasculine(user)))
-			sound = pick('modular_splurt/sound/voice/moan_m1.ogg', 'modular_splurt/sound/voice/moan_m2.ogg', 'modular_splurt/sound/voice/moan_m3.ogg')
+		sound = pick('modular_splurt/sound/voice/moan_m1.ogg', 'modular_splurt/sound/voice/moan_m2.ogg', 'modular_splurt/sound/voice/moan_m3.ogg')
 		if(user.gender == FEMALE || (user.gender == PLURAL && isfeminine(user)))
 			sound = pick('modular_splurt/sound/voice/moan_f1.ogg', 'modular_splurt/sound/voice/moan_f2.ogg', 'modular_splurt/sound/voice/moan_f3.ogg', 'modular_splurt/sound/voice/moan_f4.ogg', 'modular_splurt/sound/voice/moan_f5.ogg', 'modular_splurt/sound/voice/moan_f6.ogg', 'modular_splurt/sound/voice/moan_f7.ogg')
 		if(isalien(user))
@@ -355,6 +357,7 @@
 	else
 		message = "makes a very loud noise."
 	. = ..()
+*/
 
 /datum/emote/living/audio/chitter2
 	key = "chitter2"