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

[MIRROR] Industrial Expansion

Browse Source
This commit is contained in:
Chompstation Bot
2021-03-09 21:53:03 +00:00
parent 4dafc3196e
commit b85e9fc4d9
61 changed files with 251392 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/materials/fifty_spawner_mats.dm
+5 -1
View File
@@ -28,6 +28,10 @@
name = "stack of plastic"
type_to_spawn = /obj/item/stack/material/plastic
/obj/fiftyspawner/copper
name = "stack of copper"
type_to_spawn = /obj/item/stack/material/copper
/obj/fiftyspawner/graphite
name = "stack of graphite"
type_to_spawn = /obj/item/stack/material/graphite
@@ -92,7 +96,7 @@
name = "stack of logs"
type_to_spawn = /obj/item/stack/material/log
/obj/fiftyspawner/log
/obj/fiftyspawner/log/sif
name = "stack of alien logs"
type_to_spawn = /obj/item/stack/material/log/sif
code/modules/materials/material_sheets.dm
+86 -17
View File
@@ -102,14 +102,14 @@
/obj/item/stack/material/iron
name = "iron"
icon_state = "sheet-silver"
icon_state = "sheet-ingot"
default_type = "iron"
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/lead
name = "lead"
icon_state = "sheet-adamantine"
icon_state = "sheet-ingot"
default_type = "lead"
apply_colour = 1
no_variants = FALSE
@@ -159,22 +159,24 @@
/obj/item/stack/material/graphite
name = "graphite"
icon_state = "sheet-silver"
icon_state = "sheet-puck"
default_type = MAT_GRAPHITE
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/gold
name = "gold"
icon_state = "sheet-gold"
icon_state = "sheet-ingot"
default_type = "gold"
no_variants = FALSE
apply_colour = TRUE
/obj/item/stack/material/silver
name = "silver"
icon_state = "sheet-silver"
icon_state = "sheet-ingot"
default_type = "silver"
no_variants = FALSE
apply_colour = TRUE
//Valuable resource, cargo can sell it.
/obj/item/stack/material/platinum
@@ -182,6 +184,7 @@
icon_state = "sheet-adamantine"
default_type = "platinum"
no_variants = FALSE
apply_colour = TRUE
//Extremely valuable to Research.
/obj/item/stack/material/mhydrogen
@@ -193,14 +196,14 @@
//Fuel for MRSPACMAN generator.
/obj/item/stack/material/tritium
name = "tritium"
icon_state = "sheet-silver"
icon_state = "sheet-puck"
default_type = "tritium"
apply_colour = 1
apply_colour = TRUE
no_variants = FALSE
/obj/item/stack/material/osmium
name = "osmium"
icon_state = "sheet-silver"
icon_state = "sheet-ingot"
default_type = "osmium"
apply_colour = 1
no_variants = FALSE
@@ -209,16 +212,17 @@
// Fusion fuel.
/obj/item/stack/material/deuterium
name = "deuterium"
icon_state = "sheet-silver"
icon_state = "sheet-puck"
default_type = "deuterium"
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/steel
name = DEFAULT_WALL_MATERIAL
icon_state = "sheet-metal"
icon_state = "sheet-refined"
default_type = DEFAULT_WALL_MATERIAL
no_variants = FALSE
apply_colour = TRUE
/obj/item/stack/material/steel/hull
name = MAT_STEELHULL
@@ -226,9 +230,10 @@
/obj/item/stack/material/plasteel
name = "plasteel"
icon_state = "sheet-plasteel"
icon_state = "sheet-reinforced"
default_type = "plasteel"
no_variants = FALSE
apply_colour = TRUE
/obj/item/stack/material/plasteel/hull
name = MAT_PLASTEELHULL
@@ -236,17 +241,19 @@
/obj/item/stack/material/durasteel
name = "durasteel"
icon_state = "sheet-durasteel"
icon_state = "sheet-reinforced"
item_state = "sheet-metal"
default_type = "durasteel"
no_variants = FALSE
apply_colour = TRUE
/obj/item/stack/material/durasteel/hull
name = MAT_DURASTEELHULL
/obj/item/stack/material/titanium
name = MAT_TITANIUM
icon_state = "sheet-silver"
icon_state = "sheet-refined"
apply_colour = TRUE
item_state = "sheet-silver"
default_type = MAT_TITANIUM
no_variants = FALSE
@@ -345,8 +352,10 @@
icon_state = "sheet-wood"
default_type = MAT_WOOD
strict_color_stacking = TRUE
apply_colour = 1
drop_sound = 'sound/items/drop/wooden.ogg'
pickup_sound = 'sound/items/pickup/wooden.ogg'
no_variants = FALSE
/obj/item/stack/material/wood/sif
name = "alien wooden plank"
@@ -467,30 +476,90 @@
/obj/item/stack/material/glass
name = "glass"
icon_state = "sheet-glass"
icon_state = "sheet-transparent"
default_type = "glass"
no_variants = FALSE
drop_sound = 'sound/items/drop/glass.ogg'
pickup_sound = 'sound/items/pickup/glass.ogg'
apply_colour = TRUE
/obj/item/stack/material/glass/reinforced
name = "reinforced glass"
icon_state = "sheet-rglass"
icon_state = "sheet-rtransparent"
default_type = "rglass"
no_variants = FALSE
apply_colour = TRUE
/obj/item/stack/material/glass/phoronglass
name = "borosilicate glass"
desc = "This sheet is special platinum-glass alloy designed to withstand large temperatures"
singular_name = "borosilicate glass sheet"
icon_state = "sheet-phoronglass"
icon_state = "sheet-transparent"
default_type = "borosilicate glass"
no_variants = FALSE
apply_colour = TRUE
/obj/item/stack/material/glass/phoronrglass
name = "reinforced borosilicate glass"
desc = "This sheet is special platinum-glass alloy designed to withstand large temperatures. It is reinforced with few rods."
singular_name = "reinforced borosilicate glass sheet"
icon_state = "sheet-phoronrglass"
icon_state = "sheet-rtransparent"
default_type = "reinforced borosilicate glass"
no_variants = FALSE
apply_colour = TRUE
/obj/item/stack/material/bronze
name = "bronze"
icon_state = "sheet-ingot"
singular_name = "bronze ingot"
default_type = "bronze"
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/tin
name = "tin"
icon_state = "sheet-ingot"
singular_name = "tin ingot"
default_type = "tin"
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/copper
name = "copper"
icon_state = "sheet-ingot"
singular_name = "copper ingot"
default_type = "copper"
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/painite
name = "painite"
icon_state = "sheet-gem"
singular_name = "painite gem"
default_type = "painite"
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/void_opal
name = "void opal"
icon_state = "sheet-void_opal"
singular_name = "void opal"
default_type = "void opal"
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/quartz
name = "quartz"
icon_state = "sheet-gem"
singular_name = "quartz gem"
default_type = "quartz"
apply_colour = 1
no_variants = FALSE
/obj/item/stack/material/aluminium
name = "aluminium"
icon_state = "sheet-ingot"
singular_name = "aluminium ingot"
default_type = "aluminium"
apply_colour = 1
no_variants = FALSE
code/modules/materials/materials.dm
+82 -1
View File
@@ -486,6 +486,7 @@ var/list/name_to_material
door_icon_base = "metal"
icon_colour = "#D1E6E3"
icon_reinf = "reinf_metal"
composite_material = null
/datum/material/plasteel/titanium/hull
name = MAT_TITANIUMHULL
@@ -637,7 +638,7 @@ var/list/name_to_material
hardness = 40
weight = 30
stack_origin_tech = list(TECH_MATERIAL = 2)
composite_material = list() //todo
composite_material = list(DEFAULT_WALL_MATERIAL = SHEET_MATERIAL_AMOUNT / 2, "borosilicate glass" = SHEET_MATERIAL_AMOUNT)
rod_product = null
/datum/material/plastic
@@ -1007,6 +1008,7 @@ var/list/name_to_material
protectiveness = 1 // 4%
flags = MATERIAL_PADDING
conductive = 0
integrity = 40
pass_stack_colors = TRUE
supply_conversion_value = 2
@@ -1073,6 +1075,7 @@ var/list/name_to_material
melting_point = T0C+300
protectiveness = 3 // 13%
conductive = 0
integrity = 40
supply_conversion_value = 3
//CHOMPstation Removal Start: Moved to materials_ch and changed to allow for material var
@@ -1214,3 +1217,81 @@ var/list/name_to_material
weight = 1
protectiveness = 0 // 0%
conductive = 0
/datum/material/void_opal
name = "void opal"
display_name = "void opal"
use_name = "void opal"
icon_colour = "#0f0f0f"
stack_type = /obj/item/stack/material/void_opal
flags = MATERIAL_UNMELTABLE
cut_delay = 60
reflectivity = 0
conductivity = 1
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.
/datum/material/painite
name = "painite"
display_name = "painite"
use_name = "painite"
icon_colour = "#6b4947"
stack_type = /obj/item/stack/material/painite
flags = MATERIAL_UNMELTABLE
reflectivity = 0.3
tableslam_noise = 'sound/effects/Glasshit.ogg'
sheet_singular_name = "gem"
sheet_plural_name = "gems"
supply_conversion_value = 4
/datum/material/tin
name = "tin"
display_name = "tin"
use_name = "tin"
stack_type = /obj/item/stack/material/tin
icon_colour = "#b2afaf"
sheet_singular_name = "ingot"
sheet_plural_name = "ingots"
supply_conversion_value = 1
hardness = 50
weight = 13
/datum/material/copper
name = "copper"
display_name = "copper"
use_name = "copper"
stack_type = /obj/item/stack/material/copper
conductivity = 52
icon_colour = "#af633e"
sheet_singular_name = "ingot"
sheet_plural_name = "ingots"
supply_conversion_value = 1
weight = 13
hardness = 50
/datum/material/quartz
name = "quartz"
display_name = "quartz"
use_name = "quartz"
icon_colour = "#e6d7df"
stack_type = /obj/item/stack/material/quartz
tableslam_noise = 'sound/effects/Glasshit.ogg'
sheet_singular_name = "crystal"
sheet_plural_name = "crystals"
supply_conversion_value = 4
/datum/material/aluminium
name = "aluminium"
display_name = "aluminium"
use_name = "aluminium"
icon_colour = "#e5e2d0"
stack_type = /obj/item/stack/material/aluminium
sheet_singular_name = "ingot"
sheet_plural_name = "ingots"
supply_conversion_value = 2
weight = 10