Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit dddbb14

Browse files
authored
Removes numerous unused trait defines + a few bugfixes (#22439)
* such a mess * remove so much, just so so much * guh * oh god * Update declarations.dm * Update weaponry.dm * Update declarations.dm * done * trait sources * Update declarations.dm * Update declarations.dm
1 parent 97ab91d commit dddbb14

File tree

13 files changed

+333
-470
lines changed

13 files changed

+333
-470
lines changed

code/__DEFINES/traits.dm

Lines changed: 9 additions & 169 deletions
Original file line numberDiff line numberDiff line change
@@ -121,172 +121,12 @@
121121
/// A simple helper for checking traits in a mob's mind
122122
#define HAS_MIND_TRAIT(target, trait) (HAS_TRAIT(target, trait) || (target.mind ? HAS_TRAIT(target.mind, trait) : FALSE))
123123

124-
//Remember to update code/datums/traits/ folder if you're adding/removing/renaming traits.
125-
126-
//mob traits
127-
128-
#define TRAIT_BLIND "blind"
129-
130-
#define TRAIT_NEARSIGHT "nearsighted"
131-
132-
#define TRAIT_MONKEYLIKE "monkeylike" //sets IsAdvancedToolUser to FALSE
133-
134-
#define TRAIT_REDUCED_DAMAGE_SLOWDOWN "reduced_damage_slowdown"
135-
#define TRAIT_RESISTDAMAGESLOWDOWN "resistdamageslowdown"
136-
#define TRAIT_HIGHRESISTDAMAGESLOWDOWN "highresistdamageslowdown"
137-
138-
#define TRAIT_IMPACTIMMUNE "impact_immunity" //protects from the damage of getting launched into a wall hard
139-
140-
#define TRAIT_EMPPROOF_SELF "emp_immunity_self" //for the specific "thing" itself
141-
#define TRAIT_EMPPROOF_CONTENTS "emp_immunity_contents" //for anything the "thing" is carrying, but not itself
142-
143-
#define TRAIT_SAFEWELD "safe_welding" //prevents blinding from welding without giving actual flash immunity
144-
145-
#define TRAIT_NO_STUN_WEAPONS "no_stun_weapons" //prevents use of commonly available instant or near instant stun weapons
146-
#define TRAIT_NOINTERACT "no_interact" //Not allowed to touch anything (even with TK) or use things in hand
147-
148-
#define TRAIT_POWERHUNGRY "power_hungry" // uses electricity instead of food
149-
///Prevent species from changing while they have the trait
150-
#define TRAIT_SPECIESLOCK "species_lock"
151-
#define TRAIT_NOSLIPICE "noslip_ice"
152-
#define TRAIT_NOSLIPWATER "noslip_water"
153-
#define TRAIT_NOSLIPALL "noslip_all"
154-
155-
#define TRAIT_INFRARED_VISION "infrared_vision"
156-
157-
#define TRAIT_CALCIUM_HEALER "calcium_healer"
158-
#define TRAIT_MAGIC_CHOKE "magic_choke"
159-
160-
#define TRAIT_PSYCH "psych-diagnosis"
161-
#define TRAIT_ALWAYS_CLEAN "always-clean"
162-
163-
#define TRAIT_QUICKEST_CARRY "quickest-carry"
164-
#define TRAIT_STRONG_GRIP "strong-grip"
165-
166-
#define TRAIT_SHELTERED "sheltered"
167-
#define TRAIT_RANDOM_ACCENT "random_accent"
168-
#define TRAIT_MEDICALIGNORE "medical_ignore"
169-
#define TRAIT_SLIME_EMPATHY "slime-empathy"
170-
#define TRAIT_ACIDBLOOD "acid_blood"
171-
#define TRAIT_PRESERVED_ORGANS "preserved_organs"
172-
#define TRAIT_SKINNY "skinny" //For those with a slightly thinner torso sprite
173-
#define TRAIT_SURGERY_PREPARED "surgery_prepared"
174-
#define TRAIT_NO_PASSIVE_COOLING "no-passive-cooling"
175-
#define TRAIT_NO_PASSIVE_HEATING "no-passive-heating"
176-
#define TRAIT_BLOODY_MESS_LITE "bloody_mess_lite" //weak heparin, otherwise the same
177-
#define TRAIT_NO_BLOOD_REGEN "no_blood_regen" //prevents regenerating blood
178-
#define TRAIT_NOPULSE "nopulse" // Your heart doesn't beat
179-
#define TRAIT_MASQUERADE "masquerade" // Falsifies Health analyzer blood levels
180-
#define TRAIT_NOCLONE "noclone" // No cloning
181-
#define TRAIT_NODEFIB "nodefib" // No defibbing
182-
#define TRAIT_COLDBLOODED "coldblooded" // Your body is literal room temperature. Does not make you immune to the temp
183-
#define TRAIT_DIGITIGRADE "digitigrade" // the funny lizard legs
184-
#define TRAIT_DIGI_SQUISH "digi_squish" // squished funny lizard legs
185-
#define TRAIT_EAT_MORE "eat_more" //You get hungry three times as fast
186-
#define TRAIT_BOTTOMLESS_STOMACH "bottomless_stomach" // Can never be full
187-
#define TRAIT_MESONS "mesons"
188-
#define TRAIT_MAGBOOTS "magboots"
189-
#define TRAIT_BADMAIL "badmail" //Your mail is going to be worse than average
190-
#define TRAIT_SHORT_TELOMERES "short_telomeres" //You cannot be CLOONED
191-
#define TRAIT_LONG_TELOMERES "long_telomeres" //You get CLOONED faster!!!
192-
#define TRAIT_NO_GRENADES "no_nades"
193-
///You become a Marine that can eat crayons!!!
194-
#define TRAIT_MARINE "marine"
195-
196-
/// Whether we're sneaking, from the alien sneak ability.
197-
/// Maybe worth generalizing into a general "is sneaky" / "is stealth" trait in the future.
198-
#define TRAIT_ALIEN_SNEAK "sneaking_alien"
199-
200-
///This mob can't use vehicles
201-
#define TRAIT_NOVEHICLE "no_vehicle"
202-
203-
/// You can't see color!
204-
#define TRAIT_COLORBLIND "color_blind"
205-
206-
/// This person is crying
207-
#define TRAIT_CRYING "crying"
208-
209-
#define TRAIT_NO_STORAGE "no-storage" //you cannot put this in any container, backpack, box etc
210-
211-
#define TRAIT_POOR_AIM "poor_aim"
212-
213-
#define TRAIT_DRUNK_HEALING "drunk_healing"
214-
215-
#define TRAIT_ALLERGIC "allergic"
216-
#define TRAIT_KLEPTOMANIAC "kleptomaniac"
217-
#define TRAIT_EAT_LESS "eat_less"
218-
#define TRAIT_CRAFTY "crafty"
219-
#define TRAIT_ANOREXIC "anorexic"
220-
221-
#define TRAIT_SEE_REAGENTS "see_reagents"
222-
#define TRAIT_STARGAZED "stargazed"
223-
224-
/// The item is magically cursed
225-
#define CURSED_ITEM_TRAIT(item_type) "cursed_item_[item_type]"
226-
227-
#define PSEUDOCIDER_TRAIT "pseudocider_trait"
228-
229-
#define ATTACHMENT_TRAIT "attachment-trait"
230-
231-
/// A trait given by a specific status effect (not sure why we need both but whatever!)
232-
#define TRAIT_STATUS_EFFECT(effect_id) "[effect_id]-trait"
233-
234-
/// Trait applied by element
235-
#define ELEMENT_TRAIT(source) "element_trait_[source]"
236-
237-
238-
// unique trait sources, still defines
239-
#define CLONING_POD_TRAIT "cloning-pod"
240-
#define CHANGELING_HIVEMIND_MUTE "ling_mute"
241-
#define ABYSSAL_GAZE_BLIND "abyssal_gaze"
242-
#define HIGHLANDER "highlander"
243-
#define CULT_EYES "cult_eyes"
244-
#define NUKEOP_TRAIT "nuke-op"
245-
#define DEATHSQUAD_TRAIT "deathsquad"
246-
#define ANTI_DROP_IMPLANT_TRAIT "anti-drop-implant"
247-
#define HIVEMIND_ONE_MIND_TRAIT "one_mind"
248-
#define VR_ZONE_TRAIT "vr_zone_trait"
249-
#define GUARDIAN_TRAIT "guardian_trait"
250-
#define STARGAZER_TRAIT "stargazer"
251-
#define RANDOM_BLACKOUTS "random_blackouts"
252-
#define MADE_UNCLONEABLE "made-uncloneable"
253-
/// Source trait for Bloodsuckers-related traits
254-
#define BLOODSUCKER_TRAIT "bloodsucker_trait"
255-
/// Source trait for Monster Hunter-related traits
256-
#define HUNTER_TRAIT "monsterhunter_trait"
257-
/// Source trait during a Frenzy
258-
#define FRENZY_TRAIT "frenzy_trait"
259-
/// Source trait while Feeding
260-
#define FEED_TRAIT "feed_trait"
261-
#define HORROR_TRAIT "horror"
262-
#define HOLDER_TRAIT "holder_trait"
263-
#define SINFULDEMON_TRAIT "sinfuldemon"
264-
#define CHANGESTING_TRAIT "changesting"
265-
#define POSIBRAIN_TRAIT "positrait"
266-
#define SYNTHETIC_TRAIT "synthetictrait"
267-
#define WRIST_STRAP_TRAIT "wrist_strap"
268-
#define GRIMOIRE_TRAIT "grimoire_trait"
269-
270-
///Traits given by station traits
271-
272-
#define STATION_TRAIT_MOONSCORCH "station_trait_moonscorch"
273-
274-
///Darkspawn traits
275-
///lets darkspawns walk through weak light
276-
#define TRAIT_DARKSPAWN_LIGHTRES "darkspawn_lightres"
277-
///lets darkspawns walk through any light
278-
#define TRAIT_DARKSPAWN_CREEP "darkspawn_creep"
279-
///permanently reduces the lucidity gained from future succs
280-
#define TRAIT_DARKSPAWN_DEVOURED "darkspawn_devoured"
281-
///disable psi regeneration (make sure to remove it after some time)
282-
#define TRAIT_DARKSPAWN_PSIBLOCK "darkspawn_psiblock"
283-
///make aoe ally buff abilities also affect allied darkspawns
284-
#define TRAIT_DARKSPAWN_BUFFALLIES "darkspawn_allybuff"
285-
///revives the darkspawn if they're dead and in the dark
286-
#define TRAIT_DARKSPAWN_UNDYING "darkspawn_undying"
287-
288-
///reduces the cooldown of all used /datum/action/cooldown by 25%
289-
#define TRAIT_FAST_COOLDOWNS "short_spell_cooldowns"
290-
291-
/// One can breath under water, you get me?
292-
#define TRAIT_WATER_BREATHING "water_breathing"
124+
/////////////////////////////////////////////////////////////////////////////////////////////////
125+
/**
126+
* IF YOU ARE ADDING A NEW TRAIT, DON'T PUT IT HERE
127+
*
128+
* PUT ANY NEW TRAITS IN declarations.dm
129+
*
130+
* THAT FILE IS FOUND INSIDE THE TRAITS FOLDER
131+
*/
132+
/////////////////////////////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)