Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello

code/datums/cargoprofile.dm

@@ -1,4 +1,3 @@
-#define MAXCOIL 30
 /datum/cargoprofile
 	var/name = "All Items"
 	var/id = "all" // unique ID for the UI
@@ -787,4 +786,3 @@
 		var/punches = punch(M,remaining / PUNCH_WORK)
 		if(punches>1)master.sleep++
 		return punches * PUNCH_WORK
-#undef MAXCOIL

code/datums/material_container.dm

@@ -40,6 +40,8 @@
 		materials[MAT_BANANIUM] = new /datum/material/bananium()
 	if(mat_list[MAT_TRANQUILLITE])
 		materials[MAT_TRANQUILLITE] = new /datum/material/tranquillite()
+	if(mat_list[MAT_TITANIUM])
+		materials[MAT_TITANIUM] = new /datum/material/titanium()
 
 /datum/material_container/Destroy()
 	QDEL_LIST_ASSOC_VAL(materials)
@@ -276,6 +278,13 @@
 	material_type = MAT_TRANQUILLITE
 	sheet_type = /obj/item/stack/sheet/mineral/tranquillite
 
+/datum/material/titanium
+
+/datum/material/titanium/New()
+	..()
+	material_type = MAT_TITANIUM
+	sheet_type = /obj/item/stack/sheet/mineral/titanium
+
 /datum/material/biomass
 
 /datum/material/biomass/New()

code/datums/mutable_appearance.dm

@@ -0,0 +1,13 @@
+// Mutable appearances are an inbuilt byond datastructure. Read the documentation on them by hitting F1 in DM.
+// Basically use them instead of images for overlays/underlays and when changing an object's appearance if you're doing so with any regularity.
+// Unless you need the overlay/underlay to have a different direction than the base object. Then you have to use an image due to a bug.
+
+// Mutable appearances are children of images, just so you know.
+
+// Helper similar to image()
+/proc/mutable_appearance(icon, icon_state = "", layer = FLOAT_LAYER)
+	var/mutable_appearance/MA = new()
+	MA.icon = icon
+	MA.icon_state = icon_state
+	MA.layer = layer
+	return MA