Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adds Affection Aversion quirk (#25194)
* Adds Affection Aversion quirk Stops affection modules. Very simple. * I hate you, github May or may not do anything. Stop giving me a merge conflict. Stop it. * Revert "I hate you, github" This reverts commit 6515023cc3f72d97d90bbdf982857b1d2724b1cf. * Attempts to revert traits.dm Because something went TERRIBLY wrong with my fork and/or my editor and I'm not sure why. * Added quirk proper now that my fork is unfucked Why did this even happen? * These lists are alphabetized * Same here --------- Co-authored-by: Bloop <[email protected]>
- Loading branch information
2 people
authored and
committed
Nov 23, 2023
1 parent
1a0da8f
commit 00d51e6
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| // This file contains all of the "static" define strings that tie to a trait. | ||
| // WARNING: The sections here actually matter in this file as it's tested by CI. Please do not toy with the sections." | ||
|
|
||
| // BEGIN TRAIT DEFINES | ||
|
|
||
| /* | ||
| Remember to update _globalvars/traits.dm if you're adding/removing/renaming traits. | ||
| */ | ||
|
|
||
| //mob traits | ||
|
|
||
| // Defines for some extra traits | ||
| #define TRAIT_NO_HUSK "no_husk" | ||
| #define TRAIT_NORUNNING "norunning" // You walk! | ||
| #define TRAIT_EXCITABLE "wagwag" //Will wag when patted! | ||
| #define TRAIT_OXYIMMUNE "oxyimmune" // Immune to oxygen damage, ideally give this to all non-breathing species or bad stuff will happen | ||
| #define TRAIT_AFFECTION_AVERSION "affection_aversion" // No more dogborg licking. "Dogborg bad" is no longer a personality | ||
| #define TRAIT_PERSONALSPACE "personalspace" // Block/counter-attack ass-slaps | ||
| #define TRAIT_MOOD_NOEXAMINE "mood_noexamine" // Can't assess your own mood | ||
| #define TRAIT_DNR "do_not_revive" // Can't be revived without supernatural means or admin intervention | ||
| #define TRAIT_HARD_SOLES "hard_soles" // No step on glass | ||
| #define TRAIT_SENSITIVESNOUT "sensitive_snout" // Snout hurts when booped | ||
| #define TRAIT_DETECTIVE "detective_ability" //Given to the detective, if they have this, they can see syndicate special descriptions. | ||
| #define TRAIT_FREE_GHOST "free_ghost" // Can ghost and return freely with this trait | ||
| #define TRAIT_GLOVES "gloves_trait" //Traits associated with wearing gloves | ||
| #define TRAIT_LINGUIST "Linguist" // Extra language point. | ||
| #define TRAIT_GLUED_ITEM "glued-item" // This is for glued items, undroppable. Syndie glue applies this. | ||
| #define TRAIT_STICKY_FINGERS "sticky_fingers" //This is so a mob can strip items faster and picks them up after | ||
| /// This makes trait makes it so that the person cannot be infected by the zombie virus. | ||
| #define TRAIT_MUTANT_IMMUNE "mutant_immune" | ||
| #define TRAIT_HYDRA_HEADS "hydrahead" | ||
|
|
||
| /// adds -6 quirk to negative quirks for free points. | ||
| #define TRAIT_GIFTED "gifted" | ||
|
|
||
| //AdditionalEmotes *turf traits | ||
| #define TRAIT_WATER_ASPECT "water_aspect" | ||
| #define TRAIT_WEBBING_ASPECT "webbing_aspect" | ||
| #define TRAIT_FLORAL_ASPECT "floral_aspect" | ||
| #define TRAIT_ASH_ASPECT "ash_aspect" | ||
| #define TRAIT_SPARKLE_ASPECT "sparkle_aspect" | ||
|
|
||
| /// Allows the user to instantly reload. | ||
| #define TRAIT_INSTANT_RELOAD "instant_reload" | ||
|
|
||
| // Trait sources | ||
| #define TRAIT_GHOSTROLE "ghostrole" // SKYRAT EDIT ADDITION -- Ghost Cafe Traits | ||
|
|
||
| /// One can breath under water, you get me? | ||
| #define TRAIT_WATER_BREATHING "water_breathing" | ||
|
|
||
| /// The trait which Akulas inherit, for their species mechanic revolving around wet_stacks | ||
| #define TRAIT_SLICK_SKIN "slick_skin" | ||
| /// The trait which is applied when a `slick skin` trait haver actually gets wet_stacks | ||
| #define TRAIT_SLIPPERY "slippery" | ||
|
|
||
| /// Under the effect of a numbling agent, such as morphine, for surgery. | ||
| #define TRAIT_NUMBED "numbed" | ||
|
|
||
| // felinid traits | ||
| #define TRAIT_FELINE "feline_aspect" | ||
|
|
||
| // canine traits | ||
| #define TRAIT_CANINE "canine_aspect" | ||
|
|
||
| // avian traits | ||
| #define TRAIT_AVIAN "avian_aspect" | ||
|
|
||
| // chameleon mutation | ||
| #define TRAIT_CHAMELEON_SKIN "chameleon_skin" | ||
|
|
||
| //Makes sure that people cant be cult sacrificed twice. | ||
| #define TRAIT_SACRIFICED "sacrificed" | ||
|
|
||
| /// The trait that determines if someone has the oversized quirk. | ||
| #define TRAIT_OVERSIZED "trait_oversized" | ||
|
|
||
| /// Cargo Loader trait | ||
| #define TRAIT_TRASHMAN "trait_trashman" | ||
|
|
||
| /// Trait source for xeno innate abilities | ||
| #define TRAIT_XENO_INNATE "xeno_innate" | ||
| /// Trait source for something added BY a xeno ability | ||
| #define TRAIT_XENO_ABILITY_GIVEN "xeno_ability_given" | ||
| /// Determines if something can receive healing from a xeno | ||
| #define TRAIT_XENO_HEAL_AURA "trait_xeno_heal_aura" | ||
|
|
||
| /// Trait that was granted by a reagent. | ||
| #define TRAIT_REAGENT "reagent" | ||
|
|
||
| /// trait that lets you do flips with a style meter | ||
| #define TRAIT_STYLISH "stylish" | ||
|
|
||
| /// trait that lets you do xenoarch magnification | ||
| #define TRAIT_XENOARCH_QUALIFIED "trait_xenoarch_qualified" | ||
|
|
||
| /// Traits granted by glassblowing | ||
| #define TRAIT_GLASSBLOWING "glassblowing" | ||
|
|
||
| /// Trait that is applied whenever someone or something is glassblowing | ||
| #define TRAIT_CURRENTLY_GLASSBLOWING "currently_glassblowing" | ||
|
|
||
| /// Trait that was granted by a NIFSoft | ||
| #define TRAIT_NIFSOFT "nifsoft" | ||
|
|
||
| /// Trait given to a piece of eyewear that allows the user to use NIFSoft HUDs | ||
| #define TRAIT_NIFSOFT_HUD_GRANTER "nifsoft_hud_granter" | ||
|
|
||
| /// Trait given to a brain that is able to accept souls from a RSD | ||
| #define TRAIT_RSD_COMPATIBLE "rsd_compatible" | ||
|
|
||
| // Defines for some extra inherent traits | ||
| #define TRAIT_REVIVES_BY_HEALING "trait_revives_by_healing" | ||
| #define TRAIT_ROBOTIC_DNA_ORGANS "trait_robotic_dna_organs" | ||
|
|
||
| //Defines for model features, set in the model_features list of a robot model datum. Are they a dogborg? Is the model small? etc. | ||
| /// Cyborgs with unique sprites for when they get totally broken down. | ||
| #define TRAIT_R_UNIQUEWRECK "unique_wreck" | ||
| /// Or when tipped over. | ||
| #define TRAIT_R_UNIQUETIP "unique_tip" | ||
| /// 64x32 skins | ||
| #define TRAIT_R_WIDE "wide_borg" | ||
| /// 32x64 skins | ||
| #define TRAIT_R_TALL "tall_borg" | ||
| /// Any model small enough to reject the shrinker upgrade. | ||
| #define TRAIT_R_SMALL "small_chassis" | ||
| /// Any model that has a custom front panel | ||
| #define TRAIT_R_UNIQUEPANEL "unique_openpanel" | ||
|
|
||
| // Lewd traits | ||
| #define TRAIT_MASOCHISM "masochism" | ||
| #define TRAIT_SADISM "sadism" | ||
| #define TRAIT_NEVERBONER "neverboner" | ||
| #define TRAIT_BIMBO "bimbo" | ||
| #define TRAIT_RIGGER "rigger" | ||
| #define TRAIT_ROPEBUNNY "rope bunny" | ||
| ///traits gained by brain traumas, can be removed if the brain trauma is gone | ||
| #define TRAIT_APHRO "aphro" | ||
| ///traits gained by quirks, cannot be removed unless the quirk itself is gone | ||
| #define TRAIT_LEWDQUIRK "lewdquirks" | ||
| ///traits gained by chemicals, you get the idea | ||
| #define TRAIT_LEWDCHEM "lewdchem" | ||
|
|
||
| #define TRAIT_STRAPON "strapon" | ||
|
|
||
| #define TRAIT_CONDOM_BROKEN "broken" | ||
|
|
||
| // END TRAIT DEFINES |
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