cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-13 00:47:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Adds k'ois contaminated phoron (1)" (#15719)

Browse Source
This commit is contained in:
Sniblet
2023-02-03 21:05:29 -05:00
committed by GitHub
parent 7a739a464a
commit e7b5f5fc38
20 changed files with 113 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Machinery.dm
+1 -1
View File
@@ -327,7 +327,7 @@
var/list/sheet_reagents = list( //have a number of reagents which is a factor of REAGENTS_PER_SHEET (default 20) unless you like decimals
/obj/item/stack/material/iron = list(/singleton/reagent/iron),
/obj/item/stack/material/uranium = list(/singleton/reagent/uranium),
/obj/item/stack/material/phoron = list(/singleton/reagent/toxin/phoron/pure),
/obj/item/stack/material/phoron = list(/singleton/reagent/toxin/phoron),
/obj/item/stack/material/gold = list(/singleton/reagent/gold),
/obj/item/stack/material/silver = list(/singleton/reagent/silver),
/obj/item/stack/material/platinum = list(/singleton/reagent/platinum),
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
-46
View File
@@ -158,52 +158,6 @@
T.assume_gas(GAS_PHORON, amount, T20C)
remove_self(amount, holder)
/singleton/reagent/toxin/phoron/kois
name = "Phoron"
description = "Phoron in its liquid form. Twice as potent when breathed in. Contains biological traces."
fallback_specific_heat = 0.75 //contaminated phoron acts more like k'ois than phoron
var/kois_type = 1
/singleton/reagent/toxin/phoron/kois/black
name = "Phoron"
description = "Phoron in its liquid form. Twice as potent when breathed in. Contains exotic biological traces."
fallback_specific_heat = 0.5 //same as black k'ois
kois_type = 2
/singleton/reagent/toxin/phoron/kois/affect_blood(var/mob/living/carbon/human/M, var/alien, var/removed, var/datum/reagents/holder)
if(!ishuman(M))
return
var/is_vaurcalike = (alien == IS_VAURCA)
if(!is_vaurcalike)
var/obj/item/organ/internal/parasite/P = M.internal_organs_by_name["blackkois"]
if(istype(P) && P.stage >= 3)
is_vaurcalike = TRUE
else
infect(M, alien, removed)
/singleton/reagent/toxin/phoron/kois/affect_chem_effect(mob/living/carbon/M, alien, removed, datum/reagents/holder)
var/is_vaurcalike = (alien == IS_VAURCA)
if(!is_vaurcalike)
var/obj/item/organ/internal/parasite/P = M.internal_organs_by_name["blackkois"]
if(istype(P) && P.stage >= 3)
is_vaurcalike = TRUE
/singleton/reagent/toxin/phoron/kois/proc/infect(var/mob/living/carbon/human/H, var/alien, var/removed)
var/obj/item/organ/internal/parasite/P = H.internal_organs_by_name["blackkois"]
if((alien != IS_VAURCA) && !(istype(P) && P.stage >= 3))
H.adjustToxLoss(1 * removed)
switch(kois_type)
if(1) //Normal
if(!H.internal_organs_by_name["kois"] && prob(5*removed))
var/obj/item/organ/external/affected = H.get_organ(BP_CHEST)
var/obj/item/organ/internal/parasite/kois/infest = new()
infest.replaced(H, affected)
if(2) //Modified
if(!H.internal_organs_by_name["blackkois"] && prob(10*removed))
var/obj/item/organ/external/affected = H.get_organ(BP_HEAD)
var/obj/item/organ/internal/parasite/blackkois/infest = new()
infest.replaced(H, affected)
/singleton/reagent/toxin/cardox
name = "Cardox"
description = "Cardox is a mildly toxic, expensive, NanoTrasen designed cleaner intended to eliminate liquid phoron stains from suits."
code/modules/reagents/Chemistry-Recipes.dm
+32 -32
View File
@@ -176,7 +176,7 @@
id = "oxycomorphine"
result = /singleton/reagent/oxycomorphine
required_reagents = list(/singleton/reagent/alcohol = 1, /singleton/reagent/mortaphenyl = 1)
catalysts = list(/singleton/reagent/toxin/phoron/pure = 5)
catalysts = list(/singleton/reagent/toxin/phoron = 5)
result_amount = 1
/datum/chemical_reaction/sterilizine
@@ -269,7 +269,7 @@
id = "peridaxon"
result = /singleton/reagent/peridaxon
required_reagents = list(/singleton/reagent/bicaridine = 1, /singleton/reagent/clonexadone = 1)
catalysts = list(/singleton/reagent/toxin/phoron/pure = 5)
catalysts = list(/singleton/reagent/toxin/phoron = 5)
result_amount = 1
/datum/chemical_reaction/virus_food
@@ -284,7 +284,7 @@
id = "leporazine"
result = /singleton/reagent/leporazine
required_reagents = list(/singleton/reagent/silicon = 1, /singleton/reagent/copper = 1)
catalysts = list(/singleton/reagent/toxin/phoron/pure = 5)
catalysts = list(/singleton/reagent/toxin/phoron = 5)
result_amount = 2
/datum/chemical_reaction/cryptobiolin
@@ -313,7 +313,7 @@
id = "dexalin"
result = /singleton/reagent/dexalin
required_reagents = list(/singleton/reagent/acetone = 2, /singleton/reagent/toxin/phoron = 0.1)
catalysts = list(/singleton/reagent/toxin/phoron/pure = 1)
catalysts = list(/singleton/reagent/toxin/phoron = 1)
inhibitors = list(/singleton/reagent/water = 1) // Messes with cryox
result_amount = 1
@@ -371,8 +371,8 @@
name = "Clonexadone"
id = "clonexadone"
result = /singleton/reagent/clonexadone
required_reagents = list(/singleton/reagent/cryoxadone = 1, /singleton/reagent/sodium = 1, /singleton/reagent/toxin/phoron/pure = 0.1)
catalysts = list(/singleton/reagent/toxin/phoron/pure = 5)
required_reagents = list(/singleton/reagent/cryoxadone = 1, /singleton/reagent/sodium = 1, /singleton/reagent/toxin/phoron = 0.1)
catalysts = list(/singleton/reagent/toxin/phoron = 5)
result_amount = 2
/datum/chemical_reaction/thetamycin
@@ -458,7 +458,7 @@
name = "Potassium Chlorophoride"
id = "potassium_chlorophoride"
result = /singleton/reagent/toxin/potassium_chlorophoride
required_reagents = list(/singleton/reagent/toxin/potassium_chloride = 1, /singleton/reagent/toxin/phoron/pure = 1, /singleton/reagent/polysomnine = 1)
required_reagents = list(/singleton/reagent/toxin/potassium_chloride = 1, /singleton/reagent/toxin/phoron = 1, /singleton/reagent/polysomnine = 1)
result_amount = 4
/datum/chemical_reaction/zombiepowder
@@ -472,7 +472,7 @@
name = "Dextrotoxin"
id = "dextrotoxin"
result = /singleton/reagent/toxin/dextrotoxin
required_reagents = list(/singleton/reagent/toxin/carpotoxin = 3, /singleton/reagent/soporific = 10, /singleton/reagent/toxin/phoron/pure = 5)
required_reagents = list(/singleton/reagent/toxin/carpotoxin = 3, /singleton/reagent/soporific = 10, /singleton/reagent/toxin/phoron = 5)
result_amount = 5
/datum/chemical_reaction/mindbreaker
@@ -574,7 +574,7 @@
id = "condensedcapsaicin"
result = /singleton/reagent/capsaicin/condensed
required_reagents = list(/singleton/reagent/capsaicin = 2)
catalysts = list(/singleton/reagent/toxin/phoron/pure = 5)
catalysts = list(/singleton/reagent/toxin/phoron = 5)
result_amount = 1
/datum/chemical_reaction/coolant
@@ -597,7 +597,7 @@
id = "lexorin"
result = /singleton/reagent/lexorin
required_reagents = list(/singleton/reagent/tungsten = 1, /singleton/reagent/hydrazine = 1, /singleton/reagent/ammonia = 1)
catalysts = list(/singleton/reagent/toxin/phoron/pure = 5)
catalysts = list(/singleton/reagent/toxin/phoron = 5)
result_amount = 3
/datum/chemical_reaction/fluvectionem
@@ -655,14 +655,14 @@
id = "saline"
result = /singleton/reagent/saline
required_reagents = list(/singleton/reagent/water = 2, /singleton/reagent/sugar = 0.5, /singleton/reagent/sodiumchloride = 1)
catalysts = list(/singleton/reagent/toxin/phoron/pure = 5)
catalysts = list(/singleton/reagent/toxin/phoron = 5)
result_amount = 2
/datum/chemical_reaction/cataleptinol
name = "Cataleptinol"
id = "cataleptinol"
result = /singleton/reagent/cataleptinol
required_reagents = list(/singleton/reagent/toxin/phoron/pure = 0.1, /singleton/reagent/alkysine = 1, /singleton/reagent/cryoxadone = 0.1)
required_reagents = list(/singleton/reagent/toxin/phoron = 0.1, /singleton/reagent/alkysine = 1, /singleton/reagent/cryoxadone = 0.1)
result_amount = 1
/datum/chemical_reaction/coughsyrup
@@ -747,7 +747,7 @@
name = "Truthserum"
id = "truthserum"
result = /singleton/reagent/mental/truthserum
required_reagents = list(/singleton/reagent/mindbreaker = 1, /singleton/reagent/synaptizine = 1, /singleton/reagent/toxin/phoron/pure = 0.1)
required_reagents = list(/singleton/reagent/mindbreaker = 1, /singleton/reagent/synaptizine = 1, /singleton/reagent/toxin/phoron = 0.1)
result_amount = 2
/datum/chemical_reaction/pacifier
@@ -761,7 +761,7 @@
name = "Red Nightshade"
id = "berserk"
result = /singleton/reagent/toxin/berserk
required_reagents = list(/singleton/reagent/toxin/stimm = 1, /singleton/reagent/synaptizine = 1, /singleton/reagent/toxin/phoron/pure = 0.1)
required_reagents = list(/singleton/reagent/toxin/stimm = 1, /singleton/reagent/synaptizine = 1, /singleton/reagent/toxin/phoron = 0.1)
result_amount = 1
/datum/chemical_reaction/joy
@@ -824,7 +824,7 @@
name = "Solid Phoron"
id = "solidphoron"
result = null
required_reagents = list(/singleton/reagent/iron = 5, /singleton/reagent/frostoil = 5, /singleton/reagent/toxin/phoron/pure = 20)
required_reagents = list(/singleton/reagent/iron = 5, /singleton/reagent/frostoil = 5, /singleton/reagent/toxin/phoron = 20)
result_amount = 1
/datum/chemical_reaction/phoronsolidification/on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -922,7 +922,7 @@
name = "Napalm"
id = "napalm"
result = null
required_reagents = list(/singleton/reagent/aluminum = 1, /singleton/reagent/toxin/phoron/pure = 1, /singleton/reagent/acid = 1 )
required_reagents = list(/singleton/reagent/aluminum = 1, /singleton/reagent/toxin/phoron = 1, /singleton/reagent/acid = 1 )
result_amount = 1
/datum/chemical_reaction/napalm/on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -944,7 +944,7 @@
name = "Zo'rane Fire"
id = "greekfire"
result = /singleton/reagent/fuel/napalm
required_reagents = list(/singleton/reagent/nitroglycerin = 2, /singleton/reagent/pyrosilicate = 2, /singleton/reagent/toxin/phoron/pure = 3, /singleton/reagent/fuel/zoragel = 3)
required_reagents = list(/singleton/reagent/nitroglycerin = 2, /singleton/reagent/pyrosilicate = 2, /singleton/reagent/toxin/phoron = 3, /singleton/reagent/fuel/zoragel = 3)
result_amount = 1
log_is_important = 1
@@ -1066,7 +1066,7 @@
name = "Slime Spawn"
id = "m_spawn"
result = null
required_reagents = list(/singleton/reagent/toxin/phoron/pure = 1)
required_reagents = list(/singleton/reagent/toxin/phoron = 1)
result_amount = 1
required = /obj/item/slime_extract/grey
@@ -1091,7 +1091,7 @@
/datum/chemical_reaction/slime/teleportation
name = "Slime Teleportation"
id = "slimeteleportation"
required_reagents = list(/singleton/reagent/toxin/phoron/pure = 5)
required_reagents = list(/singleton/reagent/toxin/phoron = 5)
result_amount = 1
required = /obj/item/slime_extract/green
@@ -1130,7 +1130,7 @@
name = "Slime Metal"
id = "m_metal"
result = null
required_reagents = list(/singleton/reagent/toxin/phoron/pure = 1)
required_reagents = list(/singleton/reagent/toxin/phoron = 1)
result_amount = 1
required = /obj/item/slime_extract/metal
@@ -1203,7 +1203,7 @@
name = "Slime Bork"
id = "m_tele2"
result = null
required_reagents = list(/singleton/reagent/toxin/phoron/pure = 1)
required_reagents = list(/singleton/reagent/toxin/phoron = 1)
result_amount = 1
required = /obj/item/slime_extract/silver
@@ -1300,7 +1300,7 @@
name = "Slime fire"
id = "m_fire"
result = null
required_reagents = list(/singleton/reagent/toxin/phoron/pure = 1)
required_reagents = list(/singleton/reagent/toxin/phoron = 1)
result_amount = 1
required = /obj/item/slime_extract/orange
mix_message = "The slime extract begins to vibrate violently!"
@@ -1360,7 +1360,7 @@
name = "Slime Steroid"
id = "m_steroid"
result = null
required_reagents = list(/singleton/reagent/toxin/phoron/pure = 1)
required_reagents = list(/singleton/reagent/toxin/phoron = 1)
result_amount = 1
required = /obj/item/slime_extract/purple
@@ -1382,7 +1382,7 @@
name = "Slime Rare Metal"
id = "rm_metal"
result = null
required_reagents = list(/singleton/reagent/toxin/phoron/pure = 1)
required_reagents = list(/singleton/reagent/toxin/phoron = 1)
result_amount = 1
required = /obj/item/slime_extract/darkpurple
@@ -1417,7 +1417,7 @@
name = "Slime Nightshade"
id = "slime_nightshade"
result = /singleton/reagent/toxin/berserk
required_reagents = list(/singleton/reagent/toxin/phoron/pure = 10)
required_reagents = list(/singleton/reagent/toxin/phoron = 10)
result_amount = 1
required = /obj/item/slime_extract/red
@@ -1426,7 +1426,7 @@
name = "Docility Serum"
id = "docility_serum"
result = null
required_reagents = list(/singleton/reagent/toxin/phoron/pure = 1)
required_reagents = list(/singleton/reagent/toxin/phoron = 1)
result_amount = 1
required = /obj/item/slime_extract/pink
@@ -1447,7 +1447,7 @@
name = "Advanced Mutation Toxin"
id = "mutationtoxin2"
result = /singleton/reagent/aslimetoxin
required_reagents = list(/singleton/reagent/toxin/phoron/pure = 5)
required_reagents = list(/singleton/reagent/toxin/phoron = 5)
result_amount = 1
required = /obj/item/slime_extract/black
@@ -1456,7 +1456,7 @@
name = "Slime Explosion"
id = "m_explosion"
result = null
required_reagents = list(/singleton/reagent/toxin/phoron/pure = 1)
required_reagents = list(/singleton/reagent/toxin/phoron = 1)
result_amount = 1
required = /obj/item/slime_extract/oil
mix_message = "The slime extract begins to vibrate violently!"
@@ -1484,7 +1484,7 @@
result = null
result_amount = 1
required = /obj/item/slime_extract/lightpink
required_reagents = list(/singleton/reagent/toxin/phoron/pure = 5)
required_reagents = list(/singleton/reagent/toxin/phoron = 5)
/datum/chemical_reaction/slime/advanced_docility_serum/on_reaction(var/datum/reagents/holder)
..()
@@ -1495,7 +1495,7 @@
name = "Slime Golem"
id = "m_golem"
result = null
required_reagents = list(/singleton/reagent/toxin/phoron/pure = 5)
required_reagents = list(/singleton/reagent/toxin/phoron = 5)
result_amount = 1
required = /obj/item/slime_extract/adamantine
mix_message = "A soft fizzle is heard within the slime extract, and mystic runes suddenly appear on the floor beneath it!"
@@ -1626,7 +1626,7 @@
name = "Extract Enhancer"
id = "extract_enhancer"
result = null
required_reagents = list(/singleton/reagent/toxin/phoron/pure = 1)
required_reagents = list(/singleton/reagent/toxin/phoron = 1)
result_amount = 1
required = /obj/item/slime_extract/cerulean
@@ -2141,7 +2141,7 @@
name = "Toxins Special"
id = "phoronspecial"
result = /singleton/reagent/alcohol/toxins_special
required_reagents = list(/singleton/reagent/alcohol/rum = 2, /singleton/reagent/alcohol/vermouth = 2, /singleton/reagent/toxin/phoron/pure = 2)
required_reagents = list(/singleton/reagent/alcohol/rum = 2, /singleton/reagent/alcohol/vermouth = 2, /singleton/reagent/toxin/phoron = 2)
result_amount = 6
/datum/chemical_reaction/drink/beepsky_smash
code/modules/reagents/reagent_containers/food/cans.dm
+1 -1
View File
@@ -337,7 +337,7 @@
icon_state = "phoron_punch"
center_of_mass = list("x"=16, "y"=8)
can_size_overrides = list("x" = 1)
reagents_to_add = list(/singleton/reagent/kois/clean = 10, /singleton/reagent/toxin/phoron/pure = 5)
reagents_to_add = list(/singleton/reagent/kois/clean = 10, /singleton/reagent/toxin/phoron = 5)
/obj/item/reagent_containers/food/drinks/cans/root_beer
name = "\improper RnD Root Beer"
code/modules/reagents/reagent_containers/food/snacks.dm
+15 -15
View File
@@ -438,7 +438,7 @@
trash = /obj/item/trash/koisbar
filling_color = "#dcd9cd"
bitesize = 5
reagents_to_add = list(/singleton/reagent/kois/clean = 10, /singleton/reagent/toxin/phoron/pure = 15)
reagents_to_add = list(/singleton/reagent/kois/clean = 10, /singleton/reagent/toxin/phoron = 15)
/obj/item/reagent_containers/food/snacks/koisbar
name = "organic k'ois bar"
@@ -447,7 +447,7 @@
trash = /obj/item/trash/koisbar
filling_color = "#dcd9cd"
bitesize = 5
reagents_to_add = list(/singleton/reagent/kois = 10, /singleton/reagent/toxin/phoron/kois = 15)
reagents_to_add = list(/singleton/reagent/kois = 10, /singleton/reagent/toxin/phoron = 15)
/obj/item/reagent_containers/food/snacks/salad/aesirsalad
name = "aesir salad"
@@ -656,7 +656,7 @@
if(4)
reagents.add_reagent(/singleton/reagent/nutriment/sprinkles, 3)
if(5)
reagents.add_reagent(/singleton/reagent/toxin/phoron/pure, 3)
reagents.add_reagent(/singleton/reagent/toxin/phoron, 3)
if(6)
reagents.add_reagent(/singleton/reagent/nutriment/coco, 3)
if(7)
@@ -4101,7 +4101,7 @@
icon_state = "friedkois"
filling_color = "#E6E600"
bitesize = 5
reagents_to_add = list(/singleton/reagent/kois = 6, /singleton/reagent/toxin/phoron/kois = 9)
reagents_to_add = list(/singleton/reagent/kois = 6, /singleton/reagent/toxin/phoron = 9)
/obj/item/reagent_containers/food/snacks/friedkois/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W,/obj/item/stack/rods))
@@ -4121,7 +4121,7 @@
trash = /obj/item/stack/rods
filling_color = "#E6E600"
bitesize = 3
reagents_to_add = list(/singleton/reagent/kois = 8, /singleton/reagent/toxin/phoron/kois = 12)
reagents_to_add = list(/singleton/reagent/kois = 8, /singleton/reagent/toxin/phoron = 12)
/obj/item/reagent_containers/food/snacks/koiskebab1/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W,/obj/item/reagent_containers/food/snacks/friedkois))
@@ -4137,7 +4137,7 @@
trash = /obj/item/stack/rods
filling_color = "#E6E600"
bitesize = 6
reagents_to_add = list(/singleton/reagent/kois = 12, /singleton/reagent/toxin/phoron/kois = 16)
reagents_to_add = list(/singleton/reagent/kois = 12, /singleton/reagent/toxin/phoron = 16)
/obj/item/reagent_containers/food/snacks/koiskebab2/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W,/obj/item/reagent_containers/food/snacks/friedkois))
@@ -4153,7 +4153,7 @@
trash = /obj/item/stack/rods
filling_color = "#E6E600"
bitesize = 9
reagents_to_add = list(/singleton/reagent/kois = 16, /singleton/reagent/toxin/phoron/kois = 20)
reagents_to_add = list(/singleton/reagent/kois = 16, /singleton/reagent/toxin/phoron = 20)
/obj/item/reagent_containers/food/snacks/soup/kois
name = "k'ois paste"
@@ -4162,7 +4162,7 @@
filling_color = "#4E6E600"
bitesize = 6
reagents_to_add = list(/singleton/reagent/kois = 15, /singleton/reagent/toxin/phoron/kois = 15)
reagents_to_add = list(/singleton/reagent/kois = 15, /singleton/reagent/toxin/phoron = 15)
/obj/item/reagent_containers/food/snacks/koiswaffles
name = "k'ois waffles"
@@ -4172,7 +4172,7 @@
drop_sound = /singleton/sound_category/tray_hit_sound
filling_color = "#E6E600"
bitesize = 8
reagents_to_add = list(/singleton/reagent/kois = 25, /singleton/reagent/toxin/phoron/kois = 15)
reagents_to_add = list(/singleton/reagent/kois = 25, /singleton/reagent/toxin/phoron = 15)
/obj/item/reagent_containers/food/snacks/koisjelly
name = "k'ois jelly"
@@ -4180,7 +4180,7 @@
icon_state = "koisjelly"
filling_color = "#E6E600"
bitesize = 10
reagents_to_add = list(/singleton/reagent/kois = 25, /singleton/reagent/oculine = 20, /singleton/reagent/toxin/phoron/kois = 25)
reagents_to_add = list(/singleton/reagent/kois = 25, /singleton/reagent/oculine = 20, /singleton/reagent/toxin/phoron = 25)
//unathi snacks - sprites by Araskael
@@ -5442,7 +5442,7 @@
desc = "Some well-done k'ois, grilled to perfection."
icon_state = "kois_steak"
filling_color = "#dcd9cd"
reagents_to_add = list(/singleton/reagent/kois = 20, /singleton/reagent/toxin/phoron/kois = 15)
reagents_to_add = list(/singleton/reagent/kois = 20, /singleton/reagent/toxin/phoron = 15)
bitesize = 7
/obj/item/reagent_containers/food/snacks/donut/kois
@@ -5451,7 +5451,7 @@
icon_state = "kois_donut"
filling_color = "#dcd9cd"
overlay_state = "box-kois_donut"
reagents_to_add = list(/singleton/reagent/kois = 15, /singleton/reagent/toxin/phoron/kois = 10)
reagents_to_add = list(/singleton/reagent/kois = 15, /singleton/reagent/toxin/phoron = 10)
bitesize = 5
/obj/item/reagent_containers/food/snacks/koismuffin
@@ -5459,7 +5459,7 @@
desc = "Baked k'ois goop, molded into a little cake."
icon_state = "kois_muffin"
filling_color = "#dcd9cd"
reagents_to_add = list(/singleton/reagent/kois = 10, /singleton/reagent/toxin/phoron/kois = 15)
reagents_to_add = list(/singleton/reagent/kois = 10, /singleton/reagent/toxin/phoron = 15)
bitesize = 5
/obj/item/reagent_containers/food/snacks/koisburger
@@ -5467,7 +5467,7 @@
desc = "K'ois inside k'ois. Peak Vaurcesian cuisine."
icon_state = "kois_burger"
filling_color = "#dcd9cd"
reagents_to_add = list(/singleton/reagent/kois = 20, /singleton/reagent/toxin/phoron/kois = 20)
reagents_to_add = list(/singleton/reagent/kois = 20, /singleton/reagent/toxin/phoron = 20)
bitesize = 8
/obj/item/storage/box/fancy/vkrexitaffy
@@ -5570,7 +5570,7 @@
desc = "Rock candy popular in Flagsdale. Actually contains phoron."
icon_state = "rock_candy"
filling_color = "#ff22d9"
reagents_to_add = list(/singleton/reagent/toxin/phoron/pure = 25)
reagents_to_add = list(/singleton/reagent/toxin/phoron = 25)
bitesize = 5
trash = /obj/item/trash/phoroncandy
code/modules/reagents/reagent_containers/food/snacks/meat.dm
+2 -2
View File
@@ -30,7 +30,7 @@
/obj/item/reagent_containers/food/snacks/meat/bug
filling_color = "#E6E600"
reagents_to_add = list(/singleton/reagent/nutriment/protein = 6, /singleton/reagent/nutriment/triglyceride = 2, /singleton/reagent/toxin/phoron/pure = 27)
reagents_to_add = list(/singleton/reagent/nutriment/protein = 6, /singleton/reagent/nutriment/triglyceride = 2, /singleton/reagent/toxin/phoron = 27)
bitesize = 1.5
/obj/item/reagent_containers/food/snacks/meat/monkey
@@ -104,4 +104,4 @@
name = "bat wings"
desc = "Like chicken wings, but with even less meat!"
icon_state = "batmeat"
reagents_to_add = list(/singleton/reagent/nutriment/protein = 1)
reagents_to_add = list(/singleton/reagent/nutriment/protein = 1)
code/modules/reagents/reagent_containers/inhaler.dm
+2 -2
View File
@@ -207,7 +207,7 @@
/obj/item/reagent_containers/inhaler/phoron/Initialize()
. =..()
reagents.add_reagent(/singleton/reagent/toxin/phoron/pure, volume)
reagents.add_reagent(/singleton/reagent/toxin/phoron, volume)
update_icon()
return
@@ -221,7 +221,7 @@
/obj/item/reagent_containers/inhaler/phoron_special/Initialize()
. =..()
reagents.add_reagent(/singleton/reagent/toxin/phoron/pure, volume)
reagents.add_reagent(/singleton/reagent/toxin/phoron, volume)
update_icon()
return