* 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 set of new Nukie energy drinks, each with their own reagent that causes jitters after 30u.
Also added a Nukie vending machine to find these drinks in!
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 a bunch of british snacks! Wine gums, pasties, sherbet saucers, custard creams, bourbon biscuits, sausage rolls, scotch eggs and 'shrimps and bananas'.
There is no normal way to obtain these right now, and I will add one soon. But for now I had to get them off my PC to be safe as I am moving my repository.
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 fantasy redgate map that consists of a fantasy town and a large dungeon beneath it.
Added a selection of fantasy props.
Added a variety of "magic" resprites of existing items. These are intended to be tech disguised as magic and have descriptions to hint at it, along with some papers on the map.
Added an alchemy system that creates potions in an alembic out of an ingredient and a base. If the ingredient and base match, an interesting potion is created, if they don't, a poor quality potion is created.
Added a new reagent that polymorphs the drinker into a random creature.
Added a chest version of crates.
Added wooden wall lockers.
Added random spawners for fantasy items, potions, ingredients and bases for mapping.
Added hedge and wooden fences.
Added an old fashioned resprite of the oven.
Added a cooking pot resprite of the microwave.
Added wall torches.
Added barrel version of water tanks, beer tanks, wine tanks, blood tanks and a kettle resprite of a coffee dispenser.
Added a wooden tub bath.
Added 19 new vore mobs: 2 Catslugs, 6 succubi, 1 cryptdrake, 4 vampires 5 peasants and a bat.
Adjusts some types to tidy up the mob list. Put some of the mobs that can vore under the vore tab, removed the clown mobs from /mobs_monsters because they were the only thing in there, so there wasn't really any point in hiding them a level deeper, and generally looked for subtypes that didn't have anything in them, and commented those out. Did you know that telesci is supposed to have a chance to spawn hostile mobs if you mess up? It's true! I may or may not have fixed it, I don't play telesci, but it uses a path that actually has mobs in it now.
izac112