Update carbon.dm

2017-11-17 23:23:13 -05:00
parent f1818eb11b
commit d202867730
1 changed files with 1 additions and 4 deletions
@@ -2,13 +2,10 @@
 	blood_volume = BLOOD_VOLUME_NORMAL

 /mob/living/carbon/Initialize()
+	. = ..()
 	create_reagents(1000)
 	update_body_parts() //to update the carbon's new bodyparts appearance
-<<<<<<< HEAD
-	..()
-=======
 	GLOB.carbon_list += src
->>>>>>> 39375d5... Replaces a bunch of mob loops with hopefully better ones (#32786)

 /mob/living/carbon/Destroy()
 //This must be done first, so the mob ghosts correctly before DNA etc is nulled