mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-22 12:47:16 +01:00
[MIRROR] Multi Bugfix (#12824)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
co-authored by
Cameron Lennox
parent
0bfbc28d10
commit
3eabaa37be
@@ -223,7 +223,6 @@ GLOBAL_LIST_INIT(name_to_material, populate_material_list())
|
||||
var/conductivity = null // How conductive the material is. Iron acts as the baseline, at 10.
|
||||
var/list/composite_material // If set, object matter var will be a list containing these values.
|
||||
var/luminescence
|
||||
var/radiation_resistance = 0 // Radiation resistance, which is added on top of a material's weight for blocking radiation. Needed to make lead special without superrobust weapons.
|
||||
var/supply_conversion_value // Supply points per sheet that this material sells for.
|
||||
var/can_sharpen = TRUE // Is this material compatible with a sharpening kit?
|
||||
|
||||
|
||||
@@ -109,7 +109,6 @@
|
||||
conductive = 0
|
||||
conductivity = 5
|
||||
reflectivity = 0.5
|
||||
radiation_resistance = 20
|
||||
spatial_instability = 30
|
||||
sheet_singular_name = "gem"
|
||||
sheet_plural_name = "gems"
|
||||
@@ -132,7 +131,6 @@
|
||||
negation = 15
|
||||
conductivity = 60
|
||||
reflectivity = 0.3
|
||||
radiation_resistance = 5
|
||||
sheet_singular_name = "sheet"
|
||||
sheet_plural_name = "sheets"
|
||||
supply_conversion_value = 8
|
||||
@@ -156,7 +154,6 @@
|
||||
negation = 25
|
||||
explosion_resistance = 85
|
||||
reflectivity = 0.2
|
||||
radiation_resistance = 10
|
||||
supply_conversion_value = 13
|
||||
icon_base = "stone"
|
||||
table_icon_base = "stone"
|
||||
@@ -178,7 +175,6 @@
|
||||
negation = 35
|
||||
explosion_resistance = 20
|
||||
reflectivity = 1
|
||||
radiation_resistance = 100
|
||||
supply_conversion_value = 15
|
||||
icon_base = "stone"
|
||||
table_icon_base = "stone"
|
||||
@@ -240,7 +236,6 @@
|
||||
explosion_resistance = 13
|
||||
negation = 12
|
||||
spatial_instability = 18
|
||||
radiation_resistance = 18
|
||||
supply_conversion_value = 12
|
||||
can_sharpen = TRUE
|
||||
|
||||
|
||||
@@ -58,7 +58,6 @@
|
||||
conductivity = 10
|
||||
sheet_singular_name = "ingot"
|
||||
sheet_plural_name = "ingots"
|
||||
radiation_resistance = 25 // Lead is Special and so gets to block more radiation than it normally would with just weight, totalling in 48 protection.
|
||||
supply_conversion_value = 0.5
|
||||
|
||||
/datum/material/gold
|
||||
@@ -156,7 +155,6 @@
|
||||
protectiveness = 15
|
||||
conductivity = 18
|
||||
melting_point = T0C+3600
|
||||
radiation_resistance = 15
|
||||
supply_conversion_value = 0.5
|
||||
|
||||
/datum/material/bronze
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
sheet_plural_name = "blobs"
|
||||
conductive = 0
|
||||
explosion_resistance = 60
|
||||
radiation_resistance = 10
|
||||
stack_type = /obj/item/stack/material/resin
|
||||
supply_conversion_value = 2
|
||||
|
||||
|
||||
@@ -72,7 +72,6 @@
|
||||
melting_point = T0C+232 //temperature at which cardboard walls would be destroyed
|
||||
door_icon_base = "wood"
|
||||
destruction_desc = "crumples"
|
||||
radiation_resistance = 1
|
||||
pass_stack_colors = TRUE
|
||||
supply_conversion_value = 0.05
|
||||
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
destruction_desc = "crumples"
|
||||
sheet_singular_name = "pile"
|
||||
sheet_plural_name = "pile" //Just a bigger pile
|
||||
radiation_resistance = 1
|
||||
supply_conversion_value = 0
|
||||
|
||||
/datum/material/snow/generate_recipes()
|
||||
@@ -41,7 +40,6 @@
|
||||
destruction_desc = "crumbles"
|
||||
sheet_singular_name = "brick"
|
||||
sheet_plural_name = "bricks"
|
||||
radiation_resistance = 1
|
||||
supply_conversion_value = 0
|
||||
|
||||
/datum/material/snowbrick/generate_recipes()
|
||||
|
||||
Reference in New Issue
Block a user