* 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.
This is very similar to the Italian Moustache, but it's a beret. This will be part of a series of language items. Happy to entertain suggestions as to whether it should be a roundstart item or randomly scattered about maint/cargo crate restricted. In the spirit of atomizing PRs, this one will just be for the French Beret.
Ready for merge.
* removes the block chance from the Roman Shield.
* replaces the Roman Shield in the autodrobe with a toy version with no block chance.
* replaces the armoured roman helmets from the autodrobe with fake ones.
* Refactors some trauma code, fixes some trauma heals not working (#36093)
* Refactors some trauma code, fixes some trauma heals not working
* that too
* fix indent
* antur comments
* Refactors some trauma code, fixes some trauma heals not working
* adds a tinfoil hat to protect you from government conspiracies and aliens
* qutoes ples
* In the sheets of my sterilized room
In your comfy bed, air-conditioned car
There are vapors and toxins to get you all
In the water you drink, in the air that you breath
In the soil under your shoe
* conspiracy phobia, nodrop on hat once equipped, also CONTRAST
* a single comma
* cyberboss changes
* |=
* central typo fix
