Lesser chems (#26782)

* Mannitol, Deitine, gatormix, magica

* blisterol

* make it compile

* ye

* less crappy, more ghetto

* this makes more sense

* mannitol fix

* magica deluxe

* blisterol recipe carbon -> copper

* comment

* one line less
This commit is contained in:
SonixApache
2020-06-19 23:39:46 +02:00
committed by GitHub
parent ef5dd637ca
commit 451af76df9
8 changed files with 209 additions and 7 deletions

View File

@@ -286,6 +286,8 @@
#define MANHATTANFIREBALL "manhattanfireball"
#define FIREBALLCOLA "fireballcola"
#define FIRERITA "firerita"
#define MAGICA "magica"
#define MAGICADELUXE "magicadeluxe"
#define IRISHCOFFEE "irishcoffee"
#define MARGARITA "margarita"
#define BLACKRUSSIAN "blackrussian"
@@ -420,6 +422,10 @@
#define MUSTARD_POWDER "mustard_powder"
#define MAYO "mayo"
#define DIABEETUSOL "diabeetusol"
#define MANNITOL "mannitol"
#define DIETINE "dietine"
#define GATORMIX "gatormix"
#define BLISTEROL "blisterol"
#define TUNGSTEN "tungsten"
#define LITHIUMSODIUMTUNGSTATE "lithiumsodiumtungstate"

View File

@@ -2860,8 +2860,6 @@
density = 1.96
specheatcap = 0.57
/datum/reagent/bicaridine/on_mob_life(var/mob/living/M, var/alien)
if(..())
@@ -2896,6 +2894,25 @@
M.heal_organ_damage(2 * REM)
/datum/reagent/drink/blisterol
name = "Blisterol"
id = BLISTEROL
description = "Blisterol is a deprecated drug used to treat wounds. Renamed and marked as deprecated due to its tendency to cause blisters."
reagent_state = REAGENT_STATE_LIQUID
color = "#C8A5DC"
density = 1.8
specheatcap = 3
adj_temp = 40
custom_metabolism = 1 //goes through you fast
/datum/reagent/blisterol/on_mob_life(var/mob/living/M)
if(..())
return 1
M.heal_organ_damage(4 * REM, -1 * REM) //heal 2 brute, cause 0.5 burn
/datum/reagent/hyperzine
name = "Hyperzine"
id = HYPERZINE
@@ -3869,6 +3886,48 @@
if(M.nutrition < 0) //Prevent from going into negatives
M.nutrition = 0
/datum/reagent/dietine
name = "Dietine"
id = DIETINE
description = "An uncommon makeshift weight loss aid. Mildly toxic, moreso in larger doses."
reagent_state = REAGENT_STATE_LIQUID
color = "#BBEDA4" //rgb: 187, 237, 164
density = 1.44
specheatcap = 60
overdose_am = 5
var/on_a_diet
var/oldmetabolism
/datum/reagent/dietine/on_mob_life(var/mob/living/M)
if(..())
return 1
if(prob(5))
M.adjustToxLoss(1)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(!on_a_diet)
oldmetabolism = H.calorie_burn_rate
on_a_diet = TRUE
H.calorie_burn_rate += H.calorie_burn_rate * 3
if(prob(8))
H.vomit(0,1)
/datum/reagent/dietine/reagent_deleted()
if(ishuman(holder.my_atom))
var/mob/living/carbon/human/H = holder.my_atom
H.calorie_burn_rate -= oldmetabolism / 3
on_a_diet = FALSE
/datum/reagent/dietine/on_overdose(var/mob/living/M)
M.adjustToxLoss(1)
if(ishuman(M))
var/mob/living/carbon/human/H = M
H.vomit(0,1)
/datum/reagent/soysauce
name = "Soysauce"
id = SOYSAUCE
@@ -3928,6 +3987,35 @@
reagent_state = REAGENT_STATE_LIQUID
color = "#FFFACD" //LEMONCHIFFON
/datum/reagent/drink/gatormix
name = "Gator Mix"
id = GATORMIX
description = "A vile sludge of mixed carbohydrates. Makes people more alert. May cause kidney damage in large doses."
nutriment_factor = 8 * REAGENTS_METABOLISM //get fat, son
reagent_state = REAGENT_STATE_LIQUID
color = "#A41D77"
adj_dizzy = -5
adj_drowsy = -5
adj_sleepy = -5
adj_temp = 10
overdose_am = 50
/datum/reagent/gatormix/on_mob_life(var/mob/living/M)
if(..())
return 1
if(ishuman(M) && prob(20))
var/mob/living/carbon/human/H = M
H.Jitter(5)
/datum/reagent/gatormix/on_overdose(var/mob/living/M)
if(ishuman(M) && prob(5))
var/mob/living/carbon/human/H = M
var/datum/organ/internal/heart/killdney = H.get_kidneys()
killdney.damage++
/datum/reagent/capsaicin
name = "Capsaicin Oil"
id = CAPSAICIN
@@ -4696,6 +4784,11 @@
H.adjustToxLoss(0.13)
holder.remove_reagent(src.id, 0.5 * FOOD_METABOLISM)
/datum/reagent/discount/mannitol
name = "Mannitol"
id = MANNITOL
description = "The only medicine a <B>REAL MAN</B> needs."
/datum/reagent/irradiatedbeans
name = "Irradiated Beans"
id = IRRADIATEDBEANS
@@ -5922,6 +6015,52 @@
to_chat(M, "<span class='notice'>You feel hungry like the diona.</span>")
M.add_spell(spell)
/datum/reagent/ethanol/magicadeluxe
name = "Magica Deluxe"
id = MAGICADELUXE
description = "Makes you feel enchanted until the aftertaste hits you."
color = "#009933" //rgb(0, 153, 51)
/datum/reagent/ethanol/magicadeluxe/on_mob_life(var/mob/living/M)
if(..())
return 1
if(M.spell_list.len)
return //one per customer, magicians need not apply
var/list/fake_spells = list()
var/list/choices = getAllWizSpells()
for(var/i=5; i > 0; i--)
var/spell/passive/fakespell = new /spell/passive
var/name_modifier = pick("Efficient ","Efficient ","Free ", "Instant ")
fakespell.spell_flags = STATALLOWED
var/spell/readyup = pick_n_take(choices)
var/spell/fromwhichwetake = new readyup
fakespell.name = fromwhichwetake.name
fakespell.desc = fromwhichwetake.desc
fakespell.hud_state = fromwhichwetake.hud_state
fakespell.invocation = "MAH'JIK"
fakespell.invocation_type = SpI_SHOUT
fakespell.charge_type = Sp_CHARGES
fakespell.charge_counter = 0
fakespell.charge_max = 1
if(prob(20))
fakespell.name = name_modifier + fakespell.name
fake_spells += fakespell
if(!M.spell_list.len) //just to be sure
to_chat(M, "<span class='notice'>You feel magical!</span>")
playsound(M,'sound/effects/summon_guns.ogg', 50, 1)
for (var/spell/majik in fake_spells)
M.add_spell(majik)
if(ishuman(M))
var/mob/living/carbon/human/H = M
var/spell/thisisdumb = new /spell/targeted/equip_item/robesummon
H.add_spell(thisisdumb)
thisisdumb.charge_type = Sp_CHARGES
thisisdumb.charge_counter = 1
thisisdumb.charge_max = 1
H.cast_spell(thisisdumb,list(H))
holder.remove_reagent(MAGICADELUXE,5)
/datum/reagent/ethanol/deadrum
name = "Deadrum"
id = RUM
@@ -6440,6 +6579,13 @@
reagent_state = REAGENT_STATE_LIQUID
color = "#f0133c" //rgb: 240, 19, 60
/datum/reagent/ethanol/deadrum/magica
name = "Magica"
id = MAGICA
description = "A bitter mix with a burning aftertaste."
reagent_state = REAGENT_STATE_LIQUID
color = "#774F1B"
/datum/reagent/ethanol/deadrum/b52
name = "B-52"
id = B52

View File

@@ -338,6 +338,13 @@
required_reagents = list(SILICON = 1, CARBON = 1)
result_amount = 2
/datum/chemical_reaction/blisterol
name = "Blisterol"
id = BLISTEROL
result = BLISTEROL
required_reagents = list(ALUMINIUM = 1, COPPER = 1, FUEL = 2)
result_amount = 3
/datum/chemical_reaction/virus_food
name = "Virus Food"
id = VIRUSFOOD
@@ -698,6 +705,20 @@
required_reagents = list(SODIUMCHLORIDE = 1, ETHANOL = 1, RADIUM = 1)
result_amount = 3
/datum/chemical_reaction/dietine
name = "Dietine"
id = DIETINE
result = DIETINE
required_reagents = list(SODIUMCHLORIDE = 1, COFFEE = 3, LITHIUM = 1, FUEL = 1)
result_amount = 1
/datum/chemical_reaction/gatormix
name = "Gator Mix"
id = GATORMIX
result = GATORMIX
required_reagents = list(NUTRIMENT = 1, COFFEE = 1, COLA = 1, EGG_YOLK = 1, FUEL = 1)
result_amount = 5
/datum/chemical_reaction/carp_pheromones
name = "Carp pheromones"
id = CARPPHEROMONES
@@ -840,6 +861,13 @@
required_catalysts = list(FLUORINE = 5)
result_amount = 1
/datum/chemical_reaction/mannitol
name = "Mannitol"
id = MANNITOL
result = MANNITOL
required_reagents = list(DISCOUNT = 1, ICE = 1, BEFF = 1)
result_amount = 2
/datum/chemical_reaction/piccolyn
name = "Piccolyn"
id = PICCOLYN
@@ -3046,6 +3074,20 @@
required_reagents = list(CINNAMONWHISKY = 1, TRIPLESEC = 1, TEQUILA = 3)
result_amount = 5
/datum/chemical_reaction/magica
name = "Magica"
id = MAGICA
result = MAGICA
required_reagents = list(CINNAMONWHISKY = 1, BITTERS = 1)
result_amount = 2
/datum/chemical_reaction/magicadeluxe
name = "Magica Deluxe"
id = MAGICADELUXE
result = MAGICADELUXE
required_reagents = list(MAGICA = 1, KARMOTRINE = 1)
result_amount = 1
//Cafe stuff!
/datum/chemical_reaction/acidtea
name = "Earl's Grey Tea"

View File

@@ -511,7 +511,7 @@
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/mannsdrink/New()
..()
reagents.add_reagent(DISCOUNT, 30)
reagents.add_reagent(WATER, 20)
reagents.add_reagent(MANNITOL, 20)
src.pixel_x = rand(-10, 10) * PIXEL_MULTIPLIER
src.pixel_y = rand(-10, 10) * PIXEL_MULTIPLIER

View File

@@ -741,6 +741,14 @@
icon_state= "firerita"
name = "firerita"
desc = "Looks pretty, offends a sane person's taste buds. Then again, anyone who orders this probably lacks one of those two traits."
if(MAGICA)
icon_state= "magica"
name = "magica"
desc = "Bitter, with an annoying aftertaste of spice. Supposedly inspired by wearers of bath robes."
if(MAGICADELUXE)
icon_state= "magicadeluxe"
name = "magica deluxe"
desc = "Makes you feel positively enchanted, until the aftertaste hits you."
else
icon_state ="glass_colour"

View File

@@ -13,7 +13,7 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now
var/specialization //Used for what list they belong to in the spellbook. SSOFFENSIVE, SSDEFENSIVE, SSUTILITY
var/charge_type = Sp_RECHARGE //can be recharge or charges, see charge_max and charge_counter descriptions; can also be based on the holder's vars now, use "holder_var" for that; can ALSO be made to gradually drain the charge with Sp_GRADUAL
//The following are allowed: Sp_RECHARGE (Recharges), Sp_CHARGE (Limited uses), Sp_GRADUAL (Gradually lose charges), Sp_PASSIVE (Does not cast)
//The following are allowed: Sp_RECHARGE (Recharges), Sp_CHARGES (Limited uses), Sp_GRADUAL (Gradually lose charges), Sp_PASSIVE (Does not cast)
var/initial_charge_max = 100 //Used to calculate cooldown reduction
var/charge_max = 100 //recharge time in deciseconds if charge_type = Sp_RECHARGE or starting charges if charge_type = Sp_CHARGES

View File

@@ -70,7 +70,7 @@
"[slot_wear_mask]" = /obj/item/clothing/mask/breath,
"[slot_s_store]" = /obj/item/weapon/tank/oxygen/yellow)
usr.visible_message("<span class='danger'>[user] puts on \his robe and wizard hat!</span>", \
user.visible_message("<span class='danger'>[user] puts on \his robe and wizard hat!</span>", \
"<span class='danger'>You put on your robe and wizard hat!</span>")
..()

Binary file not shown.

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 105 KiB