Commit Graph

1504 Commits

Author SHA1 Message Date
Neerti
e91bb8f3b6 Merge pull request #5071 from Cameron653/patch-1
Makes coffee milkshakes STOP KILLING PEOPLE
2018-03-22 22:31:13 -04:00
Anewbe
3df290f46f Ports antibiotics overhaul (#5050)
* Ports antibiotics overhaul

* Update the rest of the places "spaceacillin" is used where antibiotics is meant.

* Antibiotics port compiles
2018-03-22 09:55:49 -07:00
Neerti
70ac478aea Merge pull request #5065 from VOREStation/vs-port-3204
[PORT] Revamp logging for consistency
2018-03-20 21:13:47 -04:00
Cameron653
36097cb31d Changes 2018-03-17 00:52:07 -04:00
Cameron653
981b768320 Makes a failsafe drink overdose proc 2018-03-16 13:35:20 -04:00
Anewbe
5212fa152b Species names should now use defines 2018-03-15 20:24:45 -05:00
Arokha Sieyes
73838e0a62 POLARIS: Revamp logging to be consistent 2018-03-13 18:20:58 -04:00
Mechoid
06eb3e5e47 Merge pull request #5018 from Anewbe/syringe
Syringe adjustments
2018-03-10 13:28:00 -08:00
Anewbe
f2da429eab Merge pull request #4980 from MisterLayne/ED_CLN
Adds the ED-CLN
2018-03-10 15:04:07 -06:00
Anewbe
7ed36f51f2 Syringe adjustments 2018-03-07 18:46:50 -06:00
MisterLayne
21c9cd0a05 fixes code, and adds changelog (hope I did it right) 2018-03-06 20:52:55 -05:00
Anewbe
2d452be603 Ingested reagents act half as quickly, rather than half as well 2018-03-05 19:40:29 -06:00
Anewbe
4efc7e7efe Merge pull request #4979 from Belsima/cube
Discourages eating monkey cubes
2018-03-01 10:32:57 -06:00
Belsima
d8b0685d25 Discourages eating monkey cubes 2018-02-27 18:19:05 -05:00
Atermonera
519754c2e8 Merge pull request #4959 from Screemonster/itsmostlywater
Makes drinking bleach bad for you
2018-02-26 12:16:13 -08:00
Screemonster
b8b173b044 Makes drinking bleach bad for you 2018-02-25 18:51:18 +00:00
Anewbe
387f977f45 Copy paste is bad, kids 2018-02-25 02:44:32 -06:00
Schnayy
8ccf0f7532 AlliCo Hallmark Goods (#4887)
* 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
2018-02-24 11:01:23 -06:00
Mechoid
39e737f2a3 Merge pull request #4846 from Anewbe/wetslime.nt
Prometheans are bothered by water
2018-02-19 20:28:26 -08:00
Anewbe
329a65be08 Merge pull request #4838 from VOREStation/pol-emerboxes
Port Bay's survival boxes
2018-02-17 10:05:39 -06:00
Arokha Sieyes
f4d0ec3fb8 Port Bay's survival boxes
Includes some tweaks to items that usually come in the boxes to make them more similar to the Bay implementation.
2018-02-16 19:21:15 -06:00
Anewbe
ab9f296adb Merge pull request #4837 from Schnayy/giftitems
Gift items + Cargo crate
2018-02-16 12:52:59 -06:00
Anewbe
b7711fa490 Prometheans are bothered by water 2018-02-15 19:11:54 -06:00
Schnayy
02447e5c19 The largest PR I've probably actually done. Adds the following:
* 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.
2018-02-15 03:33:23 -06:00
Arokha Sieyes
4a6a6d5742 Prevent infinite deuterium 2018-02-15 02:34:42 -06:00
Anewbe
b84878a5b7 Merge pull request #4806 from Cerebulon/meatbreadfix
Fixes Metaphysical Meatbread
2018-02-12 14:17:50 -06:00
PrismaticGynoid
188856be10 Makes More Machines Movable (#4801)
* Makes More Machines Movable

Adds in the ability to wrench/unwrench a number of machines that previously could not be. Now you're able to move:
Laptop venders!
Seed extractors!
Biogenerators!
Drying racks!
Microwaves!
Cooking machines!
Gibbers!
Chemmasters/Condimasters!
Bioprinters!
Virology machines!
Washing machines!
Tested with no apparent problems.

* Knew I forgot something
2018-02-12 14:01:14 -06:00
Cerebulon
521b77ae45 Fixes metaphysical meatbread 2018-02-12 06:33:26 +00:00
atermonera
05fe601430 Ethylredox removes alcohol 2018-02-07 13:17:00 -08:00
Anewbe
e565108ce7 Hyposprays and autoinjectors have a delay when used on a target that is not in help intent 2018-02-06 13:35:30 -06:00
SunnyDaise
d508af3285 Fixes:
Onion Rings are no longer named Onion Soup
2018-01-30 16:02:13 +00:00
Cyantime
154eea2a95 Fixes potato sticks 2018-01-28 23:41:00 -05:00
Cyantime
173a196212 Removes duplicate rezadone definition (#4660) 2018-01-28 18:12:32 -08:00
SunnyDaise
1f80c3336d Onions, Food and Plant Tweaks (#4629)
* Onyonyon

* Fixes Potato's and adds Changelog.
2018-01-27 16:53:54 -08:00
Cyantime
3b71498ddc Fixes potato reagentID (#4637)
* Vodka can be produced again
2018-01-27 16:52:40 -08:00
Cerebulon
8ec8b89e10 Adds a bunch of food recipes from /tg/station. (#4565)
* Adds a bunch of food from /tg/station.
With recipes adjusted for our system.
Meat Bun, Sashimi, Eggs Benedict, Baked Beans, Sugar Cookie, Berry Muffin, Booberry Muffin, Egg Roll, Fruit Salad, Egg Bowl, Pork Bowl, Tortilla, Meat Burrito, Cheese Burrito, Fuego Burrito, Nachos, Cheesy Nachos, Cuban Nachos, Pig in Blanket.
2018-01-23 19:16:30 -08:00
PrismaticGynoid
6f8559de07 Makes berry milkshakes makeable
Critical bugfix: uncapitalizes a letter which was preventing berry milkshakes from being made.
2018-01-22 20:33:53 -08:00
SunnyDaise
10490fa5b4 Food and Drink: Additions and Bugfixes (#4598)
* Food and Drink
2018-01-21 22:18:33 -08:00
Atermonera
17accf2e28 Band-aids three runtimes (#4591)
* Runtime in dna_modifier.dm,330: Cannot read null.occupant

* Runtime in Chemistry-Reagents.dm,47: Cannot execute null.remove reagent().

* Runtime in blood.dm,182: Division by zero

* Compiled with the right map this time
2018-01-20 13:28:51 -06:00
Cerebulon
a5de13cdb9 Fixes duplicate tea recipe.
Also a bunch of extremely minor drink typos.
2018-01-20 01:53:50 +00:00
Cyantime
8255744c2b Allows easier prefilling of beakers, bottles, etc (#4583)
* Allows easier prefilling of beakers, bottles, etc

* Optimization
2018-01-19 15:38:46 -06:00
Cyantime
cf1cf1e602 Changes vial max transfer amount to 30 2018-01-18 17:22:40 -05:00
Anewbe
b6bc743a95 Merge pull request #4563 from SunnyDaise/Icons-and-Small-Code
Adds Apple Juice.
2018-01-17 19:29:57 -06:00
Neerti
5b54f4c875 Surface Map Work (#4557)
* Tweaks Surface, POI system

* More Stuff

* Travis Appeasement

* Fixes invisible banner.
2018-01-17 13:46:19 -06:00
SunnyDaise
a0bd8f6915 Adds Apple Juice. 2018-01-17 07:29:40 +00:00
Mechoid
ff02218ccb Hatchets - > Machete subtype. 2018-01-12 21:21:18 -08:00
Mechoid
5efc484595 Makes knives all knives. 2018-01-12 18:02:07 -08:00
Cyantime
36f8c56537 Fixes 'varient' 2018-01-08 16:42:20 -05:00
Cameron653
afaa89ff26 Makes alcohol have effects when injected. (#4471)
* Makes alcohol have effects when injected into veins

* Makes Ethyl work on it when in bloodstream.

Should work this way.

* No nutrition
2018-01-06 00:04:49 -05:00
mistyLuminescence
c443875898 Dropper and bloodpack improvements (#4453)
*Droppers transfer fractions adding to 1

*IV packs can be relabeled
2017-12-31 11:49:20 -08:00