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

[MIRROR] no infinite materials (#11025)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-06-07 18:59:45 +02:00
committed by GitHub
co-authored by Kashargul
parent 5632b52433
commit 22c8ec20b7
13 changed files with 75 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/materials/materials/_materials.dm
+4 -1
View File
@@ -96,7 +96,10 @@ var/list/name_to_material
return name_to_material[name]
/proc/material_display_name(name)
var/datum/material/material = get_material_by_name(name)
if(istype(name, /datum/material)) //We were fed a datum.
var/datum/material/M = name
return M.display_name
var/datum/material/material = get_material_by_name(name) //If not a datum, we were fed a name.
if(material)
return material.display_name
return null
code/modules/materials/materials/metals/hull.dm
+32 -5
View File
@@ -7,7 +7,7 @@
table_icon_base = "stone"
icon_reinf = "reinf_mesh"
icon_colour = "#666677"
flags = MATERIAL_UNMELTABLE
flags = MATERIAL_UNMELTABLE | MATERIAL_NO_SYNTH
composite_material = list(MAT_STEEL = SHEET_MATERIAL_AMOUNT)
/datum/material/steel/hull/place_sheet(var/turf/target) //Deconstructed into normal steel sheets.
@@ -22,7 +22,7 @@
icon_reinf = "reinf_mesh"
icon_colour = "#777788"
explosion_resistance = 40
flags = MATERIAL_UNMELTABLE
flags = MATERIAL_UNMELTABLE | MATERIAL_NO_SYNTH
composite_material = list(MAT_PLASTEEL = SHEET_MATERIAL_AMOUNT)
/datum/material/plasteel/hull/place_sheet(var/turf/target) //Deconstructed into normal plasteel sheets.
@@ -37,7 +37,7 @@
icon_colour = "#45829a"
explosion_resistance = 90
reflectivity = 0.9
flags = MATERIAL_UNMELTABLE
flags = MATERIAL_UNMELTABLE | MATERIAL_NO_SYNTH
composite_material = list(MAT_DURASTEEL = SHEET_MATERIAL_AMOUNT)
/datum/material/durasteel/hull/place_sheet(var/turf/target) //Deconstructed into normal durasteel sheets.
@@ -49,7 +49,7 @@
icon_base = "hull"
table_icon_base = "stone"
icon_reinf = "reinf_mesh"
flags = MATERIAL_UNMELTABLE
flags = MATERIAL_UNMELTABLE | MATERIAL_NO_SYNTH
composite_material = list(MAT_TITANIUM = SHEET_MATERIAL_AMOUNT)
/datum/material/titanium/hull/place_sheet(var/turf/target) //Deconstructed into normal titanium sheets.
@@ -61,8 +61,35 @@
icon_base = "hull"
table_icon_base = "stone"
icon_reinf = "reinf_mesh"
flags = MATERIAL_UNMELTABLE
flags = MATERIAL_UNMELTABLE | MATERIAL_NO_SYNTH
composite_material = list(MAT_MORPHIUM = SHEET_MATERIAL_AMOUNT)
/datum/material/morphium/hull/place_sheet(var/turf/target)
new /obj/item/stack/material/morphium(target)
/datum/material/plastitanium/hull
name = MAT_PLASTITANIUMHULL
stack_type = /obj/item/stack/material/plastitanium/hull
icon_base = "hull"
table_icon_base = "stone"
icon_reinf = "reinf_mesh"
icon_colour = "#585658"
explosion_resistance = 50
flags = MATERIAL_NO_SYNTH
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)
/datum/material/gold/hull
name = MAT_GOLDHULL
stack_type = /obj/item/stack/material/gold/hull
icon_base = "hull"
table_icon_base = "stone"
icon_reinf = "reinf_mesh"
explosion_resistance = 50
flags = MATERIAL_NO_SYNTH
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/hull_vr.dm
-24
View File
@@ -1,24 +0,0 @@
/datum/material/plastitanium/hull
name = MAT_PLASTITANIUMHULL
stack_type = /obj/item/stack/material/plastitanium/hull
icon_base = "hull"
table_icon_base = "stone"
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)
/datum/material/gold/hull
name = MAT_GOLDHULL
stack_type = /obj/item/stack/material/gold/hull
icon_base = "hull"
table_icon_base = "stone"
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)