Merge remote-tracking branch 'upstream/master'

ModularTegustation/_adventure_console/adventure_events/abnormality/teth/forsaken_murderer.dm

@@ -41,8 +41,8 @@
 			. += CoinFlipping(M)
 			return
 		if(3)
-			AdjustCurrency(3)
-			AdjustStatNum(WRATH_STAT, 3)
+			AdjustCurrency(ADV_EVENT_COIN_EASY)
+			AdjustStatNum(WRATH_STAT, ADV_EVENT_STAT_EASY)
 		if(4)
 			AdjustHitPoint(-5)
-	. = ..()
+	return ..()

ModularTegustation/_adventure_console/adventure_events/abnormality/teth/old_lady.dm

@@ -35,12 +35,12 @@
 			return
 		if(2)
 			AdjustHitPoint(-15)
-			AdjustStatNum(RAND_STAT,3)
+			AdjustStatNum(RAND_STAT, ADV_EVENT_STAT_EASY)
 		if(3)
 			CHANCE_BUTTON_FORMAT(ReturnStat(GLOOM_STAT), "GLOOM", M)
 			CHANCE_BUTTON_FORMAT(ReturnStat(GLUTT_STAT), "GLUTT", M)
 			. += CoinFlipping(M)
 			return
 		if(5)
 			AdjustHitPoint(-5)
-	. = ..()
+	return ..()

ModularTegustation/_adventure_console/adventure_events/abnormality/teth/scorched_girl.dm

@@ -28,7 +28,7 @@
 			return
 		if(2)
 			AdjustHitPoint(10)
-			AdjustStatNum(ENVY_STAT, 1)
+			AdjustStatNum(ENVY_STAT, ADV_EVENT_STAT_EASY)
 		if(3)
 			AdjustCurrency(-1)
-	. = ..()
+	return ..()

ModularTegustation/_adventure_console/adventure_events/general/jazz_end.dm

@@ -0,0 +1,44 @@
+/datum/adventure_event/jazz_end
+	name = "Jazz at the End"
+	desc = "IN THE DISTANCE YOU HEAR JAZZ"
+	adventure_cords = list(
+		"You find youself in a location that resembles the moon.<br>\
+		Grey sand crunches beneath your feet<br>\
+		and a cold chill lingers in the air.<br>\
+		Since entering this place the only sound you have heard<br>\
+		is the sound of jazz playing in the distance.",
+
+		"A short distance away from where you entered is a<br>\
+		record player calmly spinning a phonograph record<br>\
+		under a sky with no stars. Around the record is<br>\
+		a leather chair and a wooden table with a empty glass.<br>\
+		It feels like someone used to live here... but not anymore.",
+
+		"You leave this world with its last tune.<br>\
+		For a moment you close your eyes and enjoy the music.<br>\
+		When you open your eyes your back on the path back home.",
+
+		"Your hand calmly pulls the needle up from the record.<br>\
+		Your met with a silence that drowns out your own breathing.<br>\
+		A world without a heartbeat. A silent world.<br>\
+		You regain your composure and walk away from the area.<br>\
+		As the world dims around you,<br>\
+		you find youself back on the path back home.",
+
+		)
+
+/datum/adventure_event/jazz_end/EventChoiceFormat(obj/machinery/M, mob/living/carbon/human/H)
+	switch(cords)
+		if(1)
+			BUTTON_FORMAT(2, "FOLLOW THE MUSIC", M)
+			return
+		if(2)
+			BUTTON_FORMAT(3, "LEAVE THE LAST TUNE", M)
+			BUTTON_FORMAT(4, "STOP THE RECORD", M)
+			return
+		if(3)
+			AdjustStatNum(SLOTH_STAT, ADV_EVENT_STAT_EASY)
+		if(4)
+			AdjustStatNum(GLOOM_STAT, ADV_EVENT_STAT_EASY)
+
+	return ..()

ModularTegustation/_adventure_console/adventure_events/general/legacy.dm

@@ -26,5 +26,5 @@
 		if(3)
 			//I just love how ominous this sound effect is.
 			playsound(get_turf(H), 'sound/effects/creak1.ogg', 20, FALSE)
-			AdjustStatNum(GLOOM_STAT,1)
-	. = ..()
+			AdjustStatNum(GLOOM_STAT,ADV_EVENT_STAT_EASY)
+	return ..()

ModularTegustation/_adventure_console/adventure_events/general/quiz.dm

@@ -36,11 +36,11 @@
 			BUTTON_FORMAT(5, "NONE CAN PATENT GOO", M)
 			return
 		if(4)
-			AdjustStatNum(PRIDE_STAT, 1)
+			AdjustStatNum(PRIDE_STAT, ADV_EVENT_STAT_EASY)
 		if(5)
 			CauseBattle(
 				"Speculative Amalagam Error:Some imperfect mix of a fixer and a sweeper. The differing physiology of a sweeper and a human causes them to violently ooze red fluid from where the sweeper parts end and the human parts begin.",
 				"1d10",
 				MON_HP_RAND_EASY,
 			)
-	. = ..()
+	return ..()

ModularTegustation/_adventure_console/adventure_events/general/sinking_bell.dm

@@ -79,4 +79,4 @@
 		if(8)
 			BUTTON_FORMAT(9, "REST", M)
 			return
-	. = ..()
+	return ..()

ModularTegustation/_adventure_console/adventure_events/limbus_company/allaround_cleaner.dm

@@ -0,0 +1,37 @@
+/datum/adventure_event/allaround_cleaner
+	name = "Mirror Shard:All Around Cleaner"
+	desc = "YOU HEAR A ROBOTIC VOICE AND SMELL SANITIZER"
+	adventure_cords = list(
+		"<b>I wipe everything.<br>\
+		Cleaning is enjoyable.<br>\
+		I like to be the same as others.<br>\
+		...<br>\
+		I am frankly troubled.<br>\
+		The model next to mine boasted that it has multiple parts that others dont.<br>\
+		Is that what makes one special?<br>\
+		Am I special the way I am?<b>",
+
+		"<b>No. I am not special.</b><br>\
+		Disregarding the answer, it gives a stern reply.<br>\
+		<b>I will keep living an ordinary life, the same as now, just as assigned to me.</b><br>\
+		Then it disappeared into the dark, spinning at a surprising speed.",
+
+		"<b>Am I not special, not special, not special?</b><br>\
+		After giving a lagged reply, it suddenly began tearing off all the cleaning gadgets from its body and crashing into walls.<br>\
+		It rubbed its body on other objects while sparks flew off as if it was trying to attach things to it.<br>\
+		It only stopped after a while.<br>\
+		<b>Maybe I wanted to be special.</b><br>\
+		It had already disappeared when the empty voice seemed to reach the ears.",
+
+		)
+
+/datum/adventure_event/allaround_cleaner/EventChoiceFormat(obj/machinery/M, mob/living/carbon/human/H)
+	switch(cords)
+		if(1)
+			BUTTON_FORMAT(2, "YOU ARE SPECIAL", M)
+			BUTTON_FORMAT(3, "YOU ARE NOT SPECIAL", M)
+			return
+		if(3)
+			AdjustStatNum(GLOOM_STAT, ADV_EVENT_STAT_EASY)
+
+	return ..()

ModularTegustation/_adventure_console/adventure_events/limbus_company/ambling_pearl.dm

@@ -0,0 +1,56 @@
+/datum/adventure_event/ambling_pearl
+	name = "Mirror Shard:Ambling Pearl"
+	desc = null
+	adventure_cords = list(
+		"The barren mudflat reeks of salt and rot.<br>\
+		What little jade-colored seawater is left there<br>\
+		doesn’t seem to have anything inside.<br>\
+		A giant clam walks before you.<br>\
+		With each step it takes, it sprays a fetid green muck.<br>\
+		Is the clam the source of the contamination,<br>\
+		or is it working to contain the filth?.",
+
+		"Ability Challenge",
+
+		"You contain some of the slime in a glass jar.<br>\
+		This isn’t simply a mass of filth.<br>\
+		Numerous hatchlings swim inside.<br>\
+		These tiny creatures are feeding on each other<br>\
+		could they be the clam’s offspring?",
+
+		"You approach with a glass jar in hand.<br>\
+		However, hesitation takes hold, and you eventually turn around.<br>\
+		You couldn’t stand the thought<br>\
+		of reaching out to contain that filth.<br>\
+		In fact, you get the feeling that it’s something you mustn’t hold.",
+
+		"You wade through the virescence.<br>\
+		With each step, the foul mud<br>\
+		brings terrible pain to one’s feet.<br>\
+		You can no longer move forward.<br>\
+		Besides struggling to wade through,<br>\
+		you worry that your legs might slough off if you go farther.<br>\
+		While you were hesitating,<br>\
+		the clam walked off into the distance.",
+		)
+
+/datum/adventure_event/ambling_pearl/EventChoiceFormat(obj/machinery/M, mob/living/carbon/human/H)
+	switch(cords)
+		if(1)
+			BUTTON_FORMAT(2, "SAMPLE THE GREEN SUBSTANCE", M)
+			BUTTON_FORMAT(5, "APPROACH THE CLAM", M)
+			return
+		if(2)
+			CHANCE_BUTTON_FORMAT(ReturnStat(GLOOM_STAT), "GLOOM", M)
+			CHANCE_BUTTON_FORMAT(ReturnStat(GLUTT_STAT), "GLUTTONY", M)
+			. += CoinFlipping(M)
+			return
+		if(3)
+			AdjustCurrency(ADV_EVENT_COIN_EASY)
+			AdjustStatNum(LUST_STAT, ADV_EVENT_STAT_EASY)
+		if(4)
+			AdjustHitPoint(-10)
+		if(5)
+			AdjustHitPoint(-4)
+
+	return ..()

ModularTegustation/_adventure_console/adventure_events/limbus_company/ardor_blossom.dm

@@ -0,0 +1,34 @@
+/datum/adventure_event/ardor_blossom
+	name = "Mirror Shard:Ardor Blossom Moth"
+	desc = "ORANGE LIGHTS FLUTTER DOWN THIS PATH"
+	adventure_cords = list(
+		"Orange circles float in the air before your eyes.<br>\
+		The lights flutter and dance in the air, creating a haze.<br>\
+		Something is burning to death within.<br>\
+		Would you be scorched as well if the flames touched you?.",
+
+		"Enchanted by the haze, you extend a finger,<br>\
+		waiting for one of the lights to land.<br>\
+		A glimmering ball gently perches on your digit.<br>\
+		Then, a fire engulfs it.<br>\
+		Another glow attaches to your body, then four, then eight.<br>\
+		They multiply until you have been entirely shrouded in light.",
+
+		"Resisting the temptation to reach out,<br>\
+		you decide it’s better to stay away from such dubious warmth.<br>\
+		You feel a cold wave crawl up your spine in an instant, but it may be the right choice.<br>\
+		Even children know not to play with fire.",
+
+		)
+
+/datum/adventure_event/ardor_blossom/EventChoiceFormat(obj/machinery/M, mob/living/carbon/human/H)
+	switch(cords)
+		if(1)
+			BUTTON_FORMAT(2, "REACH OUT", M)
+			BUTTON_FORMAT(5, "TURN AROUND", M)
+			return
+		if(2)
+			AdjustHitPoint(-10)
+			AdjustStatNum(WRATH_STAT, ADV_EVENT_STAT_EASY)
+
+	return ..()

ModularTegustation/_adventure_console/adventure_events/limbus_company/blubbering_toad.dm

@@ -0,0 +1,59 @@
+/datum/adventure_event/blubbering_toad
+	name = "Mirror Shard:Blubbering Toad"
+	desc = "YOU HEAR A SAD CROOHOO"
+	adventure_cords = list(
+		"<b>Croohoo, croohoo, croohoo.</b><br>\
+		A giant toad cries inside a cave.<br>\
+		Patches of dark blue resin cover the cave.<br>\
+		This resin is like gloom.<br>\
+		A sap of gloom, not quite like tears or sadness.<br>\
+		The toad holds this resin.",
+
+		"Ability Challenge",
+
+		"<b>Croohic, croohoo.</b><br>\
+		The toad’s cry is dull and heavy.<br>\
+		It doesn’t seem to have understood what it heard.<br>\
+		After crying like that a few more times,<br>\
+		it hopped away from its spot.<br>\
+		All that’s left is the sticky blue resin.",
+
+		"<b>Cruh-huh, croohoo.</b><br>\
+		The toad makes a different noise as if to answer.<br>\
+		It sounds like an affirmative reply.<br>\
+		It extracts its long blue tongue,<br>\
+		snatching a person from our group.<br>\
+		Sometime later, they walked back out of its mouth.<br>\
+		They seemed drenched<br>\
+		in moisture, or gloom.",
+
+		"An indeterminate amount of time passes.<br>\
+		As you waited for the toad to finish its cries,<br>\
+		it gazed into us, closing and opening its eyelids slowly.<br>\
+		With a quick, slick sound,<br>\
+		a long blue tongue<br>\
+		popped out towards us.<br>\
+		An eyeball belonging to the toad<br>\
+		was on its tongue.<br>\
+		When we picked it up,<br>\
+		it blinked its other eye at us<br>\
+		before going on its way.<br>\
+		Was that its thanks for lending an ear?"
+		)
+
+/datum/adventure_event/blubbering_toad/EventChoiceFormat(obj/machinery/M, mob/living/carbon/human/H)
+	switch(cords)
+		if(1)
+			BUTTON_FORMAT(2, "MIMIC THE CRY", M)
+			BUTTON_FORMAT(5, "SIT AND WAIT", M)
+			return
+		if(2)
+			CHANCE_BUTTON_FORMAT(ReturnStat(GLOOM_STAT), "GLOOM", M)
+			. += CoinFlipping(M)
+			return
+		if(4)
+			AdjustHitPoint(5)
+		if(5)
+			AdjustStatNum(PRIDE_STAT, ADV_EVENT_STAT_NORMAL)
+
+	return ..()

ModularTegustation/_adventure_console/adventure_events/limbus_company/chicken_strife.dm

@@ -0,0 +1,53 @@
+/datum/adventure_event/chicken_strife
+	name = "Mirror Shard:Chicken Strife"
+	desc = "THE SMELL OF CHICKEN AND HEAR A HEATED ARGUMENT"
+	adventure_cords = list(
+		"Some folks are blocking the way.<br>\
+		Theyre sitting on a deck, yelling at each other.<br>\
+		<br><b>Look at this succulent piece! The rich juice running down the fibers of luscious meat This is what chicken is about!</b><br><br>\
+		<br><b>Wrong. This piece has a clean taste, with not an ounce of grease tainting the tongue. This is the real deal.</b><br><br>\
+		The two turn around at the same time to face you.<br>\
+		<br><b>You there! Tell us which is better.</b><br>",
+
+		"<br><b>Thats true.</b><br><br>\
+		<br><b>An irrefutable point.</b><br><br>\
+		They lowered their hands and settled down.<br>\
+		<br><b>What a strange thing we were fighting over.</b><br><br>\
+		<br><b>Theyre right The one truth is that the chicken is always right.</b><br><br>\
+		After a passionate handshake, the two gave you their bucket of chicken.<br>\
+		<br><b>A wise gourmet such as yourself deserves both pieces. Please, take this, we insist.</b><br>",
+
+		"<br><b>You see! The drumsticks are better!</b><br><br>\
+		<br><b>You dont know what good taste is.</b><br><br>\
+		The person holding a chicken breast let out a baffled sigh.<br>\
+		<br><b>Ey! Heres your reward. You deserve a drumstick of your own.</b><br><br>\
+		Satisfied, the one with a drumstick handed you another from the bucket.<br>\
+		<br><b>Im counting on you to keep that leg up!</b><br><br>\
+		Unsure of what youre being trusted with, you left the table with the drumstick.",
+
+		"<br>There aint no way! Youd give up this banquet of juiciness?</b><br><br>\
+		<br><b>Its fat, not just juice. The breast is healthy, light, comes in hefty servings, and is easy to eat! its obviously the reasonable choice.</b><br><br>\
+		The person holding a piece of chicken breast pleasantly remarked.<br>\
+		<br><b>Here, a reward for you. Take this breast.</b><br><br>\
+		A sizable piece was brought out of the bucket.<br>\
+		<br><b>Best of luck with your gains. I hope you stay healthy.</b><br><br>\
+		Unsure of what youre supposed to gain, you left the table with the chicken breast.",
+
+		)
+
+/datum/adventure_event/chicken_strife/EventChoiceFormat(obj/machinery/M, mob/living/carbon/human/H)
+	switch(cords)
+		if(1)
+			BUTTON_FORMAT(2, "CHICKEN IS CHICKEN, DUH", M)
+			BUTTON_FORMAT(3, "GOTTA BE THE DRUMSTICKS, ALL RICH AND JUICY", M)
+			BUTTON_FORMAT(4, "THE BREAST OF COURSE, UNSULLIED AND SPOTLESS", M)
+			return
+		if(2)
+			AdjustStatNum(WRATH_STAT, ADV_EVENT_STAT_EASY)
+			AdjustStatNum(GLUTT_STAT, ADV_EVENT_STAT_EASY)
+		if(3)
+			AdjustStatNum(WRATH_STAT, ADV_EVENT_STAT_EASY)
+		if(4)
+			AdjustStatNum(GLUTT_STAT, ADV_EVENT_STAT_EASY)
+
+	return ..()

ModularTegustation/_adventure_console/adventure_events/limbus_company/coffin_return.dm

@@ -51,8 +51,8 @@
 			. += CoinFlipping(M)
 			return
 		if(3)
-			AdjustCurrency(1)
-			AdjustStatNum(RAND_STAT, 1)
+			AdjustCurrency(ADV_EVENT_COIN_EASY)
+			AdjustStatNum(RAND_STAT, ADV_EVENT_STAT_EASY)
 		if(4)
 			CauseBattle(
 				pick(
@@ -69,4 +69,4 @@
 			return
 		if(7)
 			AdjustHitPoint(-27)
-	. = ..()
+	return ..()