From ae35366e97a31ae10770e93a5afd8b436ba22510 Mon Sep 17 00:00:00 2001 From: Fermi Date: Wed, 29 May 2019 05:41:12 +0100 Subject: [PATCH] Some fixes before bed. --- code/datums/traits/good.dm | 4 ++-- code/datums/traits/negative.dm | 6 +++--- code/game/objects/effects/effect_system/effects_smoke.dm | 2 +- code/modules/mob/living/taste.dm | 8 ++++---- code/modules/reagents/chemistry/holder.dm | 1 - modular_citadel/code/datums/status_effects/chems.dm | 6 ++---- 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm index 8a7d179172..c023a4f180 100644 --- a/code/datums/traits/good.dm +++ b/code/datums/traits/good.dm @@ -170,7 +170,7 @@ H.equip_to_slot(gloweyes, SLOT_IN_BACKPACK) H.regenerate_icons() -/datum/quirk/BloodPressure +/datum/quirk/bloodpressure name = "Synthetic blood" desc = "You've got a new form of synthetic blood that increases the total blood volume inside of you as well as the rate of replenishment!" value = 1 //I honeslty dunno if this is a good trait? I just means you use more of medbays blood and make janitors madder, but you also regen blood a lil faster. @@ -178,7 +178,7 @@ gain_text = "You feel full of blood!" lose_text = "You feel like your blood pressure went down." -/datum/quirk/BloodPressure/add() +/datum/quirk/bloodpressure/add() var/mob/living/M = quirk_holder M.blood_ratio = 1.2 M.blood_volume += 150 diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 6c30a8aa3c..95595ef713 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -326,7 +326,7 @@ medical_record_text = "Patient's mind is in a vulnerable state, and cannot recover from traumatic events." //For reviewers: If you think it's a bad idea, feel free to remove it. I won't be upset :blobcat: -/datum/quirk/Hypno +/datum/quirk/hypno name = "Hypnotherapy user" desc = "You had hypnotherapy right before your shift, you're not sure it had any effects, though." mob_trait = "hypnotherapy" @@ -334,12 +334,12 @@ gain_text = "You really think the hypnotherapy helped you out." //lose_text = "You forget about the hypnotherapy you had, or did you even have it?" -/datum/quirk/Hypno/add() +/datum/quirk/hypno/add() //You caught me, it's not actually based off a trigger, stop spoiling the effect! Code diving ruins the magic! addtimer(CALLBACK(src, /datum/quirk/Hypno.proc/triggered, quirk_holder), rand(12000, 36000))//increase by 100, it's lower so I can test it. //DOES NOT give any indication when someone is triggered - this is intentional so people don't abuse it, you're supposed to get a random thing said to you as a mini objective. -/datum/quirk/Hypno/proc/triggered(quirk_holder)//I figured I might as well make a trait of code I added. +/datum/quirk/hypno/proc/triggered(quirk_holder)//I figured I might as well make a trait of code I added. var/mob/living/carbon/human/H = quirk_holder var/list/seen = viewers(8, get_turf(H)) seen -= quirk_holder diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm index c4f8290845..e8e833890b 100644 --- a/code/game/objects/effects/effect_system/effects_smoke.dm +++ b/code/game/objects/effects/effect_system/effects_smoke.dm @@ -273,7 +273,7 @@ chemholder = null return ..() -/datum/effect_system/smoke_spread/chem/set_up(datum/reagents/carry = null, radius = 1, loca, silent = FALSE, skip_finger = FALSE) +/datum/effect_system/smoke_spread/chem/set_up(datum/reagents/carry = null, radius = 1, loca, silent = FALSE) if(isturf(loca)) location = loca else diff --git a/code/modules/mob/living/taste.dm b/code/modules/mob/living/taste.dm index 1c0fc9da1d..5692eb99da 100644 --- a/code/modules/mob/living/taste.dm +++ b/code/modules/mob/living/taste.dm @@ -43,17 +43,17 @@ ..() if ((from.pH > 12.5) || (from.pH < 1.5)) to_chat(src, "You taste chemical burns!") - T.adjustTongueLoss(src, 5) - if (!has_trait(TRAIT_AGEUSIA)) //I'll let you get away with not having 1 damage. (add trait that lets you taste this) + T.adjustTongueLoss(src, 4) + if (!has_trait(TRAIT_AGEUSIA)) //I'll let you get away with not having 1 damage. switch(from.pH) - if(11.5 to 12.5) + if(11.5 to INFINITY) to_chat(src, "You taste a strong alkaline flavour!") T.adjustTongueLoss(src, 1) if(8.5 to 11.5) to_chat(src, "You taste a sort of soapy tone in the mixture.") if(2.5 to 5.5) to_chat(src, "You taste a sort of acid tone in the mixture.") - if(1.5 to 2.5) + if(-INFINITY to 2.5) to_chat(src, "You taste a strong acidic flavour!") T.adjustTongueLoss(src, 1) diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index 78ebb8cd24..e282d6b8bd 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -1,4 +1,3 @@ -im /proc/build_chemical_reagent_list() //Chemical Reagents - Initialises all /datum/reagent into a list indexed by reagent id diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm index 5c2ff08342..e4c8e1b3b2 100644 --- a/modular_citadel/code/datums/status_effects/chems.dm +++ b/modular_citadel/code/datums/status_effects/chems.dm @@ -52,7 +52,7 @@ /datum/status_effect/chem/BElarger/tick(mob/living/carbon/human/H)//If you try to wear clothes, you fail. Slows you down if you're comically huge var/mob/living/carbon/human/o = owner var/obj/item/organ/genital/breasts/B = o.getorganslot("breasts") - moveCalc = 1+((round(B.cached_size) - 9)/5) //Afffects how fast you move, and how often you can click. + moveCalc = 1+((round(B.cached_size) - 9)/3) //Afffects how fast you move, and how often you can click. if(!B) o.remove_movespeed_modifier("megamilk") sizeMoveMod(1) @@ -127,7 +127,7 @@ /datum/status_effect/chem/PElarger/tick(mob/living/carbon/M) var/mob/living/carbon/human/o = owner var/obj/item/organ/genital/penis/P = o.getorganslot("penis") - moveCalc = 1+((round(P.length) - 21)/5) //effects how fast you can move + moveCalc = 1+((round(P.length) - 21)/3) //effects how fast you can move bloodCalc = 1+((round(P.length) - 21)/10) //effects how much blood you need (I didn' bother adding an arousal check because I'm spending too much time on this organ already.) if(!P) o.remove_movespeed_modifier("hugedick") @@ -511,8 +511,6 @@ //UnregisterSignal(owner, COMSIG_GLOB_LIVING_SAY_SPECIAL) //Should still make custom commands work after freedom, need to check. -//WORKS!! AAAAA - /datum/status_effect/chem/enthrall/proc/owner_hear(var/hearer, message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode) if (cTriggered == TRUE) return