Update golems.dm

2017-09-27 22:43:57 -05:00
parent 3687ef2d33
commit a8043202c2
1 changed files with 1 additions and 6 deletions
--- a/code/modules/mob/living/carbon/human/species_types/golems.dm
+++ b/code/modules/mob/living/carbon/human/species_types/golems.dm
@@ -586,9 +586,6 @@
 		H.adjustFireLoss(-4)
 		H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM)

-<<<<<<< HEAD
-=======
-
 /datum/species/golem/clockwork
 	name = "Clockwork Golem"
 	id = "clockwork golem"
@@ -639,9 +636,7 @@
 	has_corpse = TRUE
 	blacklisted = TRUE
 	dangerous_existence = TRUE
-
-
->>>>>>> 59e7559... Clockwork cult rework: Post-merge micro-patch (#31044)
+	
 /datum/species/golem/cloth
 	name = "Cloth Golem"
 	id = "cloth golem"