Fever Blossom changes, return of the bock, new canaanite preacher, mo…

…re degeneracy nuked for Super Earth (#96) Co-authored-by: Marcus D. Johnston <[email protected]>
Foundation-19 · Apr 25, 2024 · fc6d126 · fc6d126
1 parent 6b84c4b
commit fc6d126
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 9 deletions.
diff --git a/code/modules/food_and_drinks/recipes/drinks/drinks_fallout.dm b/code/modules/food_and_drinks/recipes/drinks/drinks_fallout.dm
@@ -315,11 +315,11 @@
 	results = list(/datum/reagent/consumable/ethanol/oldpossum = 3)
 	required_reagents = list(/datum/reagent/consumable/ethanol/beer = 1, /datum/reagent/consumable/flour = 1, /datum/reagent/consumable/mutjuice = 1)
 
-/*/datum/chemical_reaction/bbock
+/datum/chemical_reaction/bbock
 	name = "Ballistic Bock"
 	id = "bbock"
 	results = list(/datum/reagent/consumable/ethanol/bbock = 3)
-	required_reagents = list(/datum/reagent/blackpowder = 1, /datum/reagent/radium = 1, /datum/reagent/water = 1)*/ //Made with TDM in mind. Just no. - Risingstarslash
+	required_reagents = list(/datum/reagent/blackpowder = 1, /datum/reagent/radium = 1, /datum/reagent/water = 1) //Made with TDM in mind. Just no. - Risingstarslash //It's so sad Tomoko Maus nuked Coyote Bayou. - Yuffels
 
 /datum/chemical_reaction/hardlemonade
 	name = "Hard Lemonade"

diff --git a/code/modules/hydroponics/grown/feverblossom.dm b/code/modules/hydroponics/grown/feverblossom.dm
@@ -16,18 +16,22 @@
 	icon_dead = "feverblossom-dead"
 	mutatelist = list()
 	reagents_add = list(
-		/datum/reagent/consumable/nutriment = 0.05
+		/datum/reagent/consumable/nutriment = 0.05,
+		/datum/reagent/medicine/medx = 0.01,
+		/datum/reagent/drug/psycho = 0.01,
+		/datum/reagent/drug/jet = 0.04,
+		/datum/reagent/uranium = 0.05
 	)
 
 /obj/item/reagent_containers/food/snacks/grown/fever_blossom
 	seed = /obj/item/seeds/fever_blossom
 	name = "fever blossom"
-	desc = "A glowing flower of intricate design and a rich scent. It is a known aphrodisiac."
+	desc = "A glowing flower of intricate design and a rich scent. It is a known hallucinogen and numbing agent. It is also highly radioactive."
 	icon_state = "fever_blossom"
 	slot_flags = ITEM_SLOT_HEAD
 	filling_color = "#8000ff"
 	bitesize_mod = 3
 	tastes = list("pleasant flora" = 1)
 	foodtype = VEGETABLES
 	juice_results = list(/datum/reagent/consumable/fever_blossom_juice = 0)
-	distill_reagent = /datum/reagent/consumable/ethanol/between_the_sheets
+	distill_reagent = /datum/reagent/consumable/ethanol/feverdream
diff --git a/code/modules/jobs/job_types/wasteland.dm b/code/modules/jobs/job_types/wasteland.dm
@@ -1378,7 +1378,8 @@ Raider
 	loadout_options = list(
 	/datum/outfit/loadout/crusader, 	//This is kinda a given. You bet.
 	/datum/outfit/loadout/samaritan, 	//Water and food to share with the wastes.
-	/datum/outfit/loadout/cleanser		//Just some bombs.
+	/datum/outfit/loadout/cleanser,		//Just some bombs.
+	/datum/outfit/loadout/newcanaan		//10 M1911s for the funny gun table.
 	)
 
 	access = list()		//we can expand on this and make alterations as people suggest different loadouts
@@ -1422,7 +1423,8 @@ Raider
 		/obj/item/reagent_containers/glass/beaker/waterbottle = 2,
 	)	//Matthew 14:17 RSVCE and KJV - Kitsunemitsu
 				//Nerd shit, wataur time. ~TK
-					//Both of you need to be reduced to ash. No more furry shit. - Hangyul
+          //Wataur is forbidden. - Yuffels
+					  //Both of you need to be reduced to ash. No more furry shit. - Hangyul
 
 /datum/outfit/loadout/cleanser
 	name = "Cleanser"
@@ -1432,6 +1434,12 @@ Raider
 		///obj/item/ammo_box/m44 = 2
 	)
 
+/datum/outfit/loadout/newcanaan
+	name = "New Canaanite"
+	backpack_contents = list(
+		/obj/item/gun/ballistic/automatic/pistol/m1911 = 10	//We can't expect God to do all the work.
+	)
+
 
 /datum/job/wasteland/f13preacher/after_spawn(mob/living/H, mob/M)
 	. = ..()

diff --git a/fallout/reagents/alcohol.dm b/fallout/reagents/alcohol.dm
@@ -612,7 +612,7 @@
 	glass_name = "Alcohol-Z"
 	glass_desc = "An potent generic spirit, distilled through tacky radiation and intense stirring."
 
-/*/datum/reagent/consumable/ethanol/bbock //TDM Begone
+/datum/reagent/consumable/ethanol/bbock //TDM Begone //Reenabled because furry HATE
 	name = "Ballistic Bock"
 	description = "An explosive cocktail that probably shouldn't be ingested. Fills you with <BIG>BALLISTIC RAGE<BIG>."
 	color = "#333333"
@@ -643,7 +643,7 @@
 	if(iscarbon(M))
 		var/mob/living/carbon/C = M
 		C.cure_trauma_type(rage, TRAUMA_RESILIENCE_ABSOLUTE)
-	..()*/
+	..()
 
 /datum/reagent/consumable/ethanol/bbrew
 	name = "Battle Brew"
@@ -1200,3 +1200,29 @@
 	M.set_drugginess(0)
 	M.hallucination += 0
 	..()
+
+/datum/reagent/consumable/ethanol/feverdream
+	name = "Fever Dream"
+	description = "Life could be a dream."
+	color = "#70D7FF"
+	boozepwr = 100
+	taste_description = "fantasy"
+	glass_icon_state = "glass_brown"
+	glass_name = "Fever Dream"
+	glass_desc = "Life could be a dream."
+	var/datum/brain_trauma/special/imaginary_friend/fren
+	var/datum/brain_trauma/severe/hypnotic_stupor/alice
+
+/datum/reagent/consumable/ethanol/feverdream/on_mob_life(mob/living/carbon/M)
+	var/high_message = pick("<br><font color='#70D7FF'><b>Am I dreaming?...</b></font>", "<br><font color='#70D7FF'><b>Is this real?...</b></font>", "<br><font color='#70D7FF'><b>It's like I'm swimming in fog...</b></font>")
+	if(prob(10))
+		to_chat(M, span_notice("[high_message]"))
+	M.AdjustKnockdown(-10, 0)
+	if(iscarbon(M))
+		var/mob/living/carbon/C = M
+		fren = new()
+		alice = new()
+		C.gain_trauma(fren, TRAUMA_RESILIENCE_SURGERY)
+		C.gain_trauma(alice, TRAUMA_RESILIENCE_SURGERY)
+	..()
+	. = TRUE