diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 6be7b1309f..7b75d53779 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -1,7 +1,6 @@
-#define FLAG_STATUS_NONE (1<<0)
-#define FLAG_STATUS_PH_IMMUNE (1<<1)
-#define FLAG_STATUS_TEMP_IMMUNE (1<<2)
-
+#define FLAG_STATUS_NONE (1 << 0)
+#define FLAG_STATUS_PH_IMMUNE (1 << 1)
+#define FLAG_STATUS_TEMP_IMMUNE (1 << 2)
/obj/item/reagent_containers
name = "Container"
@@ -16,9 +15,10 @@
var/spawned_disease = null
var/disease_amount = 20
var/spillable = FALSE
- var/beaker_resistances |= (FLAG_STATUS_PH_IMMUNE | FLAG_STATUS_TEMP_IMMUNE)
+ var/beaker_resistances = NONE
/obj/item/reagent_containers/Initialize(mapload, vol)
+ beaker_resistances |= FLAG_STATUS_PH_IMMUNE | FLAG_STATUS_TEMP_IMMUNE
. = ..()
if(isnum(vol) && vol > 0)
volume = vol
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 83a9b81884..6c04af50c8 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -113,7 +113,7 @@
icon_state = "beaker"
item_state = "beaker"
materials = list(MAT_GLASS=500)
- beaker_resistances &= ~FLAG_STATUS_PH_IMMUNE
+ beaker_resistances = FLAG_STATUS_TEMP_IMMUNE
/obj/item/reagent_containers/glass/beaker/Initialize()
. = ..()
@@ -191,7 +191,7 @@
volume = 200
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,20,25,30,50,100,200)
- beaker_resistances |= (1<<3)
+ beaker_resistances |= FLAG_STATUS_PH_IMMUNE | FLAG_STATUS_TEMP_IMMUNE
/obj/item/reagent_containers/glass/beaker/noreact
name = "cryostasis beaker"
@@ -201,7 +201,7 @@
materials = list(MAT_METAL=3000)
volume = 50
amount_per_transfer_from_this = 10
- beaker_resistances |= (1<<3)
+ beaker_resistances |= FLAG_STATUS_PH_IMMUNE | FLAG_STATUS_TEMP_IMMUNE
/obj/item/reagent_containers/glass/beaker/noreact/Initialize()
. = ..()
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm
index 603d36550b..9a39a7506e 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm
@@ -187,7 +187,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
if(purity < 0.5)//Impure chems don't function as you expect
return
if((M.ckey == creatorID) && (creatorName == M.real_name)) //same name AND same player - same instance of the player. (should work for clones?)
- log_game("FERMICHEM: [M] ckey: [M.key] has been given velvetspeech")
+ log_game("FERMICHEM: [M] ckey: [M.key] has been given velvetspeech")
/*if(M.has_status_effect(STATUS_EFFECT_INLOVE) //Not sure if I need/want this.
to_chat(M, "You are too captivated by your love to think about anything else")
return*/
@@ -201,7 +201,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
else
message_admins("MKUltra: [creatorName], [creatorID], is enthralling [M.name], [M.ckey]")
M.apply_status_effect(/datum/status_effect/chem/enthrall)
- log_game("FERMICHEM: [M] ckey: [M.key] has taken MKUltra")
+ log_game("FERMICHEM: [M] ckey: [M.key] has taken MKUltra")
/datum/reagent/fermi/enthrall/on_mob_life(mob/living/carbon/M)
. = ..()
@@ -275,8 +275,8 @@ Creating a chem with a low purity will make you permanently fall in love with so
else
E = M.has_status_effect(/datum/status_effect/chem/enthrall)
to_chat(M, "Your mind shatters under the volume of the mild altering chem inside of you, breaking all will and thought completely. Instead the only force driving you now is the instinctual desire to obey and follow [creatorName]. Your highest priority is now to stay by their side at all costs.")
- log_game("FERMICHEM: [M] ckey: [M.key] has been mindbroken for [creatorName] ckey: [creatorID]")
- M.slurring = 100
+ log_game("FERMICHEM: [M] ckey: [M.key] has been mindbroken for [creatorName] ckey: [creatorID]")
+ M.slurring = 100
M.confused = 100
E.phase = 4
E.mental_capacity = 0
@@ -310,7 +310,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
return
M.apply_status_effect(STATUS_EFFECT_INLOVE, love)
to_chat(M, "You develop overwhelmingly deep feelings for [love], your heart beginning to race as you look upon them with new eyes. You are determined to keep them safe above all other priorities.")
- log_game("FERMICHEM: [M] ckey: [M.key] has temporarily fallen for [love] ckey: [love.key]")
+ log_game("FERMICHEM: [M] ckey: [M.key] has temporarily fallen for [love] ckey: [love.key]")
else
if(get_dist(M, love) < 8)
if(M.has_trait(TRAIT_NYMPHO)) //Add this back when merged/updated.
@@ -332,7 +332,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "InLove")
SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "MissingLove")
to_chat(M, "Your feelings for [love] suddenly vanish!")
- log_game("FERMICHEM: [M] ckey: [M.key] is no longer in temp love")
+ log_game("FERMICHEM: [M] ckey: [M.key] is no longer in temp love")
..()
/datum/reagent/fermi/proc/FallInLove(mob/living/carbon/Lover, mob/living/carbon/Love)
@@ -345,7 +345,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
Lover.faction |= "[REF(Love)]"
Lover.apply_status_effect(STATUS_EFFECT_INLOVE, Love)
forge_valentines_objective(Lover, Love, TRUE)
- log_game("FERMICHEM: [M] ckey: [M.key] has been chemically made to fall for [love] ckey: [love.key]")
+ log_game("FERMICHEM: [Lover] ckey: [Lover.key] has been chemically made to fall for [Love] ckey: [Love.key]")
return
//For addiction see chem.dm
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm
index 864d9558da..5aa626060d 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm
@@ -66,11 +66,11 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
if(pollStarted == FALSE)
pollStarted = TRUE
candies = pollGhostCandidates("Do you want to play as a clone and do you agree to respect their character and act in a similar manner to them? I swear to god if you diddle them I will be very disapointed in you.")
- log_game("FERMICHEM: [M] ckey: [M.key] has taken SDGF, and ghosts have been polled.")
+ log_game("FERMICHEM: [M] ckey: [M.key] has taken SDGF, and ghosts have been polled.")
if(20 to INFINITY)
if(LAZYLEN(candies) && playerClone == FALSE) //If there's candidates, clone the person and put them in there!
message_admins("Ghost candidate found! [candies] is becoming a clone of [M]! Hee~!! Exciting!!")
- log_game("FERMICHEM: [M] ckey: [M.key] is creating a clone, controlled by [candies]")
+ log_game("FERMICHEM: [M] ckey: [M.key] is creating a clone, controlled by [candies]")
to_chat(M, "The cells reach a critical micelle concentration, nucleating rapidly within your body!")
var/typepath = M.type
var/mob/living/carbon/human/fermi_Gclone = new typepath(M.loc)
@@ -89,18 +89,18 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
var/obj/item/organ/zombie_infection/ZI = M.getorganslot(ORGAN_SLOT_ZOMBIE)
ZI.Remove(M)
ZI.Insert(SM)
- log_game("FERMICHEM: [M] ckey: [M.key]'s zombie_infection has been transferred to their clone")
+ log_game("FERMICHEM: [M] ckey: [M.key]'s zombie_infection has been transferred to their clone")
to_chat(SM, "You feel a strange sensation building in your mind as you realise there's two of you, before you get a chance to think about it, you suddenly split from your old body, and find yourself face to face with yourself, or rather, your original self.")
- if(prob(50))
- to_chat(SM, "While you find your newfound existence strange, you share the same memories as [M.real_name]. However, You find yourself indifferent to the goals you previously had, and take more interest in your newfound independence, but still have an indescribable care for the safety of your original")
- log_game("FERMICHEM: [SM] ckey: [SM.key]'s is not bound by [M] ckey [M.key]'s will, and is free to determine their own goals, while respecting and acting as their origin.")
- else
- to_chat(SM, "While you find your newfound existence strange, you share the same memories as [M.real_name]. Your mind has not deviated from the tasks you set out to do, and now that there's two of you the tasks should be much easier.")
- log_game("FERMICHEM: [SM] ckey: [SM.key]'s is bound by [M] ckey [M.key]'s objectives, and is encouraged to help them complete them.")
+ if(prob(50))
+ to_chat(SM, "While you find your newfound existence strange, you share the same memories as [M.real_name]. However, You find yourself indifferent to the goals you previously had, and take more interest in your newfound independence, but still have an indescribable care for the safety of your original")
+ log_game("FERMICHEM: [SM] ckey: [SM.key]'s is not bound by [M] ckey [M.key]'s will, and is free to determine their own goals, while respecting and acting as their origin.")
+ else
+ to_chat(SM, "While you find your newfound existence strange, you share the same memories as [M.real_name]. Your mind has not deviated from the tasks you set out to do, and now that there's two of you the tasks should be much easier.")
+ log_game("FERMICHEM: [SM] ckey: [SM.key]'s is bound by [M] ckey [M.key]'s objectives, and is encouraged to help them complete them.")
- to_chat(M, "You feel a strange sensation building in your mind as you realise there's two of you, before you get a chance to think about it, you suddenly split from your old body, and find yourself face to face with yourself.")
+ to_chat(M, "You feel a strange sensation building in your mind as you realise there's two of you, before you get a chance to think about it, you suddenly split from your old body, and find yourself face to face with yourself.")
M.visible_message("[M] suddenly shudders, and splits into two identical twins!")
SM.copy_known_languages_from(M, FALSE)
playerClone = TRUE
@@ -116,7 +116,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
//Transfer remaining reagent to clone. I think around 30u will make a healthy clone, otherwise they'll have clone damage, blood loss, brain damage and hunger.
SM.reagents.add_reagent("SDGFheal", volume)
M.reagents.remove_reagent(id, volume)
- log_game("FERMICHEM: [volume]u of SDGFheal has been transferred to the clone")
+ log_game("FERMICHEM: [volume]u of SDGFheal has been transferred to the clone")
return
else if(playerClone == FALSE) //No candidates leads to two outcomes; if there's already a braincless clone, it heals the user, as well as being a rare souce of clone healing (thematic!).
@@ -126,7 +126,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
if(21)
to_chat(M, "The cells fail to catalyse around a nucleation event, instead merging with your cells.") //This stuff is hard enough to make to rob a user of some benefit. Shouldn't replace Rezadone as it requires the user to not only risk making a player controlled clone, but also requires them to have split in two (which also requires 30u of SGDF).
M.remove_trait(TRAIT_DISFIGURED, TRAIT_GENERIC)
- log_game("FERMICHEM: [M] ckey: [M.key] is being healed by SDGF")
+ log_game("FERMICHEM: [M] ckey: [M.key] is being healed by SDGF")
if(22 to INFINITY)
M.adjustCloneLoss(-1, 0)
M.adjustBruteLoss(-1, 0)
@@ -158,7 +158,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
M.next_move_modifier -= 4
to_chat(M, "Your body splits away from the cell clone of yourself, leaving you with a drained and hollow feeling inside.")
M.apply_status_effect(/datum/status_effect/chem/SGDF)
- log_game("FERMICHEM: [M] ckey: [M.key] has created a mindless clone of themselves")
+ log_game("FERMICHEM: [M] ckey: [M.key] has created a mindless clone of themselves")
if(87 to INFINITY)
M.reagents.remove_reagent(id, volume)//removes SGDF on completion. Has to do it this way because of how i've coded it. If some madlab gets over 1k of SDGF, they can have the clone healing.
@@ -262,7 +262,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
ZI.real_name = M.real_name//Give your offspring a big old kiss.
ZI.name = M.real_name
ZI.desc = "[M]'s clone, gone horribly wrong."
- log_game("FERMICHEM: [M] ckey: [M.key]'s clone has become a horrifying zombie instead")
+ log_game("FERMICHEM: [M] ckey: [M.key]'s clone has become a horrifying zombie instead")
M.reagents.remove_reagent(id, 20)
else//easier to deal with
@@ -275,7 +275,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
S.rabid = 1//Make them an angery boi
M.reagents.remove_reagent(id, volume)
to_chat(M, "A large glob of the tumour suddenly splits itself from your body. You feel grossed out and slimey...")
- log_game("FERMICHEM: [M] ckey: [M.key]'s clone has become a horrifying teratoma instead")
+ log_game("FERMICHEM: [M] ckey: [M.key]'s clone has become a horrifying teratoma instead")
if(87 to INFINITY)
M.adjustToxLoss(1, 0)
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm
index 30f3575c5c..c768ee0272 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm
@@ -29,31 +29,30 @@ I'd like to point out from my calculations it'll take about 60-80 minutes to die
/datum/reagent/fermi/astral/on_mob_life(mob/living/M) // Gives you the ability to astral project for a moment!
M.alpha = 255
- switch(current_cycle)
- if(0)//Require a minimum
- log_game("FERMICHEM: [M] ckey: [M.key] became an astral ghost")
- origin = M
- if (G == null)
- G = new(get_turf(M.loc))
- G.attacktext = "raises the hairs on the neck of"
- G.response_harm = "disrupts the concentration of"
- G.response_disarm = "wafts"
- G.loot = null
- G.maxHealth = 5
- G.health = 5
- G.melee_damage_lower = 0
- G.melee_damage_upper = 0
- G.deathmessage = "disappears as if it was never really there to begin with"
- G.incorporeal_move = 1
- G.alpha = 35
- G.name = "[M]'s astral projection"
- M.mind.transfer_to(G)
- sleepytime = 15*volume
+ if(current_cycle == 0)
+ log_game("FERMICHEM: [M] ckey: [M.key] became an astral ghost")
+ origin = M
+ if (G == null)
+ G = new(get_turf(M.loc))
+ G.attacktext = "raises the hairs on the neck of"
+ G.response_harm = "disrupts the concentration of"
+ G.response_disarm = "wafts"
+ G.loot = null
+ G.maxHealth = 5
+ G.health = 5
+ G.melee_damage_lower = 0
+ G.melee_damage_upper = 0
+ G.deathmessage = "disappears as if it was never really there to begin with"
+ G.incorporeal_move = 1
+ G.alpha = 35
+ G.name = "[M]'s astral projection"
+ M.mind.transfer_to(G)
+ sleepytime = 15*volume
if(overdosed)
if(prob(50))
to_chat(G, "The high conentration of Astrogen in your blood causes you to lapse your concentration for a moment, bringing your projection back to yourself!")
do_teleport(G, M.loc)
- M.reagents.remove_reagent(id, current_cycle/2, FALSE)
+ M.reagents.remove_reagent(id, current_cycle/2, FALSE)//exponent
..()
/datum/reagent/fermi/astral/on_mob_delete(mob/living/carbon/M)
@@ -78,7 +77,7 @@ I'd like to point out from my calculations it'll take about 60-80 minutes to die
to_chat(M, "You notice your body starting to disappear, maybe you took too much Astrogen...?")
M.alpha--
antiGenetics--
- log_game("FERMICHEM: [M] ckey: [M.key] has become addicted to Astrogen")
+ log_game("FERMICHEM: [M] ckey: [M.key] has become addicted to Astrogen")
if(220)
to_chat(M, "Your addiction is only getting worse as your body disappears. Maybe you should get some more, and fast?")
M.alpha--
@@ -111,5 +110,5 @@ I'd like to point out from my calculations it'll take about 60-80 minutes to die
M.visible_message("[M] suddenly disappears, their body evaporating from existence, freeing [M] from their mortal coil.")
message_admins("[M] (ckey: [M.ckey]) has become one with the universe, and have continuous memories thoughout their lives should they find a way to come back to life (such as an inteligence potion, midround antag, ghost role).")
qdel(M) //Approx 60minutes till death from initial addiction
- log_game("FERMICHEM: [M] ckey: [M.key] has been obliterated from Astrogen addiction")
+ log_game("FERMICHEM: [M] ckey: [M.key] has been obliterated from Astrogen addiction")
..()
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm
index 65252ba73c..dedaf37c6b 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm
@@ -23,27 +23,23 @@
addiction_stage4_end = 44 //Incase it's too long
var/location_created
var/turf/open/location_return = null
- var/addictCyc1 = 0
- var/addictCyc2 = 0
var/addictCyc3 = 0
- var/addictCyc4 = 0
var/mob/living/fermi_Tclone = null
var/teleBool = FALSE
pH = 3.7
//Main functions
/datum/reagent/fermi/eigenstate/on_mob_life(mob/living/M) //Teleports to chemistry!
- log_game("FERMICHEM: [M] ckey: [M.key] took eigenstasium")
- switch(current_cycle)
- if(0)
- location_return = get_turf(M) //sets up return point
- to_chat(M, "You feel your wavefunction split!")
- if(purity > 0.75) //Teleports you home if it's pure enough
- 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, creation, 0, asoundin = 'sound/effects/phasein.ogg')
- do_sparks(5,FALSE,M)
+ log_game("FERMICHEM: [M] ckey: [M.key] took eigenstasium")
+ if(current_cycle == 0)
+ location_return = get_turf(M) //sets up return point
+ to_chat(M, "You feel your wavefunction split!")
+ if(purity > 0.75) //Teleports you home if it's pure enough
+ 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, creation, 0, asoundin = 'sound/effects/phasein.ogg')
+ do_sparks(5,FALSE,M)
if(prob(20))
do_sparks(5,FALSE,M)
..()
@@ -58,7 +54,7 @@
/datum/reagent/fermi/eigenstate/overdose_start(mob/living/M) //Overdose, makes you teleport randomly
. = ..()
to_chat(M, "Oh god, you feel like your wavefunction is about to tear.")
- log_game("FERMICHEM: [M] ckey: [M.key] has overdosed on eigenstasium")
+ log_game("FERMICHEM: [M] ckey: [M.key] has overdosed on eigenstasium")
M.Jitter(10)
/datum/reagent/fermi/eigenstate/overdose_process(mob/living/M) //Overdose, makes you teleport randomly, probably one of my favourite effects. Sometimes kills you.
@@ -70,22 +66,19 @@
//Addiction
/datum/reagent/fermi/eigenstate/addiction_act_stage1(mob/living/M) //Welcome to Fermis' wild ride.
- switch(addictCyc1)
- if(1)
- to_chat(M, "Your wavefunction feels like it's been ripped in half. You feel empty inside.")
- log_game("FERMICHEM: [M] ckey: [M.key] has become addicted to eigenstasium")
- M.Jitter(10)
+ if(addiction_stage == 0)
+ to_chat(M, "Your wavefunction feels like it's been ripped in half. You feel empty inside.")
+ log_game("FERMICHEM: [M] ckey: [M.key] has become addicted to eigenstasium")
+ M.Jitter(10)
M.nutrition = M.nutrition - (M.nutrition/15)
- addictCyc1++
..()
/datum/reagent/fermi/eigenstate/addiction_act_stage2(mob/living/M)
- switch(addictCyc2)
- if(0)
- to_chat(M, "You start to convlse violently as you feel your consciousness split and merge across realities as your possessions fly wildy off your body.")
- M.Jitter(50)
- M.Knockdown(100)
- M.Stun(40)
+ if(addiction_stage == 11)
+ to_chat(M, "You start to convlse violently as you feel your consciousness split and merge across realities as your possessions fly wildy off your body.")
+ M.Jitter(50)
+ M.Knockdown(100)
+ M.Stun(40)
var/items = M.get_contents()
if(!LAZYLEN(items))
@@ -95,16 +88,15 @@
do_sparks(5,FALSE,I)
do_teleport(I, get_turf(I), 5, no_effects=TRUE);
do_sparks(5,FALSE,I)
- addictCyc2++
..()
/datum/reagent/fermi/eigenstate/addiction_act_stage3(mob/living/M)//Pulls multiple copies of the character from alternative realities while teleporting them around!
//Clone function - spawns a clone then deletes it - simulates multiple copies of the player teleporting in
- switch(addictCyc3)
+ switch(addictCyc3) //Loops 0 -> 1 -> 2 -> 0 ...ect.
if(0)
M.Jitter(100)
- to_chat(M, "Your eigenstate starts to rip apart, causing a localised collapsed field as you're ripped from alternative universes, trapped around the densisty of the eigenstate event horizon.")
+ to_chat(M, "Your eigenstate starts to rip apart, causing a localised collapsed field as you're ripped from alternative universes, trapped around the densisty of the event horizon.")
if(1)
var/typepath = M.type
fermi_Tclone = new typepath(M.loc)
@@ -117,7 +109,7 @@
C.emote("spin")
M.emote("spin")
M.emote("me",1,"flashes into reality suddenly, gasping as they gaze around in a bewildered and highly confused fashion!",TRUE)
- C.emote("me",1,"[pick("says", "cries", "mewls", "giggles", "shouts", "screams", "gasps", "moans", "whispers", "announces")], \"[pick("Bugger me, whats all this then?", "Hot damn, where is this?", "sacre bleu! O� suis-je?!", "Yee haw! This is one hell of a hootenanny!", "WHAT IS HAPPENING?!", "Picnic!", "Das ist nicht deutschland. Das ist nicht akzeptabel!!!", "I've come from the future to warn you to not take eigenstasium! Oh no! I'm too late!", "You fool! You took too much eigenstasium! You've doomed us all!", "What...what's with these teleports? It's like one of my Japanese animes...!", "Ik stond op het punt om mehki op tafel te zetten, en nu, waar ben ik?", "This must be the will of Stein's gate.", "Fermichem was a mistake", "This is one hell of a beepsky smash.", "Now neither of us will be virgins!")]\"")
+ C.emote("me",1,"[pick("says", "cries", "mewls", "giggles", "shouts", "screams", "gasps", "moans", "whispers", "announces")], \"[pick("Bugger me, whats all this then?", "Hot damn, where is this?", "sacre bleu! Ou suis-je?!", "Yee haw! This is one hell of a hootenanny!", "WHAT IS HAPPENING?!", "Picnic!", "Das ist nicht deutschland. Das ist nicht akzeptabel!!!", "I've come from the future to warn you to not take eigenstasium! Oh no! I'm too late!", "You fool! You took too much eigenstasium! You've doomed us all!", "What...what's with these teleports? It's like one of my Japanese animes...!", "Ik stond op het punt om mehki op tafel te zetten, en nu, waar ben ik?", "This must be the will of Stein's gate.", "Fermichem was a mistake", "This is one hell of a beepsky smash.", "Now neither of us will be virgins!")]\"")
if(2)
var/mob/living/carbon/C = fermi_Tclone
do_sparks(5,FALSE,C)
@@ -131,7 +123,7 @@
..()
/datum/reagent/fermi/eigenstate/addiction_act_stage4(mob/living/M) //Thanks for riding Fermis' wild ride. Mild jitter and player buggery.
- if(addictCyc4 == 0)
+ if(addiction_stage == 42)
do_sparks(5,FALSE,M)
do_teleport(M, get_turf(M), 2, no_effects=TRUE) //teleports clone so it's hard to find the real one!
do_sparks(5,FALSE,M)
@@ -140,7 +132,7 @@
M.Knockdown(0)
to_chat(M, "You feel your eigenstate settle, snapping an alternative version of yourself into reality. All your previous memories are lost and replaced with the alternative version of yourself. This version of you feels more [pick("affectionate", "happy", "lusty", "radical", "shy", "ambitious", "frank", "voracious", "sensible", "witty")] than your previous self, sent to god knows what universe.")
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.")
+ 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?
@@ -149,7 +141,6 @@
if(prob(20))
do_sparks(5,FALSE,M)
- addictCyc4++
SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "[id]_overdose")//holdover until above fix works
..()
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
index b62f04c65a..e9c74e9c61 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
@@ -47,7 +47,7 @@
B.throw_at(T2, 8, 1)
M.reagents.remove_reagent(id, volume)
return
- log_game("FERMICHEM: [M] ckey: [M.key] has ingested Sucubus milk")
+ log_game("FERMICHEM: [M] ckey: [M.key] has ingested Sucubus milk")
var/mob/living/carbon/human/H = M
H.genital_override = TRUE
var/obj/item/organ/genital/breasts/B = H.getorganslot("breasts")
@@ -105,6 +105,7 @@
//Acute hepatic pharmacokinesis.
if(M.has_trait(TRAIT_PHARMA))
var/obj/item/organ/liver/L = M.getorganslot("liver")
+ L.swelling+= 0.05
return ..()
var/obj/item/organ/genital/penis/P = M.getorganslot("penis")
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 ed461698d4..d0c25cfb86 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
@@ -368,9 +368,8 @@
holder.remove_reagent(id, volume)
..()
-//ReagentVars
//Turns you into a cute catto while it's in your system.
-//If you manage to gamble perfectly, makes you a catgirl after you transform back. But really, you shouldn't end up with that with how random it is.
+//If you manage to gamble perfectly, makes you have cat ears after you transform back. But really, you shouldn't end up with that with how random it is.
/datum/reagent/fermi/secretcatchem //Should I hide this from code divers? A secret cit chem?
name = "secretcatchem" //an attempt at hiding it
id = "secretcatchem"
@@ -381,7 +380,7 @@
var/mob/living/simple_animal/pet/cat/custom_cat/catto = null
/datum/reagent/fermi/secretcatchem/New()
- name = "Catbalti[pick("a","u","e","y")]m [pick("apex", "prime", "meow")]"
+ name = "Catbalti[pick("a","u","e","y")]m [pick("apex", "prime", "meow")]"//rename
/datum/reagent/fermi/secretcatchem/on_mob_add(mob/living/carbon/human/H)
. = ..()
@@ -399,7 +398,7 @@
catto.desc = "A cute catto! They remind you of [H] somehow."
catto.color = "#[H.dna.features["mcolor"]]"
H.moveToNullspace()
- log_game("FERMICHEM: [M] ckey: [M.key] has been made into a cute catto.")
+ log_game("FERMICHEM: [H] ckey: [H.key] has been made into a cute catto.")
/datum/reagent/fermi/secretcatchem/on_mob_life(mob/living/carbon/H)
if(prob(5))
@@ -416,4 +415,4 @@
H.say("*wag")//force update sprites.
to_chat(H, "[words]")
qdel(catto)
- log_game("FERMICHEM: [M] ckey: [M.key] has returned to normal")
+ log_game("FERMICHEM: [H] ckey: [H.key] has returned to normal")