Merge branch 'master' into upstream-merge-33045

2017-11-24 00:10:36 +00:00
parent b2bb942817 efe10a1ee7
commit eb722bf59f
5 changed files with 83 additions and 49 deletions
@@ -10,8 +10,6 @@
 		qdel(src)
 		CRASH("[type] instantiated!")

-<<<<<<< HEAD
-=======
 	//check for common mishaps
 	if(!isnum(dupe_mode))
 		qdel(src)
@@ -20,7 +18,6 @@
 		qdel(src)
 		CRASH("[type]: Invalid dupe_type!")

->>>>>>> 807311a... Fixes component runtimes (#33045)
 	parent = P
 	var/list/arguments = args.Copy()
 	arguments.Cut(1, 2)