From 9268949ce0edba1c75abff1cd63082e9ef4bdc4d Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 4 Mar 2021 22:57:43 +0100 Subject: [PATCH] [MIRROR] Defines some traits and cleans it out a little (#3873) * Defines some traits and cleans it out a little * Update stunbaton.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Co-authored-by: Gandalf2k15 --- code/__DEFINES/traits.dm | 11 +++++++-- code/datums/brain_damage/severe.dm | 4 ++-- code/datums/mutations/body.dm | 4 ++-- code/datums/mutations/space_adaptation.dm | 8 +++---- code/datums/status_effects/buffs.dm | 20 ++++++++-------- code/datums/status_effects/debuffs.dm | 24 +++++++++---------- code/game/objects/items/body_egg.dm | 4 ++-- .../objects/items/implants/implant_exile.dm | 4 ++-- .../items/implants/implant_mindshield.dm | 6 ++--- code/game/objects/items/stunbaton.dm | 4 ++-- code/game/objects/items/weaponry.dm | 4 ++-- .../mining/lavaland/necropolis_chests.dm | 6 ++--- .../advanced/bioware/cortex_folding.dm | 4 ++-- .../surgery/advanced/bioware/ligament_hook.dm | 8 +++---- .../bioware/ligament_reinforcement.dm | 8 +++---- .../surgery/advanced/bioware/muscled_veins.dm | 4 ++-- .../advanced/bioware/nerve_grounding.dm | 4 ++-- .../surgery/organs/augments_internal.dm | 4 ++-- code/modules/surgery/organs/tongue.dm | 6 ++--- 19 files changed, 72 insertions(+), 65 deletions(-) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 49870ef0d5b..2dbd6ea1fc3 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -404,6 +404,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define OBESITY "obesity" #define MAGIC_TRAIT "magic" #define TRAUMA_TRAIT "trauma" +/// Trait inherited by experimental surgeries +#define EXPERIMENTAL_SURGERY_TRAIT "experimental_surgery" #define DISEASE_TRAIT "disease" #define SPECIES_TRAIT "species" #define ORGAN_TRAIT "organ" @@ -420,6 +422,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define HELMET_TRAIT "helmet" #define MASK_TRAIT "mask" //inherited from the mask #define SHOES_TRAIT "shoes" //inherited from your sweet kicks +/// Trait inherited by implants +#define IMPLANT_TRAIT "implant" #define GLASSES_TRAIT "glasses" #define VEHICLE_TRAIT "vehicle" // inherited from riding vehicles #define INNATE_TRAIT "innate" @@ -477,7 +481,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define CHRONOSUIT_TRAIT "chronosuit" #define LOCKED_HELMET_TRAIT "locked-helmet" #define NINJA_SUIT_TRAIT "ninja-suit" -#define ANTI_DROP_IMPLANT_TRAIT "anti-drop-implant" #define SLEEPING_CARP_TRAIT "sleeping_carp" #define MADE_UNCLONEABLE "made-uncloneable" #define TIMESTOP_TRAIT "timestop" @@ -500,7 +503,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define WARPWHISTLE_TRAIT "warpwhistle" ///Turf trait for when a turf is transparent #define TURF_Z_TRANSPARENT_TRAIT "turf_z_transparent" -/// Trait applied by by [/datum/component/soulstoned] +/// Trait applied by [/datum/component/soulstoned] #define SOULSTONE_TRAIT "soulstone" /// Trait applied to slimes by low temperature #define SLIME_COLD "slime-cold" @@ -514,6 +517,10 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define ELEMENT_TRAIT "element_trait" /// Trait granted by [/obj/item/clothing/head/helmet/space/hardsuit/berserker] #define BERSERK_TRAIT "berserk_trait" +/// Trait granted by [/obj/item/rod_of_asclepius] +#define HIPPOCRATIC_OATH_TRAIT "hippocratic_oath" +/// Trait granted by [/datum/status_effect/blooddrunk] +#define BLOODDRUNK_TRAIT "blooddrunk" /// Trait granted by lipstick #define LIPSTICK_TRAIT "lipstick_trait" /// Self-explainatory. diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm index 3a5a9221df3..1a4ac03ee21 100644 --- a/code/datums/brain_damage/severe.dm +++ b/code/datums/brain_damage/severe.dm @@ -103,13 +103,13 @@ /datum/brain_trauma/severe/paralysis/on_gain() ..() for(var/X in paralysis_traits) - ADD_TRAIT(owner, X, "trauma_paralysis") + ADD_TRAIT(owner, X, TRAUMA_TRAIT) /datum/brain_trauma/severe/paralysis/on_lose() ..() for(var/X in paralysis_traits) - REMOVE_TRAIT(owner, X, "trauma_paralysis") + REMOVE_TRAIT(owner, X, TRAUMA_TRAIT) /datum/brain_trauma/severe/paralysis/paraplegic diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm index eb04fb86557..9adf316db83 100644 --- a/code/datums/mutations/body.dm +++ b/code/datums/mutations/body.dm @@ -267,12 +267,12 @@ /datum/mutation/human/insulated/on_acquiring(mob/living/carbon/human/owner) if(..()) return - ADD_TRAIT(owner, TRAIT_SHOCKIMMUNE, "genetics") + ADD_TRAIT(owner, TRAIT_SHOCKIMMUNE, GENETIC_MUTATION) /datum/mutation/human/insulated/on_losing(mob/living/carbon/human/owner) if(..()) return - REMOVE_TRAIT(owner, TRAIT_SHOCKIMMUNE, "genetics") + REMOVE_TRAIT(owner, TRAIT_SHOCKIMMUNE, GENETIC_MUTATION) /datum/mutation/human/fire name = "Fiery Sweat" diff --git a/code/datums/mutations/space_adaptation.dm b/code/datums/mutations/space_adaptation.dm index a77694c6f79..08cbe24d498 100644 --- a/code/datums/mutations/space_adaptation.dm +++ b/code/datums/mutations/space_adaptation.dm @@ -19,12 +19,12 @@ /datum/mutation/human/space_adaptation/on_acquiring(mob/living/carbon/human/owner) if(..()) return - ADD_TRAIT(owner, TRAIT_RESISTCOLD, "space_adaptation") - ADD_TRAIT(owner, TRAIT_RESISTLOWPRESSURE, "space_adaptation") + ADD_TRAIT(owner, TRAIT_RESISTCOLD, GENETIC_MUTATION) + ADD_TRAIT(owner, TRAIT_RESISTLOWPRESSURE, GENETIC_MUTATION) /datum/mutation/human/space_adaptation/on_losing(mob/living/carbon/human/owner) if(..()) return - REMOVE_TRAIT(owner, TRAIT_RESISTCOLD, "space_adaptation") - REMOVE_TRAIT(owner, TRAIT_RESISTLOWPRESSURE, "space_adaptation") + REMOVE_TRAIT(owner, TRAIT_RESISTCOLD, GENETIC_MUTATION) + REMOVE_TRAIT(owner, TRAIT_RESISTLOWPRESSURE, GENETIC_MUTATION) diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index 8a15c697fa7..75fb7f837a8 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -114,7 +114,7 @@ /datum/status_effect/blooddrunk/on_apply() . = ..() if(.) - ADD_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, "blooddrunk") + ADD_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, BLOODDRUNK_TRAIT) if(ishuman(owner)) var/mob/living/carbon/human/H = owner H.physiology.brute_mod *= 0.1 @@ -137,7 +137,7 @@ H.physiology.clone_mod *= 10 H.physiology.stamina_mod *= 10 owner.log_message("lost blood-drunk stun immunity", LOG_ATTACK) - REMOVE_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, "blooddrunk"); + REMOVE_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, BLOODDRUNK_TRAIT); if(islist(owner.stun_absorption) && owner.stun_absorption["blooddrunk"]) owner.stun_absorption -= "blooddrunk" @@ -225,13 +225,13 @@ /datum/status_effect/hippocratic_oath/on_apply() //Makes the user passive, it's in their oath not to harm! - ADD_TRAIT(owner, TRAIT_PACIFISM, "hippocraticOath") + ADD_TRAIT(owner, TRAIT_PACIFISM, HIPPOCRATIC_OATH_TRAIT) var/datum/atom_hud/H = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED] H.add_hud_to(owner) return ..() /datum/status_effect/hippocratic_oath/on_remove() - REMOVE_TRAIT(owner, TRAIT_PACIFISM, "hippocraticOath") + REMOVE_TRAIT(owner, TRAIT_PACIFISM, HIPPOCRATIC_OATH_TRAIT) var/datum/atom_hud/H = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED] H.remove_hud_from(owner) @@ -339,7 +339,7 @@ alert_type = /atom/movable/screen/alert/status_effect/regenerative_core /datum/status_effect/regenerative_core/on_apply() - ADD_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, id) + ADD_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, STATUS_EFFECT_TRAIT) owner.adjustBruteLoss(-25) owner.adjustFireLoss(-25) owner.remove_CC() @@ -350,7 +350,7 @@ return TRUE /datum/status_effect/regenerative_core/on_remove() - REMOVE_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, id) + REMOVE_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, STATUS_EFFECT_TRAIT) /datum/status_effect/antimagic id = "antimagic" @@ -399,11 +399,11 @@ /datum/status_effect/duskndawn/on_apply() . = ..() - ADD_TRAIT(owner,TRAIT_XRAY_VISION,type) + ADD_TRAIT(owner, TRAIT_XRAY_VISION, STATUS_EFFECT_TRAIT) owner.update_sight() /datum/status_effect/duskndawn/on_remove() - REMOVE_TRAIT(owner,TRAIT_XRAY_VISION,type) + REMOVE_TRAIT(owner, TRAIT_XRAY_VISION, STATUS_EFFECT_TRAIT) owner.update_sight() return ..() @@ -416,11 +416,11 @@ /datum/status_effect/marshal/on_apply() . = ..() - ADD_TRAIT(owner,TRAIT_IGNOREDAMAGESLOWDOWN,type) + ADD_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, STATUS_EFFECT_TRAIT) /datum/status_effect/marshal/on_remove() . = ..() - REMOVE_TRAIT(owner,TRAIT_IGNOREDAMAGESLOWDOWN,type) + REMOVE_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, STATUS_EFFECT_TRAIT) /datum/status_effect/marshal/tick() . = ..() diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 26b1ffd91d0..b9b616b5c07 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -253,11 +253,11 @@ alert_type = /atom/movable/screen/alert/status_effect/strandling /datum/status_effect/strandling/on_apply() - ADD_TRAIT(owner, TRAIT_MAGIC_CHOKE, "dumbmoron") + ADD_TRAIT(owner, TRAIT_MAGIC_CHOKE, STATUS_EFFECT_TRAIT) return ..() /datum/status_effect/strandling/on_remove() - REMOVE_TRAIT(owner, TRAIT_MAGIC_CHOKE, "dumbmoron") + REMOVE_TRAIT(owner, TRAIT_MAGIC_CHOKE, STATUS_EFFECT_TRAIT) return ..() /atom/movable/screen/alert/status_effect/strandling @@ -292,11 +292,11 @@ . = ..() /datum/status_effect/pacify/on_apply() - ADD_TRAIT(owner, TRAIT_PACIFISM, "status_effect") + ADD_TRAIT(owner, TRAIT_PACIFISM, STATUS_EFFECT_TRAIT) return ..() /datum/status_effect/pacify/on_remove() - REMOVE_TRAIT(owner, TRAIT_PACIFISM, "status_effect") + REMOVE_TRAIT(owner, TRAIT_PACIFISM, STATUS_EFFECT_TRAIT) /datum/status_effect/his_wrath //does minor damage over time unless holding His Grace id = "his_wrath" @@ -636,14 +636,14 @@ /datum/status_effect/gonbola_pacify/on_apply() . = ..() - ADD_TRAIT(owner, TRAIT_PACIFISM, type) - ADD_TRAIT(owner, TRAIT_MUTE, type) + ADD_TRAIT(owner, TRAIT_PACIFISM, CLOTHING_TRAIT) + ADD_TRAIT(owner, TRAIT_MUTE, CLOTHING_TRAIT) SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, type, /datum/mood_event/gondola) to_chat(owner, "You suddenly feel at peace and feel no need to make any sudden or rash actions...") /datum/status_effect/gonbola_pacify/on_remove() - REMOVE_TRAIT(owner, TRAIT_PACIFISM, type) - REMOVE_TRAIT(owner, TRAIT_MUTE, type) + REMOVE_TRAIT(owner, TRAIT_PACIFISM, CLOTHING_TRAIT) + REMOVE_TRAIT(owner, TRAIT_MUTE, CLOTHING_TRAIT) SEND_SIGNAL(owner, COMSIG_CLEAR_MOOD_EVENT, type) return ..() @@ -670,7 +670,7 @@ if(!iscarbon(owner)) return FALSE RegisterSignal(owner, COMSIG_MOVABLE_HEAR, .proc/hypnotize) - ADD_TRAIT(owner, TRAIT_MUTE, "trance") + ADD_TRAIT(owner, TRAIT_MUTE, STATUS_EFFECT_TRAIT) owner.add_client_colour(/datum/client_colour/monochrome/trance) owner.visible_message("[stun ? "[owner] stands still as [owner.p_their()] eyes seem to focus on a distant point." : ""]", \ "[pick("You feel your thoughts slow down...", "You suddenly feel extremely dizzy...", "You feel like you're in the middle of a dream...","You feel incredibly relaxed...")]") @@ -683,7 +683,7 @@ /datum/status_effect/trance/on_remove() UnregisterSignal(owner, COMSIG_MOVABLE_HEAR) - REMOVE_TRAIT(owner, TRAIT_MUTE, "trance") + REMOVE_TRAIT(owner, TRAIT_MUTE, STATUS_EFFECT_TRAIT) owner.dizziness = 0 owner.remove_client_colour(/datum/client_colour/monochrome/trance) to_chat(owner, "You snap out of your trance!") @@ -952,14 +952,14 @@ mob_overlay = mutable_appearance('icons/effects/eldritch.dmi', "cloud_swirl", ABOVE_MOB_LAYER) owner.overlays += mob_overlay owner.update_appearance() - ADD_TRAIT(owner, TRAIT_BLIND, "cloudstruck") + ADD_TRAIT(owner, TRAIT_BLIND, STATUS_EFFECT_TRAIT) return TRUE /datum/status_effect/cloudstruck/on_remove() . = ..() if(QDELETED(owner)) return - REMOVE_TRAIT(owner, TRAIT_BLIND, "cloudstruck") + REMOVE_TRAIT(owner, TRAIT_BLIND, STATUS_EFFECT_TRAIT) if(owner) owner.overlays -= mob_overlay owner.update_appearance() diff --git a/code/game/objects/items/body_egg.dm b/code/game/objects/items/body_egg.dm index 7a15ccf0b1c..76dfd615d45 100644 --- a/code/game/objects/items/body_egg.dm +++ b/code/game/objects/items/body_egg.dm @@ -17,14 +17,14 @@ /obj/item/organ/body_egg/Insert(mob/living/carbon/M, special = FALSE) ..() ADD_TRAIT(owner, TRAIT_XENO_HOST, TRAIT_GENERIC) - ADD_TRAIT(owner, TRAIT_XENO_IMMUNE, "xeno immune") + ADD_TRAIT(owner, TRAIT_XENO_IMMUNE, TRAIT_GENERIC) owner.med_hud_set_status() INVOKE_ASYNC(src, .proc/AddInfectionImages, owner) /obj/item/organ/body_egg/Remove(mob/living/carbon/M, special = FALSE) if(owner) REMOVE_TRAIT(owner, TRAIT_XENO_HOST, TRAIT_GENERIC) - REMOVE_TRAIT(owner, TRAIT_XENO_IMMUNE, "xeno immune") + REMOVE_TRAIT(owner, TRAIT_XENO_IMMUNE, TRAIT_GENERIC) owner.med_hud_set_status() INVOKE_ASYNC(src, .proc/RemoveInfectionImages, owner) ..() diff --git a/code/game/objects/items/implants/implant_exile.dm b/code/game/objects/items/implants/implant_exile.dm index 3a1bf7f413e..a14128e0bdd 100644 --- a/code/game/objects/items/implants/implant_exile.dm +++ b/code/game/objects/items/implants/implant_exile.dm @@ -29,7 +29,7 @@ if(!. || !isliving(target)) return FALSE var/mob/living/living_target = target - ADD_TRAIT(living_target, TRAIT_NO_TELEPORT, "implant") + ADD_TRAIT(living_target, TRAIT_NO_TELEPORT, IMPLANT_TRAIT) return TRUE /obj/item/implant/exile/noteleport/removed(mob/target, silent = FALSE, special = FALSE) @@ -37,7 +37,7 @@ if(!. || !isliving(target)) return FALSE var/mob/living/living_target = target - REMOVE_TRAIT(living_target, TRAIT_NO_TELEPORT, "implant") + REMOVE_TRAIT(living_target, TRAIT_NO_TELEPORT, IMPLANT_TRAIT) return TRUE /obj/item/implanter/exile diff --git a/code/game/objects/items/implants/implant_mindshield.dm b/code/game/objects/items/implants/implant_mindshield.dm index 163940267c0..c42a037686c 100644 --- a/code/game/objects/items/implants/implant_mindshield.dm +++ b/code/game/objects/items/implants/implant_mindshield.dm @@ -19,7 +19,7 @@ /obj/item/implant/mindshield/implant(mob/living/target, mob/user, silent = FALSE, force = FALSE) if(..()) if(!target.mind) - ADD_TRAIT(target, TRAIT_MINDSHIELD, "implant") + ADD_TRAIT(target, TRAIT_MINDSHIELD, IMPLANT_TRAIT) target.sec_hud_set_implants() return TRUE var/deconverted = FALSE @@ -43,7 +43,7 @@ to_chat(target, "You feel something interfering with your mental conditioning, but you resist it!") else to_chat(target, "You feel a sense of peace and security. You are now protected from brainwashing.") - ADD_TRAIT(target, TRAIT_MINDSHIELD, "implant") + ADD_TRAIT(target, TRAIT_MINDSHIELD, IMPLANT_TRAIT) target.sec_hud_set_implants() if(deconverted) if(prob(1) || SSevents.holidays && SSevents.holidays[APRIL_FOOLS]) @@ -55,7 +55,7 @@ if(..()) if(isliving(target)) var/mob/living/L = target - REMOVE_TRAIT(L, TRAIT_MINDSHIELD, "implant") + REMOVE_TRAIT(L, TRAIT_MINDSHIELD, IMPLANT_TRAIT) L.sec_hud_set_implants() if(target.stat != DEAD && !silent) to_chat(target, "Your mind suddenly feels terribly vulnerable. You are no longer safe from brainwashing.") diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm index 31b5d6cbd8a..73ca14769a4 100644 --- a/code/game/objects/items/stunbaton.dm +++ b/code/game/objects/items/stunbaton.dm @@ -257,8 +257,8 @@ attack_cooldown_check = world.time + attack_cooldown /* SKYRAT EDIT REMOVAL - ADD_TRAIT(L, TRAIT_IWASBATONED, user) - addtimer(TRAIT_CALLBACK_REMOVE(L, TRAIT_IWASBATONED, user), attack_cooldown) + ADD_TRAIT(L, TRAIT_IWASBATONED, STATUS_EFFECT_TRAIT) + addtimer(TRAIT_CALLBACK_REMOVE(L, TRAIT_IWASBATONED, STATUS_EFFECT_TRAIT), attack_cooldown) */ return 1 diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index bc3cb60dd97..4cd47e4f296 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -109,7 +109,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/claymore/highlander/Initialize() . = ..() - ADD_TRAIT(src, TRAIT_NODROP, HIGHLANDER) + ADD_TRAIT(src, TRAIT_NODROP, HIGHLANDER_TRAIT) START_PROCESSING(SSobj, src) /obj/item/claymore/highlander/Destroy() @@ -124,7 +124,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 if(ishuman(loc)) var/mob/living/carbon/human/H = loc loc.layer = LARGE_MOB_LAYER //NO HIDING BEHIND PLANTS FOR YOU, DICKWEED (HA GET IT, BECAUSE WEEDS ARE PLANTS) - ADD_TRAIT(H, TRAIT_NOBLEED, HIGHLANDER) //AND WE WON'T BLEED OUT LIKE COWARDS + ADD_TRAIT(H, TRAIT_NOBLEED, HIGHLANDER_TRAIT) //AND WE WON'T BLEED OUT LIKE COWARDS else if(!(flags_1 & ADMIN_SPAWNED_1)) qdel(src) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 18320ae6f64..e515a50ce46 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -237,9 +237,9 @@ to_chat(user, "You feel your life being drained by the pendant...") if(do_after(user, 40, target = user)) to_chat(user, "Your lifeforce is now linked to the pendant! You feel like removing it would kill you, and yet you instinctively know that until then, you won't die.") - ADD_TRAIT(user, TRAIT_NODEATH, "memento_mori") - ADD_TRAIT(user, TRAIT_NOHARDCRIT, "memento_mori") - ADD_TRAIT(user, TRAIT_NOCRITDAMAGE, "memento_mori") + ADD_TRAIT(user, TRAIT_NODEATH, CLOTHING_TRAIT) + ADD_TRAIT(user, TRAIT_NOHARDCRIT, CLOTHING_TRAIT) + ADD_TRAIT(user, TRAIT_NOCRITDAMAGE, CLOTHING_TRAIT) icon_state = "memento_mori_active" active_owner = user diff --git a/code/modules/surgery/advanced/bioware/cortex_folding.dm b/code/modules/surgery/advanced/bioware/cortex_folding.dm index f6e3b4e9784..f5d5cbede6a 100644 --- a/code/modules/surgery/advanced/bioware/cortex_folding.dm +++ b/code/modules/surgery/advanced/bioware/cortex_folding.dm @@ -53,8 +53,8 @@ /datum/bioware/cortex_fold/on_gain() . = ..() - ADD_TRAIT(owner, TRAIT_SPECIAL_TRAUMA_BOOST, "cortex_fold") + ADD_TRAIT(owner, TRAIT_SPECIAL_TRAUMA_BOOST, EXPERIMENTAL_SURGERY_TRAIT) /datum/bioware/cortex_fold/on_lose() - REMOVE_TRAIT(owner, TRAIT_SPECIAL_TRAUMA_BOOST, "cortex_fold") + REMOVE_TRAIT(owner, TRAIT_SPECIAL_TRAUMA_BOOST, EXPERIMENTAL_SURGERY_TRAIT) return ..() diff --git a/code/modules/surgery/advanced/bioware/ligament_hook.dm b/code/modules/surgery/advanced/bioware/ligament_hook.dm index 0549736243a..10b3b508a43 100644 --- a/code/modules/surgery/advanced/bioware/ligament_hook.dm +++ b/code/modules/surgery/advanced/bioware/ligament_hook.dm @@ -36,10 +36,10 @@ /datum/bioware/hooked_ligaments/on_gain() ..() - ADD_TRAIT(owner, TRAIT_LIMBATTACHMENT, "ligament_hook") - ADD_TRAIT(owner, TRAIT_EASYDISMEMBER, "ligament_hook") + ADD_TRAIT(owner, TRAIT_LIMBATTACHMENT, EXPERIMENTAL_SURGERY_TRAIT) + ADD_TRAIT(owner, TRAIT_EASYDISMEMBER, EXPERIMENTAL_SURGERY_TRAIT) /datum/bioware/hooked_ligaments/on_lose() ..() - REMOVE_TRAIT(owner, TRAIT_LIMBATTACHMENT, "ligament_hook") - REMOVE_TRAIT(owner, TRAIT_EASYDISMEMBER, "ligament_hook") + REMOVE_TRAIT(owner, TRAIT_LIMBATTACHMENT, EXPERIMENTAL_SURGERY_TRAIT) + REMOVE_TRAIT(owner, TRAIT_EASYDISMEMBER, EXPERIMENTAL_SURGERY_TRAIT) diff --git a/code/modules/surgery/advanced/bioware/ligament_reinforcement.dm b/code/modules/surgery/advanced/bioware/ligament_reinforcement.dm index d4ada121625..59e4eaa2a39 100644 --- a/code/modules/surgery/advanced/bioware/ligament_reinforcement.dm +++ b/code/modules/surgery/advanced/bioware/ligament_reinforcement.dm @@ -36,10 +36,10 @@ /datum/bioware/reinforced_ligaments/on_gain() ..() - ADD_TRAIT(owner, TRAIT_NODISMEMBER, "reinforced_ligaments") - ADD_TRAIT(owner, TRAIT_EASILY_WOUNDED, "reinforced_ligaments") + ADD_TRAIT(owner, TRAIT_NODISMEMBER, EXPERIMENTAL_SURGERY_TRAIT) + ADD_TRAIT(owner, TRAIT_EASILY_WOUNDED, EXPERIMENTAL_SURGERY_TRAIT) /datum/bioware/reinforced_ligaments/on_lose() ..() - REMOVE_TRAIT(owner, TRAIT_NODISMEMBER, "reinforced_ligaments") - REMOVE_TRAIT(owner, TRAIT_EASILY_WOUNDED, "reinforced_ligaments") + REMOVE_TRAIT(owner, TRAIT_NODISMEMBER, EXPERIMENTAL_SURGERY_TRAIT) + REMOVE_TRAIT(owner, TRAIT_EASILY_WOUNDED, EXPERIMENTAL_SURGERY_TRAIT) diff --git a/code/modules/surgery/advanced/bioware/muscled_veins.dm b/code/modules/surgery/advanced/bioware/muscled_veins.dm index adfa949dc55..cf4756b8512 100644 --- a/code/modules/surgery/advanced/bioware/muscled_veins.dm +++ b/code/modules/surgery/advanced/bioware/muscled_veins.dm @@ -35,8 +35,8 @@ /datum/bioware/muscled_veins/on_gain() ..() - ADD_TRAIT(owner, TRAIT_STABLEHEART, "muscled_veins") + ADD_TRAIT(owner, TRAIT_STABLEHEART, EXPERIMENTAL_SURGERY_TRAIT) /datum/bioware/muscled_veins/on_lose() ..() - REMOVE_TRAIT(owner, TRAIT_STABLEHEART, "muscled_veins") + REMOVE_TRAIT(owner, TRAIT_STABLEHEART, EXPERIMENTAL_SURGERY_TRAIT) diff --git a/code/modules/surgery/advanced/bioware/nerve_grounding.dm b/code/modules/surgery/advanced/bioware/nerve_grounding.dm index 793b9feb7b3..4bbc0d23ffe 100644 --- a/code/modules/surgery/advanced/bioware/nerve_grounding.dm +++ b/code/modules/surgery/advanced/bioware/nerve_grounding.dm @@ -35,8 +35,8 @@ /datum/bioware/grounded_nerves/on_gain() ..() - ADD_TRAIT(owner, TRAIT_SHOCKIMMUNE, "grounded_nerves") + ADD_TRAIT(owner, TRAIT_SHOCKIMMUNE, EXPERIMENTAL_SURGERY_TRAIT) /datum/bioware/grounded_nerves/on_lose() ..() - REMOVE_TRAIT(owner, TRAIT_SHOCKIMMUNE, "grounded_nerves") + REMOVE_TRAIT(owner, TRAIT_SHOCKIMMUNE, EXPERIMENTAL_SURGERY_TRAIT) diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm index a4e9a3babc9..2b418233280 100644 --- a/code/modules/surgery/organs/augments_internal.dm +++ b/code/modules/surgery/organs/augments_internal.dm @@ -61,7 +61,7 @@ else for(var/obj/item/I in stored_items) to_chat(owner, "Your [owner.get_held_index_name(owner.get_held_index_of_item(I))]'s grip tightens.") - ADD_TRAIT(I, TRAIT_NODROP, ANTI_DROP_IMPLANT_TRAIT) + ADD_TRAIT(I, TRAIT_NODROP, IMPLANT_TRAIT) else release_items() @@ -85,7 +85,7 @@ /obj/item/organ/cyberimp/brain/anti_drop/proc/release_items() for(var/obj/item/I in stored_items) - REMOVE_TRAIT(I, TRAIT_NODROP, ANTI_DROP_IMPLANT_TRAIT) + REMOVE_TRAIT(I, TRAIT_NODROP, IMPLANT_TRAIT) stored_items = list() diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index 16b2f3fd2cd..f7f243c3320 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -444,8 +444,8 @@ M.verb_whisper = "subtly signs" M.verb_sing = "rythmically signs" M.verb_yell = "emphatically signs" - ADD_TRAIT(M, TRAIT_SIGN_LANG, "tongue") - REMOVE_TRAIT(M, TRAIT_MUTE, "tongue") + ADD_TRAIT(M, TRAIT_SIGN_LANG, ORGAN_TRAIT) + REMOVE_TRAIT(M, TRAIT_MUTE, ORGAN_TRAIT) /obj/item/organ/tongue/tied/Remove(mob/living/carbon/M, special = 0) ..() @@ -454,7 +454,7 @@ M.verb_whisper = initial(verb_whisper) M.verb_sing = initial(verb_sing) M.verb_yell = initial(verb_yell) - REMOVE_TRAIT(M, TRAIT_SIGN_LANG, "tongue") //People who are Ahealed get "cured" of their sign language-having ways. If I knew how to make the tied tongue persist through aheals, I'd do that. + REMOVE_TRAIT(M, TRAIT_SIGN_LANG, ORGAN_TRAIT) //People who are Ahealed get "cured" of their sign language-having ways. If I knew how to make the tied tongue persist through aheals, I'd do that. //Thank you Jwapplephobia for helping me with the literal hellcode below