* 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
* Bouquets
* Fake Bouquets. Can be won from arcade machines.
* Heart box chocolates containing a set arrangement of chocolates.
* Adds said chocolates (milk chocolate, white chocolate, and truffles) all bite-sized.
* Adds 5 cards, one blank and four with covers. Function identical to paper except you can't make an airplane because I hate fun.
* Adds The four cards with covers, 3 real bouquets, and 2 chocolate boxes to cargo under a 'gift crate' for 10 points.
Sprites by me. Code would not be possible without cerebul's help. Let me know if I've goofed on something, but I did test all of the items + ordering them from cargo.
# Conflicts:
# code/modules/mob/mob.dm - Whitespace? No real conflict.
# code/modules/mob/mob_planes.dm - Comment conflict, was a late port to Polaris.
* Update our reagent_containers to use the new "prefill" feature instead of our own PolarisSS13/Polaris/pull/4583
* Fix missing VOREStation Edit comments.
* Prevent singularity from entering dorm areas.
* Port: Metamorphic Glasses
Basically, this just adds the old style glasses to the code without
removing anything.
https://imgur.com/eeqjW7c
Glasses can be found in the bar vendor, or can be ordered with the
bar/party supplies like any other glasses.
* Port: Metamorphic Glasses - Fix
Removed the relative path. Tested
* Adds new drinks
Adds many new drinks. Adds bitters, a staple for mixing.
* Fixes errors.
Also shut up travis :c
* Fixes Bitters/Buracao conflict
Makes it so that bitters require water and more enzyme, to avoid a
conflict with Blue Curacao
* Bitters use mint instead of orange
A more elegant solution to my last
* Removes duplicate
Rotgut was defined twice.
* Another duplicate
Mojito got defined twice.
* Adds Cold Front
Cold Front - 1 Iced Coffee, 1 Whiskey, 1 Mint. Lowers body temperature
by a severe amount. (Functionally the opposite of antifreeze)
* Fixes spacing issues
Changes Four Space to Tab indent
* Requested changes
Makes new milkshakes children of milkshake
Lowers Named Bullet slime jelly to 0.25u, down from 2u
Fixes a mismatch in amounts on the mint julep
* Fixed undefined drinks
Defines Mint Julep and Love potion
Now certain weapons can strike faster or slower than usual. No weapons currently do this as this PR just lays the groundwork for that.
The click delay can also be modified with traits. The slime agility modifier makes attacks happen 25% sooner.
Adds debug test verb to display a weapon's DPS. It's really basic but should be sufficient for future force adjustments I might do in the future.
