This repository was archived by the owner on May 22, 2025. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 456
[READY] Adds Preternis! #4656
Merged
Merged
[READY] Adds Preternis! #4656
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
7bd20a9
Adds preternis part 1
4c49ed8
Part 1
3188a60
:),quick tweak to remove limb buffs
73bbbc2
part 2
281c0e9
all features done,time to complete testing and iron out bugs!
dae25bf
tweaks
dd9e2c9
bug fixes
c231ce1
clears config changes
a8e9d97
shit,forgot to test one feature and this is the result
d957477
commends
alexkar598 a5dc373
webeditor <3
alexkar598 519e13f
does the thing
Amelia0010 0906438
Update species.dm
alexkar598 8ab88e3
Update power_suck.dm
alexkar598 c54eb03
Update yogstation/code/modules/mob/living/carbon/human/species_types/…
Amelia0010 5e2252b
TRUE or FALSE?
alexkar598 ba28f66
bit too high
alexkar598 26f2de3
as you wish master nich
alexkar598 77a8f7c
finalization,buffs power charging
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
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,13 @@ | ||
| #define PRETERNIS_LEVEL_FULL 550 | ||
| #define PRETERNIS_LEVEL_WELL_FED 450 | ||
| #define PRETERNIS_LEVEL_FED 350 | ||
| #define PRETERNIS_LEVEL_HUNGRY 250 | ||
| #define PRETERNIS_LEVEL_STARVING 150 | ||
| #define PRETERNIS_LEVEL_NONE 0 | ||
|
|
||
| #define ELECTRICITY_TO_NUTRIMENT_FACTOR 0.44 //1 power unit to 44 preternis charge they can uncharge an apc to 50% at most | ||
|
|
||
| #define PRETERNIS_NV_OFF 2 //numbers of tile they can see | ||
| #define PRETERNIS_NV_ON 8 | ||
|
|
||
| #define BODYPART_ANY -1 //use this when healing with something that needs a specefied bodypart type for all |
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
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
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
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
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
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
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
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,5 @@ | ||
| /mob/living/carbon/human/CanContractDisease(datum/disease/D) | ||
| var/infectchance = dna.species ? dna.species.yogs_virus_infect_chance : 100 //will this compile? who knows | ||
| if(prob(infectchance)) | ||
| return ..() | ||
| return FALSE |
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,9 @@ | ||
| /datum/disease/advance/Refresh(new_name) | ||
| ..() | ||
| if(affected_mob?.dna) | ||
| var/datum/species/S = affected_mob.dna.species | ||
| properties["resistance"] += S.virus_resistance_boost | ||
| properties["stealth"] += S.virus_stealth_boost | ||
| properties["stage_rate"] += S.virus_stage_rate_boost | ||
| properties["transmittable"] += S.virus_transmittable_boost | ||
| AssignProperties() //this is a bit inefficent because its called twice but modularization amiright? |
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
62 changes: 62 additions & 0 deletions
62
yogstation/code/modules/mob/living/carbon/human/species_types/preternis/organs.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,62 @@ | ||
| /obj/item/organ/eyes/preternis | ||
| name = "preternis eyes" | ||
| desc = "An experimental upgraded version of eyes that can see in the dark.They are designed to fit preternis" | ||
| see_in_dark = PRETERNIS_NV_ON | ||
| lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE | ||
| actions_types = list(/datum/action/item_action/organ_action/use) | ||
| var/night_vision = TRUE | ||
|
|
||
| /obj/item/organ/eyes/preternis/ui_action_click() | ||
| var/datum/species/preternis/S = owner.dna.species | ||
| if(S.charge < PRETERNIS_LEVEL_FED) | ||
| return | ||
| sight_flags = initial(sight_flags) | ||
| switch(lighting_alpha) | ||
| if (LIGHTING_PLANE_ALPHA_VISIBLE) | ||
| lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE | ||
| if (LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE) | ||
| lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE | ||
| if (LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE) | ||
| lighting_alpha = LIGHTING_PLANE_ALPHA_INVISIBLE | ||
| else | ||
| lighting_alpha = LIGHTING_PLANE_ALPHA_VISIBLE | ||
| sight_flags &= ~SEE_BLACKNESS | ||
| owner.update_sight() | ||
|
|
||
| /obj/item/organ/eyes/preternis/on_life() | ||
| . = ..() | ||
| if(!ispreternis(owner)) | ||
| qdel(src) //these eyes depend on being inside a preternis | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can't you like, just make them not work rather than making a specieschange mean they lose their eyes permanently?
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. i tought so too but it gives them new eyes of the other species when they switch so this just affects transplants and its not meant to be in a preternis and this is wasted process cycles otherwise,tell me if its mandatory i change this |
||
| return | ||
| var/datum/species/preternis/S = owner.dna.species | ||
| if(S.charge >= PRETERNIS_LEVEL_FED) | ||
| if(see_in_dark == PRETERNIS_NV_OFF) | ||
| see_in_dark = PRETERNIS_NV_ON | ||
| owner.update_sight() | ||
| else | ||
| if(see_in_dark == PRETERNIS_NV_ON) | ||
| see_in_dark = PRETERNIS_NV_OFF | ||
| owner.update_sight() | ||
| if(lighting_alpha < LIGHTING_PLANE_ALPHA_VISIBLE) | ||
| lighting_alpha = LIGHTING_PLANE_ALPHA_VISIBLE | ||
| sight_flags &= ~SEE_BLACKNESS | ||
| owner.update_sight() | ||
|
|
||
| /obj/item/organ/lungs/preternis | ||
| name = "preternis lungs" | ||
| desc = "An experimental set of lungs.Due to the cybernetic nature of these lungs,they are less resistant to heat and cold but are more efficent at filtering oxygen." | ||
| icon_state = "lungs-c" | ||
| safe_oxygen_min = 12 | ||
| safe_toxins_max = 10 | ||
| gas_stimulation_min = 0.1 //fucking filters removing my stimulants | ||
|
|
||
| cold_level_1_threshold = 280 | ||
| cold_level_1_damage = 1.5 | ||
| cold_level_2_threshold = 260 | ||
| cold_level_2_damage = 3 | ||
| cold_level_3_threshold = 200 | ||
| cold_level_3_damage = 4.5 | ||
|
|
||
| heat_level_1_threshold = 320 | ||
| heat_level_2_threshold = 400 | ||
| heat_level_3_threshold = 600 //HALP MY LUNGS ARE ON FIRE | ||
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.
Uh oh!
There was an error while loading. Please reload this page.