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

[MIRROR] Clears unused research var (#12685)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-04-14 22:07:55 -04:00
committed by GitHub
co-authored by Cameron Lennox
parent 71699b747b
commit bb3778d69d
397 changed files with 31 additions and 1651 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/materials/materials/_materials.dm
-1
View File
@@ -205,7 +205,6 @@ GLOBAL_LIST_INIT(name_to_material, populate_material_list())
var/door_icon_base = "metal" // Door base icon tag. See header.
var/table_icon_base = "metal" // Table base icon tag. See header.
var/icon_reinf = "reinf_metal" // Overlay used
var/list/stack_origin_tech = list(TECH_MATERIAL = 1) // Research level for stacks.
var/pass_stack_colors = FALSE // Will stacks made from this material pass their colors onto objects?
// Attributes
code/modules/materials/materials/gems.dm
-7
View File
@@ -7,7 +7,6 @@
icon_colour = "#FC2BC5"
shard_type = SHARD_SHARD
hardness = 30
stack_origin_tech = list(TECH_MATERIAL = 2, TECH_PHORON = 2)
door_icon_base = "stone"
sheet_singular_name = "crystal"
sheet_plural_name = "crystals"
@@ -43,7 +42,6 @@
shard_type = SHARD_SHARD
tableslam_noise = 'sound/effects/Glasshit.ogg'
hardness = 100
stack_origin_tech = list(TECH_MATERIAL = 6)
supply_conversion_value = 8
icon_base = "stone"
table_icon_base = "stone"
@@ -89,7 +87,6 @@
shard_type = SHARD_SHARD
tableslam_noise = 'sound/effects/Glasshit.ogg'
hardness = 100
stack_origin_tech = list(TECH_ARCANE = 1, TECH_MATERIAL = 6)
sheet_singular_name = "gem"
sheet_plural_name = "gems"
supply_conversion_value = 30 // These are hilariously rare.
@@ -114,7 +111,6 @@
reflectivity = 0.5
radiation_resistance = 20
spatial_instability = 30
stack_origin_tech = list(TECH_MATERIAL = 7, TECH_PHORON = 5, TECH_BLUESPACE = 5)
sheet_singular_name = "gem"
sheet_plural_name = "gems"
icon_base = "stone"
@@ -136,7 +132,6 @@
conductivity = 60
reflectivity = 0.3
radiation_resistance = 5
stack_origin_tech = list(TECH_MATERIAL = 6, TECH_POWER = 5, TECH_BIO = 4)
sheet_singular_name = "sheet"
sheet_plural_name = "sheets"
supply_conversion_value = 8
@@ -161,7 +156,6 @@
explosion_resistance = 85
reflectivity = 0.2
radiation_resistance = 10
stack_origin_tech = list(TECH_MATERIAL = 8, TECH_ILLEGAL = 1, TECH_PHORON = 4, TECH_BLUESPACE = 4, TECH_ARCANE = 1) //CHOMP Edit
supply_conversion_value = 13
icon_base = "stone"
table_icon_base = "stone"
@@ -184,7 +178,6 @@
explosion_resistance = 20
reflectivity = 1
radiation_resistance = 100
stack_origin_tech = list(TECH_MATERIAL = 4, TECH_BLUESPACE = 8)
supply_conversion_value = 15
icon_base = "stone"
table_icon_base = "stone"
code/modules/materials/materials/glass.dm
-4
View File
@@ -105,7 +105,6 @@
tableslam_noise = 'sound/effects/Glasshit.ogg'
hardness = 40
weight = 30
stack_origin_tech = list(TECH_MATERIAL = 2)
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
@@ -120,7 +119,6 @@
flags = MATERIAL_BRITTLE
integrity = 100
icon_colour = "#FC2BC5"
stack_origin_tech = list(TECH_MATERIAL = 4)
window_options = list("One Direction" = 1, "Full Window" = 4)
created_window = /obj/structure/window/phoronbasic
created_fulltile_window = /obj/structure/window/phoronbasic/full
@@ -131,13 +129,11 @@
name = MAT_RPGLASS
display_name = MAT_RPGLASS
stack_type = /obj/item/stack/material/glass/phoronrglass
stack_origin_tech = list(TECH_MATERIAL = 5)
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, MAT_PGLASS = SHEET_MATERIAL_AMOUNT)
rod_product = null
flags = MATERIAL_UNMELTABLE
code/modules/materials/materials/glass_vr.dm
-2
View File
@@ -7,7 +7,6 @@
weight = 50
flags = MATERIAL_BRITTLE
icon_colour = "#A7A3A6"
stack_origin_tech = list(TECH_MATERIAL = 5)
window_options = list("One Direction" = 1, "Full Window" = 4)
created_window = /obj/structure/window/titanium
created_fulltile_window = /obj/structure/window/titanium/full
@@ -23,7 +22,6 @@
weight = 80
flags = MATERIAL_BRITTLE
icon_colour = "#676366"
stack_origin_tech = list(TECH_MATERIAL = 6)
window_options = list("One Direction" = 1, "Full Window" = 4)
created_window = /obj/structure/window/plastitanium
created_fulltile_window = /obj/structure/window/plastitanium/full
code/modules/materials/materials/metals/metals.dm
-10
View File
@@ -16,7 +16,6 @@
weight = 28
protectiveness = 60 // 75%
reflectivity = 0.7 // Not a perfect mirror, but close.
stack_origin_tech = list(TECH_MATERIAL = 8)
supply_conversion_value = 9
/datum/material/durasteel/generate_recipes()
@@ -67,7 +66,6 @@
weight = 24
hardness = 40
conductivity = 41
stack_origin_tech = list(TECH_MATERIAL = 4)
sheet_singular_name = "ingot"
sheet_plural_name = "ingots"
supply_conversion_value = 2
@@ -79,7 +77,6 @@
weight = 22
hardness = 50
conductivity = 63
stack_origin_tech = list(TECH_MATERIAL = 3)
sheet_singular_name = "ingot"
sheet_plural_name = "ingots"
supply_conversion_value = 2
@@ -90,7 +87,6 @@
icon_colour = "#9999FF"
weight = 27
conductivity = 9.43
stack_origin_tech = list(TECH_MATERIAL = 2)
sheet_singular_name = "ingot"
sheet_plural_name = "ingots"
supply_conversion_value = 5
@@ -103,7 +99,6 @@
icon_reinf = "reinf_stone"
icon_colour = "#007A00"
weight = 22
stack_origin_tech = list(TECH_MATERIAL = 5)
door_icon_base = "stone"
supply_conversion_value = 2
@@ -111,7 +106,6 @@
name = MAT_METALHYDROGEN
stack_type = /obj/item/stack/material/mhydrogen
icon_colour = "#E6C5DE"
stack_origin_tech = list(TECH_MATERIAL = 6, TECH_POWER = 6, TECH_MAGNET = 5)
conductivity = 100
is_fusion_fuel = 1
supply_conversion_value = 6
@@ -120,7 +114,6 @@
name = MAT_DEUTERIUM
stack_type = /obj/item/stack/material/deuterium
icon_colour = "#999999"
stack_origin_tech = list(TECH_MATERIAL = 3)
sheet_singular_name = "ingot"
sheet_plural_name = "ingots"
is_fusion_fuel = 1
@@ -130,7 +123,6 @@
name = MAT_TRITIUM
stack_type = /obj/item/stack/material/tritium
icon_colour = "#777777"
stack_origin_tech = list(TECH_MATERIAL = 5)
sheet_singular_name = "ingot"
sheet_plural_name = "ingots"
is_fusion_fuel = 1
@@ -140,7 +132,6 @@
name = MAT_OSMIUM
stack_type = /obj/item/stack/material/osmium
icon_colour = "#9999FF"
stack_origin_tech = list(TECH_MATERIAL = 5)
sheet_singular_name = "ingot"
sheet_plural_name = "ingots"
conductivity = 100
@@ -161,7 +152,6 @@
conductivity = 18
melting_point = T0C+3600
radiation_resistance = 15
stack_origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 2)
/datum/material/bronze
name = MAT_BRONZE
code/modules/materials/materials/metals/plasteel.dm
-1
View File
@@ -11,7 +11,6 @@
weight = 23
protectiveness = 20 // 50%
conductivity = 13 // For the purposes of balance.
stack_origin_tech = list(TECH_MATERIAL = 2)
supply_conversion_value = 6
/datum/material/plasteel/generate_recipes()
code/modules/materials/materials/metals/plasteel_vr.dm
-1
View File
@@ -11,7 +11,6 @@
weight = 40
protectiveness = 30
conductivity = 7
stack_origin_tech = list(TECH_MATERIAL = 5)
supply_conversion_value = 8
/datum/material/plastitanium/generate_recipes()
code/modules/materials/materials/organic/animal_products.dm
-1
View File
@@ -16,7 +16,6 @@
name = MAT_CHITIN
icon_colour = "#8d6653"
stack_type = /obj/item/stack/material/chitin
stack_origin_tech = list(TECH_MATERIAL = 3, TECH_BIO = 4)
icon_base = "solid"
icon_reinf = "reinf_mesh"
integrity = 60
code/modules/materials/materials/organic/cloth.dm
-2
View File
@@ -1,6 +1,5 @@
/datum/material/cloth
name = MAT_CLOTH
stack_origin_tech = list(TECH_MATERIAL = 2)
door_icon_base = "wood"
ignition_point = T0C+232
melting_point = T0C+300
@@ -48,7 +47,6 @@
/datum/material/cloth/syncloth
name = MAT_SYNCLOTH
stack_origin_tech = list(TECH_MATERIAL = 3, TECH_BIO = 2)
ignition_point = T0C+532
melting_point = T0C+600
integrity = 200
code/modules/materials/materials/organic/leather.dm
-1
View File
@@ -3,7 +3,6 @@
display_name = "plainleather"
icon_colour = "#5C4831"
stack_type = /obj/item/stack/material/leather
stack_origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2)
flags = MATERIAL_PADDING
ignition_point = T0C+300
melting_point = T0C+300
code/modules/materials/materials/organic/resin.dm
-1
View File
@@ -14,7 +14,6 @@
conductive = 0
explosion_resistance = 60
radiation_resistance = 10
stack_origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 2) // CHOMPedit: No longer super powerful for research.
stack_type = /obj/item/stack/material/resin
/datum/material/resin/can_open_material_door(var/mob/living/user)
code/modules/materials/materials/organic/wood.dm
-3
View File
@@ -14,7 +14,6 @@
conductivity = 1
melting_point = T0C+300 //okay, not melting in this case, but hot enough to destroy wood
ignition_point = T0C+288
stack_origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
dooropen_noise = 'sound/effects/doorcreaky.ogg'
door_icon_base = "wood"
destruction_desc = "splinters"
@@ -59,7 +58,6 @@
name = MAT_SIFWOOD
stack_type = /obj/item/stack/material/wood/sif
icon_colour = "#0099cc" // Cyan-ish
stack_origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2) // Alien wood would presumably be more interesting to the analyzer.
/datum/material/wood/sif/generate_recipes()
..()
@@ -157,7 +155,6 @@
name = MAT_SIFLOG
display_name = MAT_SIFWOOD
icon_colour = "#0099cc" // Cyan-ish
stack_origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2)
stack_type = /obj/item/stack/material/log/sif
/datum/material/wood/log/hard
code/modules/materials/materials/plastic.dm
-2
View File
@@ -11,7 +11,6 @@
conductive = 0
conductivity = 2 // For the sake of material armor diversity, we're gonna pretend this plastic is a good insulator.
melting_point = T0C+371 //assuming heat resistant plastic
stack_origin_tech = list(TECH_MATERIAL = 3)
/datum/material/plastic/generate_recipes()
..()
@@ -70,7 +69,6 @@
conductive = 0
ignition_point = T0C+232 //"the temperature at which book-paper catches fire, and burns." close enough
melting_point = T0C+232 //temperature at which cardboard walls would be destroyed
stack_origin_tech = list(TECH_MATERIAL = 1)
door_icon_base = "wood"
destruction_desc = "crumples"
radiation_resistance = 1
code/modules/materials/materials/snow.dm
-2
View File
@@ -9,7 +9,6 @@
hardness = 1
weight = 1
protectiveness = 0 // 0%
stack_origin_tech = list(TECH_MATERIAL = 1)
melting_point = T0C+1
destruction_desc = "crumples"
sheet_singular_name = "pile"
@@ -37,7 +36,6 @@
weight = 2
hardness = 2
protectiveness = 0 // 0%
stack_origin_tech = list(TECH_MATERIAL = 1)
melting_point = T0C+1
destruction_desc = "crumbles"
sheet_singular_name = "brick"
code/modules/materials/materials/supermatter.dm
-1
View File
@@ -14,7 +14,6 @@
sheet_singular_name = "crystal"
sheet_plural_name = "crystals"
is_fusion_fuel = 1
stack_origin_tech = list(TECH_MATERIAL = 8, TECH_PHORON = 5, TECH_BLUESPACE = 4)
flags = MATERIAL_UNMELTABLE
/datum/material/supermatter/generate_recipes()
code/modules/materials/sheets/_sheets.dm
-2
View File
@@ -37,8 +37,6 @@
recipes = material.get_recipes()
stacktype = material.stack_type
if(islist(material.stack_origin_tech))
origin_tech = material.stack_origin_tech.Copy()
if(apply_colour)
color = material.icon_colour
code/modules/materials/sheets/organic/animal_products.dm
-1
View File
@@ -35,7 +35,6 @@
/datum/material/fur
name = MAT_FUR
icon_colour = "#fff2d3"
stack_origin_tech = list(TECH_MATERIAL = 2)
display_name = MAT_FUR
icon_base = "sheet-fabric"
stack_type = /obj/item/stack/material/fur