From 99b8b251ebe9656264547a86890215d07fc0a5cc Mon Sep 17 00:00:00 2001 From: Geeves Date: Sat, 21 Sep 2024 13:24:17 +0200 Subject: [PATCH] Value Reorganization (#19879) Deletes the worths files and moves them to their values instead, ctrl + click will now go to the correct definition in VSCode. No user facing changes. --- aurorastation.dme | 3 - .../objects/items/weapons/material/kitchen.dm | 1 + .../objects/items/weapons/material/knives.dm | 1 + .../weapons/material/material_weapons.dm | 3 + .../objects/items/weapons/material/misc.dm | 4 + .../objects/items/weapons/material/swords.dm | 1 + .../objects/items/weapons/material/thrown.dm | 1 + .../items/weapons/material/twohanded.dm | 6 + code/modules/item_worth/material_weapons.dm | 47 - code/modules/item_worth/materials.dm | 91 -- code/modules/item_worth/reagents.dm | 853 ------------------ code/modules/materials/materials.dm | 34 + code/modules/reagents/Chemistry-Reagents.dm | 3 + .../Chemistry-Reagents-Core.dm | 6 + .../Chemistry-Reagents-Dispenser.dm | 24 + .../Chemistry-Reagents-Drugs.dm | 7 + .../Chemistry-Reagents-Food-Drinks.dm | 324 +++++++ .../Chemistry-Reagents-Medicine.dm | 43 + .../Chemistry-Reagents-Other.dm | 21 + .../Chemistry-Reagents-Toxins.dm | 20 + 20 files changed, 499 insertions(+), 994 deletions(-) delete mode 100644 code/modules/item_worth/material_weapons.dm delete mode 100644 code/modules/item_worth/materials.dm delete mode 100644 code/modules/item_worth/reagents.dm diff --git a/aurorastation.dme b/aurorastation.dme index 16e9bde7339..191dcdea47c 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -2385,9 +2385,6 @@ #include "code\modules\integrated_electronics\~defines\~defines.dm" #include "code\modules\item_worth\_helpers.dm" #include "code\modules\item_worth\item_worth.dm" -#include "code\modules\item_worth\material_weapons.dm" -#include "code\modules\item_worth\materials.dm" -#include "code\modules\item_worth\reagents.dm" #include "code\modules\item_worth\worths_list.dm" #include "code\modules\item_worth\Value_procs\atoms.dm" #include "code\modules\item_worth\Value_procs\mob.dm" diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm index 033961f41d9..8618026da0a 100644 --- a/code/game/objects/items/weapons/material/kitchen.dm +++ b/code/game/objects/items/weapons/material/kitchen.dm @@ -1,6 +1,7 @@ /obj/item/material/kitchen icon = 'icons/obj/kitchen.dmi' contained_sprite = TRUE + worth_multiplier = 1.1 /* * Utensils diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm index 368b5282f17..2deae652d73 100644 --- a/code/game/objects/items/weapons/material/knives.dm +++ b/code/game/objects/items/weapons/material/knives.dm @@ -146,6 +146,7 @@ attack_verb = list("patted", "tapped") force_divisor = 0.25 // 15 when wielded with hardness 60 (steel) thrown_force_divisor = 0.25 // 5 when thrown with weight 20 (steel) + worth_multiplier = 8 /obj/item/material/knife/butterfly/update_force() if(active) diff --git a/code/game/objects/items/weapons/material/material_weapons.dm b/code/game/objects/items/weapons/material/material_weapons.dm index 98cf3cedc61..a673a41d297 100644 --- a/code/game/objects/items/weapons/material/material_weapons.dm +++ b/code/game/objects/items/weapons/material/material_weapons.dm @@ -24,6 +24,9 @@ var/material/material var/drops_debris = TRUE + /// Multiplies the amount this item is worth with the following calculation: material.value * worth_multiplier + var/worth_multiplier = 1 + /obj/item/material/Initialize(var/newloc, var/material_key) . = ..() if(!material_key) diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm index 8e0fe6455c1..eed42ccdd5c 100644 --- a/code/game/objects/items/weapons/material/misc.dm +++ b/code/game/objects/items/weapons/material/misc.dm @@ -8,6 +8,7 @@ force_divisor = 0.3 // 18 with hardness 60 (steel) thrown_force_divisor = 0.85 attack_verb = list("jabbed","stabbed","ripped") + worth_multiplier = 15 /obj/item/material/harpoon/proc/prime() return @@ -45,6 +46,7 @@ drop_sound = 'sound/items/drop/axe.ogg' pickup_sound = 'sound/items/pickup/axe.ogg' surgerysound = 'sound/items/surgery/hatchet.ogg' + worth_multiplier = 6 /obj/item/material/hatchet/can_woodcut() return TRUE @@ -150,6 +152,7 @@ thrown_force_divisor = 0.25 // as above w_class = WEIGHT_CLASS_SMALL attack_verb = list("slashed", "sliced", "cut", "clawed") + worth_multiplier = 6 /obj/item/material/scythe name = "scythe" @@ -169,6 +172,7 @@ slot_flags = SLOT_BACK origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 2) attack_verb = list("chopped", "sliced", "cut", "reaped") + worth_multiplier = 20 /obj/item/material/scythe/sickle name = "sickle" diff --git a/code/game/objects/items/weapons/material/swords.dm b/code/game/objects/items/weapons/material/swords.dm index a434eb8e5a7..387a05b2bc8 100644 --- a/code/game/objects/items/weapons/material/swords.dm +++ b/code/game/objects/items/weapons/material/swords.dm @@ -19,6 +19,7 @@ drop_sound = 'sound/items/drop/sword.ogg' pickup_sound = /singleton/sound_category/sword_pickup_sound equip_sound = /singleton/sound_category/sword_equip_sound + worth_multiplier = 30 /obj/item/material/sword/handle_shield(mob/user, var/on_back, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") var/parry_bonus = 1 diff --git a/code/game/objects/items/weapons/material/thrown.dm b/code/game/objects/items/weapons/material/thrown.dm index 7a5e371afc3..2604992d5cf 100644 --- a/code/game/objects/items/weapons/material/thrown.dm +++ b/code/game/objects/items/weapons/material/thrown.dm @@ -10,6 +10,7 @@ sharp = 1 edge = TRUE w_class = WEIGHT_CLASS_SMALL + worth_multiplier = 25 /obj/item/material/star/Initialize(newloc, material_key) . = ..() diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm index e0332ec1fa2..a80a0d3edbf 100644 --- a/code/game/objects/items/weapons/material/twohanded.dm +++ b/code/game/objects/items/weapons/material/twohanded.dm @@ -215,6 +215,7 @@ use_material_sound = FALSE drop_sound = 'sound/items/drop/axe.ogg' pickup_sound = 'sound/items/pickup/axe.ogg' + worth_multiplier = 31 /obj/item/material/twohanded/fireaxe/afterattack(atom/A, mob/user, proximity) if(!proximity) return @@ -257,6 +258,7 @@ default_material = "glass" var/obj/item/grenade/explosive = null use_material_sound = FALSE + worth_multiplier = 7 //blade + stuff /obj/item/material/twohanded/spear/Destroy() if(explosive) @@ -552,6 +554,7 @@ use_material_sound = FALSE drop_sound = 'sound/items/drop/woodweapon.ogg' pickup_sound = 'sound/items/pickup/woodweapon.ogg' + worth_multiplier = 20 /obj/item/material/twohanded/pike/halberd icon_state = "halberd0" @@ -563,6 +566,7 @@ force_divisor = 0.6 sharp = 1 attack_verb = list("attacked", "poked", "jabbed","gored", "chopped", "cleaved", "torn", "cut", "stabbed") + worth_multiplier = 30 /obj/item/material/twohanded/pike/halberd/can_woodcut() if(wielded) @@ -575,6 +579,7 @@ base_icon = "pitchfork" name = "pitchfork" desc = "An old farming tool, not something you would find at hydroponics." + worth_multiplier = 10 /obj/item/material/twohanded/pike/flag name = "republic of biesel flag" @@ -651,6 +656,7 @@ default_material = "steel" parry_chance = 60 can_embed = 0 + worth_multiplier = 35 var/wielded_ap = 40 var/unwielded_ap = 0 diff --git a/code/modules/item_worth/material_weapons.dm b/code/modules/item_worth/material_weapons.dm deleted file mode 100644 index e76b103e156..00000000000 --- a/code/modules/item_worth/material_weapons.dm +++ /dev/null @@ -1,47 +0,0 @@ -/obj/item/material - var/worth_multiplier = 1 - -//Rule of thumb is: worth more than the parts put in -//Finished good is worth more than its individual parts - -/obj/item/material/kitchen - worth_multiplier = 1.1 - -/obj/item/material/knife/butterfly - worth_multiplier = 8 - -/obj/item/material/harpoon - worth_multiplier = 15 - -/obj/item/material/hatchet - worth_multiplier = 6 - -/obj/item/material/minihoe - worth_multiplier = 6 - -/obj/item/material/scythe - worth_multiplier = 20 - -/obj/item/material/sword - worth_multiplier = 30 - -/obj/item/material/twohanded/fireaxe - worth_multiplier = 31 - -/obj/item/material/twohanded/spear - worth_multiplier = 7 //blade + stuff - -/obj/item/material/star - worth_multiplier = 25 - -/obj/item/material/twohanded/pike - worth_multiplier = 20 - -/obj/item/material/twohanded/pike/halberd - worth_multiplier = 30 - -/obj/item/material/twohanded/pike/pitchfork - worth_multiplier = 10 - -/obj/item/material/twohanded/zweihander - worth_multiplier = 35 diff --git a/code/modules/item_worth/materials.dm b/code/modules/item_worth/materials.dm deleted file mode 100644 index 0a0612983d3..00000000000 --- a/code/modules/item_worth/materials.dm +++ /dev/null @@ -1,91 +0,0 @@ -/material - var/value = 1 - -/material/Destroy(force) - stack_trace("Someone tried to delete a /material.") - . = ..() - return QDEL_HINT_LETMELIVE //Materials cannot be deleted, as you cannot poof the concept out of existence - -/material/uranium - value = 100 - -/material/diamond - value = 170 - -/material/gold - value = 40 - -/material/silver - value = 35 - -/material/bronze - value = 25 - -/material/phoron - value = 150 - -/material/stone/marble - value = 4 - -/material/steel - value = 4 - -/material/diona - value = 5 - -/material/steel/holographic - value = 0 - -/material/plasteel - value = 12 - -/material/plasteel/titanium - value = 10 - -/material/glass/reinforced - value = 2 - -/material/glass/phoron - value = 30 - -/material/glass/phoron/reinforced - value = 40 - -/material/osmium - value = 30 - -/material/tritium - value = 300 - -/material/mhydrogen - value = 100 - -/material/platinum - value = 200 - -/material/iron - value = 5 - -/material/wood - value = 3 - -/material/wood/holographic - value = 0 - -/material/cardboard - value = 0 - -/material/leather - value = 3 - -/material/hide - value = 5 - -/material/hide/human - value = 35 - -/material/bone - value = 5 - -/material/bone/necromancer - value = 50 diff --git a/code/modules/item_worth/reagents.dm b/code/modules/item_worth/reagents.dm deleted file mode 100644 index 2cb91bfa47f..00000000000 --- a/code/modules/item_worth/reagents.dm +++ /dev/null @@ -1,853 +0,0 @@ -//These value assume that each unit is roughly a gram - -/singleton/reagent - var/value = 1 //per unit - -/singleton/reagent/blood - value = 2 - -/singleton/reagent/water - value = 0 - -/singleton/reagent/fuel - value = 6.8 - -/singleton/reagent/acetone - value = 0.27 - -/singleton/reagent/aluminum - value = 0.02 - -/singleton/reagent/ammonia - value = 0.01 - -/singleton/reagent/carbon - value = 0.2 - -/singleton/reagent/copper - value = 0.02 - -/singleton/reagent/alcohol/ethanol - value = 0.01 - -/singleton/reagent/alcohol/butanol - value = 0.02 - -/singleton/reagent/alcohol/butanol/xuizijuice - value = 0.2 - -/singleton/reagent/alcohol/butanol/xuizijuice - value = 0.2 - -/singleton/reagent/alcohol/nmshaan_liquor/darmadhirbrew - value = 25 - -/singleton/reagent/hydrazine - value = 0.017 - -/singleton/reagent/iron - value = 0.01 - -/singleton/reagent/lithium - value = 6 - -/singleton/reagent/mercury - value = 0.02 - -/singleton/reagent/phosphorus - value = 0.4 - -/singleton/reagent/potassium - value = 1 - -/singleton/reagent/radium - value = 50 //Radium is crazy expensive, like 100k+ per gram. So probably a bit less expensive in the future. - -/singleton/reagent/acid - value = 0.2 - -/singleton/reagent/acid/stomach - value = 0 - -/singleton/reagent/sodium - value = 0.1 - -/singleton/reagent/sugar - value = 0.1 - -/singleton/reagent/sulfur - value = 2 - -/singleton/reagent/kois - value = 0.5 - -/singleton/reagent/nutriment - value = 0.1 - -/singleton/reagent/nutriment/virus_food - value = 0.15 - -/singleton/reagent/nutriment/sprinkles - value = 0.05 - -/singleton/reagent/nutriment/mint - value = 0.14 - -/singleton/reagent/lipozine - value = 0.11 - -/singleton/reagent/sodiumchloride - value = 0.11 - -/singleton/reagent/blackpepper - value = 0.1 - -/singleton/reagent/enzyme - value = 0.2 - -/singleton/reagent/frostoil - value = 0.2 - -/singleton/reagent/capsaicin - value = 0.2 - -/singleton/reagent/capsaicin/condensed - value = 0.5 - -/singleton/reagent/drink - value = 0.1 - -/singleton/reagent/drink/milk/chocolate - value = 0.11 - -/singleton/reagent/drink/milk/cream - value = 0.12 - -/singleton/reagent/drink/coffee - value = 0.12 - -/singleton/reagent/drink/coffee/soy_latte - value = 0.13 - -/singleton/reagent/drink/hot_coco - value = 0.11 - -/singleton/reagent/drink/milkshake - value = 0.12 - -/singleton/reagent/drink/ntella_milkshake - value = 0.14 - -/singleton/reagent/drink/shake_caramel - value = 0.13 - -/singleton/reagent/drink/shake_strawberry - value = 0.13 - -/singleton/reagent/drink/shake_dirtberry - value = 0.13 - -/singleton/reagent/drink/shake_blueberry - value = 0.13 - -/singleton/reagent/drink/shake_chocolate - value = 0.13 - -/singleton/reagent/drink/shake_blue_raspberry - value = 0.13 - -/singleton/reagent/drink/shake_raspberry - value = 0.13 - -/singleton/reagent/drink/shake_berry - value = 0.13 - -/singleton/reagent/drink/shake_ylpha - value = 0.13 - -/singleton/reagent/drink/shake_choco_mint - value = 0.13 - -/singleton/reagent/drink/ntella_hot_chocolate - value = 0.13 - -/singleton/reagent/drink/rewriter - value = 0.11 - -/singleton/reagent/drink/nuka_cola - value = 0.13 - -/singleton/reagent/drink/doctorsdelight - value = 0.3 - -/singleton/reagent/drink/ice - value = 0 - -/singleton/reagent/drink/nothing - value = 0 - -/singleton/reagent/alcohol/absinthe - value = 0.13 - -/singleton/reagent/alcohol/ale - value = 0.13 - -/singleton/reagent/alcohol/beer - value = 0.12 - -/singleton/reagent/alcohol/bitters - value = 0.15 - -/singleton/reagent/alcohol/bluecuracao - value = 0.16 - -/singleton/reagent/alcohol/champagne - value = 0.2 - -/singleton/reagent/alcohol/cognac - value = 0.2 - -/singleton/reagent/alcohol/deadrum - value = 0.15 - -/singleton/reagent/alcohol/gin - value = 0.1 - -/singleton/reagent/alcohol/coffee/kahlua - value = 0.14 - -/singleton/reagent/alcohol/melonliquor - value = 0.13 - -/singleton/reagent/alcohol/rum - value = 0.1 - -/singleton/reagent/alcohol/sake - value = 0.11 - -/singleton/reagent/alcohol/tequila - value = 0.1 - -/singleton/reagent/alcohol/thirteenloko - value = 0.15 - -/singleton/reagent/alcohol/vermouth - value = 0.1 - -/singleton/reagent/alcohol/vodka - value = 0.1 - -/singleton/reagent/alcohol/whiskey - value = 0.1 - -/singleton/reagent/alcohol/wine - value = 0.1 - -/singleton/reagent/alcohol/wine/vintage - value = 15 - -/singleton/reagent/alcohol/acid_spit - value = 0.15 - -/singleton/reagent/alcohol/alliescocktail - value = 0.16 - -/singleton/reagent/alcohol/aloe - value = 0.17 - -/singleton/reagent/alcohol/amasec - value = 0.16 - -/singleton/reagent/alcohol/andalusia - value = 0.15 - -/singleton/reagent/alcohol/antifreeze - value = 0.16 - -/singleton/reagent/alcohol/atomicbomb - value = 0.21 - -/singleton/reagent/alcohol/coffee/b52 - value = 0.17 - -/singleton/reagent/alcohol/bahama_mama - value = 0.15 - -/singleton/reagent/alcohol/bananahonk - value = 0.15 - -/singleton/reagent/alcohol/barefoot - value = 0.14 - -/singleton/reagent/alcohol/beepsky_smash - value = 0.2 - -/singleton/reagent/alcohol/bilk - value = 0.12 - -/singleton/reagent/alcohol/blackrussian - value = 0.14 - -/singleton/reagent/alcohol/bloodymary - value = 0.14 - -/singleton/reagent/alcohol/booger - value = 0.13 - -/singleton/reagent/alcohol/coffee/brave_bull - value = 0.16 - -/singleton/reagent/alcohol/cmojito - value = 0.14 - -/singleton/reagent/alcohol/gibsonpunch - value = 0.19 - -/singleton/reagent/alcohol/classic - value = 0.14 - -/singleton/reagent/alcohol/martini - value = 0.16 - -/singleton/reagent/alcohol/corkpopper - value = 0.13 - -/singleton/reagent/alcohol/rumandcola - value = 0.15 - -/singleton/reagent/alcohol/cubalibre - value = 0.16 - -/singleton/reagent/alcohol/demonsblood - value = 0.15 - -/singleton/reagent/alcohol/devilskiss - value = 0.14 - -/singleton/reagent/alcohol/driestmartini - value = 0.16 - -/singleton/reagent/alcohol/ginfizz - value = 0.13 - -/singleton/reagent/alcohol/french75 - value = 0.17 - -/singleton/reagent/alcohol/grog - value = 0.11 - -/singleton/reagent/alcohol/erikasurprise - value = 0.16 - -/singleton/reagent/alcohol/gargleblaster - value = 0.21 - -/singleton/reagent/alcohol/gintonic - value = 0.15 - -/singleton/reagent/alcohol/goldschlager - value = 0.2 - -/singleton/reagent/alcohol/hippiesdelight - value = 0.12 - -/singleton/reagent/alcohol/hooch - value = 0.11 - -/singleton/reagent/alcohol/iced_beer - value = 0.13 - -/singleton/reagent/alcohol/irishcarbomb - value = 0.14 - -/singleton/reagent/alcohol/coffee/irishcoffee - value = 0.12 - -/singleton/reagent/alcohol/irish_cream - value = 0.13 - -/singleton/reagent/alcohol/longislandicedtea - value = 0.13 - -/singleton/reagent/alcohol/manhattan - value = 0.14 - -/singleton/reagent/alcohol/manhattan_proj - value = 0.2 - -/singleton/reagent/alcohol/manly_dorf - value = 0.13 - -/singleton/reagent/alcohol/margarita - value = 0.15 - -/singleton/reagent/alcohol/mead - value = 0.13 - -/singleton/reagent/alcohol/moonshine - value = 0.11 - -/singleton/reagent/alcohol/muscmule - value = 0.14 - -/singleton/reagent/alcohol/neurotoxin - value = 0.2 - -/singleton/reagent/alcohol/omimosa - value = 0.18 - -/singleton/reagent/alcohol/patron - value = 0.16 - -/singleton/reagent/alcohol/pinkgin - value = 0.11 - -/singleton/reagent/alcohol/pinkgintonic - value = 0.13 - -/singleton/reagent/alcohol/piratepunch - value = 0.14 - -/singleton/reagent/alcohol/planterpunch - value = 0.13 - -/singleton/reagent/alcohol/pwine - value = 0.19 - -/singleton/reagent/alcohol/red_mead - value = 0.14 - -/singleton/reagent/alcohol/sbiten - value = 0.13 - -/singleton/reagent/alcohol/screwdrivercocktail - value = 0.13 - -/singleton/reagent/alcohol/sidewinderfang - value = 0.14 - -/singleton/reagent/alcohol/silencer - value = 0.135 - -/singleton/reagent/alcohol/singulo - value = 0.2 - -/singleton/reagent/alcohol/snowwhite - value = 0.125 - -/singleton/reagent/alcohol/ssroyale - value = 0.14 - -/singleton/reagent/alcohol/suidream - value = 0.12 - -/singleton/reagent/alcohol/gibsonhooch - value = 0.21 - -/singleton/reagent/alcohol/tequila_sunrise - value = 0.13 - -/singleton/reagent/alcohol/threemileisland - value = 0.2 - -/singleton/reagent/alcohol/toxins_special - value = 0.2 - -/singleton/reagent/alcohol/vodkamartini - value = 0.135 - -/singleton/reagent/alcohol/vodkatonic - value = 0.145 - -/singleton/reagent/alcohol/white_russian - value = 0.125 - -/singleton/reagent/alcohol/whiskey_cola - value = 0.15 - -/singleton/reagent/alcohol/whiskeysoda - value = 0.15 - -/singleton/reagent/alcohol/specialwhiskey - value = 0.3 - -/singleton/reagent/alcohol/daiquiri - value = 0.15 - -/singleton/reagent/alcohol/icepick - value = 0.15 - -/singleton/reagent/alcohol/poussecafe - value = 0.17 - -/singleton/reagent/alcohol/mintjulep - value = 0.15 - -/singleton/reagent/alcohol/johncollins - value = 0.17 - -/singleton/reagent/alcohol/gimlet - value = 0.13 - -/singleton/reagent/alcohol/starsandstripes - value = 0.15 - -/singleton/reagent/alcohol/metropolitan - value = 0.13 - -/singleton/reagent/alcohol/caruso - value = 0.18 - -/singleton/reagent/alcohol/aprilshower - value = 0.15 - -/singleton/reagent/alcohol/carthusiansazerac - value = 0.17 - -/singleton/reagent/alcohol/deweycocktail - value = 0.15 - -/singleton/reagent/alcohol/chartreusegreen - value = 0.18 - -/singleton/reagent/alcohol/chartreuseyellow - value = 0.18 - -/singleton/reagent/alcohol/cremewhite - value = 0.14 - -/singleton/reagent/alcohol/cremeyvette - value = 0.17 - -/singleton/reagent/alcohol/brandy - value = 0.2 - -/singleton/reagent/alcohol/guinness - value = 0.1 - -/singleton/reagent/alcohol/drambuie - value = 0.18 - -/singleton/reagent/alcohol/oldfashioned - value = 0.15 - -/singleton/reagent/alcohol/blindrussian - value = 0.16 - -/singleton/reagent/alcohol/rustynail - value = 0.13 - -/singleton/reagent/alcohol/tallrussian - value = 0.15 - -/singleton/reagent/alcohol/solarian_white - value = 0.125 - -/singleton/reagent/alcohol/solarian_marine - value = 0.2 - -/singleton/reagent/alcohol/cloudyeridani - value = 0.12 - -/singleton/reagent/alcohol/djinntea - value = 0.12 - -/singleton/reagent/alcohol/permanentrevolution - value = 0.13 - -/singleton/reagent/alcohol/internationale - value = 0.13 - -/singleton/reagent/alcohol/dionamama - value = 0.2 - -/singleton/reagent/alcohol/jovianstorm - value = 0.13 - -/singleton/reagent/alcohol/primeminister - value = 0.13 - -/singleton/reagent/alcohol/peacetreaty - value = 0.15 - -/singleton/reagent/alcohol/fiscream - value = 0.14 - -/singleton/reagent/alcohol/coffee/fiscoffee - value = 0.13 - -/singleton/reagent/alcohol/fisfirebomb - value = 0.15 - -/singleton/reagent/inaprovaline - value = 2.5 - -/singleton/reagent/bicaridine - value = 4.9 - -/singleton/reagent/dermaline - value = 3.9 - -/singleton/reagent/dylovene - value = 2.1 - -/singleton/reagent/dexalin - value = 2.4 - -/singleton/reagent/dexalin/plus - value = 3.6 - -/singleton/reagent/tricordrazine - value = 6 - -/singleton/reagent/cryoxadone - value = 3.9 - -/singleton/reagent/clonexadone - value = 5.5 - -/singleton/reagent/perconol - value = 3.3 - -/singleton/reagent/mortaphenyl - value = 3.1 - -/singleton/reagent/oxycomorphine - value = 3.3 - -/singleton/reagent/synaptizine - value = 4.6 - -/singleton/reagent/alkysine - value = 5.9 - -/singleton/reagent/oculine - value = 4.2 - -/singleton/reagent/peridaxon - value = 6 - -/singleton/reagent/ryetalyn - value = 3.6 - -/singleton/reagent/pneumalin - value = 3.2 - -/singleton/reagent/hyperzine - value = 3.9 - -/singleton/reagent/ethylredoxrazine - value = 3.1 - -/singleton/reagent/hyronalin - value = 2.3 - -/singleton/reagent/arithrazine - value = 2.7 - -/singleton/reagent/thetamycin - value = 2.5 - -/singleton/reagent/antidexafen - value = 1.5 - -/singleton/reagent/sterilizine - value = 2.2 - -/singleton/reagent/leporazine - value = 2 - -/singleton/reagent/mental/corophenidate - value = 6 - -/singleton/reagent/mental/parvosil - value = 6 - -/singleton/reagent/mental/neurostabin - value = 6 - -/singleton/reagent/mental/minaphobin - value = 6 - -/singleton/reagent/mental/emoxanyl - value = 6 - -/singleton/reagent/mental/orastabin - value = 6 - -/singleton/reagent/mental/neurapan - value = 6 - -/singleton/reagent/mental/nerospectan - value = 6 - -/singleton/reagent/mental/truthserum - value = 8 - -/singleton/reagent/mental/nicotine - value = 2 - -/singleton/reagent/rezadone - value = 5 - -/singleton/reagent/sanasomnum - value = 5 - -/singleton/reagent/verunol - value = 2 - -/singleton/reagent/crayon_dust - value = 0.001 - -/singleton/reagent/adminordrazine - value = 1000 - -/singleton/reagent/gold - value = 7 - -/singleton/reagent/silver - value = 4 - -/singleton/reagent/uranium - value = 9 - -/singleton/reagent/platinum - value = 3 - -/singleton/reagent/adrenaline - value = 3 - -/singleton/reagent/diethylamine - value = 0.9 - -/singleton/reagent/surfactant - value = 0.05 - -/singleton/reagent/thermite - value = 6 - -/singleton/reagent/spacecleaner - value = 0.7 - -/singleton/reagent/lube - value = 0.6 - -/singleton/reagent/glycerol - value = 8 - -/singleton/reagent/nitroglycerin - value = 9 - -/singleton/reagent/coolant - value = 0.8 - -/singleton/reagent/woodpulp - value = 0.6 - -/singleton/reagent/luminol - value = 1.4 - -/singleton/reagent/toxin - value = 2 - -/singleton/reagent/toxin/plasticide - value = 2.1 - -/singleton/reagent/toxin/amatoxin - value = 2.3 - -/singleton/reagent/toxin/carpotoxin - value = 3 - -/singleton/reagent/toxin/phoron - value = 10 - -/singleton/reagent/toxin/cyanide - value = 3.3 - -/singleton/reagent/toxin/potassium_chloride - value = 4.4 - -/singleton/reagent/toxin/potassium_chlorophoride - value = 4.5 - -/singleton/reagent/toxin/zombiepowder - value = 2.9 - -/singleton/reagent/toxin/fertilizer - value = 1.2 - -/singleton/reagent/toxin/plantbgone - value = 1.1 - -/singleton/reagent/acid/polyacid - value = 2 - -/singleton/reagent/lexorin - value = 2.4 - -/singleton/reagent/mutagen - value = 3.1 - -/singleton/reagent/slimejelly - value = 1.2 - -/singleton/reagent/soporific - value = 2.5 - -/singleton/reagent/polysomnine - value = 2.6 - -/singleton/reagent/polysomnine/beer2 - value = 2.2 - -/singleton/reagent/drugs/mms - value = 2.8 - -/singleton/reagent/drugs/serotrotium - value = 2.5 - -/singleton/reagent/drugs/cryptobiolin - value = 2 - -/singleton/reagent/drugs/impedrezene - value = 1.8 - -/singleton/reagent/drugs/mindbreaker - value = 0.6 - -/singleton/reagent/drugs/psilocybin - value = 0.7 - -/singleton/reagent/aslimetoxin - value = 3 - -/singleton/reagent/toxin/nanites - value = 9 - -/singleton/reagent/estus - value = 50 - -/singleton/reagent/liquid_fire - value = 50 - -/singleton/reagent/black_matter - value = 250 - -/singleton/reagent/bluespace_dust - value = 250 - -/singleton/reagent/philosopher_stone - value = 1000 - -/singleton/reagent/elixir - value = 1000 - -/singleton/reagent/azoth - value = 500 - -/singleton/reagent/toxin/undead - value = 300 - -/singleton/reagent/drugs/ambrosia_extract - value = 2.8 diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm index 3c8e3f6c71d..7030cbc7d89 100644 --- a/code/modules/materials/materials.dm +++ b/code/modules/materials/materials.dm @@ -87,6 +87,9 @@ var/hardness = 60 // Prob of wall destruction by hulk, used for edge damage in weapons. Also used for bullet protection in armor. var/weight = 20 // Determines blunt damage/throwforce for weapons, and whether it can be flipped. Check DEFAULT_TABLE_FLIP_WEIGHT if you want your materai to be tableflippable. + /// The price value of the item + var/value = 1 + // Noise when someone is faceplanted onto a table made of this material. var/tableslam_noise = 'sound/weapons/tablehit1.ogg' // Noise made when a simple door made of this material opens or closes. @@ -200,6 +203,11 @@ multipart_reinf_icon = new(multipart_reinf_icon) multipart_reinf_icon.Blend(blend_colour, ICON_MULTIPLY) +/material/Destroy(force) + stack_trace("Someone tried to delete a /material.") + . = ..() + return QDEL_HINT_LETMELIVE //Materials cannot be deleted, as you cannot poof the concept out of existence + // This is a placeholder for proper integration of windows/windoors into the system. /material/proc/build_windows(var/mob/living/user, var/obj/item/stack/used_stack) return 0 @@ -279,6 +287,7 @@ icon_colour = "#007A00" weight = 25 hardness = 20 + value = 100 stack_origin_tech = list(TECH_MATERIAL = 5) door_icon_base = "stone" golem = SPECIES_GOLEM_URANIUM @@ -289,6 +298,7 @@ flags = MATERIAL_UNMELTABLE cut_delay = 60 icon_colour = "#00FFE1" + value = 170 opacity = 0.4 reflectivity = 0.6 conductivity = 1 @@ -307,6 +317,7 @@ icon_colour = "#EDD12F" weight = 30 hardness = 15 + value = 40 conductivity = 41 stack_origin_tech = list(TECH_MATERIAL = 4) sheet_singular_name = "ingot" @@ -318,6 +329,7 @@ stack_type = /obj/item/stack/material/bronze weight = 30 hardness = 50 + value = 25 conductivity = 11 icon_colour = "#EDD12F" stack_origin_tech = list(TECH_MATERIAL = 2) @@ -338,6 +350,7 @@ icon_colour = "#D1E6E3" weight = 22 hardness = 50 + value = 35 conductivity = 63 stack_origin_tech = list(TECH_MATERIAL = 3) sheet_singular_name = "ingot" @@ -352,6 +365,7 @@ icon_colour = "#FC2BC5" shard_type = SHARD_SHARD hardness = 30 + value = 150 stack_origin_tech = list(TECH_MATERIAL = 2, TECH_PHORON = 2) door_icon_base = "stone" sheet_singular_name = "crystal" @@ -400,6 +414,7 @@ icon_colour = "#b4b1a6" weight = 26 hardness = 70 + value = 4 stack_type = /obj/item/stack/material/marble golem = SPECIES_GOLEM_MARBLE drop_sound = 'sound/items/drop/boots.ogg' @@ -418,6 +433,7 @@ name = DEFAULT_WALL_MATERIAL stack_type = /obj/item/stack/material/steel integrity = 150 + value = 4 conductivity = 11 protectiveness = 10 // 33% wall_icon = 'icons/turf/smooth/composite_solid_color.dmi' @@ -439,6 +455,7 @@ colour_blend = FALSE integrity = 100 weight = 23 + value = 5 // below is same as wood melting_point = T0C + 300 ignition_point = T0C + 288 @@ -456,6 +473,7 @@ display_name = DEFAULT_WALL_MATERIAL stack_type = null shard_type = SHARD_NONE + value = 0 /material/plasteel name = MATERIAL_PLASTEEL @@ -468,6 +486,7 @@ explosion_resistance = 25 hardness = 80 weight = 23 + value = 12 protectiveness = 20 // 50% conductivity = 10 stack_origin_tech = list(TECH_MATERIAL = 2) @@ -483,6 +502,7 @@ conductivity = 2.38 hardness = 90 weight = 25 + value = 10 protectiveness = 25 icon_base = "metal" door_icon_base = "metal" @@ -617,6 +637,7 @@ tableslam_noise = 'sound/effects/glass_hit.ogg' hardness = 40 weight = 30 + value = 2 stack_origin_tech = list(TECH_MATERIAL = 2) composite_material = list(DEFAULT_WALL_MATERIAL = 1875, MATERIAL_GLASS = 3750) window_options = list("One Direction" = 1, "Full Window" = 4, "Windoor" = 5) @@ -630,6 +651,7 @@ stack_type = /obj/item/stack/material/glass/phoronglass flags = MATERIAL_BRITTLE integrity = 100 + value = 30 icon_colour = "#FC2BC5" stack_origin_tech = list(TECH_MATERIAL = 4) created_window = /obj/structure/window/borosilicate @@ -646,6 +668,7 @@ created_window = /obj/structure/window/borosilicate/reinforced hardness = 40 weight = 30 + value = 40 rod_product = null /material/plastic @@ -682,6 +705,7 @@ stack_type = /obj/item/stack/material/mhydrogen icon_colour = "#E6C5DE" stack_origin_tech = list(TECH_MATERIAL = 6, TECH_POWER = 6, TECH_MAGNET = 5) + value = 100 conductivity = 100 golem = SPECIES_GOLEM_HYDROGEN is_fusion_fuel = TRUE @@ -691,6 +715,7 @@ stack_type = /obj/item/stack/material/platinum icon_colour = "#9999FF" weight = 27 + value = 200 conductivity = 9.43 stack_origin_tech = list(TECH_MATERIAL = 2) sheet_singular_name = "ingot" @@ -701,6 +726,7 @@ stack_type = /obj/item/stack/material/iron icon_colour = "#5C5454" weight = 22 + value = 5 conductivity = 10 sheet_singular_name = "ingot" sheet_plural_name = "ingots" @@ -755,6 +781,7 @@ hardness = 15 weight = 18 protectiveness = 8 // 28% + value = 3 conductivity = 1 melting_point = T0C+300 //okay, not melting in this case, but hot enough to destroy wood ignition_point = T0C+288 @@ -854,6 +881,7 @@ display_name = "wood" stack_type = null shard_type = SHARD_NONE + value = 0 /material/cardboard name = MATERIAL_CARDBOARD @@ -864,6 +892,7 @@ hardness = 1 weight = 1 protectiveness = 0 // 0% + value = 0 ignition_point = T0C+232 //"the temperature at which book-paper catches fire, and burns." close enough melting_point = T0C+232 //temperature at which cardboard walls would be destroyed stack_origin_tech = list(TECH_MATERIAL = 1) @@ -920,6 +949,7 @@ flags = MATERIAL_PADDING hardness = 1 weight = 1 + value = 3 ignition_point = T0C+300 melting_point = T0C+300 protectiveness = 3 // 13% @@ -1048,6 +1078,7 @@ golem = SPECIES_GOLEM_MEAT drop_sound = 'sound/items/drop/leather.ogg' pickup_sound = 'sound/items/pickup/leather.ogg' + value = 5 /material/hide/corgi name = MATERIAL_HIDE_CORGI @@ -1073,6 +1104,7 @@ name = MATERIAL_HIDE_HUMAN stack_type = /obj/item/stack/material/animalhide/human icon_colour = "#833C00" + value = 35 /material/hide/barehide name = "bare hide" @@ -1092,6 +1124,7 @@ weight = 10 hardness = 20 integrity = 70 + value = 5 stack_origin_tech = list(TECH_MATERIAL = 2) door_icon_base = "stone" protectiveness = 10 // 33% @@ -1103,6 +1136,7 @@ integrity = 150 hardness = 60 protectiveness = 20 // 50% + value = 50 /material/vaurca name = MATERIAL_VAURCA diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index ad05d56efa3..360bd20c9f0 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -39,6 +39,9 @@ var/germ_adjust = 0 // for makeshift bandages/disinfectant var/carbonated = FALSE // if it's carbonated or not + /// Adds to the value of whatever container's holding it, value * units of reagents + var/value = 1 + /singleton/reagent/proc/initialize_data(var/newdata, var/datum/reagents/holder) // Called when the reagent is created. if(!isnull(newdata)) return newdata diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm index 26e818af2be..53b693e8012 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm @@ -12,6 +12,8 @@ fallback_specific_heat = 3.617 + value = 2 + /singleton/reagent/blood/initialize_data(newdata, datum/reagents/holder) . = ..() if(.) @@ -123,6 +125,8 @@ germ_adjust = 0.05 // i mean, i guess you could try... + value = 0 + /singleton/reagent/water/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) if(!istype(M)) return @@ -206,6 +210,8 @@ fallback_specific_heat = 0.605 + value = 6.8 + /singleton/reagent/fuel/touch_turf(var/turf/T, var/amount, var/datum/reagents/holder) new /obj/effect/decal/cleanable/liquid_fuel(T, amount) remove_self(amount, holder) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm index dd666cd4942..f82f0f81d6b 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm @@ -7,6 +7,8 @@ taste_description = "acid" fallback_specific_heat = 0.567 + value = 0.27 + /singleton/reagent/acetone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) M.adjustToxLoss(removed * 3) @@ -35,6 +37,7 @@ taste_description = "metal" taste_mult = 1.1 fallback_specific_heat = 0.811 + value = 0.02 /singleton/reagent/ammonia name = "Ammonia" @@ -47,6 +50,7 @@ breathe_mul = 2 breathe_met = REM * 0.25 fallback_specific_heat = 1.048 + value = 0.01 /singleton/reagent/ammonia/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) if(alien == IS_DIONA) @@ -83,6 +87,7 @@ taste_description = "sour chalk" taste_mult = 1.5 fallback_specific_heat = 0.018 + value = 0.2 scannable = TRUE /singleton/reagent/carbon/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) @@ -109,6 +114,7 @@ color = "#6E3B08" taste_description = "copper" fallback_specific_heat = 1.148 + value = 0.02 scannable = TRUE /singleton/reagent/copper/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) @@ -229,6 +235,8 @@ ABSTRACT_TYPE(/singleton/reagent/alcohol) distillation_point = T0C + 78.37 + value = 0.01 + /** * # Butanol * @@ -250,6 +258,7 @@ ABSTRACT_TYPE(/singleton/reagent/alcohol) glass_desc = "A fairly harmless alcohol that has intoxicating effects on certain species." fallback_specific_heat = 0.549 + value = 0.02 distillation_point = T0C + 117.7 @@ -287,6 +296,7 @@ ABSTRACT_TYPE(/singleton/reagent/alcohol) taste_description = "sweet tasting metal" fallback_specific_heat = 0.549 //Unknown + value = 0.017 /singleton/reagent/hydrazine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) var/obj/item/organ/internal/augment/fuel_cell/aug = M.internal_organs_by_name[BP_AUG_FUEL_CELL] @@ -317,6 +327,7 @@ ABSTRACT_TYPE(/singleton/reagent/alcohol) scannable = TRUE fallback_specific_heat = 1.181 + value = 0.01 /singleton/reagent/iron/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) if (!(alien & (IS_SKRELL | IS_VAURCA))) @@ -330,6 +341,7 @@ ABSTRACT_TYPE(/singleton/reagent/alcohol) taste_description = "metal" fallback_specific_heat = 0.633 + value = 6 /singleton/reagent/lithium/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) if(M.canmove && !M.restrained() && !(istype(M.loc, /turf/space))) @@ -351,6 +363,7 @@ ABSTRACT_TYPE(/singleton/reagent/alcohol) scannable = TRUE fallback_specific_heat = 0.631 + value = 0.02 /singleton/reagent/mercury/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) M.add_chemical_effect(CE_NEUROTOXIC, 1*removed) @@ -379,6 +392,7 @@ ABSTRACT_TYPE(/singleton/reagent/alcohol) taste_description = "vinegar" fallback_specific_heat = 0.569 + value = 0.4 /singleton/reagent/potassium name = "Potassium" @@ -388,6 +402,7 @@ ABSTRACT_TYPE(/singleton/reagent/alcohol) taste_description = "sweetness" //potassium is bitter in higher doses but sweet in lower ones. fallback_specific_heat = 0.214 + value = 1 /singleton/reagent/potassium/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) if(REAGENT_VOLUME(holder, type) > 3) @@ -404,6 +419,8 @@ ABSTRACT_TYPE(/singleton/reagent/alcohol) unaffected_species = IS_MACHINE fallback_specific_heat = 0.220 + value = 50 // Radium is crazy expensive, like 100k+ per gram. So probably a bit less expensive in the future. + var/message_shown = FALSE /singleton/reagent/radium/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) @@ -429,6 +446,7 @@ ABSTRACT_TYPE(/singleton/reagent/alcohol) taste_description = "acid" fallback_specific_heat = 0.815 + value = 0.2 /singleton/reagent/acid/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) M.take_organ_damage(0, removed * power) @@ -525,12 +543,14 @@ ABSTRACT_TYPE(/singleton/reagent/alcohol) power = 6 meltdose = 4 taste_description = "acid" + value = 2 /singleton/reagent/acid/stomach name = "Stomach Acid" taste_description = "coppery foulness" power = 2 color = "#d8ff00" + value = 0 /singleton/reagent/silicon name = "Silicon" @@ -547,6 +567,7 @@ ABSTRACT_TYPE(/singleton/reagent/alcohol) color = COLOR_GRAY taste_description = "salty metal" fallback_specific_heat = 0.483 + value = 0.1 /singleton/reagent/sugar name = "Sugar" @@ -561,6 +582,8 @@ ABSTRACT_TYPE(/singleton/reagent/alcohol) glass_desc = "You can feel your blood sugar rising just looking at this." fallback_specific_heat = 0.332 + value = 0.1 + condiment_name = "sugar sack" condiment_desc = "Tasty space sugar!" condiment_icon_state = "sugar" @@ -577,6 +600,7 @@ ABSTRACT_TYPE(/singleton/reagent/alcohol) scannable = TRUE fallback_specific_heat = 0.503 + value = 2 /singleton/reagent/sulfur/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) if (alien & IS_VAURCA) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm index f94dc28bba2..a37abea81fc 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm @@ -44,6 +44,7 @@ color = "#60A584" taste_description = "bitterness" taste_mult = 0.4 + value = 2.8 /singleton/reagent/drugs/mms/affect_blood(mob/living/carbon/M, alien, removed, datum/reagents/holder) ..() @@ -83,6 +84,7 @@ taste_description = "bitterness" fallback_specific_heat = 1.2 effect_messages = FALSE + value = 2.5 /singleton/reagent/drugs/serotrotium/affect_blood(mob/living/carbon/M, alien, removed, datum/reagents/holder) ..() @@ -110,6 +112,7 @@ overdose = REAGENTS_OVERDOSE taste_description = "sourness" effect_messages = FALSE + value = 2 /singleton/reagent/drugs/cryptobiolin/affect_blood(mob/living/carbon/M, alien, removed, datum/reagents/holder) ..() @@ -153,6 +156,7 @@ overdose = REAGENTS_OVERDOSE taste_description = "numbness" effect_messages = FALSE + value = 1.8 /singleton/reagent/drugs/impedrezene/affect_blood(mob/living/carbon/M, alien, removed, datum/reagents/holder) ..() @@ -173,6 +177,7 @@ overdose = REAGENTS_OVERDOSE taste_description = "sourness" ignores_drug_resistance = TRUE + value = 0.6 /singleton/reagent/drugs/mindbreaker/affect_blood(mob/living/carbon/M, alien, removed, datum/reagents/holder) ..() @@ -194,6 +199,7 @@ metabolism = REM * 0.5 taste_description = "mushroom" fallback_specific_heat = 1.2 + value = 0.7 condiment_name = "Psilocybin" condiment_desc = "A small bottle full of a pink liquid. Whatever could it do?" condiment_icon_state = "psilocybin" @@ -480,6 +486,7 @@ taste_description = "spicy earth" taste_mult = 0.4 fallback_specific_heat = 1.6 + value = 2.8 condiment_name = "Ambrosia Extract Bottle" condiment_desc = "A small dropper bottle full of a stoner's paradise." condiment_icon_state = "ambrosiaextract" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 726b953afa6..19ac53428d7 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -10,6 +10,7 @@ unaffected_species = IS_MACHINE var/kois_type = 1 fallback_specific_heat = 0.75 + value = 0.5 /singleton/reagent/kois/affect_ingest(var/mob/living/carbon/human/M, var/alien, var/removed, var/datum/reagents/holder) if(!ishuman(M)) @@ -91,6 +92,7 @@ unaffected_species = IS_MACHINE taste_description = "food" fallback_specific_heat = 1.25 + value = 0.1 /singleton/reagent/nutriment/mix_data(var/list/newdata, var/newamount, var/datum/reagents/holder) if(isemptylist(newdata)) @@ -678,6 +680,7 @@ color = "#899613" taste_description = "vomit" taste_mult = 2 + value = 0.15 /singleton/reagent/nutriment/sprinkles name = "Sprinkles" @@ -688,6 +691,7 @@ condiment_name = "bottle of sprinkles" condiment_icon_state = "sprinklesbottle" condiment_center_of_mass = list("x"=16, "y"=10) + value = 0.05 /singleton/reagent/nutriment/mint name = "Mint" @@ -695,6 +699,7 @@ reagent_state = LIQUID color = "#CFFFE5" taste_description = "mint" + value = 0.14 /singleton/reagent/nutriment/glucose name = "Glucose" @@ -709,6 +714,7 @@ color = "#BBEDA4" overdose = REAGENTS_OVERDOSE taste_description = "mothballs" + value = 0.11 /singleton/reagent/lipozine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) M.adjustNutritionLoss(10*removed) @@ -771,6 +777,7 @@ condiment_desc = "Salt. From space oceans, presumably." condiment_icon_state = "saltshakersmall" condiment_center_of_mass = list("x"=17, "y"=11) + value = 0.11 /singleton/reagent/sodiumchloride/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) M.intoxication -= min(M.intoxication,removed*2) //Salt absorbs alcohol @@ -800,6 +807,7 @@ condiment_desc = "Often used to flavor food or make people sneeze." condiment_icon_state = "peppermillsmall" condiment_center_of_mass = list("x"=17, "y"=11) + value = 0.1 /singleton/reagent/enzyme name = "Universal Enzyme" @@ -813,6 +821,7 @@ condiment_name = "universal enzyme" condiment_icon_state = "enzyme" condiment_center_of_mass = list("x"=18, "y"=7) + value = 0.2 /singleton/reagent/frostoil name = "Frost Oil" @@ -821,6 +830,7 @@ color = "#005BCC" taste_description = "mint" taste_mult = 1.5 + value = 0.2 fallback_specific_heat = 15 default_temperature = T0C - 20 @@ -844,6 +854,7 @@ taste_description = "hot peppers" taste_mult = 1.5 fallback_specific_heat = 2 + value = 0.2 condiment_name = "hotsauce" condiment_desc = "Hot sauce. It's in the name." condiment_icon_state = "hotsauce" @@ -896,6 +907,7 @@ discomfort_message = SPAN_DANGER("You feel like your insides are burning!") slime_temp_adj = 15 fallback_specific_heat = 4 + value = 0.5 /singleton/reagent/capsaicin/condensed/affect_touch(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) var/eyes_covered = 0 @@ -1021,6 +1033,7 @@ unaffected_species = IS_MACHINE var/blood_to_ingest_scale = 2 fallback_specific_heat = 1.75 + value = 0.1 /singleton/reagent/drink/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) digest(M,alien,removed * blood_to_ingest_scale, FALSE, holder) @@ -1431,6 +1444,8 @@ color = "#DFD7AF" taste_description = "creamy milk" + value = 0.12 + glass_icon_state = "glass_white" glass_name = "glass of cream" glass_desc = "Ewwww..." @@ -1907,6 +1922,8 @@ adj_drowsy = -3 adj_sleepy = -3 + value = 0.12 + //Coffee //========== @@ -1959,6 +1976,8 @@ color = "#664300" taste_description = "creamy coffee" + value = 0.13 + glass_icon_state = "soy_latte_vended" glass_name = "glass of soy latte" glass_desc = "A nice and refreshing beverage to enjoy while reading." @@ -2169,6 +2188,8 @@ nutrition = 2 taste_description = "creamy chocolate" + value = 0.11 + glass_icon_state = "chocolateglass" glass_name = "cup of hot chocolate" glass_desc = "Made with love! And cocoa beans." @@ -2272,6 +2293,8 @@ color = "#DADADA" taste_description = "creamy vanilla" + value = 0.12 + glass_icon_state = "milkshake" glass_name = "glass of milkshake" glass_desc = "Glorious brainfreezing mixture." @@ -2285,6 +2308,8 @@ taste_description = "soda and coffee" carbonated = TRUE + value = 0.11 + glass_icon_state = "rewriter" glass_name = "glass of Rewriter" glass_desc = "The secret of the sanctuary of the Libarian..." @@ -2304,6 +2329,8 @@ taste_description = "cola" carbonated = TRUE + value = 0.13 + glass_icon_state = "nuka_colaglass" glass_name = "glass of Nuka-Cola" glass_desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland" @@ -2424,6 +2451,8 @@ nutrition = 1 taste_description = "homely fruit" + value = 0.3 + glass_icon_state = "doctorsdelightglass" glass_name = "glass of The Doctor's Delight" glass_desc = "A healthy mixture of juices, guaranteed to keep you healthy until the next toolboxing takes place." @@ -2479,6 +2508,8 @@ taste_mult = 1.5 hydration = 8 + value = 0 + glass_icon_state = "iceglass" glass_name = "glass of ice" glass_desc = "Generally, you're supposed to put something else in there too..." @@ -2490,6 +2521,8 @@ description = "Absolutely nothing." taste_description = "nothing" + value = 0 + glass_icon_state = "nothing" glass_name = "glass of nothing" glass_desc = "Absolutely nothing." @@ -2597,6 +2630,8 @@ color = "#6d4124" taste_description = "overwhelmingly sweet chocolate" + value = 0.14 + glass_icon_state = "NTellamilkshake" glass_name = "glass of NTella milkshake" glass_desc = "Oh look, it's that thing you actually want to get but probably shouldn't." @@ -2608,6 +2643,8 @@ color = "#ff7575" taste_description = "sugary strawberry" + value = 0.13 + glass_icon_state = "shake_strawberry" glass_name = "glass of strawberry milkshake" glass_desc = "A sweet, chilly milkshake with neon red syrup. So sweet you could pop!" @@ -2619,6 +2656,8 @@ color = "#d19d4e" taste_description = "smooth caramel" + value = 0.13 + glass_icon_state = "shake_caramel" glass_name = "glass of caramel milkshake" glass_desc = "In case there wasn't enough sugar in your sugar." @@ -2630,6 +2669,8 @@ color = "#92692c" taste_description = "smooth dirtberries" + value = 0.13 + glass_icon_state = "shake_dirtberry" glass_name = "glass of dirtberry milkshake" glass_desc = "Don't let the name fool you, this dairy delight is smooth and sweet!" @@ -2641,6 +2682,8 @@ color = "#0c00b3" taste_description = "creamy blueberries" + value = 0.13 + glass_icon_state = "shake_blueberry" glass_name = "glass of blueberry milkshake" glass_desc = "This is an alarming level of neon blue for something that's supposed to be ingested. Probably still delicious though!" @@ -2652,6 +2695,8 @@ color = "#79452c" taste_description = "chocolatey vanilla" + value = 0.13 + glass_icon_state = "shake_chocolate" glass_name = "glass of chocolate milkshake" glass_desc = "A vanilla milkshake with a hefty heap of delicious chocolate syrup mixed in. Eh, that diet can wait until tomorrow, right?" @@ -2663,6 +2708,8 @@ color = "#3955a3" taste_description = "creamy raspberry" + value = 0.13 + glass_icon_state = "shake_blue_raspberry" glass_name = "glass of blue raspberry milkshake" glass_desc = "Formerly this used to be created with artificial food dyes. Now it's made with real blue raspberries! Make no mistake, though, this is still absolutely and deliciously bad for you." @@ -2674,6 +2721,8 @@ color = "#a03257" taste_description = "creamy raspberry" + value = 0.13 + glass_icon_state = "shake_purplered" glass_name = "glass of raspberry milkshake" glass_desc = "Oh Raspberries, is there any dessert you can't improve?" @@ -2685,6 +2734,8 @@ color = "#f1315b" taste_description = "smooth berries" + value = 0.13 + glass_icon_state = "shake_berry" glass_name = "glass of berry milkshake" glass_desc = "Why settle for just one Milkshake flavor when you can have the wide, delicious vagueness of 'berries'?" @@ -2696,6 +2747,8 @@ color = "#a03257" taste_description = "tangy sweetness" + value = 0.13 + glass_icon_state = "shake_purplered" glass_name = "glass of ylpha berry milkshake" glass_desc = "That trademark magenta mixture of tangy and sweet - now in a tall, creamy glass of Milkshake!" @@ -2707,6 +2760,8 @@ color = "#6ecf73" taste_description = "chocolatey mint" + value = 0.13 + glass_icon_state = "shake_choco_mint" glass_name = "glass of choco-mint milkshake" glass_desc = "For everyone who liked to eat their toothpaste as a kid and never grew out of it." @@ -2718,6 +2773,8 @@ color = "#63432e" taste_description = "hazelnutty, creamy chocolate" + value = 0.13 + glass_icon_state = "NTellahotchocolate" glass_name = "glass of NTella hot chocolate" glass_desc = "A very chocolatey drink for the days so rough, so cold, or so celebratory that a regular hot chocolate just won't cut it. It has marshmallows!" @@ -2882,6 +2939,8 @@ strength = 75 taste_description = "licorice" + value = 0.13 + glass_icon_state = "absintheglass" glass_name = "glass of absinthe" glass_desc = "Wormwood, anise, oh my." @@ -2895,6 +2954,8 @@ taste_description = "hearty barley ale" carbonated = TRUE + value = 0.13 + glass_icon_state = "aleglass" glass_name = "glass of ale" glass_desc = "A freezing pint of delicious ale." @@ -2931,6 +2992,8 @@ taste_description = "beer" carbonated = TRUE + value = 0.12 + glass_icon_state = "beerglass" glass_name = "glass of beer" glass_desc = "A freezing pint of beer." @@ -2976,6 +3039,8 @@ strength = 40 taste_description = "bitter" + value = 0.15 + glass_icon_state = "bittersglass" glass_name = "glass of bitters" glass_desc = "A pungent glass of bitters." @@ -2988,6 +3053,8 @@ strength = 25 taste_description = "oranges" + value = 0.16 + glass_icon_state = "curacaoglass" glass_name = "glass of blue curacao" glass_desc = "Exotically blue, fruity drink, distilled from oranges." @@ -3001,6 +3068,8 @@ taste_description = "bubbly bitter-sweetness" carbonated = TRUE + value = 0.2 + glass_icon_state = "champagneglass" glass_name = "glass of champagne" glass_desc = "Off-white and bubbly. So passe." @@ -3013,6 +3082,8 @@ strength = 40 taste_description = "rich and smooth alcohol" + value = 0.2 + glass_icon_state = "cognacglass" glass_name = "glass of cognac" glass_desc = "Damn, you feel like some kind of French aristocrat just by holding this." @@ -3025,6 +3096,8 @@ strength = 40 taste_description = "salty sea water" + value = 0.15 + glass_icon_state = "rumglass" glass_name = "glass of rum" glass_desc = "Now you want to Pray for a pirate suit, don't you?" @@ -3053,6 +3126,8 @@ strength = 30 taste_description = "an alcoholic christmas tree" + value = 0.1 + glass_icon_state = "ginvodkaglass" glass_name = "glass of gin" glass_desc = "A crystal clear glass of Borovicka gin." @@ -3077,6 +3152,8 @@ strength = 20 taste_description = "fizzy mint tea" + value = 0.12 + glass_icon_state = "djinnteaglass" glass_name = "glass of Djinn Tea" glass_desc = "A mildly alcoholic spin on a popular Skrell drink. Less good for you than the original." @@ -3106,6 +3183,8 @@ caffeine = 0.25 taste_description = "spiked latte" + value = 0.14 + glass_icon_state = "kahluaglass" glass_name = "glass of RR coffee liquor" glass_desc = "DAMN, THIS THING LOOKS ROBUST" @@ -3130,6 +3209,8 @@ strength = 23 taste_description = "fruity alcohol" + value = 0.13 + glass_icon_state = "emeraldglass" glass_name = "glass of melon liquor" glass_desc = "A relatively sweet and fruity 46 proof liquor." @@ -3142,6 +3223,8 @@ strength = 40 taste_description = "spiked butterscotch" + value = 0.1 + glass_icon_state = "rumglass" glass_name = "glass of rum" glass_desc = "Now you want to Pray for a pirate suit, don't you?" @@ -3154,6 +3237,8 @@ strength = 20 taste_description = "mildly dry alcohol with a subtle sweetness" + value = 0.11 + glass_icon_state = "sakeglass" glass_name = "glass of sake" glass_desc = "A glass of sake." @@ -3166,6 +3251,8 @@ strength = 15 taste_description = "soy milk putting on airs" + value = 0.12 + glass_icon_state = "cloudyeridaniglass" glass_name = "glass of Cloudy Eridani" glass_desc = "A frothy white beverage. Reminds Suits of home. Dregs, not so much." @@ -3190,6 +3277,8 @@ strength = 40 taste_description = "paint stripper" + value = 0.1 + glass_icon_state = "tequilaglass" glass_name = "glass of tequila" glass_desc = "Now all that's missing is the weird colored shades!" @@ -3205,6 +3294,8 @@ taste_description = "jitters and death" carbonated = TRUE + value = 0.15 + glass_icon_state = "thirteen_loko_glass" glass_name = "glass of Getmore Energy" glass_desc = "This is a glass of Getmore Energy, a potent mixture of caffeine and alcohol." @@ -3228,6 +3319,8 @@ taste_description = "dry alcohol" taste_mult = 1.3 + value = 0.1 + glass_icon_state = "vermouthglass" glass_name = "glass of vermouth" glass_desc = "You wonder why you're even drinking this straight." @@ -3240,6 +3333,8 @@ strength = 50 taste_description = "grain alcohol" + value = 0.1 + glass_icon_state = "ginvodkaglass" glass_name = "glass of vodka" glass_desc = "The glass contain wodka. Xynta." @@ -3267,6 +3362,8 @@ strength = 40 taste_description = "molasses" + value = 0.1 + glass_icon_state = "whiskeyglass" glass_name = "glass of whiskey" glass_desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy." @@ -3279,6 +3376,8 @@ strength = 15 taste_description = "bitter sweetness" + value = 0.1 + glass_icon_state = "wineglass" glass_name = "glass of wine" glass_desc = "A very classy looking drink." @@ -3290,6 +3389,8 @@ strength = 20 taste_description = "rich and full-bodied sweetness unlike anything you've ever had" + value = 15 + glass_name = "glass of vintage wine" glass_desc = "A very classy and expensive-looking drink." @@ -3415,6 +3516,8 @@ strength = 25 taste_description = "stomach acid" + value = 0.15 + glass_icon_state = "acidspitglass" glass_name = "glass of Acid Spit" glass_desc = "A drink from the company archives. Made from live aliens." @@ -3427,6 +3530,8 @@ strength = 25 taste_description = "bitter yet free" + value = 0.16 + glass_icon_state = "alliescocktail" glass_name = "glass of Allies cocktail" glass_desc = "A drink made from your allies." @@ -3439,6 +3544,8 @@ strength = 15 taste_description = "sweet 'n creamy" + value = 0.17 + glass_icon_state = "aloe" glass_name = "glass of Aloe" glass_desc = "Very, very, very good." @@ -3452,6 +3559,8 @@ strength = 25 taste_description = "dark and metallic" + value = 0.16 + glass_icon_state = "amasecglass" glass_name = "glass of Amasec" glass_desc = "Always handy before COMBAT!!!" @@ -3464,6 +3573,8 @@ strength = 35 taste_description = "lemons" + value = 0.15 + glass_icon_state = "andalusia" glass_name = "glass of Andalusia" glass_desc = "A nice, strange named drink." @@ -3478,6 +3589,8 @@ targ_temp = 330 taste_description = "cold cream" + value = 0.16 + glass_icon_state = "antifreeze" glass_name = "glass of Anti-freeze" glass_desc = "The ultimate refreshment." @@ -3492,6 +3605,8 @@ druggy = 50 taste_description = "da bomb" + value = 0.21 + glass_icon_state = "atomicbombglass" glass_name = "glass of Atomic Bomb" glass_desc = "We cannot take legal responsibility for your actions after imbibing." @@ -3504,6 +3619,8 @@ strength = 35 taste_description = "angry and irish" + value = 0.17 + glass_icon_state = "b52glass" glass_name = "glass of B-52" glass_desc = "Kahlua, Irish cream, and congac. You will get bombed." @@ -3515,6 +3632,8 @@ strength = 15 taste_description = "lime and orange" + value = 0.15 + glass_icon_state = "bahama_mama" glass_name = "glass of Bahama Mama" glass_desc = "Tropical cocktail" @@ -3528,6 +3647,8 @@ druggy = 25 taste_description = "tangy, irradiated licorice" + value = 0.2 + glass_icon_state = "dionamamaglass" glass_name = "glass of Diona Mama" glass_desc = "Lightly irradiated, just the way Dionae like it." @@ -3540,6 +3661,8 @@ strength = 15 taste_description = "stormy sweetness" + value = 0.13 + glass_icon_state = "jovianstormglass" glass_name = "glass of Jovian Storm" glass_desc = "A classic Callistean drink named after Jupiter's storm. It'll blow you away." @@ -3553,6 +3676,8 @@ strength = 15 taste_description = "a bad joke" + value = 0.15 + glass_icon_state = "bananahonkglass" glass_name = "glass of Banana Honk" glass_desc = "A drink from banana heaven." @@ -3565,6 +3690,8 @@ strength = 15 taste_description = "creamy berries" + value = 0.14 + glass_icon_state = "b&p" glass_name = "glass of Barefoot" glass_desc = "A drink made of berry juice, cream, and vermouth." @@ -3578,6 +3705,8 @@ strength = 35 taste_description = "JUSTICE" + value = 0.2 + glass_icon_state = "beepskysmashglass" glass_name = "Beepsky Smash" glass_desc = "Heavy, hot and strong. Just like the Iron fist of the LAW." @@ -3596,6 +3725,8 @@ nutriment_factor = 2 taste_description = "desperation and lactate" + value = 0.12 + glass_icon_state = "glass_brown" glass_name = "glass of bilk" glass_desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis." @@ -3607,6 +3738,8 @@ strength = 20 taste_description = "bitterness" + value = 0.14 + glass_icon_state = "blackrussianglass" glass_name = "glass of Black Russian" glass_desc = "For the lactose-intolerant. Still as classy as a White Russian." @@ -3619,6 +3752,8 @@ strength = 20 taste_description = "tomatoes with a hint of lime" + value = 0.14 + glass_icon_state = "bloodymaryglass" glass_name = "glass of Bloody Mary" glass_desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder." @@ -3630,6 +3765,8 @@ strength = 20 taste_description = "sweet 'n creamy" + value = 0.13 + glass_icon_state = "booger" glass_name = "glass of Booger" glass_desc = "Ewww..." @@ -3642,6 +3779,8 @@ caffeine = 0.2 taste_description = "alcoholic bravery" + value = 0.16 + glass_icon_state = "bravebullglass" glass_name = "glass of Brave Bull" glass_desc = "Tequila and coffee liquor, brought together in a mouthwatering mixture. Drink up." @@ -3654,6 +3793,8 @@ strength = 15 taste_description = "sweet mint alcohol" + value = 0.14 + glass_icon_state = "cmojito" glass_name = "glass of champagne mojito" glass_desc = "Looks fun!" @@ -3665,6 +3806,8 @@ strength = 40 taste_description = "sour and bitter fruit" + value = 0.19 + glass_icon_state = "gibsonpunch" glass_name = "glass of Gibson Punch" glass_desc = "An alcoholic fruit punch." @@ -3678,6 +3821,8 @@ taste_description = "sour and bitter" carbonated = TRUE + value = 0.14 + glass_icon_state = "classic" glass_name = "glass of the classic" glass_desc = "Just classic. Wow." @@ -3690,6 +3835,8 @@ strength = 25 taste_description = "dry class" + value = 0.16 + glass_icon_state = "martiniglass" glass_name = "glass of classic martini" glass_desc = "Damn, the bartender even stirred it, not shook it." @@ -3702,6 +3849,8 @@ strength = 30 taste_description = "sour and smokey" + value = 0.13 + glass_icon_state = "corkpopper" glass_name = "glass of cork popper" glass_desc = "The confusing scent only proves all the more alluring." @@ -3715,6 +3864,8 @@ taste_description = "cola and a hint of lime" carbonated = TRUE + value = 0.16 + glass_icon_state = "cubalibreglass" glass_name = "glass of Cuba Libre" glass_desc = "A classic mix of rum, cola, and lime." @@ -3728,6 +3879,8 @@ taste_description = "cola" carbonated = TRUE + value = 0.15 + glass_icon_state = "rumandcolaglass" glass_name = "glass of Rum and Cola" glass_desc = "A classic mix of rum and cola." @@ -3741,6 +3894,8 @@ taste_description = "sweet tasting iron" carbonated = TRUE + value = 0.15 + glass_icon_state = "demonsblood" glass_name = "glass of Demons' Blood" glass_desc = "Just looking at this thing makes the hair at the back of your neck stand up." @@ -3753,6 +3908,8 @@ strength = 15 taste_description = "bitter iron" + value = 0.14 + glass_icon_state = "devilskiss" glass_name = "glass of Devil's Kiss" glass_desc = "Creepy time!" @@ -3778,6 +3935,8 @@ strength = 20 taste_description = "a beach" + value = 0.16 + glass_icon_state = "driestmartiniglass" glass_name = "glass of Driest Martini" glass_desc = "Only for the experienced. You think you see sand floating in the glass." @@ -3791,6 +3950,8 @@ taste_description = "sour and classy" carbonated = TRUE + value = 0.17 + glass_icon_state = "french75" glass_name = "glass of french 75" glass_desc = "It looks like a lemon shaved into your cocktail." @@ -3804,6 +3965,8 @@ taste_description = "dry, tart lemons" carbonated = TRUE + value = 0.13 + glass_icon_state = "ginfizzglass" glass_name = "glass of gin fizz" glass_desc = "Refreshingly lemony, deliciously dry." @@ -3817,6 +3980,8 @@ strength = 10 taste_description = "a poor excuse for alcohol" + value = 0.11 + glass_icon_state = "grogglass" glass_name = "glass of grog" glass_desc = "A fine and cepa drink for Space." @@ -3828,6 +3993,8 @@ strength = 15 taste_description = "tartness and bananas" + value = 0.16 + glass_icon_state = "erikasurprise" glass_name = "glass of Erika Surprise" glass_desc = "The surprise is, it's green!" @@ -3841,6 +4008,8 @@ strength = 50 taste_description = "your brains smashed out by a lemon wrapped around a gold brick" + value = 0.21 + glass_icon_state = "gargleblasterglass" glass_name = "glass of Pan-Galactic Gargle Blaster" glass_desc = "Does... does this mean that Arthur and Ford are on the station? Oh joy." @@ -3854,6 +4023,8 @@ taste_description = "mild and tart" carbonated = TRUE + value = 0.15 + glass_icon_state = "gintonicglass" glass_name = "glass of gin and tonic" glass_desc = "A mild but still great cocktail. Drink up, like a true Englishman." @@ -3866,6 +4037,8 @@ strength = 50 taste_description = "burning cinnamon" + value = 0.2 + glass_icon_state = "ginvodkaglass" glass_name = "glass of Goldschlager" glass_desc = "100 proof that teen girls will drink anything with gold in it." @@ -3880,6 +4053,8 @@ druggy = 50 taste_description = "giving peace a chance" + value = 0.12 + glass_icon_state = "hippiesdelightglass" glass_name = "glass of Hippie's Delight" glass_desc = "A drink enjoyed by people during the 1960's." @@ -3892,6 +4067,8 @@ strength = 65 taste_description = "pure resignation" + value = 0.11 + glass_icon_state = "glass_brown2" glass_name = "glass of Hooch" glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night." @@ -3905,6 +4082,8 @@ taste_description = "refreshingly cold" carbonated = TRUE + value = 0.13 + glass_icon_state = "iced_beerglass" glass_name = "glass of iced beer" glass_desc = "A beer so frosty, the air around it freezes." @@ -3918,6 +4097,8 @@ taste_description = "delicious anger" carbonated = TRUE + value = 0.14 + glass_icon_state = "irishcarbomb" glass_name = "glass of Irish Car Bomb" glass_desc = "An irish car bomb." @@ -3931,6 +4112,8 @@ taste_description = "anti-dominian sentiment" carbonated = TRUE + value = 0.15 + glass_icon_state = "fisfirebombglass" glass_name = "glass of Fisanduhian Firebomb" glass_desc = "The somewhat spicier cousin to the Irish Car Bomb." @@ -3944,6 +4127,8 @@ caffeine = 0.3 taste_description = "giving up on the day" + value = 0.12 + glass_icon_state = "irishcoffeeglass" glass_name = "glass of Irish coffee" glass_desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning." @@ -3957,6 +4142,8 @@ caffeine = 0.3 taste_description = "giving up on peaceful coexistence" + value = 0.13 + glass_icon_state = "fiscoffeeglass" glass_name = "glass of Fisanduhian coffee" glass_desc = "It's like an Irish coffee, but spicy and angry about Dominia." @@ -3969,6 +4156,8 @@ strength = 25 taste_description = "creamy alcohol" + value = 0.13 + glass_icon_state = "irishcreamglass" glass_name = "glass of Irish cream" glass_desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?" @@ -3981,6 +4170,8 @@ strength = 25 taste_description = "creamy spiced alcohol" + value = 0.14 + glass_icon_state = "irishcreamglass" glass_name = "glass of Fisanduhian cream" glass_desc = "A sweet, slightly spicy alcoholic cream. Fisanduh is not yet lost." @@ -3994,6 +4185,8 @@ taste_description = "a mixture of cola and alcohol" carbonated = TRUE + value = 0.13 + glass_icon_state = "longislandicedteaglass" glass_name = "glass of Long Island iced tea" glass_desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." @@ -4006,6 +4199,8 @@ strength = 30 taste_description = "mild dryness" + value = 0.14 + glass_icon_state = "manhattanglass" glass_name = "glass of Manhattan" glass_desc = "The Detective's undercover drink of choice. He never could stomach gin..." @@ -4019,6 +4214,8 @@ druggy = 30 taste_description = "death, the destroyer of worlds" + value = 0.2 + glass_icon_state = "proj_manhattanglass" glass_name = "glass of Manhattan Project" glass_desc = "A scientist's drink of choice, for thinking how to blow up the station." @@ -4032,6 +4229,8 @@ taste_description = "hair on your chest and your chin" carbonated = TRUE + value = 0.13 + glass_icon_state = "manlydorfglass" glass_name = "glass of The Manly Dorf" glass_desc = "A manly concotion made from Ale and Beer. Intended for true men only." @@ -4043,6 +4242,8 @@ strength = 30 taste_description = "dry and salty" + value = 0.15 + glass_icon_state = "margaritaglass" glass_name = "glass of margarita" glass_desc = "On the rocks with salt on the rim. Arriba~!" @@ -4057,6 +4258,8 @@ nutriment_factor = 1 taste_description = "sweet yet alcoholic" + value = 0.13 + glass_icon_state = "meadglass" glass_name = "glass of mead" glass_desc = "A Viking's beverage, though a cheap one." @@ -4069,6 +4272,8 @@ strength = 65 taste_description = "bitterness" + value = 0.11 + glass_icon_state = "glass_clear" glass_name = "glass of moonshine" glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night." @@ -4080,6 +4285,8 @@ strength = 40 taste_description = "mint and a mule's kick" + value = 0.14 + glass_icon_state = "muscmule" glass_name = "glass of muscovite mule" glass_desc = "Such a pretty green, this couldn't possible go wrong!" @@ -4093,6 +4300,8 @@ strength = 50 taste_description = "a numbing sensation" + value = 0.2 + glass_icon_state = "neurotoxinglass" glass_name = "glass of Neurotoxin" glass_desc = "A drink that is guaranteed to knock you silly." @@ -4116,6 +4325,8 @@ taste_description = "fizzy orange" carbonated = TRUE + value = 0.18 + glass_icon_state = "omimosa" glass_name = "glass of orange mimosa" glass_desc = "Smells like a fresh start." @@ -4127,6 +4338,8 @@ strength = 20 taste_description = "metallic and expensive" + value = 0.16 + glass_icon_state = "patronglass" glass_name = "glass of Patron" glass_desc = "Drinking patron in the bar, with all the subpar ladies." @@ -4139,6 +4352,8 @@ strength = 25 taste_description = "bitter christmas tree" + value = 0.11 + glass_icon_state = "pinkgin" glass_name = "glass of pink gin" glass_desc = "What an eccentric cocktail." @@ -4152,6 +4367,8 @@ taste_description = "very bitter christmas tree" carbonated = TRUE + value = 0.13 + glass_icon_state = "pinkgintonic" glass_name = "glass of pink gin and tonic" glass_desc = "You made gin and tonic more bitter... you madman!" @@ -4163,6 +4380,8 @@ strength = 25 taste_description = "spiced fruit cocktail" + value = 0.14 + glass_icon_state = "piratepunch" glass_name = "glass of pirate's punch" glass_desc = "Yarr harr fiddly dee, drink whatcha want 'cause a pirate is ye!" @@ -4175,6 +4394,8 @@ strength = 25 taste_description = "jamaica" + value = 0.13 + glass_icon_state = "planterpunch" glass_name = "glass of planter's punch" glass_desc = "This takes you back, back to those endless white beaches of yore." @@ -4189,6 +4410,8 @@ halluci = 10 taste_description = "purified alcoholic death" + value = 0.19 + glass_icon_state = "pwineglass" glass_name = "glass of ???" glass_desc = "A black ichor with an oily purple sheer on top. Are you sure you should drink this?" @@ -4218,6 +4441,8 @@ strength = 21 taste_description = "sweet and salty alcohol" + value = 0.14 + glass_icon_state = "red_meadglass" glass_name = "glass of red mead" glass_desc = "A true Viking's beverage, though its color is strange." @@ -4232,6 +4457,8 @@ targ_temp = 360 taste_description = "hot and spice" + value = 0.13 + glass_icon_state = "sbitenglass" glass_name = "glass of Sbiten" glass_desc = "A spicy mix of Mead and Spices. Very hot." @@ -4244,6 +4471,8 @@ strength = 15 taste_description = "oranges" + value = 0.13 + glass_icon_state = "screwdriverglass" glass_name = "glass of Screwdriver" glass_desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer." @@ -4256,6 +4485,8 @@ strength = 30 taste_description = "fruity rum and bittersweet nostalgia" + value = 0.14 + glass_icon_state = "sidewinderglass" glass_name = "glass of Sidewinder Fang" glass_desc = "An eclectic cocktail of fruit juices and dark rum. Mess with the viper, and you get the fangs." @@ -4268,6 +4499,8 @@ strength = 50 taste_description = "a pencil eraser" + value = 0.135 + glass_icon_state = "silencerglass" glass_name = "glass of Silencer" glass_desc = "A drink from mime Heaven." @@ -4280,6 +4513,8 @@ strength = 50 taste_description = "concentrated matter" + value = 0.2 + glass_icon_state = "singulo" glass_name = "glass of Singulo" glass_desc = "A blue-space beverage." @@ -4293,6 +4528,8 @@ taste_description = "refreshing cold" carbonated = TRUE + value = 0.125 + glass_icon_state = "snowwhite" glass_name = "glass of Snow White" glass_desc = "A cold refreshment." @@ -4305,6 +4542,8 @@ strength = 20 taste_description = "lime christmas tree" + value = 0.14 + glass_icon_state = "ssroyale" glass_name = "glass of southside royale" glass_desc = "This cocktail is better than you. Maybe it's the crossed arms that give it away. Or the rich parents." @@ -4318,6 +4557,8 @@ taste_description = "fruit" carbonated = TRUE + value = 0.12 + glass_icon_state = "sdreamglass" glass_name = "glass of Sui Dream" glass_desc = "A froofy, fruity, and sweet mixed drink. Understanding the name only brings shame." @@ -4331,6 +4572,8 @@ taste_description = "cheap labor" carbonated = TRUE + value = 0.21 + glass_icon_state = "gibsonhooch" glass_name = "glass of Gibson Hooch" glass_desc = "A factory worker's favorite... Because they can't afford much else." @@ -4343,6 +4586,8 @@ strength = 15 taste_description = "oranges" + value = 0.13 + glass_icon_state = "tequilasunriseglass" glass_name = "glass of Tequila Sunrise" glass_desc = "Oh great, now you feel nostalgic about sunrises back on Terra..." @@ -4356,6 +4601,8 @@ taste_description = "dry" carbonated = TRUE + value = 0.2 + glass_icon_state = "threemileislandglass" glass_name = "glass of Three Mile Island iced tea" glass_desc = "A glass of this is sure to prevent a meltdown." @@ -4371,6 +4618,8 @@ targ_temp = 330 taste_description = "spicy toxins" + value = 0.2 + glass_icon_state = "toxinsspecialglass" glass_name = "glass of Toxins Special" glass_desc = "Whoah, this thing is on FIRE" @@ -4382,6 +4631,8 @@ strength = 32 taste_description = "shaken, not stirred" + value = 0.135 + glass_icon_state = "martiniglass" glass_name = "glass of vodka martini" glass_desc ="A bastardisation of the classic martini. Still great." @@ -4394,6 +4645,8 @@ strength = 35 taste_description = "tart bitterness" + value = 0.145 + glass_icon_state = "vodkatonicglass" glass_name = "glass of vodka and tonic" glass_desc = "For when a gin and tonic isn't Russian enough." @@ -4406,6 +4659,8 @@ strength = 30 taste_description = "bitter cream" + value = 0.125 + glass_icon_state = "whiterussianglass" glass_name = "glass of White Russian" glass_desc = "A very nice looking drink. But that's just, like, your opinion, man." @@ -4418,6 +4673,8 @@ strength = 30 taste_description = "creamy vodka and lime" + value = 0.125 + glass_icon_state = "solarianwhiteglass" glass_name = "glass of Solarian White" glass_desc = "A classic Solarian cocktail. Despite the name, this is not a security officer." @@ -4432,6 +4689,8 @@ strength = 35 taste_description = "polished boots and nationalism" + value = 0.2 + glass_icon_state = "solarianmarineglass" glass_name = "Solarian Marine" glass_desc = "Drink too many of these, and you'll wake up invading Tau Ceti." @@ -4445,6 +4704,8 @@ strength = 65 taste_description = "strong, earthy licorice" + value = 0.13 + glass_icon_state = "permanentrevolutionglass" glass_name = "glass of Permanent Revolution" glass_desc = "A Himean cocktail, so named for its tendency to make the room spin. You have nothing to lose but your sobriety." @@ -4469,6 +4730,8 @@ strength = 28 taste_description = "earthy, oily unity" + value = 0.13 + glass_icon_state = "internationaleglass" glass_name = "glass of Internationale" glass_desc = "The nearest thing the Orion Spur has to left unity. The subversive's choice." @@ -4483,6 +4746,8 @@ taste_description = "cola" carbonated = TRUE + value = 0.15 + glass_icon_state = "whiskeycolaglass" glass_name = "glass of whiskey cola" glass_desc = "An innocent-looking mixture of cola and Whiskey. Delicious." @@ -4496,6 +4761,8 @@ taste_description = "cola" carbonated = TRUE + value = 0.15 + glass_icon_state = "whiskeysodaglass2" glass_name = "glass of whiskey soda" glass_desc = "Ultimate refreshment." @@ -4508,6 +4775,8 @@ strength = 45 taste_description = "silky, amber goodness" + value = 0.3 + glass_icon_state = "whiskeyglass" glass_name = "glass of special blend whiskey" glass_desc = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything." @@ -4549,6 +4818,8 @@ strength = 15 taste_description = "lime and sugar" + value = 0.15 + glass_icon_state = "daiquiri" glass_name = "glass of Daiquiri" glass_desc = "A splendid looking cocktail." @@ -4560,6 +4831,8 @@ strength = 10 taste_description = "vodka and lemon" + value = 0.15 + glass_icon_state = "icepick" glass_name = "glass of Ice Pick" glass_desc = "Big. And red. Hmm..." @@ -4571,6 +4844,8 @@ strength = 15 taste_description = "layers of liquors" + value = 0.17 + glass_icon_state = "pousseecafe" glass_name = "glass of Pousse-Cafe" glass_desc = "Smells of French and liquore." @@ -4582,6 +4857,8 @@ strength = 25 taste_description = "old as time" + value = 0.15 + glass_icon_state = "mintjulep" glass_name = "glass of Mint Julep" glass_desc = "As old as time itself, but how does it taste?" @@ -4594,6 +4871,8 @@ taste_description = "whiskey" carbonated = TRUE + value = 0.17 + glass_icon_state = "johnscollins" glass_name = "glass of John Collins" glass_desc = "Named after a man, perhaps?" @@ -4606,6 +4885,8 @@ taste_description = "gin and class" carbonated = TRUE + value = 0.13 + glass_icon_state = "gimlet" glass_name = "glass of Gimlet" glass_desc = "Small, elegant, and packs a punch." @@ -4617,6 +4898,8 @@ strength = 10 taste_description = "freedom" + value = 0.15 + glass_icon_state = "starsandstripes" glass_name = "glass of Stars and Stripes" glass_desc = "Someone, somewhere, is saluting." @@ -4639,6 +4922,8 @@ strength = 27 taste_description = "fruity sweetness" + value = 0.13 + glass_icon_state = "metropolitan" glass_name = "glass of Metropolitan" glass_desc = "What more could you ask for?" @@ -4661,6 +4946,8 @@ strength = 30 taste_description = "political power" + value = 0.13 + glass_icon_state = "primeministerglass" glass_name = "glass of Prime Minister" glass_desc = "All the fun of power, none of the assassination risk!" @@ -4672,6 +4959,8 @@ strength = 21 taste_description = "tart, oily honey" + value = 0.15 + glass_icon_state = "peacetreatyglass" glass_name = "glass of Peace Treaty" glass_desc = "A diplomatic overture in a glass." @@ -4683,6 +4972,8 @@ strength = 25 taste_description = "dryness" + value = 0.18 + glass_icon_state = "caruso" glass_name = "glass of Caruso" glass_desc = "Green, almost alien." @@ -4694,6 +4985,8 @@ strength = 25 taste_description = "brandy and oranges" + value = 0.15 + glass_icon_state = "aprilshower" glass_name = "glass of April Shower" glass_desc = "Smells of brandy." @@ -4705,6 +4998,8 @@ strength = 15 taste_description = "sweetness" + value = 0.17 + glass_icon_state = "carthusiansazerac" glass_name = "glass of Carthusian Sazerac" glass_desc = "Whiskey and... Syrup?" @@ -4716,6 +5011,8 @@ strength = 25 taste_description = "dry gin" + value = 0.15 + glass_icon_state = "deweycocktail" glass_name = "glass of Dewey Cocktail" glass_desc = "Colours, look at all the colours!" @@ -4727,6 +5024,8 @@ strength = 40 taste_description = "a mixture of herbs" + value = 0.18 + glass_icon_state = "greenchartreuseglass" glass_name = "glass of Green Chartreuse" glass_desc = "A green, strong liqueur." @@ -4738,6 +5037,8 @@ strength = 40 taste_description = "a sweet mixture of herbs" + value = 0.18 + glass_icon_state = "chartreuseyellowglass" glass_name = "glass of Yellow Chartreuse" glass_desc = "A yellow, strong liqueur." @@ -4749,6 +5050,8 @@ strength = 20 taste_description = "mint" + value = 0.14 + glass_icon_state = "whitecremeglass" glass_name = "glass of White Creme de Menthe" glass_desc = "Mint-flavoured alcohol." @@ -4760,6 +5063,8 @@ strength = 20 taste_description = "berries" + value = 0.17 + glass_icon_state = "cremedeyvetteglass" glass_name = "glass of Creme de Yvette" glass_desc = "Berry-flavoured alcohol." @@ -4771,6 +5076,8 @@ strength = 40 taste_description = "cheap cognac" + value = 0.2 + glass_icon_state = "brandyglass" glass_name = "glass of Brandy" glass_desc = "Cheap knock off for cognac." @@ -4783,6 +5090,8 @@ taste_description = "dryness" carbonated = TRUE + value = 0.1 + glass_icon_state = "guinnessglass" glass_name = "glass of Guinness" glass_desc = "A glass of Guinness." @@ -4794,6 +5103,8 @@ strength = 40 taste_description = "sweet whisky" + value = 0.18 + glass_icon_state = "drambuieglass" glass_name = "glass of Drambuie" glass_desc = "A drink that smells like whiskey but tastes different." @@ -4805,6 +5116,8 @@ strength = 30 taste_description = "bitterness" + value = 0.15 + glass_icon_state = "oldfashioned" glass_name = "glass of Old Fashioned" glass_desc = "That looks like it's from the sixties." @@ -4816,6 +5129,8 @@ strength = 40 taste_description = "bitterness blindness" + value = 0.16 + glass_icon_state = "blindrussian" glass_name = "glass of Blind Russian" glass_desc = "You can't see?" @@ -4827,6 +5142,8 @@ strength = 25 taste_description = "lemons" + value = 0.13 + glass_icon_state = "rustynail" glass_name = "glass of Rusty Nail" glass_desc = "Smells like lemon." @@ -4839,6 +5156,8 @@ taste_description = "tall bitterness" carbonated = TRUE + value = 0.15 + glass_icon_state = "tallblackrussian" glass_name = "glass of Tall Black Russian" glass_desc = "Just like black russian but taller." @@ -5621,6 +5940,8 @@ glass_icon_state = "darmadhirbrew_glass" glass_name = "glass of Darmadhir Brew" + value = 25 + /singleton/reagent/alcohol/treebark_firewater name = "Tree-Bark Firewater" color = "#ACAA1D" @@ -5674,6 +5995,8 @@ glass_name = "glass of Xuizi Juice" glass_desc = "The clear green liquid smells like vanilla, tastes like water. Unathi swear it has a rich taste and texture." + value = 0.2 + /singleton/reagent/alcohol/butanol/sarezhiwine name = "Sarezhi Wine" description = "An alcoholic beverage made from lightly fermented Sareszhi berries, considered an upper class delicacy on Moghes. Significant butanol content indicates intoxicating effects on Unathi." @@ -6430,6 +6753,7 @@ description = "A mixture of perfectly healthy milk and delicious chocolate." color = "#74533b" taste_description = "chocolate milk" + value = 0.11 glass_icon_state = "glass_chocolate" glass_name = "glass of chocolate milk" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index ca421a3ee70..fdbb7af6d83 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -10,6 +10,7 @@ metabolism_min = REM * 0.125 breathe_mul = 0.5 scannable = TRUE + value = 2.5 taste_description = "bitterness" /singleton/reagent/inaprovaline/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) @@ -33,6 +34,7 @@ taste_description = "bitterness" fallback_specific_heat = 1 taste_mult = 3 + value = 4.9 /singleton/reagent/bicaridine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) M.heal_organ_damage(5 * removed, 0) @@ -114,6 +116,7 @@ metabolism = REM * 0.5 overdose = 15 taste_mult = 1.5 + value = 3.9 /singleton/reagent/dermaline/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) M.heal_organ_damage(0, 12 * removed) @@ -129,6 +132,7 @@ scannable = TRUE metabolism = REM * 0.5 taste_description = "a roll of gauze" + value = 2.1 var/remove_generic = TRUE var/list/remove_toxins = list( @@ -171,6 +175,7 @@ metabolism = REM * 0.75 breathe_met = REM * 0.5 breathe_mul = 2 + value = 2.4 var/strength = 6 /singleton/reagent/dexalin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) @@ -197,6 +202,7 @@ color = "#0040FF" overdose = 15 strength = 12 + value = 3.6 /singleton/reagent/tricordrazine name = "Tricordrazine" @@ -209,6 +215,7 @@ taste_description = "bitterness" breathe_mul = 0 metabolism = REM * 0.25 + value = 6 /singleton/reagent/tricordrazine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) var/power = 1 + Clamp((holder.get_temperature() - (T0C + 20))*0.1,-0.5,0.5) @@ -228,6 +235,7 @@ overdose = 5 scannable = TRUE taste_description = "sludge" + value = 3.9 /singleton/reagent/cryoxadone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) M.add_chemical_effect(CE_CRYO, 1) @@ -261,6 +269,7 @@ overdose = 5 scannable = TRUE taste_description = "slime" + value = 5.5 /singleton/reagent/clonexadone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) M.add_chemical_effect(CE_CRYO, 1) @@ -301,6 +310,7 @@ taste_description = "sickness" metabolism_min = 0.005 breathe_mul = 0 + value = 3.3 /singleton/reagent/perconol/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) if(check_min_dose(M)) @@ -330,6 +340,7 @@ taste_description = "sourness" metabolism_min = 0.005 breathe_mul = 0 + value = 3.1 /singleton/reagent/mortaphenyl/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) var/list/joy_messages = list("You feel soothed and at ease.", "You feel content and at peace.", "You feel a pleasant emptiness.", "You feel like sharing the wonderful memories and feelings you're experiencing.", "All your anxieties fade away.", "You feel like you're floating off the ground.", "You don't want this feeling to end.") @@ -503,6 +514,7 @@ breathe_met = REM * 4 // .8 units per tick taste_description = "bitterness" metabolism_min = 0.005 + value = 3.3 /singleton/reagent/oxycomorphine/initial_effect(var/mob/living/carbon/human/M, var/alien, var/holder) to_chat(M, SPAN_GOOD(pick("You lean back and begin to fall... and fall... and fall.", "A feeling of ecstasy builds within you.", "You're startled by just how amazing you suddenly feel."))) @@ -554,6 +566,7 @@ scannable = TRUE taste_description = "bitterness" metabolism_min = REM * 0.0125 + value = 4.6 /singleton/reagent/synaptizine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) M.drowsiness = max(M.drowsiness - 5, 0) @@ -595,6 +608,7 @@ scannable = TRUE taste_description = "bitterness" metabolism_min = REM * 0.075 + value = 5.9 /singleton/reagent/alkysine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) if(check_min_dose(M, 2)) //Increased effectiveness & no side-effects if given via IV drip with low transfer rate. @@ -633,6 +647,7 @@ scannable = TRUE taste_mult = 0.33 //Specifically to cut the dull toxin taste out of foods using carrot taste_description = "dull toxin" + value = 4.2 /singleton/reagent/oculine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) M.eye_blurry = max(M.eye_blurry - 5 * removed, 0) @@ -665,6 +680,7 @@ overdose = 10 scannable = TRUE taste_description = "bitterness" + value = 6 /singleton/reagent/peridaxon/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) if(ishuman(M)) @@ -707,6 +723,7 @@ taste_description = "acid" metabolism = REM metabolism_min = 0.25 + value = 3.6 /singleton/reagent/ryetalyn/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) holder.remove_reagent(/singleton/reagent/toxin/malignant_tumour_cells, 2) @@ -731,6 +748,7 @@ taste_description = "acid" metabolism_min = REM * 0.025 breathe_met = REM * 0.15 * 0.5 + value = 3.9 /singleton/reagent/hyperzine/initial_effect(mob/living/carbon/M, alien, datum/reagents/holder) . = ..() @@ -781,6 +799,7 @@ overdose = REAGENTS_OVERDOSE scannable = TRUE taste_description = "bitterness" + value = 3.1 /singleton/reagent/ethylredoxrazine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) var/P = removed * ETHYL_REAGENT_POWER @@ -833,6 +852,7 @@ overdose = REAGENTS_OVERDOSE scannable = TRUE taste_description = "bitterness" + value = 2.3 unaffected_species = IS_MACHINE var/last_taste_time = -10000 @@ -863,6 +883,7 @@ overdose = REAGENTS_OVERDOSE scannable = TRUE taste_description = "bitterness" + value = 2.7 unaffected_species = IS_MACHINE /singleton/reagent/arithrazine/initialize_data(newdata) @@ -900,6 +921,7 @@ scannable = TRUE taste_description = "bitter gauze soaked in rubbing alcohol" fallback_specific_heat = 0.605 // assuming it's ethanol-based + value = 2.5 /singleton/reagent/thetamycin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) M.add_chemical_effect(CE_ANTIBIOTIC, M.chem_doses[type]) // strength of antibiotics; amount absorbed, need >5u dose to begin to be effective which'll take ~5 minutes to metabolise. need >10u dose if administered orally. @@ -986,6 +1008,8 @@ breathe_met = REM * 2 // .4 units per tick // touch is slow + value = 1.5 + glass_name = "glass of cough syrup" glass_desc = "You'd better not." @@ -1031,6 +1055,7 @@ touch_met = 5 taste_description = "burning bleach" germ_adjust = 20 + value = 2.2 /singleton/reagent/sterilizine/affect_touch(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) M.germ_level -= min(removed*20, M.germ_level) @@ -1094,6 +1119,7 @@ overdose = REAGENTS_OVERDOSE scannable = TRUE taste_description = "bitterness" + value = 2 /singleton/reagent/leporazine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) if(!check_min_dose(M)) @@ -1183,6 +1209,7 @@ taste_description = "bitterness" messagedelay = MEDICATION_MESSAGE_DELAY * 0.75 goodmessage = list("You feel good.","You feel relaxed.","You feel alert and focused.") + value = 2 /singleton/reagent/mental/nicotine/overdose(var/mob/living/carbon/M, var/alien, var/removed, var/scale, var/datum/reagents/holder) ..() @@ -1217,6 +1244,7 @@ od_minimum_dose = 0.2 taste_description = "paper" goodmessage = list("You feel focused.","You feel like you have no distractions.","You feel willing to work.") + value = 6 /singleton/reagent/mental/corophenidate/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) M.add_chemical_effect(CE_HALLUCINATE, -1) @@ -1231,6 +1259,7 @@ od_minimum_dose = 0.2 taste_description = "bitterness" goodmessage = list("You do not feel the need to worry about simple things.","You feel calm and level-headed.","You feel fine.") + value = 6 /singleton/reagent/mental/parvosil name = "Parvosil" @@ -1241,6 +1270,7 @@ od_minimum_dose = 0.4 taste_description = "paper" goodmessage = list("You feel fine.","You feel rational.","You feel secure.") + value = 6 /singleton/reagent/mental/minaphobin name = "Minaphobin" @@ -1251,6 +1281,7 @@ od_minimum_dose = 0.2 taste_description = "duct tape" goodmessage = list("You feel relaxed.","You feel at ease.","You feel carefree.") + value = 6 /singleton/reagent/mental/emoxanyl name = "Emoxanyl" @@ -1262,6 +1293,7 @@ taste_description = "scotch tape" goodmessage = list("You feel at ease.","Your mind feels great.", "You feel centered.") messagedelay = MEDICATION_MESSAGE_DELAY * 0.75 + value = 6 /singleton/reagent/mental/orastabin name = "Orastabin" @@ -1273,6 +1305,7 @@ taste_description = "glue" goodmessage = list("You feel at ease.","You feel like you can speak with confidence.","You feel unafraid to speak.") messagedelay = MEDICATION_MESSAGE_DELAY * 0.75 + value = 6 /singleton/reagent/mental/orastabin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) M.add_chemical_effect(CE_NOSTUTTER, 2) @@ -1289,6 +1322,7 @@ taste_description = "tranquility" goodmessage = list("Your mind feels as one.","You feel incredibly comfortable.","Your body feels good.","Your thoughts are clear.", "You feel stress free.", "Nothing is bothering you anymore.") messagedelay = MEDICATION_MESSAGE_DELAY * 0.5 + value = 6 /singleton/reagent/mental/neurapan/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) M.add_chemical_effect(CE_HALLUCINATE, -2) @@ -1311,6 +1345,7 @@ taste_description = "paint" goodmessage = list("Your mind feels as one.","You feel comfortable speaking.","Your body feels good.","Your thoughts are pure.","Your body feels responsive.","You can handle being alone.") messagedelay = MEDICATION_MESSAGE_DELAY * 0.5 + value = 6 /singleton/reagent/mental/nerospectan/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) M.add_chemical_effect(CE_HALLUCINATE, -2) @@ -1331,6 +1366,7 @@ goodmessage = list("You feel like you have nothing to hide.","You feel compelled to spill your secrets.","You feel like you can trust those around you.") messagedelay = 30 ingest_mul = 1 + value = 8 /singleton/reagent/mental/truthserum/overdose(var/mob/living/carbon/M, var/alien, var/datum/reagents/holder) M.add_chemical_effect(CE_PACIFIED, 1) @@ -1511,6 +1547,7 @@ scannable = TRUE taste_description = "fine dust" reagent_state = SOLID + value = 3.2 /singleton/reagent/pneumalin/affect_breathe(var/mob/living/carbon/human/H, var/alien, var/removed, var/datum/reagents/holder) H.adjustOxyLoss(removed) //Every unit heals 1 oxy damage @@ -1535,6 +1572,7 @@ overdose = REAGENTS_OVERDOSE scannable = TRUE taste_description = "sickness" + value = 5 /singleton/reagent/rezadone/affect_chem_effect(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) . = ..() @@ -1564,6 +1602,7 @@ scannable = TRUE taste_description = "blood" specific_heat = 1 + value = 5 /singleton/reagent/sanasomnum/initial_effect(mob/living/carbon/M) to_chat(M, SPAN_WARNING("Your limbs start to feel numb and weak, and your legs wobble as it becomes hard to stand!")) @@ -1620,6 +1659,7 @@ overdose = REAGENTS_OVERDOSE scannable = TRUE taste_description = "sweet syrup" + value = 2 /singleton/reagent/verunol/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) if (prob(10+M.chem_doses[type])) @@ -1638,6 +1678,7 @@ taste_description = "bitter metal" overdose = 5 fallback_specific_heat = 1.2 + value = 500 /singleton/reagent/azoth/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) ..() @@ -1726,6 +1767,7 @@ value = 2 breathe_mul = 0 ingest_mul = 0 + value = 3 /singleton/reagent/adrenaline/affect_blood(var/mob/living/carbon/human/M, var/alien, var/removed, var/datum/reagents/holder) if(alien == IS_DIONA) @@ -1763,6 +1805,7 @@ affects_dead = 1 taste_description = "eternal blissfulness" fallback_specific_heat = 2 + value = 1000 /singleton/reagent/elixir/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) if(ishuman(M)) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm index 25349e4029c..9cd09998468 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm @@ -8,6 +8,7 @@ overdose = 5 taste_description = "the back of class" fallback_specific_heat = 0.4 + value = 0.001 /singleton/reagent/crayon_dust/red name = "Red Crayon Dust" @@ -99,6 +100,7 @@ glass_desc = "It's magic, I ain't gotta explain shit." fallback_specific_heat = 10 //Magical. + value = 1000 /singleton/reagent/adminordrazine/affect_touch(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) @@ -135,6 +137,7 @@ color = "#F7C430" taste_description = "expensive metal" fallback_specific_heat = 2.511 + value = 7 /singleton/reagent/silver name = "Silver" @@ -143,6 +146,7 @@ color = "#D0D0D0" taste_description = "expensive yet reasonable metal" fallback_specific_heat = 0.241 + value = 4 /singleton/reagent/uranium name = "Uranium" @@ -151,6 +155,7 @@ color = "#B8B8C0" taste_description = "the inside of a reactor" fallback_specific_heat = 2.286 + value = 9 /singleton/reagent/uranium/affect_touch(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) affect_ingest(M, alien, removed, holder) @@ -195,6 +200,7 @@ color = "#E0E0E0" taste_description = "salty metalic miner tears" fallback_specific_heat = 0.2971 + value = 3 /singleton/reagent/water/holywater name = "Holy Water" @@ -257,6 +263,7 @@ reagent_state = LIQUID color = "#604030" taste_description = "iron" + value = 0.9 /singleton/reagent/surfactant // Foam precursor name = "Azosurfactant" @@ -264,6 +271,7 @@ reagent_state = LIQUID color = "#9E6B38" taste_description = "metal" + value = 0.05 /singleton/reagent/foaming_agent // Metal foaming agent. This is lithium hydride. Add other recipes (e.g. LiH + H2O -> LiOH + H2) eventually. name = "Foaming Agent" @@ -279,6 +287,7 @@ color = "#673910" touch_met = 50 taste_description = "sweet tasting metal" + value = 6 /singleton/reagent/thermite/touch_turf(var/turf/T, var/amount, var/datum/reagents/holder) . = ..() @@ -306,6 +315,7 @@ touch_met = REM * 10 taste_description = "sourness" germ_adjust = 10 + value = 0.7 /singleton/reagent/spacecleaner/touch_obj(var/obj/O, var/amount, var/datum/reagents/holder) O.clean_blood() @@ -425,6 +435,7 @@ reagent_state = LIQUID color = "#009CA8" taste_description = "cherry" + value = 0.6 /singleton/reagent/lube/touch_turf(var/turf/simulated/T, var/amount, var/datum/reagents/holder) if(!istype(T)) @@ -466,6 +477,7 @@ reagent_state = LIQUID color = COLOR_GRAY taste_description = "sweetness" + value = 8 /singleton/reagent/nitroglycerin name = "Nitroglycerin" @@ -473,6 +485,7 @@ reagent_state = LIQUID color = COLOR_GRAY taste_description = "oil" + value = 9 /singleton/reagent/nitroglycerin/proc/explode(var/datum/reagents/holder) var/datum/effect/effect/system/reagents_explosion/e = new() @@ -515,6 +528,7 @@ color = "#C8A5DC" taste_description = "sourness" taste_mult = 1.1 + value = 0.8 /singleton/reagent/ultraglue name = "Ultra Glue" @@ -530,6 +544,7 @@ color = "#B97A57" taste_description = "wood" fallback_specific_heat = 1.9 + value = 0.6 /singleton/reagent/luminol name = "Luminol" @@ -537,6 +552,7 @@ reagent_state = LIQUID color = "#F2F3F4" taste_description = "metal" + value = 1.4 /singleton/reagent/luminol/touch_obj(var/obj/O, var/amount, var/datum/reagents/holder) O.reveal_blood() @@ -660,6 +676,7 @@ metabolism = REM * 0.25 taste_description = "bottled fire" fallback_specific_heat = 2.75 + value = 50 unaffected_species = IS_MACHINE /singleton/reagent/estus/initial_effect(mob/living/carbon/M, alien, datum/reagents/holder) @@ -690,6 +707,7 @@ touch_met = 5 taste_description = "metal" fallback_specific_heat = 20 //This holds a ton of heat. + value = 50 unaffected_species = IS_MACHINE /singleton/reagent/liquid_fire/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) @@ -710,6 +728,7 @@ color = "#000000" taste_description = "emptyness" fallback_specific_heat = 100 //Yeah... + value = 250 unaffected_species = IS_MACHINE /singleton/reagent/black_matter/touch_turf(var/turf/T, var/amount, var/datum/reagents/holder) @@ -735,6 +754,7 @@ color = "#1f8999" taste_description = "fizzling blue" fallback_specific_heat = 0.1 + value = 250 unaffected_species = IS_MACHINE /singleton/reagent/bluespace_dust/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) @@ -755,6 +775,7 @@ color = "#f4c430" taste_description = "heavenly knowledge" fallback_specific_heat = 1.25 + value = 1000 /singleton/reagent/sglue name = "Sovereign Glue" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm index 6ae74a94b95..34a43900b60 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm @@ -10,6 +10,7 @@ taste_mult = 1.2 fallback_specific_heat = 0.75 overdose = 10 + value = 2 var/target_organ // needs to be null by default var/strength = 2 // How much damage it deals per unit @@ -48,6 +49,7 @@ color = "#CF3600" strength = 5 taste_description = "plastic" + value = 2.1 /singleton/reagent/toxin/amatoxin name = "Amatoxin" @@ -56,6 +58,7 @@ color = "#792300" strength = 10 taste_description = "mushroom" + value = 2.3 /singleton/reagent/toxin/carpotoxin name = "Carpotoxin" @@ -65,6 +68,7 @@ strength = 10 taste_description = "fish" target_organ = BP_BRAIN + value = 3 /singleton/reagent/toxin/carpotoxin/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) if(alien && alien == IS_UNATHI) @@ -133,6 +137,7 @@ taste_mult = 1.5 breathe_mul = 2 fallback_specific_heat = 12 //Phoron is very dense and can hold a lot of energy. + value = 10 /singleton/reagent/toxin/phoron/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) if(ishuman(M)) @@ -256,6 +261,7 @@ taste_description = "bitter almonds" taste_mult = 1.5 target_organ = BP_HEART + value = 3.3 /singleton/reagent/toxin/cyanide/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) ..() @@ -274,6 +280,7 @@ overdose = 15 od_minimum_dose = 5 taste_description = "salt" + value = 4.4 /singleton/reagent/toxin/potassium_chloride/overdose(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) var/mob/living/carbon/human/H = M @@ -295,6 +302,7 @@ overdose = 5 od_minimum_dose = 20 taste_description = "salt" + value = 4.5 /singleton/reagent/toxin/potassium_chlorophoride/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) var/mob/living/carbon/human/H = M @@ -317,6 +325,7 @@ strength = 3 taste_description = "death" target_organ = BP_BRAIN + value = 2.9 /singleton/reagent/toxin/zombiepowder/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) ..() @@ -344,6 +353,7 @@ taste_description = "plant food" taste_mult = 0.5 touch_mul = 0 + value = 1.2 unaffected_species = IS_MACHINE /singleton/reagent/toxin/fertilizer/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) @@ -442,6 +452,7 @@ strength = 4 metabolism = REM*1.5 taste_mult = 1 + value = 1.1 unaffected_species = IS_MACHINE /singleton/reagent/toxin/plantbgone/touch_turf(var/turf/T, var/amount, var/datum/reagents/holder) @@ -478,6 +489,7 @@ color = "#C8A5DC" overdose = REAGENTS_OVERDOSE taste_description = "acid" + value = 2.4 /singleton/reagent/lexorin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) var/mob/living/carbon/human/H = M @@ -494,6 +506,7 @@ color = "#13BC5E" taste_description = "slime" taste_mult = 0.9 + value = 3.1 /singleton/reagent/mutagen/affect_touch(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) if(prob(33)) @@ -531,6 +544,7 @@ color = "#801E28" taste_description = "slime" taste_mult = 1.3 + value = 1.2 /singleton/reagent/slimejelly/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) if(isslime(M)) // stabilize slime mutation by reintroducing slime jelly into the slime @@ -557,6 +571,7 @@ overdose = REAGENTS_OVERDOSE taste_description = "bitterness" breathe_met = REM * 0.5 * 0.33 + value = 2.5 var/total_strength = 0 /singleton/reagent/soporific/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) @@ -588,6 +603,7 @@ overdose = 15 taste_description = "bitterness" breathe_met = REM * 0.5 * 0.5 + value = 2.6 /singleton/reagent/polysomnine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) var/mob/living/carbon/human/H = M @@ -620,6 +636,7 @@ glass_center_of_mass = list("x"=16, "y"=8) fallback_specific_heat = 1.2 + value = 2.2 /* Transformations */ @@ -629,6 +646,7 @@ reagent_state = LIQUID color = "#13BC5E" taste_description = "sludge" + value = 3 /singleton/reagent/aslimetoxin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) // TODO: check if there's similar code anywhere else if(M.transforming) @@ -663,12 +681,14 @@ color = "#535E66" taste_description = "slimey metal" fallback_specific_heat = 3 + value = 9 /singleton/reagent/toxin/undead name = "Undead Ichor" description = "A wicked liquid with unknown origins and uses." color = "#b2beb5" strength = 25 + value = 300 taste_description = "ashes" /singleton/reagent/toxin/undead/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder)