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

Dropship Move Sound Effects & Swamp Tree Icon Fix #3531

Merged
merged 1 commit into from
Feb 4, 2024
Merged

Dropship Move Sound Effects & Swamp Tree Icon Fix #3531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/flora/swamp_tree.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/obj/structure/flora/tree/swamp_tree
name = "glowing tree"
desc = "A large, sturdy, glowing tree."
icon = 'code/modules/halo/icons/flora/swamp_tree.dmi'
anchored = 1
density = 1

Expand Down
Binary file added code/modules/halo/sounds/vehicle_sfx/pelican_move.ogg
View file
Open in desktop
Binary file not shown.
Binary file added code/modules/halo/sounds/vehicle_sfx/phantom_move.ogg
View file
Open in desktop
Binary file not shown.
8 changes: 8 additions & 0 deletions code/modules/halo/vehicles/types/pelican.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@

overmap_range = 10

move_sound = 'code/modules/halo/sounds/vehicle_sfx/pelican_move.ogg'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can just put these sfx links in the baseline define for the vehicle so it's passed down to subtypes, rather than putting one in each subtype


takeoff_overlay_icon_state = "thrust"
takeoff_sound = 'code/modules/halo/shuttles/pelican_takeoff.ogg'

Expand Down Expand Up @@ -131,6 +133,8 @@
/obj/vehicles/air/overmap/pelican/unsc
faction = "UNSC"

move_sound = 'code/modules/halo/sounds/vehicle_sfx/pelican_move.ogg'

spawn_datum = /datum/mobile_spawn/unsc

/obj/vehicles/air/overmap/pelican/urf
Expand All @@ -140,6 +144,8 @@
desc = "A versatile aircraft used by the UNSC for medium-lift operations of personnel, vehicles and equipment. This one has a red fist painted onto the armor. A 40mm Chain-Gun is mounted on the nose."
faction = "Insurrection"

move_sound = 'code/modules/halo/sounds/vehicle_sfx/pelican_move.ogg'

comp_prof = /datum/component_profile/pelican/urf

ammo_containers = newlist(/obj/item/ammo_magazine/pelican_chaingun)
Expand Down Expand Up @@ -183,6 +189,8 @@
faction = "police"
occupants = list(6,0)

move_sound = 'code/modules/halo/sounds/vehicle_sfx/pelican_move.ogg'

comp_prof = /datum/component_profile/pelican/civ

/obj/item/vehicle_component/health_manager/pelican/civ
Expand Down
2 changes: 2 additions & 0 deletions code/modules/halo/vehicles/types/phantom_dropship.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
takeoff_sound = null
overmap_range = 10

move_sound = 'code/modules/halo/sounds/vehicle_sfx/phantom_move.ogg'

comp_prof = /datum/component_profile/phantom

spawn_datum = /datum/mobile_spawn/covenant
Expand Down
Loading