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
@@ -3,7 +3,7 @@
 	desc = "A handy little spring-loaded trap for catching pesty rodents."
 	icon_state = "mousetrap"
 	item_state = "mousetrap"
-	materials = list(MAT_METAL=100)
+	custom_materials = list(/datum/material/iron=100)
 	attachable = TRUE
 	var/armed = FALSE