cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

REGEX REPLACE! /([\w\.]+)\.remove_trait\(/ -> /REMOVE_TRAIT(\1, /

Browse Source
This commit is contained in:
Gary Lafortune
2019-06-01 20:54:11 -05:00
parent 108ffdd4d2
commit 68d6a815a9
51 changed files with 121 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/brain_damage/magic.dm
View File

@@ -57,7 +57,7 @@
..()
/datum/brain_trauma/magic/antimagic/on_lose()
owner.remove_trait(TRAIT_ANTIMAGIC, TRAUMA_TRAIT)
REMOVE_TRAIT(owner, TRAIT_ANTIMAGIC, TRAUMA_TRAIT)
..()
/datum/brain_trauma/magic/stalker

4
code/datums/brain_damage/mild.dm
View File

@@ -55,7 +55,7 @@
..()
/datum/brain_trauma/mild/dumbness/on_lose()
owner.remove_trait(TRAIT_DUMB, TRAUMA_TRAIT)
REMOVE_TRAIT(owner, TRAIT_DUMB, TRAUMA_TRAIT)
owner.derpspeech = 0
SEND_SIGNAL(owner, COMSIG_CLEAR_MOOD_EVENT, "dumb")
..()
@@ -72,7 +72,7 @@
..()
/datum/brain_trauma/mild/speech_impediment/on_lose()
owner.remove_trait(TRAIT_UNINTELLIGIBLE_SPEECH, TRAUMA_TRAIT)
REMOVE_TRAIT(owner, TRAIT_UNINTELLIGIBLE_SPEECH, TRAUMA_TRAIT)
..()
/datum/brain_trauma/mild/concussion

8
code/datums/brain_damage/severe.dm
View File

@@ -17,7 +17,7 @@
..()
/datum/brain_trauma/severe/mute/on_lose()
owner.remove_trait(TRAIT_MUTE, TRAUMA_TRAIT)
REMOVE_TRAIT(owner, TRAIT_MUTE, TRAUMA_TRAIT)
..()
/datum/brain_trauma/severe/aphasia
@@ -115,7 +115,7 @@
/datum/brain_trauma/severe/paralysis/on_lose()
..()
for(var/X in paralysis_traits)
owner.remove_trait(X, "trauma_paralysis")
REMOVE_TRAIT(owner, X, "trauma_paralysis")
owner.update_disabled_bodyparts()
/datum/brain_trauma/severe/paralysis/paraplegic
@@ -237,7 +237,7 @@
..()
/datum/brain_trauma/severe/discoordination/on_lose()
owner.remove_trait(TRAIT_MONKEYLIKE, TRAUMA_TRAIT)
REMOVE_TRAIT(owner, TRAIT_MONKEYLIKE, TRAUMA_TRAIT)
..()
/datum/brain_trauma/severe/pacifism
@@ -252,7 +252,7 @@
..()
/datum/brain_trauma/severe/pacifism/on_lose()
owner.remove_trait(TRAIT_PACIFISM, TRAUMA_TRAIT)
REMOVE_TRAIT(owner, TRAIT_PACIFISM, TRAUMA_TRAIT)
..()
/datum/brain_trauma/severe/hypnotic_stupor

8
code/datums/brain_damage/special.dm
View File

@@ -27,7 +27,7 @@
..()
/datum/brain_trauma/special/godwoken/on_lose()
owner.remove_trait(TRAIT_HOLY, TRAUMA_TRAIT)
REMOVE_TRAIT(owner, TRAIT_HOLY, TRAUMA_TRAIT)
..()
/datum/brain_trauma/special/godwoken/proc/speak(type, include_owner = FALSE)
@@ -156,8 +156,8 @@
..()
/datum/brain_trauma/special/tenacity/on_lose()
owner.remove_trait(TRAIT_NOSOFTCRIT, TRAUMA_TRAIT)
owner.remove_trait(TRAIT_NOHARDCRIT, TRAUMA_TRAIT)
REMOVE_TRAIT(owner, TRAIT_NOSOFTCRIT, TRAUMA_TRAIT)
REMOVE_TRAIT(owner, TRAIT_NOHARDCRIT, TRAUMA_TRAIT)
..()
/datum/brain_trauma/special/death_whispers
@@ -184,7 +184,7 @@
addtimer(CALLBACK(src, .proc/cease_whispering), rand(50, 300))
/datum/brain_trauma/special/death_whispers/proc/cease_whispering()
owner.remove_trait(TRAIT_SIXTHSENSE, TRAUMA_TRAIT)
REMOVE_TRAIT(owner, TRAIT_SIXTHSENSE, TRAUMA_TRAIT)
active = FALSE
/datum/brain_trauma/special/beepsky

4
code/datums/diseases/advance/symptoms/oxygen.dm
View File

@@ -57,7 +57,7 @@ Bonus
var/mob/living/carbon/M = A.affected_mob
switch(A.stage)
if(3)
M.remove_trait(TRAIT_NOBREATH, DISEASE_TRAIT)
REMOVE_TRAIT(M, TRAIT_NOBREATH, DISEASE_TRAIT)
if(4)
ADD_TRAIT(M, TRAIT_NOBREATH, DISEASE_TRAIT)
return TRUE
@@ -66,4 +66,4 @@ Bonus
if(!..())
return
if(A.stage >= 4)
A.affected_mob.remove_trait(TRAIT_NOBREATH, DISEASE_TRAIT)
REMOVE_TRAIT(A.affected_mob, TRAIT_NOBREATH, DISEASE_TRAIT)

6
code/datums/mutations/body.dm
View File

@@ -120,7 +120,7 @@
/datum/mutation/human/clumsy/on_losing(mob/living/carbon/human/owner)
if(..())
return
owner.remove_trait(TRAIT_CLUMSY, GENETIC_MUTATION)
REMOVE_TRAIT(owner, TRAIT_CLUMSY, GENETIC_MUTATION)
//Tourettes causes you to randomly stand in place and shout.
@@ -162,7 +162,7 @@
/datum/mutation/human/deaf/on_losing(mob/living/carbon/human/owner)
if(..())
return
owner.remove_trait(TRAIT_DEAF, GENETIC_MUTATION)
REMOVE_TRAIT(owner, TRAIT_DEAF, GENETIC_MUTATION)
//Monified turns you into a monkey.
@@ -231,7 +231,7 @@
/datum/mutation/human/insulated/on_losing(mob/living/carbon/human/owner)
if(..())
return
owner.remove_trait(TRAIT_SHOCKIMMUNE, "genetics")
REMOVE_TRAIT(owner, TRAIT_SHOCKIMMUNE, "genetics")
/datum/mutation/human/fire
name = "Fiery Sweat"

4
code/datums/mutations/hulk.dm
View File

@@ -31,8 +31,8 @@
/datum/mutation/human/hulk/on_losing(mob/living/carbon/human/owner)
if(..())
return
owner.remove_trait(TRAIT_STUNIMMUNE, TRAIT_HULK)
owner.remove_trait(TRAIT_PUSHIMMUNE, TRAIT_HULK)
REMOVE_TRAIT(owner, TRAIT_STUNIMMUNE, TRAIT_HULK)
REMOVE_TRAIT(owner, TRAIT_PUSHIMMUNE, TRAIT_HULK)
owner.update_body_parts()
SEND_SIGNAL(owner, COMSIG_CLEAR_MOOD_EVENT, "hulk")

2
code/datums/mutations/sight.dm
View File

@@ -54,7 +54,7 @@
/datum/mutation/human/thermal/on_losing(mob/living/carbon/human/owner)
if(..())
return
owner.remove_trait(visionflag, GENETIC_MUTATION)
REMOVE_TRAIT(owner, visionflag, GENETIC_MUTATION)
owner.update_sight()
//X-ray Vision lets you see through walls.

4
code/datums/mutations/space_adaptation.dm
View File

@@ -25,6 +25,6 @@
/datum/mutation/human/space_adaptation/on_losing(mob/living/carbon/human/owner)
if(..())
return
owner.remove_trait(TRAIT_RESISTCOLD, "space_adaptation")
owner.remove_trait(TRAIT_RESISTLOWPRESSURE, "space_adaptation")
REMOVE_TRAIT(owner, TRAIT_RESISTCOLD, "space_adaptation")
REMOVE_TRAIT(owner, TRAIT_RESISTLOWPRESSURE, "space_adaptation")

4
code/datums/mutations/speech.dm
View File

@@ -38,7 +38,7 @@
/datum/mutation/human/mute/on_losing(mob/living/carbon/human/owner)
if(..())
return
owner.remove_trait(TRAIT_MUTE, GENETIC_MUTATION)
REMOVE_TRAIT(owner, TRAIT_MUTE, GENETIC_MUTATION)
/datum/mutation/human/smile
@@ -114,7 +114,7 @@
/datum/mutation/human/unintelligible/on_losing(mob/living/carbon/human/owner)
if(..())
return
owner.remove_trait(TRAIT_UNINTELLIGIBLE_SPEECH, GENETIC_MUTATION)
REMOVE_TRAIT(owner, TRAIT_UNINTELLIGIBLE_SPEECH, GENETIC_MUTATION)
/datum/mutation/human/swedish
name = "Swedish"

6
code/datums/status_effects/buffs.dm
View File

@@ -474,7 +474,7 @@
return ..()
/datum/status_effect/hippocraticOath/on_remove()
owner.remove_trait(TRAIT_PACIFISM, "hippocraticOath")
REMOVE_TRAIT(owner, TRAIT_PACIFISM, "hippocraticOath")
var/datum/atom_hud/H = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
H.remove_hud_from(owner)
@@ -578,7 +578,7 @@
return TRUE
/datum/status_effect/regenerative_core/on_remove()
owner.remove_trait(TRAIT_IGNOREDAMAGESLOWDOWN, "regenerative_core")
REMOVE_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, "regenerative_core")
/datum/status_effect/antimagic
id = "antimagic"
@@ -593,5 +593,5 @@
return ..()
/datum/status_effect/antimagic/on_remove()
owner.remove_trait(TRAIT_ANTIMAGIC, MAGIC_TRAIT)
REMOVE_TRAIT(owner, TRAIT_ANTIMAGIC, MAGIC_TRAIT)
owner.visible_message("<span class='warning'>[owner]'s dull aura fades away...</span>")

14
code/datums/status_effects/debuffs.dm
View File

@@ -134,7 +134,7 @@
return ..()
/datum/status_effect/strandling/on_remove()
owner.remove_trait(TRAIT_MAGIC_CHOKE, "dumbmoron")
REMOVE_TRAIT(owner, TRAIT_MAGIC_CHOKE, "dumbmoron")
return ..()
/obj/screen/alert/status_effect/strandling
@@ -163,7 +163,7 @@
return ..()
/datum/status_effect/pacify/on_remove()
owner.remove_trait(TRAIT_PACIFISM, "status_effect")
REMOVE_TRAIT(owner, TRAIT_PACIFISM, "status_effect")
//OTHER DEBUFFS
/datum/status_effect/pacify
@@ -183,7 +183,7 @@
return ..()
/datum/status_effect/pacify/on_remove()
owner.remove_trait(TRAIT_PACIFISM, "status_effect")
REMOVE_TRAIT(owner, TRAIT_PACIFISM, "status_effect")
/datum/status_effect/his_wrath //does minor damage over time unless holding His Grace
id = "his_wrath"
@@ -626,9 +626,9 @@
return ..()
/datum/status_effect/gonbolaPacify/on_remove()
owner.remove_trait(TRAIT_PACIFISM, "gonbolaPacify")
owner.remove_trait(TRAIT_MUTE, "gonbolaMute")
owner.remove_trait(TRAIT_JOLLY, "gonbolaJolly")
REMOVE_TRAIT(owner, TRAIT_PACIFISM, "gonbolaPacify")
REMOVE_TRAIT(owner, TRAIT_MUTE, "gonbolaMute")
REMOVE_TRAIT(owner, TRAIT_JOLLY, "gonbolaJolly")
/datum/status_effect/trance
id = "trance"
@@ -667,7 +667,7 @@
/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)

2
code/datums/status_effects/neutral.dm
View File

@@ -83,7 +83,7 @@
/datum/status_effect/throat_soothed/on_remove()
. = ..()
owner.remove_trait(TRAIT_SOOTHED_THROAT, "[STATUS_EFFECT_TRAIT]_[id]")
REMOVE_TRAIT(owner, TRAIT_SOOTHED_THROAT, "[STATUS_EFFECT_TRAIT]_[id]")
/datum/status_effect/bounty
id = "bounty"

4
code/datums/traits/_quirk.dm
View File

@@ -35,7 +35,7 @@
to_chat(quirk_holder, lose_text)
quirk_holder.roundstart_quirks -= src
if(mob_trait)
quirk_holder.remove_trait(mob_trait, ROUNDSTART_TRAIT, TRUE)
REMOVE_TRAIT(quirk_holder, mob_trait, ROUNDSTART_TRAIT, TRUE)
SSquirks.quirk_objects -= src
return ..()
@@ -43,7 +43,7 @@
quirk_holder.roundstart_quirks -= src
to_mob.roundstart_quirks += src
if(mob_trait)
quirk_holder.remove_trait(mob_trait, ROUNDSTART_TRAIT)
REMOVE_TRAIT(quirk_holder, mob_trait, ROUNDSTART_TRAIT)
ADD_TRAIT(to_mob, mob_trait, ROUNDSTART_TRAIT)
quirk_holder = to_mob
on_transfer()

10
code/game/machinery/cloning.dm
View File

@@ -400,11 +400,11 @@
if(!mob_occupant)
return
current_insurance = null
mob_occupant.remove_trait(TRAIT_STABLEHEART, CLONING_POD_TRAIT)
mob_occupant.remove_trait(TRAIT_EMOTEMUTE, CLONING_POD_TRAIT)
mob_occupant.remove_trait(TRAIT_MUTE, CLONING_POD_TRAIT)
mob_occupant.remove_trait(TRAIT_NOCRITDAMAGE, CLONING_POD_TRAIT)
mob_occupant.remove_trait(TRAIT_NOBREATH, CLONING_POD_TRAIT)
REMOVE_TRAIT(mob_occupant, TRAIT_STABLEHEART, CLONING_POD_TRAIT)
REMOVE_TRAIT(mob_occupant, TRAIT_EMOTEMUTE, CLONING_POD_TRAIT)
REMOVE_TRAIT(mob_occupant, TRAIT_MUTE, CLONING_POD_TRAIT)
REMOVE_TRAIT(mob_occupant, TRAIT_NOCRITDAMAGE, CLONING_POD_TRAIT)
REMOVE_TRAIT(mob_occupant, TRAIT_NOBREATH, CLONING_POD_TRAIT)
if(grab_ghost_when == CLONER_MATURE_CLONE)
mob_occupant.grab_ghost()

2
code/game/objects/items/body_egg.dm
View File

@@ -24,7 +24,7 @@
/obj/item/organ/body_egg/Remove(var/mob/living/carbon/M, special = 0)
STOP_PROCESSING(SSobj, src)
if(owner)
owner.remove_trait(TRAIT_XENO_HOST, TRAIT_GENERIC)
REMOVE_TRAIT(owner, TRAIT_XENO_HOST, TRAIT_GENERIC)
owner.med_hud_set_status()
INVOKE_ASYNC(src, .proc/RemoveInfectionImages, owner)
..()

2
code/game/objects/items/implants/implant_mindshield.dm
View File

@@ -77,7 +77,7 @@
if(..())
if(isliving(target))
var/mob/living/L = target
L.remove_trait(TRAIT_MINDSHIELD, "implant")
REMOVE_TRAIT(L, TRAIT_MINDSHIELD, "implant")
L.sec_hud_set_implants()
if(target.stat != DEAD && !silent)
to_chat(target, "<span class='boldnotice'>Your mind suddenly feels terribly vulnerable. You are no longer safe from brainwashing.</span>")

2
code/game/objects/structures/petrified_statue.dm
View File

@@ -64,7 +64,7 @@
if(petrified_mob)
petrified_mob.status_flags &= ~GODMODE
petrified_mob.forceMove(loc)
petrified_mob.remove_trait(TRAIT_MUTE, STATUE_MUTE)
REMOVE_TRAIT(petrified_mob, TRAIT_MUTE, STATUE_MUTE)
petrified_mob.take_overall_damage((petrified_mob.health - obj_integrity + 100)) //any new damage the statue incurred is transfered to the mob
petrified_mob.faction -= "mimic"
petrified_mob = null

6
code/modules/antagonists/abductor/abductor.dm
View File

@@ -51,7 +51,7 @@
if(owner.current)
to_chat(owner.current,"<span class='userdanger'>You are no longer the [owner.special_role]!</span>")
owner.special_role = null
owner.remove_trait(TRAIT_ABDUCTOR_TRAINING, ABDUCTOR_ANTAGONIST)
REMOVE_TRAIT(owner, TRAIT_ABDUCTOR_TRAINING, ABDUCTOR_ANTAGONIST)
return ..()
/datum/antagonist/abductor/greet()
@@ -84,8 +84,8 @@
. = ..()
/datum/antagonist/abductor/scientist/on_removal()
owner.remove_trait(TRAIT_ABDUCTOR_SCIENTIST_TRAINING, ABDUCTOR_ANTAGONIST)
owner.remove_trait(TRAIT_SURGEON, ABDUCTOR_ANTAGONIST)
REMOVE_TRAIT(owner, TRAIT_ABDUCTOR_SCIENTIST_TRAINING, ABDUCTOR_ANTAGONIST)
REMOVE_TRAIT(owner, TRAIT_SURGEON, ABDUCTOR_ANTAGONIST)
. = ..()
/datum/antagonist/abductor/admin_add(datum/mind/new_owner,mob/admin)

2
code/modules/antagonists/abductor/equipment/gland.dm
View File

@@ -295,7 +295,7 @@
ADD_TRAIT(owner, TRAIT_SHOCKIMMUNE, ORGAN_TRAIT)
/obj/item/organ/heart/gland/electric/Remove(mob/living/carbon/M, special = 0)
owner.remove_trait(TRAIT_SHOCKIMMUNE, ORGAN_TRAIT)
REMOVE_TRAIT(owner, TRAIT_SHOCKIMMUNE, ORGAN_TRAIT)
..()
/obj/item/organ/heart/gland/electric/activate()

4
code/modules/antagonists/cult/cult.dm
View File

@@ -131,7 +131,7 @@
var/mob/living/carbon/human/H = current
H.eye_color = initial(H.eye_color)
H.dna.update_ui_block(DNA_EYE_COLOR_BLOCK)
H.remove_trait(CULT_EYES)
REMOVE_TRAIT(H, CULT_EYES)
H.remove_overlay(HALO_LAYER)
H.update_body()
@@ -231,7 +231,7 @@
var/mob/living/carbon/human/H = current
H.eye_color = initial(H.eye_color)
H.dna.update_ui_block(DNA_EYE_COLOR_BLOCK)
H.remove_trait(CULT_EYES)
REMOVE_TRAIT(H, CULT_EYES)
H.remove_overlay(HALO_LAYER)
H.update_body()

2
code/modules/antagonists/ert/ert.dm
View File

@@ -38,7 +38,7 @@
ADD_TRAIT(owner, TRAIT_DISK_VERIFIER, DEATHSQUAD_TRAIT)
/datum/antagonist/ert/deathsquad/remove_innate_effects(mob/living/mob_override)
owner.remove_trait(TRAIT_DISK_VERIFIER, DEATHSQUAD_TRAIT)
REMOVE_TRAIT(owner, TRAIT_DISK_VERIFIER, DEATHSQUAD_TRAIT)
/datum/antagonist/ert/security // kinda handled by the base template but here for completion

2
code/modules/antagonists/highlander/highlander.dm
View File

@@ -11,7 +11,7 @@
/datum/antagonist/highlander/remove_innate_effects(mob/living/mob_override)
var/mob/living/L = owner.current || mob_override
L.remove_trait(TRAIT_NOGUNS, "highlander")
REMOVE_TRAIT(L, TRAIT_NOGUNS, "highlander")
/datum/antagonist/highlander/proc/forge_objectives()
var/datum/objective/steal/steal_objective = new

12
code/modules/antagonists/hivemind/hivemind.dm
View File

@@ -198,12 +198,12 @@
if(!C)
return
owner.RemoveSpell(new/obj/effect/proc_holder/spell/self/hive_comms)
C.remove_trait(TRAIT_STUNIMMUNE, HIVEMIND_ONE_MIND_TRAIT)
C.remove_trait(TRAIT_SLEEPIMMUNE, HIVEMIND_ONE_MIND_TRAIT)
C.remove_trait(TRAIT_VIRUSIMMUNE, HIVEMIND_ONE_MIND_TRAIT)
C.remove_trait(TRAIT_NOLIMBDISABLE, HIVEMIND_ONE_MIND_TRAIT)
C.remove_trait(TRAIT_NOHUNGER, HIVEMIND_ONE_MIND_TRAIT)
C.remove_trait(TRAIT_NODISMEMBER, HIVEMIND_ONE_MIND_TRAIT)
REMOVE_TRAIT(C, TRAIT_STUNIMMUNE, HIVEMIND_ONE_MIND_TRAIT)
REMOVE_TRAIT(C, TRAIT_SLEEPIMMUNE, HIVEMIND_ONE_MIND_TRAIT)
REMOVE_TRAIT(C, TRAIT_VIRUSIMMUNE, HIVEMIND_ONE_MIND_TRAIT)
REMOVE_TRAIT(C, TRAIT_NOLIMBDISABLE, HIVEMIND_ONE_MIND_TRAIT)
REMOVE_TRAIT(C, TRAIT_NOHUNGER, HIVEMIND_ONE_MIND_TRAIT)
REMOVE_TRAIT(C, TRAIT_NODISMEMBER, HIVEMIND_ONE_MIND_TRAIT)
active_one_mind.Destroy()
/datum/antagonist/hivemind/on_gain()

2
code/modules/antagonists/nukeop/nukeop.dm
View File

@@ -28,7 +28,7 @@
/datum/antagonist/nukeop/remove_innate_effects(mob/living/mob_override)
var/mob/living/M = mob_override || owner.current
update_synd_icons_removed(M)
owner.remove_trait(TRAIT_DISK_VERIFIER, NUKEOP_TRAIT)
REMOVE_TRAIT(owner, TRAIT_DISK_VERIFIER, NUKEOP_TRAIT)
/datum/antagonist/nukeop/proc/equip_op()
if(!ishuman(owner.current))

4
code/modules/antagonists/wizard/equipment/artefact.dm
View File

@@ -171,8 +171,8 @@
to_chat(current_owner, "<span class='notice'>Your otherworldly vision fades...</span>")
current_owner.remove_trait(TRAIT_SIXTHSENSE, SCRYING_ORB)
current_owner.remove_trait(TRAIT_XRAY_VISION, SCRYING_ORB)
REMOVE_TRAIT(current_owner, TRAIT_SIXTHSENSE, SCRYING_ORB)
REMOVE_TRAIT(current_owner, TRAIT_XRAY_VISION, SCRYING_ORB)
current_owner.update_sight()
current_owner = null

2
code/modules/clothing/glasses/_glasses.dm
View File

@@ -206,7 +206,7 @@
/obj/item/clothing/glasses/sunglasses/reagent/dropped(mob/user)
. = ..()
user.remove_trait(TRAIT_BOOZE_SLIDER, CLOTHING_TRAIT)
REMOVE_TRAIT(user, TRAIT_BOOZE_SLIDER, CLOTHING_TRAIT)
/obj/item/clothing/glasses/sunglasses/garb
name = "black gar glasses"

4
code/modules/clothing/spacesuits/chronosuit.dm
View File

@@ -98,7 +98,7 @@
user.anchored = FALSE
teleporting = 0
for(var/obj/item/I in user.held_items)
I.remove_trait(TRAIT_NODROP, CHRONOSUIT_TRAIT)
REMOVE_TRAIT(I, TRAIT_NODROP, CHRONOSUIT_TRAIT)
if(camera)
camera.remove_target_ui()
camera.forceMove(user)
@@ -234,7 +234,7 @@
to_chat(user, "\[ <span style='color: #ff5500;'>ok</span> \] Unmounting /dev/helmet")
to_chat(user, "logout")
if(helmet)
helmet.remove_trait(TRAIT_NODROP, CHRONOSUIT_TRAIT)
REMOVE_TRAIT(helmet, TRAIT_NODROP, CHRONOSUIT_TRAIT)
helmet.suit = null
helmet = null
if(camera)

4
code/modules/mob/living/carbon/human/species.dm
View File

@@ -306,7 +306,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(DIGITIGRADE in species_traits)
C.Digitigrade_Leg_Swap(TRUE)
for(var/X in inherent_traits)
C.remove_trait(X, SPECIES_TRAIT)
REMOVE_TRAIT(C, X, SPECIES_TRAIT)
//If their inert mutation is not the same, swap it out
if((inert_mutation != new_species.inert_mutation) && LAZYLEN(C.dna.mutation_index) && (inert_mutation in C.dna.mutation_index))
@@ -978,7 +978,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(H.has_trait(TRAIT_FAT))//I share your pain, past coder.
if(H.overeatduration < 100)
to_chat(H, "<span class='notice'>You feel fit again!</span>")
H.remove_trait(TRAIT_FAT, OBESITY)
REMOVE_TRAIT(H, TRAIT_FAT, OBESITY)
H.update_inv_w_uniform()
H.update_inv_wear_suit()
else

2
code/modules/mob/living/carbon/human/species_types/angel.dm
View File

@@ -36,7 +36,7 @@
H.dna.species.mutant_bodyparts -= "wings"
H.dna.features["wings"] = "None"
H.update_body()
H.remove_trait(TRAIT_HOLY, SPECIES_TRAIT)
REMOVE_TRAIT(H, TRAIT_HOLY, SPECIES_TRAIT)
..()
/datum/species/angel/spec_life(mob/living/carbon/human/H)

8
code/modules/mob/living/carbon/human/species_types/golems.dm
View File

@@ -76,7 +76,7 @@
ADD_TRAIT(C, TRAIT_ANTIMAGIC, SPECIES_TRAIT)
/datum/species/golem/adamantine/on_species_loss(mob/living/carbon/C)
C.remove_trait(TRAIT_ANTIMAGIC, SPECIES_TRAIT)
REMOVE_TRAIT(C, TRAIT_ANTIMAGIC, SPECIES_TRAIT)
..()
//The suicide bombers of golemkind
@@ -177,7 +177,7 @@
ADD_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT)
/datum/species/golem/silver/on_species_loss(mob/living/carbon/C)
C.remove_trait(TRAIT_HOLY, SPECIES_TRAIT)
REMOVE_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT)
..()
//Harder to stun, deals more damage, massively slowpokes, but gravproof and obstructive. Basically, The Wall.
@@ -205,7 +205,7 @@
ADD_TRAIT(C, TRAIT_NOMOBSWAP, SPECIES_TRAIT) //THE WALL THE WALL THE WALL
/datum/species/golem/plasteel/on_species_loss(mob/living/carbon/C)
C.remove_trait(TRAIT_NOMOBSWAP, SPECIES_TRAIT) //NOTHING ON ERF CAN MAKE IT FALL
REMOVE_TRAIT(C, TRAIT_NOMOBSWAP, SPECIES_TRAIT) //NOTHING ON ERF CAN MAKE IT FALL
..()
//Immune to ash storms
@@ -710,7 +710,7 @@
ADD_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT)
/datum/species/golem/cloth/on_species_loss(mob/living/carbon/C)
C.remove_trait(TRAIT_HOLY, SPECIES_TRAIT)
REMOVE_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT)
..()
/datum/species/golem/cloth/check_roundstart_eligible()

2
code/modules/mob/living/carbon/human/species_types/snail.dm
View File

@@ -40,7 +40,7 @@
. = ..()
var/datum/component/CP = C.GetComponent(/datum/component/snailcrawl)
CP.RemoveComponent()
C.remove_trait(TRAIT_NOSLIPALL, SPECIES_TRAIT)
REMOVE_TRAIT(C, TRAIT_NOSLIPALL, SPECIES_TRAIT)
var/obj/item/storage/backpack/bag = C.get_item_by_slot(SLOT_BACK)
if(istype(bag, /obj/item/storage/backpack/snail))
bag.emptyStorage()

2
code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
View File

@@ -726,7 +726,7 @@ Difficulty: Very Hard
/obj/structure/closet/stasis/dump_contents(var/kill = 1)
STOP_PROCESSING(SSobj, src)
for(var/mob/living/L in src)
L.remove_trait(TRAIT_MUTE, STASIS_MUTE)
REMOVE_TRAIT(L, TRAIT_MUTE, STASIS_MUTE)
L.status_flags &= ~GODMODE
L.notransform = 0
if(holder_animal)

6
code/modules/ninja/suit/suit.dm
View File

@@ -136,14 +136,14 @@ Contents:
slowdown = 1
icon_state = "s-ninja"
if(n_hood)//Should be attached, might not be attached.
n_hood.remove_trait(TRAIT_NODROP, NINJA_SUIT_TRAIT)
REMOVE_TRAIT(n_hood, TRAIT_NODROP, NINJA_SUIT_TRAIT)
if(n_shoes)
n_shoes.remove_trait(TRAIT_NODROP, NINJA_SUIT_TRAIT)
REMOVE_TRAIT(n_shoes, TRAIT_NODROP, NINJA_SUIT_TRAIT)
n_shoes.slowdown++
if(n_gloves)
n_gloves.icon_state = "s-ninja"
n_gloves.item_state = "s-ninja"
n_gloves.remove_trait(TRAIT_NODROP, NINJA_SUIT_TRAIT)
REMOVE_TRAIT(n_gloves, TRAIT_NODROP, NINJA_SUIT_TRAIT)
n_gloves.candrain = FALSE
n_gloves.draining = FALSE

8
code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
View File

@@ -1390,10 +1390,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
..()
/datum/reagent/consumable/ethanol/neurotoxin/on_mob_delete(mob/living/carbon/M)
M.remove_trait(TRAIT_PARALYSIS_L_ARM, "neurotoxin")
M.remove_trait(TRAIT_PARALYSIS_R_ARM, "neurotoxin")
M.remove_trait(TRAIT_PARALYSIS_R_LEG, "neurotoxin")
M.remove_trait(TRAIT_PARALYSIS_L_LEG, "neurotoxin")
REMOVE_TRAIT(M, TRAIT_PARALYSIS_L_ARM, "neurotoxin")
REMOVE_TRAIT(M, TRAIT_PARALYSIS_R_ARM, "neurotoxin")
REMOVE_TRAIT(M, TRAIT_PARALYSIS_R_LEG, "neurotoxin")
REMOVE_TRAIT(M, TRAIT_PARALYSIS_L_LEG, "neurotoxin")
M.adjustStaminaLoss(10)
..()

2
code/modules/reagents/chemistry/reagents/drink_reagents.dm
View File

@@ -438,7 +438,7 @@
ADD_TRAIT(L, TRAIT_SHOCKIMMUNE, id)
/datum/reagent/consumable/grey_bull/on_mob_delete(mob/living/L)
L.remove_trait(TRAIT_SHOCKIMMUNE, id)
REMOVE_TRAIT(L, TRAIT_SHOCKIMMUNE, id)
..()
/datum/reagent/consumable/grey_bull/on_mob_life(mob/living/carbon/M)

6
code/modules/reagents/chemistry/reagents/drug_reagents.dm
View File

@@ -271,8 +271,8 @@
C.gain_trauma(rage, TRAUMA_RESILIENCE_ABSOLUTE)
/datum/reagent/drug/bath_salts/on_mob_delete(mob/living/L)
L.remove_trait(TRAIT_STUNIMMUNE, id)
L.remove_trait(TRAIT_SLEEPIMMUNE, id)
REMOVE_TRAIT(L, TRAIT_STUNIMMUNE, id)
REMOVE_TRAIT(L, TRAIT_SLEEPIMMUNE, id)
if(rage)
QDEL_NULL(rage)
..()
@@ -384,7 +384,7 @@
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")
..()

16
code/modules/reagents/chemistry/reagents/medicine_reagents.dm
View File

@@ -143,7 +143,7 @@
M.adjustFireLoss(-power, 0)
M.adjustToxLoss(-power, 0, TRUE) //heals TOXINLOVERs
M.adjustCloneLoss(-power, 0)
M.remove_trait(TRAIT_DISFIGURED, TRAIT_GENERIC) //fixes common causes for disfiguration
REMOVE_TRAIT(M, TRAIT_DISFIGURED, TRAIT_GENERIC) //fixes common causes for disfiguration
. = 1
metabolization_rate = REAGENTS_METABOLISM * (0.00001 * (M.bodytemperature ** 2) + 0.5)
..()
@@ -159,7 +159,7 @@
/datum/reagent/medicine/clonexadone/on_mob_life(mob/living/carbon/M)
if(M.bodytemperature < T0C)
M.adjustCloneLoss(0.00006 * (M.bodytemperature ** 2) - 6, 0)
M.remove_trait(TRAIT_DISFIGURED, TRAIT_GENERIC)
REMOVE_TRAIT(M, TRAIT_DISFIGURED, TRAIT_GENERIC)
. = 1
metabolization_rate = REAGENTS_METABOLISM * (0.000015 * (M.bodytemperature ** 2) + 0.75)
..()
@@ -189,7 +189,7 @@
M.adjustFireLoss(-1.5 * power, 0)
M.adjustToxLoss(-power, 0, TRUE)
M.adjustCloneLoss(-power, 0)
M.remove_trait(TRAIT_DISFIGURED, TRAIT_GENERIC)
REMOVE_TRAIT(M, TRAIT_DISFIGURED, TRAIT_GENERIC)
. = 1
..()
@@ -205,7 +205,7 @@
/datum/reagent/medicine/rezadone/on_mob_life(mob/living/carbon/M)
M.setCloneLoss(0) //Rezadone is almost never used in favor of cryoxadone. Hopefully this will change that.
M.heal_bodypart_damage(1,1)
M.remove_trait(TRAIT_DISFIGURED, TRAIT_GENERIC)
REMOVE_TRAIT(M, TRAIT_DISFIGURED, TRAIT_GENERIC)
..()
. = 1
@@ -799,7 +799,7 @@
ADD_TRAIT(M, TRAIT_NOCRITDAMAGE, id)
/datum/reagent/medicine/epinephrine/on_mob_delete(mob/living/carbon/M)
M.remove_trait(TRAIT_NOCRITDAMAGE, id)
REMOVE_TRAIT(M, TRAIT_NOCRITDAMAGE, id)
..()
/datum/reagent/medicine/epinephrine/on_mob_life(mob/living/carbon/M)
@@ -1247,7 +1247,7 @@
ADD_TRAIT(M, TRAIT_STABLEHEART, id)
/datum/reagent/medicine/corazone/on_mob_delete(mob/living/M)
M.remove_trait(TRAIT_STABLEHEART, id)
REMOVE_TRAIT(M, TRAIT_STABLEHEART, id)
..()
/datum/reagent/medicine/muscle_stimulant
@@ -1279,7 +1279,7 @@
..()
/datum/reagent/medicine/modafinil/on_mob_delete(mob/living/M)
M.remove_trait(TRAIT_SLEEPIMMUNE, id)
REMOVE_TRAIT(M, TRAIT_SLEEPIMMUNE, id)
..()
/datum/reagent/medicine/modafinil/on_mob_life(mob/living/carbon/M)
@@ -1342,7 +1342,7 @@
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)

10
code/modules/reagents/chemistry/reagents/other_reagents.dm
View File

@@ -195,7 +195,7 @@
ADD_TRAIT(L, TRAIT_HOLY, id)
/datum/reagent/water/holywater/on_mob_delete(mob/living/L)
L.remove_trait(TRAIT_HOLY, id)
REMOVE_TRAIT(L, TRAIT_HOLY, id)
..()
/datum/reagent/water/holywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
@@ -1258,8 +1258,8 @@
ADD_TRAIT(L, TRAIT_SLEEPIMMUNE, id)
/datum/reagent/stimulum/on_mob_delete(mob/living/L)
L.remove_trait(TRAIT_STUNIMMUNE, id)
L.remove_trait(TRAIT_SLEEPIMMUNE, id)
REMOVE_TRAIT(L, TRAIT_STUNIMMUNE, id)
REMOVE_TRAIT(L, TRAIT_SLEEPIMMUNE, id)
..()
/datum/reagent/stimulum/on_mob_life(mob/living/carbon/M)
@@ -1788,7 +1788,7 @@
ADD_TRAIT(L, TRAIT_PACIFISM, id)
/datum/reagent/pax/on_mob_delete(mob/living/L)
L.remove_trait(TRAIT_PACIFISM, id)
REMOVE_TRAIT(L, TRAIT_PACIFISM, id)
..()
/datum/reagent/bz_metabolites
@@ -1807,7 +1807,7 @@
/datum/reagent/bz_metabolites/on_mob_delete(mob/living/L)
..()
L.remove_trait(CHANGELING_HIVEMIND_MUTE, id)
REMOVE_TRAIT(L, CHANGELING_HIVEMIND_MUTE, id)
if(L.mind && L.mind.has_antag_datum(/datum/antagonist/changeling)) //yogs
to_chat(L, "<span class='boldnotice'>Our blood is pure, we can regenerate chemicals again.</span>") //yogs

4
code/modules/reagents/chemistry/reagents/toxin_reagents.dm
View File

@@ -186,7 +186,7 @@
ADD_TRAIT(L, TRAIT_FAKEDEATH, id)
/datum/reagent/toxin/ghoulpowder/on_mob_delete(mob/living/L)
L.remove_trait(TRAIT_FAKEDEATH, id)
REMOVE_TRAIT(L, TRAIT_FAKEDEATH, id)
..()
/datum/reagent/toxin/ghoulpowder/on_mob_life(mob/living/carbon/M)
@@ -903,7 +903,7 @@
ADD_TRAIT(L, TRAIT_EMOTEMUTE, id)
/datum/reagent/toxin/mimesbane/on_mob_delete(mob/living/L)
L.remove_trait(TRAIT_EMOTEMUTE, id)
REMOVE_TRAIT(L, TRAIT_EMOTEMUTE, id)
/datum/reagent/toxin/bonehurtingjuice //oof ouch
name = "Bone Hurting Juice"

4
code/modules/research/nanites/nanite_programs/buffing.dm
View File

@@ -108,7 +108,7 @@
/datum/nanite_program/conductive/disable_passive_effect()
. = ..()
host_mob.remove_trait(TRAIT_SHOCKIMMUNE, "nanites")
REMOVE_TRAIT(host_mob, TRAIT_SHOCKIMMUNE, "nanites")
/datum/nanite_program/mindshield
name = "Mental Barrier"
@@ -124,5 +124,5 @@
/datum/nanite_program/mindshield/disable_passive_effect()
. = ..()
host_mob.remove_trait(TRAIT_MINDSHIELD, "nanites")
REMOVE_TRAIT(host_mob, TRAIT_MINDSHIELD, "nanites")
host_mob.sec_hud_set_implants()

4
code/modules/research/nanites/nanite_programs/suppression.dm
View File

@@ -69,7 +69,7 @@
/datum/nanite_program/pacifying/disable_passive_effect()
. = ..()
host_mob.remove_trait(TRAIT_PACIFISM, "nanites")
REMOVE_TRAIT(host_mob, TRAIT_PACIFISM, "nanites")
/datum/nanite_program/blinding
name = "Blindness"
@@ -97,7 +97,7 @@
/datum/nanite_program/mute/disable_passive_effect()
. = ..()
host_mob.remove_trait(TRAIT_MUTE, "nanites")
REMOVE_TRAIT(host_mob, TRAIT_MUTE, "nanites")
/datum/nanite_program/fake_death
name = "Death Simulation"

4
code/modules/research/xenobiology/crossbreeding/_clothing.dm
View File

@@ -27,7 +27,7 @@ Slimecrossing Armor
/obj/item/clothing/mask/nobreath/dropped(mob/living/carbon/human/user)
..()
user.remove_trait(TRAIT_NOBREATH, "breathmask_[REF(src)]")
REMOVE_TRAIT(user, TRAIT_NOBREATH, "breathmask_[REF(src)]")
user.remove_status_effect(/datum/status_effect/rebreathing)
/obj/item/clothing/glasses/prism_glasses
@@ -116,7 +116,7 @@ Slimecrossing Armor
/obj/item/clothing/head/peaceflower/dropped(mob/living/carbon/human/user)
..()
user.remove_trait(TRAIT_PACIFISM, "peaceflower_[REF(src)]")
REMOVE_TRAIT(user, TRAIT_PACIFISM, "peaceflower_[REF(src)]")
/obj/item/clothing/head/peaceflower/attack_hand(mob/user)
if(iscarbon(user))

14
code/modules/research/xenobiology/crossbreeding/_status_effects.dm
View File

@@ -24,7 +24,7 @@
/datum/status_effect/rainbow_protection/on_remove()
owner.status_flags &= ~GODMODE
owner.color = originalcolor
owner.remove_trait(TRAIT_PACIFISM, "slimestatus")
REMOVE_TRAIT(owner, TRAIT_PACIFISM, "slimestatus")
owner.visible_message("<span class='notice'>[owner] stops glowing, the rainbow light fading away.</span>",
"<span class='warning'>You no longer feel protected...</span>")
@@ -251,7 +251,7 @@ datum/status_effect/rebreathing/tick()
return ..()
/datum/status_effect/firecookie/on_remove()
owner.remove_trait(TRAIT_RESISTCOLD,"firecookie")
REMOVE_TRAIT(owner, TRAIT_RESISTCOLD,"firecookie")
/datum/status_effect/watercookie
id = "watercookie"
@@ -268,7 +268,7 @@ datum/status_effect/rebreathing/tick()
T.MakeSlippery(TURF_WET_WATER, min_wet_time = 10, wet_time_to_add = 5)
/datum/status_effect/watercookie/on_remove()
owner.remove_trait(TRAIT_NOSLIPWATER,"watercookie")
REMOVE_TRAIT(owner, TRAIT_NOSLIPWATER,"watercookie")
/datum/status_effect/metalcookie
id = "metalcookie"
@@ -317,7 +317,7 @@ datum/status_effect/rebreathing/tick()
return ..()
/datum/status_effect/toxincookie/on_remove()
owner.remove_trait(TRAIT_TOXINLOVER,"toxincookie")
REMOVE_TRAIT(owner, TRAIT_TOXINLOVER,"toxincookie")
/datum/status_effect/timecookie
id = "timecookie"
@@ -417,7 +417,7 @@ datum/status_effect/rebreathing/tick()
return ..()
/datum/status_effect/plur/on_remove()
owner.remove_trait(TRAIT_PACIFISM, "peacecookie")
REMOVE_TRAIT(owner, TRAIT_PACIFISM, "peacecookie")
/datum/status_effect/adamantinecookie
id = "adamantinecookie"
@@ -515,7 +515,7 @@ datum/status_effect/rebreathing/tick()
return ..()
datum/status_effect/stabilized/blue/on_remove()
owner.remove_trait(TRAIT_NOSLIPWATER, "slimestatus")
REMOVE_TRAIT(owner, TRAIT_NOSLIPWATER, "slimestatus")
/datum/status_effect/stabilized/metal
id = "stabilizedmetal"
@@ -594,7 +594,7 @@ datum/status_effect/stabilized/blue/on_remove()
return ..()
/datum/status_effect/stabilized/darkpurple/on_remove()
owner.remove_trait(TRAIT_RESISTHEATHANDS, "slimestatus")
REMOVE_TRAIT(owner, TRAIT_RESISTHEATHANDS, "slimestatus")
qdel(fire)
/datum/status_effect/stabilized/darkblue

2
code/modules/spells/spell_types/genetic.dm
View File

@@ -41,4 +41,4 @@
for(var/A in mutations)
target.dna.remove_mutation(A)
for(var/A in traits)
target.remove_trait(A, GENETICS_SPELL)
REMOVE_TRAIT(target, A, GENETICS_SPELL)

4
code/modules/surgery/advanced/bioware/ligament_hook.dm
View File

@@ -37,5 +37,5 @@
/datum/bioware/hooked_ligaments/on_lose()
..()
owner.remove_trait(TRAIT_LIMBATTACHMENT, "ligament_hook")
owner.remove_trait(TRAIT_EASYDISMEMBER, "ligament_hook")
REMOVE_TRAIT(owner, TRAIT_LIMBATTACHMENT, "ligament_hook")
REMOVE_TRAIT(owner, TRAIT_EASYDISMEMBER, "ligament_hook")

4
code/modules/surgery/advanced/bioware/ligament_reinforcement.dm
View File

@@ -37,5 +37,5 @@
/datum/bioware/reinforced_ligaments/on_lose()
..()
owner.remove_trait(TRAIT_NODISMEMBER, "reinforced_ligaments")
owner.remove_trait(TRAIT_EASYLIMBDISABLE, "reinforced_ligaments")
REMOVE_TRAIT(owner, TRAIT_NODISMEMBER, "reinforced_ligaments")
REMOVE_TRAIT(owner, TRAIT_EASYLIMBDISABLE, "reinforced_ligaments")

2
code/modules/surgery/organs/augments_internal.dm
View File

@@ -84,7 +84,7 @@
/obj/item/organ/cyberimp/brain/anti_drop/proc/release_items()
for(var/obj/item/I in stored_items)
I.remove_trait(TRAIT_NODROP, ANTI_DROP_IMPLANT_TRAIT)
REMOVE_TRAIT(I, TRAIT_NODROP, ANTI_DROP_IMPLANT_TRAIT)
stored_items = list()

2
code/modules/surgery/plastic_surgery.dm
View File

@@ -14,7 +14,7 @@
/datum/surgery_step/reshape_face/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(target.has_trait(TRAIT_DISFIGURED, TRAIT_GENERIC))
target.remove_trait(TRAIT_DISFIGURED, TRAIT_GENERIC)
REMOVE_TRAIT(target, TRAIT_DISFIGURED, TRAIT_GENERIC)
user.visible_message("[user] successfully restores [target]'s appearance!", "<span class='notice'>You successfully restore [target]'s appearance.</span>")
else
var/list/names = list()

2
yogstation/code/game/gamemodes/battle_royale/battleroyale.dm
View File

@@ -205,7 +205,7 @@ GLOBAL_LIST_EMPTY(battleroyale_players) //reduce iteration cost
/obj/structure/battle_bus/proc/exit(var/mob/living/carbon/human/Ltaker)
Ltaker.forceMove(get_turf(src))
Ltaker.remove_trait(TRAIT_XRAY_VISION)
REMOVE_TRAIT(Ltaker, TRAIT_XRAY_VISION)
Ltaker.update_sight()
SEND_SOUND(Ltaker, 'yogstation/sound/effects/battleroyale/exitbus.ogg')

2
yogstation/code/modules/ninja/suit/ninja.dm
View File

@@ -77,7 +77,7 @@
/obj/item/clothing/suit/space/space_ninja/unlock_suit()
.=..()
if(n_mask)
n_mask.remove_trait(TRAIT_NODROP, NINJA_SUIT_TRAIT)
REMOVE_TRAIT(n_mask, TRAIT_NODROP, NINJA_SUIT_TRAIT)
n_mask.lights_on = FALSE
if(n_shoes)