cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 12:35:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Hooch no longer heals assistants. (#64693)

Browse Source
This commit is contained in:
Iamgoofball
2022-02-08 03:59:45 -08:00
committed by GitHub
parent a04f65a802
commit dd24ca37cd
5 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/traits.dm
-1
View File
@@ -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"
code/modules/jobs/job_types/assistant.dm
-2
View File
@@ -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
code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
-7
View File
@@ -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."
code/modules/reagents/withdrawal/generic_addictions.dm
-5
View File
@@ -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")
code/modules/surgery/organs/liver.dm
-2
View File
@@ -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 <em>clown</em>."
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 <em>medical worker</em>."
if(HAS_TRAIT(src, TRAIT_GREYTIDE_METABOLISM))
. += "Greyer than most with electrical burn marks, this is the liver of an <em>assistant</em>."
if(HAS_TRAIT(src, TRAIT_ENGINEER_METABOLISM))
. += "Signs of radiation exposure and space adaption, implies that this is the liver of an <em>engineer</em>."