cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 06:58:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	.travis.yml
	code/setup.dm
	maps/exodus-1.dmm
	maps/exodus-5.dmm
This commit is contained in:
PsiOmegaDelta
2015-06-17 09:33:34 +02:00
parent 167655b681 5c22ba85c0
commit 772488fadc
12 changed files with 1252 additions and 1223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/materials/materials.dm
+8 -1
View File
@@ -290,6 +290,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"
@@ -303,7 +304,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"
@@ -457,6 +458,12 @@ var/list/name_to_material
weight = 12
stack_origin_tech = list(TECH_MATERIAL = 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