cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-28 15:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use material defines more

Browse Source
This commit is contained in:
Chompstation Bot
2021-07-07 19:02:05 +00:00
parent 7e10238662
commit 287a5deee3
205 changed files with 4579 additions and 865 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/tables/presets.dm
+12 -12
View File
@@ -12,7 +12,7 @@
color = "#666666"
/obj/structure/table/steel/New()
material = get_material_by_name(DEFAULT_WALL_MATERIAL)
material = get_material_by_name(MAT_STEEL)
..()
/obj/structure/table/marble
@@ -29,7 +29,7 @@
/obj/structure/table/reinforced/New()
material = get_material_by_name(DEFAULT_TABLE_MATERIAL)
reinforced = get_material_by_name(DEFAULT_WALL_MATERIAL)
reinforced = get_material_by_name(MAT_STEEL)
..()
/obj/structure/table/steel_reinforced
@@ -37,8 +37,8 @@
color = "#666666"
/obj/structure/table/steel_reinforced/New()
material = get_material_by_name(DEFAULT_WALL_MATERIAL)
reinforced = get_material_by_name(DEFAULT_WALL_MATERIAL)
material = get_material_by_name(MAT_STEEL)
reinforced = get_material_by_name(MAT_STEEL)
..()
/obj/structure/table/wooden_reinforced
@@ -47,7 +47,7 @@
/obj/structure/table/wooden_reinforced/New()
material = get_material_by_name("wood")
reinforced = get_material_by_name(DEFAULT_WALL_MATERIAL)
reinforced = get_material_by_name(MAT_STEEL)
..()
/obj/structure/table/woodentable
@@ -72,7 +72,7 @@
/obj/structure/table/sifwooden_reinforced/New()
material = get_material_by_name("alien wood")
reinforced = get_material_by_name(DEFAULT_WALL_MATERIAL)
reinforced = get_material_by_name(MAT_STEEL)
..()
/obj/structure/table/gamblingtable
@@ -147,7 +147,7 @@
color = "#666666"
/obj/structure/table/bench/steel/New()
material = get_material_by_name(DEFAULT_WALL_MATERIAL)
material = get_material_by_name(MAT_STEEL)
..()
@@ -165,7 +165,7 @@
/obj/structure/table/bench/reinforced/New()
material = get_material_by_name(DEFAULT_TABLE_MATERIAL)
reinforced = get_material_by_name(DEFAULT_WALL_MATERIAL)
reinforced = get_material_by_name(MAT_STEEL)
..()
/obj/structure/table/bench/steel_reinforced
@@ -173,8 +173,8 @@
color = "#666666"
/obj/structure/table/bench/steel_reinforced/New()
material = get_material_by_name(DEFAULT_WALL_MATERIAL)
reinforced = get_material_by_name(DEFAULT_WALL_MATERIAL)
material = get_material_by_name(MAT_STEEL)
reinforced = get_material_by_name(MAT_STEEL)
..()
/obj/structure/table/bench/wooden_reinforced
@@ -183,7 +183,7 @@
/obj/structure/table/bench/wooden_reinforced/New()
material = get_material_by_name("wood")
reinforced = get_material_by_name(DEFAULT_WALL_MATERIAL)
reinforced = get_material_by_name(MAT_STEEL)
..()
*/
/obj/structure/table/bench/wooden
@@ -210,7 +210,7 @@
icon_state = "padded_preview"
/obj/structure/table/bench/padded/New()
material = get_material_by_name(DEFAULT_WALL_MATERIAL)
material = get_material_by_name(MAT_STEEL)
carpeted = 1
..()
code/modules/tables/rack_vr.dm
+2 -2
View File
@@ -2,7 +2,7 @@
color = "#666666"
/obj/structure/table/rack/steel/New()
material = get_material_by_name(DEFAULT_WALL_MATERIAL)
material = get_material_by_name(MAT_STEEL)
..()
/obj/structure/table/rack/shelf
@@ -15,5 +15,5 @@
color = "#666666"
/obj/structure/table/rack/shelf/steel/New()
material = get_material_by_name(DEFAULT_WALL_MATERIAL)
material = get_material_by_name(MAT_STEEL)
..()
code/modules/tables/tables.dm
+1 -1
View File
@@ -322,7 +322,7 @@ var/list/table_icon_cache = list()
if(full_return || prob(20))
new /obj/item/stack/material/steel(src.loc)
else
var/datum/material/M = get_material_by_name(DEFAULT_WALL_MATERIAL)
var/datum/material/M = get_material_by_name(MAT_STEEL)
S = M.place_shard(loc)
if(S) shards += S
qdel(src)