cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 19:44:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1169 from Kelenius/fixesOnly

Browse Source 
Axes old wire, fixes costs in lathe
This commit is contained in:
Neerti
2016-03-26 15:42:25 -04:00
parent 655a7b08e2 359889a15c
commit 57b6fe7aa8
6 changed files with 8 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/materials/materials.dm
+2 -2
View File
@@ -355,7 +355,7 @@ var/list/name_to_material
hardness = 80
weight = 23
stack_origin_tech = list(TECH_MATERIAL = 2)
composite_material = list(DEFAULT_WALL_MATERIAL = 3750, "platinum" = 3750) //todo
composite_material = list(DEFAULT_WALL_MATERIAL = SHEET_MATERIAL_AMOUNT, "platinum" = SHEET_MATERIAL_AMOUNT) //todo
/material/plasteel/titanium
name = "titanium"
@@ -466,7 +466,7 @@ var/list/name_to_material
hardness = 40
weight = 30
stack_origin_tech = "materials=2"
composite_material = list(DEFAULT_WALL_MATERIAL = 1875,"glass" = 3750)
composite_material = list(DEFAULT_WALL_MATERIAL = SHEET_MATERIAL_AMOUNT / 2, "glass" = SHEET_MATERIAL_AMOUNT)
window_options = list("One Direction" = 1, "Full Window" = 4, "Windoor" = 5)
created_window = /obj/structure/window/reinforced
wire_product = null