cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Converts gas, ore, plants and reagent strings to defines (#9611)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2024-12-11 18:11:06 -07:00
committed by GitHub
parent d5b62d4159
commit fd5d9267ff
622 changed files with 11273 additions and 9558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/blob2/core_chunk.dm
View File

@@ -122,7 +122,7 @@
name = "Hostile Blob Revival"
id = "blob_revival"
result = null
required_reagents = list("phoron" = 60)
required_reagents = list(REAGENT_ID_PHORON = 60)
result_amount = 1
/decl/chemical_reaction/instant/blob_reconstitution/can_happen(var/datum/reagents/holder)
@@ -142,7 +142,7 @@
name = "Allied Blob Revival"
id = "blob_friend"
result = null
required_reagents = list("hydrophoron" = 40, "peridaxon" = 20, "mutagen" = 20)
required_reagents = list(REAGENT_ID_HYDROPHORON = 40, REAGENT_ID_PERIDAXON = 20, REAGENT_ID_MUTAGEN = 20)
result_amount = 1
/decl/chemical_reaction/instant/blob_reconstitution/domination/on_reaction(var/datum/reagents/holder)

4
code/modules/blob2/overmind/types/blazing_oil.dm
View File

@@ -33,7 +33,7 @@
env.add_thermal_energy(10 * 1000)
/datum/blob_type/blazing_oil/on_chunk_tick(obj/item/blobcore_chunk/B)
B.reagents.add_reagent("thermite_v", 0.5)
B.reagents.add_reagent(REAGENT_ID_THERMITEV, 0.5)
var/turf/T = get_turf(B)
if(!T)
@@ -44,4 +44,4 @@
/datum/blob_type/blazing_oil/on_chunk_use(obj/item/blobcore_chunk/B, mob/living/user)
user.add_modifier(/datum/modifier/exothermic, 5 MINUTES)
return
return

6
code/modules/blob2/overmind/types/classic.dm
View File

@@ -22,7 +22,7 @@
spawn()
var/obj/effect/effect/water/splash = new(T)
splash.create_reagents(15)
splash.reagents.add_reagent("blood", 10,list("blood_colour" = color))
splash.reagents.add_reagent(REAGENT_ID_BLOOD, 10,list("blood_colour" = color))
splash.set_color()
splash.set_up(F, 2, 3)
@@ -30,8 +30,8 @@
var/obj/effect/decal/cleanable/chemcoating/blood = locate() in T
if(!istype(blood))
blood = new(T)
blood.reagents.add_reagent("blood", 10,list("blood_colour" = color))
blood.reagents.add_reagent("tricorlidaze", 5)
blood.reagents.add_reagent(REAGENT_ID_BLOOD, 10,list("blood_colour" = color))
blood.reagents.add_reagent(REAGENT_ID_TRICORLIDAZE, 5)
blood.update_icon()
return

2
code/modules/blob2/overmind/types/cryogenic_goo.dm
View File

@@ -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))