Adds new reagents and recipes (#3688)

This pr adds some new reagents and recipes, to be used properly with the feature added by #3522.
This commit is contained in:
Alberyk
2017-11-15 20:11:51 -02:00
committed by Werner
parent 7dc02be204
commit 8dd97ed30b
12 changed files with 233 additions and 49 deletions

View File

@@ -20,6 +20,10 @@
taste_sensitivity = TASTE_NUMB
breakcuffs = list(MALE,FEMALE,NEUTER)
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/undead
reagent_tag = IS_UNDEAD
virus_immune = 1
rarity_value = 10
@@ -86,12 +90,16 @@
virus_immune = 1
reagent_tag = IS_UNDEAD
rarity_value = 10
blurb = "Apparitions are vengeful spirits, they are given temporary bodies to fulfill the wicked \
desires of their masters. A common sight among the ranks of the geometer of blood."
remains_type = /obj/effect/decal/cleanable/ash
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/undead
flesh_color = "#551A8B"
flags = NO_BLOOD | NO_SCAN | NO_SLIP | NO_POISON | NO_PAIN | NO_BREATHE | NO_EMBED

View File

@@ -412,7 +412,7 @@
light_range = 2
light_power = 0.5
meat_type = /obj/item/stack/material/steel
unarmed_types = list(/datum/unarmed_attack/punch)
rarity_value = 2

View File

@@ -608,3 +608,47 @@
/datum/reagent/ipecac/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
M.adjustToxLoss(2 * removed) //If you inject it you're doing it wrong
/datum/reagent/azoth
name = "Azoth"
id = "azoth"
description = "Azoth is a miraculous medicine, capable of healing internal injuries."
reagent_state = LIQUID
color = "#BF0000"
taste_description = "bitter metal"
overdose = 5
/datum/reagent/azoth/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
..()
if(ishuman(M))
var/mob/living/carbon/human/H = M
for (var/A in H.organs)
var/obj/item/organ/external/E = A
for (var/X in E.wounds)
var/datum/wound/W = X
if (W && W.internal)
E.wounds -= W
return 1
if(E.status & ORGAN_BROKEN)
E.status &= ~ORGAN_BROKEN
E.stage = 0
return 1
/datum/reagent/azoth/overdose(var/mob/living/carbon/M, var/alien)
M.adjustBruteLoss(5)
/datum/reagent/elixir
name = "Elixir of Life"
id = "elixir_life"
description = "A mythical substance, the cure for the ultimate illness."
color = "#ffd700"
affects_dead = 1
taste_description = "eternal blissfulness"
/datum/reagent/elixir/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
..()
if(ishuman(M))
if(M && M.stat == DEAD)
M.stat = 0
M.visible_message("<span class='danger'>\The [M] shudders violently!!</span>")

View File

@@ -448,4 +448,60 @@
if (!modifier)
modifier = M.add_modifier(/datum/modifier/luminous, MODIFIER_REAGENT, src, _strength = 4, override = MODIFIER_OVERRIDE_STRENGTHEN)
if(isskeleton(M))
M.heal_organ_damage(10 * removed, 15 * removed)
M.heal_organ_damage(10 * removed, 15 * removed)
/datum/reagent/liquid_fire
name = "Liquid Fire"
id = "liquid_fire"
description = "A dangerous flammable chemical, capable of causing fires when in contact with organic matter."
reagent_state = LIQUID
color = "#E25822"
touch_met = 5
taste_description = "metal"
/datum/reagent/liquid_fire/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(istype(M))
M.adjust_fire_stacks(25)
M.IgniteMob()
/datum/reagent/liquid_fire/touch_mob(var/mob/living/L, var/amount)
if(istype(L))
L.adjust_fire_stacks(25)
L.IgniteMob()
/datum/reagent/black_matter
name = "Unstable Black Matter"
id = "black_matter"
description = "A pitch black blend of cosmic origins, handle with care."
color = "#000000"
taste_description = "emptyness"
/datum/reagent/black_matter/touch_turf(var/turf/T)
new /obj/effect/portal/wormhole/jaunt_tunnel(T, volume)
remove_self(volume)
return
/datum/reagent/bluespace_dust
name = "Bluespace Dust"
id = "bluespace_dust"
description = "A dust composed of microscopic bluespace crystals."
color = "#1f8999"
taste_description = "fizzling blue"
/datum/reagent/bluespace_dust/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(prob(25))
M.make_jittery(5)
M << "<span class='warning'>You feel unstable...</span>"
if(prob(10))
do_teleport(M, get_turf(M), 5, asoundin = 'sound/effects/phasein.ogg')
/datum/reagent/bluespace_dust/touch_mob(var/mob/living/L, var/amount)
do_teleport(L, get_turf(L), amount, asoundin = 'sound/effects/phasein.ogg')
/datum/reagent/philosopher_stone
name = "Philosopher's Stone"
id = "philosopher_stone"
description = "A mythical compound, rumored to be the catalyst of fantastic reactions."
color = "#f4c430"
taste_description = "heavenly knowledge"

View File

@@ -606,3 +606,18 @@
/datum/reagent/xenomicrobes/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
M.contract_disease(new /datum/disease/xeno_transformation(0), 1)
/datum/reagent/toxin/undead
name = "Undead Ichor"
id = "undead_ichor"
description = "A wicked liquid with unknown origins and uses."
color = "#b2beb5"
strength = 25
taste_description = "ashes"
/datum/reagent/toxin/undead/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(alien && alien == IS_UNDEAD)
M.heal_organ_damage(10 * removed, 15 * removed)
return
..()

View File

@@ -2492,4 +2492,49 @@
id = "bluebird"
result = "bluebird"
required_reagents = list("gintonic" = 3, "bluecuracao" = 1)
result_amount = 4
result_amount = 4
//transmutation
/datum/chemical_reaction/transmutation_silver
name = "Transmutation: Silver"
id = "transmutation_silver"
result = null
required_reagents = list("iron" = 5, "copper" = 5)
catalysts = list("philosopher_stone" = 1)
result_amount = 1
/datum/chemical_reaction/transmutation_silver/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/stack/material/silver(location)
return
/datum/chemical_reaction/transmutation_gold
name = "Transmutation: Gold"
id = "transmutation_gold"
result = null
required_reagents = list("aluminum" = 5, "silver" = 5)
catalysts = list("philosopher_stone" = 1)
result_amount = 1
/datum/chemical_reaction/transmutation_gold/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/stack/material/gold(location)
return
/datum/chemical_reaction/transmutation_diamond
name = "Transmutation: Diamond"
id = "transmutation_diamond"
result = null
required_reagents = list("carbon" = 5, "gold" = 5)
catalysts = list("philosopher_stone" = 1)
result_amount = 1
/datum/chemical_reaction/transmutation_diamond/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/stack/material/diamond(location)
return

View File

@@ -6,11 +6,12 @@
filling_color = "#FF1C1C"
center_of_mass = list("x"=16, "y"=14)
cooked_icon = "meatstake"
Initialize()
. = ..()
reagents.add_reagent("protein", 6)
reagents.add_reagent("triglyceride", 2)
src.bitesize = 1.5
/obj/item/weapon/reagent_containers/food/snacks/meat/Initialize()
. = ..()
reagents.add_reagent("protein", 6)
reagents.add_reagent("triglyceride", 2)
src.bitesize = 1.5
/obj/item/weapon/reagent_containers/food/snacks/meat/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W,/obj/item/weapon/material/knife))
@@ -41,11 +42,11 @@
/obj/item/weapon/reagent_containers/food/snacks/meat/bug
filling_color = "#E6E600"
Initialize()
. = ..()
reagents.add_reagent("protein", 6)
reagents.add_reagent("phoron", 27)
src.bitesize = 1.5
/obj/item/weapon/reagent_containers/food/snacks/meat/bug/Initialize()
. = ..()
reagents.add_reagent("protein", 6)
reagents.add_reagent("phoron", 27)
src.bitesize = 1.5
/obj/item/weapon/reagent_containers/food/snacks/meat/monkey
//same as plain meat
@@ -54,13 +55,25 @@
name = "corgi meat"
desc = "Tastes like... well, you know."
/obj/item/weapon/reagent_containers/food/snacks/meat/chicken
name = "chicken"
icon_state = "chickenbreast"
cooked_icon = "chickenbreast_cooked"
filling_color = "#BBBBAA"
Initialize()
. = ..()
reagents.remove_reagent("triglyceride", INFINITY)
//Chicken is low fat. Less total calories than other meats
/obj/item/weapon/reagent_containers/food/snacks/meat/chicken/Initialize()
. = ..()
reagents.remove_reagent("triglyceride", INFINITY)
//Chicken is low fat. Less total calories than other meats
/obj/item/weapon/reagent_containers/food/snacks/meat/undead
name = "rotten meat"
desc = "A slab of rotten meat."
icon_state = "shadowmeat"
health = 180
filling_color = "#FF1C1C"
/obj/item/weapon/reagent_containers/food/snacks/meat/undead/Initialize()
. = ..()
reagents.add_reagent("protein", 6)
reagents.add_reagent("undead_ichor", 5)

View File

@@ -139,9 +139,11 @@
var/lich = null
/obj/item/phylactery/New()
..()
/obj/item/phylactery/Initialize()
. = ..()
world_phylactery += src
create_reagents(30)
reagents.add_reagent("undead_ichor", 30)
/obj/item/phylactery/Destroy()
lich << "<span class='danger'>Your phylactery was destroyed, your soul is cast into the abyss as your immortality vanishes away!</span>"

View File

@@ -14,7 +14,8 @@
..()
pixel_x = rand(-5, 5)
pixel_y = rand(-5, 5)
create_reagents(10)
reagents.add_reagent("bluespace_dust", blink_range)
/obj/item/bluespace_crystal/attack_self(mob/user)
user.visible_message("<span class='warning'>[user] crushes [src]!</span>", "<span class='danger'>You crush [src]!</span>")