From ac3f0c790e51eea87ba2cd22c8a34a70f1c4afeb Mon Sep 17 00:00:00 2001 From: Fermi Date: Tue, 21 May 2019 20:28:40 +0100 Subject: [PATCH] Fixed compling errors from last time. --- code/modules/reagents/chemistry/holder.dm | 18 +++++++++++++++--- code/modules/surgery/organs/vocal_cords.dm | 8 ++++---- .../code/datums/status_effects/chems.dm | 10 +++++----- .../chemistry/reagents/fermi_reagents.dm | 11 ++++++----- .../reagents/chemistry/recipes/fermi.dm | 3 +++ 5 files changed, 33 insertions(+), 17 deletions(-) diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index 67cccedff0..6566fd7e06 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -555,8 +555,12 @@ im //var/datum/reagent/fermi/Ferm = GLOB.chemical_reagents_list[C.id] C.FermiFinish(src, my_atom, multiplier) //C.on_reaction(src, multiplier, special_react_result) + //Reaction sounds and words + playsound(get_turf(my_atom), C.mix_sound, 80, 1) + var/list/seen = viewers(5, get_turf(my_atom))//Sound and sight checkers + var/iconhtml = icon2html(my_atom, seen) for(var/mob/M in seen) - to_chat(M, "[iconhtml] [selected_reaction.mix_message]") + to_chat(M, "[iconhtml] [C.mix_message]") return for(var/P in cached_results) targetVol = cached_results[P]*multiplier @@ -582,8 +586,12 @@ im //var/datum/reagent/fermi/Ferm = GLOB.chemical_reagents_list[C.id] C.FermiFinish(src, my_atom, multiplier) //C.on_reaction(src, multiplier, special_react_result) + //Reaction sounds and words + playsound(get_turf(my_atom), C.mix_sound, 80, 1) + var/list/seen = viewers(5, get_turf(my_atom))//Sound and sight checkers + var/iconhtml = icon2html(my_atom, seen) for(var/mob/M in seen) - to_chat(M, "[iconhtml] [selected_reaction.mix_message]") + to_chat(M, "[iconhtml] [C.mix_message]") return else STOP_PROCESSING(SSprocessing, src) @@ -596,8 +604,12 @@ im //var/datum/reagent/fermi/Ferm = GLOB.chemical_reagents_list[C.id] C.FermiFinish(src, my_atom, multiplier) //C.on_reaction(src, multiplier, special_react_result) + //Reaction sounds and words + playsound(get_turf(my_atom), C.mix_sound, 80, 1) + var/list/seen = viewers(5, get_turf(my_atom))//Sound and sight checkers + var/iconhtml = icon2html(my_atom, seen) for(var/mob/M in seen) - to_chat(M, "[iconhtml] [selected_reaction.mix_message]") + to_chat(M, "[iconhtml] [C.mix_message]") return //handle_reactions() diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index 5737d62910..9e5c7a7445 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -873,7 +873,7 @@ else E.resistanceTally /= 3*power_multiplier //asexuals are masochists apparently (not seriously) addtimer(CALLBACK(L, .proc/to_chat, "I've failed [E.master]..."), 5) - SEND_SIGNAL(L, COMSIG_ADD_MOOD_tEVENT, "enthrallscold", /datum/mood_event/enthrallscold) + SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "enthrallscold", /datum/mood_event/enthrallscold) E.cooldown += 1 //teir 0 @@ -897,7 +897,7 @@ if(0) E.phase = 3 E.status = null - if(C.canbearoused) + if(L.canbearoused) addtimer(CALLBACK(L, .proc/to_chat, "The snapping of your [E.enthrallGender]'s fingers brings you back to your enthralled state, obedient and ready to serve."), 5) else addtimer(CALLBACK(L, .proc/to_chat, "The snapping of [E.master]'s fingers brings you back to being under their command."), 5) @@ -954,9 +954,9 @@ E.phase = 0 E.cooldown = 0 if(C.canbearoused) - addtimer(CALLBACK(L, .proc/to_chat, "You revert to yourself before being enthralled by your [E.enthrallGender], with no memory of what happened."), 5) + addtimer(CALLBACK(C, .proc/to_chat, "You revert to yourself before being enthralled by your [E.enthrallGender], with no memory of what happened."), 5) else - addtimer(CALLBACK(L, .proc/to_chat, "You revert to who you were before, with no memory of what happened with [E.master]."), 5) + addtimer(CALLBACK(C, .proc/to_chat, "You revert to who you were before, with no memory of what happened with [E.master]."), 5) //ATTRACT else if((findtext(message, attract_words))) diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm index 73f4b25016..429c8f5ff6 100644 --- a/modular_citadel/code/datums/status_effects/chems.dm +++ b/modular_citadel/code/datums/status_effects/chems.dm @@ -45,7 +45,7 @@ id = "BElarger" alert_type = null var/moveCalc = 1 - var/breast_values = list ("a" = 1, "b" = 2, "c" = 3, "d" = 4, "e" = 5, "f" = 6, "g" = 7, "h" = 8, "i" = 9, "j" = 10, "k" = 11, "l" = 12, "m" = 13, "n" = 14, "o" = 15, "huge" = 16, "flat" = 0) + //var/breast_values = list ("a" = 1, "b" = 2, "c" = 3, "d" = 4, "e" = 5, "f" = 6, "g" = 7, "h" = 8, "i" = 9, "j" = 10, "k" = 11, "l" = 12, "m" = 13, "n" = 14, "o" = 15, "huge" = 16, "flat" = 0) //var/list/items = list() //var/items = o.get_contents() @@ -78,11 +78,11 @@ o.dropItemToGround(W, TRUE) playsound(o.loc, 'sound/items/poster_ripped.ogg', 50, 1) to_chat(owner, "Your enormous breasts are way too large to fit anything over them!") - moveCalc = ((round(B.cached_size) - 9))/5) - if (breast_values[size] > breast_values[prev_size]) + moveCalc = (round(B.cached_size) - 9)/5 + if (B.breast_values[B.size] > B.breast_values[B.prev_size]) o.add_movespeed_modifier("megamilk", TRUE, 100, NONE, override = TRUE, multiplicative_slowdown = moveCalc) o.next_move_modifier *= moveCalc - else if (breast_values[size] < breast_values[prev_size]) + else if (B.breast_values[B.size] < B.breast_values[B.prev_size]) o.add_movespeed_modifier("megamilk", TRUE, 100, NONE, override = TRUE, multiplicative_slowdown = moveCalc) o.next_move_modifier /= moveCalc if(round(B.cached_size) < 16) @@ -286,7 +286,7 @@ to_chat(owner, "The separation from you [enthrallGender] sparks a small flame of resistance in yourself, as your mind slowly starts to return to normal.") if(prob(2)) if(owner.canbearoused) - to_chat(owner, "[pick("I belong to [enthrallGender].", "[enthrallGender] knows whats best for me.", "Obedence is pleasure.", "I exist to serve [enthrallGender].", "[enthrallGender] is so dominant, it feels right to obey them.")].") + to_chat(owner, "[pick("I belong to [enthrallGender].", "[enthrallGender] knows whats best for me.", "Obedence is pleasure.", "I exist to serve [enthrallGender].", "[enthrallGender] is so dominant, it feels right to obey them.")].") if (4) //mindbroken if (mental_capacity >= 499 || owner.getBrainLoss() >=20 || !owner.reagents.has_reagent("MKUltra")) phase = 2 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 4308ba345e..3c2aab4736 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -1167,11 +1167,12 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y . = ..() if (M.ckey == creatorID && creatorName == M.real_name)//If the creator drinks 150u, then you get the status for someone random (They don't have the vocal chords though, so it's limited.) var/list/seen = viewers(7, get_turf(M))//Sound and sight checkers - for(var/victim in seen) - if((victim != mob/living/carbon/M) || (victim == M))//as much as I want you to fall for beepsky, he doesn't have a ckey - if(!victim.ckey) - seen = seen - victim - var/chosen = pick(seen) + for(var/mob/living/carbon/victim in seen) + if(victim == M)//as much as I want you to fall for beepsky, he doesn't have a ckey + seen = seen - victim + if(!victim.ckey) + seen = seen - victim + var/mob/living/carbon/chosen = pick(seen) creatorID = chosen.ckey if (chosen.gender == "female") creatorGender = "Mistress" diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm index 84d1947a1a..aecd0ba029 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -1,5 +1,8 @@ //TO TWEAK: +/datum/chemical_reaction/fermi + mix_sound = 'modular_citadel/sound/voice/merowr.ogg' + //Called for every reaction step /datum/chemical_reaction/fermi/proc/FermiCreate(holder) //You can get holder by reagents.holder WHY DID I LEARN THIS NOW??? return