Skip to content

Commit

Permalink
Removes Lick Healing & Special Tongues (not abductors just in case) (#82
Browse files Browse the repository at this point in the history
)
  • Loading branch information
Aurrain authored Apr 4, 2024
1 parent 7a4c544 commit a2b00ca
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 0 deletions.
2 changes: 2 additions & 0 deletions code/__DEFINES/traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -334,9 +334,11 @@
#define TRAIT_EXPLOSIVE_CRAFTING "explosive_crafting" //can craft explosives and bombs
#define TRAIT_ADVANCED_EXPLOSIVE_CRAFTING "advanced explosive crafting" //can craft almost all kinds of explosives
/// Lets your tongue heal damage on limbs
/*
#define TRAIT_HEAL_TONGUE "healing tongue"
/// Lets your tongue apply awful bandages to limbs
#define TRAIT_BANDAGE_TONGUE "coagulating tongue"
*/
/// You're hooked on punga!
#define TRAIT_PUNGAPOWER "pungaful"

Expand Down
6 changes: 6 additions & 0 deletions code/__DEFINES/wounds.dm
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,9 @@ GLOBAL_LIST_INIT(global_all_wound_types, list(
#define WOUND_BLEED_LYING_DOWN_MULTIPLIER 0.50

/// Max time cat spit will stay on someone before falling off
/*
#define LICK_MAX_DURATION 5 MINUTES
*/
/// Max time an improvised bandage will stay on someone before falling off
#define BANDAGE_POOR_MAX_DURATION 10 MINUTES
/// Max time a normal bandage will stay on someone before falling off
Expand Down Expand Up @@ -182,7 +184,9 @@ GLOBAL_LIST_INIT(global_all_wound_types, list(
#define WOUND_BLEED_BANDAGE_MULTIPLIER 0.05

/// Multiplier for bleeding if the wound has a lick on it
/*
#define WOUND_BLEED_LICK_MULTIPLIER 0.35
*/

/// Multiplier for bleeding if the wound has enough sutures on it
#define WOUND_BLEED_SUTURE_MULTIPLIER 0 // no blood!
Expand Down Expand Up @@ -345,7 +349,9 @@ GLOBAL_LIST_INIT(global_all_wound_types, list(
#define BANDAGE_BEST_WOUND_CLOSURE (BANDAGE_BASE_WOUND_CLOSURE * 3)

/// Base amount cat spit assist wound closure
/*
#define LICK_BASE_WOUND_CLOSURE (BANDAGE_BASE_WOUND_CLOSURE * 0.20)
*/

/// max amount of bleed_dam that bandages are able to fix
#define BANDAGE_BASE_WOUND_MAX (WOUND_BLEED_MODERATE_THRESHOLD)
Expand Down
2 changes: 2 additions & 0 deletions code/datums/traits/good.dm
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,7 @@ GLOBAL_LIST_INIT(pa_repair, list(
H.mind.learned_recipes -= GLOB.basic_explosive_recipes
H.mind.learned_recipes -= GLOB.adv_explosive_recipes

/*
/datum/quirk/lick_heal
name = "Soothing Saliva"
desc = "Your saliva has a mild healing effect on burns and bruises. Use *lick to lick your injuries."
Expand Down Expand Up @@ -642,6 +643,7 @@ GLOBAL_LIST_INIT(pa_repair, list(
if(!our_tongue)
return //welp
QDEL_NULL(our_tongue.lick_bandage)
*/

// This does the same thing as basic explosive crafting by giving basic_recipe and adv_recipe. -Possum
/*
Expand Down
4 changes: 4 additions & 0 deletions code/game/objects/items/stacks/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,7 @@
grind_results = list(/datum/reagent/medicine/styptic_powder = 10, /datum/reagent/medicine/silver_sulfadiazine = 10)
merge_type = /obj/item/stack/medical/bruise_pack

/*
/obj/item/stack/medical/bruise_pack/lick
name = "healing saliva"
singular_name = "healing saliva"
Expand Down Expand Up @@ -422,6 +423,7 @@
user.visible_message(
span_green("[user] lick [target]'s [target_part]!"),
span_green("You lick [user == target ? "your" : "[target]'s"] [target_part]!"))
*/

/obj/item/stack/medical/bruise_pack/one
amount = 1
Expand Down Expand Up @@ -557,6 +559,7 @@
merge_type = /obj/item/stack/medical/gauze/cyborg

/// ...
/*
/obj/item/stack/medical/gauze/lick
name = "coagulating saliva"
desc = "A fresh coating of somehow medicinal saliva, good for slowing the blood flow on a wound. Not the best of treatments, but somehow better than nothing."
Expand All @@ -582,6 +585,7 @@
custom_price = PRICE_REALLY_CHEAP
grind_results = null
merge_type = /obj/item/stack/medical/gauze/lick
*/

/* * * * * *
* SUTURES
Expand Down
6 changes: 6 additions & 0 deletions code/modules/surgery/organs/tongue.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
))
healing_factor = STANDARD_ORGAN_HEALING*5 //Fast!!
decay_factor = STANDARD_ORGAN_DECAY/2
/*
/// How much licking someone should heal someone
var/lick_heal_brute
/// How much licking someone should heal someone
Expand All @@ -38,6 +39,7 @@
var/obj/item/stack/medical/gauze/lick_bandage
/// What kind of healpack is applied by licking someone
var/obj/item/stack/medical/bruise_pack/lick_healer
*/

/obj/item/organ/tongue/Initialize(mapload)
. = ..()
Expand All @@ -50,6 +52,7 @@
now_failing = span_warning("Your [name] feels like it's about to fall out!.")
now_fixed = span_info("The excruciating pain of your [name] has subsided.")
languages_possible = languages_possible_base
/*
if(lick_bandage) // ew
initialize_bandage(lick_bandage)
if(lick_healer) // ew
Expand All @@ -75,6 +78,7 @@
return FALSE
lick_healer = new lick_pack(src)
return TRUE
*/

/obj/item/organ/tongue/proc/handle_speech(datum/source, list/speech_args) //this wont proc unless there's initial_accents on the tongue
for(var/datum/accent/speech_modifier in accents)
Expand Down Expand Up @@ -106,6 +110,7 @@
/obj/item/organ/tongue/could_speak_language(language)
return is_type_in_typecache(language, languages_possible)

/*
/obj/item/organ/tongue/lizard
name = "forked tongue"
desc = "A thin and long muscle typically found in reptilian races, apparently moonlights as a nose."
Expand Down Expand Up @@ -141,6 +146,7 @@
taste_sensitivity = 25 // you eat vomit, this is a mercy
maxHealth = 80 //years of eatting trash has made your tongue strong
initial_accents = list(/datum/accent/fly)
*/

/obj/item/organ/tongue/abductor
name = "superlingual matrix"
Expand Down

0 comments on commit a2b00ca

Please sign in to comment.