Repository navigation
Resolve whole-fork modularization findings - #481
Merged
Merged
Conversation
…zation # Conflicts: # tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferences/index.tsx # tgui/packages/tgui/styles/main.scss
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Master's modularization check still finds 503 problems across the fork. Some are Voidcrew code written inside tg files. The rest are Voidcrew edits to tg files whose
VOIDCREW EDITmarkers are missing, unpaired or in the wrong place. This clears all of them, so the check now passes on the whole fork, not only on new changes. It also fixes the ship data siphon's window, which could not open. Nothing else changes in play.What changes
Voidcrew code moved out of tg files. Standalone Voidcrew procs, overrides, variables and constants that were still written inside tg files now live in new files under
voidcrew/. The tg files keep only the calls and values that have to stay there.Fork files moved out of tg folders.
voidcrew/modules/.voidcrew/modules/unit_tests/._maps/map_files/voidcrew/to_maps/voidcrew/planets/.tgui/packages/voidcrew_tgui/. The modular ship setup panel of the shuttle manipulator becomes its ownModularShipConfigcomponent.Markers on the hooks that stay. Tg files that keep a Voidcrew hook get their missing markers added and their unpaired START/END markers fixed. Markers that sat inside multi-line macros move outside them.
Fixed. The ship data siphon's window was in a folder the interface loader never searches, so the console could not open it. It now sits with the other Voidcrew interfaces.
Why it's good for the game
Voidcrew code in its own folders, with every remaining hook marked, keeps tg merges small and makes fork changes easy to find. With the whole fork clean, the modularization check flags only new problems.
Upstream tg files touched (309)
code/__DEFINES/admin.dmcode/__DEFINES/dcs/signals/signals_atom/signals_atom_movement.dmcode/__DEFINES/explosions.dmcode/__DEFINES/reagents.dmcode/__DEFINES/tgs.dmcode/__DEFINES/wiremod.dmcode/__HELPERS/_lists.dmcode/__HELPERS/areas.dmcode/__HELPERS/logging/attack.dmcode/__HELPERS/logging/mob.dmcode/__HELPERS/paths/jps.dmcode/__HELPERS/priority_announce.dmcode/__HELPERS/radiation.dmcode/__HELPERS/shuttle.dmcode/_globalvars/logging.dmcode/_onclick/click.dmcode/_onclick/hud/alert.dmcode/_onclick/hud/blob_overmind.dmcode/_onclick/hud/hud.dmcode/_onclick/hud/human.dmcode/_onclick/hud/new_player.dmcode/_onclick/hud/parallax/parallax.dmcode/_onclick/hud/rendering/plane_master_group.dmcode/_onclick/hud/rendering/plane_masters/_plane_master.dmcode/_onclick/hud/rendering/render_plate.dmcode/_onclick/hud/screen_objects.dmcode/_onclick/hud/screentip.dmcode/_onclick/observer.dmcode/_onclick/other_mobs.dmcode/controllers/configuration/entries/game_options.dmcode/controllers/subsystem/air.dmcode/controllers/subsystem/area_contents.dmcode/controllers/subsystem/atoms.dmcode/controllers/subsystem/explosions.dmcode/controllers/subsystem/job.dmcode/controllers/subsystem/lighting.dmcode/controllers/subsystem/mapping.dmcode/controllers/subsystem/minor_mapping.dmcode/controllers/subsystem/networks/research.dmcode/controllers/subsystem/pathfinder.dmcode/controllers/subsystem/radiation.dmcode/controllers/subsystem/shuttle.dmcode/controllers/subsystem/statpanel.dmcode/controllers/subsystem/ticker.dmcode/controllers/subsystem/tts.dmcode/controllers/subsystem/weather.dmcode/datums/actions/mobs/charge.dmcode/datums/alarm.dmcode/datums/components/chasm.dmcode/datums/components/crafting/crafting.dmcode/datums/components/irradiated.dmcode/datums/components/orbiter.dmcode/datums/components/overlay_lighting.dmcode/datums/components/singularity.dmcode/datums/components/spawner.dmcode/datums/components/tether.dmcode/datums/elements/decals/_decal.dmcode/datums/elements/turf_transparency.dmcode/datums/elements/weather_listener.dmcode/datums/helper_datums/teleport.dmcode/datums/mapgen/biomes/_biome.dmcode/datums/mapgen/CaveGenerator.dmcode/datums/materials/basemats.dmcode/datums/mind/_mind.dmcode/datums/records/record.dmcode/datums/screentips/atom_context.dmcode/datums/shuttles/_shuttle.dmcode/datums/station_alert.dmcode/datums/storage/storage.dmcode/datums/storage/subtypes/others/bag_of_holding.dmcode/datums/weather/weather.dmcode/datums/weather/weather_types/ash_storm.dmcode/datums/weather/weather_types/floor_is_lava.dmcode/datums/weather/weather_types/rain_storm.dmcode/datums/weather/weather_types/sand_storm.dmcode/datums/weather/weather_types/snow_storm.dmcode/game/area/areas.dmcode/game/atom/_atom.dmcode/game/atom/atom_defense.dmcode/game/machinery/computer/apc_control.dmcode/game/machinery/computer/atmos_alert.dmcode/game/machinery/computer/camera.dmcode/game/machinery/computer/communications.dmcode/game/machinery/computer/crew.dmcode/game/machinery/doors/airlock.dmcode/game/machinery/doors/airlock_electronics.dmcode/game/machinery/doors/firedoor.dmcode/game/machinery/doors/windowdoor.dmcode/game/machinery/embedded_controller/airlock_controller.dmcode/game/machinery/status_display.dmcode/game/movable_luminosity.dmcode/game/objects/effects/decals/crayon.dmcode/game/objects/items.dmcode/game/objects/items/devices/scanners/gas_analyzer.dmcode/game/objects/items/devices/scanners/t_scanner.dmcode/game/objects/items/rcd/RCD.dmcode/game/objects/items/rcd/RHD.dmcode/game/objects/items/rcd/RPD.dmcode/game/objects/items/stacks/medical.dmcode/game/objects/items/stacks/stack.dmcode/game/objects/items/tanks/tanks.dmcode/game/objects/items/tools/painter/decal_painter.dmcode/game/objects/obj_defense.dmcode/game/objects/structures/crates_lockers/closets.dmcode/game/objects/structures/grille.dmcode/game/objects/structures/lattice.dmcode/game/objects/structures/lavaland/ore_vent.dmcode/game/objects/structures/mystery_box.dmcode/game/objects/structures/shower.dmcode/game/objects/structures/tables_racks.dmcode/game/objects/structures/window.dmcode/game/shuttle_engines.dmcode/game/sound/sound.dmcode/game/turfs/change_turf.dmcode/game/turfs/closed/minerals.dmcode/game/turfs/closed/wall/misc_walls.dmcode/game/turfs/closed/wall/reinf_walls.dmcode/game/turfs/closed/walls.dmcode/game/turfs/open/_open.dmcode/game/turfs/open/floor.dmcode/game/turfs/open/floor/fancy_floor.dmcode/game/turfs/open/grass.dmcode/game/turfs/open/river.dmcode/game/turfs/open/space/space.dmcode/game/turfs/open/space/transit.dmcode/modules/admin/admin_fax_panel.dmcode/modules/admin/verbs/adminpm.dmcode/modules/antagonists/abductor/equipment/glands/heal.dmcode/modules/antagonists/heretic/magic/rust_construction.dmcode/modules/asset_cache/assets/rcd.dmcode/modules/atmospherics/environmental/LINDA_fire.dmcode/modules/atmospherics/environmental/LINDA_system.dmcode/modules/atmospherics/environmental/LINDA_turf_tile.dmcode/modules/atmospherics/machinery/atmosmachinery.dmcode/modules/atmospherics/machinery/components/components_base.dmcode/modules/atmospherics/machinery/components/unary_devices/machine_connector.dmcode/modules/atmospherics/machinery/datum_pipeline.dmcode/modules/atmospherics/machinery/pipes/pipes.dmcode/modules/atmospherics/machinery/portable/scrubber.dmcode/modules/awaymissions/signpost.dmcode/modules/bitrunning/areas.dmcode/modules/bitrunning/server/map_handling.dmcode/modules/bitrunning/server/obj_generation.dmcode/modules/bitrunning/server/signal_handlers.dmcode/modules/bitrunning/server/util.dmcode/modules/bitrunning/util/virtual_megafauna.dmcode/modules/bitrunning/virtual_domain/domains/ash_drake.dmcode/modules/bitrunning/virtual_domain/domains/blood_drunk_miner.dmcode/modules/bitrunning/virtual_domain/domains/bubblegum.dmcode/modules/bitrunning/virtual_domain/domains/colossus.dmcode/modules/bitrunning/virtual_domain/domains/hierophant.dmcode/modules/bitrunning/virtual_domain/domains/psyker_zombies.dmcode/modules/bitrunning/virtual_domain/domains/wendigo.dmcode/modules/cargo/exports/large_objects.dmcode/modules/cargo/exports/manifest.dmcode/modules/cargo/exports/materials.dmcode/modules/cargo/exports/sheets.dmcode/modules/cargo/materials_market.dmcode/modules/cargo/order.dmcode/modules/cargo/packs/_packs.dmcode/modules/client/preferences.dmcode/modules/client/preferences/screentips.dmcode/modules/client/preferences_savefile.dmcode/modules/client/verbs/ooc.dmcode/modules/clothing/clothing.dmcode/modules/clothing/glasses/engine_goggles.dmcode/modules/clothing/head/hardhat.dmcode/modules/clothing/head/hat.dmcode/modules/clothing/suits/utility.dmcode/modules/error_handler/error_handler.dmcode/modules/error_handler/error_viewer.dmcode/modules/events/wormholes.dmcode/modules/experisci/experiment/handlers/experiment_handler.dmcode/modules/experisci/experiment/physical_experiments.dmcode/modules/experisci/experiment/types/scanning.dmcode/modules/experisci/experiment/types/scanning_fish.dmcode/modules/fishing/sources/_fish_source.dmcode/modules/food_and_drinks/machinery/smartfridge.dmcode/modules/jobs/job_types/_job.dmcode/modules/jobs/job_types/ai.dmcode/modules/jobs/job_types/prisoner.dmcode/modules/library/bibles.dmcode/modules/lighting/lighting_object.dmcode/modules/lighting/lighting_turf.dmcode/modules/loadout/loadout_menu.dmcode/modules/logging/log_holder.dmcode/modules/lootpanel/_lootpanel.dmcode/modules/lootpanel/contents.dmcode/modules/mapping/map_template.dmcode/modules/mapping/mapping_helpers.dmcode/modules/mapping/reader.dmcode/modules/mapping/ruins.dmcode/modules/mapping/space_management/space_reservation.dmcode/modules/mining/aux_base.dmcode/modules/mining/fulton.dmcode/modules/mining/lavaland/mining_loot/megafauna/legion.dmcode/modules/mining/machine_redemption.dmcode/modules/mining/machine_silo.dmcode/modules/mining/ores_coins.dmcode/modules/mob/dead/new_player/new_player.dmcode/modules/mob/dead/observer/observer.dmcode/modules/mob/living/basic/lavaland/legion/legion.dmcode/modules/mob/living/basic/lavaland/legion/spawn_legions.dmcode/modules/mob/living/basic/tree.dmcode/modules/mob/living/basic/trooper/pirate.dmcode/modules/mob/living/basic/trooper/trooper.dmcode/modules/mob/living/carbon/human/species_types/golems.dmcode/modules/mob/living/carbon/inventory.dmcode/modules/mob/living/carbon/life.dmcode/modules/mob/living/living.dmcode/modules/mob/living/login.dmcode/modules/mob/living/silicon/ai/ai.dmcode/modules/mob/living/silicon/ai/ai_say.dmcode/modules/mob/living/silicon/ai/robot_control.dmcode/modules/mob/living/silicon/robot/robot.dmcode/modules/mob/living/simple_animal/hostile/hostile.dmcode/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dmcode/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dmcode/modules/mob/living/simple_animal/simple_animal.dmcode/modules/mob/mob.dmcode/modules/mod/mod_activation.dmcode/modules/mod/mod_theme.dmcode/modules/mod/modules/modules_supply.dmcode/modules/mod/modules/modules_visor.dmcode/modules/modular_computers/file_system/programs/budgetordering.dmcode/modules/modular_computers/file_system/programs/radar.dmcode/modules/modular_computers/file_system/programs/secureye.dmcode/modules/modular_computers/file_system/programs/sm_monitor.dmcode/modules/power/cable.dmcode/modules/power/singularity/dark_matter_singularity.dmcode/modules/power/singularity/emitter.dmcode/modules/power/singularity/reality_tear.dmcode/modules/power/singularity/singularity.dmcode/modules/power/smes.dmcode/modules/power/tesla/energy_ball.dmcode/modules/power/turbine/turbine.dmcode/modules/projectiles/gun.dmcode/modules/reagents/chemistry/equilibrium.dmcode/modules/reagents/chemistry/holder/holder.dmcode/modules/reagents/chemistry/holder/reactions.dmcode/modules/reagents/chemistry/machinery/chem_heater.dmcode/modules/reagents/chemistry/reagents/food_reagents.dmcode/modules/reagents/chemistry/reagents/reaction_agents_reagents.dmcode/modules/reagents/reagent_containers.dmcode/modules/reagents/reagent_containers/dropper.dmcode/modules/reagents/reagent_containers/hypospray.dmcode/modules/research/designs.dmcode/modules/research/designs/autolathe/security_designs.dmcode/modules/research/designs/comp_board_designs.dmcode/modules/research/designs/machine_designs.dmcode/modules/research/destructive_analyzer.dmcode/modules/research/machinery/_production.dmcode/modules/research/part_replacer.dmcode/modules/research/techweb/_techweb_node.dmcode/modules/research/techweb/nodes/medbay_nodes.dmcode/modules/research/techweb/nodes/mining_nodes.dmcode/modules/research/techweb/nodes/service_nodes.dmcode/modules/security_levels/keycard_authentication.dmcode/modules/shuttle/mobile_port/mobile_port.dmcode/modules/shuttle/mobile_port/shuttle_move.dmcode/modules/shuttle/mobile_port/shuttle_move_callbacks.dmcode/modules/shuttle/mobile_port/variants/custom/custom_consoles.dmcode/modules/shuttle/shuttle.dmcode/modules/shuttle/shuttle_consoles/navigation_computer.dmcode/modules/shuttle/stationary_port/port_types.dmcode/modules/shuttle/stationary_port/stationary_port.dmcode/modules/spells/spell_types/jaunt/bloodcrawl.dmcode/modules/spells/spell_types/jaunt/ethereal_jaunt.dmcode/modules/spells/spell_types/tower_of_babel.dmcode/modules/surgery/experimental_dissection.dmcode/modules/surgery/healing.dmcode/modules/surgery/organs/internal/heart/heart_anomalock.dmcode/modules/surgery/surgery.dmcode/modules/surgery/surgery_step.dmcode/modules/unit_tests/_unit_tests.dmcode/modules/unit_tests/designs.dmcode/modules/unit_tests/missing_icons.dmcode/modules/unit_tests/operating_table.dmcode/modules/unit_tests/simple_animal_freeze.dmcode/modules/unit_tests/spell_jaunt.dmcode/modules/unit_tests/spell_shapeshift.dmcode/modules/vehicles/mecha/mech_fabricator.dmcode/modules/wiremod/components/ntnet/ntnet_receive.dmcode/modules/wiremod/components/ntnet/ntnet_send.dmcode/modules/wiremod/components/ntnet/ntnet_send_literal.dmcode/modules/wiremod/components/utility/nfc_receive.dmcode/modules/wiremod/components/utility/nfc_send_literal.dmcode/modules/wiremod/core/component.dmcode/modules/wiremod/core/integrated_circuit.dmcode/modules/wiremod/core/port.dmcode/modules/wiremod/dcs_components/component_add_port.dmtgstation.dmetgui/packages/tgui/drag.tstgui/packages/tgui/interfaces/BankMachine.tsxtgui/packages/tgui/interfaces/CameraConsole.tsxtgui/packages/tgui/interfaces/ChemHeater.tsxtgui/packages/tgui/interfaces/CommunicationsConsole/Main.tsxtgui/packages/tgui/interfaces/CommunicationsConsole/types.tstgui/packages/tgui/interfaces/NtosSkillTracker.jsxtgui/packages/tgui/interfaces/OreSilo.tsxtgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferences/index.tsxtgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferences/loadout/ItemDisplay.tsxtgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferences/MainPage.tsxtgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/index.tstgui/packages/tgui/interfaces/PreferencesMenu/types.tstgui/packages/tgui/interfaces/ShuttleManipulator.jsxtgui/packages/tgui/interfaces/StripMenu.tsxtgui/packages/tgui/interfaces/Techweb/nodes/TechNode.tsxtgui/packages/tgui/layouts/Window.tsxChangelog
🆑
fix: The ship data siphon's control window opens.
/:cl: