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

Fix Aquarium Sprites #1568

Merged
merged 1 commit into from
Oct 22, 2023
Merged

Fix Aquarium Sprites #1568

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
2 changes: 0 additions & 2 deletions ModularTegustation/fishing/code/fish/freshwater_fish.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@
name = "cory catfish"
desc = "A catfish has about 100,000 taste buds, and their bodies are covered with them to help detect chemicals present in the water and also to respond to touch."
icon_state = "catfish"
dedicated_in_aquarium_icon_state = "fish_greyscale"
aquarium_vc_color = "#907420"
average_size = 100
average_weight = 2000

Expand Down
3 changes: 0 additions & 3 deletions ModularTegustation/fishing/code/fish/saltwater_fish.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
name = "cardinalfish"
desc = "Cardinalfish are often found near sea urchins, where the fish hide when threatened."
icon_state = "cardinalfish"
dedicated_in_aquarium_icon_state = "fish_greyscale"
average_size = 30
average_weight = 500
stable_population = 4
Expand All @@ -41,8 +40,6 @@
name = "green chromis"
desc = "The Chromis can vary in color from blue to green depending on the lighting and distance from the lights."
icon_state = "greenchromis"
dedicated_in_aquarium_icon_state = "fish_greyscale"
aquarium_vc_color = "#00ff00"
average_size = 30
average_weight = 500
stable_population = 5
Expand Down
1 change: 1 addition & 0 deletions code/datums/components/aquarium.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
aquarium_vc_color = fish.aquarium_vc_color

if(fish.dedicated_in_aquarium_icon_state)
icon = 'icons/obj/aquarium.dmi'
icon_state = fish.dedicated_in_aquarium_icon_state
base_transform = matrix()
else
Expand Down