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

Commit 68d6a81

Browse files
Altoids1Altoids1
committed
REGEX REPLACE! /([\w\.]+)\.remove_trait\(/ -> /REMOVE_TRAIT(\1, /
1 parent 108ffdd commit 68d6a81

51 files changed

Lines changed: 121 additions & 121 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎code/datums/brain_damage/magic.dm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
..()
5858

5959
/datum/brain_trauma/magic/antimagic/on_lose()
60-
owner.remove_trait(TRAIT_ANTIMAGIC, TRAUMA_TRAIT)
60+
REMOVE_TRAIT(owner, TRAIT_ANTIMAGIC, TRAUMA_TRAIT)
6161
..()
6262

6363
/datum/brain_trauma/magic/stalker

‎code/datums/brain_damage/mild.dm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
..()
5656

5757
/datum/brain_trauma/mild/dumbness/on_lose()
58-
owner.remove_trait(TRAIT_DUMB, TRAUMA_TRAIT)
58+
REMOVE_TRAIT(owner, TRAIT_DUMB, TRAUMA_TRAIT)
5959
owner.derpspeech = 0
6060
SEND_SIGNAL(owner, COMSIG_CLEAR_MOOD_EVENT, "dumb")
6161
..()
@@ -72,7 +72,7 @@
7272
..()
7373

7474
/datum/brain_trauma/mild/speech_impediment/on_lose()
75-
owner.remove_trait(TRAIT_UNINTELLIGIBLE_SPEECH, TRAUMA_TRAIT)
75+
REMOVE_TRAIT(owner, TRAIT_UNINTELLIGIBLE_SPEECH, TRAUMA_TRAIT)
7676
..()
7777

7878
/datum/brain_trauma/mild/concussion

‎code/datums/brain_damage/severe.dm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
..()
1818

1919
/datum/brain_trauma/severe/mute/on_lose()
20-
owner.remove_trait(TRAIT_MUTE, TRAUMA_TRAIT)
20+
REMOVE_TRAIT(owner, TRAIT_MUTE, TRAUMA_TRAIT)
2121
..()
2222

2323
/datum/brain_trauma/severe/aphasia
@@ -115,7 +115,7 @@
115115
/datum/brain_trauma/severe/paralysis/on_lose()
116116
..()
117117
for(var/X in paralysis_traits)
118-
owner.remove_trait(X, "trauma_paralysis")
118+
REMOVE_TRAIT(owner, X, "trauma_paralysis")
119119
owner.update_disabled_bodyparts()
120120

121121
/datum/brain_trauma/severe/paralysis/paraplegic
@@ -237,7 +237,7 @@
237237
..()
238238

239239
/datum/brain_trauma/severe/discoordination/on_lose()
240-
owner.remove_trait(TRAIT_MONKEYLIKE, TRAUMA_TRAIT)
240+
REMOVE_TRAIT(owner, TRAIT_MONKEYLIKE, TRAUMA_TRAIT)
241241
..()
242242

243243
/datum/brain_trauma/severe/pacifism
@@ -252,7 +252,7 @@
252252
..()
253253

254254
/datum/brain_trauma/severe/pacifism/on_lose()
255-
owner.remove_trait(TRAIT_PACIFISM, TRAUMA_TRAIT)
255+
REMOVE_TRAIT(owner, TRAIT_PACIFISM, TRAUMA_TRAIT)
256256
..()
257257

258258
/datum/brain_trauma/severe/hypnotic_stupor

‎code/datums/brain_damage/special.dm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
..()
2828

2929
/datum/brain_trauma/special/godwoken/on_lose()
30-
owner.remove_trait(TRAIT_HOLY, TRAUMA_TRAIT)
30+
REMOVE_TRAIT(owner, TRAIT_HOLY, TRAUMA_TRAIT)
3131
..()
3232

3333
/datum/brain_trauma/special/godwoken/proc/speak(type, include_owner = FALSE)
@@ -156,8 +156,8 @@
156156
..()
157157

158158
/datum/brain_trauma/special/tenacity/on_lose()
159-
owner.remove_trait(TRAIT_NOSOFTCRIT, TRAUMA_TRAIT)
160-
owner.remove_trait(TRAIT_NOHARDCRIT, TRAUMA_TRAIT)
159+
REMOVE_TRAIT(owner, TRAIT_NOSOFTCRIT, TRAUMA_TRAIT)
160+
REMOVE_TRAIT(owner, TRAIT_NOHARDCRIT, TRAUMA_TRAIT)
161161
..()
162162

163163
/datum/brain_trauma/special/death_whispers
@@ -184,7 +184,7 @@
184184
addtimer(CALLBACK(src, .proc/cease_whispering), rand(50, 300))
185185

186186
/datum/brain_trauma/special/death_whispers/proc/cease_whispering()
187-
owner.remove_trait(TRAIT_SIXTHSENSE, TRAUMA_TRAIT)
187+
REMOVE_TRAIT(owner, TRAIT_SIXTHSENSE, TRAUMA_TRAIT)
188188
active = FALSE
189189

190190
/datum/brain_trauma/special/beepsky

‎code/datums/diseases/advance/symptoms/oxygen.dm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Bonus
5757
var/mob/living/carbon/M = A.affected_mob
5858
switch(A.stage)
5959
if(3)
60-
M.remove_trait(TRAIT_NOBREATH, DISEASE_TRAIT)
60+
REMOVE_TRAIT(M, TRAIT_NOBREATH, DISEASE_TRAIT)
6161
if(4)
6262
ADD_TRAIT(M, TRAIT_NOBREATH, DISEASE_TRAIT)
6363
return TRUE
@@ -66,4 +66,4 @@ Bonus
6666
if(!..())
6767
return
6868
if(A.stage >= 4)
69-
A.affected_mob.remove_trait(TRAIT_NOBREATH, DISEASE_TRAIT)
69+
REMOVE_TRAIT(A.affected_mob, TRAIT_NOBREATH, DISEASE_TRAIT)

‎code/datums/mutations/body.dm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
/datum/mutation/human/clumsy/on_losing(mob/living/carbon/human/owner)
121121
if(..())
122122
return
123-
owner.remove_trait(TRAIT_CLUMSY, GENETIC_MUTATION)
123+
REMOVE_TRAIT(owner, TRAIT_CLUMSY, GENETIC_MUTATION)
124124

125125

126126
//Tourettes causes you to randomly stand in place and shout.
@@ -162,7 +162,7 @@
162162
/datum/mutation/human/deaf/on_losing(mob/living/carbon/human/owner)
163163
if(..())
164164
return
165-
owner.remove_trait(TRAIT_DEAF, GENETIC_MUTATION)
165+
REMOVE_TRAIT(owner, TRAIT_DEAF, GENETIC_MUTATION)
166166

167167

168168
//Monified turns you into a monkey.
@@ -231,7 +231,7 @@
231231
/datum/mutation/human/insulated/on_losing(mob/living/carbon/human/owner)
232232
if(..())
233233
return
234-
owner.remove_trait(TRAIT_SHOCKIMMUNE, "genetics")
234+
REMOVE_TRAIT(owner, TRAIT_SHOCKIMMUNE, "genetics")
235235

236236
/datum/mutation/human/fire
237237
name = "Fiery Sweat"

‎code/datums/mutations/hulk.dm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
/datum/mutation/human/hulk/on_losing(mob/living/carbon/human/owner)
3232
if(..())
3333
return
34-
owner.remove_trait(TRAIT_STUNIMMUNE, TRAIT_HULK)
35-
owner.remove_trait(TRAIT_PUSHIMMUNE, TRAIT_HULK)
34+
REMOVE_TRAIT(owner, TRAIT_STUNIMMUNE, TRAIT_HULK)
35+
REMOVE_TRAIT(owner, TRAIT_PUSHIMMUNE, TRAIT_HULK)
3636
owner.update_body_parts()
3737
SEND_SIGNAL(owner, COMSIG_CLEAR_MOOD_EVENT, "hulk")
3838

‎code/datums/mutations/sight.dm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
/datum/mutation/human/thermal/on_losing(mob/living/carbon/human/owner)
5555
if(..())
5656
return
57-
owner.remove_trait(visionflag, GENETIC_MUTATION)
57+
REMOVE_TRAIT(owner, visionflag, GENETIC_MUTATION)
5858
owner.update_sight()
5959

6060
//X-ray Vision lets you see through walls.

‎code/datums/mutations/space_adaptation.dm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
/datum/mutation/human/space_adaptation/on_losing(mob/living/carbon/human/owner)
2626
if(..())
2727
return
28-
owner.remove_trait(TRAIT_RESISTCOLD, "space_adaptation")
29-
owner.remove_trait(TRAIT_RESISTLOWPRESSURE, "space_adaptation")
28+
REMOVE_TRAIT(owner, TRAIT_RESISTCOLD, "space_adaptation")
29+
REMOVE_TRAIT(owner, TRAIT_RESISTLOWPRESSURE, "space_adaptation")
3030

‎code/datums/mutations/speech.dm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
/datum/mutation/human/mute/on_losing(mob/living/carbon/human/owner)
3939
if(..())
4040
return
41-
owner.remove_trait(TRAIT_MUTE, GENETIC_MUTATION)
41+
REMOVE_TRAIT(owner, TRAIT_MUTE, GENETIC_MUTATION)
4242

4343

4444
/datum/mutation/human/smile
@@ -114,7 +114,7 @@
114114
/datum/mutation/human/unintelligible/on_losing(mob/living/carbon/human/owner)
115115
if(..())
116116
return
117-
owner.remove_trait(TRAIT_UNINTELLIGIBLE_SPEECH, GENETIC_MUTATION)
117+
REMOVE_TRAIT(owner, TRAIT_UNINTELLIGIBLE_SPEECH, GENETIC_MUTATION)
118118

119119
/datum/mutation/human/swedish
120120
name = "Swedish"

0 commit comments

Comments
 (0)