Materials subsystem, material defines instead of strings, structure materials. (#8447)

The shitcode crusade begins.
This commit is contained in:
Matt Atlas
2020-03-18 20:19:11 +01:00
committed by GitHub
parent d952493ca0
commit 82437acd43
127 changed files with 687 additions and 646 deletions
+32 -28
View File
@@ -19,7 +19,7 @@
if(!default_type)
default_type = DEFAULT_WALL_MATERIAL
material = get_material_by_name("[default_type]")
material = SSmaterials.get_material_by_name(default_type)
if(!material)
qdel(src)
return
@@ -85,37 +85,37 @@
/obj/item/stack/material/iron
name = "iron"
icon_state = "sheet-silver"
default_type = "iron"
default_type = MATERIAL_IRON
apply_colour = 1
/obj/item/stack/material/sandstone
name = "sandstone brick"
icon_state = "sheet-sandstone"
default_type = "sandstone"
default_type = MATERIAL_SANDSTONE
icon_has_variants = TRUE
drop_sound = 'sound/items/drop/boots.ogg'
/obj/item/stack/material/marble
name = "marble brick"
icon_state = "sheet-marble"
default_type = "marble"
default_type = MATERIAL_MARBLE
drop_sound = 'sound/items/drop/boots.ogg'
/obj/item/stack/material/diamond
name = "diamond"
icon_state = "sheet-diamond"
default_type = "diamond"
default_type = MATERIAL_DIAMOND
drop_sound = 'sound/items/drop/glass.ogg'
/obj/item/stack/material/uranium
name = "uranium"
icon_state = "sheet-uranium"
default_type = "uranium"
default_type = MATERIAL_URANIUM
/obj/item/stack/material/phoron
name = "solid phoron"
icon_state = "sheet-phoron"
default_type = "phoron"
default_type = MATERIAL_PHORON
icon_has_variants = TRUE
drop_sound = 'sound/items/drop/glass.ogg'
@@ -123,46 +123,51 @@
name = "plastic"
icon_state = "sheet-plastic"
item_state = "sheet-plastic"
default_type = "plastic"
default_type = MATERIAL_PLASTIC
icon_has_variants = TRUE
drop_sound = 'sound/items/drop/card.ogg'
/obj/item/stack/material/gold
name = "gold"
icon_state = "sheet-gold"
default_type = "gold"
default_type = MATERIAL_GOLD
icon_has_variants = TRUE
/obj/item/stack/material/osmium
name = "osmium"
icon_state = "sheet-silver"
default_type = MATERIAL_OSMIUM
/obj/item/stack/material/silver
name = "silver"
icon_state = "sheet-silver"
default_type = "silver"
default_type = MATERIAL_SILVER
icon_has_variants = TRUE
//Valuable resource, cargo can sell it.
/obj/item/stack/material/platinum
name = "platinum"
icon_state = "sheet-adamantine"
default_type = "platinum"
default_type = MATERIAL_PLATINUM
icon_has_variants = TRUE
//Extremely valuable to Research.
/obj/item/stack/material/mhydrogen
name = "metallic hydrogen"
icon_state = "sheet-mythril"
default_type = "mhydrogen"
default_type = MATERIAL_HYDROGEN_METALLIC
//Fuel for MRSPACMAN generator.
/obj/item/stack/material/tritium
name = "tritium"
icon_state = "sheet-silver"
default_type = "tritium"
default_type = MATERIAL_TRITIUM
apply_colour = 1
/obj/item/stack/material/osmium
name = "osmium"
icon_state = "sheet-silver"
default_type = "osmium"
default_type = MATERIAL_OSMIUM
apply_colour = 1
/obj/item/stack/material/steel
@@ -175,30 +180,30 @@
name = "plasteel"
icon_state = "sheet-plasteel"
item_state = "sheet-metal"
default_type = "plasteel"
default_type = MATERIAL_PLASTEEL
icon_has_variants = TRUE
/obj/item/stack/material/wood
name = "wooden plank"
icon_state = "sheet-wood"
default_type = "wood"
default_type = MATERIAL_WOOD
drop_sound = 'sound/items/drop/wooden.ogg'
/obj/item/stack/material/woodlog
name = "log"
icon_state = "sheet-wood"
default_type = "log"
default_type = MATERIAL_WOOD_LOG
/obj/item/stack/material/woodbranch
name = "branch"
icon_state = "sheet-wood"
default_type = "branch"
default_type = MATERIAL_WOOD_BRANCH
/obj/item/stack/material/cloth
name = "cloth"
icon_state = "sheet-cloth"
default_type = "cloth"
default_type = MATERIAL_CLOTH
icon_has_variants = TRUE
drop_sound = 'sound/items/drop/clothing.ogg'
@@ -216,35 +221,35 @@
/obj/item/stack/material/cardboard
name = "cardboard"
icon_state = "sheet-card"
default_type = "cardboard"
default_type = MATERIAL_CARDBOARD
drop_sound = 'sound/items/drop/box.ogg'
/obj/item/stack/material/leather
name = "leather"
desc = "The by-product of mob grinding."
icon_state = "sheet-leather"
default_type = "leather"
default_type = MATERIAL_LEATHER
icon_has_variants = TRUE
drop_sound = 'sound/items/drop/leather.ogg'
/obj/item/stack/material/glass
name = "glass"
icon_state = "sheet-glass"
default_type = "glass"
default_type = MATERIAL_GLASS
icon_has_variants = TRUE
drop_sound = 'sound/items/drop/glass.ogg'
/obj/item/stack/material/glass/wired
name = "wired glass"
icon = 'icons/obj/stacks/tiles.dmi'
icon_state = "glass_wire"
icon_state = MATERIAL_GLASS_WIRED
default_type = "wired glass"
/obj/item/stack/material/glass/reinforced
name = "reinforced glass"
icon_state = "sheet-rglass"
item_state = "sheet-rglass"
default_type = "rglass"
default_type = MATERIAL_GLASS_REINFORCED
/obj/item/stack/material/glass/phoronglass
name = "borosilicate glass"
@@ -252,7 +257,7 @@
singular_name = "borosilicate glass sheet"
icon_state = "sheet-phoronglass"
item_state = "sheet-pglass"
default_type = "borosilicate glass"
default_type = MATERIAL_GLASS_PHORON
/obj/item/stack/material/glass/phoronrglass
name = "reinforced borosilicate glass"
@@ -260,8 +265,7 @@
singular_name = "reinforced borosilicate glass sheet"
icon_state = "sheet-phoronrglass"
item_state = "sheet-prglass"
default_type = "reinforced borosilicate glass"
default_type = MATERIAL_GLASS_REINFORCED_PHORON
/obj/item/stack/material/bronze
name = "bronze"
icon_state = "sheet-brass"
@@ -271,5 +275,5 @@
/obj/item/stack/material/titanium
name = "titanium"
icon_state = "sheet-titanium"
default_type = "titanium"
default_type = MATERIAL_TITANIUM
icon_has_variants = TRUE