cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-08-22 12:36:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #59 from Azarak/master

Browse Source 
It's me trying to fix a conflict and I've never done this don't mind me
This commit is contained in:
quotefox
2019-11-08 20:48:47 +00:00
committed by GitHub
parent 1699ed1d94 95d7876b1f
commit 19810f7e98
70 changed files with 1963 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/asset_cache.dm
+8
View File
@@ -677,3 +677,11 @@ GLOBAL_LIST_EMPTY(asset_datums)
Insert(initial(D.id), I)
return ..()
/datum/asset/simple/genetics
assets = list(
"dna_discovered.gif" = 'html/dna_discovered.gif',
"dna_undiscovered.gif" = 'html/dna_undiscovered.gif',
"dna_extra.gif" = 'html/dna_extra.gif'
)