Update AI_modules.dm

2018-01-19 08:48:40 -05:00
parent 844a80dba6
commit 19fa1066d9
1 changed files with 0 additions and 5 deletions
@@ -398,13 +398,8 @@ AI MODULES
 /obj/item/aiModule/core/full/custom
 	name = "Default Core AI Module"

-<<<<<<< HEAD
-/obj/item/aiModule/core/full/custom/New()
-	..()
-=======
 /obj/item/aiModule/core/full/custom/Initialize()
 	. = ..()
->>>>>>> 1bc398c... Merge pull request #34603 from optimumtact/pigfuck
 	for(var/line in world.file2list("config/silicon_laws.txt"))
 		if(!line)
 			continue