Use material defines more

This commit is contained in:
Aronai Sieyes
2021-07-03 18:18:05 -04:00
parent 4b52bf232f
commit b71c7e7271
206 changed files with 908 additions and 918 deletions
+4 -4
View File
@@ -162,8 +162,8 @@
"spod" = "\ref[spod]",
"name" = sanitize(capitalize(spod.name)),
"busy" = spod.busy,
"steel" = spod.stored_material[DEFAULT_WALL_MATERIAL],
"glass" = spod.stored_material["glass"]
"steel" = spod.stored_material[MAT_STEEL],
"glass" = spod.stored_material[MAT_GLASS]
)))
data["spods"] = temppods.Copy()
temppods.Cut()
@@ -289,8 +289,8 @@
return
//Not enough steel or glass
else if(spod.stored_material[DEFAULT_WALL_MATERIAL] < spod.body_cost)
set_temp("Error: Not enough [DEFAULT_WALL_MATERIAL] in SynthFab.", "danger")
else if(spod.stored_material[MAT_STEEL] < spod.body_cost)
set_temp("Error: Not enough [MAT_STEEL] in SynthFab.", "danger")
return
else if(spod.stored_material["glass"] < spod.body_cost)
set_temp("Error: Not enough glass in SynthFab.", "danger")
+1 -1
View File
@@ -62,7 +62,7 @@
throw_speed = 1
throw_range = 5
w_class = ITEMSIZE_SMALL
matter = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 2000)
matter = list(MAT_STEEL = 2000, MAT_GLASS = 2000)
var/list/obj/item/weapon/implant/backup/imps = list()
var/max_implants = 4 //Iconstates need to exist due to the update proc!
+3 -3
View File
@@ -194,7 +194,7 @@
density = 1
anchored = 1
var/list/stored_material = list(DEFAULT_WALL_MATERIAL = 30000, "glass" = 30000)
var/list/stored_material = list(MAT_STEEL = 30000, MAT_GLASS = 30000)
var/connected //What console it's done up with
var/busy = 0 //Busy cloning
var/body_cost = 15000 //Cost of a cloned body (metal and glass ea.)
@@ -255,7 +255,7 @@
if(!istype(BR) || busy)
return 0
if(stored_material[DEFAULT_WALL_MATERIAL] < body_cost || stored_material["glass"] < body_cost)
if(stored_material[MAT_STEEL] < body_cost || stored_material["glass"] < body_cost)
return 0
current_project = BR
@@ -350,7 +350,7 @@
H.loc = get_turf(src)
//Machine specific stuff at the end
stored_material[DEFAULT_WALL_MATERIAL] -= body_cost
stored_material[MAT_STEEL] -= body_cost
stored_material["glass"] -= body_cost
busy = 0
update_icon()
+1 -1
View File
@@ -23,7 +23,7 @@
var/mob/living/silicon/infomorph/infomorph
var/current_emotion = 1
matter = list(DEFAULT_WALL_MATERIAL = 4000, "glass" = 4000)
matter = list(MAT_STEEL = 4000, MAT_GLASS = 4000)
/obj/item/device/sleevecard/relaymove(var/mob/user, var/direction)
if(user.stat || user.stunned)