mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-21 02:57:48 +01:00
TGUI ORM MACHINE - Alloys Images (#19113)
* 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:
@@ -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")
|
||||
..()
|
||||
|
||||
@@ -286,6 +286,7 @@
|
||||
alloys += list(list(
|
||||
"id" = D.id,
|
||||
"name" = D.name,
|
||||
"description" = D.desc,
|
||||
"amount" = get_num_smeltable_alloy(D)
|
||||
))
|
||||
data["alloys"] = alloys
|
||||
@@ -375,7 +376,7 @@
|
||||
|
||||
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
|
||||
if(!ui)
|
||||
ui = new(user, src, ui_key, "OreRedemption", name, 400, 600)
|
||||
ui = new(user, src, ui_key, "OreRedemption", name, 500, 600)
|
||||
ui.open()
|
||||
ui.set_autoupdate(FALSE)
|
||||
|
||||
|
||||
@@ -206,6 +206,7 @@
|
||||
|
||||
/datum/design/rglass
|
||||
name = "Reinforced Glass"
|
||||
desc = "Metal + Glass"
|
||||
id = "rglass"
|
||||
build_type = AUTOLATHE | SMELTER
|
||||
materials = list(MAT_METAL = 1000, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
|
||||
|
||||
@@ -1,16 +1,17 @@
|
||||
///////SMELTABLE ALLOYS///////
|
||||
|
||||
/datum/design/plasteel_alloy
|
||||
name = "Plasteel (Plasma + Iron)"
|
||||
name = "Plasteel"
|
||||
desc = "Plasma + Iron"
|
||||
id = "plasteel"
|
||||
build_type = SMELTER
|
||||
materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT, MAT_PLASMA = MINERAL_MATERIAL_AMOUNT)
|
||||
build_path = /obj/item/stack/sheet/plasteel
|
||||
category = list("initial")
|
||||
|
||||
|
||||
/datum/design/plastitanium_alloy
|
||||
name = "Plastitanium (Plasma + Titanium)"
|
||||
name = "Plastitanium"
|
||||
desc = "Plasma + Titanium"
|
||||
id = "plastitanium"
|
||||
build_type = SMELTER
|
||||
materials = list(MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT, MAT_PLASMA = MINERAL_MATERIAL_AMOUNT)
|
||||
@@ -18,7 +19,8 @@
|
||||
category = list("initial")
|
||||
|
||||
/datum/design/plaglass_alloy
|
||||
name = "Plasma Glass (Plasma + Glass)"
|
||||
name = "Plasma Glass"
|
||||
desc = "Plasma + Glass"
|
||||
id = "plasmaglass"
|
||||
build_type = SMELTER
|
||||
materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
|
||||
@@ -26,7 +28,8 @@
|
||||
category = list("initial")
|
||||
|
||||
/datum/design/titaniumglass_alloy
|
||||
name = "Titanium Glass (Titanium + Glass)"
|
||||
name = "Titanium Glass"
|
||||
desc = "Titanium + Glass"
|
||||
id = "titaniumglass"
|
||||
build_type = SMELTER
|
||||
materials = list(MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
|
||||
@@ -34,7 +37,8 @@
|
||||
category = list("initial")
|
||||
|
||||
/datum/design/plastitaniumglass_alloy
|
||||
name = "Plastitanium Glass (Plasma + Titanium + Glass)"
|
||||
name = "Plastitanium Glass"
|
||||
desc = "Plasma + Titanium + Glass"
|
||||
id = "plastitaniumglass"
|
||||
build_type = SMELTER
|
||||
materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT, MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
|
||||
|
||||
Reference in New Issue
Block a user