diff --git a/code/datums/brain_damage/phobia.dm b/code/datums/brain_damage/phobia.dm
index 8cd8d95603..d438c23593 100644
--- a/code/datums/brain_damage/phobia.dm
+++ b/code/datums/brain_damage/phobia.dm
@@ -31,7 +31,7 @@
/datum/brain_trauma/mild/phobia/on_life()
..()
- if(owner.has_trait(TRAIT_FEARLESS))
+ if(HAS_TRAIT(owner, TRAIT_FEARLESS))
return
if(is_blind(owner))
return
@@ -72,7 +72,7 @@
/datum/brain_trauma/mild/phobia/on_hear(message, speaker, message_language, raw_message, radio_freq)
if(!owner.can_hear() || world.time < next_scare) //words can't trigger you if you can't hear them *taps head*
return message
- if(owner.has_trait(TRAIT_FEARLESS))
+ if(HAS_TRAIT(owner, TRAIT_FEARLESS))
return message
for(var/word in trigger_words)
var/reg = regex("(\\b|\\A)[REGEX_QUOTE(word)]'?s*(\\b|\\Z)", "i")
@@ -83,7 +83,7 @@
return message
/datum/brain_trauma/mild/phobia/on_say(message)
- if(owner.has_trait(TRAIT_FEARLESS))
+ if(HAS_TRAIT(owner, TRAIT_FEARLESS))
return message
for(var/word in trigger_words)
var/reg = regex("(\\b|\\A)[REGEX_QUOTE(word)]'?s*(\\b|\\Z)", "i")
diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm
index c4dea21f1e..5b1e942ba2 100644
--- a/code/datums/components/mood.dm
+++ b/code/datums/components/mood.dm
@@ -179,7 +179,7 @@
amount = sanity - 0.5
// Disturbed stops you from getting any more sane
- if(master.has_trait(TRAIT_UNSTABLE))
+ if(HAS_TRAIT(master, TRAIT_UNSTABLE))
sanity = min(amount,sanity)
else
sanity = amount
@@ -232,7 +232,7 @@
/datum/component/mood/proc/IncreaseSanity(amount, maximum = SANITY_NEUTRAL)
// Disturbed stops you from getting any more sane - I'm just gonna bung this in here
var/mob/living/owner = parent
- if(owner.has_trait(TRAIT_UNSTABLE))
+ if(HAS_TRAIT(owner, TRAIT_UNSTABLE))
return
if(sanity > maximum)
DecreaseSanity(0.5) //Removes some sanity to go back to our current limit.
diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm
index db2761356a..17aedcdf10 100644
--- a/code/datums/status_effects/debuffs.dm
+++ b/code/datums/status_effects/debuffs.dm
@@ -521,11 +521,11 @@ datum/status_effect/pacify
. = ..()
/datum/status_effect/pacify/on_apply()
- owner.add_trait(TRAIT_PACIFISM, "status_effect")
+ ADD_TRAIT(owner, TRAIT_PACIFISM, "status_effect")
return ..()
/datum/status_effect/pacify/on_remove()
- owner.remove_trait(TRAIT_PACIFISM, "status_effect")
+ REMOVE_TRAIT(owner, TRAIT_PACIFISM, "status_effect")
/datum/status_effect/trance
id = "trance"
@@ -550,7 +550,7 @@ datum/status_effect/pacify
if(!iscarbon(owner))
return FALSE
RegisterSignal(owner, COMSIG_MOVABLE_HEAR, .proc/hypnotize)
- owner.add_trait(TRAIT_MUTE, "trance")
+ ADD_TRAIT(owner, TRAIT_MUTE, "trance")
if(!owner.has_quirk(/datum/quirk/monochromatic))
owner.add_client_colour(/datum/client_colour/monochrome)
owner.visible_message("[stun ? "[owner] stands still as [owner.p_their()] eyes seem to focus on a distant point." : ""]", \
@@ -564,7 +564,7 @@ datum/status_effect/pacify
/datum/status_effect/trance/on_remove()
UnregisterSignal(owner, COMSIG_MOVABLE_HEAR)
- owner.remove_trait(TRAIT_MUTE, "trance")
+ REMOVE_TRAIT(owner, TRAIT_MUTE, "trance")
owner.dizziness = 0
if(!owner.has_quirk(/datum/quirk/monochromatic))
owner.remove_client_colour(/datum/client_colour/monochrome)
diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm
index 3ca88d0031..ca1a961a92 100644
--- a/code/modules/mob/living/blood.dm
+++ b/code/modules/mob/living/blood.dm
@@ -46,7 +46,7 @@
nutrition_ratio = 0.8
else
nutrition_ratio = 1
- if(has_trait(TRAIT_HIGH_BLOOD))
+ if(HAS_TRAIT(src, TRAIT_HIGH_BLOOD))
nutrition_ratio *= 1.2
if(satiety > 80)
nutrition_ratio *= 1.25
@@ -322,7 +322,7 @@
/mob/living/proc/ResetBloodVol()
if(ishuman(src))
var/mob/living/carbon/human/H = src
- if (src.has_trait(TRAIT_HIGH_BLOOD))
+ if (HAS_TRAIT(src, TRAIT_HIGH_BLOOD))
blood_ratio = 1.2
H.handle_blood()
return
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 2e156677fd..3ce918f279 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -913,13 +913,13 @@
return bodyparts.len > 2 && ..()
/mob/living/carbon/proc/hypnosis_vulnerable()//unused atm, but added in case
- if(src.has_trait(TRAIT_MINDSHIELD))
+ if(HAS_TRAIT(src, TRAIT_MINDSHIELD))
return FALSE
if(hallucinating())
return TRUE
if(IsSleeping())
return TRUE
- if(src.has_trait(TRAIT_DUMB))
+ if(HAS_TRAIT(src, TRAIT_DUMB))
return TRUE
GET_COMPONENT_FROM(mood, /datum/component/mood, src)
if(mood)
diff --git a/code/modules/mob/living/taste.dm b/code/modules/mob/living/taste.dm
index 29596c4eec..282fe0a716 100644
--- a/code/modules/mob/living/taste.dm
+++ b/code/modules/mob/living/taste.dm
@@ -48,7 +48,7 @@
to_chat(src, "Your tongue moves on it's own in response to the liquid.")
say("The pH is appropriately [round(from.pH, 1)].")
return
- if (!has_trait(TRAIT_AGEUSIA)) //I'll let you get away with not having 1 damage.
+ if (!HAS_TRAIT(src, TRAIT_AGEUSIA)) //I'll let you get away with not having 1 damage.
switch(from.pH)
if(11.5 to INFINITY)
to_chat(src, "You taste a strong alkaline flavour!")
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
index 276b7231e0..c80a5262be 100644
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -347,8 +347,6 @@
var/list/cached_reagents = reagent_list
var/list/cached_reactions = GLOB.chemical_reactions_list
var/datum/cached_my_atom = my_atom
- if(reagents_holder_flags & REAGENT_NOREACT)
- return
var/reaction_occurred = 0 // checks if reaction, binary variable
var/continue_reacting = FALSE //Helps keep track what kind of reaction is occuring; standard or fermi.
diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
index 992158ac8c..2a05f36410 100644
--- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
@@ -389,11 +389,11 @@
/datum/reagent/drug/happiness/on_mob_add(mob/living/L)
..()
- L.add_trait(TRAIT_FEARLESS, id)
+ ADD_TRAIT(L, TRAIT_FEARLESS, id)
SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "happiness_drug", /datum/mood_event/happiness_drug)
/datum/reagent/drug/happiness/on_mob_delete(mob/living/L)
- L.remove_trait(TRAIT_FEARLESS, id)
+ REMOVE_TRAIT(L, TRAIT_FEARLESS, id)
SEND_SIGNAL(L, COMSIG_CLEAR_MOOD_EVENT, "happiness_drug")
..()
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index c651b10d53..188f129226 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -1377,10 +1377,10 @@
/datum/reagent/medicine/psicodine/on_mob_add(mob/living/L)
..()
- L.add_trait(TRAIT_FEARLESS, id)
+ ADD_TRAIT(L, TRAIT_FEARLESS, id)
/datum/reagent/medicine/psicodine/on_mob_delete(mob/living/L)
- L.remove_trait(TRAIT_FEARLESS, id)
+ REMOVE_TRAIT(L, TRAIT_FEARLESS, id)
..()
/datum/reagent/medicine/psicodine/on_mob_life(mob/living/carbon/M)
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index eede050273..3cb9b447dc 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -211,7 +211,7 @@
/obj/item/reagent_containers/glass/beaker/noreact/Initialize()
beaker_weakness_bitflag &= ~PH_WEAK
. = ..()
- reagents.set_reacting(FALSE)
+ //reagents.set_reacting(FALSE) was this removed in a recent pr?
/obj/item/reagent_containers/glass/beaker/bluespace
name = "bluespace beaker"
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index 7bae833245..b69d857739 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -575,7 +575,7 @@
cooldown = COOLDOWN_MEME
for(var/V in listeners)
var/mob/living/carbon/human/H = V
- if(H.canbearoused && H.has_dna() && H.has_trait(TRAIT_NYMPHO)) // probably a redundant check but for good measure
+ if(H.canbearoused && H.has_dna() && HAS_TRAIT(H, TRAIT_NYMPHO)) // probably a redundant check but for good measure
H.mob_climax(forced_climax=TRUE)
//DAB
@@ -803,9 +803,9 @@
continue
if (L.lewd)
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "[E.enthrallGender] has praised me!!"), 5)
- if(L.has_trait(TRAIT_NYMPHO))
+ if(HAS_TRAIT(L, TRAIT_NYMPHO))
L.adjustArousalLoss(2*power_multiplier)
- if(L.has_trait(TRAIT_MASO))
+ if(HAS_TRAIT(L, TRAIT_MASO))
E.enthrallTally -= power_multiplier
E.resistanceTally += power_multiplier
E.cooldown += 1
@@ -826,7 +826,7 @@
if(L == user)
continue
if (L.lewd)
- if(L.has_trait(TRAIT_MASO))
+ if(HAS_TRAIT(L, TRAIT_MASO))
L.adjustArousalLoss(3*power_multiplier)
descmessage += "And yet, it feels so good..!" //I don't really understand masco, is this the right sort of thing they like?
E.enthrallTally += power_multiplier
@@ -848,7 +848,7 @@
for(var/V in listeners)
var/mob/living/carbon/C = V
var/datum/status_effect/chem/enthrall/E = C.has_status_effect(/datum/status_effect/chem/enthrall)
- C.remove_trait(TRAIT_MUTE, "enthrall")
+ REMOVE_TRAIT(C, TRAIT_MUTE, "enthrall")
if(C.lewd)
addtimer(CALLBACK(C, /atom/movable/proc/say, "[E.enthrallGender]"), 5)
else
@@ -878,7 +878,7 @@
var/datum/status_effect/chem/enthrall/E = C.has_status_effect(/datum/status_effect/chem/enthrall)
power_multiplier *= distancelist[get_dist(user, C)+1]
if (E.phase == 3) //If target is fully enthralled,
- C.add_trait(TRAIT_MUTE, "enthrall")
+ ADD_TRAIT(C, TRAIT_MUTE, "enthrall")
else
C.silent += ((10 * power_multiplier) * E.phase)
E.cooldown += 3
@@ -887,7 +887,7 @@
else if((findtext(message, silence_words)))
for(var/mob/living/carbon/C in listeners)
var/datum/status_effect/chem/enthrall/E = C.has_status_effect(/datum/status_effect/chem/enthrall)
- C.remove_trait(TRAIT_MUTE, "enthrall")
+ REMOVE_TRAIT(C, TRAIT_MUTE, "enthrall")
E.cooldown += 3
@@ -948,7 +948,7 @@
var/mob/living/carbon/human/H = V
var/datum/status_effect/chem/enthrall/E = H.has_status_effect(/datum/status_effect/chem/enthrall)
if(E.phase > 1)
- if(H.has_trait(TRAIT_NYMPHO) && H.canbearoused) // probably a redundant check but for good measure
+ if(HAS_TRAIT(H, TRAIT_NYMPHO) && H.canbearoused) // probably a redundant check but for good measure
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "Your [E.enthrallGender] pushes you over the limit, overwhelming your body with pleasure."), 5)
H.mob_climax(forced_climax=TRUE)
H.SetStun(20)
@@ -1061,9 +1061,9 @@
if (E.phase > 2)
for (var/trigger in E.customTriggers)
speaktrigger += "[trigger], "
- C.add_trait(TRAIT_DEAF, "Triggers") //So you don't trigger yourself! Actually this will trigger yourself oops.
+ ADD_TRAIT(C, TRAIT_DEAF, "Triggers") //So you don't trigger yourself! Actually this will trigger yourself oops.
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, /atom/movable/proc/say, "[speaktrigger]"), 5)
- C.remove_trait(TRAIT_DEAF, "Triggers")
+ REMOVE_TRAIT(C, TRAIT_DEAF, "Triggers")
//CUSTOM TRIGGERS
diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm
index f1c802ab0d..71b2c4f85d 100644
--- a/modular_citadel/code/datums/status_effects/chems.dm
+++ b/modular_citadel/code/datums/status_effects/chems.dm
@@ -256,7 +256,7 @@
mental_capacity += 10
//mindshield check
- if(M.has_trait(TRAIT_MINDSHIELD))//If you manage to enrapture a head, wow, GJ. (resisting gives a bigger bonus with a mindshield)
+ if(HAS_TRAIT(M, TRAIT_MINDSHIELD))//If you manage to enrapture a head, wow, GJ. (resisting gives a bigger bonus with a mindshield)
resistanceTally += 2
if(prob(10))
to_chat(owner, "You feel lucidity returning to your mind as the mindshield buzzes, attempting to return your brain to normal function.")
@@ -303,7 +303,7 @@
to_chat(owner, "You are now fully enthralled to [master], and eager to follow their commands. However you find that in your intoxicated state you are unable to resort to violence. Equally you are unable to commit suicide, even if ordered to, as you cannot serve your [enthrallGender] in death. ")//If people start using this as an excuse to be violent I'll just make them all pacifists so it's not OP.
else
to_chat(owner, "You are unable to put up a resistance any longer, and now are under the control of [master]. However you find that in your intoxicated state you are unable to resort to violence. Equally you are unable to commit suicide, even if ordered to, as you cannot serve your [master] in death. ")
- owner.add_trait(TRAIT_PACIFISM, "MKUltra") //IMPORTANT
+ ADD_TRAIT(owner, TRAIT_PACIFISM, "MKUltra") //IMPORTANT
log_game("FERMICHEM: MKULTRA: Status on [owner] ckey: [owner.key] has been fully entrhalled (state 3) with a master of [master] ckey: [enthrallID].")
else if (resistanceTally > 200)
enthrallTally *= 0.5
@@ -315,18 +315,18 @@
if(owner.lewd)
to_chat(owner, "[pick("It feels so good to listen to [enthrallGender].", "You can't keep your eyes off [enthrallGender].", "[enthrallGender]'s voice is making you feel so sleepy.", "You feel so comfortable with [enthrallGender]", "[enthrallGender] is so dominant, it feels right to obey them.")].")
if (3)//fully entranced
- if ((resistanceTally >= 200 && withdrawalTick >= 150) || (M.has_trait(TRAIT_MINDSHIELD) && (resistanceTally >= 100)))
+ if ((resistanceTally >= 200 && withdrawalTick >= 150) || (HAS_TRAIT(M, TRAIT_MINDSHIELD) && (resistanceTally >= 100)))
enthrallTally = 0
phase -= 1
resistanceTally = 0
resistGrowth = 0
to_chat(owner, "The separation from [(owner.lewd?"your [enthrallGender]":"[master]")] sparks a small flame of resistance in yourself, as your mind slowly starts to return to normal.")
- owner.remove_trait(TRAIT_PACIFISM, "MKUltra")
+ REMOVE_TRAIT(owner, TRAIT_PACIFISM, "MKUltra")
if(prob(2))
if(owner.lewd)
to_chat(owner, "[pick("I belong to [enthrallGender].", "[enthrallGender] knows whats best for me.", "Obedence is pleasure.", "I exist to serve [enthrallGender].", "[enthrallGender] is so dominant, it feels right to obey them.")].")
if (4) //mindbroken
- if (mental_capacity >= 499 && (owner.getBrainLoss() >=20 || M.has_trait(TRAIT_MINDSHIELD)) && !owner.reagents.has_reagent("MKUltra"))
+ if (mental_capacity >= 499 && (owner.getBrainLoss() >=20 || HAS_TRAIT(M, TRAIT_MINDSHIELD)) && !owner.reagents.has_reagent("MKUltra"))
phase = 2
mental_capacity = 500
customTriggers = list()
@@ -471,7 +471,7 @@
cooldown += 1 //Cooldown doesn't process till status is done
else if(status == "charge")
- owner.add_trait(TRAIT_GOTTAGOFAST, "MKUltra")
+ ADD_TRAIT(owner, TRAIT_GOTTAGOFAST, "MKUltra")
status = "charged"
if(master.lewd)
to_chat(owner, "Your [enthrallGender]'s order fills you with a burst of speed!")
@@ -481,7 +481,7 @@
else if (status == "charged")
if (statusStrength < 0)
status = null
- owner.remove_trait(TRAIT_GOTTAGOFAST, "MKUltra")
+ REMOVE_TRAIT(owner, TRAIT_GOTTAGOFAST, "MKUltra")
owner.Knockdown(50)
to_chat(owner, "Your body gives out as the adrenaline in your system runs out.")
else
@@ -489,7 +489,7 @@
cooldown += 1 //Cooldown doesn't process till status is done
else if (status == "pacify")
- owner.add_trait(TRAIT_PACIFISM, "MKUltraStatus")
+ ADD_TRAIT(owner, TRAIT_PACIFISM, "MKUltraStatus")
status = null
//Truth serum?
@@ -530,7 +530,7 @@
qdel(redirect_component.resolve())
redirect_component = null
UnregisterSignal(owner, COMSIG_MOVABLE_HEAR)
- owner.remove_trait(TRAIT_PACIFISM, "MKUltra")
+ REMOVE_TRAIT(owner, TRAIT_PACIFISM, "MKUltra")
to_chat(owner, "You're now free of [master]'s influence, and fully independant oncemore!'")
//UnregisterSignal(owner, COMSIG_GLOB_LIVING_SAY_SPECIAL) //Should still make custom commands work after freedom, need to check.
@@ -549,7 +549,7 @@
//Speak (Forces player to talk) works
if (lowertext(customTriggers[trigger][1]) == "speak")//trigger2
var/saytext = "Your mouth moves on it's own before you can even catch it."
- if(C.has_trait(TRAIT_NYMPHO))
+ if(HAS_TRAIT(C, TRAIT_NYMPHO))
saytext += " You find yourself fully believing in the validity of what you just said and don't think to question it."
to_chat(C, "[saytext]")
(C.say(customTriggers[trigger][2]))//trigger3
@@ -571,7 +571,7 @@
//wah intensifies wah-rks
else if (lowertext(customTriggers[trigger]) == "cum")//aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- if (C.has_trait(TRAIT_NYMPHO))
+ if (HAS_TRAIT(C, TRAIT_NYMPHO))
if (C.getArousalLoss() > 80)
C.mob_climax(forced_climax=TRUE)
C.SetStun(10)//We got your stun effects in somewhere, Kev.
@@ -659,7 +659,7 @@
deltaResist *= 1.5
to_chat(owner, "You attempt to shake the mental cobwebs from your mind!")
//nymphomania
- if (M.canbearoused && M.has_trait(TRAIT_NYMPHO))//I'm okay with this being removed.
+ if (M.canbearoused && HAS_TRAIT(M, TRAIT_NYMPHO))//I'm okay with this being removed.
deltaResist*= 0.5-(((2/200)*M.arousalloss)/1)//more aroused you are, the weaker resistance you can give, the less you are, the more you gain. (+/- 0.5)
//chemical resistance, brain and annaphros are the key to undoing, but the subject has to to be willing to resist.
@@ -667,7 +667,7 @@
deltaResist *= 1.25
if (owner.reagents.has_reagent("neurine"))
deltaResist *= 1.5
- if (!owner.has_trait(TRAIT_CROCRIN_IMMUNE) && M.canbearoused)
+ if (!HAS_TRAIT(owner, TRAIT_CROCRIN_IMMUNE) && M.canbearoused)
if (owner.reagents.has_reagent("anaphro"))
deltaResist *= 1.5
if (owner.reagents.has_reagent("anaphro+"))
@@ -711,7 +711,7 @@
//If you've a collar, you get a sense of pride
if(istype(M.wear_neck, /obj/item/clothing/neck/petcollar))
deltaResist *= 0.5
- if(M.has_trait(TRAIT_MINDSHIELD))
+ if(HAS_TRAIT(M, TRAIT_MINDSHIELD))
deltaResist += 5//even faster!
return
diff --git a/modular_citadel/code/modules/arousal/organs/genitals.dm b/modular_citadel/code/modules/arousal/organs/genitals.dm
index 573995c764..051b386e7c 100644
--- a/modular_citadel/code/modules/arousal/organs/genitals.dm
+++ b/modular_citadel/code/modules/arousal/organs/genitals.dm
@@ -304,7 +304,7 @@
var/breastCheck = FALSE
var/willyCheck = FALSE
if(!canbearoused)
- add_trait(TRAIT_PHARMA)//Prefs prevent unwanted organs.
+ ADD_TRAIT(src, TRAIT_PHARMA, "pharma")//Prefs prevent unwanted organs.
return
for(var/obj/item/organ/O in internal_organs)
if(istype(O, /obj/item/organ/genital))
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm
index 9a39a7506e..20334a2151 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm
@@ -264,7 +264,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
creatorName = chosen.real_name
creator = get_mob_by_key(creatorID)
*/
- M.add_trait(TRAIT_PACIFISM, "MKUltra")
+ ADD_TRAIT(M, TRAIT_PACIFISM, "MKUltra")
var/datum/status_effect/chem/enthrall/E
if (!M.has_status_effect(/datum/status_effect/chem/enthrall))
M.apply_status_effect(/datum/status_effect/chem/enthrall)
@@ -313,7 +313,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
log_game("FERMICHEM: [M] ckey: [M.key] has temporarily fallen for [love] ckey: [love.key]")
else
if(get_dist(M, love) < 8)
- if(M.has_trait(TRAIT_NYMPHO)) //Add this back when merged/updated.
+ if(HAS_TRAIT(M, TRAIT_NYMPHO)) //Add this back when merged/updated.
M.adjustArousalLoss(5)
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "InLove", /datum/mood_event/InLove)
SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "MissingLove")
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm
index 5aa626060d..cdcc4c03b2 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm
@@ -125,7 +125,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
switch(current_cycle)
if(21)
to_chat(M, "The cells fail to catalyse around a nucleation event, instead merging with your cells.") //This stuff is hard enough to make to rob a user of some benefit. Shouldn't replace Rezadone as it requires the user to not only risk making a player controlled clone, but also requires them to have split in two (which also requires 30u of SGDF).
- M.remove_trait(TRAIT_DISFIGURED, TRAIT_GENERIC)
+ REMOVE_TRAIT(M, TRAIT_DISFIGURED, TRAIT_GENERIC)
log_game("FERMICHEM: [M] ckey: [M.key] is being healed by SDGF")
if(22 to INFINITY)
M.adjustCloneLoss(-1, 0)
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm
index c768ee0272..4aa4d571ef 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm
@@ -64,10 +64,10 @@ I'd like to point out from my calculations it'll take about 60-80 minutes to die
antiGenetics = 255
..()
-//Okay so, this might seem a bit too good, but my counterargument is that it'll likely take all round to eventually kill you this way, then you have to be revived without a body. It takes approximately 60-80 minutes to die from this.
+//Okay so, this might seem a bit too good, but my counterargument is that it'll likely take all round to eventually kill you this way, then you have to be revived without a body. It takes approximately 50-80 minutes to die from this.
/datum/reagent/fermi/astral/addiction_act_stage1(mob/living/carbon/M)
if(addiction_stage < 2)
- antiGenetics = 255//Doesn't reset when you take more, which is weird for me, it should.
+ antiGenetics = 255
M.alpha = 255 //Antigenetics is to do with stopping geneticists from turning people invisible to kill them.
if(prob(65))
M.alpha--
@@ -94,7 +94,7 @@ I'd like to point out from my calculations it'll take about 60-80 minutes to die
to_chat(M, "You feel a substantial part of your soul flake off into the ethereal world, rendering yourself unclonable.")
M.alpha--
antiGenetics--
- M.add_trait(TRAIT_NOCLONE) //So you can't scan yourself, then die, to metacomm. You can only use your memories if you come back as something else.
+ ADD_TRAIT(M, TRAIT_NOCLONE, "astral") //So you can't scan yourself, then die, to metacomm. You can only use your memories if you come back as something else.
if(80)
to_chat(M, "You feel a thrill shoot through your body as what's left of your mind contemplates your forthcoming oblivion.")
M.alpha--
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
index e9c74e9c61..1d79c4f8c8 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
@@ -68,7 +68,7 @@
if(!B) //If they don't have breasts, give them breasts.
//If they have Acute hepatic pharmacokinesis, then route processing though liver.
- if(M.has_trait(TRAIT_PHARMA))
+ if(HAS_TRAIT(M, TRAIT_PHARMA))
var/obj/item/organ/liver/L = M.getorganslot("liver")
L.swelling+= 0.05
return..()
@@ -103,7 +103,7 @@
/datum/reagent/fermi/breast_enlarger/overdose_process(mob/living/carbon/M) //Turns you into a female if male and ODing, doesn't touch nonbinary and object genders.
//Acute hepatic pharmacokinesis.
- if(M.has_trait(TRAIT_PHARMA))
+ if(HAS_TRAIT(M, TRAIT_PHARMA))
var/obj/item/organ/liver/L = M.getorganslot("liver")
L.swelling+= 0.05
return ..()
@@ -144,7 +144,7 @@
var/obj/item/organ/genital/breasts/B = M.getorganslot("breasts")
if(!B)
//Acute hepatic pharmacokinesis.
- if(M.has_trait(TRAIT_PHARMA))
+ if(HAS_TRAIT(M, TRAIT_PHARMA))
var/obj/item/organ/liver/L = M.getorganslot("liver")
L.swelling-= 0.05
return ..()
@@ -207,7 +207,7 @@
if(!P)//They do have a preponderance for escapism, or so I've heard.
//If they have Acute hepatic pharmacokinesis, then route processing though liver.
- if(M.has_trait(TRAIT_PHARMA))
+ if(HAS_TRAIT(M, TRAIT_PHARMA))
var/obj/item/organ/liver/L = M.getorganslot("liver")
L.swelling+= 0.05
return..()
@@ -235,7 +235,7 @@
/datum/reagent/fermi/penis_enlarger/overdose_process(mob/living/carbon/M) //Turns you into a male if female and ODing, doesn't touch nonbinary and object genders.
//Acute hepatic pharmacokinesis.
- if(M.has_trait(TRAIT_PHARMA))
+ if(HAS_TRAIT(M, TRAIT_PHARMA))
var/obj/item/organ/liver/L = M.getorganslot("liver")
L.swelling+= 0.05
return..()
@@ -275,7 +275,7 @@
var/obj/item/organ/genital/penis/P = H.getorganslot("penis")
if(!P)
//Acute hepatic pharmacokinesis.
- if(M.has_trait(TRAIT_PHARMA))
+ if(HAS_TRAIT(M, TRAIT_PHARMA))
var/obj/item/organ/liver/L = M.getorganslot("liver")
L.swelling-= 0.05
return..()
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
index d7c89150f8..ad6d914c34 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
@@ -401,7 +401,7 @@
H.moveToNullspace()
log_game("FERMICHEM: [H] ckey: [H.key] has been made into a cute catto.")
//Just to deal with rascally ghosts
- catto.add_trait(TRAIT_NODEATH, "catto")
+ ADD_TRAIT(catto, TRAIT_NODEATH, "catto")
/datum/reagent/fermi/secretcatchem/on_mob_life(mob/living/carbon/H)
if(catto.health <= 50)