Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fever Blossom changes, return of the bock, new canaanite preacher, more degeneracy nuked for Super Earth #96

Merged
merged 19 commits into from
Apr 25, 2024
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/modules/food_and_drinks/recipes/drinks/drinks_fallout.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
9 changes: 6 additions & 3 deletions code/modules/hydroponics/grown/feverblossom.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,21 @@
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
)

/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."
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
20 changes: 12 additions & 8 deletions code/modules/jobs/job_types/wasteland.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1378,7 +1378,8 @@
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
Expand Down Expand Up @@ -1410,26 +1411,29 @@
name = "Crusader"
backpack_contents = list(
/obj/item/clothing/suit/armor/light/knight = 1,
/obj/item/clothing/head/helmet/f13/knighthelmet = 1,
///obj/item/melee/onehanded/machete = 1,
/obj/item/clothing/head/helmet/f13/knighthelmet = 1
)

/datum/outfit/loadout/samaritan
name = "Samaritan"
backpack_contents = list(
/obj/item/reagent_containers/food/snacks/store/bread/plain = 5,
/obj/item/reagent_containers/food/snacks/fishmeat/salmon = 2,
/obj/item/reagent_containers/glass/beaker/waterbottle = 2,
/obj/item/reagent_containers/glass/beaker/waterbottle/wataur = 1
/obj/item/reagent_containers/glass/beaker/waterbottle = 3
) //Matthew 14:17 RSVCE and KJV - Kitsunemitsu
//Nerd shit, wataur time. ~TK
//Wataur is forbidden. - Yuffels

/datum/outfit/loadout/cleanser
name = "Cleanser"
backpack_contents = list(
/obj/item/grenade/homemade/coffeepotbomb = 2, //This is funny. I swear guys.
///obj/item/gun/ballistic/revolver/m29 = 1, //Moved here for more *variety*
///obj/item/ammo_box/m44 = 2
/obj/item/grenade/homemade/coffeepotbomb = 2 //This is funny. I swear guys.
)

/datum/outfit/loadout/newcanaan

Check warning on line 1433 in code/modules/jobs/job_types/wasteland.dm

View workflow job for this annotation

GitHub Actions / Run Linters

nested absolute path inside /datum/outfit/loadout/cleanser
biotear marked this conversation as resolved.
Show resolved Hide resolved
name = "New Canaanite"
backpack_contents = list(
/obj/item/gun/ballistic/automatic/pistol/m1911 = 10 //We can't expect God to do all the work.
)


Expand Down
30 changes: 28 additions & 2 deletions fallout/reagents/alcohol.dm
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,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"
Expand Down Expand Up @@ -624,7 +624,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"
Expand Down Expand Up @@ -1181,3 +1181,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
Loading