cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-17 01:54:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

some moire

Browse Source
This commit is contained in:
Kashargul
2024-12-06 21:54:05 +01:00
parent 80edcd2c3d
commit 429398bdd7
231 changed files with 2484 additions and 1945 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/materials/materials/metals/metals.dm
+21 -21
View File
@@ -4,7 +4,7 @@
// Very rare alloy that is reflective, should be used sparingly.
/datum/material/durasteel
name = "durasteel"
name = MAT_DURASTEEL
stack_type = /obj/item/stack/material/durasteel
integrity = 600
melting_point = 7000
@@ -41,7 +41,7 @@
)
/datum/material/iron
name = "iron"
name = MAT_IRON
stack_type = /obj/item/stack/material/iron
icon_colour = "#5C5454"
weight = 22
@@ -61,7 +61,7 @@
supply_conversion_value = 2
/datum/material/gold
name = "gold"
name = MAT_GOLD
stack_type = /obj/item/stack/material/gold
icon_colour = "#EDD12F"
weight = 24
@@ -73,7 +73,7 @@
supply_conversion_value = 2
/datum/material/silver
name = "silver"
name = MAT_SILVER
stack_type = /obj/item/stack/material/silver
icon_colour = "#D1E6E3"
weight = 22
@@ -85,7 +85,7 @@
supply_conversion_value = 2
/datum/material/platinum
name = "platinum"
name = MAT_PLATINUM
stack_type = /obj/item/stack/material/platinum
icon_colour = "#9999FF"
weight = 27
@@ -96,7 +96,7 @@
supply_conversion_value = 5
/datum/material/uranium
name = "uranium"
name = MAT_URANIUM
stack_type = /obj/item/stack/material/uranium
radioactivity = 12
icon_base = "stone"
@@ -108,7 +108,7 @@
supply_conversion_value = 2
/datum/material/mhydrogen
name = "mhydrogen"
name = MAT_METALHYDROGEN
stack_type = /obj/item/stack/material/mhydrogen
icon_colour = "#E6C5DE"
stack_origin_tech = list(TECH_MATERIAL = 6, TECH_POWER = 6, TECH_MAGNET = 5)
@@ -117,7 +117,7 @@
supply_conversion_value = 6
/datum/material/deuterium
name = "deuterium"
name = MAT_DEUTERIUM
stack_type = /obj/item/stack/material/deuterium
icon_colour = "#999999"
stack_origin_tech = list(TECH_MATERIAL = 3)
@@ -127,7 +127,7 @@
conductive = 0
/datum/material/tritium
name = "tritium"
name = MAT_TRITIUM
stack_type = /obj/item/stack/material/tritium
icon_colour = "#777777"
stack_origin_tech = list(TECH_MATERIAL = 5)
@@ -137,7 +137,7 @@
conductive = 0
/datum/material/osmium
name = "osmium"
name = MAT_OSMIUM
stack_type = /obj/item/stack/material/osmium
icon_colour = "#9999FF"
stack_origin_tech = list(TECH_MATERIAL = 5)
@@ -164,7 +164,7 @@
stack_origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 2)
/datum/material/bronze
name = "bronze"
name = MAT_BRONZE
stack_type = /obj/item/stack/material/bronze
icon_colour = "#EDD12F"
icon_base = "solid"
@@ -174,9 +174,9 @@
protectiveness = 9 // 33%
/datum/material/tin
name = "tin"
display_name = "tin"
use_name = "tin"
name = MAT_TIN
display_name = MAT_TIN
use_name = MAT_TIN
stack_type = /obj/item/stack/material/tin
icon_colour = "#b2afaf"
sheet_singular_name = "ingot"
@@ -186,9 +186,9 @@
weight = 13
/datum/material/copper
name = "copper"
display_name = "copper"
use_name = "copper"
name = MAT_COPPER
display_name = MAT_COPPER
use_name = MAT_COPPER
stack_type = /obj/item/stack/material/copper
conductivity = 52
icon_colour = "#af633e"
@@ -199,12 +199,12 @@
hardness = 50
/datum/material/aluminium
name = "aluminium"
display_name = "aluminium"
use_name = "aluminium"
name = MAT_ALUMINIUM
display_name = MAT_ALUMINIUM
use_name = MAT_ALUMINIUM
icon_colour = "#e5e2d0"
stack_type = /obj/item/stack/material/aluminium
sheet_singular_name = "ingot"
sheet_plural_name = "ingots"
supply_conversion_value = 2
weight = 10
weight = 10
code/modules/materials/sheets/metals/metal.dm
+32 -32
View File
@@ -6,9 +6,9 @@
apply_colour = TRUE
/obj/item/stack/material/plasteel
name = "plasteel"
name = MAT_PLASTEEL
icon_state = "sheet-reinforced"
default_type = "plasteel"
default_type = MAT_PLASTEEL
no_variants = FALSE
apply_colour = TRUE
@@ -26,10 +26,10 @@
icon_state = "rods"
/obj/item/stack/material/durasteel
name = "durasteel"
name = MAT_DURASTEEL
icon_state = "sheet-reinforced"
item_state = "sheet-metal"
default_type = "durasteel"
default_type = MAT_DURASTEEL
no_variants = FALSE
apply_colour = TRUE
@@ -42,112 +42,112 @@
no_variants = FALSE
/obj/item/stack/material/iron
name = "iron"
name = MAT_IRON
icon_state = "sheet-ingot"
default_type = "iron"
default_type = MAT_IRON
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/lead
name = "lead"
name = MAT_LEAD
icon_state = "sheet-ingot"
default_type = "lead"
default_type = MAT_LEAD
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/gold
name = "gold"
name = MAT_GOLD
icon_state = "sheet-ingot"
default_type = "gold"
default_type = MAT_GOLD
no_variants = FALSE
apply_colour = TRUE
/obj/item/stack/material/silver
name = "silver"
name = MAT_SILVER
icon_state = "sheet-ingot"
default_type = "silver"
default_type = MAT_SILVER
no_variants = FALSE
apply_colour = TRUE
//Valuable resource, cargo can sell it.
/obj/item/stack/material/platinum
name = "platinum"
name = MAT_PLATINUM
icon_state = "sheet-adamantine"
default_type = "platinum"
default_type = MAT_PLATINUM
no_variants = FALSE
apply_colour = TRUE
/obj/item/stack/material/uranium
name = "uranium"
name = MAT_URANIUM
icon_state = "sheet-uranium"
default_type = "uranium"
default_type = MAT_URANIUM
no_variants = FALSE
//Extremely valuable to Research.
/obj/item/stack/material/mhydrogen
name = "metallic hydrogen"
icon_state = "sheet-mythril"
default_type = "mhydrogen"
default_type = MAT_METALHYDROGEN
no_variants = FALSE
// Fusion fuel.
/obj/item/stack/material/deuterium
name = "deuterium"
name = MAT_DEUTERIUM
icon_state = "sheet-puck"
default_type = "deuterium"
default_type = MAT_DEUTERIUM
apply_colour = 1
no_variants = FALSE
//Fuel for MRSPACMAN generator.
/obj/item/stack/material/tritium
name = "tritium"
name = MAT_TRITIUM
icon_state = "sheet-puck"
default_type = "tritium"
default_type = MAT_TRITIUM
apply_colour = TRUE
no_variants = FALSE
/obj/item/stack/material/osmium
name = "osmium"
name = MAT_OSMIUM
icon_state = "sheet-ingot"
default_type = "osmium"
default_type = MAT_OSMIUM
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/graphite
name = "graphite"
name = MAT_GRAPHITE
icon_state = "sheet-puck"
default_type = MAT_GRAPHITE
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/bronze
name = "bronze"
name = MAT_BRONZE
icon_state = "sheet-ingot"
singular_name = "bronze ingot"
default_type = "bronze"
default_type = MAT_BRONZE
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/tin
name = "tin"
name = MAT_TIN
icon_state = "sheet-ingot"
singular_name = "tin ingot"
default_type = "tin"
default_type = MAT_TIN
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/copper
name = "copper"
name = MAT_COPPER
icon_state = "sheet-ingot"
singular_name = "copper ingot"
default_type = "copper"
default_type = MAT_COPPER
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/aluminium
name = "aluminium"
name = MAT_ALUMINIUM
icon_state = "sheet-ingot"
singular_name = "aluminium ingot"
default_type = "aluminium"
default_type = MAT_ALUMINIUM
apply_colour = 1
no_variants = FALSE