Skip to content

Commit

Permalink
Yeah, yeah, that girl stands out, exceptional
Browse files Browse the repository at this point in the history
We were extras from the beginning
  • Loading branch information
Matt Atlas committed Jul 21, 2023
1 parent f017b77 commit 77f8eec
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 5 deletions.
1 change: 0 additions & 1 deletion code/__defines/species_languages.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#define CAN_JOIN 0x2 // Species is selectable in chargen.
#define IS_RESTRICTED 0x4 // Is not a core/normally playable species. (castes, mutantraces)
#define NO_AGE_MINIMUM 0x8 // Doesn't respect minimum job age requirements.
#define HAS_PSIONICS 0x10 // Spawns with psionics.

// Species appearance flags
#define HAS_SKIN_TONE 0x1 // Skin tone selectable in chargen. (0-255)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/human.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1485,7 +1485,7 @@

species.set_default_tail(src)

if(!species.can_commune())
if(species.psi_deaf || (species.flags & IS_MECHANICAL) || (species.flags & NO_SCAN))
ADD_TRAIT(src, TRAIT_PSIONICALLY_DEAF, INNATE_TRAIT)

if(client)
Expand Down
8 changes: 6 additions & 2 deletions code/modules/mob/living/carbon/human/species/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,12 @@

var/use_alt_hair_layer = FALSE

/// Species psionics. FALSE for no psionics. Otherwise, set to the PSI_RANK define you want.
var/has_psionics = FALSE
/// Number of psi points in character creation.
var/character_creation_psi_points = 0
/// Is this species psionically deaf?
var/psi_deaf = FALSE

/datum/species/proc/get_eyes(var/mob/living/carbon/human/H)
return
Expand Down Expand Up @@ -473,8 +477,8 @@
if(!H.client || !H.client.prefs || !H.client.prefs.gender)
H.gender = pick(default_genders)
H.pronouns = H.gender
if(spawn_flags & HAS_PSIONICS)
H.set_psi_rank(PSI_RANK_SENSITIVE)
if(has_psionics)
H.set_psi_rank(has_psionics)

/datum/species/proc/handle_death(var/mob/living/carbon/human/H, var/gibbed = 0) //Handles any species-specific death events (such as dionaea nymph spawns).
return
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
grab_mod = 2
resist_mod = 0.5 // LIKE BABBY

spawn_flags = CAN_JOIN | IS_WHITELISTED | HAS_PSIONICS
spawn_flags = CAN_JOIN | IS_WHITELISTED
appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_SOCKS
flags = NO_SLIP

Expand Down Expand Up @@ -107,6 +107,7 @@

alterable_internal_organs = list(BP_HEART, BP_EYES, BP_LUNGS, BP_LIVER, BP_KIDNEYS, BP_STOMACH)

has_psionics = PSI_RANK_SENSITIVE
character_creation_psi_points = 4

/datum/species/skrell/handle_trail(var/mob/living/carbon/human/H, var/turf/T)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@


alterable_internal_organs = list(BP_HEART, BP_EYES, BP_LUNGS, BP_STOMACH, BP_APPENDIX)
psi_deaf = TRUE

/datum/species/bug/before_equip(var/mob/living/carbon/human/H)
. = ..()
Expand Down Expand Up @@ -168,3 +169,4 @@
if(I.w_class <= ITEMSIZE_SMALL)
return TRUE
return FALSE

49 changes: 49 additions & 0 deletions html/changelogs/mattatlas-kyoushikimurasaki.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################

# Your name.
author: MattAtlas

# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True

# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- experiment: "Psionics have been reworked to use the Technomancer ability system. This means that you get physical ability objects in your hand to use (in hand, melee, or ranged)."
- rscadd: "Added a psionic point shop. Opened by shift-clicking your psionic hub icon. This is also usable by non-antags, but they can't buy anything: it's still useful to use it to know what your powers do and how to use them!"
- rscadd: "Antagonists get points usable in the psionic point shop. This varies per antag: Loners get 8, borer hosts get 3 (increased by borers with Advance Psionics)."
- tweak: "Reworked the Psi ranks. The canon ones are Psionically Sensitive (Skrell), Psionically Harmonious (exceptional Skrell born with better psionic control), Psionic Apex (unknown to everyone, really). There's also an admin-only non-canon Limitless level."
- rscadd: "Every 30 minutes, psionics will be pinged in their chat about their emotional state, which can be one from a selection. A few minutes after, the responses will be tallied together and the winning emotion will be broadcasted. Higher psionic rank means higher vote value."
- rscadd: "Added a psionic jumpstarter to the antagonist uplink for 19 telecrystals. It will boost you to Psionically Harmonious, but with only 8 psi points."
- rscadd: "Added a truckload of new psionic abilities. No, really. They're a lot."
- rscadd: "Skrell may choose additional psionics that they spawn with in their loadout."
- rscadd: "Added mechanical support for the lack of a Zona Bovinae, mainly for vaurcae and dionae. In certain cases, a Zona Bovinae may even be removed from someone..."

0 comments on commit 77f8eec

Please sign in to comment.