* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync
* sync part 1 - underscore folders in code
* controllers folder
* datums folder
* game folder
* cmon, work
* modules - admin to awaymissions
* cargo to events
* fields to lighting
* mapping > ruins
* rest of the code folder
* rest of the folders in the root directory
* DME
* fixes compiling errors. it compiles so it works
* readds map changes
* fixes dogborg module select
* fixes typo in moduleselect_alternate_icon filepath
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
* maps, tgui, tools
* defines and helpers
* onclick and controllers
* datums
fucking caught that hulk reversal too.
* game and shuttle modular
* module/admin
* oh god they fucking moved antag shit again
* haaaaate. Haaaaaaaaaate.
* enables moff wings
* more modules things
* tgstation.dme
before I forget something important
* some mob stuff
* s'more mob/living stuff
* some carbon stuff
* ayy lmaos and kitchen meat
* Human stuff
* species things
moff wings have a 'none' version too
* the rest of the module stuff.
* some strings
* misc
* mob icons
* some other icons.
* It compiles FUCK BORERS
FUCK BORERS
* map tweaks/shuttle engines
* helpers and defines
* global/onclick
* controllers and datums
* mapping
* game folder
* some other stuff
* some modules
* modules that aren't mobs
* some mob stuff
* new player stuff
* mob living
* silicon stuff
* simple animal things
* carbon/ayylmao
* update_icons
* carbon/human
* sounds and tools
* icons and stuff
* hippie grinder changes + tgui
* kitchen.dmi
* compile issues fixed
* mapfix
* Mapfixes 2.0
* mapedit2.0
* mapmerger pls
* Revert "mapedit2.0"
This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481.
* clean up vore folder + 2 hotfixes
* admin ticket refinement
* Blob tweaks and LAZYADD
* LAZYADD IS LAZY
* Magic strings purged
* DEFINES NEED HIGHER PRIORITIES
* Only a sleepless idiot deals in absolute TRUE|FALSE
* u h g
* progress bar fix
* reverts ticket logs
* there's always that one guy
* fixes and stuff
* 2/27 fixes
* game folder stuff
* stats
* some modules again
* clothing stuff
gets vg clothing out of the main files
* everything not mobs again
* mob stuff
* maps, tgui, sql stuff
* icons
* additional fixes and compile errors
* don't need this anymore
* Oh right this isn't needed anymore
* maint bar re-added
* that doesn't need to be here
* stupid events
* wtfeven
* probably makes Travis happy
* don't care to fix the grinder atm
* fixes vending sprites, changes turret
* lethal, not lethals
* overylays are finicky creatures
* lazy fix for bleeding edgy (#252)
* map tweaks/shuttle engines
* helpers and defines
* global/onclick
* controllers and datums
* mapping
* game folder
* some other stuff
* some modules
* modules that aren't mobs
* some mob stuff
* new player stuff
* mob living
* silicon stuff
* simple animal things
* carbon/ayylmao
* update_icons
* carbon/human
* sounds and tools
* icons and stuff
* hippie grinder changes + tgui
* kitchen.dmi
* compile issues fixed
* mapfix
* Mapfixes 2.0
* mapedit2.0
* mapmerger pls
* Revert "mapedit2.0"
This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481.
* clean up vore folder + 2 hotfixes
* admin ticket refinement
* Blob tweaks and LAZYADD
* LAZYADD IS LAZY
* Magic strings purged
* DEFINES NEED HIGHER PRIORITIES
* Only a sleepless idiot deals in absolute TRUE|FALSE
* u h g
* progress bar fix
* reverts ticket logs
* there's always that one guy
* fixes and stuff
* 2/27 fixes
* game folder stuff
* stats
* some modules again
* clothing stuff
gets vg clothing out of the main files
* everything not mobs again
* mob stuff
* maps, tgui, sql stuff
* icons
* additional fixes and compile errors
* don't need this anymore
* Oh right this isn't needed anymore
* maint bar re-added
* that doesn't need to be here
* stupid events
* wtfeven
* probably makes Travis happy
* don't care to fix the grinder atm
* fixes vending sprites, changes turret
* lethal, not lethals
* overylays are finicky creatures
* stage one
* datums and shit
* game stuff
* modules
* tgstation.dme
* tools
* these things for icons
* compiling fixes
* merge spree on TG
* other updates
* updated maps with deepfryers
* My helpers were not helping
