cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +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

18
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
View File

@@ -125,6 +125,12 @@
/obj/structure/bed/chair/comfy/lime/New(var/newloc,var/newmaterial) /obj/structure/bed/chair/comfy/lime/New(var/newloc,var/newmaterial)
..(newloc,"steel","lime") ..(newloc,"steel","lime")
/obj/structure/bed/chair/comfy/yellow/New(var/newloc,var/newmaterial)
..(newloc,"steel","yellow")
/obj/structure/bed/chair/comfy/orange/New(var/newloc,var/newmaterial)
..(newloc,"steel","orange")
/obj/structure/bed/chair/office /obj/structure/bed/chair/office
anchored = 0 anchored = 0
buckle_movable = 1 buckle_movable = 1
@@ -272,6 +278,9 @@
/obj/structure/bed/chair/sofa/yellow /obj/structure/bed/chair/sofa/yellow
sofa_material = "yellow" sofa_material = "yellow"
/obj/structure/bed/chair/sofa/orange
sofa_material = "orange"
//sofa directions //sofa directions
/obj/structure/bed/chair/sofa/left /obj/structure/bed/chair/sofa/left
@@ -363,3 +372,12 @@
/obj/structure/bed/chair/sofa/yellow/corner /obj/structure/bed/chair/sofa/yellow/corner
icon_state = "sofacorner" icon_state = "sofacorner"
/obj/structure/bed/chair/sofa/orange/left
icon_state = "sofaend_left"
/obj/structure/bed/chair/sofa/orange/right
icon_state = "sofaend_right"
/obj/structure/bed/chair/sofa/orange/corner
icon_state = "sofacorner"

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("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("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("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("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) 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% protectiveness = 1 // 4%
conductive = 0 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 /material/toy_foam
name = "foam" name = "foam"
display_name = "foam" display_name = "foam"