2e787af654
* fix ui
* oops
* Fixes map bibby broke
* Revert "Fixes map bibby broke"
This reverts commit af1d1c610e.
* e
* Unfucks deltastation
* stuff
* cleans things after bibby
* Fix subcontroller cache
* Fixed APCs and air alarms not working when connected to a subcontroller
* bunch of fixes
* job icon
* tcomms server
Update traffic_control.dm
* make compile
* Update synthetic.dm
* Update synthetic.dm
* Update access.dm
* er
* le runtime
* Update ai_data_core.dm
* le dupe
* wall
* Update decentralized_ai.dm
* Update decentralized_ai.dm
* e
* Update wy_synths.dm
* we do a little trolling
* e
* small cahnges
* more minor changes
* Create conflict_fixer.dmm
* Create conflict_fixer - Kopi.dmm
* minor map cahnges
* broken maps
* oops
* bon
* Update ainetworkinterface.dm
* Update ainetworkinterface.dm
* Update ai.dm
* lol
* light
* fixes
* e
* Update synth_pod.dm
* e
* Update synth_os.dm
* Update objective.dm
* fixes
* Update synthetic.dm
* e
* antag
* tweaks
* e
* Update VRSleeper.js
* e
* Update synth_pod.dm
* Update synth_pod.dm
* 1
* Update synth_pod.dm
* Update synth_os.dm
* Update synthetic.dm
* fixes
* headset and ID go boom
* Update wy_synths.dm
* Update robot_parts.dm
* cremator
* Update communications.dm
* Update synthetic.dm
* no synth control
* Update synthetic.dm
* Update ai_dashboard.dm
* Update miscellaneous.dm
* Update miscellaneous.dm
* Update headset.dm
* Update damage_procs.dm
* Update server_cabinet.dm
* minor fixes
* Update miscellaneous.dm
* Update rack_creator.dm
* Update synthetic.dm
* compiles
* fixes
* brainless
* access request
* cofnlict
* fixes
* controller
* Update yogstation.dme
* Update yogstation.dme
* s
* maps
* Update NtosSynthManager.js
* unrevert this lol
* eat
* Update wy_synths.dm
* sigh
* e
* Update wy_synths.dm
* sigh
* fixed ma
* Update synthetic.dm
* better
* Update ethernet_cable.dm
* Update computer.dm
* Update computer.dm
* i hate this
* Update ai_laws.dm
* Update hardsuit.dm
* initialize
* sigh
* Update synth_os.dm
* Update master_subcontroller.dm
* Update master_subcontroller.dm
* Update synth_requester.dm
* Update synth_requester.dm
* Update room_lockdown.dm
* small fixes
* propa sprite matey
* no latejoin lol
* Update synth_os.dm
* maps fixed
* compiles
* Update brain_item.dm
* fixes
* mappers
* Update hud.dmi
* Update passworddoor.dm
* button puzzle
* mine stuff
* Update yogstation.dme
* le map
* changes
* ye
* Update abandoned_mine.dm
* Update _puzzles.dm
* bingus
* Update abandoned_mine.dm
* maps
* e
* no more quirks
* e
* DMI merge conflict resolver (from TG)
* update yogstation map
* Minor away mission changes
* forgot something
* proper fix
* donut
* maps
* asteroid
* gax
* all maps done
* Update synthetic.dm
* makes it compile
* Update backstabs.dm
* more compile!
* fix this map
* bad item
* remove broken objects
* gax
* Update ticker.dm
* pdas
* omg save the file
* Update networking_machines.dm
* area string moment
* s
* awkward
* revival
* Update ai_dashboard.dm
* fixes
* fixed floopy
* less difficult
* this is important
* Update ai_network.dm
* maps
* fixes the maps
* wHAT
* WHAT
* wet
* start fixing conflicts
* Update yogstation.dme
* start fixing map conflicts
* Update DonutStation.dmm
* updates
* donut conflicts
* update box
* Update IceMeta.dmm
* icon diffs
* Update crew.dm
* Update unsorted.dm
* Update layers.dm
* Update YogStation.dmm
* conflicts
* Update IceMeta.dmm
* will this finally fix it
* Update IceMeta.dmm
* fix all this SHIT
* what
* more shit ugh
* what!
* Update DonutStation.dmm
* Update AsteroidStation.dmm
* Update AsteroidStation.dmm
* Update dead.dm
* Update catwalk_plating.dm
* Update catwalk_plating.dm
---------
Co-authored-by: adamsong <adamsong@users.noreply.github.com>
Co-authored-by: wejengin2 <48154165+wejengin2@users.noreply.github.com>
Co-authored-by: Byemoh <baiomurang@gmail.com>
Git Integration Hooks
This folder contains installable scripts for Git hooks and merge drivers. Use of these hooks and drivers is optional and they must be installed explicitly before they take effect.
To install the current set of hooks, or update if new hooks are added, run
install.bat (Windows) or install.sh (Unix-like) as appropriate.
Hooks expect a Unix-like environment on the backend. Usually this is handled automatically by GUI tools like TortoiseGit and GitHub for Windows, but Git for Windows is an option if you prefer to use a CLI even on Windows.
Current Hooks
- Pre-commit: Runs mapmerge2 on changed maps, if any.
- DMI merger: Attempts to fix icon conflicts when performing a git merge. If it succeeds, the file is marked merged. If it fails, it logs what states are still in conflict and adds them to the .dmi file, where the desired resolution can be chosen.
Adding New Hooks
New Git hooks may be added by creating a file named <hook-name>.hook in
this directory. Git determines what hooks are available and what their names
are. The install script copies the .hook file into .git/hooks, so editing
the .hook file will require a reinstall.
New merge drivers may be added by adding a shell script named <ext>.merge
and updating .gitattributes in the root of the repository to include the line
*.<ext> merge=<ext>. The install script will set up the merge driver to point
to the .merge file directly, and editing it will not require a reinstall.
tools/hooks/python.sh may be used as a trampoline to ensure that the correct
version of Python is found.