cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 23:17:02 +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/research/designs/autolathe_designs.dm
+1
View File
@@ -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)
code/modules/research/designs/smelting_designs.dm
+10 -6
View File
@@ -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)