Commit Graph

1486 Commits

Author SHA1 Message Date
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
mistyLuminescence
c986d57c34 Med Pill Blue Pill (#4404)
* Fixes 4412
* Rebalanced medical gear spawns
* Pill bottle code touched up
2017-12-23 14:45:24 -08:00
mistyLuminescence
9a86b05471 Grind up some more stuff! (#4423)
*More types of sheets can be ground up in a grinder
2017-12-17 13:43:10 -08:00
OrbisAnima
24ceb65752 Port: Metamorphic Glasses (#4428)
* 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
2017-12-11 00:52:20 -06:00
Mewchild
e97b301838 Take two. New drinks (#4259)
* 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
2017-12-09 16:25:06 -06:00
Verkister
cce138b094 Makes player simplemobs able to finish off snacks.
No more endless futile nibbling. Tested working fine.
2017-12-06 20:57:54 +02:00
Anewbe
d2a90fcec4 Fixes High Cap water tanks, lets drones move tanks again. 2017-12-04 17:43:57 -06:00
Neerti
af5c633cdb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/28/2017_new_blob
# Conflicts:
#	code/game/atoms_movable.dm
2017-11-29 22:43:05 -05:00
Neerti
acb208dd3f Works on New Blob 2017-11-29 22:35:01 -05:00
Neerti
2f7db506eb Adds Variable Click Delay
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.
2017-11-28 16:11:56 -05:00
Mechoid
c505b7883f Merge pull request #4329 from Anewbe/synthblood
Creates synthblood reagent, adds it to merc medic borg hyposprays
2017-11-27 16:15:35 -08:00
Anewbe
1d9af61ff0 Adds a cap to losebreath 2017-11-26 21:55:55 -06:00
mistyLuminescence
1f84c0c8ee Drinking changes 2017-11-24 00:59:45 +00:00
Anewbe
0e726d595e Removes synthblood from the surgeon borg 2017-11-23 01:46:54 -06:00
Anewbe
ec59a15bdf Creates synthblood reagent, adds it to surgeon borg hyposprays 2017-11-22 17:44:01 -06:00
Mechoid
d5404ae0eb Adds More Spiders. Touches cuff-code tangentially. 2017-11-21 12:59:06 -08:00
Anewbe
35fc43d579 Merge pull request #4112 from Woodratt/WR_10192017
High Capacity Water Tanks
2017-11-05 20:11:23 -06:00
Woodratt
114d391bb9 High Capacity Water Tanks
- Adds in code and sprites for high capacity water tanks. 5 times the volume of a regular one.
- [Edit] Uses the regular fuel tank and water tank sprites.
2017-11-04 22:41:28 -07:00
mistyLuminescence
41f332df42 fuck this pr PART TWO 2017-11-04 00:00:07 +00:00