diff --git a/code/modules/halo/covenant/species/jiralhanae/jiralhanae.dm b/code/modules/halo/covenant/species/jiralhanae/jiralhanae.dm index 04f2d77fcfc7f..ab4bbbebafaf7 100644 --- a/code/modules/halo/covenant/species/jiralhanae/jiralhanae.dm +++ b/code/modules/halo/covenant/species/jiralhanae/jiralhanae.dm @@ -86,6 +86,7 @@ GLOBAL_LIST_INIT(first_names_jiralhanae, world.file2list('code/modules/halo/cove /datum/unarmed_attack/brute_punch attack_verb = list("clobbers", "smashes", "backhands", "punches", "slams") attack_noun = list("fist") + attack_sound = 'code/modules/halo/sounds/punch_sfx/brute_punch_1.ogg' eye_attack_text = "fingers" eye_attack_text_victim = "digits" damage = 25 diff --git a/code/modules/halo/covenant/structures_machines/closet.dm b/code/modules/halo/covenant/structures_machines/closet.dm index 43383bb316981..46361f3b9b07b 100644 --- a/code/modules/halo/covenant/structures_machines/closet.dm +++ b/code/modules/halo/covenant/structures_machines/closet.dm @@ -3,6 +3,8 @@ name = "storage crate" desc = "It's a basic storage unit for the Covenant." icon = 'code/modules/halo/covenant/structures_machines/crate_tall.dmi' + open_sound = 'code/modules/halo/sounds/object_sfx/covenant_crate_open.ogg' + close_sound = 'code/modules/halo/sounds/object_sfx/covenant_crate_close.ogg' /obj/structure/ore_box/covenant icon = 'code/modules/halo/covenant/structures_machines/crate_tall.dmi' diff --git a/code/modules/halo/covenant/structures_machines/light.dmi b/code/modules/halo/covenant/structures_machines/light.dmi index 137bebc181c94..4f6a00d472d0d 100644 Binary files a/code/modules/halo/covenant/structures_machines/light.dmi and b/code/modules/halo/covenant/structures_machines/light.dmi differ diff --git a/code/modules/halo/covenant/structures_machines/storage.dm b/code/modules/halo/covenant/structures_machines/storage.dm index 61539d12e245d..272db2986728f 100644 --- a/code/modules/halo/covenant/structures_machines/storage.dm +++ b/code/modules/halo/covenant/structures_machines/storage.dm @@ -4,4 +4,6 @@ icon = 'code/modules/halo/covenant/structures_machines/crate_short.dmi' icon_state = "Covie Crate Closed" icon_closed = "Covie Crate Closed" - icon_opened = "Covie Crate Open" \ No newline at end of file + icon_opened = "Covie Crate Open" + open_sound = 'code/modules/halo/sounds/object_sfx/covenant_crate_open.ogg' + close_sound = 'code/modules/halo/sounds/object_sfx/covenant_crate_close.ogg' \ No newline at end of file diff --git a/code/modules/halo/sounds/brute_shot_melee.ogg b/code/modules/halo/sounds/brute_shot_melee.ogg new file mode 100644 index 0000000000000..3c9322d8beee0 Binary files /dev/null and b/code/modules/halo/sounds/brute_shot_melee.ogg differ diff --git a/code/modules/halo/sounds/energy_sword_hit.ogg b/code/modules/halo/sounds/energy_sword_hit.ogg new file mode 100644 index 0000000000000..c9b26ed5814d0 Binary files /dev/null and b/code/modules/halo/sounds/energy_sword_hit.ogg differ diff --git a/code/modules/halo/sounds/mauler_melee.ogg b/code/modules/halo/sounds/mauler_melee.ogg new file mode 100644 index 0000000000000..cd88db159d27d Binary files /dev/null and b/code/modules/halo/sounds/mauler_melee.ogg differ diff --git a/code/modules/halo/sounds/mauler_reload.ogg b/code/modules/halo/sounds/mauler_reload.ogg new file mode 100644 index 0000000000000..862dae985b945 Binary files /dev/null and b/code/modules/halo/sounds/mauler_reload.ogg differ diff --git a/code/modules/halo/sounds/object_sfx/covenant_crate_close.ogg b/code/modules/halo/sounds/object_sfx/covenant_crate_close.ogg new file mode 100644 index 0000000000000..ff5d7ab2972cb Binary files /dev/null and b/code/modules/halo/sounds/object_sfx/covenant_crate_close.ogg differ diff --git a/code/modules/halo/sounds/object_sfx/covenant_crate_open.ogg b/code/modules/halo/sounds/object_sfx/covenant_crate_open.ogg new file mode 100644 index 0000000000000..f6be061285b06 Binary files /dev/null and b/code/modules/halo/sounds/object_sfx/covenant_crate_open.ogg differ diff --git a/code/modules/halo/sounds/punch_sfx/brute_punch_1.ogg b/code/modules/halo/sounds/punch_sfx/brute_punch_1.ogg new file mode 100644 index 0000000000000..0226111234e49 Binary files /dev/null and b/code/modules/halo/sounds/punch_sfx/brute_punch_1.ogg differ diff --git a/code/modules/halo/sounds/spiker_melee.ogg b/code/modules/halo/sounds/spiker_melee.ogg new file mode 100644 index 0000000000000..8ecebd682c5a5 Binary files /dev/null and b/code/modules/halo/sounds/spiker_melee.ogg differ diff --git a/code/modules/halo/sounds/spiker_reload.ogg b/code/modules/halo/sounds/spiker_reload.ogg new file mode 100644 index 0000000000000..c32836b34b059 Binary files /dev/null and b/code/modules/halo/sounds/spiker_reload.ogg differ diff --git a/code/modules/halo/weapons/covenant/brute.dm b/code/modules/halo/weapons/covenant/brute.dm index 2e973d1cdec34..75ce181a469b7 100644 --- a/code/modules/halo/weapons/covenant/brute.dm +++ b/code/modules/halo/weapons/covenant/brute.dm @@ -71,6 +71,8 @@ load_method = MAGAZINE handle_casings = CASELESS fire_sound = 'code/modules/halo/sounds/Spikershotfire.ogg' + reload_sound = 'code/modules/halo/sounds/spiker_reload.ogg' + hitsound = 'code/modules/halo/sounds/spiker_melee.ogg' burst = 3 edge = 1 sharp = 1 @@ -159,6 +161,8 @@ caliber = "mauler" origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) fire_sound = 'code/modules/halo/sounds/mauler_firing.ogg' + reload_sound = 'code/modules/halo/sounds/mauler_reload.ogg' + hitsound = 'code/modules/halo/sounds/mauler_melee.ogg' edge = 1 sharp = 1 force = 35 @@ -265,7 +269,7 @@ if(get_dist(A,user) > 1) return - + var/atom/throw_target = get_edge_target_turf(A, get_dir(user, A)) if(istype(A, /mob/living) && !islarge(A) || istype(A, /obj/item/)) var/atom/movable/AM = A @@ -277,7 +281,7 @@ for(var/atom/movable/M in range(A,1)) if(M == user) continue - + if(M == A) continue @@ -313,6 +317,7 @@ icon_state = "bruteshot" item_state = "blank" pump_sound = null + hitsound = 'code/modules/halo/sounds/brute_shot_melee.ogg' fire_delay = 10 max_grenades = 6 one_hand_penalty = -1 diff --git a/code/modules/halo/weapons/covenant/melee.dm b/code/modules/halo/weapons/covenant/melee.dm index 23039a49c5a2a..1387c126e4160 100644 --- a/code/modules/halo/weapons/covenant/melee.dm +++ b/code/modules/halo/weapons/covenant/melee.dm @@ -92,7 +92,7 @@ item_state_slots = list( slot_l_hand_str = "[inhand_icon_state] l", slot_r_hand_str = "[inhand_icon_state] r" ) - hitsound = 'code/modules/halo/sounds/Energyswordhit.ogg' + hitsound = 'code/modules/halo/sounds/energy_sword_hit.ogg' parry_slice_objects = 1 /obj/item/weapon/melee/energy/elite_sword/activate(mob/living/user) diff --git a/maps/CRS_Unyielding_Transgression/CRS_Unyielding_Transgression.dmm b/maps/CRS_Unyielding_Transgression/CRS_Unyielding_Transgression.dmm index 32dc8eb08562b..c012d2c2604e3 100644 --- a/maps/CRS_Unyielding_Transgression/CRS_Unyielding_Transgression.dmm +++ b/maps/CRS_Unyielding_Transgression/CRS_Unyielding_Transgression.dmm @@ -809,7 +809,7 @@ "pC" = (/obj/structure/closet/crate/covenant{name = "Building Supplies"},/obj/item/stack/material/glass/phoronrglass/ten,/obj/item/stack/material/glass/phoronrglass/ten,/obj/item/stack/material/glass/phoronrglass/ten,/obj/item/stack/material/glass/phoronrglass/ten,/obj/item/stack/material/glass/phoronrglass/ten,/obj/item/stack/material/glass/phoronrglass/ten,/obj/item/stack/material/steel/fifty,/obj/item/stack/material/nanolaminate/fifty,/obj/item/stack/material/nanolaminate/fifty,/obj/item/stack/material/steel/fifty,/obj/item/stack/material/steel/fifty,/obj/item/stack/material/steel/fifty,/obj/item/stack/material/nanolaminate/fifty,/obj/item/stack/material/nanolaminate/fifty,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/centralengine) "pD" = (/obj/structure/closet/covenant{name = "Mining Equipment Storage Crate"},/obj/item/weapon/pickaxe/plasma_drill,/obj/item/weapon/pickaxe/plasma_drill,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/centralengine) "pE" = (/turf/unsimulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/centralengine) -"pF" = (/obj/structure/closet/crate/covenant,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/centralengine) +"pF" = (/obj/structure/closet/crate/covenant{name = "Light Tube Storage Crate"},/obj/item/weapon/storage/box/lights/tubes,/obj/item/weapon/storage/box/lights/tubes,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/centralengine) "pG" = (/obj/machinery/vending/armory/covenant/general/medical,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/mainmedicalbay) "pH" = (/obj/machinery/light/invis,/obj/structure/ai_routing_node/cov,/obj/machinery/smartfridge/chemistry/covenant{density = 0; pixel_y = -32},/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/mainmedicalbay) "pI" = (/obj/structure/table/marble,/obj/machinery/newscaster/covenant{pixel_y = -32},/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/vipquarters)