diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 275b6fdbcdc..83a6f99e1d0 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -404,7 +404,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_CULINARY_METABOLISM "culinary_metabolism" #define TRAIT_COMEDY_METABOLISM "comedy_metabolism" #define TRAIT_MEDICAL_METABOLISM "medical_metabolism" -#define TRAIT_GREYTIDE_METABOLISM "greytide_metabolism" #define TRAIT_ENGINEER_METABOLISM "engineer_metabolism" #define TRAIT_ROYAL_METABOLISM "royal_metabolism" #define TRAIT_PRETENDER_ROYAL_METABOLISM "pretender_royal_metabolism" diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm index a535c9ab57c..e96fb069a54 100644 --- a/code/modules/jobs/job_types/assistant.dm +++ b/code/modules/jobs/job_types/assistant.dm @@ -16,8 +16,6 @@ Assistant plasmaman_outfit = /datum/outfit/plasmaman paycheck = PAYCHECK_ASSISTANT // Get a job. Job reassignment changes your paycheck now. Get over it. - liver_traits = list(TRAIT_GREYTIDE_METABOLISM) - paycheck_department = ACCOUNT_CIV display_order = JOB_DISPLAY_ORDER_ASSISTANT diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 831b33c05b0..8c40a1f272d 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -481,13 +481,6 @@ All effects don't start immediately, but rather get worse over time; the rate is addiction_types = list(/datum/addiction/alcohol = 5, /datum/addiction/maintenance_drugs = 2) chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/hooch/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) - var/obj/item/organ/liver/liver = drinker.getorganslot(ORGAN_SLOT_LIVER) - if(liver && HAS_TRAIT(liver, TRAIT_GREYTIDE_METABOLISM)) - drinker.heal_bodypart_damage(1 * REM * delta_time, 1 * REM * delta_time) - . = TRUE - return ..() || . - /datum/reagent/consumable/ethanol/ale name = "Ale" description = "A dark alcoholic beverage made with malted barley and yeast." diff --git a/code/modules/reagents/withdrawal/generic_addictions.dm b/code/modules/reagents/withdrawal/generic_addictions.dm index 0ae6563e0fc..3c2e6656192 100644 --- a/code/modules/reagents/withdrawal/generic_addictions.dm +++ b/code/modules/reagents/withdrawal/generic_addictions.dm @@ -124,11 +124,6 @@ return to_chat(affected_carbon, span_warning("You feel yourself adapt to the darkness.")) var/mob/living/carbon/human/affected_human = affected_carbon - - var/obj/item/organ/liver/empowered_liver = affected_carbon.getorgan(/obj/item/organ/liver) - if(empowered_liver) - ADD_TRAIT(empowered_liver, TRAIT_GREYTIDE_METABOLISM, "maint_drug_addiction") - var/obj/item/organ/eyes/empowered_eyes = affected_human.getorgan(/obj/item/organ/eyes) if(empowered_eyes) ADD_TRAIT(affected_human, TRAIT_NIGHT_VISION, "maint_drug_addiction") diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm index 572a89aa338..0571234f68b 100755 --- a/code/modules/surgery/organs/liver.dm +++ b/code/modules/surgery/organs/liver.dm @@ -58,8 +58,6 @@ . += "A smell of bananas, a slippery sheen and [span_clown("honking")] when depressed, implies that this is the liver of a clown." if(HAS_TRAIT(src, TRAIT_MEDICAL_METABOLISM)) . += "Marks of stress and a faint whiff of medicinal alcohol, imply that this is the liver of a medical worker." - if(HAS_TRAIT(src, TRAIT_GREYTIDE_METABOLISM)) - . += "Greyer than most with electrical burn marks, this is the liver of an assistant." if(HAS_TRAIT(src, TRAIT_ENGINEER_METABOLISM)) . += "Signs of radiation exposure and space adaption, implies that this is the liver of an engineer."