cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 18:11:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #47492 from MrPerson/material_color_improvments

Browse Source 
Improved material colors
This commit is contained in:
81Denton
2019-11-01 10:42:27 +01:00
committed by GitHub
parent 68bbf9a9e0 9e204afd58
commit dce27bac3d
19 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
code/datums/materials/basemats.dm
View File

@@ -13,7 +13,7 @@
name = "glass"
id = "glass"
desc = "Glass forged by melting sand."
color = "#dae6f0"
color = "#88cdf1"
alpha = 150
categories = list(MAT_CATEGORY_RIGID = TRUE)
integrity_modifier = 0.1
@@ -22,18 +22,17 @@
beauty_modifier = 0.05
armor_modifiers = list("melee" = 0.2, "bullet" = 0.2, "laser" = 0, "energy" = 1, "bomb" = 0, "bio" = 0.2, "rad" = 0.2, "fire" = 1, "acid" = 0.2) // yeah ok retard
/*A few materials use color matrices. I recommend you just look them up, but for dummies:
First element should be tha target color
Second and third should be different shades of the same color but very dark
Fourth element is alpha, don't touch it.
You can make it look way better by just looking them up, but I understand if you just want to quickly make something thats passable*/
/*
Color matrices are like regular colors but unlike with normal colors, you can go over 255 on a channel.
Unless you know what you're doing, only use the first three numbers. They're in RGB order.
*/
///Has no special properties. Could be good against vampires in the future perhaps.
/datum/material/silver
name = "silver"
id = "silver"
desc = "Silver"
color = list(rgb(154, 170, 181), rgb(68, 89, 102), rgb(92, 92, 92), rgb(0,0,0))
color = list(255/255, 284/255, 302/255,0, 0,0,0,0, 0,0,0,0, 0,0,0,1, 0,0,0,0)
categories = list(MAT_CATEGORY_ORE = TRUE, MAT_CATEGORY_RIGID = TRUE)
sheet_type = /obj/item/stack/sheet/mineral/silver
value_per_unit = 0.025
@@ -44,7 +43,7 @@ You can make it look way better by just looking them up, but I understand if you
name = "gold"
id = "gold"
desc = "Gold"
color = list(rgb(232, 201, 23), rgb(79, 82, 1), rgb(143, 129, 43), rgb(0,0,0))
color = list(340/255, 240/255, 50/255,0, 0,0,0,0, 0,0,0,0, 0,0,0,1, 0,0,0,0) //gold is shiny, but not as bright as bananium
strength_modifier = 1.2
categories = list(MAT_CATEGORY_ORE = TRUE, MAT_CATEGORY_RIGID = TRUE)
sheet_type = /obj/item/stack/sheet/mineral/gold
@@ -57,10 +56,10 @@ You can make it look way better by just looking them up, but I understand if you
name = "diamond"
id = "diamond"
desc = "Highly pressurized carbon"
color = "#22c2d4"
color = list(48/255, 272/255, 301/255,0, 0,0,0,0, 0,0,0,0, 0,0,0,1, 0,0,0,0)
categories = list(MAT_CATEGORY_ORE = TRUE, MAT_CATEGORY_RIGID = TRUE)
sheet_type = /obj/item/stack/sheet/mineral/diamond
alpha = 150
alpha = 132
value_per_unit = 0.25
beauty_modifier = 0.3
armor_modifiers = list("melee" = 1.3, "bullet" = 1.3, "laser" = 0.6, "energy" = 1, "bomb" = 1.2, "bio" = 1, "rad" = 1, "fire" = 1, "acid" = 1)
@@ -70,7 +69,7 @@ You can make it look way better by just looking them up, but I understand if you
name = "uranium"
id = "uranium"
desc = "Uranium"
color = list(rgb(2, 115, 2), rgb(35, 74, 24), rgb(11, 48, 0), rgb(0,0,0))
color = rgb(48, 237, 26)
categories = list(MAT_CATEGORY_ORE = TRUE, MAT_CATEGORY_RIGID = TRUE)
sheet_type = /obj/item/stack/sheet/mineral/uranium
value_per_unit = 0.05
@@ -90,7 +89,7 @@ You can make it look way better by just looking them up, but I understand if you
name = "plasma"
id = "plasma"
desc = "Isn't plasma a state of matter? Oh whatever."
color = list(rgb(161, 10, 163), rgb(85, 36, 110), rgb(52, 0, 79), rgb(0,0,0))
color = list(298/255, 46/255, 352/255,0, 0,0,0,0, 0,0,0,0, 0,0,0,1, 0,0,0,0)
categories = list(MAT_CATEGORY_ORE = TRUE, MAT_CATEGORY_RIGID = TRUE)
sheet_type = /obj/item/stack/sheet/mineral/plasma
value_per_unit = 0.1
@@ -113,7 +112,7 @@ You can make it look way better by just looking them up, but I understand if you
name = "bluespace crystal"
id = "bluespace_crystal"
desc = "Crystals with bluespace properties"
color = list(rgb(72, 104, 240), rgb(46, 74, 92), rgb(1, 39, 64), rgb(0,0,0))
color = list(119/255, 217/255, 396/255,0, 0,0,0,0, 0,0,0,0, 0,0,0,1, 0,0,0,0)
alpha = 200
categories = list(MAT_CATEGORY_ORE = TRUE)
beauty_modifier = 0.5
@@ -125,7 +124,7 @@ You can make it look way better by just looking them up, but I understand if you
name = "bananium"
id = "bananium"
desc = "Material with hilarious properties"
color = "#fff263"
color = list(460/255, 464/255, 0, 0, 0,0,0,0, 0,0,0,0, 0,0,0,1, 0,0,0,0) //obnoxiously bright yellow
categories = list(MAT_CATEGORY_ORE = TRUE, MAT_CATEGORY_RIGID = TRUE)
sheet_type = /obj/item/stack/sheet/mineral/bananium
value_per_unit = 0.5
@@ -208,7 +207,7 @@ You can make it look way better by just looking them up, but I understand if you
name = "mythril"
id = "mythril"
desc = "How this even exists is byond me"
color = "#ffedee"
color = "#f2d5d7"
categories = list(MAT_CATEGORY_RIGID = TRUE)
sheet_type = /obj/item/stack/sheet/mineral/mythril
value_per_unit = 0.75