forked from Sandstorm-Station/Sandstorm-Station-13
-
-
Notifications
You must be signed in to change notification settings - Fork 283
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
Races port #1056
Open
Comicao1
wants to merge
4
commits into
SPLURT-Station:master
Choose a base branch
from
Comicao1:Races-port
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Races port #1056
Changes from all commits
Commits
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 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
This file contains 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
This file contains 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
This file contains 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
Binary file not shown.
Binary file not shown.
This file contains 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
This file contains 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
114 changes: 114 additions & 0 deletions
114
modular_splurt/code/modules/mob/living/carbon/human/species_types/diona.dm
This file contains 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,114 @@ | ||
/datum/species/diona | ||
name = "Diona" | ||
id = SPECIES_DIONA | ||
override_bp_icon = 'modular_splurt/icons/mob/diona.dmi' | ||
species_language_holder = /datum/language_holder/diona | ||
|
||
species_traits = list( | ||
NO_UNDERWEAR | ||
) | ||
|
||
exotic_blood_color = "#004400" | ||
//flesh_color = "#808D11" | ||
|
||
min_age = 18 | ||
max_age = 300 | ||
say_mod = "chirrups" | ||
eye_type = "diona" | ||
allowed_limb_ids = null | ||
damage_overlay_type = "diona" | ||
|
||
/datum/species/diona/check_roundstart_eligible() | ||
return TRUE | ||
|
||
/datum/language_holder/diona | ||
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM), | ||
/datum/language/diona = list(LANGUAGE_ATOM)) | ||
spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM), | ||
/datum/language/diona = list(LANGUAGE_ATOM)) | ||
|
||
/datum/language/diona | ||
|
||
/datum/species/diona/on_species_gain(mob/living/carbon/human/C, datum/species/old_species, pref_load) | ||
if(ishuman(C)) | ||
C.add_movespeed_modifier(/datum/movespeed_modifier/diona) | ||
C.verbs += /mob/living/carbon/human/proc/regenerate | ||
C.verbs += /mob/living/carbon/human/proc/diona_split_nymph | ||
..() | ||
|
||
/datum/movespeed_modifier/diona | ||
multiplicative_slowdown = 2 | ||
|
||
/datum/species/diona/spec_life(mob/living/carbon/human/H) | ||
var/turf/T = get_turf(H) | ||
if(T) | ||
var/light_amount = T.get_lumcount()*10 | ||
|
||
if((H.nutrition + light_amount) < initial(H.nutrition)) | ||
H.adjust_nutrition(light_amount) | ||
|
||
if(light_amount >= 3) //if there's enough light, heal | ||
H.adjustBruteLoss(-(round(light_amount/2))) | ||
H.adjustFireLoss(-(round(light_amount/2))) | ||
H.adjustToxLoss(-(light_amount)) | ||
H.adjustOxyLoss(-(light_amount)) | ||
//TODO: heal wounds, heal broken limbs. | ||
if(H.nutrition < 200) | ||
H.take_overall_damage(2,0) | ||
|
||
/mob/living/carbon/human | ||
var/active_regen = FALSE //Used for the regenerate proc in human_powers.dm | ||
var/active_regen_delay = 300 | ||
|
||
/mob/living/carbon/human/proc/regenerate() | ||
set name = "Regenerate" | ||
set desc = "Allows you to regrow limbs and heal organs after a period of rest." | ||
set category = "Abilities" | ||
|
||
if(nutrition < 250) | ||
to_chat(src, span_warning("You lack the biomass to begin regeneration!")) | ||
return | ||
|
||
if(active_regen) | ||
to_chat(src, span_warning("You are already regenerating tissue!")) | ||
return | ||
else | ||
active_regen = TRUE | ||
src.visible_message(span_warning("<B>[src]</B>'s flesh begins to mend...")) | ||
|
||
var/delay_length = round(active_regen_delay * 1) | ||
if(do_after(src,delay_length)) | ||
adjust_nutrition(-200) | ||
|
||
regenerate_limbs() | ||
regenerate_organs() | ||
remove_all_embedded_objects() | ||
set_heartattack(FALSE) | ||
|
||
handle_organs() // Update everything | ||
|
||
active_regen = FALSE | ||
else | ||
to_chat(src, span_userdanger("Your regeneration is interrupted!")) | ||
adjust_nutrition(-75) | ||
active_regen = FALSE | ||
|
||
|
||
/mob/living/carbon/human/proc/diona_split_nymph() | ||
set name = "Split" | ||
set desc = "Split your humanoid form into its constituent nymphs." | ||
set category = "Abilities" | ||
var/turf/T = get_turf(src) | ||
|
||
var/mob/living/carbon/alien/diona/S = new(T) | ||
|
||
if(mind) | ||
mind.transfer_to(S) | ||
|
||
for(var/obj/item/W in src) | ||
dropItemToGround(W) | ||
|
||
visible_message(span_warning("\The [src] quivers slightly, then splits apart with a wet slithering noise.")) | ||
qdel(src) | ||
|
||
|
67 changes: 67 additions & 0 deletions
67
modular_splurt/code/modules/mob/living/carbon/human/species_types/diona_nymph.dm
This file contains 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,67 @@ | ||
/mob/living/carbon/alien/diona | ||
name = "diona nymph" | ||
var/adult_form = /mob/living/carbon/human/species/mammal/diona | ||
var/can_namepick_as_adult = 1 | ||
var/adult_name = "diona gestalt" | ||
icon_state = "nymph" | ||
//race = /datum/species/diona | ||
var/amount_grown = 0 | ||
var/max_grown = 325 | ||
verb_say = "chirrups" | ||
initial_language_holder = /datum/language_holder/diona | ||
|
||
/mob/living/carbon/alien/diona/proc/handle_npc(var/mob/living/carbon/alien/diona/D) | ||
if(D.stat != CONSCIOUS) | ||
return | ||
if(prob(33) && isturf(D.loc) && !D.pulledby) //won't move if being pulled | ||
step(D, pick(NORTH, SOUTH, EAST, WEST)) | ||
if(prob(1)) | ||
D.emote(pick("scratch","jump","chirp","roll")) | ||
|
||
/mob/living/carbon/alien/diona/ComponentInitialize() | ||
. = ..() | ||
AddElement(/datum/element/mob_holder, worn_state = "diona", inv_slots = ITEM_SLOT_HEAD) | ||
|
||
/mob/living/carbon/alien/diona/Life() | ||
..() | ||
if(amount_grown < max_grown) | ||
amount_grown++ | ||
|
||
/mob/living/carbon/alien/diona/movement_delay() | ||
return 2 | ||
|
||
/mob/living/carbon/alien/diona/verb/evolve() | ||
|
||
set name = "Evolve" | ||
set desc = "Evolve into your adult form." | ||
set category = "Abilities" | ||
|
||
if(stat != CONSCIOUS) | ||
return | ||
|
||
if(!adult_form) | ||
verbs -= /mob/living/carbon/alien/diona/verb/evolve | ||
return | ||
|
||
if(amount_grown < max_grown) | ||
to_chat(src, "<font color='red'>You are not fully grown.</font>") | ||
return | ||
var/mob/living/carbon/human/adult = new adult_form(get_turf(src)) | ||
|
||
|
||
if(mind) | ||
mind.transfer_to(adult) | ||
if (can_namepick_as_adult) | ||
var/newname = sanitize(tgui_input_text(adult, "You have become an adult. Choose a name for yourself.", "Adult Name", null, MAX_NAME_LEN), MAX_NAME_LEN) | ||
|
||
if(!newname) | ||
adult.fully_replace_character_name(name, "[src.adult_name]") | ||
else | ||
adult.fully_replace_character_name(name, newname) | ||
else | ||
adult.key = src.key | ||
|
||
for (var/obj/item/W in src.contents) | ||
dropItemToGround(W) | ||
|
||
qdel(src) |
This file contains 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
Binary file not shown.
This file contains 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
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.
undefine min_age and max_age, as 1 would be below 18 (our minimum age) for species.
I don't care if they can't have genitals due to the fact you forgot to do ANY adjustment; we do not allow people with characters below the age of 18 on the server.