cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor trait defines

Browse Source 
Moves all trait definitions into a single file, fixes inconsistent capitalization, and sorts them into even lists by type. Does the same for species defines.
This commit is contained in:
Darius
2023-02-19 17:05:41 -05:00
parent a3fd8c69bb
commit edea2d78d6
5 changed files with 31 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/__SPLURTCODE/DEFINES/species.dm
View File

@@ -1,2 +1,4 @@
#define SPECIES_SPECBOT "spectre_bot" #define SPECIES_SPECBOT "spectre_bot"
#define SPECIES_SHADEKIN "shadekin" #define SPECIES_SHADEKIN "shadekin"
#define SPECIES_ASHWALKER_WEST "ashlizard_west"
#define SPECIES_ASHWALKER_EAST "ashlizard_east"

51
code/__SPLURTCODE/DEFINES/traits.dm
View File

@@ -1,29 +1,32 @@
#define SLAVER_TRAIT "slaver" // General traits
#define PREGNANCY_TRAIT "pregnancy" #define TRAIT_PREGNANT "pregnant"
#define TRAIT_FLOORED "floored"
#define IGNORE_FAKE_Z_AXIS "ignore_fake_z_axis"
#define TRAIT_TONGUELESS_SPEECH "tongueless_speech"
#define TRAIT_HYPNOTIC_GAZE "Hypnotic Gaze" // Trait types
#define TRAIT_PREGNANT "pregnant" #define SLAVER_TRAIT "slaver"
#define PREGNANCY_TRAIT "pregnancy"
#define TRAIT_FLOORED "floored" // Quirk traits
#define IGNORE_FAKE_Z_AXIS "ignore_fake_z_axis" #define TRAIT_HYPNOTIC_GAZE "hypnotic_gaze"
#define TRAIT_GFLUID_DETECT "genital_fluid_detect"
#define TRAIT_GFLUID_DETECT "genital_fluid_detect" #define TRAIT_ASHRESISTANCE "ash_resistance"
#define TRAIT_PHARMA "hepatic_pharmacokinesis"
#define TRAIT_ASHRESISTANCE "TRAIT_ASHRESISTANCE"
#define TRAIT_TONGUELESS_SPEECH "tongueless-speech" //for dephelm stuff
// Hyperstation traits
#define TRAIT_PHARMA "hepatic_pharmacokinesis"
#define TRAIT_CHOKE_SLUT "choke_slut" #define TRAIT_CHOKE_SLUT "choke_slut"
#define TRAIT_BLOODFLEDGE "bloodfledge"
#define TRAIT_BLOODFLEDGE "BloodFledge" #define TRAIT_INCUBUS "incubus"
#define TRAIT_SUCCUBUS "succubus"
#define TRAIT_INCUBUS "Incubus" #define TRAIT_ARACHNID "arachnid"
#define TRAIT_SUCCUBUS "Succubus"
#define TRAIT_ARACHNID "Arachnid"
#define TRAIT_FLUTTER "flutter" #define TRAIT_FLUTTER "flutter"
#define TRAIT_NUDIST "Nudist" #define TRAIT_NUDIST "nudist"
#define TRAIT_CLOTH_EATER "cloth_eater" #define TRAIT_CLOTH_EATER "cloth_eater"
#define TRAIT_WEREWOLF "Werewolf" #define TRAIT_WEREWOLF "werewolf"
#define TRAIT_PRIMITIVE "primitive"
#define TRAIT_STEEL_ASS "steel_ass"
#define TRAIT_CURSED_BLOOD "cursed_blood"
#define TRAIT_HEADPAT_SLUT "headpat_slut"
#define TRAIT_DISTANT "headpat_hater"
#define TRAIT_ILLITERATE "illiterate"
#define TRAIT_HIDE_BACKPACK "hide_backpack"
#define TRAIT_DUMB4CUM "dumb4cum"

2
code/__SPLURTCODE/DEFINES/zeros/species.dm
View File

@@ -1,2 +0,0 @@
#define SPECIES_ASHWALKER_WEST "ashlizard_west"
#define SPECIES_ASHWALKER_EAST "ashlizard_east"

9
code/__SPLURTCODE/DEFINES/zeros/traits.dm
View File

@@ -1,9 +0,0 @@
#define TRAIT_PRIMITIVE "primitive"
#define TRAIT_STEEL_ASS "steel_ass"
#define TRAIT_CURSED_BLOOD "cursed_blood" //Yo dawg I heard you like bloodborne references so I put a
#define TRAIT_HEADPAT_SLUT "headpat_slut"
#define TRAIT_DISTANT "headpat_hater"
#define TRAIT_ILLITERATE "illiterate"
#define TRAIT_HIDE_BACKPACK "hide_backpack"
#define TRAIT_DUMB4CUM "dumb4cum"

2
tgstation.dme
View File

@@ -281,8 +281,6 @@
#include "code\__SPLURTCODE\DEFINES\traits.dm" #include "code\__SPLURTCODE\DEFINES\traits.dm"
#include "code\__SPLURTCODE\DEFINES\arousal\genitals.dm" #include "code\__SPLURTCODE\DEFINES\arousal\genitals.dm"
#include "code\__SPLURTCODE\DEFINES\dcs\signals.dm" #include "code\__SPLURTCODE\DEFINES\dcs\signals.dm"
#include "code\__SPLURTCODE\DEFINES\zeros\species.dm"
#include "code\__SPLURTCODE\DEFINES\zeros\traits.dm"
#include "code\_globalvars\admin.dm" #include "code\_globalvars\admin.dm"
#include "code\_globalvars\bitfields.dm" #include "code\_globalvars\bitfields.dm"
#include "code\_globalvars\configuration.dm" #include "code\_globalvars\configuration.dm"