cleanup the last

This commit is contained in:
Kashargul
2024-12-08 20:54:28 +01:00
parent 99f21e40a3
commit 8d6bf161a8
76 changed files with 356 additions and 324 deletions
+7 -7
View File
@@ -17,25 +17,25 @@
/obj/item/stack/material/cyborg/plastic
icon_state = "sheet-plastic"
default_type = "plastic"
default_type = MAT_PLASTIC
/obj/item/stack/material/cyborg/steel
icon_state = "sheet-metal"
default_type = "steel"
default_type = MAT_STEEL
/obj/item/stack/material/cyborg/plasteel
icon_state = "sheet-plasteel"
default_type = "plasteel"
default_type = MAT_PLASTEEL
/obj/item/stack/material/cyborg/wood
icon_state = "sheet-wood"
default_type = "wood"
default_type = MAT_WOOD
/obj/item/stack/material/cyborg/glass
icon_state = "sheet-glass"
default_type = "glass"
default_type = MAT_GLASS
/obj/item/stack/material/cyborg/glass/reinforced
icon_state = "sheet-rglass"
default_type = "rglass"
charge_costs = list(500, 1000)
default_type = MAT_RGLASS
charge_costs = list(500, 1000)
@@ -1,6 +1,6 @@
// Adminspawn only, do not let anyone get this.
/datum/material/alienalloy
name = "alienalloy"
name = MAT_ALIENALLOY
display_name = "durable alloy"
stack_type = null
flags = MATERIAL_UNMELTABLE
@@ -37,4 +37,4 @@
display_name = "alien"
icon_base = "alien"
table_icon_base = "alien"
icon_colour = "#FFFFFF"
icon_colour = "#FFFFFF"
+4 -4
View File
@@ -1,5 +1,5 @@
/datum/material/cult
name = "cult"
name = MAT_CULT
display_name = "disturbing stone"
icon_base = "cult"
table_icon_base = "stone"
@@ -11,14 +11,14 @@
conductive = 0
/datum/material/cult/place_dismantled_girder(var/turf/target)
new /obj/structure/girder/cult(target, "cult")
new /obj/structure/girder/cult(target, MAT_CULT)
/datum/material/cult/place_dismantled_product(var/turf/target)
new /obj/effect/decal/cleanable/blood(target)
/datum/material/cult/reinf
name = "cult2"
name = MAT_CULT2
display_name = "human remains"
/datum/material/cult/reinf/place_dismantled_product(var/turf/target)
new /obj/effect/decal/remains/human(target)
new /obj/effect/decal/remains/human(target)
+4 -4
View File
@@ -63,8 +63,8 @@
/datum/material/painite
name = MAT_PAINITE
display_name = "painite"
use_name = "painite"
display_name = MAT_PAINITE
use_name = MAT_PAINITE
icon_colour = "#6b4947"
stack_type = /obj/item/stack/material/painite
flags = MATERIAL_UNMELTABLE
@@ -78,8 +78,8 @@
/datum/material/void_opal
name = MAT_VOPAL
display_name = "void opal"
use_name = "void opal"
display_name = MAT_VOPAL
use_name = MAT_VOPAL
icon_colour = "#0f0f0f"
stack_type = /obj/item/stack/material/void_opal
flags = MATERIAL_UNMELTABLE
+2 -2
View File
@@ -115,7 +115,7 @@
/datum/material/glass/phoron
name = MAT_PGLASS
display_name = "borosilicate glass"
display_name = MAT_PGLASS
stack_type = /obj/item/stack/material/glass/phoronglass
flags = MATERIAL_BRITTLE
integrity = 100
@@ -129,7 +129,7 @@
/datum/material/glass/phoron/reinforced
name = MAT_RPGLASS
display_name = "reinforced borosilicate glass"
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)
@@ -5,13 +5,13 @@
shard_type = SHARD_NONE
/datum/material/plastic/holographic
name = "holoplastic"
display_name = "plastic"
name = "holo" + MAT_PLASTIC
display_name = MAT_PLASTIC
stack_type = null
shard_type = SHARD_NONE
/datum/material/wood/holographic
name = "holowood"
display_name = "wood"
name = "holo" + MAT_WOOD
display_name = MAT_WOOD
stack_type = null
shard_type = SHARD_NONE
shard_type = SHARD_NONE
@@ -1,5 +1,5 @@
/datum/material/cloth
name = "cloth"
name = MAT_CLOTH
stack_origin_tech = list(TECH_MATERIAL = 2)
door_icon_base = "wood"
ignition_point = T0C+232
@@ -46,7 +46,7 @@
)
/datum/material/cloth/syncloth
name = "syncloth"
name = MAT_SYNCLOTH
stack_origin_tech = list(TECH_MATERIAL = 3, TECH_BIO = 2)
ignition_point = T0C+532
melting_point = T0C+600
@@ -57,63 +57,63 @@
hardness = 5
/datum/material/cloth/teal
name = "teal"
display_name ="teal"
name = MAT_CLOTH_TEAL
display_name =MAT_CLOTH_TEAL
use_name = "teal cloth"
icon_colour = "#00EAFA"
/datum/material/cloth/black
name = "black"
display_name = "black"
name = MAT_CLOTH_BLACK
display_name = MAT_CLOTH_BLACK
use_name = "black cloth"
icon_colour = "#505050"
/datum/material/cloth/green
name = "green"
display_name = "green"
name = MAT_CLOTH_GREEN
display_name = MAT_CLOTH_GREEN
use_name = "green cloth"
icon_colour = "#01C608"
/datum/material/cloth/puple
name = "purple"
display_name = "purple"
name = MAT_CLOTH_PURPLE
display_name = MAT_CLOTH_PURPLE
use_name = "purple cloth"
icon_colour = "#9C56C4"
/datum/material/cloth/blue
name = "blue"
display_name = "blue"
name = MAT_CLOTH_BLUE
display_name = MAT_CLOTH_BLUE
use_name = "blue cloth"
icon_colour = "#6B6FE3"
/datum/material/cloth/beige
name = "beige"
display_name = "beige"
name = MAT_CLOTH_BEIGE
display_name = MAT_CLOTH_BEIGE
use_name = "beige cloth"
icon_colour = "#E8E7C8"
/datum/material/cloth/lime
name = "lime"
display_name = "lime"
name = MAT_CLOTH_LIME
display_name = MAT_CLOTH_LIME
use_name = "lime cloth"
icon_colour = "#62E36C"
/datum/material/cloth/yellow
name = "yellow"
display_name = "yellow"
name = MAT_CLOTH_YELLOW
display_name = MAT_CLOTH_YELLOW
use_name = "yellow cloth"
icon_colour = "#EEF573"
/datum/material/cloth/orange
name = "orange"
display_name = "orange"
name = MAT_CLOTH_ORANGE
display_name = MAT_CLOTH_ORANGE
use_name = "orange cloth"
icon_colour = "#E3BF49"
/datum/material/carpet
name = "carpet"
name = MAT_CARPET
display_name = "comfy"
use_name = "red upholstery"
icon_colour = "#DA020A"
@@ -128,8 +128,8 @@
integrity = 40
/datum/material/cotton
name = "cotton"
display_name ="cotton"
name = MAT_COTTON
display_name =MAT_COTTON
icon_colour = "#FFFFFF"
flags = MATERIAL_PADDING|MATERIAL_BRITTLE
ignition_point = T0C+232
@@ -143,7 +143,7 @@
name = MAT_FIBERS
display_name = "plant"
sheet_singular_name = "fiber"
sheet_singular_name = "fibers"
sheet_singular_name = MAT_FIBERS
icon_colour = "#006b0e"
flags = MATERIAL_PADDING|MATERIAL_BRITTLE
ignition_point = T0C+232
@@ -152,4 +152,4 @@
conductive = 0
pass_stack_colors = TRUE
hardness = 5
integrity = 5
integrity = 5
@@ -1,5 +1,5 @@
/datum/material/resin
name = "resin"
name = MAT_RESIN
icon_colour = "#35343a"
icon_base = "resin"
table_icon_base = "stone"
@@ -53,4 +53,4 @@
new /datum/stack_recipe("[display_name] net", /obj/item/material/fishing_net, 10, time = 5 SECONDS, supplied_material = "[name]", pass_stack_color = TRUE),
new /datum/stack_recipe("[display_name] membrane", /obj/structure/alien/membrane, 1, time = 2 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"),
new /datum/stack_recipe("[display_name] node", /obj/effect/alien/weeds/node, 1, time = 4 SECONDS, recycle_material = "[name]")
)
)
@@ -94,10 +94,10 @@
/datum/material/wood/log
name = MAT_LOG
display_name = "wood" // will lead to "wood log"
display_name = MAT_WOOD // will lead to "wood log"
icon_base = "log"
stack_type = /obj/item/stack/material/log
sheet_singular_name = "log"
sheet_singular_name = MAT_LOG
sheet_plural_name = "logs"
sheet_collective_name = "pile"
pass_stack_colors = TRUE
@@ -110,7 +110,7 @@
/datum/material/wood/log/sif
name = MAT_SIFLOG
display_name = "alien wood"
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
@@ -124,7 +124,7 @@
/datum/material/wood/stick
name = "wooden stick"
icon_colour = "#824B28"
display_name = "wood"
display_name = MAT_WOOD
icon_base = "stick"
stack_type = /obj/item/stack/material/stick
sheet_collective_name = "pile"
@@ -135,4 +135,4 @@
/datum/material/wood/stick/generate_recipes()
return
//VOREStation Addition End
//VOREStation Addition End
+1 -1
View File
@@ -57,7 +57,7 @@
)
/datum/material/cardboard
name = "cardboard"
name = MAT_CARDBOARD
stack_type = /obj/item/stack/material/cardboard
flags = MATERIAL_BRITTLE
integrity = 10
+2 -2
View File
@@ -26,7 +26,7 @@
)
/datum/material/snowbrick //only slightly stronger than snow, used to make igloos mostly
name = "packed snow"
name = MAT_SNOWBRICK
flags = MATERIAL_BRITTLE
stack_type = /obj/item/stack/material/snowbrick
icon_base = "stone"
@@ -54,4 +54,4 @@
new /datum/stack_recipe("[display_name] double bed", /obj/structure/bed/double, 4, one_per_turf = 1, on_floor = 1, supplied_material = "[name]"),
new /datum/stack_recipe("[display_name] wall girders", /obj/structure/girder, 2, time = 50, one_per_turf = 1, on_floor = 1, supplied_material = "[name]"),
new /datum/stack_recipe("[display_name] ashtray", /obj/item/material/ashtray, 2, one_per_turf = 1, on_floor = 1, supplied_material = "[name]")
)
)
+3 -3
View File
@@ -1,5 +1,5 @@
/datum/material/stone
name = "sandstone"
name = MAT_SANDSTONE
stack_type = /obj/item/stack/material/sandstone
icon_base = "stone"
table_icon_base = "stone"
@@ -20,7 +20,7 @@
recipes += new /datum/stack_recipe("planting bed", /obj/machinery/portable_atmospherics/hydroponics/soil, 3, time = 10, one_per_turf = 1, on_floor = 1, recycle_material = "[name]")
/datum/material/stone/marble
name = "marble"
name = MAT_MARBLE
icon_colour = "#AAAAAA"
weight = 26
hardness = 30 //VOREStation Edit - Please.
@@ -36,7 +36,7 @@
)
//VOREStation Addition Start
/datum/material/stone/flint
name = "flint"
name = MAT_FLINT
icon_colour = "#9e9c99"
weight = 20
hardness = 30
+1 -1
View File
@@ -24,7 +24,7 @@
/obj/item/stack/material/void_opal
name = MAT_VOPAL
icon_state = "sheet-void_opal"
singular_name = "void opal"
singular_name = MAT_VOPAL
default_type = MAT_VOPAL
apply_colour = 1
no_variants = FALSE
+6 -6
View File
@@ -10,24 +10,24 @@
/obj/item/stack/material/glass/reinforced
name = "reinforced glass"
icon_state = "sheet-rtransparent"
default_type = "rglass"
default_type = MAT_RGLASS
no_variants = FALSE
apply_colour = TRUE
/obj/item/stack/material/glass/phoronglass
name = "borosilicate glass"
name = MAT_PGLASS
desc = "This sheet is special platinum-glass alloy designed to withstand large temperatures"
singular_name = "borosilicate glass sheet"
icon_state = "sheet-transparent"
default_type = "borosilicate glass"
default_type = MAT_PGLASS
no_variants = FALSE
apply_colour = TRUE
/obj/item/stack/material/glass/phoronrglass
name = "reinforced borosilicate glass"
name = MAT_RPGLASS
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-rtransparent"
default_type = "reinforced borosilicate glass"
default_type = MAT_RPGLASS
no_variants = FALSE
apply_colour = TRUE
apply_colour = TRUE
@@ -1,8 +1,8 @@
/obj/item/stack/material/resin
name = "resin"
name = MAT_RESIN
icon_state = "sheet-resin"
default_type = "resin"
default_type = MAT_RESIN
no_variants = TRUE
apply_colour = TRUE
pass_color = TRUE
strict_color_stacking = TRUE
strict_color_stacking = TRUE
@@ -1,5 +1,5 @@
/obj/item/stack/material/leather
name = "leather"
name = MAT_LEATHER
desc = "The by-product of mob grinding."
icon_state = "sheet-leather"
default_type = MAT_LEATHER
@@ -10,10 +10,10 @@
pickup_sound = 'sound/items/pickup/leather.ogg'
/obj/item/stack/material/cloth
name = "cloth"
name = MAT_CLOTH
desc = "Individual fibers woven into a cloth."
icon_state = "sheet-cloth"
default_type = "cloth"
default_type = MAT_CLOTH
no_variants = FALSE
pass_color = TRUE
strict_color_stacking = TRUE
@@ -20,7 +20,7 @@
description_info = "Rich, lustrous hardwood, imported from offworld at moderate expense. Mostly used for luxurious furniture, and not very good for weapons or other structures."
/obj/item/stack/material/log
name = "log"
name = MAT_LOG
icon_state = "sheet-log"
default_type = MAT_LOG
no_variants = FALSE
@@ -33,13 +33,13 @@
pickup_sound = 'sound/items/pickup/wooden.ogg'
/obj/item/stack/material/log/sif
name = "alien log"
name = MAT_SIFLOG
default_type = MAT_SIFLOG
color = "#0099cc"
plank_type = /obj/item/stack/material/wood/sif
/obj/item/stack/material/log/hard
name = "hardwood log"
name = MAT_HARDLOG
default_type = MAT_HARDLOG
color = "#6f432a"
plank_type = /obj/item/stack/material/wood/hard
+2 -2
View File
@@ -5,9 +5,9 @@
no_variants = FALSE
/obj/item/stack/material/cardboard
name = "cardboard"
name = MAT_CARDBOARD
icon_state = "sheet-card"
default_type = "cardboard"
default_type = MAT_CARDBOARD
no_variants = FALSE
pass_color = TRUE
strict_color_stacking = TRUE
+4 -4
View File
@@ -1,16 +1,16 @@
// Ok, technically not stones, but the snowbrick's function is similar to sandstone and marble
/obj/item/stack/material/snow
name = "snow"
name = MAT_SNOW
desc = "The temptation to build a snowman rises."
icon_state = "sheet-snow"
drop_sound = 'sound/items/drop/gloves.ogg'
pickup_sound = 'sound/items/pickup/clothing.ogg'
default_type = "snow"
default_type = MAT_SNOW
/obj/item/stack/material/snowbrick
name = "snow brick"
desc = "For all of your igloo building needs."
icon_state = "sheet-snowbrick"
default_type = "packed snow"
default_type = MAT_SNOWBRICK
drop_sound = 'sound/items/drop/gloves.ogg'
pickup_sound = 'sound/items/pickup/clothing.ogg'
pickup_sound = 'sound/items/pickup/clothing.ogg'
+8 -8
View File
@@ -1,23 +1,23 @@
/obj/item/stack/material/sandstone
name = "sandstone brick"
name = MAT_SANDSTONE + " brick"
icon_state = "sheet-sandstone"
default_type = "sandstone"
default_type = MAT_SANDSTONE
no_variants = FALSE
drop_sound = 'sound/items/drop/boots.ogg'
pickup_sound = 'sound/items/pickup/boots.ogg'
/obj/item/stack/material/marble
name = "marble brick"
name = MAT_MARBLE + " brick"
icon_state = "sheet-marble"
default_type = "marble"
default_type = MAT_MARBLE
no_variants = FALSE
drop_sound = 'sound/items/drop/boots.ogg'
pickup_sound = 'sound/items/pickup/boots.ogg'
/obj/item/stack/material/flint
name = "flint piece"
name = MAT_FLINT + " piece"
icon_state = "sheet-rock"
default_type = "flint"
default_type = MAT_FLINT
no_variants = FALSE
drop_sound = 'sound/items/drop/boots.ogg'
pickup_sound = 'sound/items/pickup/boots.ogg'
@@ -25,8 +25,8 @@
apply_colour = TRUE
/obj/item/stack/material/concrete
name = "concrete brick"
name = MAT_CONCRETE + " brick"
icon_state = "brick"
default_type = "concrete"
default_type = MAT_CONCRETE
no_variants = FALSE
apply_colour = 1