Skip to content

Commit

Permalink
Renames / Rethemes Space Carp to fit into the SCP universe better (Fo…
Browse files Browse the repository at this point in the history
…undation-19#1658)

carp -> selachian
  • Loading branch information
chesse20 authored and MysticalFaceLesS committed Apr 24, 2024
1 parent 8da9cda commit 68e1374
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions code/modules/mob/living/simple_animal/hostile/carp.dm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/reagents/reagent_containers/food/fish.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions code/modules/spells/aoe_turf/summons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 68e1374

Please sign in to comment.