Commit Graph

609 Commits

Author SHA1 Message Date
Fox-McCloud
846ce475b2 Refactors Reagent Tanks--Adds High Capacity Water Tank 2017-02-05 13:58:24 -05:00
Fox-McCloud
b62cffadf8 glyphosate plantbgone change 2017-01-28 08:36:08 -05:00
Fox-McCloud
51bbe8c466 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-26 06:53:18 -05:00
Crazy Lemon
0e42e416b6 Merge pull request #6176 from Fox-McCloud/reagents-noreact-refactor
Makes Reagents Holder Process and Refactors NOREACT
2017-01-26 03:47:30 -08:00
Fox-McCloud
7007f6bbdf Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-23 01:01:09 -05:00
Fox-McCloud
dc0710135e more fixes 2017-01-23 00:53:44 -05:00
Fox-McCloud
ea76990b7a Botany Rework 2017-01-21 18:28:03 -05:00
Mieszko Jędrzejczak
1b506aaf9f Switches over to the new system 2017-01-17 13:57:07 +01:00
Fox-McCloud
ea8080e6c9 Makes Reagents Holder Process and Refactors NOREACT 2017-01-14 20:09:49 -05:00
Fox-McCloud
46887e88d8 fixes 2016-11-08 06:41:48 -05:00
Fox-McCloud
ebb59ca511 Reagent Reorganization 2016-11-03 21:27:10 -04:00
Fox-McCloud
4b81269adc reagents 2016-10-25 04:14:39 -04:00
IcyV
a015a11254 Buckets can be worn as hats
Allows for buckets to be worn as a hat. Déjà vu.

![Bucket hats picture](http://puu.sh/qZvzt/6b80809f03.png)
Sprite by FullOfSkittles

🆑 IcyV
add: Buckets can be worn as hats.
/🆑
2016-09-04 07:52:11 -07:00
Fox McCloud
4eb1aff523 Merge pull request #5551 from IcyV/BottleFixes
Makes bottles not as terrible
2016-09-03 13:24:40 -04:00
KasparoVy
6f1b3bce2f Aligns the reagent bottles as they used to be, corrects an issue with filler image and the base bottle icon_state. 2016-09-02 02:10:52 -04:00
TheDZD
f5577b4a8f add_logs() un-fuckery 2016-08-29 17:27:56 -04:00
KasparoVy
0b77f70ef0 Fixes a couple bugs, resolves some issues, re-adds a few more bottle choices. 2016-08-27 23:42:31 -04:00
KasparoVy
4481caa39b Switching to underlays. 2016-08-27 21:38:26 -04:00
IcyV
be223511b9 A few more tweaks and updates.
Most of this can be attributed to KasparoVv
2016-08-27 07:46:39 -07:00
KasparoVy
6efd9efdfe bottle filler icon handling and nanoui fixes 2016-08-27 04:02:11 -04:00
IcyV
a2af7ac8ab Makes bottles not as terrible
Previously, the brown rbottles found in chemical lockers were stuck as
brown forever. Now they actually display the chemical inside of them.

The bottles for items such as morphine or toxins that you could get from
vendors always had a specific bottle that never updated based on
chemical or volume. These have new bottles and properly work now.

![bottle images](http://puu.sh/qOWuN/d1a23bf6ed.png)

Much thanks to FullOfSkittles for the bottle sprite and KasproVv for
pretty much most of getting this worked out.

🆑 IcyV
add: Adds new bottle sprite
fix: Fixes many bottles being locked to a single icon
/🆑
2016-08-26 03:51:55 -07:00
monster860
19460ff4af Makes boldnotice and danger classes be be used 2016-08-11 12:20:02 -04:00
TheDZD
4cba2b8d07 Merge pull request #5154 from Fox-McCloud/more-reagent-stuff
More Reagent Cleanup
2016-07-26 14:24:26 -04:00
Fox-McCloud
25faa3b90a spans and \the 2016-07-22 19:07:23 -04:00
Fox-McCloud
7bfd7931b4 to avoid conflicts 2016-07-22 09:08:31 -04:00
Fox-McCloud
e4214a8181 Moves All Kitchen Stuff to Module 2016-07-22 09:02:10 -04:00
Fox-McCloud
44ffbd0667 More Reagent Cleanup 2016-07-22 05:49:45 -04:00
Fox-McCloud
a6282e0f7b go away snowflake 2016-07-21 06:54:52 -04:00
Fox-McCloud
517f294beb more tweaks 2016-07-19 23:09:34 -04:00
Fox-McCloud
0fd1c94315 oops 2016-07-19 17:58:39 -04:00
Fox-McCloud
a58c85941b More Reagent Refactoring 2016-07-19 14:06:41 -04:00
Fox-McCloud
7dccd3cedc fixes 2016-07-16 23:40:43 -04:00
Fox-McCloud
a4619fbd38 clean up 2016-07-16 23:11:32 -04:00
Fox McCloud
7c790a8b21 Merge pull request #4780 from Crazylemon64/space_ruins
Crazypilot's Space Ruins Port
2016-07-15 22:55:51 -04:00
Fox McCloud
66d7b89d9a Merge pull request #4838 from FalseIncarnate/paradise_pop
Paradise Pop
2016-07-14 23:58:24 -04:00
FalseIncarnate
0c4f898d95 more styling and gap removal
from here out, the commit names are going to get remarkably less useful
as i become more frustrated with krausus pointing things out
post-commit.
2016-07-13 22:46:43 -04:00
FalseIncarnate
7d8080e489 spacing 2016-07-13 22:26:26 -04:00
Fox McCloud
b787af15f8 Merge pull request #4934 from Chakirski/BACON!
Adds AUTHENTIC, JUICY, AMAZING BACON!
2016-07-11 21:23:41 -04:00
Chakirski
a031ebe889 Update snacks.dm 2016-07-11 20:17:30 -05:00
Chakirski
7635de3020 Sliceable cutlets are sliceable not sliceable 2016-07-10 18:22:32 -05:00
monster860
009dcaa2d8 Merge branch 'master' into w_class 2016-07-10 09:29:12 -04:00
Chakirski
8f23ac930a Revert "sync"
This reverts commit 3700a7ff8b.
2016-07-08 15:42:15 -05:00
Chakirski
3700a7ff8b sync 2016-07-08 15:33:26 -05:00
Chakirski
d432cf1239 Pink bacon 2016-07-08 14:58:46 -05:00
monster860
3df85518e1 Removes .0 at the end of w_class numbers 2016-07-08 12:26:34 -04:00
Crazylemon64
a779fc8663 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins
All hail glorious leader tigercat
2016-07-08 00:16:28 -07:00
Chakirski
f2cf93226e Amazing! 2016-07-08 00:26:37 -05:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
FalseIncarnate
496c3a7843 Paradise Pop
Adds in a new Bottler machine used to combine a set of three ingredients
into a beverage!

Adds a new line of drinks, branded Paradise Pop, to be made with the
bottler. Currently, the possible flavors are:
- Paradise Punch
- Apple-pocalypse
- Berry Banned
- Blackeye Brew
- Grape Granade
- Meteor Malt
These beverages currently have no mechanical effect, though that will be
added at a later date along with additional recipes

The bottler can dispense empty glass bottles, plastic bottles, or metal
cans as well as fill these containers with the result of a processing of
ingredients. Successful processing requires both careful selection of
ingredients AND proper ordering, or else the entire drink is rendered a
horrible and nigh-undrinkable disaster.

Used cans and bottles, both from the bottler and the vending machines,
can be reinserted for recycling even when crushed, so pick up that can!
Clown stole all your cans and bottles for his latest prank? Simply slide
in some sheets of glass, plastic, or metal to restock the machine's
reserves!

Order your Bottler today from cargo for only 35 supply points, and we'll
even throw in a free wrench to help you move it to its new home! (will
map one into the bar later)

Minor other changes:
Sugarcane and grapes received kitchen_tag values, so they may be used in
the bottler
- Also allows grapes to be properly juiced again in a blender
Water bottles from the vendors now are plastic bottles, instead of glass
2016-07-01 13:31:09 -04:00
Crazylemon64
a4fde648e7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 2016-06-24 16:03:10 -07:00