* Supply Drop POI
* Ration Cache
* BlastMine1
* Supply Drop 2
* Tweaks, package bomb detonators can be re-used
* Changelog
* Missed some spots while cherry-picking
* Merge branch master (I hope this works)
* Appeases travis
* Missed a spot
* adds rolling paper and joints
F O U R T W E N T Y B L A Z E I T
* adds joint sprites
(they're pretty bad though)
* adds rolling paper box, adds papers to cig vendors
* c h a n g e l o g
smoke
weed
every
day
* Adds: flamenco dress, bustle dress, cowboy duster, sheriff badge, tiny cowboy hat. To be added: 2 pairs of cowboy boots, stick horse.
* Adds 2 cowboy boots and a stick horse. yeehaw.
* Attempting to squash conflict that was caused by one of my OWN prs. For shame.
* attempting to fix conflict ft. anewbe
Firstly it fixes a long-standing bugs with constructable flooring not actually populating on server startup, but instead through a proc that's only called on existing floor tiles.
Second it changes sif wood tiles into a child of wood tiles now that the reason for carpet colors not working is known & fixed.
* Adds the gift vendor, AlliCo Hallmark Goods, ran the name by Elgeon beforehand. Is a delightfully gaudy vending machine placed in the locker rooms. The coffee machine was removed and the sweatmax moved to take it's place so the gift vendor is next to the laptop and cigarette vendors. Prices were based off of the SweatMax vendor.
Before: https://i.gyazo.com/0d6758fc8a469fea6e340b5937b95f82.png
After: https://i.gyazo.com/ab21b6ff7ed012786d475b71f1ec180e.png
Vendor will normally dispense:
- Heart box chocolates
- Bouquets
- Cheaper fake bouquets
- Each of the 4 cards previously added.
- All the therapy dolls.
Will dispense the following with a coin:
- All small plushies
- Newly added trinket box.
Will dispense the following when hacked:
- Gilthari Luxury Champagne
- Plans to add a handbuzzer in the future but not right now.
Items & Reagents added:
- Champagne. Is not a mixable reagent, listed as a child of wine.
- Gilthari Luxury Champagne. Contains said reagent.
- Trinket box. Think an engagement ring box, except it can also hold coins and medals. May be toggled open/closed, when opened it's description will say what's inside. Can only hold one item. Thanks to Mechoid for helping me code this mess. https://i.gyazo.com/7a16faada015ef0795a4db2ec6429e68.png
- Also goes in and fixes a small bug with the heart box saying it contains donuts when it does, in fact, not contain donuts.
Side note, mapping things in is scary!!!
* In the process of fixing the map merger nonsense w/ mechoid's help.
* We're almost there lads.
* If this doesn't work I'll cry.
* Changes name to AlliCo Baubles and Confectioneries, fixes conflict (hopefully), and adds friendship bracelets to vendor.
* REVERTING ITEMS.DMI. Attempting to fix conflict.
* Recommitting items.dmi
* One last attempt to fix the conflict before I make some bigger changes to get this through.
* Removed conflicting file and committed out calls on the sprite. Will readd in separate PR.
* now with 20% less silly
Synths start with a unique empty type rather than just an unnamed cardboard box, and don't get a tank or the comprehensive supplies (the only useful thing would be the glowstick, but there are a billion of those).
* Makes GPS units more useful, adds helper to give more useful dir strings
* Re-obfuscates PoI gps locations
They keep adir direction though, so finding them should generally be easier
* Re-obfuscates PoI gps locations
Atermonera
