diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index 5b28942b98..a8e8afc149 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -142,7 +142,10 @@ //melts plastic beakers /obj/item/reagent_containers/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) reagents.expose_temperature(exposed_temperature) + message_admins("Heating beaker") + message_admins("temperature [reagents.chem_temp]") if(beaker_weakness_bitflag & TEMP_WEAK) + message_admins("Beaker weak to heat") if(reagents.chem_temp >= 444)//assuming polypropylene var/list/seen = viewers(5, get_turf(src)) var/iconhtml = icon2html(src, seen) diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm index 71b2c4f85d..dc41eed0eb 100644 --- a/modular_citadel/code/datums/status_effects/chems.dm +++ b/modular_citadel/code/datums/status_effects/chems.dm @@ -69,7 +69,7 @@ to_chat(owner, "Your enormous breasts are way too large to fit anything over them!") if (B.size == "huge") if(prob(1)) - to_chat(owner, "Your back is feeling a little sore.") + to_chat(owner, "Your back is feeling sore.") var/target = o.get_bodypart(BODY_ZONE_CHEST) o.apply_damage(0.1, BRUTE, target) if(!B.cached_size == B.breast_values[B.prev_size]) @@ -90,7 +90,7 @@ if(10 to INFINITY) if (GLOB.breasts_size_list[B.prev_size] != GLOB.breasts_size_list[B.size]) to_chat(H, "Your indulgent busom is so substantial, it's affecting your movements!") - if(prob(2)) + if(prob(1)) to_chat(owner, "Your back is feeling a little sore.") ..() diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm index 2b0a54b081..40c5e31fa3 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm @@ -14,7 +14,7 @@ id = "eigenstate" description = "A strange mixture formed from a controlled reaction of bluespace with plasma, that causes localised eigenstate fluxuations within the patient" taste_description = "wiggly cosmic dust." - color = "#5020H4" // rgb: 50, 20, 255 + color = "#5020F4" // rgb: 50, 20, 255 overdose_threshold = 15 addiction_threshold = 15 metabolization_rate = 1.2 * REAGENTS_METABOLISM @@ -28,6 +28,9 @@ var/teleBool = FALSE pH = 3.7 +/datum/reagent/fermi/eigenstate/on_new(list/data) + location_created = data.["location_created"] + //Main functions /datum/reagent/fermi/eigenstate/on_mob_life(mob/living/M) //Teleports to chemistry! log_game("FERMICHEM: [M] ckey: [M.key] took eigenstasium") @@ -35,10 +38,11 @@ location_return = get_turf(M) //sets up return point to_chat(M, "You feel your wavefunction split!") if(purity > 0.9) //Teleports you home if it's pure enough + if(!location_created && data) //Just in case + location_created = data.["location_created"] log_game("FERMICHEM: [M] ckey: [M.key] returned to [location_created] using eigenstasium") - //var/turf/open/creation = location_created do_sparks(5,FALSE,M) - do_teleport(M, loc, 0, asoundin = 'sound/effects/phasein.ogg') + do_teleport(M, location_created, 0, asoundin = 'sound/effects/phasein.ogg') do_sparks(5,FALSE,M) if(prob(20)) do_sparks(5,FALSE,M) @@ -59,8 +63,9 @@ metabolization_rate += 0.5 //So you're not stuck forever teleporting. /datum/reagent/fermi/eigenstate/overdose_process(mob/living/M) //Overdose, makes you teleport randomly, probably one of my favourite effects. Sometimes kills you. + do_sparks(5,FALSE,M) do_teleport(M, get_turf(M), 10, asoundin = 'sound/effects/phasein.ogg') - do_sparks(5,FALSE,src) + do_sparks(5,FALSE,M) ..() //Addiction @@ -132,8 +137,10 @@ M.emote("me",1,"flashes into reality suddenly, gasping as they gaze around in a bewildered and highly confused fashion!",TRUE) log_game("FERMICHEM: [M] ckey: [M.key] has become an alternative universe version of themselves.") M.reagents.remove_all_type(/datum/reagent, 100, 0, 1) + /* for(var/datum/mood_event/Me in M) SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, Me) //Why does this not work? + */ SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "Alternative dimension", /datum/mood_event/eigenstate) diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm index 1d79c4f8c8..37224c9b94 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm @@ -95,8 +95,8 @@ if(H.w_uniform || H.wear_suit) var/target = M.get_bodypart(BODY_ZONE_CHEST) to_chat(M, "Your breasts begin to strain against your clothes tightly!") - M.adjustOxyLoss(10, 0) - M.apply_damage(2, BRUTE, target) + M.adjustOxyLoss(5, 0) + M.apply_damage(1, BRUTE, target) B.update() ..() @@ -228,7 +228,7 @@ if(H.w_uniform || H.wear_suit) var/target = M.get_bodypart(BODY_ZONE_CHEST) to_chat(M, "Your cock begin to strain against your clothes tightly!") - M.apply_damage(5, BRUTE, target) + M.apply_damage(2.5, BRUTE, target) P.update() ..() 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 be1b8281fc..68c7be4b85 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -404,7 +404,7 @@ ADD_TRAIT(catto, TRAIT_NODEATH, "catto") /datum/reagent/fermi/secretcatchem/on_mob_life(mob/living/carbon/H) - if(catto.health <= 50) + if(catto.health <= 0) catto.icon_state = "custom_cat_dead" catto.Stun(1000) else if(prob(5)) diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm index af6673de22..4f9c679c26 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -49,7 +49,7 @@ R.add_reagent("fermiAcid", (volume/3)) if(R.reagent_list) message_admins("gas") - s.set_up(R, (volume/10), my_atom) + s.set_up(R, (volume/5), my_atom) s.start() if (pH > 10) //if alkaline, small explosion. @@ -90,6 +90,8 @@ var/turf/open/location = get_turf(my_atom) var/datum/reagent/fermi/eigenstate/E = locate(/datum/reagent/fermi/eigenstate) in my_atom.reagents.reagent_list E.location_created = location + if(!E.data) + E.data.["location_created"] = location //serum