This commit is contained in:
Kashargul
2024-12-06 22:26:07 +01:00
parent e0972e8325
commit 5398ec84bf
22 changed files with 69 additions and 45 deletions
@@ -46,7 +46,7 @@
env.add_thermal_energy(-10 * 1000)
/datum/blob_type/cryogenic_goo/on_chunk_tick(obj/item/blobcore_chunk/B)
B.reagents.add_reagent("cryoslurry", 0.5)
B.reagents.add_reagent(REAGENT_ID_CRYOSLURRY, 0.5)
var/turf/simulated/T = get_turf(B)
if(!istype(T))
+2 -2
View File
@@ -75,7 +75,7 @@
if(ismob(target) && proximity_flag)
// Clicked protean blob
if(istype(target, /mob/living/simple_mob/protean_blob))
sipp_mob(target, user, "liquid_protean")
sipp_mob(target, user, REAGENT_ID_LIQUIDPROTEAN)
return
// Clicked humanoid
else if(ishuman(target))
@@ -83,7 +83,7 @@
var/speciesname = H.species?.name
switch(speciesname)
if(SPECIES_PROTEAN)
sipp_mob(target, user, "liquid_protean")
sipp_mob(target, user, REAGENT_ID_LIQUIDPROTEAN)
return
if(SPECIES_PROMETHEAN)
sipp_mob(target, user, REAGENT_ID_NUTRIMENT)
+1 -1
View File
@@ -8,7 +8,7 @@
/obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteanshake/Initialize()
. = ..()
cut_overlays()
reagents.add_reagent("liquid_protean", 50)
reagents.add_reagent(REAGENT_ID_LIQUIDPROTEAN, 50)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 50)
/obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteanshake/update_icon()
+1 -1
View File
@@ -155,7 +155,7 @@
/obj/item/reagent_containers/food/snacks/meat/grubmeat/Initialize()
. = ..()
reagents.add_reagent("protein", 1)
reagents.add_reagent("shockchem", 6)
reagents.add_reagent(REAGENT_ID_SHOCKCHEM, 6)
bitesize = 6
/obj/item/reagent_containers/food/snacks/meat/worm
+2 -2
View File
@@ -193,7 +193,7 @@
/obj/item/reagent_containers/food/snacks/pillbug/Initialize()
. = ..()
reagents.add_reagent("protein", 3)
reagents.add_reagent("shockchem", 6)
reagents.add_reagent(REAGENT_ID_SHOCKCHEM, 6)
bitesize = 6
/obj/item/reagent_containers/food/snacks/pillbugempty
@@ -235,7 +235,7 @@
/obj/item/reagent_containers/food/snacks/makaroni/Initialize()
. = ..()
reagents.add_reagent("protein", 1)
reagents.add_reagent("shockchem", 6)
reagents.add_reagent(REAGENT_ID_SHOCKCHEM, 6)
bitesize = 7
/obj/item/reagent_containers/food/snacks/lobster
+1 -1
View File
@@ -191,7 +191,7 @@
desc = "An odd slice, despite the grease and cherries oozing off the top, it smells delicious."
nutriment_desc = list("The desire to consume" = 10) // You won't even taste the poison.
reagents.add_reagent("neurotoxic_protein", 2)
reagents.add_reagent("shockchem", 2)
reagents.add_reagent(REAGENT_ID_SHOCKCHEM, 2)
reagents.add_reagent("amatoxin", 2)
reagents.add_reagent("carpotoxin", 2)
reagents.add_reagent(REAGENT_ID_SPIDERTOXIN, 2)
@@ -44,7 +44,7 @@ List of things solar grubs should be able to do:
say_list_type = /datum/say_list/solargrub
var/poison_per_bite = 5 //grubs cause a shock when they bite someone
var/poison_type = "shockchem"
var/poison_type = REAGENT_ID_SHOCKCHEM
var/poison_chance = 50
var/datum/powernet/PN // Our powernet
var/obj/structure/cable/attached // the attached cable
@@ -155,7 +155,7 @@
/obj/structure/reagent_dispensers/foam/Initialize()
. = ..()
reagents.add_reagent("firefoam",1000)
reagents.add_reagent(REAGENT_ID_FIREFOAM,1000)
//Helium3
/obj/structure/reagent_dispensers/he3
+1 -1
View File
@@ -210,4 +210,4 @@
/turf/simulated/floor/water/contaminated/pump_reagents(var/datum/reagents/R, var/volume)
. = ..()
R.add_reagent("vatstabilizer", round(volume / 2, 0.1))
R.add_reagent(REAGENT_ID_VATSTABILIZER, round(volume / 2, 0.1))
@@ -155,7 +155,7 @@
/decl/chemical_reaction/distilling/berserkjuice
name = "Distilling Brute Juice"
id = "distill_brutejuice"
result = "berserkmed"
result = REAGENT_ID_BERSERKMED
required_reagents = list("biomass" = 1, "hyperzine" = 3, "synaptizine" = 2, REAGENT_ID_PHORON = 1)
result_amount = 3
@@ -173,7 +173,7 @@
/decl/chemical_reaction/distilling/cryogel
name = "Distilling Cryogellatin"
id = "distill_cryoslurry"
result = "cryoslurry"
result = REAGENT_ID_CRYOSLURRY
required_reagents = list("frostoil" = 7, "enzyme" = 3, "plasticide" = 3, "foaming_agent" = 2)
inhibitors = list(REAGENT_ID_WATER = 5)
result_amount = 1
@@ -4,7 +4,7 @@
name = "Grub protein drink"
id = REAGENT_ID_GRUBSHAKE
result = REAGENT_ID_GRUBSHAKE
required_reagents = list("shockchem" = 5, REAGENT_ID_WATER = 25)
required_reagents = list(REAGENT_ID_SHOCKCHEM = 5, REAGENT_ID_WATER = 25)
result_amount = 30
/decl/chemical_reaction/instant/drinks/deathbell
@@ -106,9 +106,9 @@
required_reagents = list("cola" = 1, "mint" = 1)
/decl/chemical_reaction/instant/firefightingfoam //TODO: Make it so we can add this to the foam tanks to refill them
name = "Firefighting Foam"
name = REAGENT_FIREFOAM
id = "firefighting foam"
result = "firefoam"
result = REAGENT_ID_FIREFOAM
required_reagents = list(REAGENT_ID_WATER = 1)
catalysts = list(REAGENT_ID_FLUORINE = 10)
result_amount = 1
@@ -116,9 +116,9 @@
/decl/chemical_reaction/instant/firefightingfoamqol //Please don't abuse this and make us remove it. Seriously.
name = "Firefighting Foam EZ"
id = "firefighting foam ez"
result = "firefoam"
result = REAGENT_ID_FIREFOAM
required_reagents = list(REAGENT_ID_WATER = 1)
catalysts = list("firefoam" = 5)
catalysts = list(REAGENT_ID_FIREFOAM = 5)
inhibitors = list(REAGENT_ID_FLUORINE = 0.01)
result_amount = 1
@@ -152,7 +152,7 @@
name = "Vermicetol"
id = "vermicetol"
result = "vermicetol"
required_reagents = list("bicaridine" = 2, "shockchem" = 1, REAGENT_ID_PHORON = 0.1)
required_reagents = list("bicaridine" = 2, REAGENT_ID_SHOCKCHEM = 1, REAGENT_ID_PHORON = 0.1)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 3
@@ -202,8 +202,8 @@
//SLIME-RELATED BELOW HERE///////
///////////////////////////////
/decl/chemical_reaction/instant/slimeify
name = "Advanced Mutation Toxin"
name = REAGENT_ADVMUTATIONTOXIN
id = "advmutationtoxin2"
result = "advmutationtoxin"
result = REAGENT_ID_ADVMUTATIONTOXIN
required_reagents = list(REAGENT_ID_PHORON = 15, "slimejelly" = 15, "mutationtoxin" = 15) //In case a xenobiologist wants to become a fully fledged slime person.
result_amount = 1
+6 -6
View File
@@ -3,8 +3,8 @@
*/
/datum/reagent/modapplying
name = "brute juice"
id = "berserkmed"
name = REAGENT_BERSERKMED
id = REAGENT_ID_BERSERKMED
description = "A liquid that is capable of causing a prolonged state of heightened aggression and durability."
taste_description = "metal"
reagent_state = LIQUID
@@ -21,8 +21,8 @@
M.add_modifier(modifier_to_add, modifier_duration, suppress_failure = TRUE)
/datum/reagent/modapplying/cryofluid
name = "cryogenic slurry"
id = "cryoslurry"
name = REAGENT_CRYOSLURRY
id = REAGENT_ID_CRYOSLURRY
description = "An incredibly strange liquid that rapidly absorbs thermal energy from materials it contacts."
taste_description = "siberian hellscape"
color = "#4CDBDB"
@@ -61,8 +61,8 @@
return
/datum/reagent/modapplying/vatstabilizer
name = "clone growth inhibitor"
id = "vatstabilizer"
name = REAGENT_VATSTABILIZER
id = REAGENT_ID_VATSTABILIZER
description = "A compound produced by NanoTrasen using a secret blend of phoron and toxins to stop the rampant growth of a clone beyond intended states."
taste_description = "sour glue"
color = "#060501"
+10 -10
View File
@@ -1,6 +1,6 @@
/datum/reagent/advmutationtoxin
name = "Advanced Mutation Toxin"
id = "advmutationtoxin"
name = REAGENT_ADVMUTATIONTOXIN
id = REAGENT_ID_ADVMUTATIONTOXIN
description = "A corruptive toxin produced by slimes. Turns the subject of the chemical into a Promethean."
reagent_state = LIQUID
color = "#13BC5E"
@@ -31,8 +31,8 @@
torso.implants += BI
/datum/reagent/nif_repair_nanites
name = "Programmed Nanomachines"
id = "nifrepairnanites"
name = REAGENT_NIFREPAIRNANITES
id = REAGENT_ID_NIFREPAIRNANITES
description = "A thick grey slurry of NIF repair nanomachines."
taste_description = "metallic"
reagent_state = LIQUID
@@ -50,8 +50,8 @@
nif.repair(removed)
/datum/reagent/firefighting_foam
name = "Firefighting Foam"
id = "firefoam"
name = REAGENT_FIREFOAM
id = REAGENT_ID_FIREFOAM
description = "A historical fire suppressant. Originally believed to simply displace oxygen to starve fires, it actually interferes with the combustion reaction itself. Vastly superior to the cheap water-based extinguishers found on most NT vessels."
reagent_state = LIQUID
color = "#A6FAFF"
@@ -95,8 +95,8 @@
M.ExtinguishMob()
/datum/reagent/liquid_protean
name = "Liquid protean"
id = "liquid_protean"
name = REAGENT_LIQUIDPROTEAN
id = REAGENT_ID_LIQUIDPROTEAN
description = "This seems to be a small portion of a Protean creature, still slightly wiggling."
taste_description = "wiggly peanutbutter"
reagent_state = LIQUID
@@ -124,8 +124,8 @@
//Special toxins for solargrubs
/datum/reagent/grubshock
name = "200 V" //in other words a painful shock
id = "shockchem"
name = REAGENT_SHOCKCHEM //in other words a painful shock
id = REAGENT_ID_SHOCKCHEM
description = "A liquid that quickly dissapates to deliver a painful shock."
reagent_state = LIQUID
color = "#E4EC2F"
+1 -1
View File
@@ -1408,7 +1408,7 @@
/decl/chemical_reaction/instant/slime/ruby_brute_juice
name = "Slime Brute Juice"
id = "m_ruby_brute_juice"
result = "berserkmed"
result = REAGENT_ID_BERSERKMED
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 30
required = /obj/item/slime_extract/ruby