* Update settings
* Whitespace changes
* Comment out merger hooks in gitattributes
Corrupt maps would have to be resolved in repo before hooks could be updated
* Revert "Whitespace changes"
This reverts commit afbdd1d8442973f5d570c30920d9d865b5acd479.
* Whitespace again minus example
* Gitignore example changelog
* Restore changelog merge setting
* Keep older dmi hook attribute until hooks can be updated
* update vscode settings too
* Renormalize remaining
* Revert "Gitignore example changelog"
This reverts commit de22ad375d3ee4d5930c550da2fd23a29a86e616.
* Attempt to normalize example.yml (and another file I guess)
* Try again
Added a vending machine that stocks all desatti foods. Included in random vending machine choices.
Added rhubarb and custard sweets.
Added pork pies.
Added a sweets crate to cargo hospitality orders.
Fixed desatti jaffa cake crate having only one box instead of ten.
Added Jaffa Cakes. They can be either bought from Sol Snacks vendors in boxes of 12 or ordered from cargo for 10 boxes. They can be made in the oven, 6 at a time, with 1 orange, 10 cocoa and 15 cake batter.
Added a new redgate islands map. This consists of two Z-levels: An ocean with a few islands to visit, many with vore mobs on them. An underwater Z-level with lots of things to find hidden around the ocean floor, a little more sparse on vore mobs.
Added a new underwater turf. Standing on this turf feeds you CO2 instead of air, suffocating you. It is a subset of water turfs, and therefore interacts with aquatic, which also allows you to breathe on these turfs. This does mean that you can use the "dive" ability of aquatic under the water too, but it can be treated as though you are swimming up above the sea floor.
Added a "diving" subset of the ocean turf, which allows you to dive down to the turf beneath it, or to swim up from below. Uses normal move up/down verbs.
Added a bunch of underwater flora.
Added a collapsed ships mast prop.
Added a new variation of Fake_Sun that applies a new underwater weather effect and has only one option for the colour and brightness.
Added a new "vorny" variation of the great white carp. This one is very hard to escape from and digests quickly, but is stunned if you manage to do so to give you a chance to flee.
Added a new water resistant and friendly hiveless hivebot called Harry.
Added a couple of creative commons 0 sound effects for the ocean and underwater areas.
izac112