From 68e1374d4cf36084183a95e9b7d2a3e98adfd90e Mon Sep 17 00:00:00 2001
From: chesse20 <chesse20@gmail.com>
Date: Tue, 23 Apr 2024 22:32:59 -0700
Subject: [PATCH] Renames / Rethemes Space Carp to fit into the SCP universe
 better (#1658)

carp -> selachian
---
 code/modules/mob/living/simple_animal/hostile/carp.dm       | 6 +++---
 .../reagents/Chemistry-Reagents/toxins/toxins_poisons.dm    | 4 ++--
 code/modules/reagents/reagent_containers/food/fish.dm       | 2 +-
 code/modules/spells/aoe_turf/summons.dm                     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
index c9a546303c..4f03c2daec 100644
--- a/code/modules/mob/living/simple_animal/hostile/carp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -1,13 +1,13 @@
 /mob/living/simple_animal/hostile/carp
-	name = "space carp"
-	desc = "A ferocious, fang-bearing creature that resembles a fish."
+	name = "selachian"
+	desc = "A suspicously carp shaped shark with an extremely punchable face"
 	icon = 'icons/mob/simple_animal/carp.dmi'
 	icon_state = "carp" //for mapping purposes
 	icon_gib = "carp_gib"
 	turns_per_move = 3
 	response_help = "pets the"
 	response_disarm = "gently pushes aside the"
-	response_harm = "hits the"
+	response_harm = "punches the"
 	movement_cooldown = 3
 	maxHealth = 50
 	health = 50
diff --git a/code/modules/reagents/Chemistry-Reagents/toxins/toxins_poisons.dm b/code/modules/reagents/Chemistry-Reagents/toxins/toxins_poisons.dm
index 0a69fc03f4..100771a115 100644
--- a/code/modules/reagents/Chemistry-Reagents/toxins/toxins_poisons.dm
+++ b/code/modules/reagents/Chemistry-Reagents/toxins/toxins_poisons.dm
@@ -67,8 +67,8 @@
 
 
 /datum/reagent/toxin/carpotoxin
-	name = "Carpotoxin"
-	description = "A neurotoxin found in the flesh of space carp. It causes artery blockages that disrupt blood circulation."
+	name = "Sharkotoxin"
+	description = "A neurotoxin found in the flesh of selachians. It causes artery blockages that disrupt blood circulation."
 	taste_description = "fish"
 	reagent_state = LIQUID
 	color = "#003333"
diff --git a/code/modules/reagents/reagent_containers/food/fish.dm b/code/modules/reagents/reagent_containers/food/fish.dm
index 6df668e777..cce567e6f2 100644
--- a/code/modules/reagents/reagent_containers/food/fish.dm
+++ b/code/modules/reagents/reagent_containers/food/fish.dm
@@ -43,7 +43,7 @@
 	fish_type = "shark"
 
 /obj/item/reagent_containers/food/snacks/fish/carp
-	fish_type = "carp"
+	fish_type = "selachian"
 
 /obj/item/reagent_containers/food/snacks/fish/octopus
 	fish_type = "tako"
diff --git a/code/modules/spells/aoe_turf/summons.dm b/code/modules/spells/aoe_turf/summons.dm
index c67d6474f1..006573d95a 100644
--- a/code/modules/spells/aoe_turf/summons.dm
+++ b/code/modules/spells/aoe_turf/summons.dm
@@ -13,8 +13,8 @@
 	mana_cost = 100
 
 /datum/spell/aoe_turf/conjure/carp
-	name = "Summon Carp"
-	desc = "This spell conjures a simple carp."
+	name = "Summon Selachian"
+	desc = "This spell conjures a simple selachian."
 
 	charge_max = 1200
 	spell_flags = NEEDSCLOTHES