Update pen.dm

2017-12-14 17:24:19 -05:00
parent ba928eae5e
commit ede6f432bc
1 changed files with 0 additions and 4 deletions
@@ -175,12 +175,8 @@
 				reagents.trans_to(M, reagents.total_volume)


-<<<<<<< HEAD
-/obj/item/pen/sleepy/New()
-=======
 /obj/item/pen/sleepy/Initialize()
 	. = ..()
->>>>>>> d447acd... All-In-One grinder results are now defined by type, not by huge lists (#33181)
 	create_reagents(45)
 	reagents.add_reagent("chloralhydrate2", 20)
 	reagents.add_reagent("mutetoxin", 15)