Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sound Additions & Minor Sprite Fix #3573

Merged
merged 3 commits into from
Nov 4, 2024
Merged

Sound Additions & Minor Sprite Fix #3573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97c52cf
Various Additions
YourPalHolidays Nov 4, 2024
f4f9247
Revert "Various Additions"
YourPalHolidays Nov 4, 2024
d5eff8b
Various Additions
YourPalHolidays Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/modules/halo/covenant/species/jiralhanae/jiralhanae.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions code/modules/halo/covenant/structures_machines/closet.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Binary file modified code/modules/halo/covenant/structures_machines/light.dmi
View file
Open in desktop
Binary file not shown.
4 changes: 3 additions & 1 deletion code/modules/halo/covenant/structures_machines/storage.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
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'
Binary file added code/modules/halo/sounds/brute_shot_melee.ogg
View file
Open in desktop
Binary file not shown.
Binary file added code/modules/halo/sounds/energy_sword_hit.ogg
View file
Open in desktop
Binary file not shown.
Binary file added code/modules/halo/sounds/mauler_melee.ogg
View file
Open in desktop
Binary file not shown.
Binary file added code/modules/halo/sounds/mauler_reload.ogg
View file
Open in desktop
Binary file not shown.
Binary file added code/modules/halo/sounds/object_sfx/covenant_crate_close.ogg
View file
Open in desktop
Binary file not shown.
Binary file added code/modules/halo/sounds/object_sfx/covenant_crate_open.ogg
View file
Open in desktop
Binary file not shown.
Binary file added code/modules/halo/sounds/punch_sfx/brute_punch_1.ogg
View file
Open in desktop
Binary file not shown.
Binary file added code/modules/halo/sounds/spiker_melee.ogg
View file
Open in desktop
Binary file not shown.
Binary file added code/modules/halo/sounds/spiker_reload.ogg
View file
Open in desktop
Binary file not shown.
9 changes: 7 additions & 2 deletions code/modules/halo/weapons/covenant/brute.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -277,7 +281,7 @@
for(var/atom/movable/M in range(A,1))
if(M == user)
continue

if(M == A)
continue

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/halo/weapons/covenant/melee.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion maps/CRS_Unyielding_Transgression/CRS_Unyielding_Transgression.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading