Merge remote-tracking branch 'citadel/master' into mobility_flags

2020-02-21 23:29:25 -07:00
parent b8d60a33bd d4e1c30597
commit f6542b381c
279 changed files with 4174 additions and 1928 deletions
@@ -9,7 +9,7 @@
 	flags_1 = CONDUCT_1
 	slot_flags = ITEM_SLOT_BACK
 	w_class = WEIGHT_CLASS_HUGE
-	materials = list(MAT_METAL=10000, MAT_GLASS=2500)
+	custom_materials = list(/datum/material/iron=10000, /datum/material/glass=2500)

 	var/code = 2
 	var/frequency = FREQ_ELECTROPACK
@@ -157,7 +157,7 @@ Code:
 	w_class = WEIGHT_CLASS_SMALL
 	strip_delay = 60
 	equip_delay_other = 60
-	materials = list(MAT_METAL=5000, MAT_GLASS=2000)
+	custom_materials = list(/datum/material/iron = 5000, /datum/material/glass = 2000)

 	var/tagname = null

@@ -166,7 +166,7 @@ Code:
 	id = "shockcollar"
 	build_type = AUTOLATHE
 	build_path = /obj/item/electropack/shockcollar
-	materials = list(MAT_METAL=5000, MAT_GLASS=2000)
+	materials = list(/datum/material/iron = 5000, /datum/material/glass =2000)
 	category = list("hacked", "Misc")

 /obj/item/electropack/shockcollar/attack_hand(mob/user)
@@ -19,7 +19,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 	desc = "An updated, modular intercom that fits over the head. Takes encryption keys."
 	icon_state = "headset"
 	item_state = "headset"
-	materials = list(MAT_METAL=75)
+	custom_materials = list(/datum/material/iron=75)
 	subspace_transmission = TRUE
 	canhear_range = 0 // can't hear headsets from very far away

@@ -147,4 +147,4 @@
 	result_path = /obj/item/radio/intercom/unscrewed
 	pixel_shift = 29
 	inverse = TRUE
-	materials = list(MAT_METAL = 75, MAT_GLASS = 25)
+	custom_materials = list(/datum/material/iron = 75, /datum/material/glass = 25)
@@ -11,7 +11,7 @@
 	throw_speed = 3
 	throw_range = 7
 	w_class = WEIGHT_CLASS_SMALL
-	materials = list(MAT_METAL=75, MAT_GLASS=25)
+	custom_materials = list(/datum/material/iron=75, /datum/material/glass=25)
 	obj_flags = USES_TGUI

 	var/on = TRUE