cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upstream merge 65785 (#12450)

Browse Source 
* Fish refactor. (#65785)

Refactors fish into proper paths.
Removes aquarium behaviour intermediary datums.
Moves fish functionality out of aquarium content component.
Fixes flopping animation resetting on dropping.

Simplifies everything. There should be no player facing changes.

The animate signal is kinda weak method of solving the animate queue issue but it seemed least intrusive to me.
Open to any better ideas.

* Fish refactor.

* Update fishing.dm

* Update fishing.dm

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: SkyratBot <skyratcommunity@gmail.com>
This commit is contained in:
Gandalf
2022-04-01 01:15:20 +01:00
committed by GitHub
co-authored by AnturK SkyratBot
parent 94a7033eb7
commit 575fdb7b12
15 changed files with 585 additions and 553 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/asset_cache/assets/fish.dm
+2 -2
View File
@@ -2,8 +2,8 @@
name = "fish"
/datum/asset/spritesheet/fish/create_spritesheets()
for (var/path in subtypesof(/datum/aquarium_behaviour/fish))
var/datum/aquarium_behaviour/fish/fish_type = path
for (var/path in subtypesof(/obj/item/fish))
var/obj/item/fish/fish_type = path
var/fish_icon = initial(fish_type.icon)
var/fish_icon_state = initial(fish_type.icon_state)
var/id = sanitize_css_class_name("[fish_icon][fish_icon_state]")