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

TGUI ORM MACHINE - Alloys Images (#19113)

Browse Source 
* ORM improved alloy name

* capital letter

* Add images to "Alloys" on ORM

* FML-main part done

* Few changes

* Recipe and Descriptions

* Forgot this. widens the ORM

* quick fix

* Slight alignment fix. New images on PR

* TGUI merge conflict and tiny alignment

* diff line endings!

* added ;

* Holes and stuff

* merge conflict fix, hopefully

* SMELT moved

* Alignment and tgui bundle

* Merge Conflict fix

* Update to master + tgui bundle

* TGUI Bundle

* TGUI BUNDLE

Co-authored-by: Henri23729 <iki-hs@hotmail.com>
This commit is contained in:
Deniz
2022-10-25 23:48:53 +01:00
committed by GitHub
co-authored by Henri23729
parent 7a8cef043a
commit a272267193
6 changed files with 164 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/asset_cache.dm
+2 -1
View File
@@ -329,7 +329,8 @@ GLOBAL_LIST_EMPTY(asset_datums)
verify = FALSE
/datum/asset/simple/materials/register()
for(var/n in list("metal", "glass", "silver", "gold", "diamond", "uranium", "plasma", "clown", "mime", "titanium", "plastic"))
for(var/n in list("metal", "glass", "silver", "gold", "diamond", "uranium", "plasma", "clown", "mime", "titanium", "plastic",
"rglass", "plasteel", "plastitanium", "plasmaglass", "titaniumglass", "plastitaniumglass"))
assets["sheet-[n].png"] = icon('icons/obj/items.dmi', "sheet-[n]")
assets["sheet-bluespace.png"] = icon('icons/obj/telescience.dmi', "polycrystal")
..()