* buncha things from upstream
* datums globals, onclick
* datums
* game folder, holy shit mirror bot why
* modules
* icons
* dme
* compiles cleanly
* tools purge
* updates maps
* double check just because. and wew lad
* incidentally, this needs more work first
* some things
* weh
* sound cleanup and icons
* reeeee
* compile issues
* oh look, fresh code sync
* cleans up some unused icons
* dirty vars
* reeeeeeeeeeeeeeee
* wew lad. fuck off with this already
* use titanium/plastitanium on unanchored reinforced fulltile window to make shuttle/plastitanium windows
* updates titanium/plastitanium sprites, adds titanium glass and plastitanium glass, fixes material amount in mineral glass
* fuck pubby
* fuck you too ceres
* ree
* this is going to be a disaster isn't it
* disaster
* dme
* -_-
* tg
* woops
* proper sync
* Welcome to conflict hell.
* lets hope this fixes more things than it breaks
* gdi
* goddamnit
* 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
