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

Fixes autolathe and smartfridge issues

Browse Source
This commit is contained in:
Heroman
2022-12-28 17:43:04 +10:00
parent e5ee1d2801
commit 547382e647
12 changed files with 28 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/materials/materials/glass.dm
+1 -2
View File
@@ -132,13 +132,12 @@
display_name = "reinforced borosilicate glass"
stack_type = /obj/item/stack/material/glass/phoronrglass
stack_origin_tech = list(TECH_MATERIAL = 5)
composite_material = list() //todo
window_options = list("One Direction" = 1, "Full Window" = 4)
created_window = /obj/structure/window/phoronreinforced
created_fulltile_window = /obj/structure/window/phoronreinforced/full
hardness = 40
weight = 30
stack_origin_tech = list(TECH_MATERIAL = 2)
composite_material = list(MAT_STEEL = SHEET_MATERIAL_AMOUNT / 2, "borosilicate glass" = SHEET_MATERIAL_AMOUNT)
composite_material = list(MAT_STEEL = SHEET_MATERIAL_AMOUNT / 2, MAT_PGLASS = SHEET_MATERIAL_AMOUNT)
rod_product = null
flags = MATERIAL_UNMELTABLE
code/modules/materials/materials/glass_vr.dm
-2
View File
@@ -13,7 +13,6 @@
created_fulltile_window = /obj/structure/window/titanium/full
wire_product = null
rod_product = /obj/item/stack/material/glass/titanium
composite_material = list(MAT_TITANIUM = SHEET_MATERIAL_AMOUNT, MAT_GLASS = SHEET_MATERIAL_AMOUNT)
/datum/material/glass/plastaniumglass
name = MAT_PLASTITANIUMGLASS
@@ -30,4 +29,3 @@
created_fulltile_window = /obj/structure/window/plastitanium/full
wire_product = null
rod_product = /obj/item/stack/material/glass/plastitanium
composite_material = list(MAT_PLASTITANIUM = SHEET_MATERIAL_AMOUNT, MAT_GLASS = SHEET_MATERIAL_AMOUNT)
code/modules/materials/materials/metals/hull.dm
+5
View File
@@ -7,6 +7,7 @@
icon_reinf = "reinf_mesh"
icon_colour = "#666677"
flags = MATERIAL_UNMELTABLE
composite_material = list(MAT_STEEL = SHEET_MATERIAL_AMOUNT)
/datum/material/steel/hull/place_sheet(var/turf/target) //Deconstructed into normal steel sheets.
new /obj/item/stack/material/steel(target)
@@ -20,6 +21,7 @@
icon_colour = "#777788"
explosion_resistance = 40
flags = MATERIAL_UNMELTABLE
composite_material = list(MAT_PLASTEEL = SHEET_MATERIAL_AMOUNT)
/datum/material/plasteel/hull/place_sheet(var/turf/target) //Deconstructed into normal plasteel sheets.
new /obj/item/stack/material/plasteel(target)
@@ -33,6 +35,7 @@
explosion_resistance = 90
reflectivity = 0.9
flags = MATERIAL_UNMELTABLE
composite_material = list(MAT_DURASTEEL = SHEET_MATERIAL_AMOUNT)
/datum/material/durasteel/hull/place_sheet(var/turf/target) //Deconstructed into normal durasteel sheets.
new /obj/item/stack/material/durasteel(target)
@@ -43,6 +46,7 @@
icon_base = "hull"
icon_reinf = "reinf_mesh"
flags = MATERIAL_UNMELTABLE
composite_material = list(MAT_TITANIUM = SHEET_MATERIAL_AMOUNT)
/datum/material/titanium/hull/place_sheet(var/turf/target) //Deconstructed into normal titanium sheets.
new /obj/item/stack/material/titanium(target)
@@ -53,6 +57,7 @@
icon_base = "hull"
icon_reinf = "reinf_mesh"
flags = MATERIAL_UNMELTABLE
composite_material = list(MAT_MORPHIUM = SHEET_MATERIAL_AMOUNT)
/datum/material/morphium/hull/place_sheet(var/turf/target)
new /obj/item/stack/material/morphium(target)
code/modules/materials/materials/metals/hull_vr.dm
+2
View File
@@ -5,6 +5,7 @@
icon_reinf = "reinf_mesh"
icon_colour = "#585658"
explosion_resistance = 50
composite_material = list(MAT_PLASTITANIUM = SHEET_MATERIAL_AMOUNT)
/datum/material/plastitanium/hull/place_sheet(var/turf/target) //Deconstructed into normal plasteel sheets.
new /obj/item/stack/material/plastitanium(target)
@@ -15,6 +16,7 @@
icon_base = "hull"
icon_reinf = "reinf_mesh"
explosion_resistance = 50
composite_material = list(MAT_GOLD = SHEET_MATERIAL_AMOUNT)
/datum/material/gold/hull/place_sheet(var/turf/target) //Deconstructed into normal gold sheets.
new /obj/item/stack/material/gold(target)
code/modules/materials/materials/metals/metals.dm
-2
View File
@@ -17,7 +17,6 @@
protectiveness = 60 // 75%
reflectivity = 0.7 // Not a perfect mirror, but close.
stack_origin_tech = list(TECH_MATERIAL = 8)
composite_material = list("plasteel" = SHEET_MATERIAL_AMOUNT, "diamond" = SHEET_MATERIAL_AMOUNT) //shrug
supply_conversion_value = 9
/datum/material/titanium
@@ -28,7 +27,6 @@
door_icon_base = "metal"
icon_colour = "#D1E6E3"
icon_reinf = "reinf_metal"
composite_material = null
/datum/material/iron
name = "iron"
code/modules/materials/materials/metals/plasteel.dm
+1 -1
View File
@@ -12,7 +12,6 @@
protectiveness = 20 // 50%
conductivity = 13 // For the purposes of balance.
stack_origin_tech = list(TECH_MATERIAL = 2)
composite_material = list(MAT_STEEL = SHEET_MATERIAL_AMOUNT, "platinum" = SHEET_MATERIAL_AMOUNT) //todo
supply_conversion_value = 6
/datum/material/plasteel/generate_recipes()
@@ -38,3 +37,4 @@
stack_type = /obj/item/stack/material/plasteel/rebar
sheet_singular_name = "rod"
sheet_plural_name = "rods"
composite_material = list(MAT_PLASTEEL = SHEET_MATERIAL_AMOUNT)
code/modules/materials/materials/metals/plasteel_vr.dm
-1
View File
@@ -12,7 +12,6 @@
protectiveness = 30
conductivity = 7
stack_origin_tech = list(TECH_MATERIAL = 5)
composite_material = list(MAT_TITANIUM = SHEET_MATERIAL_AMOUNT, MAT_PLASTEEL = SHEET_MATERIAL_AMOUNT)
supply_conversion_value = 8
/datum/material/plastitanium/generate_recipes()