From 801238f4d2f326f937b6c20ab8a428096109717d Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Mon, 16 Dec 2024 23:31:49 +0100 Subject: [PATCH] [Manual Port] of #16707 Enable define sanity (#9651) --- .github/workflows/ci.yml | 2 + .gitignore | 3 + code/ZAS/Turf.dm | 1 + code/__defines/atoms_movable_ch.dm | 3 + code/__defines/ballistics_ch.dm | 44 +++++++++++ code/__defines/belly_modes_ch.dm | 6 -- code/__defines/belly_modes_vr.dm | 6 ++ code/__defines/dna.dm | 6 ++ code/__defines/lighting_source_ch.dm | 16 ++++ code/__defines/phobias.dm | 9 +++ code/__defines/planets_yw.dm | 22 ++++++ code/controllers/subsystems/bellies_vr.dm | 3 + code/datums/locations/qerrvallis.dm | 30 +++---- code/game/atoms_movable_ch.dm | 3 - code/game/dna/dna2.dm | 7 -- code/game/dna/dna2_domutcheck.dm | 1 - code/game/machinery/suit_dispenser.dm | 5 ++ code/game/memory_profiler_ch.dm | 3 + .../items/weapons/circuitboards/mecha_ch.dm | 2 + .../objects/items/weapons/wiki_manuals.dm | 3 + code/game/turfs/unsimulated/planetary_yw.dm | 25 +----- code/modules/Phorochemistry/misc_phoronics.dm | 5 -- code/modules/Phorochemistry/phororeactions.dm | 2 + code/modules/Phorochemistry/phororeagent.dm | 3 - code/modules/games/cah_black_cards.dm | 14 ++-- .../hardcode_library/fiction/PortedBooks.dm | 60 +++++++------- .../fiction/battlefieldcommander.dm | 78 +++++++++---------- .../hardcode_library/reference/Schnayy.dm | 2 +- code/modules/lighting/lighting_source.dm | 15 ++-- code/modules/lighting/sunlight_handler_ch.dm | 2 - code/modules/lore_codex/lore_data/species.dm | 22 +++--- .../lore_codex/lore_data_vr/species.dm | 12 +-- .../lore_codex/lore_data_yw/species.dm | 16 ++-- code/modules/maps/bapi-dmm/bapi_bindings.dm | 2 + .../mob/living/carbon/human/phobias.dm | 10 --- .../species/station/traits_vr/negative_ch.dm | 2 + .../living/zz_ballistics_ch/bullet_act_ch.dm | 45 ----------- .../zz_ballistics_ch/z_ballistic_test_ch.dm | 12 +++ .../guns/projectile/leveraction.dm | 10 +-- code/modules/vore/eating/belly_obj_vr.dm | 5 -- tools/define_sanity/check.py | 9 ++- vorestation.dme | 4 + 42 files changed, 286 insertions(+), 244 deletions(-) create mode 100644 code/__defines/atoms_movable_ch.dm create mode 100644 code/__defines/ballistics_ch.dm create mode 100644 code/__defines/lighting_source_ch.dm create mode 100644 code/__defines/phobias.dm create mode 100644 code/__defines/planets_yw.dm diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f7e308c336..fe695ae3c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,6 +72,8 @@ jobs: - name: Run Tests run: | tools/ci/validate_files.sh + - name: Run Define Sanity Checks + run: tools/bootstrap/python -m define_sanity.check - name: Run DreamChecker shell: bash run: ~/dreamchecker 2>&1 | bash tools/ci/annotate_dm.sh diff --git a/.gitignore b/.gitignore index b1a24c9031..e5f718595b 100644 --- a/.gitignore +++ b/.gitignore @@ -163,3 +163,6 @@ config/jobwhitelist.txt #ignore tracy dll prof.dll + +# From /tools/define_sanity/check.py - potential output file that we load onto the user's machine that we don't want to have committed. +define_sanity_output.txt diff --git a/code/ZAS/Turf.dm b/code/ZAS/Turf.dm index b47721f2ed..d2c413090a 100644 --- a/code/ZAS/Turf.dm +++ b/code/ZAS/Turf.dm @@ -130,6 +130,7 @@ . |= dir */ . = !. +#undef GET_ZONE_NEIGHBOURS // CHOMPEdit End /turf/simulated/update_air_properties() diff --git a/code/__defines/atoms_movable_ch.dm b/code/__defines/atoms_movable_ch.dm new file mode 100644 index 0000000000..e5a585cdf7 --- /dev/null +++ b/code/__defines/atoms_movable_ch.dm @@ -0,0 +1,3 @@ +#define NON_LISTENING_ATOM 0 +#define LISTENING_ATOM 1 +#define LISTENING_PLAYER 2 diff --git a/code/__defines/ballistics_ch.dm b/code/__defines/ballistics_ch.dm new file mode 100644 index 0000000000..ad893f2e64 --- /dev/null +++ b/code/__defines/ballistics_ch.dm @@ -0,0 +1,44 @@ +#define BULLET_AP_DIVISOR 200 +#define AP_DIVISOR 4152 +#define ARMOR_Y_INTERCEPT 0.2 +#define ARMOR_SLOPE 0.017 +#define PENETRATION_PROBABILITY_EXP_BASE 2 +#define PENETRATION_PROBABILITY_EXP_MULT 30 + +#define BULLET_DEFLECTED_PAIN_DIVISOR 5000 +#define BULLET_DEFLECTED_BULLET_DIVISOR 70 +#define BULLET_DEFLECTED_MELEE_DIVISOR 280 +#define BULLET_DEFLECTED_PAIN_EXPONENT 1.5 +#define BULLET_DEFLECTED_BRUISE_SUBTRACT 5 + +GLOBAL_VAR_INIT(SKIN_LOSS_COEFFICIENT,16) +GLOBAL_VAR_INIT(ARMOR_LOSS_COEFFICIENT,150) +GLOBAL_VAR_INIT(ARMOR_LOSS_MIN_MULT,0.5) +GLOBAL_VAR_INIT(ARMOR_LOSS_MIN_ARMOR,20) +GLOBAL_VAR_INIT(INTERNAL_LOSS_COEFFICIENT,195) +#define ORGAN_LOSS_COEFFICIENT 350 +#define HIT_VITAL_ORGAN_CHANCE 35 + +#define BONE_HIT_CHANCE_UNENCASED 45 +#define BONE_HIT_CHANCE_ENCASED 80 +GLOBAL_VAR_INIT(BONE_JOULES_PERHP_AVG,2) +GLOBAL_VAR_INIT(BONE_JOULES_PERHP_DEV,1) +GLOBAL_VAR_INIT(BONE_JOULES_MIN,100) +#define BONE_HP_AVG 25 + +GLOBAL_VAR_INIT(HOLLOW_POINT_VELLOSS_BONUS,1.45) +GLOBAL_VAR_INIT(HOLLOW_POINT_CONVERSION_EFF,1.85) + +#define PROB_LEAVE_EARLY_FIRST 20 +#define PROB_LEAVE_EARLY_SECOND 40 + +GLOBAL_VAR_INIT(ENERGY_DAMAGE_FLESH_FACTOR,0.025) +GLOBAL_VAR_INIT(ENERGY_DAMAGE_ORGAN_FACTOR,0.035) +#define ENERGY_DAMAGE_EXPONENT 0.6 +#define ENERGY_DAMAGE_COEFFICIENT 0.05 +#define ENERGY_DAMAGE_FLESH_FALLOFF_POINT 10 +#define ENERGY_DAMAGE_ORGAN_FALLOFF_POINT 7 + +#ifndef GAUSSIAN_RANDOM +#define GAUSSIAN_RANDOM(vars...) ((-2*log(rand()))**0.5 * cos(6.28318530718*rand())) +#endif diff --git a/code/__defines/belly_modes_ch.dm b/code/__defines/belly_modes_ch.dm index d243f721e6..5765a79595 100644 --- a/code/__defines/belly_modes_ch.dm +++ b/code/__defines/belly_modes_ch.dm @@ -8,12 +8,6 @@ #define DM_FLAG_REAGENTSABSORB 0x4 #define DM_FLAG_REAGENTSDRAIN 0x8 -//Vore Sprite Flags -#define DM_FLAG_VORESPRITE_BELLY 0x1 -#define DM_FLAG_VORESPRITE_TAIL 0x2 -#define DM_FLAG_VORESPRITE_MARKING 0x4 -#define DM_FLAG_VORESPRITE_ARTICLE 0x8 - //For belly fullscreen shennanigans outside of bellies, due to Life() clearing belly fullscreens outside of bellies. #define ATOM_BELLY_FULLSCREEN "belly_atom_vfx" diff --git a/code/__defines/belly_modes_vr.dm b/code/__defines/belly_modes_vr.dm index 91b681dfa7..ec7d0f18ff 100644 --- a/code/__defines/belly_modes_vr.dm +++ b/code/__defines/belly_modes_vr.dm @@ -47,3 +47,9 @@ #define DR_SLEEP "Sleep" #define DR_FAKE "False Sleep" #define DR_WEIGHT "Weight Drain" + +//Vore Sprite Flags +#define DM_FLAG_VORESPRITE_BELLY 0x1 +#define DM_FLAG_VORESPRITE_TAIL 0x2 +#define DM_FLAG_VORESPRITE_MARKING 0x4 +#define DM_FLAG_VORESPRITE_ARTICLE 0x8 diff --git a/code/__defines/dna.dm b/code/__defines/dna.dm index 10fe4d729b..b958466201 100644 --- a/code/__defines/dna.dm +++ b/code/__defines/dna.dm @@ -154,3 +154,9 @@ var/SMALLSIZEBLOCK = 0 #define DNA2_BUF_UI 1 #define DNA2_BUF_UE 2 #define DNA2_BUF_SE 4 + +// Mutation flags +#define MUTCHK_FORCED 1 + +// Gene flags +#define GENE_ALWAYS_ACTIVATE 1 diff --git a/code/__defines/lighting_source_ch.dm b/code/__defines/lighting_source_ch.dm new file mode 100644 index 0000000000..21a73a2959 --- /dev/null +++ b/code/__defines/lighting_source_ch.dm @@ -0,0 +1,16 @@ +// Keep in mind. Lighting corners accept the bottom left (northwest) set of cords to them as input +// Handles dynamic light +#define GENERATE_MISSING_CORNERS(gen_for) \ + if (!gen_for.lighting_corner_NE) { \ + gen_for.lighting_corner_NE = new /datum/lighting_corner(gen_for.x, gen_for.y, gen_for.z, gen_for.has_dynamic_lighting()); \ + } \ + if (!gen_for.lighting_corner_SE) { \ + gen_for.lighting_corner_SE = new /datum/lighting_corner(gen_for.x, gen_for.y - 1, gen_for.z, gen_for.has_dynamic_lighting()); \ + } \ + if (!gen_for.lighting_corner_SW) { \ + gen_for.lighting_corner_SW = new /datum/lighting_corner(gen_for.x - 1, gen_for.y - 1, gen_for.z, gen_for.has_dynamic_lighting()); \ + } \ + if (!gen_for.lighting_corner_NW) { \ + gen_for.lighting_corner_NW = new /datum/lighting_corner(gen_for.x - 1, gen_for.y, gen_for.z, gen_for.has_dynamic_lighting()); \ + } \ + gen_for.lighting_corners_initialised = TRUE; diff --git a/code/__defines/phobias.dm b/code/__defines/phobias.dm new file mode 100644 index 0000000000..0bf2fc1613 --- /dev/null +++ b/code/__defines/phobias.dm @@ -0,0 +1,9 @@ +//Handling and defining of phobias and fears +#define NYCTOPHOBIA 1 +#define ARACHNOPHOBIA 2 +#define HEMOPHOBIA 4 +#define THALASSOPHOBIA 8 +#define CLAUSTROPHOBIA_MINOR 16 +#define CLAUSTROPHOBIA_MAJOR 32 +#define ANATIDAEPHOBIA 64 +#define AGRAVIAPHOBIA 128 diff --git a/code/__defines/planets_yw.dm b/code/__defines/planets_yw.dm new file mode 100644 index 0000000000..7e9c3d3cfd --- /dev/null +++ b/code/__defines/planets_yw.dm @@ -0,0 +1,22 @@ +//Atmosphere properties +#define CRYOGAIA_ONE_ATMOSPHERE 101.13 //kPa +#define CRYOGAIA_AVG_TEMP 233.15 //kelvin + +#define CRYOGAIA_PER_N2 0.24 //percent +#define CRYOGAIA_PER_O2 0.72 +#define CRYOGAIA_PER_N2O 0.00 //Currently no capacity to 'start' a turf with this. See turf.dm +#define CRYOGAIA_PER_CO2 0.04 +#define CRYOGAIA_PER_PHORON 0.00 + +//Math only beyond this point +#define CRYOGAIA_MOL_PER_TURF (CRYOGAIA_ONE_ATMOSPHERE*CELL_VOLUME/(CRYOGAIA_AVG_TEMP*R_IDEAL_GAS_EQUATION)) +#define CRYOGAIA_MOL_N2 (CRYOGAIA_MOL_PER_TURF * CRYOGAIA_PER_N2) +#define CRYOGAIA_MOL_O2 (CRYOGAIA_MOL_PER_TURF * CRYOGAIA_PER_O2) +#define CRYOGAIA_MOL_N2O (CRYOGAIA_MOL_PER_TURF * CRYOGAIA_PER_N2O) +#define CRYOGAIA_MOL_CO2 (CRYOGAIA_MOL_PER_TURF * CRYOGAIA_PER_CO2) +#define CRYOGAIA_MOL_PHORON (CRYOGAIA_MOL_PER_TURF * CRYOGAIA_PER_PHORON) + +//Turfmakers +#define CRYOGAIA_SET_ATMOS nitrogen=CRYOGAIA_MOL_N2;oxygen=CRYOGAIA_MOL_O2;carbon_dioxide=CRYOGAIA_MOL_CO2;phoron=CRYOGAIA_MOL_PHORON;temperature=CRYOGAIA_AVG_TEMP +#define CRYOGAIA_TURF_CREATE(x) x/cryogaia/nitrogen=CRYOGAIA_MOL_N2;x/cryogaia/oxygen=CRYOGAIA_MOL_O2;x/cryogaia/carbon_dioxide=CRYOGAIA_MOL_CO2;x/cryogaia/phoron=CRYOGAIA_MOL_PHORON;x/cryogaia/temperature=CRYOGAIA_AVG_TEMP;x/cryogaia/outdoors=TRUE;x/cryogaia/update_graphic(list/graphic_add = null, list/graphic_remove = null) return 0 +#define CRYOGAIA_TURF_CREATE_UN(x) x/cryogaia/nitrogen=CRYOGAIA_MOL_N2;x/cryogaia/oxygen=CRYOGAIA_MOL_O2;x/cryogaia/carbon_dioxide=CRYOGAIA_MOL_CO2;x/cryogaia/phoron=CRYOGAIA_MOL_PHORON;x/cryogaia/temperature=CRYOGAIA_AVG_TEMP diff --git a/code/controllers/subsystems/bellies_vr.dm b/code/controllers/subsystems/bellies_vr.dm index 64fec98568..0e896bebe5 100644 --- a/code/controllers/subsystems/bellies_vr.dm +++ b/code/controllers/subsystems/bellies_vr.dm @@ -40,3 +40,6 @@ SUBSYSTEM_DEF(bellies) if (MC_TICK_CHECK) return + +#undef SSBELLIES_PROCESSED +#undef SSBELLIES_IGNORED diff --git a/code/datums/locations/qerrvallis.dm b/code/datums/locations/qerrvallis.dm index 5a3572a886..a3cc2468ba 100644 --- a/code/datums/locations/qerrvallis.dm +++ b/code/datums/locations/qerrvallis.dm @@ -26,32 +26,32 @@ ..(creator) /datum/locations/qarrkloa - name = "Qarr’kloa" - desc = "Mythically considered the first State-City ever built by Skrellkind, Qarr’kloa attracts thousands of tourists and archeologists \ + name = "Qarr'kloa" + desc = "Mythically considered the first State-City ever built by Skrellkind, Qarr'kloa attracts thousands of tourists and archeologists \ every year thanks to the ancestral structures, built thousands of years ago by the Skrell, scattered in its vicinity." /datum/locations/moglar - name = "Mo’glar" - desc = "Built on the northern coast of Qorr’gloa, Mo’glar was, at the time of Xi’Krri’oal’s colonization, a major port of trade between \ + name = "Mo'glar" + desc = "Built on the northern coast of Qorr'gloa, Mo'glar was, at the time of Xi'Krri'oal's colonization, a major port of trade between \ the two continents of the planet. It has kept that role to this day, although it never truly adapted to inter-planetary trade, leaving the \ - task of exporting Qerrbalak’s goods to other planets to other cities, mainly on Xi’Krri’oal." + task of exporting Qerrbalak's goods to other planets to other cities, mainly on Xi'Krri'oal." /datum/locations/miqoxi - name = "Mi’qoxi" - desc = "This city, built on the small patch of islands north of Xi’Krri’oal, owes most of its current status to the infamous Qerr-Skria \ - Glo’morr Krrixi who, in the 23th century BCE, built a large empire spanning from the Qo’rria Sea to the current city of Qal’krrea, mostly \ - through military conquests. As the center of his empire, Mi’qoxi became a large center of population and industry and while the fall of \ - the empire at Krrixi’s death did put a halt to the city’s growth, it is still today one of the biggest cities of the continent." + name = "Mi'qoxi" + desc = "This city, built on the small patch of islands north of Xi'Krri'oal, owes most of its current status to the infamous Qerr-Skria \ + Glo'morr Krrixi who, in the 23th century BCE, built a large empire spanning from the Qo'rria Sea to the current city of Qal'krrea, mostly \ + through military conquests. As the center of his empire, Mi'qoxi became a large center of population and industry and while the fall of \ + the empire at Krrixi's death did put a halt to the city's growth, it is still today one of the biggest cities of the continent." /datum/locations/kallo - name = "Kal’lo" - desc = "A relatively recent city compared to the other major cities of the planet, Kal’lo quickly rose in status by fathering some of the most \ - important figures of modern skrellian society. It is notably the birthplace of Xikrra Kol’goa, who wrote the Lo’glo’mog’rri in 46 BCE, \ + name = "Kal'lo" + desc = "A relatively recent city compared to the other major cities of the planet, Kal'lo quickly rose in status by fathering some of the most \ + important figures of modern skrellian society. It is notably the birthplace of Xikrra Kol'goa, who wrote the Lo'glo'mog'rri in 46 BCE, \ the constitutional code that is still used by most of the skrellian states in the galaxy." /datum/locations/glimorr - name = "Gli’morr" - desc = "While Gli’morr is not as heavily-populated than its continental counterparts, its touristic potential made it rich enough to finance \ + name = "Gli'morr" + desc = "While Gli'morr is not as heavily-populated than its continental counterparts, its touristic potential made it rich enough to finance \ the biggest research center of the planet, covering dozens of scientific fields. Its Academy is just as much renowned, and even the lowest \ Qrri-Mog (although most of its students prefer to continue their studies until they become Qerr-Mog) coming out of its classrooms is \ considered part of the elite." diff --git a/code/game/atoms_movable_ch.dm b/code/game/atoms_movable_ch.dm index e3ef8169ee..89940d10b0 100644 --- a/code/game/atoms_movable_ch.dm +++ b/code/game/atoms_movable_ch.dm @@ -1,6 +1,3 @@ -#define NON_LISTENING_ATOM 0 -#define LISTENING_ATOM 1 -#define LISTENING_PLAYER 2 //gonna be honest this is really just a ripoff of tg's recursive hearing /atom/movable var/recursive_listeners diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm index f8c2f5f8ab..ab266fbbaf 100644 --- a/code/game/dna/dna2.dm +++ b/code/game/dna/dna2.dm @@ -25,13 +25,6 @@ var/global/list/assigned_blocks[DNA_SE_LENGTH] var/global/list/datum/dna/gene/dna_genes[0] -///////////////// -// GENE DEFINES -///////////////// -// Skip checking if it's already active. -// Used for genes that check for value rather than a binary on/off. -#define GENE_ALWAYS_ACTIVATE 1 - /datum/dna // READ-ONLY, GETS OVERWRITTEN // DO NOT FUCK WITH THESE OR BYOND WILL EAT YOUR FACE diff --git a/code/game/dna/dna2_domutcheck.dm b/code/game/dna/dna2_domutcheck.dm index 02495bbc49..2b3f820532 100644 --- a/code/game/dna/dna2_domutcheck.dm +++ b/code/game/dna/dna2_domutcheck.dm @@ -3,7 +3,6 @@ // M: Mob to mess with // connected: Machine we're in, type unchecked so I doubt it's used beyond monkeying // flags: See below, bitfield. -#define MUTCHK_FORCED 1 /proc/domutcheck(var/mob/living/M, var/connected=null, var/flags=0) for(var/datum/dna/gene/gene in dna_genes) if(!M || !M.dna) diff --git a/code/game/machinery/suit_dispenser.dm b/code/game/machinery/suit_dispenser.dm index 99585bf975..174baf10f6 100644 --- a/code/game/machinery/suit_dispenser.dm +++ b/code/game/machinery/suit_dispenser.dm @@ -463,3 +463,8 @@ var/list/dispenser_presets = list() icon_state = "suitdispenserAL" dispenser_flags = GD_ONEITEM|GD_NOGREED|GD_UNLIMITED one_setting = /datum/gear_disp/voidsuit/autolok + +#undef GD_BUSY +#undef GD_ONEITEM +#undef GD_NOGREED +#undef GD_UNLIMITED diff --git a/code/game/memory_profiler_ch.dm b/code/game/memory_profiler_ch.dm index bb1bb82f50..75c4a65fca 100644 --- a/code/game/memory_profiler_ch.dm +++ b/code/game/memory_profiler_ch.dm @@ -194,3 +194,6 @@ if(num_bytes > 10000) return "[num_bytes/1000] kb" return "[num_bytes] b" + +#undef LOOP_STEP_SIZE +//#undef MEM_NO_CHECK_TICK diff --git a/code/game/objects/items/weapons/circuitboards/mecha_ch.dm b/code/game/objects/items/weapons/circuitboards/mecha_ch.dm index dc29adc342..f094691e2d 100644 --- a/code/game/objects/items/weapons/circuitboards/mecha_ch.dm +++ b/code/game/objects/items/weapons/circuitboards/mecha_ch.dm @@ -19,3 +19,5 @@ /obj/item/circuitboard/mecha/scarab/main name = T_BOARD_CHMECHA("Scarab central control") icon_state = "mainboard" + +#undef T_BOARD_CHMECHA diff --git a/code/game/objects/items/weapons/wiki_manuals.dm b/code/game/objects/items/weapons/wiki_manuals.dm index 8ba6b68dab..aaac07da1d 100644 --- a/code/game/objects/items/weapons/wiki_manuals.dm +++ b/code/game/objects/items/weapons/wiki_manuals.dm @@ -143,3 +143,6 @@ title = "Engineering Textbook" page_link = "Guide_to_Engineering" + +#undef BOOK_WINDOW_BROWSE_SIZE +#undef WIKI_PAGE_IFRAME diff --git a/code/game/turfs/unsimulated/planetary_yw.dm b/code/game/turfs/unsimulated/planetary_yw.dm index 8c2d87974b..8c70c75cee 100644 --- a/code/game/turfs/unsimulated/planetary_yw.dm +++ b/code/game/turfs/unsimulated/planetary_yw.dm @@ -1,26 +1,3 @@ -//Atmosphere properties -#define CRYOGAIA_ONE_ATMOSPHERE 101.13 //kPa -#define CRYOGAIA_AVG_TEMP 233.15 //kelvin - -#define CRYOGAIA_PER_N2 0.24 //percent -#define CRYOGAIA_PER_O2 0.72 -#define CRYOGAIA_PER_N2O 0.00 //Currently no capacity to 'start' a turf with this. See turf.dm -#define CRYOGAIA_PER_CO2 0.04 -#define CRYOGAIA_PER_PHORON 0.00 - -//Math only beyond this point -#define CRYOGAIA_MOL_PER_TURF (CRYOGAIA_ONE_ATMOSPHERE*CELL_VOLUME/(CRYOGAIA_AVG_TEMP*R_IDEAL_GAS_EQUATION)) -#define CRYOGAIA_MOL_N2 (CRYOGAIA_MOL_PER_TURF * CRYOGAIA_PER_N2) -#define CRYOGAIA_MOL_O2 (CRYOGAIA_MOL_PER_TURF * CRYOGAIA_PER_O2) -#define CRYOGAIA_MOL_N2O (CRYOGAIA_MOL_PER_TURF * CRYOGAIA_PER_N2O) -#define CRYOGAIA_MOL_CO2 (CRYOGAIA_MOL_PER_TURF * CRYOGAIA_PER_CO2) -#define CRYOGAIA_MOL_PHORON (CRYOGAIA_MOL_PER_TURF * CRYOGAIA_PER_PHORON) - -//Turfmakers -#define CRYOGAIA_SET_ATMOS nitrogen=CRYOGAIA_MOL_N2;oxygen=CRYOGAIA_MOL_O2;carbon_dioxide=CRYOGAIA_MOL_CO2;phoron=CRYOGAIA_MOL_PHORON;temperature=CRYOGAIA_AVG_TEMP -#define CRYOGAIA_TURF_CREATE(x) x/cryogaia/nitrogen=CRYOGAIA_MOL_N2;x/cryogaia/oxygen=CRYOGAIA_MOL_O2;x/cryogaia/carbon_dioxide=CRYOGAIA_MOL_CO2;x/cryogaia/phoron=CRYOGAIA_MOL_PHORON;x/cryogaia/temperature=CRYOGAIA_AVG_TEMP;x/cryogaia/outdoors=TRUE;x/cryogaia/update_graphic(list/graphic_add = null, list/graphic_remove = null) return 0 -#define CRYOGAIA_TURF_CREATE_UN(x) x/cryogaia/nitrogen=CRYOGAIA_MOL_N2;x/cryogaia/oxygen=CRYOGAIA_MOL_O2;x/cryogaia/carbon_dioxide=CRYOGAIA_MOL_CO2;x/cryogaia/phoron=CRYOGAIA_MOL_PHORON;x/cryogaia/temperature=CRYOGAIA_AVG_TEMP - // This is a wall you surround the area of your "planet" with, that makes the atmosphere inside stay within bounds, even if canisters // are opened or other strange things occur. /turf/unsimulated/wall/planetary/borealis2 @@ -29,4 +6,4 @@ icon = 'icons/turf/snow_new.dmi' icon_state = "Icerock" alpha = 0xFF - CRYOGAIA_SET_ATMOS \ No newline at end of file + CRYOGAIA_SET_ATMOS diff --git a/code/modules/Phorochemistry/misc_phoronics.dm b/code/modules/Phorochemistry/misc_phoronics.dm index 86204f72fc..2c6f690fae 100644 --- a/code/modules/Phorochemistry/misc_phoronics.dm +++ b/code/modules/Phorochemistry/misc_phoronics.dm @@ -1,8 +1,3 @@ -#define REM 0.2 -#define SOLID 1 -#define LIQUID 2 -#define GAS 3 - proc/gaseous_reagent_check(var/mob/living/carbon/human/H) //protective clothing check return (istype(H.wear_suit, /obj/item/clothing/suit/space) && istype(H.head, /obj/item/clothing/head/helmet/space)) \ || (istype(H.wear_suit, /obj/item/clothing/suit/bio_suit) && istype(H.head, /obj/item/clothing/head/bio_hood) && H.gloves) \ diff --git a/code/modules/Phorochemistry/phororeactions.dm b/code/modules/Phorochemistry/phororeactions.dm index 4f44397545..6f62888597 100644 --- a/code/modules/Phorochemistry/phororeactions.dm +++ b/code/modules/Phorochemistry/phororeactions.dm @@ -66,3 +66,5 @@ //garbage collection should deal with reagents + +#undef PHORONICS_TESTING diff --git a/code/modules/Phorochemistry/phororeagent.dm b/code/modules/Phorochemistry/phororeagent.dm index e0bf91e2f8..0e1c550bd1 100644 --- a/code/modules/Phorochemistry/phororeagent.dm +++ b/code/modules/Phorochemistry/phororeagent.dm @@ -1,6 +1,3 @@ -#define SOLID 1 -#define LIQUID 2 -#define GAS 3 var/induromol_frequency = rand(700, 750) * 2 + 1 //signallers only increase by .2 increments var/induromol_code = rand(1, 50) diff --git a/code/modules/games/cah_black_cards.dm b/code/modules/games/cah_black_cards.dm index 922ba1f763..312d8f19d2 100644 --- a/code/modules/games/cah_black_cards.dm +++ b/code/modules/games/cah_black_cards.dm @@ -182,27 +182,27 @@ "Why do I hurt all over?", "In the seventh circle of Hell, sinners must endure _____ for all eternity.", "A successful job interview begins with a firm handshake and ends with _____.", - "Lovin’ you is easy ’cause you’re _____.", + "Lovin' you is easy 'cause you're _____.", "My life is ruled by a vicious cycle of _____ and _____.", "The blind date was going horribly until we discovered our shared interest in _____.", "_____. Awesome in theory, kind of a mess in practice.", - "I’m not like the rest of you. I’m too rich and busy for _____.", + "I'm not like the rest of you. I'm too rich and busy for _____.", "(Pick 2) _____: Hours of fun. Easy to use. Perfect for _____!", "What left this stain on my couch?", "Call the law offices of Goldstein & Goldstein, because no one should have to tolerate _____ in the workplace.", "(Pick 2) When you get right down to it, _____ is just _____.", "Turns out that _____ Man was neither the hero we needed nor wanted.", "As part of his daily regimen, Anderson Cooper sets aside 15 minutes for _____.", - "Money can’t buy me love, but it can buy me _____.", + "Money can't buy me love, but it can buy me _____.", "(Pick 2) With enough time and pressure, _____ will turn into _____.", "And what did you bring for show and tell?", "During high school I never really fit in until I found _____ club.", - "Hey baby, come back to my place and I’ll show you _____.", - "(Pick 2) After months of practice with _____, I think I’m finally ready for _____.", + "Hey baby, come back to my place and I'll show you _____.", + "(Pick 2) After months of practice with _____, I think I'm finally ready for _____.", "To prepare for his upcoming role, Daniel Day-Lewis immersed himself in the world of _____.", "Finally! A service that delivers _____ right to your door.", "My gym teacher got fired for adding _____ to the obstacle course.", "(Pick 2) Having problems with _____? Try _____!", - "As part of his contract, Prince won’t perform without _____ in his dressing room.", - "(Pick 2) Listen, son. If you want to get involved with _____, I won’t stop you. Just steer clear of _____." + "As part of his contract, Prince won't perform without _____ in his dressing room.", + "(Pick 2) Listen, son. If you want to get involved with _____, I won't stop you. Just steer clear of _____." ) diff --git a/code/modules/library/hardcode_library/fiction/PortedBooks.dm b/code/modules/library/hardcode_library/fiction/PortedBooks.dm index 13bf1e58fb..95f51cceef 100644 --- a/code/modules/library/hardcode_library/fiction/PortedBooks.dm +++ b/code/modules/library/hardcode_library/fiction/PortedBooks.dm @@ -46,39 +46,39 @@ Category: Fiction

- Once upon a time there was a cat, but he wasn’t the kind of cat you’re thinking of. He was from the land of the fairies and his fur was completely unexpected colors. For starters, his nose was violet. His eyes were indigo, his ears were sky blue, his front paws were green, his body was yellow, his back paws were orange, and his tail was red. So he was a mysterious cat of seven colors arranged just like a rainbow. + Once upon a time there was a cat, but he wasn't the kind of cat you're thinking of. He was from the land of the fairies and his fur was completely unexpected colors. For starters, his nose was violet. His eyes were indigo, his ears were sky blue, his front paws were green, his body was yellow, his back paws were orange, and his tail was red. So he was a mysterious cat of seven colors arranged just like a rainbow.

That rainbow cat went on all sorts of strange adventures. The following story is one of them.

One day while the rainbow cat was sunbathing, he was suddenly vexed by boredom. That is to say, peace reigned in the land of the fairies, so nothing much was going on.

- It’s not good for my health to spend all my time idling about as if I haven’t got a care in the world, he thought. Perhaps I should head out and go on an adventure. + It's not good for my health to spend all my time idling about as if I haven't got a care in the world, he thought. Perhaps I should head out and go on an adventure.

So he put a note up on his door: "Dear Mr. Post Man, I will be gone for two or three days, so if any packages or letters come, please throw them down the chimney."

Then he packed a small bag, hung it on his tail, and wobbled off to the border of the land of the fairies. When he arrived, a thick cloud billowed up.

- "Well, maybe I’ll drop by the cloud people’s place," he chattered to himself, climbing up the cloud embankment. + "Well, maybe I'll drop by the cloud people's place," he chattered to himself, climbing up the cloud embankment.

- The people who lived in cloud country were quite pleasant folks. They didn’t do any work, in particular, but just because they were lazy didn’t mean that they didn’t find the world interesting. They all lived in splendid palaces, of which the ones you couldn’t see from Earth were far more beautiful than the ones you could. + The people who lived in cloud country were quite pleasant folks. They didn't do any work, in particular, but just because they were lazy didn't mean that they didn't find the world interesting. They all lived in splendid palaces, of which the ones you couldn't see from Earth were far more beautiful than the ones you could.

- The people of the cloud country sometimes drove pearly gray carriages or went sailing in lightweight boats. They lived in the sky, so the only person they had to fear was Sir Thunder. It’s quite understandable given that he was quick to anger -- he would make the sky rumble with his stomping and go around knocking down their houses. + The people of the cloud country sometimes drove pearly gray carriages or went sailing in lightweight boats. They lived in the sky, so the only person they had to fear was Sir Thunder. It's quite understandable given that he was quick to anger -- he would make the sky rumble with his stomping and go around knocking down their houses.

The people of the cloud country were very happy to have the rainbow cat visit and greeted him politely.

- "You’ve come at a great time," they said. "We’re having a big celebration at the Wind God’s house. His eldest son, North Wind is taking the daughter of the King of the Magic Isle as his wife." + "You've come at a great time," they said. "We're having a big celebration at the Wind God's house. His eldest son, North Wind is taking the daughter of the King of the Magic Isle as his wife."

The rainbow cat, having thought just such a thing might happen, was prepared with various goods in the bag on his tail.

It was a truly magnificent wedding.

- Everyone came. Even Comet showed up. You wouldn’t see Comet unless it was a very fine banquet indeed. + Everyone came. Even Comet showed up. You wouldn't see Comet unless it was a very fine banquet indeed.

- And Aurora came in the most indescribably beautiful garments of light. Of course, the bride’s parents, the King of Magic Isle and his Pearl Oyster Queen, were in attendance. + And Aurora came in the most indescribably beautiful garments of light. Of course, the bride's parents, the King of Magic Isle and his Pearl Oyster Queen, were in attendance.

- A feast was served and everyone was in a lively mood, having interesting conversations and drinking, when all of the sudden a swallow flew in. According to him, the giant Sir Thunder was rushing towards them at a tremendous speed. Apparently, when Trade Wind was hurrying by, he had tripped over sleeping Sir Thunder’s toes and Sir Thunder was furious. + A feast was served and everyone was in a lively mood, having interesting conversations and drinking, when all of the sudden a swallow flew in. According to him, the giant Sir Thunder was rushing towards them at a tremendous speed. Apparently, when Trade Wind was hurrying by, he had tripped over sleeping Sir Thunder's toes and Sir Thunder was furious.

- "What’ll we do?" everyone wondered at once, their faces pale. "The celebration will be ruined!" + "What'll we do?" everyone wondered at once, their faces pale. "The celebration will be ruined!"

All the guests and the master of the house began to scatter in a panic.

@@ -88,9 +88,9 @@ Category: Fiction

A moment later, he came back out.

- "I’ll find a way to keep Sir Thunder from coming here," said the cat. "So please continue the celebration as you were. I’ll go to him and see what I can do." + "I'll find a way to keep Sir Thunder from coming here," said the cat. "So please continue the celebration as you were. I'll go to him and see what I can do."

- Everyone was surprised at how brave and composed the rainbow cat was, but it sounded like their celebration wouldn’t be intruded upon partway through, so they were happy to gather and see off the cat as he raced towards the far-off rumblings of Sir Thunder. + Everyone was surprised at how brave and composed the rainbow cat was, but it sounded like their celebration wouldn't be intruded upon partway through, so they were happy to gather and see off the cat as he raced towards the far-off rumblings of Sir Thunder.

@@ -111,21 +111,21 @@ Category: Fiction

"Hey, who are you and what are you doing here?" he shouted.

- "Me? I’m the famed magician Mewpuu," replied the rainbow cat in a voice made to sound serious and important. "Take a look at my bag, here. There are magic seeds inside. Mr. Thunder, I’ve known about you for a while now. You’re quite famous." + "Me? I'm the famed magician Mewpuu," replied the rainbow cat in a voice made to sound serious and important. "Take a look at my bag, here. There are magic seeds inside. Mr. Thunder, I've known about you for a while now. You're quite famous."

Hearing this Sir Thunder felt a bit proud, but his foot was sore, so he was soon angry again.

- "Hrmph! I don’t think too highly of magicians. What can you do, anyways?" + "Hrmph! I don't think too highly of magicians. What can you do, anyways?"

"I can read your mind."

- "Oh? Is that so? Then try to guess what I’m thinking right now." + "Oh? Is that so? Then try to guess what I'm thinking right now."

- "A simple matter. You’re angry because your foot hurts and you want to catch the fellow who kicked your blister, right?" + "A simple matter. You're angry because your foot hurts and you want to catch the fellow who kicked your blister, right?"

The rainbow cat had heard all that from the swallow. Sir Thunder was flabbergasted.

- "Wow, that’s right. Will you teach me your magic?" + "Wow, that's right. Will you teach me your magic?"

"Sure I will. But first I must test your potential. Have a seat."

@@ -133,35 +133,35 @@ Category: Fiction

"Now then, try to tell me what I am thinking right now," said the cat.

- Sir Thunder the giant looked blankly at the cat’s face. He was not very bright. + Sir Thunder the giant looked blankly at the cat's face. He was not very bright.

"You must be thinking that I look pretty foolish sitting here."

"Excellent. Astonishing! You have more than enough talent to begin the training. You may be my brightest disciple yet."

- "Then maybe I’ll try one more time." Sir Thunder now thought himself terribly sharp. + "Then maybe I'll try one more time." Sir Thunder now thought himself terribly sharp.

- "Very well. Try to guess what I’m thinking." + "Very well. Try to guess what I'm thinking."

- Sir Thunder tried to look wise and peered at the cat’s face with his small, goofy eyes. + Sir Thunder tried to look wise and peered at the cat's face with his small, goofy eyes.

"Beef steak and onions," he announced abruptly.

- "Brilliant!" the cat feigned surprise and purposely lost his footing to land on his rump. "You’re exactly right. But how did you know?" + "Brilliant!" the cat feigned surprise and purposely lost his footing to land on his rump. "You're exactly right. But how did you know?"

"Oh, how do you say...? I guess it just came to me," replied Sir Thunder.

The cat assumed a serious air. "We must cultivate that fine talent of yours!"

- "How do we cultivate it?" asked Sir Thunder. He thought being able to read people’s minds was quite fun. + "How do we cultivate it?" asked Sir Thunder. He thought being able to read people's minds was quite fun.

- "It’s a cinch," said the cat, finally telling a blatant lie now that he thought he had the giant where he wanted him. "Go home and sleep for two or three hours. Then have some cake and sleep another two or three hours. Then, when you wake up, drink one cup of hot tea. But you have to be as still as possible or it won’t work. If you do all that, by tomorrow morning you’ll be reading people’s minds like it’s nothing." + "It's a cinch," said the cat, finally telling a blatant lie now that he thought he had the giant where he wanted him. "Go home and sleep for two or three hours. Then have some cake and sleep another two or three hours. Then, when you wake up, drink one cup of hot tea. But you have to be as still as possible or it won't work. If you do all that, by tomorrow morning you'll be reading people's minds like it's nothing."

- Sir Thunder wanted to go running straight home, but of course, he couldn’t forget his manners. "Thanks a lot. But Master Mewpuu, what can I offer you in return for teaching me this?" + Sir Thunder wanted to go running straight home, but of course, he couldn't forget his manners. "Thanks a lot. But Master Mewpuu, what can I offer you in return for teaching me this?"

- The rainbow cat thought a moment and said, "I’d like a tiny bit of lightning. Please give me just a smidge." + The rainbow cat thought a moment and said, "I'd like a tiny bit of lightning. Please give me just a smidge."

- Sir Thunder the giant put his hand in his pocket and said, "No problem. If that’s all, I have a bundle of it right here, so please take this. When you need it, just undo the string and the lightning will come out in a most amusing way." + Sir Thunder the giant put his hand in his pocket and said, "No problem. If that's all, I have a bundle of it right here, so please take this. When you need it, just undo the string and the lightning will come out in a most amusing way."

"Thank you very much."

@@ -285,7 +285,7 @@ Category: Fiction Those that I fight I do not hate
Those that I guard I do not love;
My country is Kiltartan Cross,
- My countrymen Kiltartan’s poor,
+ My countrymen Kiltartan's poor,
No likely end could bring them loss
Or leave them happier than before.
Nor law, nor duty bade me fight,
@@ -417,7 +417,7 @@ Category: Fiction Gas! GAS! Quick, boys! -- An ecstasy of fumbling
Fitting the clumsy helmets just in time,
But someone still was yelling out and stumbling
- And flound’ring like a man in fire or lime.--
+ And flound'ring like a man in fire or lime.--
Dim through the misty panes and thick green light,
As under a green sea, I saw him drowning.

In all my dreams before my helpless sight,
@@ -425,7 +425,7 @@ Category: Fiction If in some smothering dreams, you too could pace
Behind the wagon that we flung him in,
And watch the white eyes writhing in his face,
- His hanging face, like a devil’s sick of sin;
+ His hanging face, like a devil's sick of sin;
If you could hear, at every jolt, the blood
Come gargling from the froth-corrupted lungs,
Obscene as cancer, bitter as the cud
diff --git a/code/modules/library/hardcode_library/fiction/battlefieldcommander.dm b/code/modules/library/hardcode_library/fiction/battlefieldcommander.dm index 2794915d45..b9953697ff 100644 --- a/code/modules/library/hardcode_library/fiction/battlefieldcommander.dm +++ b/code/modules/library/hardcode_library/fiction/battlefieldcommander.dm @@ -83,14 +83,14 @@ CATEGORY: Fiction -
In the land of Margata, nothing is ever as it seems. There have been many verifiable cases of local bakers having a secret double life as DJs. The correlation between exposure to bread and wanting to scratch out some sick beats has never been quantified, quite possibly to science being illegal in the region. That didn't happen to be the case of a young boy named Gadroc, who was neither a baker nor a DJ. In fact, his story happens to have nothing to do with either of the two. Poor Gadroc was afflicted with a terrible curse. It had been that way ever since he was born, because a witch had cursed his mother for saying "Keep the change," when there was only one cent of change left. Gadroc’s curse was horrible, one that no human being should suffer through: he couldn’t look at butts. Whenever someone showed him a full moon, he transformed into a horrible beast with astoundingly fresh breath. Whenever this happened, he would always run to the nearest cornfield and begin uncontrollably eating corn. Why corn? Because magic, that’s why. That's just how it fucking works. Don't you know anything?
-
After coming home with corn stuck in his teeth for three days straight, and only having one more pair of pants that weren’t destroyed, Gadroc knew that he needed to do something about his curse. He went to the first person he could think of for help.
-
Carne was the town’s blacksmith. He wasn’t very wise, but he always spoke as though he was. It was for this reason that Gadroc often came to Carne for help, despite the fact that he could probably go to basically anyone else. The town beggar, who was constantly sitting in a puddle of his own pee, gave better advice than the blacksmith. Carne was the only one who knew about Gadroc’s affliction. No one else knew who was ravaging the town’s corn population, and riots had already broken out over the severe deficit in cornbread supply.
+
In the land of Margata, nothing is ever as it seems. There have been many verifiable cases of local bakers having a secret double life as DJs. The correlation between exposure to bread and wanting to scratch out some sick beats has never been quantified, quite possibly to science being illegal in the region. That didn't happen to be the case of a young boy named Gadroc, who was neither a baker nor a DJ. In fact, his story happens to have nothing to do with either of the two. Poor Gadroc was afflicted with a terrible curse. It had been that way ever since he was born, because a witch had cursed his mother for saying "Keep the change," when there was only one cent of change left. Gadroc's curse was horrible, one that no human being should suffer through: he couldn't look at butts. Whenever someone showed him a full moon, he transformed into a horrible beast with astoundingly fresh breath. Whenever this happened, he would always run to the nearest cornfield and begin uncontrollably eating corn. Why corn? Because magic, that's why. That's just how it fucking works. Don't you know anything?
+
After coming home with corn stuck in his teeth for three days straight, and only having one more pair of pants that weren't destroyed, Gadroc knew that he needed to do something about his curse. He went to the first person he could think of for help.
+
Carne was the town's blacksmith. He wasn't very wise, but he always spoke as though he was. It was for this reason that Gadroc often came to Carne for help, despite the fact that he could probably go to basically anyone else. The town beggar, who was constantly sitting in a puddle of his own pee, gave better advice than the blacksmith. Carne was the only one who knew about Gadroc's affliction. No one else knew who was ravaging the town's corn population, and riots had already broken out over the severe deficit in cornbread supply.
"Carne, you have to help me!" Gadroc shouted as he burst through the doors of the smithy. Carne was in the middle of forging a pair of iron gauntlets, and had his back turned to Gadroc. He did not turn around.
"Do you need my help? Or do you need my help to help yourself?" Carne said, spouting his signature wisdom.
"Yes. No. What? Did you get that from a fortune cookie?" replied Gadroc.
-
"Yes, actually." Carne turned around. He was loudly crunching on some fortune cookie and inexplicably wearing the gauntlets he was working on, still glowing red hot. He held up the fortune, but Gadroc didn’t have time to read it, as it immediately caught fire and fell into a pile of ashes on the floor.
-
Gadroc was concerned. "Doesn’t that... you know... hurt?"
+
"Yes, actually." Carne turned around. He was loudly crunching on some fortune cookie and inexplicably wearing the gauntlets he was working on, still glowing red hot. He held up the fortune, but Gadroc didn't have time to read it, as it immediately caught fire and fell into a pile of ashes on the floor.
+
Gadroc was concerned. "Doesn't that... you know... hurt?"
"Oh yes, extremely," Carne said with a smile. They both stared at each other for a moment.
@@ -105,27 +105,27 @@ CATEGORY: Fiction
"AHHHHHHHHHHHHHHHHHHHH!" screamed Carne. He flailed his arms around wildly until the gauntlets flew off. One of them flew across the room and hit a painting hanging on the wall. The painting was of our lord and president, Orcbama, and the gauntlet punched him in the face. The painting had a large scorch mark in the same place where the gauntlet had hit, indicating that this was a common occurrence.
"Anyways," Carne said casually, hands blistered and burnt, "What do you need to help me with?"
-
"That’s not what I... you know what, nevermind. Listen. I am sick and tired of this stupid werewolf bullshit! Corn used to be my favorite, and now I can’t stand it! I miss the days when I enjoyed cornbread..."
+
"That's not what I... you know what, nevermind. Listen. I am sick and tired of this stupid werewolf bullshit! Corn used to be my favorite, and now I can't stand it! I miss the days when I enjoyed cornbread..."
"Yeah, so do the townsfolk," the blacksmith replied.
"That's not helpful," Gadroc said, but Carne went on.
"I've always been more of a corn casserole kind of guy myself. Easier on the old gut. Y'know, when I was a boy-"
"Would you shut up and listen? We need to do something about this!"
-
"Right... What’s the problem again?" Gadroc smacked his forehead. He pointed to his own butt.
+
"Right... What's the problem again?" Gadroc smacked his forehead. He pointed to his own butt.
"Listen, son, if that's the way you're swingin', you don't have to play charades about it. Old Carne won't judge," Carne said.
-
"No, the werewolf problem!" Gadroc screamed. He fell to his knees, tears welling up in his eyes. He sniffed. "I just want to be able to look at butts. That’s all I want."
-
Carne walked up and put his gross, burnt hand on Gadroc’s shoulder. "It’s alright. I’ll help you with your problem."
+
"No, the werewolf problem!" Gadroc screamed. He fell to his knees, tears welling up in his eyes. He sniffed. "I just want to be able to look at butts. That's all I want."
+
Carne walked up and put his gross, burnt hand on Gadroc's shoulder. "It's alright. I'll help you with your problem."
Gadroc sniffed again. "Really?"
-
"Yes. Even if it means I’m helping myself to help you help me-"
-
"Carne, you’re not helping again."
+
"Yes. Even if it means I'm helping myself to help you help me-"
+
"Carne, you're not helping again."

-
CUT TO: Gadroc and Carne, scaling a mountain. Both men were equipped with the finest blades from Carne’s smithy. Gadroc was feeling a little indignant, considering Carne had only given him a foam sword. Carne had taken the only finished blade in the smithy.
-
"You see that up there?" Carne said to Gadroc as they climbed. "That’s the ancient temple whose name is really hard to pronounce."
+
CUT TO: Gadroc and Carne, scaling a mountain. Both men were equipped with the finest blades from Carne's smithy. Gadroc was feeling a little indignant, considering Carne had only given him a foam sword. Carne had taken the only finished blade in the smithy.
+
"You see that up there?" Carne said to Gadroc as they climbed. "That's the ancient temple whose name is really hard to pronounce."
"Really?" Gadroc asked. "What's it called?"
-
"I’d tell you, but it’s really hard to pronounce," explained the smith. He continued. "From what I understand, there’s a mystical artifact that can cure any curse. We’re going to use it to cure your werewolf problem."
-
"Why didn’t you tell me any of this on the way here? I’ve been following you up this mountain for hours with no idea of what we’re doing."
+
"I'd tell you, but it's really hard to pronounce," explained the smith. He continued. "From what I understand, there's a mystical artifact that can cure any curse. We're going to use it to cure your werewolf problem."
+
"Why didn't you tell me any of this on the way here? I've been following you up this mountain for hours with no idea of what we're doing."
"We took that part out in post. It was a really long and not very funny bit that didn't get much of a reaction out of anyone the first time this story was read out loud. It's a little trick the boys back home call 'the Director's Cut.'"
"Ah. That makes a lot of sense."
-
"Right?" The two laughed at that, looked at the camera for a moment, then back to each other. A laugh track played during this. It lasted for an uncomfortable amount of time. It was the kind of laughter that you think is about to die down, but then it kicks right back up again. There’s also that one lady who’s cackling like a hyena having a tea party with a witch. You try to unhear her, but you just keep noticing her. Why do sitcoms think laugh tracks add anything to the show? It doesn't. That shit just doesn’t sit right with me.
+
"Right?" The two laughed at that, looked at the camera for a moment, then back to each other. A laugh track played during this. It lasted for an uncomfortable amount of time. It was the kind of laughter that you think is about to die down, but then it kicks right back up again. There's also that one lady who's cackling like a hyena having a tea party with a witch. You try to unhear her, but you just keep noticing her. Why do sitcoms think laugh tracks add anything to the show? It doesn't. That shit just doesn't sit right with me.
"}, @@ -139,20 +139,20 @@ CATEGORY: Fiction
They continued to hike up the mountain. After a little while, they reached the temple. The door was guarded by two dog-men holding spears.
"Who are these guys?" Gadroc asked.
-
"Let me handle this," assured Carne. "How’s it going gentlemen?" The dog-men stepped closer and crossed their spears across the door.
-
"Listen boys, there’s no need for the attitude," said the smith. The dog-men began to growl at him.
-
Carne frowned. "Hey now, that’s just rude." The dog-men responded to this by shoulder-checking Carne, knocking him to the ground. Gadroc sighed and walked up to the armored, bipedal golden retriever.
-
"Who’s a good boy?" Gadroc said as he began to scratch the dog behind his cutie ears. The dog-man turned his head into Gadroc’s hand and began to pant.
-
Gadroc continued. "You are! You’re a good boy! Oh it’s you!" The dog barked as if to say, "YES IT IS ME, I AM THE GOOD BOY." The dog-man eventually got down on all fours, stomped around in a circle a bit, and promptly fell asleep. The other guard whimpered. He had felt that he had been a good boy too, and that he deserved scratchies just as much as his partner, if not more. He conveyed this to Gadroc in a single bark. Gadroc turned to him.
-
"Oh I know! You’ve been a good boy too!" He pet the guard for a little bit, then pulled an ear of corn out of his pocket.
+
"Let me handle this," assured Carne. "How's it going gentlemen?" The dog-men stepped closer and crossed their spears across the door.
+
"Listen boys, there's no need for the attitude," said the smith. The dog-men began to growl at him.
+
Carne frowned. "Hey now, that's just rude." The dog-men responded to this by shoulder-checking Carne, knocking him to the ground. Gadroc sighed and walked up to the armored, bipedal golden retriever.
+
"Who's a good boy?" Gadroc said as he began to scratch the dog behind his cutie ears. The dog-man turned his head into Gadroc's hand and began to pant.
+
Gadroc continued. "You are! You're a good boy! Oh it's you!" The dog barked as if to say, "YES IT IS ME, I AM THE GOOD BOY." The dog-man eventually got down on all fours, stomped around in a circle a bit, and promptly fell asleep. The other guard whimpered. He had felt that he had been a good boy too, and that he deserved scratchies just as much as his partner, if not more. He conveyed this to Gadroc in a single bark. Gadroc turned to him.
+
"Oh I know! You've been a good boy too!" He pet the guard for a little bit, then pulled an ear of corn out of his pocket.
"You want a treat boy?" Gadroc asked, as he held up the corn. The dog nodded violently and made a couple of attempts to nibble on the corn, but Gadroc pulled it away before he could.
"Go get it!" shouted Gadroc as he threw the corn down the mountain. The dog guard threw his spear to the side as he bounded after the corn bouncing down the path. Certain the guard had made it out of sight, Gadroc went to help Carne up.
"Where did you learn to deal with Canine-sapiens like that?" Carne asked.
"Well, if you think about it, werewolves are technically part dog. Plus, I just know a good boy when I see one."
The two stepped through the doors of the temple. At the end of the long, church-like room was a marble altar on a platform, with a set of stairs leading up to it. On the altar sat a small, simple wooden box. From above, a light fell gently on the box, giving it a soft, almost holy glow. The stained glass windows at the back of the room were arranged in such a way that they almost seemed to be pointing at the box. Many different flowers were arranged on either side of the box and at the foot of the altar.
-
"Call it a hunch," Carne said slowly, "but I think those flowers might be important somehow. I just get that feeling, I couldn’t tell you why."
-
"It’s the box that’s important, or whatever's in it," Gadroc said dryly. "The only thing that could make it more obvious is if a huge, luminescent sign dropped down with blinking arrows that read, ‘There’s probably a magic artifact in this box.’" Just then, a huge luminescent sign with blinking arrows that read, "There’s probably a magic artifact in this box." dropped down. Gadroc pinched the bridge of his nose.
-
"Do you think there might be a secret compartment in the altar? I bet that’s where the artifact is," pondered the smith.
+
"Call it a hunch," Carne said slowly, "but I think those flowers might be important somehow. I just get that feeling, I couldn't tell you why."
+
"It's the box that's important, or whatever's in it," Gadroc said dryly. "The only thing that could make it more obvious is if a huge, luminescent sign dropped down with blinking arrows that read, ‘There's probably a magic artifact in this box.'" Just then, a huge luminescent sign with blinking arrows that read, "There's probably a magic artifact in this box." dropped down. Gadroc pinched the bridge of his nose.
+
"Do you think there might be a secret compartment in the altar? I bet that's where the artifact is," pondered the smith.
"}, @@ -164,20 +164,20 @@ CATEGORY: Fiction -
"Welcome to the temple of Ivyechneyoveen Kah’al, my children," came a voice.
-
"Who said that?" Gadroc asked. "So that’s how it’s pronounced," mused Carne. A figure stepped out from behind a pillar. It was a robed dog-woman, an ancient St. Bernard.
+
"Welcome to the temple of Ivyechneyoveen Kah'al, my children," came a voice.
+
"Who said that?" Gadroc asked. "So that's how it's pronounced," mused Carne. A figure stepped out from behind a pillar. It was a robed dog-woman, an ancient St. Bernard.
The dog lady spoke again. "Have you come to give your thanks to Orcville?"
-
"I’m sorry, who?" Gadroc asked, confused.
+
"I'm sorry, who?" Gadroc asked, confused.
"Yes, Orcville Redenbacher. He blessed the world with his glorious popcorn and saved our souls."
"Wait," interrupted Carne. "Then why is it called the temple of Itchyville Cable?"
-
"Ivyechneyoveen Kah’al," corrected the priestess with a polite smile.
-
"Yeah, that’s what I said."
-
"I’d be glad to enlighten you, my child. It all started when..." The priestess lengthy explanation on the history and fine points of the religion of the dog people. It didn’t make the slightest bit of sense, though Carne did have a bit of a chuckle at the part where Orcville defeated the demon lord who wouldn't stop pretending to throw a ball to go fetch and then never actually throw the ball. Gadroc nearly fell asleep on his feet. He decided not to take part in the theological discussion and turned his attention back to the box. He walked up to the altar platform and climbed the steps. Carefully he opened the two small, wooden doors on the front of the box. Words could not describe his excitement. Inside the box was...
-
"A hot dog?" Gadroc asked aloud. He was thoroughly baffled. Inside the box was a golden hot dog that sparkled in the light. He couldn’t tell whether or not it had ketchup, mustard, or even relish on it; it was all gold.
+
"Ivyechneyoveen Kah'al," corrected the priestess with a polite smile.
+
"Yeah, that's what I said."
+
"I'd be glad to enlighten you, my child. It all started when..." The priestess lengthy explanation on the history and fine points of the religion of the dog people. It didn't make the slightest bit of sense, though Carne did have a bit of a chuckle at the part where Orcville defeated the demon lord who wouldn't stop pretending to throw a ball to go fetch and then never actually throw the ball. Gadroc nearly fell asleep on his feet. He decided not to take part in the theological discussion and turned his attention back to the box. He walked up to the altar platform and climbed the steps. Carefully he opened the two small, wooden doors on the front of the box. Words could not describe his excitement. Inside the box was...
+
"A hot dog?" Gadroc asked aloud. He was thoroughly baffled. Inside the box was a golden hot dog that sparkled in the light. He couldn't tell whether or not it had ketchup, mustard, or even relish on it; it was all gold.
"What are you doing with our sacred artifact?" shouted the dog priestess. Gadroc jumped, startled. He was too busy thinking about what gold tasted like.
"Uh... I need it... for... a friend," Gadroc lied, incredibly convincingly.
-
"You’d better not eat that because that’s totally not how a magic artifact shaped like a hot dog would work!" screeched the priestess.
-
Gadroc looked again at the supposed cure to all his problems. It was right there in his hands! "You’re not my mom!" he shouted, and promptly shoved the entire hot dog in his mouth and made a break for the door. Carne seemed impressed.
+
"You'd better not eat that because that's totally not how a magic artifact shaped like a hot dog would work!" screeched the priestess.
+
Gadroc looked again at the supposed cure to all his problems. It was right there in his hands! "You're not my mom!" he shouted, and promptly shoved the entire hot dog in his mouth and made a break for the door. Carne seemed impressed.
"Damn," he said. "Wish I could run that fast after stuffing an entire hot dog in my mouth. Last time I did that I got a hernia." He turned to the dog priestess.
"So, uh... wanna go grab some popcorn later?" The priestess slapped him across the face. "Right. I'll get goin', then. Sorry about the hot dog. We'll make you a new one." Carne began to head in Gadroc's direction.
@@ -192,12 +192,12 @@ CATEGORY: Fiction -
"Gadroc, where are you?" Carne shouted. "You can come out now, she didn’t follow us." Gadroc looked around and slowly stepped out from behind a tree that didn't even come close to consealing him whatsoever.
-
"I... I don’t know if it worked, Carne," the boy said nervously.
-
"Here," said the smith. He handed Gadroc a small, folded up piece of paper. Almost the exact moment Gadroc’s fingers touched it, Carne leapt like an orc-lympic death hurdle sprinter and combat rolled to take cover behind a nearby fallen tree. Gadroc unfolded the paper, hands trembling. On it was a pin up of a real buff orc dude. His shirtless body was ripped and glistening with sweat. He held a wrench and his jeans were not tight around his waist. Another shot showed him crouched down in front of a sink, which was confusing because plumbing was not very popular yet. The orc’s loose jeans were sagging down his pants, and they revealed the glowing, firm cheeks of his fine behind. A single tear rolled down Gadroc’s face.
+
"Gadroc, where are you?" Carne shouted. "You can come out now, she didn't follow us." Gadroc looked around and slowly stepped out from behind a tree that didn't even come close to consealing him whatsoever.
+
"I... I don't know if it worked, Carne," the boy said nervously.
+
"Here," said the smith. He handed Gadroc a small, folded up piece of paper. Almost the exact moment Gadroc's fingers touched it, Carne leapt like an orc-lympic death hurdle sprinter and combat rolled to take cover behind a nearby fallen tree. Gadroc unfolded the paper, hands trembling. On it was a pin up of a real buff orc dude. His shirtless body was ripped and glistening with sweat. He held a wrench and his jeans were not tight around his waist. Another shot showed him crouched down in front of a sink, which was confusing because plumbing was not very popular yet. The orc's loose jeans were sagging down his pants, and they revealed the glowing, firm cheeks of his fine behind. A single tear rolled down Gadroc's face.
"Carne," he sniffed. "It worked." Carne came out from behind the log and wiped the sweat from his brow with a "Phew!"
-
"It’s beautiful, Carne," Gadroc went on.
-
"Keep it, kid," the blacksmith said with a smile. "You need it more than I do. Let’s go home."
+
"It's beautiful, Carne," Gadroc went on.
+
"Keep it, kid," the blacksmith said with a smile. "You need it more than I do. Let's go home."
Gadroc had gold poop for a week.


diff --git a/code/modules/library/hardcode_library/reference/Schnayy.dm b/code/modules/library/hardcode_library/reference/Schnayy.dm index d5e946535a..43a758bcf5 100644 --- a/code/modules/library/hardcode_library/reference/Schnayy.dm +++ b/code/modules/library/hardcode_library/reference/Schnayy.dm @@ -49,7 +49,7 @@ CATEGORY: Reference
Phoron research and study is a vital subject of research -- it has been a pillar of humanity's progress, a staple of the technology that has shaped our society. To work on expanding our knowledge and shape our future in the cosmos is a noble cause, but it should be done with caution.

- This is not to speak on safety in your lab, but the consequences of action. Many times has man created the unthinkable, and many times we have not been prepared for such discoveries. We should not censor ourselves from advancement, but we should shape the world to be ready for what comes with it – and know that it is an invariable consequence there will be those who seek to abuse it. + This is not to speak on safety in your lab, but the consequences of action. Many times has man created the unthinkable, and many times we have not been prepared for such discoveries. We should not censor ourselves from advancement, but we should shape the world to be ready for what comes with it - and know that it is an invariable consequence there will be those who seek to abuse it.

You cannot take back what you give to the world. diff --git a/code/modules/lighting/lighting_source.dm b/code/modules/lighting/lighting_source.dm index a5f9bfa167..c46369aacd 100644 --- a/code/modules/lighting/lighting_source.dm +++ b/code/modules/lighting/lighting_source.dm @@ -193,22 +193,22 @@ return view(CEILING(light_range, 1), source_turf) // Keep in mind. Lighting corners accept the bottom left (northwest) set of cords to them as input -//CHOMPEdit Start Dynamic light -#define GENERATE_MISSING_CORNERS(gen_for) \ +/* CHOMPRemove Start, we use our own in _defines +# define GENERATE_MISSING_CORNERS(gen_for) \ if (!gen_for.lighting_corner_NE) { \ - gen_for.lighting_corner_NE = new /datum/lighting_corner(gen_for.x, gen_for.y, gen_for.z, gen_for.has_dynamic_lighting()); \ + gen_for.lighting_corner_NE = new /datum/lighting_corner(gen_for.x, gen_for.y, gen_for.z); \ } \ if (!gen_for.lighting_corner_SE) { \ - gen_for.lighting_corner_SE = new /datum/lighting_corner(gen_for.x, gen_for.y - 1, gen_for.z, gen_for.has_dynamic_lighting()); \ + gen_for.lighting_corner_SE = new /datum/lighting_corner(gen_for.x, gen_for.y - 1, gen_for.z); \ } \ if (!gen_for.lighting_corner_SW) { \ - gen_for.lighting_corner_SW = new /datum/lighting_corner(gen_for.x - 1, gen_for.y - 1, gen_for.z, gen_for.has_dynamic_lighting()); \ + gen_for.lighting_corner_SW = new /datum/lighting_corner(gen_for.x - 1, gen_for.y - 1, gen_for.z); \ } \ if (!gen_for.lighting_corner_NW) { \ - gen_for.lighting_corner_NW = new /datum/lighting_corner(gen_for.x - 1, gen_for.y, gen_for.z, gen_for.has_dynamic_lighting()); \ + gen_for.lighting_corner_NW = new /datum/lighting_corner(gen_for.x - 1, gen_for.y, gen_for.z); \ } \ gen_for.lighting_corners_initialised = TRUE; -//CHOMPEdit End +*/// CHOMPRemove End /datum/light_source/proc/update_corners() var/update = FALSE @@ -320,6 +320,7 @@ (. * _lum_g) - (OLD * _applied_lum_g), \ (. * _lum_b) - (OLD * _applied_lum_b) \ ); +#undef APPLY_CORNER_NEW //CHOMPEdit End var/list/datum/lighting_corner/gone_corners = effect_str - corners diff --git a/code/modules/lighting/sunlight_handler_ch.dm b/code/modules/lighting/sunlight_handler_ch.dm index 585d9ffb29..6f371d6dcd 100644 --- a/code/modules/lighting/sunlight_handler_ch.dm +++ b/code/modules/lighting/sunlight_handler_ch.dm @@ -391,5 +391,3 @@ return TRUE else return FALSE - -#undef GENERATE_MISSING_CORNERS diff --git a/code/modules/lore_codex/lore_data/species.dm b/code/modules/lore_codex/lore_data/species.dm index 227ee222b2..c24453a112 100644 --- a/code/modules/lore_codex/lore_data/species.dm +++ b/code/modules/lore_codex/lore_data/species.dm @@ -132,12 +132,12 @@ name = "Promethean" keywords += list("slime", "promethean") data = "Prometheans are an artificial species created by the Humans sometime in the 2540s, aboard the NRS Prometheus, while experimenting with \ - the Aetolian giant slime, or ‘Macrolimus vulgaris’. They themselves are considered sapient beings and given protection under prior Human legislation, \ - though often only appear to serve as aides or inferior positions when kept as staff. Aetolus, the official ‘Home world’ of the Prometheans and giant slime, \ - is an obnoxiously warm, humid planet requiring structures to be built within large, atmospherically-filtered ‘tent-like’ domes. \ - Prometheans take on vague visual and vocal features of the species they cohabitate with, sharing their predecessors’ tendency to mimic nearby entities, \ + the Aetolian giant slime, or 'Macrolimus vulgaris'. They themselves are considered sapient beings and given protection under prior Human legislation, \ + though often only appear to serve as aides or inferior positions when kept as staff. Aetolus, the official 'Home world' of the Prometheans and giant slime, \ + is an obnoxiously warm, humid planet requiring structures to be built within large, atmospherically-filtered 'tent-like' domes. \ + Prometheans take on vague visual and vocal features of the species they cohabitate with, sharing their predecessors' tendency to mimic nearby entities, \ though in physical form additionally; this is seemingly more important in their own development, as well. Despite their taken appearances, \ - there is no known existence of a divergence between a biologically ‘male’ or ‘female’ form of the species, leading most to believe they are in fact asexual, \ + there is no known existence of a divergence between a biologically 'male' or 'female' form of the species, leading most to believe they are in fact asexual, \ as their predecessors are." // Vatborn Lore @@ -155,7 +155,7 @@ data = "A Positronic being, is an individual with a positronic brain, manufactured \ and fostered amongst organic life. Positronic brains enjoy the same legal status as a human in [quick_link("SolGov")] space, although discrimination is \ still prevalent, and are considered sapient on all accounts. They can be considered the \"synthetic species\". Half-developed and \ - half-discovered in the 2280’s by a human black lab studying alien artifacts, the first positronic brain was an inch-wide cube \ + half-discovered in the 2280's by a human black lab studying alien artifacts, the first positronic brain was an inch-wide cube \ of an palladium-iridium alloy, nano-etched with billions upon billions of conduits and connections. Upon activation, \ hard-booted with an emitter laser, the brain issued a single sentence before the neural pathways collapsed and \ it became an inert lump of platinum: \"What is my purpose?\"." @@ -218,7 +218,7 @@ keywords = list("fork") data = "A \"codeline\" is a single type of drone. A codeline represents a significant degree of effort from sapient programmers to realize, as well as \ a substantial amount of regulatory fees levied by the government. Each copy of a codeline is called a \"fork\", whether the fork is created from the \ - codeline’s initial state or from a fully realized individual of that codeline. The degree of similarity between forks of the same codeline varies \ + codeline's initial state or from a fully realized individual of that codeline. The degree of similarity between forks of the same codeline varies \ on the intelligence of the codeline, with low-level forks being virtually identical to high-level forks being no more similar than family members." /datum/lore/codex/page/emergence @@ -234,8 +234,8 @@ keywords = list("SG-EIO", "SG EIO", "EIO", "Intelligence Oversight") data = "SG-EIO, usually just called EIO, is the organization charged with monitoring existing AI for any threat of dangerous emergence. Their perception in the \ public eye is generally positive, with all but the hardest-line Mercurial humans in favor of protection from the dangers of Seed AI. Some positronic rights \ - groups bristle at the EIO’s human-centric viewpoint, but most are glad to have a different boogeyman in the form of drone intelligences. The tiny population \ - of A-class drones are generally frightened of the EIO’s total power over them." + groups bristle at the EIO's human-centric viewpoint, but most are glad to have a different boogeyman in the form of drone intelligences. The tiny population \ + of A-class drones are generally frightened of the EIO's total power over them." /datum/lore/codex/category/drone_classes name = "Drone Classifications" @@ -293,7 +293,7 @@ name = "A Class" keywords += list("AGI") data = "A-class drones are also referred to as AGI. A-class drones are capable of performing in many contexts and can learn to solve problems from \ - first principles, with an incredible potential for growth and emergent behavior. However, some abilities fall short of humans’, usually those relating \ + first principles, with an incredible potential for growth and emergent behavior. However, some abilities fall short of humans', usually those relating \ to socialization, and they often act in ways that are strange or distressing. There is a small but growing lobby of support for the personhood of A-class \ drones. The cost of initializing an A-class drone is absolutely massive, as they will be monitored by [quick_link("EIO")] forever. The auditing cost of an A-class drone \ codeline is even more staggering, making development and deployment of AGI limited to research, highly difficult and high-throughput operations like habitat \ @@ -305,7 +305,7 @@ data = "AA-class drones do not yet exist. Hypothetically, they are equal to living in every respect, with psychology that would not be abnormal in a baseline \ human. The type of AA-class drone most frequently discussed is a hypothetical digitized consciousness of a human, a human brain that is somehow translated into \ software. Some argue that a small fraction of the A-class drones would more properly be considered AA, but as of yet no action has been taken. Some Mercurials \ - will jokingly refer to themselves or other organics and positronics as AA’s. Research into brain uploading is heavily regulated and generally illegal." + will jokingly refer to themselves or other organics and positronics as AA's. Research into brain uploading is heavily regulated and generally illegal." /datum/lore/codex/page/class_aaa name = "AAA Class" diff --git a/code/modules/lore_codex/lore_data_vr/species.dm b/code/modules/lore_codex/lore_data_vr/species.dm index ea7ca8ad81..f2ce71d42e 100644 --- a/code/modules/lore_codex/lore_data_vr/species.dm +++ b/code/modules/lore_codex/lore_data_vr/species.dm @@ -205,7 +205,7 @@ data = "A Positronic being, is an individual with a positronic brain, manufactured \ and fostered amongst organic life. Positronic brains enjoy the same legal status as a human in [quick_link("SolGov")] space, although discrimination is \ still prevalent, and are considered sapient on all accounts. They can be considered a \"synthetic species\". Half-developed and \ - half-discovered in the 2280’s by a human black lab studying alien artifacts, the first positronic brain was an inch-wide cube \ + half-discovered in the 2280's by a human black lab studying alien artifacts, the first positronic brain was an inch-wide cube \ of an palladium-iridium alloy, nano-etched with billions upon billions of conduits and connections. Upon activation, \ hard-booted with an emitter laser, the brain issued a single sentence before the neural pathways collapsed and \ it became an inert lump of platinum: \"What is my purpose?\"." @@ -269,7 +269,7 @@ keywords = list("fork") data = "A \"codeline\" is a single type of drone. A codeline represents a significant degree of effort from sapient programmers to realize, as well as \ a substantial amount of regulatory fees levied by the government. Each copy of a codeline is called a \"fork\", whether the fork is created from the \ - codeline’s initial state or from a fully realized individual of that codeline. The degree of similarity between forks of the same codeline varies \ + codeline's initial state or from a fully realized individual of that codeline. The degree of similarity between forks of the same codeline varies \ on the intelligence of the codeline, with low-level forks being virtually identical to high-level forks being no more similar than family members." /* @@ -287,8 +287,8 @@ keywords = list("SG-EIO", "SG EIO", "EIO", "Intelligence Oversight") data = "SG-EIO, usually just called EIO, is the organization charged with monitoring existing AI for any threat of dangerous emergence. Their perception in the \ public eye is generally positive, with all but the hardest-line Mercurial humans in favor of protection from the dangers of Seed AI. Some positronic rights \ - groups bristle at the EIO’s human-centric viewpoint, but most are glad to have a different boogeyman in the form of drone intelligences. The tiny population \ - of A-class drones are generally frightened of the EIO’s total power over them." + groups bristle at the EIO's human-centric viewpoint, but most are glad to have a different boogeyman in the form of drone intelligences. The tiny population \ + of A-class drones are generally frightened of the EIO's total power over them." /*/datum/lore/codex/category/drone_classes name = "Drone Classifications" @@ -346,7 +346,7 @@ name = "A Class" keywords += list("AGI") data = "A-class drones are also referred to as AGI. A-class drones are capable of performing in many contexts and can learn to solve problems from \ - first principles, with an incredible potential for growth and emergent behavior. However, some abilities fall short of humans’, usually those relating \ + first principles, with an incredible potential for growth and emergent behavior. However, some abilities fall short of humans', usually those relating \ to socialization, and they often act in ways that are strange or distressing. There is a small but growing lobby of support for the personhood of A-class \ drones. The cost of initializing an A-class drone is absolutely massive, as they will be monitored by [quick_link("EIO")] forever. The auditing cost of an A-class drone \ codeline is even more staggering, making development and deployment of AGI limited to research, highly difficult and high-throughput operations like habitat \ @@ -358,7 +358,7 @@ data = "AA-class drones do not yet exist. Hypothetically, they are equal to living in every respect, with psychology that would not be abnormal in a baseline \ human. The type of AA-class drone most frequently discussed is a hypothetical digitized consciousness of a human, a human brain that is somehow translated into \ software. Some argue that a small fraction of the A-class drones would more properly be considered AA, but as of yet no action has been taken. Some Mercurials \ - will jokingly refer to themselves or other organics and positronics as AA’s. Research into brain uploading is heavily regulated and generally illegal." + will jokingly refer to themselves or other organics and positronics as AA's. Research into brain uploading is heavily regulated and generally illegal." /datum/lore/codex/page/class_aaa name = "AAA Class" diff --git a/code/modules/lore_codex/lore_data_yw/species.dm b/code/modules/lore_codex/lore_data_yw/species.dm index 4b89b0fcb2..4a81f9ec33 100644 --- a/code/modules/lore_codex/lore_data_yw/species.dm +++ b/code/modules/lore_codex/lore_data_yw/species.dm @@ -156,10 +156,10 @@ proposing that they are extragalactic refugees who have somehow crossed the great divide between their galaxy \ and our own to hide from some greater threat. \

\ - Theorizing aside, they're perhaps best known for their natural \'telepathic\' abilities, their violent reaction to water \ + Theorizing aside, they're perhaps best known for their natural \"telepathic\" abilities, their violent reaction to water \ (owing to their salt-heavy biology their cells rapidly undergo cytolysis when exposed to water, which can easily be fatal) \ and their apparent knack for research and development. The TSCs have been quick to court the favor of those that leave the \ - Grey \'homeworld\' of Mauna-b, offering them almost uncharacteristically generous employment packages within administrative \ + Grey \"homeworld\" of Mauna-b, offering them almost uncharacteristically generous employment packages within administrative \ and research departments at facilities across civilized space. For their part the Grey seem to be integrating well, despite \ occasional difficulties with the lower levels of oxygen present outside of their favored ships and habitats." @@ -241,7 +241,7 @@ data = "A Positronic being, is an individual with a positronic brain, manufactured \ and fostered amongst organic life. Positronic brains enjoy the same legal status as a human in [quick_link("SolGov")] space, although discrimination is \ still prevalent, and are considered sapient on all accounts. They can be considered a \"synthetic species\". Half-developed and \ - half-discovered in the 2280’s by a human black lab studying alien artifacts, the first positronic brain was an inch-wide cube \ + half-discovered in the 2280's by a human black lab studying alien artifacts, the first positronic brain was an inch-wide cube \ of an palladium-iridium alloy, nano-etched with billions upon billions of conduits and connections. Upon activation, \ hard-booted with an emitter laser, the brain issued a single sentence before the neural pathways collapsed and \ it became an inert lump of platinum: \"What is my purpose?\"." @@ -305,7 +305,7 @@ keywords = list("fork") data = "A \"codeline\" is a single type of drone. A codeline represents a significant degree of effort from sapient programmers to realize, as well as \ a substantial amount of regulatory fees levied by the government. Each copy of a codeline is called a \"fork\", whether the fork is created from the \ - codeline’s initial state or from a fully realized individual of that codeline. The degree of similarity between forks of the same codeline varies \ + codeline's initial state or from a fully realized individual of that codeline. The degree of similarity between forks of the same codeline varies \ on the intelligence of the codeline, with low-level forks being virtually identical to high-level forks being no more similar than family members." /* @@ -323,8 +323,8 @@ keywords = list("SG-EIO", "SG EIO", "EIO", "Intelligence Oversight") data = "SG-EIO, usually just called EIO, is the organization charged with monitoring existing AI for any threat of dangerous emergence. Their perception in the \ public eye is generally positive, with all but the hardest-line Mercurial humans in favor of protection from the dangers of Seed AI. Some positronic rights \ - groups bristle at the EIO’s human-centric viewpoint, but most are glad to have a different boogeyman in the form of drone intelligences. The tiny population \ - of A-class drones are generally frightened of the EIO’s total power over them." + groups bristle at the EIO's human-centric viewpoint, but most are glad to have a different boogeyman in the form of drone intelligences. The tiny population \ + of A-class drones are generally frightened of the EIO's total power over them." /*/datum/lore/codex/category/drone_classes name = "Drone Classifications" @@ -382,7 +382,7 @@ name = "A Class" keywords += list("AGI") data = "A-class drones are also referred to as AGI. A-class drones are capable of performing in many contexts and can learn to solve problems from \ - first principles, with an incredible potential for growth and emergent behavior. However, some abilities fall short of humans’, usually those relating \ + first principles, with an incredible potential for growth and emergent behavior. However, some abilities fall short of humans', usually those relating \ to socialization, and they often act in ways that are strange or distressing. There is a small but growing lobby of support for the personhood of A-class \ drones. The cost of initializing an A-class drone is absolutely massive, as they will be monitored by [quick_link("EIO")] forever. The auditing cost of an A-class drone \ codeline is even more staggering, making development and deployment of AGI limited to research, highly difficult and high-throughput operations like habitat \ @@ -394,7 +394,7 @@ data = "AA-class drones " + span_bold("do not yet exist") + ". Hypothetically, they are equal to living in every respect, with psychology that would not be abnormal in a baseline \ human. The type of AA-class drone most frequently discussed is a hypothetical digitized consciousness of a human, a human brain that is somehow translated into \ software. Some argue that a small fraction of the A-class drones would more properly be considered AA, but as of yet no action has been taken. Some Mercurials \ - will jokingly refer to themselves or other organics and positronics as AA’s. Research into brain uploading is heavily regulated and generally illegal." + will jokingly refer to themselves or other organics and positronics as AA's. Research into brain uploading is heavily regulated and generally illegal." /datum/lore/codex/page/class_aaa name = "AAA Class" diff --git a/code/modules/maps/bapi-dmm/bapi_bindings.dm b/code/modules/maps/bapi-dmm/bapi_bindings.dm index 780445e4e6..b88871414b 100644 --- a/code/modules/maps/bapi-dmm/bapi_bindings.dm +++ b/code/modules/maps/bapi-dmm/bapi_bindings.dm @@ -34,3 +34,5 @@ x_upper, y_lower, y_upper, z_lower, z_upper, place_on_top, new_z) /proc/bapidmm_generate_automata(limit_x, limit_y, iterations, initial_wall_cell) return call_ext(BAPI_DMM_READER, "byond:bapidmm_generate_automata_ffi")(limit_x, limit_y, iterations, initial_wall_cell) + +#undef BAPI_DMM_READER diff --git a/code/modules/mob/living/carbon/human/phobias.dm b/code/modules/mob/living/carbon/human/phobias.dm index 092fba6347..f92ea2464b 100644 --- a/code/modules/mob/living/carbon/human/phobias.dm +++ b/code/modules/mob/living/carbon/human/phobias.dm @@ -1,13 +1,3 @@ -//Handling and defining of phobias and fears -#define NYCTOPHOBIA 1 -#define ARACHNOPHOBIA 2 -#define HEMOPHOBIA 4 -#define THALASSOPHOBIA 8 -#define CLAUSTROPHOBIA_MINOR 16 -#define CLAUSTROPHOBIA_MAJOR 32 -#define ANATIDAEPHOBIA 64 -#define AGRAVIAPHOBIA 128 - /mob/living/carbon/human/proc/handle_phobias() if(phobias & NYCTOPHOBIA) var/turf/T = get_turf(src) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative_ch.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative_ch.dm index 02f6bfe486..125ac272b0 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative_ch.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative_ch.dm @@ -460,3 +460,5 @@ desc = "Your biochemistry is a little delicate, rendering you more susceptible to both deadly toxins and the more subtle ones. You'll probably want to list this in your medical records, and perhaps in your exploitable info as well. Toxin damages and knockout drugs are 25% stronger on you." cost = -1 var_changes = list("chem_strength_tox" = 1.25) + +#undef GAUSSIAN_RANDOM diff --git a/code/modules/mob/living/zz_ballistics_ch/bullet_act_ch.dm b/code/modules/mob/living/zz_ballistics_ch/bullet_act_ch.dm index 0d3ad41d05..9a2979d3f9 100644 --- a/code/modules/mob/living/zz_ballistics_ch/bullet_act_ch.dm +++ b/code/modules/mob/living/zz_ballistics_ch/bullet_act_ch.dm @@ -1,48 +1,3 @@ -#define BULLET_AP_DIVISOR 200 -#define AP_DIVISOR 4152 -#define ARMOR_Y_INTERCEPT 0.2 -#define ARMOR_SLOPE 0.017 -#define PENETRATION_PROBABILITY_EXP_BASE 2 -#define PENETRATION_PROBABILITY_EXP_MULT 30 - -#define BULLET_DEFLECTED_PAIN_DIVISOR 5000 -#define BULLET_DEFLECTED_BULLET_DIVISOR 70 -#define BULLET_DEFLECTED_MELEE_DIVISOR 280 -#define BULLET_DEFLECTED_PAIN_EXPONENT 1.5 -#define BULLET_DEFLECTED_BRUISE_SUBTRACT 5 - -GLOBAL_VAR_INIT(SKIN_LOSS_COEFFICIENT,16) -GLOBAL_VAR_INIT(ARMOR_LOSS_COEFFICIENT,150) -GLOBAL_VAR_INIT(ARMOR_LOSS_MIN_MULT,0.5) -GLOBAL_VAR_INIT(ARMOR_LOSS_MIN_ARMOR,20) -GLOBAL_VAR_INIT(INTERNAL_LOSS_COEFFICIENT,195) -#define ORGAN_LOSS_COEFFICIENT 350 -#define HIT_VITAL_ORGAN_CHANCE 35 - -#define BONE_HIT_CHANCE_UNENCASED 45 -#define BONE_HIT_CHANCE_ENCASED 80 -GLOBAL_VAR_INIT(BONE_JOULES_PERHP_AVG,2) -GLOBAL_VAR_INIT(BONE_JOULES_PERHP_DEV,1) -GLOBAL_VAR_INIT(BONE_JOULES_MIN,100) -#define BONE_HP_AVG 25 - -GLOBAL_VAR_INIT(HOLLOW_POINT_VELLOSS_BONUS,1.45) -GLOBAL_VAR_INIT(HOLLOW_POINT_CONVERSION_EFF,1.85) - -#define PROB_LEAVE_EARLY_FIRST 20 -#define PROB_LEAVE_EARLY_SECOND 40 - -GLOBAL_VAR_INIT(ENERGY_DAMAGE_FLESH_FACTOR,0.025) -GLOBAL_VAR_INIT(ENERGY_DAMAGE_ORGAN_FACTOR,0.035) -#define ENERGY_DAMAGE_EXPONENT 0.6 -#define ENERGY_DAMAGE_COEFFICIENT 0.05 -#define ENERGY_DAMAGE_FLESH_FALLOFF_POINT 10 -#define ENERGY_DAMAGE_ORGAN_FALLOFF_POINT 7 - -#ifndef GAUSSIAN_RANDOM -#define GAUSSIAN_RANDOM(vars...) ((-2*log(rand()))**0.5 * cos(6.28318530718*rand())) -#endif - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////// CADYN'S BALLISTICS ////////////////////////////////////////////////////////////////////////// ORIGINAL FROM CHOMPSTATION //////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/code/modules/mob/living/zz_ballistics_ch/z_ballistic_test_ch.dm b/code/modules/mob/living/zz_ballistics_ch/z_ballistic_test_ch.dm index b536a9135a..5df401915b 100644 --- a/code/modules/mob/living/zz_ballistics_ch/z_ballistic_test_ch.dm +++ b/code/modules/mob/living/zz_ballistics_ch/z_ballistic_test_ch.dm @@ -234,3 +234,15 @@ energy_dumped_organic += P.energy / 3 P.sub_velocity(P.velocity) return lazy_return_testing(chex,energy_dumped_organic) + +#undef BULLET_PENETRATED +#undef BULLET_BONECHECK1_TRUE +#undef BULLET_ORGANCHECK_TRUE +#undef BULLET_BONECHECK2_TRUE +#undef BULLET_PASSED_LEAVE_EARLY +#undef BULLET_PASSED_BONECHECK1 +#undef BULLET_PASSED_ORGANCHECK +#undef BULLET_PASSED_INTERNALCHECK2 +#undef BULLET_PASSED_BONECHECK2 +#undef BULLET_PASSED_INTERNALCHECK3 +#undef BULLET_TESTS diff --git a/code/modules/projectiles/guns/projectile/leveraction.dm b/code/modules/projectiles/guns/projectile/leveraction.dm index 49b93f7350..ff7560119d 100644 --- a/code/modules/projectiles/guns/projectile/leveraction.dm +++ b/code/modules/projectiles/guns/projectile/leveraction.dm @@ -8,7 +8,7 @@ the same time having a rather respectable firing rate due to it's mechanism. It is very probable \ this is a replica instead of a museum piece, but rifles of this pattern still see usage as \ colonist guns in some far off regions. Uses 7.62mm rounds." - description_fluff = "The frontier’s largest home-grown firearms manufacturer, the Weissen \ + description_fluff = "The frontier's largest home-grown firearms manufacturer, the Weissen \ Company offers a range of high-quality, high-cost hunting rifles and shotguns designed with \ the wild frontier wilderness - and its wildlife - in mind. The company operates just one \ production plant in the Mytis system, but their weapons have found popularity on garden \ @@ -31,7 +31,7 @@ the same time having a rather respectable firing rate due to it's mechanism. It is very probable \ this is a replica instead of a museum piece, but rifles of this pattern still see usage as \ colonist guns in some far off regions. Uses 7.62mm rounds." - description_fluff = "The frontier’s largest home-grown firearms manufacturer, the Weissen \ + description_fluff = "The frontier's largest home-grown firearms manufacturer, the Weissen \ Company offers a range of high-quality, high-cost hunting rifles and shotguns designed with \ the wild frontier wilderness - and its wildlife - in mind. The company operates just one \ production plant in the Mytis system, but their weapons have found popularity on garden \ @@ -47,7 +47,7 @@ name = "repeater" desc = "The Weissen Company's answer to varmint shooting on frontier ranches, the T-7 Boone \ gives ranchers and farmers alike a perfect rider rifle for protecting the fenceline. Uses .357 rounds." - description_fluff = "The frontier’s largest home-grown firearms manufacturer, \ + description_fluff = "The frontier's largest home-grown firearms manufacturer, \ the Weissen Arms Company are the leading manufacturer of - not only quality - \ but affordable rifles for the average frontiersman looking to protect his \ claim. The company operates just one production plant in the Mytis system, \ @@ -67,7 +67,7 @@ name = "brushgun" desc = "Weissen Company's newest budget caravan rifle for those that want a light yet effective rifle, \ the T-10 Cassidy Uses .44 rounds." - description_fluff = "The frontier’s largest home-grown firearms manufacturer, \ + description_fluff = "The frontier's largest home-grown firearms manufacturer, \ the Weissen Arms Company are the leading manufacturer of - not only quality - \ but affordable rifles for the average frontiersman looking to protect his \ claim. The company operates just one production plant in the Mytis system, \ @@ -87,7 +87,7 @@ name = "brushgun" desc = "Weissen Company's newest budget caravan rifle for those that want a light yet effective rifle, \ the T-10 Cassidy Uses .44 rounds." - description_fluff = "The frontier’s largest home-grown firearms manufacturer, \ + description_fluff = "The frontier's largest home-grown firearms manufacturer, \ the Weissen Arms Company are the leading manufacturer of - not only quality - \ but affordable rifles for the average frontiersman looking to protect his \ claim. The company operates just one production plant in the Mytis system, \ diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index 00a53b302c..8c0709f8c7 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -9,11 +9,6 @@ // Parent type of all the various "belly" varieties. // -// # define DM_FLAG_VORESPRITE_TAIL 0x2 //CHOMPRemove -// # define DM_FLAG_VORESPRITE_MARKING 0x4 //CHOMPRemove -// # define DM_FLAG_VORESPRITE_ARTICLE 0x8 //CHOMPRemove - - /obj/belly name = "belly" // Name of this location desc = "It's a belly! You're in it!" // Flavor text description of inside sight/sound/smells/feels. diff --git a/tools/define_sanity/check.py b/tools/define_sanity/check.py index b825ee103f..fef59d28db 100644 --- a/tools/define_sanity/check.py +++ b/tools/define_sanity/check.py @@ -38,11 +38,12 @@ excluded_files = [ "code/modules/tgs/**/*.dm", ] -define_regex = re.compile(r"(\s+)?#define\s?([A-Z0-9_]+)\(?(.+)\)?") +define_regex = re.compile(r"([ \t]+)?#define\s?([A-Z0-9_]+)\(?(.+)\)?") files_to_scan = [] number_of_defines = 0 +number_of_files = 0 if not on_github: print(blue(f"Running define sanity check outside of Github Actions.\nFor assistance, a '{output_file_name}' file will be generated at the root of your directory if any errors are detected.")) @@ -67,7 +68,7 @@ located_error_tuples = [] for applicable_file in files_to_scan: with open(applicable_file, encoding="utf8") as file: - print(file.name) + number_of_files += 1 file_contents = file.read() for define in define_regex.finditer(file_contents): number_of_defines += 1 @@ -79,8 +80,8 @@ if number_of_defines == 0: print(red("No defines found! This is likely an error.")) sys.exit(1) -if number_of_defines <= 1000: - print(red(f"Only found {number_of_defines} defines! Something has likely gone wrong as the number of local defines should not be this low.")) +if number_of_defines <= 900: + print(red(f"Only found {number_of_defines} defines in {number_of_files} files! Something has likely gone wrong as the number of local defines should not be this low.")) sys.exit(1) if len(located_error_tuples): diff --git a/vorestation.dme b/vorestation.dme index 51019557e3..eae2d3c19c 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -42,6 +42,7 @@ #include "code\__defines\assert.dm" #include "code\__defines\atmos.dm" #include "code\__defines\atoms_movable.dm" +#include "code\__defines\atoms_movable_ch.dm" #include "code\__defines\belly_modes_ch.dm" #include "code\__defines\belly_modes_vr.dm" #include "code\__defines\blueprints.dm" @@ -87,6 +88,7 @@ #include "code\__defines\life.dm" #include "code\__defines\lighting.dm" #include "code\__defines\lighting_ch.dm" +#include "code\__defines\lighting_source_ch.dm" #include "code\__defines\lighting_vr.dm" #include "code\__defines\logging.dm" #include "code\__defines\lum.dm" @@ -115,8 +117,10 @@ #include "code\__defines\paicard.dm" #include "code\__defines\pda.dm" #include "code\__defines\persistence.dm" +#include "code\__defines\phobias.dm" #include "code\__defines\planets.dm" #include "code\__defines\planets_vr.dm" +#include "code\__defines\planets_yw.dm" #include "code\__defines\plants.dm" #include "code\__defines\power.dm" #include "code\__defines\preferences.dm"