From e1b3815539963ed4a8055ff68588dfd3e14de4b3 Mon Sep 17 00:00:00 2001 From: MrPerson Date: Fri, 22 Jan 2016 19:06:46 -0800 Subject: [PATCH] Fixes some awful defines to not be hacks --- code/ATMOSPHERICS/components/unary_devices/tank.dm | 2 +- code/LINDA/LINDA_turf_tile.dm | 4 ++-- code/__DEFINES/atmospherics.dm | 5 ----- code/__HELPERS/unsorted.dm | 2 +- code/datums/gas_mixture.dm | 6 +++--- code/game/machinery/alarm.dm | 2 +- code/game/machinery/computer/atmos_control.dm | 2 +- code/game/objects/items/devices/PDA/PDA.dm | 2 +- code/game/objects/items/devices/scanners.dm | 2 +- code/modules/admin/verbs/debug.dm | 2 +- code/modules/admin/verbs/diagnostics.dm | 2 +- code/modules/mob/living/silicon/pai/software.dm | 2 +- code/modules/mob/mob.dm | 2 +- 13 files changed, 15 insertions(+), 20 deletions(-) diff --git a/code/ATMOSPHERICS/components/unary_devices/tank.dm b/code/ATMOSPHERICS/components/unary_devices/tank.dm index dfff3ced12f..cee595c5466 100644 --- a/code/ATMOSPHERICS/components/unary_devices/tank.dm +++ b/code/ATMOSPHERICS/components/unary_devices/tank.dm @@ -16,7 +16,7 @@ if(gas_type) air_contents.assert_gas(gas_type) air_contents.gases[gas_type][MOLES] = AIR_CONTENTS - name = "[name] ([air_contents.gases[gas_type][GAS_NAME]])" + name = "[name] ([air_contents.gases[gas_type][GAS_META][META_GAS_NAME]])" /obj/machinery/atmospherics/components/unary/tank/carbon_dioxide gas_type = "co2" diff --git a/code/LINDA/LINDA_turf_tile.dm b/code/LINDA/LINDA_turf_tile.dm index 1c64a517a15..2f720d946e1 100644 --- a/code/LINDA/LINDA_turf_tile.dm +++ b/code/LINDA/LINDA_turf_tile.dm @@ -235,8 +235,8 @@ var/list/gases = air.gases for(var/id in gases) var/gas = gases[id] - if(gas[GAS_OVERLAY] && gas[MOLES] > gas[MOLES_VISIBLE]) - . += gas[GAS_OVERLAY] + if(gas[GAS_META][META_GAS_OVERLAY] && gas[MOLES] > gas[GAS_META][META_GAS_MOLES_VISIBLE]) + . += gas[GAS_META][META_GAS_OVERLAY] /turf/simulated/proc/share_air(turf/simulated/T) if(T.current_cycle < current_cycle) diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm index 5e699b97e84..dd3a33d5f1d 100644 --- a/code/__DEFINES/atmospherics.dm +++ b/code/__DEFINES/atmospherics.dm @@ -12,15 +12,10 @@ #define MOLES 1 #define ARCHIVE 2 #define GAS_META 3 -//this is kinda hacky... but it means I don't have to change every single time they're called. #define META_GAS_SPECIFIC_HEAT 1 #define META_GAS_NAME 2 #define META_GAS_OVERLAY 4 #define META_GAS_MOLES_VISIBLE 3 -#define SPECIFIC_HEAT GAS_META][META_GAS_SPECIFIC_HEAT -#define GAS_NAME GAS_META][META_GAS_NAME -#define GAS_OVERLAY GAS_META][META_GAS_OVERLAY -#define MOLES_VISIBLE GAS_META][META_GAS_MOLES_VISIBLE //stuff you should probably leave well alone! //ATMOS diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 163ff45a635..9146b916ba1 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -935,7 +935,7 @@ var/list/WALLITEMS_INVERSE = list( for(var/id in cached_gases) var/gas_concentration = cached_gases[id][MOLES]/total_moles if(id in hardcoded_gases || gas_concentration > 0.01) //ensures the four primary gases are always shown. - user << "[cached_gases[id][GAS_NAME]]: [round(gas_concentration*100)] %" + user << "[cached_gases[id][GAS_META][META_GAS_NAME]]: [round(gas_concentration*100)] %" user << "Temperature: [round(air_contents.temperature-T0C)] °C" else diff --git a/code/datums/gas_mixture.dm b/code/datums/gas_mixture.dm index 69293a78bf9..b37bfe16618 100644 --- a/code/datums/gas_mixture.dm +++ b/code/datums/gas_mixture.dm @@ -86,13 +86,13 @@ var/list/cached_gases_list = null var/list/cached_gases = gases . = 0 for(var/id in cached_gases) - . += cached_gases[id][MOLES]*cached_gases[id][SPECIFIC_HEAT] + . += cached_gases[id][MOLES]*cached_gases[id][GAS_META][META_GAS_SPECIFIC_HEAT] /datum/gas_mixture/proc/heat_capacity_archived() var/list/cached_gases = gases . = 0 for(var/id in cached_gases) - . += cached_gases[id][ARCHIVE]*cached_gases[id][SPECIFIC_HEAT] + . += cached_gases[id][ARCHIVE]*cached_gases[id][GAS_META][META_GAS_SPECIFIC_HEAT] /datum/gas_mixture/proc/total_moles() var/list/cached_gases = gases @@ -415,7 +415,7 @@ var/list/cached_gases_list = null var/delta = QUANTIZE(gas[ARCHIVE] - sharergas[ARCHIVE])/(atmos_adjacent_turfs+1) //the amount of gas that gets moved between the mixtures if(delta && abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) - var/gas_heat_capacity = delta * gas[SPECIFIC_HEAT] + var/gas_heat_capacity = delta * gas[GAS_META][META_GAS_SPECIFIC_HEAT] if(delta > 0) heat_capacity_self_to_sharer += gas_heat_capacity else diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 7488a3e7b91..37cf9741c1b 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -223,7 +223,7 @@ continue cur_tlv = TLV[gas_id] environment_data += list(list( - "name" = env_gases[gas_id][GAS_NAME], + "name" = env_gases[gas_id][GAS_META][META_GAS_NAME], "value" = env_gases[gas_id][MOLES] / total * 100, "unit" = "%", "danger_level" = cur_tlv.get_danger_level(env_gases[gas_id][MOLES] * partial_pressure) diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index 257fc561e6f..f294f62038a 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -35,7 +35,7 @@ ) var/total_moles = air_sample.total_moles() for(var/gas_id in air_sample.gases) - var/gas_name = air_sample.gases[gas_id][GAS_NAME] + var/gas_name = air_sample.gases[gas_id][GAS_META][META_GAS_NAME] signal.data["gases"][gas_name] = air_sample.gases[gas_id][MOLES] / total_moles * 100 radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index d54ecea04b5..aea78b91bd8 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -426,7 +426,7 @@ var/global/list/obj/item/device/pda/PDAs = list() for(var/id in env_gases) var/gas_level = env_gases[id][MOLES]/total_moles if(id in hardcoded_gases || gas_level > 0.01) - dat += "[env_gases[id][GAS_NAME]]: [round(gas_level*100)]%
" + dat += "[env_gases[id][GAS_META][META_GAS_NAME]]: [round(gas_level*100)]%
" dat += "Temperature: [round(environment.temperature-T0C)]°C
" dat += "
" diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 6a76998e260..7c9eb724098 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -302,7 +302,7 @@ MASS SPECTROMETER if(id in hardcoded_gases) continue var/gas_concentration = env_gases[id][MOLES]/total_moles - user << "[env_gases[id][GAS_NAME]]: [round(gas_concentration*100)] %" + user << "[env_gases[id][GAS_META][META_GAS_NAME]]: [round(gas_concentration*100)] %" user << "Temperature: [round(environment.temperature-T0C)] °C" diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 1e99c5a4ea0..b52c6846ada 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -199,7 +199,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that var/t = "" for(var/id in env_gases) if(id in hardcoded_gases || env_gases[id][MOLES]) - t+= "[env_gases[id][GAS_NAME]] : [env_gases[id][MOLES]]\n" + t+= "[env_gases[id][GAS_META][META_GAS_NAME]] : [env_gases[id][MOLES]]\n" usr << t feedback_add_details("admin_verb","ASL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm index 7811b0bc3c0..6ec65b1f71d 100644 --- a/code/modules/admin/verbs/diagnostics.dm +++ b/code/modules/admin/verbs/diagnostics.dm @@ -16,7 +16,7 @@ usr << "@[target.x],[target.y]: [GM.temperature] Kelvin, [GM.return_pressure()] kPa [(burning)?("\red BURNING"):(null)]" for(var/id in GM_gases) if(id in hardcoded_gases || GM_gases[id][MOLES]) - usr << "[GM_gases[id][GAS_NAME]]: [GM_gases[id][MOLES]]" + usr << "[GM_gases[id][GAS_META][META_GAS_NAME]]: [GM_gases[id][MOLES]]" feedback_add_details("admin_verb","DAST") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/fix_next_move() diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index c10a41e6a78..0915e26e3f6 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -537,7 +537,7 @@ for(var/id in env_gases) var/gas_level = env_gases[id][MOLES]/total_moles if(id in hardcoded_gases || gas_level > 0.01) - dat += "[env_gases[id][GAS_NAME]]: [round(gas_level*100)]%
" + dat += "[env_gases[id][GAS_META][META_GAS_NAME]]: [round(gas_level*100)]%
" dat += "Temperature: [round(environment.temperature-T0C)]°C
" dat += "Refresh Reading
" dat += "
" diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 377ddabf388..9e5d9be46c3 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -38,7 +38,7 @@ var/next_mob_id = 0 for(var/id in environment.gases) var/gas = environment.gases[id] if(gas[MOLES]) - t+="[gas[GAS_NAME]]: [gas[MOLES]] \n" + t+="[gas[GAS_META][META_GAS_NAME]]: [gas[MOLES]] \n" usr << t