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

Merge pull request #6740 from Heroman3003/orangeyellow

Browse Source 
Adds orange and yellow cloth materials
This commit is contained in:
Atermonera
2020-02-26 17:25:43 -08:00
committed by VirgoBot
parent e0000671dc
commit 695ea645fe
3 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/materials/material_recipes.dm
View File

@@ -45,6 +45,8 @@
new/datum/stack_recipe("blue comfy chair", /obj/structure/bed/chair/comfy/blue, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("purple comfy chair", /obj/structure/bed/chair/comfy/purp, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("green comfy chair", /obj/structure/bed/chair/comfy/green, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("yellow comfy chair", /obj/structure/bed/chair/comfy/yellow, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("orange comfy chair", /obj/structure/bed/chair/comfy/orange, 2, one_per_turf = 1, on_floor = 1), \
))
recipes += new/datum/stack_recipe("table frame", /obj/structure/table, 1, time = 10, one_per_turf = 1, on_floor = 1)
recipes += new/datum/stack_recipe("bench frame", /obj/structure/table/bench, 1, time = 10, one_per_turf = 1, on_floor = 1)

22
code/modules/materials/materials.dm
View File

@@ -1112,6 +1112,28 @@ var/list/name_to_material
protectiveness = 1 // 4%
conductive = 0
/material/cloth_yellow
name = "yellow"
display_name = "yellow"
use_name = "yellow cloth"
icon_colour = "#EEF573"
flags = MATERIAL_PADDING
ignition_point = T0C+232
melting_point = T0C+300
protectiveness = 1 // 4%
conductive = 0
/material/cloth_orange
name = "orange"
display_name = "orange"
use_name = "orange cloth"
icon_colour = "#E3BF49"
flags = MATERIAL_PADDING
ignition_point = T0C+232
melting_point = T0C+300
protectiveness = 1 // 4%
conductive = 0
/material/toy_foam
name = "foam"
display_name = "foam"