cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +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

8
code/modules/power/singularity/collector.dm
View File

@@ -37,11 +37,11 @@ var/global/list/rad_collectors = list()
receive_pulse(rads * 5) //Maths is hard
if(P)
if(P.air_contents.gas["phoron"] == 0)
if(P.air_contents.gas[GAS_PHORON] == 0)
investigate_log("<font color='red'>out of fuel</font>.","singulo")
eject()
else
P.air_contents.adjust_gas("phoron", -0.001*drainratio)
P.air_contents.adjust_gas(GAS_PHORON, -0.001*drainratio)
return
@@ -51,7 +51,7 @@ var/global/list/rad_collectors = list()
toggle_power()
user.visible_message("[user.name] turns the [src.name] [active? "on":"off"].", \
"You turn the [src.name] [active? "on":"off"].")
investigate_log("turned [active?"<font color='green'>on</font>":"<font color='red'>off</font>"] by [user.key]. [P?"Fuel: [round(P.air_contents.gas["phoron"]/0.29)]%":"<font color='red'>It is empty</font>"].","singulo")
investigate_log("turned [active?"<font color='green'>on</font>":"<font color='red'>off</font>"] by [user.key]. [P?"Fuel: [round(P.air_contents.gas[GAS_PHORON]/0.29)]%":"<font color='red'>It is empty</font>"].","singulo")
return
else
to_chat(user, span_red("The controls are locked!"))
@@ -130,7 +130,7 @@ var/global/list/rad_collectors = list()
/obj/machinery/power/rad_collector/proc/receive_pulse(var/pulse_strength)
if(P && active)
var/power_produced = 0
power_produced = P.air_contents.gas["phoron"]*pulse_strength*20
power_produced = P.air_contents.gas[GAS_PHORON]*pulse_strength*20
add_avail(power_produced)
last_power_new = power_produced
return

12
code/modules/power/singularity/particle_accelerator/particle_smasher.dm
View File

@@ -270,7 +270,7 @@
*/
/datum/particle_smasher_recipe
var/list/reagents // example: = list("pacid" = 5)
var/list/reagents // example: = list(REAGENT_ID_PACID = 5)
var/list/items // example: = list(/obj/item/tool/crowbar, /obj/item/welder) Place /foo/bar before /foo. Do not include fruit. Maximum of 3 items.
var/recipe_type = PS_RESULT_STACK // Are we producing a stack or an item?
@@ -319,7 +319,7 @@
return .
/datum/particle_smasher_recipe/deuterium_tritium
reagents = list("hydrogen" = 15)
reagents = list(REAGENT_ID_HYDROGEN = 15)
result = /obj/item/stack/material/tritium
required_material = /obj/item/stack/material/deuterium
@@ -349,7 +349,7 @@
probability = 10
/datum/particle_smasher_recipe/osmium_lead
reagents = list("tungsten" = 10)
reagents = list(REAGENT_ID_TUNGSTEN = 10)
result = /obj/item/stack/material/lead
required_material = /obj/item/stack/material/osmium
@@ -362,7 +362,7 @@
probability = 50
/datum/particle_smasher_recipe/phoron_valhollide
reagents = list("phoron" = 10, "pacid" = 10)
reagents = list(REAGENT_ID_PHORON = 10, REAGENT_ID_PACID = 10)
result = /obj/item/stack/material/valhollide
required_material = /obj/item/stack/material/phoron
@@ -375,7 +375,7 @@
probability = 10
/datum/particle_smasher_recipe/valhollide_supermatter
reagents = list("phoron" = 300)
reagents = list(REAGENT_ID_PHORON = 300)
result = /obj/item/stack/material/supermatter
required_material = /obj/item/stack/material/valhollide
@@ -404,7 +404,7 @@
/datum/particle_smasher_recipe/donkpockets_ascend
items = list(/obj/item/reagent_containers/food/snacks/donkpocket)
reagents = list("phoron" = 120)
reagents = list(REAGENT_ID_PHORON = 120)
recipe_type = PS_RESULT_ITEM