Convert /material to /datum/material

This commit is contained in:
ShadowLarkens
2020-09-27 16:16:44 -07:00
parent 6ffd4e86c3
commit 3d7b051f2b
41 changed files with 185 additions and 185 deletions
+1 -1
View File
@@ -9,7 +9,7 @@
var/burning = FALSE
var/next_fuel_consumption = 0 // world.time of when next item in fuel list gets eatten to sustain the fire.
var/grill = FALSE
var/material/material
var/datum/material/material
var/set_temperature = T0C + 30 //K
var/heating_power = 80000
+5 -5
View File
@@ -11,8 +11,8 @@
var/current_damage = 0
var/cover = 50 //how much cover the girder provides against projectiles.
var/default_material = DEFAULT_WALL_MATERIAL
var/material/girder_material
var/material/reinf_material
var/datum/material/girder_material
var/datum/material/reinf_material
var/reinforcing = 0
var/applies_material_colour = 1
@@ -226,7 +226,7 @@
to_chat(user, "<span class='notice'>There isn't enough material here to construct a wall.</span>")
return 0
var/material/M = name_to_material[S.default_type]
var/datum/material/M = name_to_material[S.default_type]
if(!istype(M))
return 0
@@ -267,7 +267,7 @@
to_chat(user, "<span class='notice'>There isn't enough material here to reinforce the girder.</span>")
return 0
var/material/M = name_to_material[S.default_type]
var/datum/material/M = name_to_material[S.default_type]
if(!istype(M) || M.integrity < 50)
to_chat(user, "You cannot reinforce \the [src] with that; it is too soft.")
return 0
@@ -401,7 +401,7 @@
var/turf/simulated/wall/new_T = get_turf(src) // Ref to the wall we just built.
// Apparently set_material(...) for walls requires refs to the material singletons and not strings.
// This is different from how other material objects with their own set_material(...) do it, but whatever.
var/material/M = name_to_material[the_rcd.material_to_use]
var/datum/material/M = name_to_material[the_rcd.material_to_use]
new_T.set_material(M, the_rcd.make_rwalls ? M : null, girder_material)
new_T.add_hiddenprint(user)
qdel(src)
+1 -1
View File
@@ -17,7 +17,7 @@
var/epitaph = "" //A quick little blurb
// var/dir_locked = 0 //Can it be spun? Not currently implemented
var/material/material
var/datum/material/material
/obj/structure/gravemarker/New(var/newloc, var/material_name)
..(newloc)
+1 -1
View File
@@ -7,7 +7,7 @@
icon = 'icons/obj/doors/material_doors.dmi'
icon_state = "metal"
var/material/material
var/datum/material/material
var/state = 0 //closed, 1 == open
var/isSwitchingStates = 0
var/hardness = 1
@@ -1,4 +1,4 @@
/material/flockium
/datum/material/flockium
name = "flockium"
//stack_type = /obj/item/stack/material/sandstone
icon_base = "flock"
@@ -17,8 +17,8 @@
can_buckle = 1
buckle_dir = SOUTH
buckle_lying = 1
var/material/material
var/material/padding_material
var/datum/material/material
var/datum/material/padding_material
var/base_icon = "bed"
var/applies_material_colour = 1
@@ -226,7 +226,7 @@
/obj/structure/bed/chair/sofa/update_icon()
if(applies_material_colour && sofa_material)
var/material/color_material = get_material_by_name(sofa_material)
var/datum/material/color_material = get_material_by_name(sofa_material)
color = color_material.icon_colour
if(sofa_material == "carpet")
@@ -12,8 +12,8 @@ var/global/list/stool_cache = list() //haha stool
throwforce = 10
w_class = ITEMSIZE_HUGE
var/base_icon = "stool_base"
var/material/material
var/material/padding_material
var/datum/material/material
var/datum/material/padding_material
/obj/item/weapon/stool/padded
icon_state = "stool_padded_preview" //set for the map