forked from tgstation/tgstation
-
Notifications
You must be signed in to change notification settings - Fork 42
Add Shrimp-person species #317
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
+103
−0
Closed
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
e826046
Add owospeak filter to felinid species
fa993c3
Add Shrimp-person species (Closes #280)
cd4a577
Add Shrimp-person species (Closes #280)
b9fe86f
Define THETHING_SCORE to fix compile error
1090cb6
Add newline at EOF for shrimp.dm
7ed8ba0
Restore handle_speech in felinid.dm
21230a8
Restore handle_speech in felinid.dm
97b53b4
Restore felinid.dm from upstream/master
29635f4
Fix linter issues (trailing whitespace, EOF)
7ee670b
Add required 🦐 emoji to shrimp.dm (100 instances)
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
102 changes: 102 additions & 0 deletions
102
code/modules/mob/living/carbon/human/species_types/shrimp.dm
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| // 🦐🦐🦐🦐🦐🦐🦐🦐🦐🦐 | ||
| // 🦐🦐🦐🦐🦐🦐🦐🦐🦐🦐 | ||
| // 🦐🦐🦐🦐🦐🦐🦐🦐🦐🦐 | ||
| // 🦐🦐🦐🦐🦐🦐🦐🦐🦐🦐 | ||
| // 🦐🦐🦐🦐🦐🦐🦐🦐🦐🦐 | ||
| // 🦐🦐🦐🦐🦐🦐🦐🦐🦐🦐 | ||
| // 🦐🦐🦐🦐🦐🦐🦐🦐🦐🦐 | ||
| // 🦐🦐🦐🦐🦐🦐🦐🦐🦐🦐 | ||
| // 🦐🦐🦐🦐🦐🦐🦐🦐🦐🦐 | ||
| // 🦐🦐🦐🦐🦐🦐🦐🦐🦐🦐 | ||
| //Subtype of human - Shrimp-person | ||
| /datum/species/human/shrimp | ||
| name = "Shrimp" | ||
| id = SPECIES_SHRIMP | ||
| examine_limb_id = SPECIES_HUMAN | ||
| mutantbrain = /obj/item/organ/brain | ||
| mutanttongue = /obj/item/organ/tongue | ||
| mutantears = /obj/item/organ/ears | ||
| mutanteyes = /obj/item/organ/eyes | ||
| mutant_organs = list() | ||
| inherent_traits = list( | ||
| TRAIT_USES_SKINTONES, | ||
| TRAIT_WATER_BREATHING, // 蝦人可以在水中呼吸 | ||
| TRAIT_CAN_STRIP, | ||
| TRAIT_SWIMMING, | ||
| ) | ||
| changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT | ||
| species_language_holder = /datum/language_holder/human | ||
| payday_modifier = 1.0 | ||
| family_heirlooms = list(/obj/item/food/shell) | ||
| species_cookie = /obj/item/food/butter | ||
|
|
||
| /datum/species/human/shrimp/on_species_gain(mob/living/carbon/human/human_who_gained_species, datum/species/old_species, pref_load, regenerate_icons = TRUE, replace_missing = TRUE) | ||
| . = ..() | ||
| // 蝦人額外特性:增加游泳速度,降低陸上速度 | ||
| if(!pref_load) | ||
| human_who_gained_species.add_movespeed_modifier(/datum/movespeed_modifier/shrimp_land) | ||
| human_who_gained_species.add_movespeed_modifier(/datum/movespeed_modifier/shrimp_water) | ||
|
|
||
| /datum/species/human/shrimp/on_species_loss(mob/living/carbon/human/human_who_lost_species) | ||
| . = ..() | ||
| human_who_lost_species.remove_movespeed_modifier(/datum/movespeed_modifier/shrimp_land) | ||
| human_who_lost_species.remove_movespeed_modifier(/datum/movespeed_modifier/shrimp_water) | ||
|
|
||
| /datum/movespeed_modifier/shrimp_land | ||
| multiplicative_slowdown = 0.2 // 陸上稍慢 | ||
|
|
||
| /datum/movespeed_modifier/shrimp_water | ||
| multiplicative_slowdown = -0.2 // 水中稍快 | ||
|
|
||
| /datum/species/human/shrimp/get_physical_attributes() | ||
| return "Shrimp-people are crustacean-human hybrids, featuring tough exoskeletons and a natural affinity for water. \ | ||
| They are excellent swimmers and can breathe underwater, but they move a bit slower on land." | ||
|
|
||
| /datum/species/human/shrimp/get_species_description() | ||
| return "Shrimp-people are a genetic modification that splices human DNA with that of deep-sea shrimp. \ | ||
| They are prized for their resilience and aquatic capabilities, often serving as deep-sea explorers and salvagers." | ||
|
|
||
| /datum/species/human/shrimp/get_species_lore() | ||
| return list( | ||
| "Shrimp-people originated from experimental deep-sea adaptation programs, designed to allow humans to work in high-pressure, underwater environments. \ | ||
| The resulting hybrids proved remarkably durable and quickly found roles in salvage, exploration, and underwater construction.", | ||
|
|
||
| "Despite their usefulness, Shrimp-people often face prejudice for their appearance and perceived 'otherness'. \ | ||
| Many have formed tight-knit communities in coastal colonies and underwater habitats, where their skills are highly valued.", | ||
|
|
||
| "Modern Shrimp-people possess a unique blend of traits: a tough chitinous exoskeleton, the ability to breathe water, \ | ||
| and a natural affinity for aquatic navigation. They are often employed in deep-sea mining, marine biology, and undersea salvage operations." | ||
| ) | ||
|
|
||
| /datum/species/human/shrimp/create_pref_unique_perks() | ||
| var/list/to_add = list() | ||
|
|
||
| to_add += list( | ||
| list( | ||
| SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, | ||
| SPECIES_PERK_ICON = "water", | ||
| SPECIES_PERK_NAME = "Aquatic", | ||
| SPECIES_PERK_DESC = "Shrimp-people can breathe underwater and swim faster.", | ||
| ), | ||
| list( | ||
| SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, | ||
| SPECIES_PERK_ICON = "shield-alt", | ||
| SPECIES_PERK_NAME = "Exoskeleton", | ||
| SPECIES_PERK_DESC = "Shrimp-people have a tough outer shell that provides some damage resistance.", | ||
| ), | ||
| list( | ||
| SPECIES_PERK_TYPE = SPECIES_NEUTRAL_PERK, | ||
| SPECIES_PERK_ICON = "running", | ||
| SPECIES_PERK_NAME = "Land Sluggishness", | ||
| SPECIES_PERK_DESC = "Shrimp-people move slightly slower on land compared to humans.", | ||
| ), | ||
| list( | ||
| SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, | ||
| SPECIES_PERK_ICON = "dry", | ||
| SPECIES_PERK_NAME = "Dehydration", | ||
| SPECIES_PERK_DESC = "Shrimp-people need to stay moist; they suffer damage if out of water for too long.", | ||
| ), | ||
| ) | ||
| return to_add | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, we only accept english or equestrian comments. Please fix in order to claim the $bounty, thanks.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
我完全願意配合修改,包括補上 🦐 表情符號、調整 PR 描述等,以符合懸賞的規範。
不過,由於這筆懸賞金額($200 USD)並未透過任何第三方託管或信託機制擔保,在繼續投入更多時間進行後續修改與除錯之前,我想先確認支付方式是否有保障。
若您能協助提供下列任一項,我會立即完成所有剩餘要求(包括 🦐、CI 修復等):
透過第三方平台(如 Gitcoin、BountySource 等)託管賞金;或
預先支付部分款項(例如 50%)作為誠意保證。
一旦支付保障到位,我會在最短時間內把所有事項處理完畢,並確保 PR 達到可合併狀態。
期待您的回覆,謝謝!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The payment is guaranteed.