* let's get this back on the table
* split 'em up because sorting memes
* Gets stuff code-ready, sprite work to continue
Engineering / Atmosia / Cheng
Civilian Space
Blood Red / Red and Black
Riot / Armor vests
Radiation / Fire / Atmosia Fire
Bio Suits (Viro/CMO/basic)
ERT / Deathsquad
* It's messy, but it works so w/e
* let there be more tail access
* finishes naga taur spriting
* memes
* super fixes any lingering memes
* leg experiment
* nah, this isn't gunna work.
* poked at canine again
* saving memes
* tweaks some fixes and things
* finished quad suits, added bomb suits for nagas also
* "inconsistant indentation" Byond you fuck
* Take that, byond
* The war on Byond continues
* let's make sure the explorer gear uses fancy sprites
* syndiE ??? wtf did I sleep type
* 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.
* Adds Hypospray kits, fixes reagent overlays
Also adds colors to trek chems other than PINK.
* reee admins.txt
* adds the CMO Hypo MK II kit to the CMO's locker
renames the locker overrides as well, because lazy
* grammer gud
* hypo vial fix suggested by Kfive
* Modifies hypospray functions
* Fixed the Hypospray mk.II, is now comprehensive where it must.
* Fixed bugs, including the vending machine problem.
* Either fixed or didn't fix line terminator issues.
* Turns out there were no line ending problems, rather there were literally spaces after some lines, which got removed automatically.
* Forgot a comma.
* Forgot a comma, even though it's in a comment. Good thing I caught it before somebody tried decommenting it.
* Left a line in the alternative reskin function for hypovials. This has been removed since it's unnecessary.
* delay tweaks. otherwise all good.
* reee github
* unneeded \the I thought were purged
* grammar fix, gives MDs and Chemist hypokits
* Makes chem masters able to produce vials
* recompiles tgui
* Update belt.dm
CalamaBanana