cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-27 06:54:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Value Reorganization (#19879)

Browse Source 
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.
This commit is contained in:
Geeves
2024-09-21 11:24:17 +00:00
committed by GitHub
parent f2d65081e1
commit 99b8b251eb
20 changed files with 499 additions and 994 deletions
Download Patch File Download Diff File Expand all files Collapse all files
aurorastation.dme
-3
View File
@@ -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"
code/game/objects/items/weapons/material/kitchen.dm
+1
View File
@@ -1,6 +1,7 @@
/obj/item/material/kitchen
icon = 'icons/obj/kitchen.dmi'
contained_sprite = TRUE
worth_multiplier = 1.1
/*
* Utensils
code/game/objects/items/weapons/material/knives.dm
+1
View File
@@ -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)
code/game/objects/items/weapons/material/material_weapons.dm
+3
View File
@@ -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)
code/game/objects/items/weapons/material/misc.dm
+4
View File
@@ -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"
code/game/objects/items/weapons/material/swords.dm
+1
View File
@@ -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
code/game/objects/items/weapons/material/thrown.dm
+1
View File
@@ -10,6 +10,7 @@
sharp = 1
edge = TRUE
w_class = WEIGHT_CLASS_SMALL
worth_multiplier = 25
/obj/item/material/star/Initialize(newloc, material_key)
. = ..()
code/game/objects/items/weapons/material/twohanded.dm
+6
View File
@@ -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
code/modules/item_worth/material_weapons.dm
-47
View File
@@ -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
code/modules/item_worth/materials.dm
-91
View File
@@ -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
code/modules/item_worth/reagents.dm
-853
View File
@@ -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
code/modules/materials/materials.dm
+34
View File
@@ -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
code/modules/reagents/Chemistry-Reagents.dm
+3
View File
@@ -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
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
+6
View File
@@ -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)
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
+24
View File
@@ -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)
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm
+7
View File
@@ -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"
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+324
View File
File diff suppressed because it is too large Load Diff
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
+43
View File
@@ -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 <b>numb</b> and <b>weak</b>, 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))
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
+21
View File
@@ -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"
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
+20
View File
@@ -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)