From 71088eace977d8099b0d1e3225a772216abde43c Mon Sep 17 00:00:00 2001 From: Fermi Date: Tue, 21 May 2019 05:05:32 +0100 Subject: [PATCH] More fixes --- code/modules/mob/living/say.dm | 5 ----- code/modules/reagents/chemistry/holder.dm | 2 ++ code/modules/surgery/organs/vocal_cords.dm | 5 +---- modular_citadel/code/datums/status_effects/chems.dm | 2 +- .../modules/reagents/chemistry/reagents/fermi_reagents.dm | 6 +++--- .../code/modules/reagents/chemistry/recipes/fermi.dm | 4 ++-- 6 files changed, 9 insertions(+), 15 deletions(-) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 161544578d..230b265fb8 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -205,11 +205,6 @@ GLOBAL_LIST_INIT(department_radio_keys, list( if(pressure < ONE_ATMOSPHERE*0.4) //Thin air, let's italicise the message spans |= SPAN_ITALICS - //global say component - //SEND_GLOBAL_SIGNAL(COMSIG_LIVING_SAY, src, message) - //if(SEND_SIGNAL(COMSIG_LIVING_SAY,src,message) == COMPONENT_NO_SAY) - // return - send_speech(message, message_range, src, bubble_type, spans, language, message_mode) if(succumbed) diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index 8a101f5873..3027d45554 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -616,6 +616,7 @@ im //go to explode proc //message_admins("temperature is over limit: [C.ExplodeTemp] Current temperature: [cached_temp]") C.FermiExplode(src, my_atom, (reactedVol+targetVol), cached_temp, pH) + return if (pH > 14) pH = 14 @@ -628,6 +629,7 @@ im if ((purity < C.PurityMin) && (!C.PurityMin == 0))//If purity is below the min, blow it up. C.FermiExplode(src, my_atom, (reactedVol+targetVol), cached_temp, pH) + return //For now, purity is handled elsewhere diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index 1fca8123c2..943b1d2921 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -706,9 +706,6 @@ if (E.cooldown > 0)//If they're on cooldown you can't give them more commands. continue listeners += L - if(debug == TRUE) - for(var/L in listeners) - to_chat(world, "[user] choses, and [L] obeys.") if(!listeners.len) cooldown = 0 @@ -994,7 +991,7 @@ if(2 to INFINITY) var/mob/living/M = V playsound(get_turf(M), pick('sound/effects/meow1.ogg', 'modular_citadel/sound/voice/nya.ogg'), 50, 1, -1) - M.emote(M,"lets out a nya!") + M.emote(M, 1, "lets out a nya!") E.cooldown += 1 //SLEEP diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm index 6127f82a03..43664d1010 100644 --- a/modular_citadel/code/datums/status_effects/chems.dm +++ b/modular_citadel/code/datums/status_effects/chems.dm @@ -454,7 +454,7 @@ */ //Doesn't work -/datum/status_effect/chem/enthrall/proc/owner_hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode) +/datum/status_effect/chem/enthrall/proc/owner_hear(message = message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode) var/mob/living/carbon/C = owner //message_admins("[C] heard something!") for (var/trigger in customTriggers) diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm index 4444251243..366ca14302 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -114,8 +114,8 @@ addiction_threshold = 15 metabolization_rate = 0.5 * REAGENTS_METABOLISM addiction_stage2_end = 30 - addiction_stage3_end = 40 - addiction_stage4_end = 43 //Incase it's too long + addiction_stage3_end = 41 + addiction_stage4_end = 44 //Incase it's too long var/location_created var/turf/open/location_return = null var/addictCyc1 = 0 @@ -251,7 +251,7 @@ src.addictCyc4++ ..() - . = 1 + //. = 1 //TODO ///datum/reagent/fermi/eigenstate/overheat_explode(mob/living/M) diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm index cdc822179a..7a9d631496 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -190,7 +190,7 @@ my_atom.reagents.clear_reagents() ..() -/datum/chemical_reaction/fermi/astral //done +/datum/chemical_reaction/fermi/astral //done //BORKEN name = "Astrogen" id = "astral" results = list("astral" = 3) @@ -278,7 +278,7 @@ var/turf/T = get_turf(my_atom) var/datum/reagents/R = new/datum/reagents(1000) var/datum/effect_system/smoke_spread/chem/s = new() - R.add_reagent("enthrallExplo", volume) + R.add_reagent("enthrallExplo", volume/2) s.set_up(R, volume, T) s.start() my_atom.reagents.clear_reagents()