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

Merge pull request #9821 from mwerezak/tableshaveturned

Browse Source 
Makes standard tables plastic, related changes
This commit is contained in:
Zuhayr
2015-06-17 14:35:22 +09:30
parent 1cd00056b5 3715fafae3
commit 031c7db3e5
9 changed files with 379 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/materials/materials.dm
+8 -1
View File
@@ -292,6 +292,7 @@ var/list/name_to_material
/material/steel
name = DEFAULT_WALL_MATERIAL
stack_type = /obj/item/stack/material/steel
integrity = 150
icon_base = "solid"
icon_reinf = "reinf_over"
icon_colour = "#666666"
@@ -305,7 +306,7 @@ var/list/name_to_material
/material/plasteel
name = "plasteel"
stack_type = /obj/item/stack/material/plasteel
integrity = 800
integrity = 400
melting_point = 6000
icon_base = "solid"
icon_reinf = "reinf_over"
@@ -456,6 +457,12 @@ var/list/name_to_material
weight = 12
stack_origin_tech = "materials=3"
/material/plastic/holographic
name = "holographic plastic"
display_name = "plastic"
stack_type = null
shard_type = SHARD_NONE
/material/osmium
name = "osmium"
stack_type = /obj/item/stack/material/osmium
code/modules/tables/presets.dm
+17 -9
View File
@@ -1,19 +1,19 @@
/obj/structure/table
standard
icon_state = "plain_preview"
color = "#EEEEEE"
New()
material = get_material_by_name(DEFAULT_TABLE_MATERIAL)
..()
steel
icon_state = "plain_preview"
color = "#666666"
New()
material = get_material_by_name(DEFAULT_WALL_MATERIAL)
..()
plastic
icon_state = "plain_preview"
color = "#EEEEEE"
New()
material = get_material_by_name("plastic")
..()
marble
icon_state = "stone_preview"
color = "#CCCCCC"
@@ -22,6 +22,14 @@
..()
reinforced
icon_state = "reinf_preview"
color = "#EEEEEE"
New()
material = get_material_by_name(DEFAULT_TABLE_MATERIAL)
reinforced = get_material_by_name(DEFAULT_WALL_MATERIAL)
..()
steel_reinforced
icon_state = "reinf_preview"
color = "#666666"
New()
@@ -53,9 +61,9 @@
holotable
icon_state = "holo_preview"
color = "#666666"
color = "#EEEEEE"
New()
material = get_material_by_name("holographic [DEFAULT_WALL_MATERIAL]")
material = get_material_by_name("holographic [DEFAULT_TABLE_MATERIAL]")
..()
woodentable/holotable