diff --git a/code/game/sound.dm b/code/game/sound.dm index 1ab8fc42f41a..110945b4e2a0 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -353,6 +353,8 @@ S = pick('sound/voice/warcry/male_go.ogg', 'sound/voice/warcry/male_attack.ogg', 'sound/voice/warcry/male_charge.ogg', 'sound/voice/warcry/male_charge2.ogg', 'sound/voice/warcry/warcry_male_1.ogg', 'sound/voice/warcry/warcry_male_2.ogg', 'sound/voice/warcry/warcry_male_3.ogg', 'sound/voice/warcry/warcry_male_4.ogg', 'sound/voice/warcry/warcry_male_5.ogg', 'sound/voice/warcry/warcry_male_6.ogg', 'sound/voice/warcry/warcry_male_7.ogg', 'sound/voice/warcry/warcry_male_8.ogg', 'sound/voice/warcry/warcry_male_9.ogg', 'sound/voice/warcry/warcry_male_10.ogg', 'sound/voice/warcry/warcry_male_11.ogg', 'sound/voice/warcry/warcry_male_12.ogg', 'sound/voice/warcry/warcry_male_13.ogg', 'sound/voice/warcry/warcry_male_14.ogg', 'sound/voice/warcry/warcry_male_15.ogg', 'sound/voice/warcry/warcry_male_16.ogg', 'sound/voice/warcry/warcry_male_17.ogg', 'sound/voice/warcry/warcry_male_18.ogg', 'sound/voice/warcry/warcry_male_19.ogg', 'sound/voice/warcry/warcry_male_20.ogg', 'sound/voice/warcry/warcry_male_21.ogg', 'sound/voice/warcry/warcry_male_22.ogg', 'sound/voice/warcry/warcry_male_23.ogg', 'sound/voice/warcry/warcry_male_24.ogg', 'sound/voice/warcry/warcry_male_25.ogg', 'sound/voice/warcry/warcry_male_26.ogg', 'sound/voice/warcry/warcry_male_27.ogg', 'sound/voice/warcry/warcry_male_28.ogg', 'sound/voice/warcry/warcry_male_29.ogg', 'sound/voice/warcry/warcry_male_30.ogg', 'sound/voice/warcry/warcry_male_31.ogg', 'sound/voice/warcry/warcry_male_32.ogg', 'sound/voice/warcry/warcry_male_33.ogg', 'sound/voice/warcry/warcry_male_34.ogg', 'sound/voice/warcry/warcry_male_35.ogg', 5;'sound/voice/warcry/warcry_male_rare_1.ogg', 5;'sound/voice/warcry/warcry_male_rare_2.ogg', 5;'sound/voice/warcry/warcry_male_rare_3.ogg', 5;'sound/voice/warcry/warcry_male_rare_4.ogg', 5;'sound/voice/warcry/warcry_male_rare_5.ogg') if("male_upp_warcry") S = pick('sound/voice/upp_warcry/warcry_male_1.ogg', 'sound/voice/upp_warcry/warcry_male_2.ogg') + if("male_twe_warcry") + S = pick('sound/voice/twe_warcry/warcry_male_1.ogg', 'sound/voice/twe_warcry/warcry_male_2.ogg') if("female_scream") S = pick('sound/voice/human_female_scream_1.ogg','sound/voice/human_female_scream_2.ogg','sound/voice/human_female_scream_3.ogg','sound/voice/human_female_scream_4.ogg',5;'sound/voice/human_female_scream_5.ogg') if("female_pain") @@ -363,6 +365,8 @@ S = pick('sound/voice/warcry/female_charge.ogg', 'sound/voice/warcry/female_yell1.ogg', 'sound/voice/warcry/warcry_female_1.ogg', 'sound/voice/warcry/warcry_female_2.ogg', 'sound/voice/warcry/warcry_female_3.ogg', 'sound/voice/warcry/warcry_female_4.ogg', 'sound/voice/warcry/warcry_female_5.ogg', 'sound/voice/warcry/warcry_female_6.ogg', 'sound/voice/warcry/warcry_female_7.ogg', 'sound/voice/warcry/warcry_female_8.ogg', 'sound/voice/warcry/warcry_female_9.ogg', 'sound/voice/warcry/warcry_female_10.ogg', 'sound/voice/warcry/warcry_female_11.ogg', 'sound/voice/warcry/warcry_female_12.ogg', 'sound/voice/warcry/warcry_female_13.ogg', 'sound/voice/warcry/warcry_female_14.ogg', 'sound/voice/warcry/warcry_female_15.ogg', 'sound/voice/warcry/warcry_female_16.ogg', 'sound/voice/warcry/warcry_female_17.ogg', 'sound/voice/warcry/warcry_female_18.ogg', 'sound/voice/warcry/warcry_female_19.ogg', 'sound/voice/warcry/warcry_female_20.ogg') if("female_upp_warcry") S = pick('sound/voice/upp_warcry/warcry_female_1.ogg', 'sound/voice/upp_warcry/warcry_female_2.ogg') + if("female_twe_warcry") + S = pick('sound/voice/twe_warcry/warcry_female_1.ogg', 'sound/voice/twe_warcry/warcry_female_2.ogg') if("rtb_handset") S = pick('sound/machines/telephone/rtb_handset_1.ogg', 'sound/machines/telephone/rtb_handset_2.ogg', 'sound/machines/telephone/rtb_handset_3.ogg', 'sound/machines/telephone/rtb_handset_4.ogg', 'sound/machines/telephone/rtb_handset_5.ogg') if("bone_break") diff --git a/code/modules/cm_marines/equipment/mortar/mortar_shells.dm b/code/modules/cm_marines/equipment/mortar/mortar_shells.dm index dae0910cc9b4..8d80c61e123a 100644 --- a/code/modules/cm_marines/equipment/mortar/mortar_shells.dm +++ b/code/modules/cm_marines/equipment/mortar/mortar_shells.dm @@ -3,6 +3,7 @@ desc = "An unlabeled 80mm mortar shell, probably a casing." icon = 'icons/obj/structures/mortar.dmi' icon_state = "mortar_ammo_cas" + throw_range = 1 w_class = SIZE_HUGE flags_atom = FPRINT|CONDUCT var/datum/cause_data/cause_data @@ -193,6 +194,7 @@ icon_opened = "secure_open_mortar" icon_locked = "secure_locked_mortar" icon_unlocked = "secure_unlocked_mortar" + throw_range = 1 req_one_access = list(ACCESS_MARINE_OT, ACCESS_MARINE_CARGO, ACCESS_MARINE_ENGPREP) /obj/structure/closet/crate/secure/mortar_ammo/full/Initialize() diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 7da0376bbef1..b10967c62398 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -363,11 +363,15 @@ if(user.gender == MALE) if(user.faction == FACTION_UPP) return get_sfx("male_upp_warcry") + if(user.faction == FACTION_TWE) + return get_sfx("male_twe_warcry") else return get_sfx("male_warcry") else if(user.faction == FACTION_UPP) return get_sfx("female_upp_warcry") + if(user.faction == FACTION_TWE) + return get_sfx("female_twe_warcry") else return get_sfx("female_warcry") diff --git a/sound/voice/twe_warcry/warcry_female_1.ogg b/sound/voice/twe_warcry/warcry_female_1.ogg new file mode 100644 index 000000000000..7e957fb2636f Binary files /dev/null and b/sound/voice/twe_warcry/warcry_female_1.ogg differ diff --git a/sound/voice/twe_warcry/warcry_female_2.ogg b/sound/voice/twe_warcry/warcry_female_2.ogg new file mode 100644 index 000000000000..75652d2a6c57 Binary files /dev/null and b/sound/voice/twe_warcry/warcry_female_2.ogg differ diff --git a/sound/voice/twe_warcry/warcry_male_1.ogg b/sound/voice/twe_warcry/warcry_male_1.ogg new file mode 100644 index 000000000000..ced3fde2ffe4 Binary files /dev/null and b/sound/voice/twe_warcry/warcry_male_1.ogg differ diff --git a/sound/voice/twe_warcry/warcry_male_2.ogg b/sound/voice/twe_warcry/warcry_male_2.ogg new file mode 100644 index 000000000000..b1974a6c198c Binary files /dev/null and b/sound/voice/twe_warcry/warcry_male_2.ogg differ