Update creature.dm

2017-11-26 21:25:13 -05:00
parent e5e17cf334
commit 90e13d0053
1 changed files with 0 additions and 21 deletions
@@ -1,23 +1,3 @@
-<<<<<<< HEAD
-/mob/living/simple_animal/hostile/creature
-	name = "creature"
-	desc = "A sanity-destroying otherthing."
-	icon_state = "otherthing"
-	icon_living = "otherthing"
-	icon_dead = "otherthing-dead"
-	health = 80
-	maxHealth = 80
-	obj_damage = 100
-	melee_damage_lower = 25
-	melee_damage_upper = 50
-	attacktext = "chomps"
-	attack_sound = 'sound/weapons/bite.ogg'
-	faction = list("creature")
-	speak_emote = list("screams")
-	gold_core_spawnable = 1
-	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
-	minbodytemp = 0
-=======
 /mob/living/simple_animal/hostile/creature
 	name = "creature"
 	desc = "A sanity-destroying otherthing."
@@ -36,4 +16,3 @@
 	gold_core_spawnable = HOSTILE_SPAWN
 	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
 	minbodytemp = 0
->>>>>>> 2abae67... Cleans up goldcore defines (#33090)