From 253a3a44ba58790f4c92e4febc7a49850fda22bb Mon Sep 17 00:00:00 2001 From: Putnam Date: Wed, 15 Jan 2020 20:15:40 -0800 Subject: [PATCH] moved "aphro" magic string to a define --- code/__DEFINES/traits.dm | 1 + .../code/modules/reagents/reagents/cit_reagents.dm | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 2cba494ed8..e48eea451d 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -195,6 +195,7 @@ #define STATUS_EFFECT_TRAIT "status-effect" #define ROUNDSTART_TRAIT "roundstart" //cannot be removed without admin intervention #define GHOSTROLE_TRAIT "ghostrole" +#define APHRO_TRAIT "aphro" // unique trait sources, still defines #define STATUE_MUTE "statue" diff --git a/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm b/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm index bc62728785..32474263c4 100644 --- a/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm +++ b/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm @@ -135,7 +135,7 @@ else aroused_message = pick("You feel a bit hot.", "You feel strong sexual urges.", "You feel in the mood.", "You're ready to go down on someone.") to_chat(M, "[aroused_message]") - REMOVE_TRAIT(M,TRAIT_NEVERBONER,"aphro") + REMOVE_TRAIT(M,TRAIT_NEVERBONER,APHRO_TRAIT) if(ishuman(M)) var/mob/living/carbon/human/H = M var/list/genits = H.adjust_arousal(100, aphro = TRUE) // redundant but should still be here @@ -163,7 +163,7 @@ if(prob(5) && ishuman(M) && M.has_dna() && (M.client?.prefs.cit_toggles & BIMBOFICATION)) if(!HAS_TRAIT(M,TRAIT_PERMABONER)) to_chat(M, "Your libido is going haywire!") - ADD_TRAIT(M,TRAIT_PERMABONER,"aphro") + ADD_TRAIT(M,TRAIT_PERMABONER,APHRO_TRAIT) ..() /datum/reagent/drug/anaphrodisiac @@ -194,7 +194,7 @@ /datum/reagent/drug/anaphrodisiacplus/on_mob_life(mob/living/M) if(M && M.client?.prefs.arousable) - REMOVE_TRAIT(M,TRAIT_PERMABONER,"aphro") + REMOVE_TRAIT(M,TRAIT_PERMABONER,APHRO_TRAIT) if(ishuman(M)) var/mob/living/carbon/human/H = M var/list/genits = H.adjust_arousal(-100, aphro = TRUE) @@ -206,7 +206,7 @@ /datum/reagent/drug/anaphrodisiacplus/overdose_process(mob/living/M) if(M && M.client?.prefs.arousable && prob(5)) to_chat(M, "You feel like you'll never feel aroused again...") - ADD_TRAIT(M,TRAIT_NEVERBONER,"aphro") + ADD_TRAIT(M,TRAIT_NEVERBONER,APHRO_TRAIT) ..() //recipes