Mega Carp Re-Carpening: Carpatastrophe!

code/_globalvars/lists/names.dm

@@ -16,6 +16,8 @@ GLOBAL_LIST_INIT(golem_names, world.file2list("strings/names/golem.txt"))
 GLOBAL_LIST_INIT(plasmaman_names, world.file2list("strings/names/plasmaman.txt"))
 GLOBAL_LIST_INIT(posibrain_names, world.file2list("strings/names/posibrain.txt"))
 GLOBAL_LIST_INIT(nightmare_names, world.file2list("strings/names/nightmare.txt"))
+GLOBAL_LIST_INIT(megacarp_first_names, world.file2list("strings/names/megacarp1.txt"))
+GLOBAL_LIST_INIT(megacarp_last_names, world.file2list("strings/names/megacarp2.txt"))
 
 
 GLOBAL_LIST_INIT(verbs, world.file2list("strings/names/verbs.txt"))

code/modules/mob/living/simple_animal/hostile/carp.dm

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /mob/living/simple_animal/hostile/carp
 	name = "space carp"
 	desc = "A ferocious, fang-bearing creature that resembles a fish."
@@ -78,4 +79,107 @@
 	speak_emote = list("squeaks")
 	gold_core_spawnable = 0
 	faction = list("syndicate")
-	AIStatus = AI_OFF
+	AIStatus = AI_OFF
+=======
+#define REGENERATION_DELAY 60  // After taking damage, how long it takes for automatic regeneration to begin for megacarps (ty robustin!)
+
+/mob/living/simple_animal/hostile/carp
+	name = "space carp"
+	desc = "A ferocious, fang-bearing creature that resembles a fish."
+	icon_state = "carp"
+	icon_living = "carp"
+	icon_dead = "carp_dead"
+	icon_gib = "carp_gib"
+	speak_chance = 0
+	turns_per_move = 5
+	butcher_results = list(/obj/item/reagent_containers/food/snacks/carpmeat = 2)
+	response_help = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm = "hits"
+	emote_taunt = list("gnashes")
+	taunt_chance = 30
+	speed = 0
+	maxHealth = 25
+	health = 25
+
+	harm_intent_damage = 8
+	obj_damage = 50
+	melee_damage_lower = 15
+	melee_damage_upper = 15
+	attacktext = "bites"
+	attack_sound = 'sound/weapons/bite.ogg'
+	speak_emote = list("gnashes")
+
+	//Space carp aren't affected by cold.
+	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
+	maxbodytemp = 1500
+	faction = list("carp")
+	movement_type = FLYING
+	pressure_resistance = 200
+	gold_core_spawnable = 1
+
+/mob/living/simple_animal/hostile/carp/Process_Spacemove(movement_dir = 0)
+	return 1	//No drifting in space for space carp!	//original comments do not steal
+
+/mob/living/simple_animal/hostile/carp/AttackingTarget()
+	. = ..()
+	if(. && ishuman(target))
+		var/mob/living/carbon/human/H = target
+		H.adjustStaminaLoss(8)
+
+/mob/living/simple_animal/hostile/carp/holocarp
+	icon_state = "holocarp"
+	icon_living = "holocarp"
+	maxbodytemp = INFINITY
+	gold_core_spawnable = 0
+	del_on_death = 1
+
+/mob/living/simple_animal/hostile/carp/megacarp
+	icon = 'icons/mob/broadMobs.dmi'
+	name = "Mega Space Carp"
+	desc = "A ferocious, fang bearing creature that resembles a shark. This one seems especially ticked off."
+	icon_state = "megacarp"
+	icon_living = "megacarp"
+	icon_dead = "megacarp_dead"
+	icon_gib = "megacarp_gib"
+	maxHealth = 20
+	health = 20
+	pixel_x = -16
+	mob_size = MOB_SIZE_LARGE
+
+	obj_damage = 80
+	melee_damage_lower = 20
+	melee_damage_upper = 20
+
+	var/regen_cooldown = 0
+
+/mob/living/simple_animal/hostile/carp/megacarp/Initialize()
+	. = ..()
+	name = "[pick(GLOB.megacarp_first_names)] [pick(GLOB.megacarp_last_names)]"
+	melee_damage_lower += rand(2, 10)
+	melee_damage_upper += rand(10,20)
+	maxHealth += rand(30,60)
+	move_to_delay = rand(3,7)
+
+/mob/living/simple_animal/hostile/carp/megacarp/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
+	. = ..()
+	if(.)
+		regen_cooldown = world.time + REGENERATION_DELAY
+
+/mob/living/simple_animal/hostile/carp/megacarp/Life()
+	. = ..()
+	if(regen_cooldown < world.time)
+		heal_overall_damage(4)
+
+/mob/living/simple_animal/hostile/carp/cayenne
+	name = "Cayenne"
+	desc = "A failed Syndicate experiment in weaponized space carp technology, it now serves as a lovable mascot."
+	gender = FEMALE
+	speak_emote = list("squeaks")
+	gold_core_spawnable = 0
+	faction = list("syndicate")
+	AIStatus = AI_OFF
+
+#undef REGENERATION_DELAY
+>>>>>>> 15241d9... Mega Carp Re-Carpening: Carpatastrophe! (#31365)