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

Use material defines more

Browse Source
This commit is contained in:
Aronai Sieyes
2021-07-03 18:18:05 -04:00
parent 4b52bf232f
commit b71c7e7271
206 changed files with 908 additions and 918 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/materials/materials/glass.dm
+2 -2
View File
@@ -106,7 +106,7 @@
hardness = 40
weight = 30
stack_origin_tech = list(TECH_MATERIAL = 2)
composite_material = list(DEFAULT_WALL_MATERIAL = SHEET_MATERIAL_AMOUNT / 2, "glass" = SHEET_MATERIAL_AMOUNT)
composite_material = list(MAT_STEEL = SHEET_MATERIAL_AMOUNT / 2, MAT_GLASS = SHEET_MATERIAL_AMOUNT)
window_options = list("One Direction" = 1, "Full Window" = 4, "Windoor" = 2)
created_window = /obj/structure/window/reinforced
created_fulltile_window = /obj/structure/window/reinforced/full
@@ -139,5 +139,5 @@
hardness = 40
weight = 30
stack_origin_tech = list(TECH_MATERIAL = 2)
composite_material = list(DEFAULT_WALL_MATERIAL = SHEET_MATERIAL_AMOUNT / 2, "borosilicate glass" = SHEET_MATERIAL_AMOUNT)
composite_material = list(MAT_STEEL = SHEET_MATERIAL_AMOUNT / 2, "borosilicate glass" = SHEET_MATERIAL_AMOUNT)
rod_product = null
code/modules/materials/materials/glass_vr.dm
+2 -2
View File
@@ -13,7 +13,7 @@
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, "glass" = SHEET_MATERIAL_AMOUNT)
composite_material = list(MAT_TITANIUM = SHEET_MATERIAL_AMOUNT, MAT_GLASS = SHEET_MATERIAL_AMOUNT)
/datum/material/glass/plastaniumglass
name = MAT_PLASTITANIUMGLASS
@@ -30,4 +30,4 @@
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, "glass" = SHEET_MATERIAL_AMOUNT)
composite_material = list(MAT_PLASTITANIUM = SHEET_MATERIAL_AMOUNT, MAT_GLASS = SHEET_MATERIAL_AMOUNT)
code/modules/materials/materials/holographic.dm
+2 -2
View File
@@ -1,6 +1,6 @@
/datum/material/steel/holographic
name = "holo" + DEFAULT_WALL_MATERIAL
display_name = DEFAULT_WALL_MATERIAL
name = "holo" + MAT_STEEL
display_name = MAT_STEEL
stack_type = null
shard_type = SHARD_NONE
code/modules/materials/materials/metals/plasteel.dm
+1 -1
View File
@@ -12,7 +12,7 @@
protectiveness = 20 // 50%
conductivity = 13 // For the purposes of balance.
stack_origin_tech = list(TECH_MATERIAL = 2)
composite_material = list(DEFAULT_WALL_MATERIAL = SHEET_MATERIAL_AMOUNT, "platinum" = SHEET_MATERIAL_AMOUNT) //todo
composite_material = list(MAT_STEEL = SHEET_MATERIAL_AMOUNT, "platinum" = SHEET_MATERIAL_AMOUNT) //todo
supply_conversion_value = 6
/datum/material/plasteel/generate_recipes()
code/modules/materials/materials/metals/steel.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/datum/material/steel
name = DEFAULT_WALL_MATERIAL
name = MAT_STEEL
stack_type = /obj/item/stack/material/steel
integrity = 150
conductivity = 11 // Assuming this is carbon steel, it would actually be slightly less conductive than iron, but lets ignore that.
code/modules/materials/sheets/_sheets.dm
+2 -2
View File
@@ -13,7 +13,7 @@
slot_r_hand_str = 'icons/mob/items/righthand_material.dmi',
)
var/default_type = DEFAULT_WALL_MATERIAL
var/default_type = MAT_STEEL
var/datum/material/material
var/perunit = SHEET_MATERIAL_AMOUNT
var/apply_colour //temp pending icon rewrite
@@ -26,7 +26,7 @@
randpixel_xy()
if(!default_type)
default_type = DEFAULT_WALL_MATERIAL
default_type = MAT_STEEL
material = get_material_by_name("[default_type]")
if(!material)
return INITIALIZE_HINT_QDEL
code/modules/materials/sheets/metals/metal.dm
+2 -2
View File
@@ -1,7 +1,7 @@
/obj/item/stack/material/steel
name = DEFAULT_WALL_MATERIAL
name = MAT_STEEL
icon_state = "sheet-refined"
default_type = DEFAULT_WALL_MATERIAL
default_type = MAT_STEEL
no_variants = FALSE
apply_colour = TRUE
code/modules/materials/sheets/metals/rods.dm
+1 -1
View File
@@ -10,7 +10,7 @@
throw_range = 20
drop_sound = 'sound/items/drop/metalweapon.ogg'
pickup_sound = 'sound/items/pickup/metalweapon.ogg'
matter = list(DEFAULT_WALL_MATERIAL = SHEET_MATERIAL_AMOUNT / 2)
matter = list(MAT_STEEL = SHEET_MATERIAL_AMOUNT / 2)
max_amount = 60
attack_verb = list("hit", "bludgeoned", "whacked")