Skip to content

Commit

Permalink
cleanup disabled quirks
Browse files Browse the repository at this point in the history
  • Loading branch information
Sorenon committed Oct 28, 2024
1 parent cd68f9a commit b75506a
Show file tree
Hide file tree
Showing 8 changed files with 308 additions and 300 deletions.
31 changes: 16 additions & 15 deletions code/datums/quirks/negative_quirks/chronic_illness.dm
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
// /datum/quirk/item_quirk/chronic_illness
// name = "Chronic Illness"
// desc = "You have a chronic illness that requires constant medication to keep under control."
// icon = FA_ICON_DISEASE
// value = -12
// gain_text = span_danger("You feel a bit off today.")
// lose_text = span_notice("You feel a bit better today.")
// medical_record_text = "Patient has a chronic illness that requires constant medication to keep under control."
// hardcore_value = 12
// mail_goodies = list(/obj/item/storage/pill_bottle/sansufentanyl)
/* /datum/quirk/item_quirk/chronic_illness - monkestation disabled for now
name = "Chronic Illness"
desc = "You have a chronic illness that requires constant medication to keep under control."
icon = FA_ICON_DISEASE
value = -12
gain_text = span_danger("You feel a bit off today.")
lose_text = span_notice("You feel a bit better today.")
medical_record_text = "Patient has a chronic illness that requires constant medication to keep under control."
hardcore_value = 12
mail_goodies = list(/obj/item/storage/pill_bottle/sansufentanyl)
// /datum/quirk/item_quirk/chronic_illness/add_unique(client/client_source)
// var/datum/disease/chronic_illness/hms = new /datum/disease/chronic_illness()
// quirk_holder.ForceContractDisease(hms)
// give_item_to_holder(/obj/item/storage/pill_bottle/sansufentanyl, list(LOCATION_BACKPACK = ITEM_SLOT_BACKPACK),flavour_text = "You've been provided with medication to help manage your condition. Take it regularly to avoid complications.")
// give_item_to_holder(/obj/item/healthanalyzer/simple/disease, list(LOCATION_BACKPACK = ITEM_SLOT_BACKPACK))
/datum/quirk/item_quirk/chronic_illness/add_unique(client/client_source)
var/datum/disease/chronic_illness/hms = new /datum/disease/chronic_illness()
quirk_holder.ForceContractDisease(hms)
give_item_to_holder(/obj/item/storage/pill_bottle/sansufentanyl, list(LOCATION_BACKPACK = ITEM_SLOT_BACKPACK),flavour_text = "You've been provided with medication to help manage your condition. Take it regularly to avoid complications.")
give_item_to_holder(/obj/item/healthanalyzer/simple/disease, list(LOCATION_BACKPACK = ITEM_SLOT_BACKPACK))
*/
41 changes: 21 additions & 20 deletions code/datums/quirks/negative_quirks/hemiplegic.dm
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
// /datum/quirk/hemiplegic
// name = "Hemiplegic"
// desc = "Half of your body doesn't work. Nothing will ever fix this."
// icon = FA_ICON_CIRCLE_HALF_STROKE
// value = -10 // slightly more bearable than paraplegic but not by much
// gain_text = null // Handled by trauma.
// lose_text = null
// medical_record_text = "Patient has an untreatable impairment in motor function on half of their body."
// hardcore_value = 10
// mail_goodies = list(
// /obj/item/stack/sheet/mineral/uranium/half, //half a stack of a material that has a half life
// /obj/item/reagent_containers/cup/glass/drinkingglass/filled/half_full,
// )
/* /datum/quirk/hemiplegic - monkestation disabled for now
name = "Hemiplegic"
desc = "Half of your body doesn't work. Nothing will ever fix this."
icon = FA_ICON_CIRCLE_HALF_STROKE
value = -10 // slightly more bearable than paraplegic but not by much
gain_text = null // Handled by trauma.
lose_text = null
medical_record_text = "Patient has an untreatable impairment in motor function on half of their body."
hardcore_value = 10
mail_goodies = list(
/obj/item/stack/sheet/mineral/uranium/half, //half a stack of a material that has a half life
/obj/item/reagent_containers/cup/glass/drinkingglass/filled/half_full,
)
// /datum/quirk/hemiplegic/add(client/client_source)
// var/mob/living/carbon/human/human_holder = quirk_holder
// var/trauma_type = pick(/datum/brain_trauma/severe/paralysis/hemiplegic/left, /datum/brain_trauma/severe/paralysis/hemiplegic/right)
// human_holder.gain_trauma(trauma_type, TRAUMA_RESILIENCE_ABSOLUTE)
/datum/quirk/hemiplegic/add(client/client_source)
var/mob/living/carbon/human/human_holder = quirk_holder
var/trauma_type = pick(/datum/brain_trauma/severe/paralysis/hemiplegic/left, /datum/brain_trauma/severe/paralysis/hemiplegic/right)
human_holder.gain_trauma(trauma_type, TRAUMA_RESILIENCE_ABSOLUTE)
// /datum/quirk/hemiplegic/remove()
// var/mob/living/carbon/human/human_holder = quirk_holder
// human_holder.cure_trauma_type(/datum/brain_trauma/severe/paralysis/hemiplegic, TRAUMA_RESILIENCE_ABSOLUTE)
/datum/quirk/hemiplegic/remove()
var/mob/living/carbon/human/human_holder = quirk_holder
human_holder.cure_trauma_type(/datum/brain_trauma/severe/paralysis/hemiplegic, TRAUMA_RESILIENCE_ABSOLUTE)
*/
135 changes: 68 additions & 67 deletions code/datums/quirks/negative_quirks/junkie.dm
Original file line number Diff line number Diff line change
Expand Up @@ -147,70 +147,71 @@
else
quirk_holder.add_mood_event("wrong_cigs", /datum/mood_event/wrong_brand)

// /datum/quirk/item_quirk/junkie/alcoholic
// name = "Alcoholic"
// desc = "You just can't live without alcohol. Your liver is a machine that turns ethanol into acetaldehyde."
// icon = FA_ICON_WINE_GLASS
// value = -4
// gain_text = span_danger("You really need a drink.")
// lose_text = span_notice("Alcohol doesn't seem nearly as enticing anymore.")
// medical_record_text = "Patient is an alcoholic."
// reagent_type = /datum/reagent/consumable/ethanol
// drug_container_type = /obj/item/reagent_containers/cup/glass/bottle/whiskey
// mob_trait = TRAIT_HEAVY_DRINKER
// hardcore_value = 1
// drug_flavour_text = "Make sure you get your favorite type of drink when you run out."
// mail_goodies = list(
// /obj/effect/spawner/random/food_or_drink/booze,
// /obj/item/book/bible/booze,
// )
// /// Cached typepath of the owner's favorite alcohol reagent
// var/datum/reagent/consumable/ethanol/favorite_alcohol

// /datum/quirk/item_quirk/junkie/alcoholic/New()
// drug_container_type = pick(
// /obj/item/reagent_containers/cup/glass/bottle/whiskey,
// /obj/item/reagent_containers/cup/glass/bottle/vodka,
// /obj/item/reagent_containers/cup/glass/bottle/ale,
// /obj/item/reagent_containers/cup/glass/bottle/beer,
// /obj/item/reagent_containers/cup/glass/bottle/hcider,
// /obj/item/reagent_containers/cup/glass/bottle/wine,
// /obj/item/reagent_containers/cup/glass/bottle/sake,
// )

// return ..()

// /datum/quirk/item_quirk/junkie/alcoholic/post_add()
// . = ..()
// RegisterSignal(quirk_holder, COMSIG_MOB_REAGENT_CHECK, PROC_REF(check_brandy))

// var/obj/item/reagent_containers/brandy_container = GLOB.alcohol_containers[drug_container_type]
// if(isnull(brandy_container))
// stack_trace("Alcoholic quirk added while the GLOB.alcohol_containers is (somehow) not initialized!")
// brandy_container = new drug_container_type
// favorite_alcohol = brandy_container.list_reagents[1]
// qdel(brandy_container)
// else
// favorite_alcohol = brandy_container.list_reagents[1]

// quirk_holder.add_mob_memory(/datum/memory/key/quirk_alcoholic, protagonist = quirk_holder, preferred_brandy = initial(favorite_alcohol.name))
// // alcoholic livers have 25% less health and healing
// var/obj/item/organ/internal/liver/alcohol_liver = quirk_holder.get_organ_slot(ORGAN_SLOT_LIVER)
// if(alcohol_liver && IS_ORGANIC_ORGAN(alcohol_liver)) // robotic livers aren't affected
// alcohol_liver.maxHealth = alcohol_liver.maxHealth * 0.75
// alcohol_liver.healing_factor = alcohol_liver.healing_factor * 0.75

// /datum/quirk/item_quirk/junkie/alcoholic/remove()
// UnregisterSignal(quirk_holder, COMSIG_MOB_REAGENT_CHECK)

// /datum/quirk/item_quirk/junkie/alcoholic/proc/check_brandy(mob/source, datum/reagent/booze)
// SIGNAL_HANDLER

// //we don't care if it is not alcohol
// if(!istype(booze, /datum/reagent/consumable/ethanol))
// return

// if(istype(booze, favorite_alcohol))
// quirk_holder.clear_mood_event("wrong_alcohol")
// else
// quirk_holder.add_mood_event("wrong_alcohol", /datum/mood_event/wrong_brandy)
/* /datum/quirk/item_quirk/junkie/alcoholic - monkestation disabled for now
name = "Alcoholic"
desc = "You just can't live without alcohol. Your liver is a machine that turns ethanol into acetaldehyde."
icon = FA_ICON_WINE_GLASS
value = -4
gain_text = span_danger("You really need a drink.")
lose_text = span_notice("Alcohol doesn't seem nearly as enticing anymore.")
medical_record_text = "Patient is an alcoholic."
reagent_type = /datum/reagent/consumable/ethanol
drug_container_type = /obj/item/reagent_containers/cup/glass/bottle/whiskey
mob_trait = TRAIT_HEAVY_DRINKER
hardcore_value = 1
drug_flavour_text = "Make sure you get your favorite type of drink when you run out."
mail_goodies = list(
/obj/effect/spawner/random/food_or_drink/booze,
/obj/item/book/bible/booze,
)
/// Cached typepath of the owner's favorite alcohol reagent
var/datum/reagent/consumable/ethanol/favorite_alcohol
/datum/quirk/item_quirk/junkie/alcoholic/New()
drug_container_type = pick(
/obj/item/reagent_containers/cup/glass/bottle/whiskey,
/obj/item/reagent_containers/cup/glass/bottle/vodka,
/obj/item/reagent_containers/cup/glass/bottle/ale,
/obj/item/reagent_containers/cup/glass/bottle/beer,
/obj/item/reagent_containers/cup/glass/bottle/hcider,
/obj/item/reagent_containers/cup/glass/bottle/wine,
/obj/item/reagent_containers/cup/glass/bottle/sake,
)
return ..()
/datum/quirk/item_quirk/junkie/alcoholic/post_add()
. = ..()
RegisterSignal(quirk_holder, COMSIG_MOB_REAGENT_CHECK, PROC_REF(check_brandy))
var/obj/item/reagent_containers/brandy_container = GLOB.alcohol_containers[drug_container_type]
if(isnull(brandy_container))
stack_trace("Alcoholic quirk added while the GLOB.alcohol_containers is (somehow) not initialized!")
brandy_container = new drug_container_type
favorite_alcohol = brandy_container.list_reagents[1]
qdel(brandy_container)
else
favorite_alcohol = brandy_container.list_reagents[1]
quirk_holder.add_mob_memory(/datum/memory/key/quirk_alcoholic, protagonist = quirk_holder, preferred_brandy = initial(favorite_alcohol.name))
// alcoholic livers have 25% less health and healing
var/obj/item/organ/internal/liver/alcohol_liver = quirk_holder.get_organ_slot(ORGAN_SLOT_LIVER)
if(alcohol_liver && IS_ORGANIC_ORGAN(alcohol_liver)) // robotic livers aren't affected
alcohol_liver.maxHealth = alcohol_liver.maxHealth * 0.75
alcohol_liver.healing_factor = alcohol_liver.healing_factor * 0.75
/datum/quirk/item_quirk/junkie/alcoholic/remove()
UnregisterSignal(quirk_holder, COMSIG_MOB_REAGENT_CHECK)
/datum/quirk/item_quirk/junkie/alcoholic/proc/check_brandy(mob/source, datum/reagent/booze)
SIGNAL_HANDLER
//we don't care if it is not alcohol
if(!istype(booze, /datum/reagent/consumable/ethanol))
return
if(istype(booze, favorite_alcohol))
quirk_holder.clear_mood_event("wrong_alcohol")
else
quirk_holder.add_mood_event("wrong_alcohol", /datum/mood_event/wrong_brandy)
*/
27 changes: 14 additions & 13 deletions code/datums/quirks/negative_quirks/numb.dm
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
// /datum/quirk/numb
// name = "Numb"
// desc = "You can't feel pain at all."
// icon = FA_ICON_STAR_OF_LIFE
// value = -4
// gain_text = "You feel your body becoming numb."
// lose_text = "The numbness subsides."
// medical_record_text = "The patient exhibits congenital hypoesthesia, making them insensitive to pain stimuli."
// hardcore_value = 4
/* /datum/quirk/numb - monkestation disabled for now
name = "Numb"
desc = "You can't feel pain at all."
icon = FA_ICON_STAR_OF_LIFE
value = -4
gain_text = "You feel your body becoming numb."
lose_text = "The numbness subsides."
medical_record_text = "The patient exhibits congenital hypoesthesia, making them insensitive to pain stimuli."
hardcore_value = 4
// /datum/quirk/numb/add(client/client_source)
// quirk_holder.apply_status_effect(/datum/status_effect/grouped/screwy_hud/fake_healthy, type)
/datum/quirk/numb/add(client/client_source)
quirk_holder.apply_status_effect(/datum/status_effect/grouped/screwy_hud/fake_healthy, type)
// /datum/quirk/numb/remove(client/client_source)
// quirk_holder.remove_status_effect(/datum/status_effect/grouped/screwy_hud/fake_healthy, type)
/datum/quirk/numb/remove(client/client_source)
quirk_holder.remove_status_effect(/datum/status_effect/grouped/screwy_hud/fake_healthy, type)
*/
121 changes: 61 additions & 60 deletions code/datums/quirks/negative_quirks/photophobia.dm
Original file line number Diff line number Diff line change
@@ -1,75 +1,76 @@
// #define MOOD_CATEGORY_PHOTOPHOBIA "photophobia"
/* #define MOOD_CATEGORY_PHOTOPHOBIA "photophobia" - monkestation disabled for now
// /datum/quirk/photophobia
// name = "Photophobia"
// desc = "Bright lights seem to bother you more than others. Maybe it's a medical condition."
// icon = FA_ICON_ARROWS_TO_EYE
// value = -4
// gain_text = span_danger("The safety of light feels off...")
// lose_text = span_notice("Enlightening.")
// medical_record_text = "Patient has acute phobia of light, and insists it is physically harmful."
// hardcore_value = 4
// mail_goodies = list(
// /obj/item/flashlight/flashdark,
// /obj/item/food/grown/mushroom/glowshroom/shadowshroom,
// /obj/item/skillchip/light_remover,
// )
/datum/quirk/photophobia
name = "Photophobia"
desc = "Bright lights seem to bother you more than others. Maybe it's a medical condition."
icon = FA_ICON_ARROWS_TO_EYE
value = -4
gain_text = span_danger("The safety of light feels off...")
lose_text = span_notice("Enlightening.")
medical_record_text = "Patient has acute phobia of light, and insists it is physically harmful."
hardcore_value = 4
mail_goodies = list(
/obj/item/flashlight/flashdark,
/obj/item/food/grown/mushroom/glowshroom/shadowshroom,
/obj/item/skillchip/light_remover,
)
// /datum/quirk/photophobia/add(client/client_source)
// RegisterSignal(quirk_holder, COMSIG_CARBON_GAIN_ORGAN, PROC_REF(check_eyes))
// RegisterSignal(quirk_holder, COMSIG_CARBON_LOSE_ORGAN, PROC_REF(restore_eyes))
// RegisterSignal(quirk_holder, COMSIG_MOVABLE_MOVED, PROC_REF(on_holder_moved))
// update_eyes(quirk_holder.get_organ_slot(ORGAN_SLOT_EYES))
/datum/quirk/photophobia/add(client/client_source)
RegisterSignal(quirk_holder, COMSIG_CARBON_GAIN_ORGAN, PROC_REF(check_eyes))
RegisterSignal(quirk_holder, COMSIG_CARBON_LOSE_ORGAN, PROC_REF(restore_eyes))
RegisterSignal(quirk_holder, COMSIG_MOVABLE_MOVED, PROC_REF(on_holder_moved))
update_eyes(quirk_holder.get_organ_slot(ORGAN_SLOT_EYES))
// /datum/quirk/photophobia/remove()
// UnregisterSignal(quirk_holder, list(
// COMSIG_CARBON_GAIN_ORGAN,
// COMSIG_CARBON_LOSE_ORGAN,
// COMSIG_MOVABLE_MOVED,))
// quirk_holder.clear_mood_event(MOOD_CATEGORY_PHOTOPHOBIA)
// var/obj/item/organ/internal/eyes/normal_eyes = quirk_holder.get_organ_slot(ORGAN_SLOT_EYES)
// if(istype(normal_eyes))
// normal_eyes.flash_protect = initial(normal_eyes.flash_protect)
/datum/quirk/photophobia/remove()
UnregisterSignal(quirk_holder, list(
COMSIG_CARBON_GAIN_ORGAN,
COMSIG_CARBON_LOSE_ORGAN,
COMSIG_MOVABLE_MOVED,))
quirk_holder.clear_mood_event(MOOD_CATEGORY_PHOTOPHOBIA)
var/obj/item/organ/internal/eyes/normal_eyes = quirk_holder.get_organ_slot(ORGAN_SLOT_EYES)
if(istype(normal_eyes))
normal_eyes.flash_protect = initial(normal_eyes.flash_protect)
// /datum/quirk/photophobia/proc/check_eyes(obj/item/organ/internal/eyes/sensitive_eyes)
// SIGNAL_HANDLER
// if(!istype(sensitive_eyes))
// return
// update_eyes(sensitive_eyes)
/datum/quirk/photophobia/proc/check_eyes(obj/item/organ/internal/eyes/sensitive_eyes)
SIGNAL_HANDLER
if(!istype(sensitive_eyes))
return
update_eyes(sensitive_eyes)
// /datum/quirk/photophobia/proc/update_eyes(obj/item/organ/internal/eyes/target_eyes)
// if(!istype(target_eyes))
// return
// target_eyes.flash_protect = max(target_eyes.flash_protect - 1, FLASH_PROTECTION_HYPER_SENSITIVE)
/datum/quirk/photophobia/proc/update_eyes(obj/item/organ/internal/eyes/target_eyes)
if(!istype(target_eyes))
return
target_eyes.flash_protect = max(target_eyes.flash_protect - 1, FLASH_PROTECTION_HYPER_SENSITIVE)
// /datum/quirk/photophobia/proc/restore_eyes(obj/item/organ/internal/eyes/normal_eyes)
// SIGNAL_HANDLER
// if(!istype(normal_eyes))
// return
// normal_eyes.flash_protect = initial(normal_eyes.flash_protect)
/datum/quirk/photophobia/proc/restore_eyes(obj/item/organ/internal/eyes/normal_eyes)
SIGNAL_HANDLER
if(!istype(normal_eyes))
return
normal_eyes.flash_protect = initial(normal_eyes.flash_protect)
// /datum/quirk/photophobia/proc/on_holder_moved(mob/living/source, atom/old_loc, dir, forced)
// SIGNAL_HANDLER
/datum/quirk/photophobia/proc/on_holder_moved(mob/living/source, atom/old_loc, dir, forced)
SIGNAL_HANDLER
// if(quirk_holder.stat != CONSCIOUS || quirk_holder.IsSleeping() || quirk_holder.IsUnconscious())
// return
if(quirk_holder.stat != CONSCIOUS || quirk_holder.IsSleeping() || quirk_holder.IsUnconscious())
return
// if(HAS_TRAIT(quirk_holder, TRAIT_FEARLESS))
// return
if(HAS_TRAIT(quirk_holder, TRAIT_FEARLESS))
return
// var/mob/living/carbon/human/human_holder = quirk_holder
var/mob/living/carbon/human/human_holder = quirk_holder
// if(human_holder.sight & SEE_TURFS)
// return
if(human_holder.sight & SEE_TURFS)
return
// var/turf/holder_turf = get_turf(quirk_holder)
var/turf/holder_turf = get_turf(quirk_holder)
// var/lums = holder_turf.get_lumcount()
var/lums = holder_turf.get_lumcount()
// var/eye_protection = quirk_holder.get_eye_protection()
// if(lums < LIGHTING_TILE_IS_DARK || eye_protection >= FLASH_PROTECTION_NONE)
// quirk_holder.clear_mood_event(MOOD_CATEGORY_PHOTOPHOBIA)
// return
// quirk_holder.add_mood_event(MOOD_CATEGORY_PHOTOPHOBIA, /datum/mood_event/photophobia)
var/eye_protection = quirk_holder.get_eye_protection()
if(lums < LIGHTING_TILE_IS_DARK || eye_protection >= FLASH_PROTECTION_NONE)
quirk_holder.clear_mood_event(MOOD_CATEGORY_PHOTOPHOBIA)
return
quirk_holder.add_mood_event(MOOD_CATEGORY_PHOTOPHOBIA, /datum/mood_event/photophobia)
// #undef MOOD_CATEGORY_PHOTOPHOBIA
#undef MOOD_CATEGORY_PHOTOPHOBIA
*/
Loading

0 comments on commit b75506a

Please sign in to comment.