cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pogo

Browse Source
This commit is contained in:
FalseIncarnate
2016-09-06 05:28:43 -04:00
parent 05112f6669 0ce93c9706
commit dd26a99a26
189 changed files with 1934 additions and 1560 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/asset_cache.dm
+2 -2
View File
@@ -270,8 +270,8 @@ proc/getFilesSlow(var/client/client, var/list/files, var/register_asset = TRUE)
/datum/asset/chem_master/register()
for(var/i = 1 to 20)
assets["pill[i].png"] = icon('icons/obj/chemical.dmi', "pill[i]")
for(var/i = 1 to 20)
assets["bottle[i].png"] = icon('icons/obj/chemical.dmi', "bottle[i]")
for(var/i in list("bottle", "small_bottle", "wide_bottle", "round_bottle"))
assets["[i].png"] = icon('icons/obj/chemical.dmi', "[i]")
for(var/asset_name in assets)
register_asset(asset_name, assets[asset_name])