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
@@ -76,11 +76,6 @@
 	for(var/path in subtypesof(/datum/surgery))
 		GLOB.surgeries_list += new path()

-	//Materials
-	for(var/path in subtypesof(/datum/material))
-		var/datum/material/D = new path()
-		GLOB.materials_list[D.id] = D
-
 	//Emotes
 	for(var/path in subtypesof(/datum/emote))
 		var/datum/emote/E = new path()