Commit Graph

587 Commits

Author SHA1 Message Date
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
LittleBigKid2000
9df0329088 Fixes candy corn not having an icon (#4765) 2016-06-24 09:30:27 -04:00
tigercat2000
732c3b4ae5 Goonchat (#4744)
* bicon regex run

* Remove all \black

* Goonchat from /vg/ / Goon

Whoo!
Special thanks to @Tastyfish for the macro2html thing so all of our
horrible color macros keep working and don't fail horribly <3

* Fixes and changes n stuff

- Made ping sane again (the fuck PJ)
- Updated chat CSS
- Fixed like one problem with a color macro

* whoops

* Restore /vg/'s pingloop stuff (used to avoid fucking up is_afk)

* Strip problematic tags from tcomm scripts

- <audio>
- <video>
- <iframe>
- <script>

* Fix human examine icon

* Name hotkey elements

* Removed old stylesheet
2016-06-23 16:56:15 -04:00
TheDZD
831ab328e5 Merge pull request #4683 from Fox-McCloud/patch-tweaks
Chem Patch Tweaks
2016-06-16 10:27:14 -04:00
Fox-McCloud
4835482c53 Chem Patch Tweaks 2016-06-15 06:45:00 -04:00
Aurorablade
fe6c3e3626 is making a commit its looke like they are trying to commit... (#4657) 2016-06-13 23:02:30 -04:00
Fox McCloud
695cde670a Merge pull request #4515 from TheDZD/why-did-i-try-doing-this-again
Major Gun Refactor
2016-06-08 22:49:10 -04:00
Matt Milosevic
bc86a86ece Hopefully final 2016-06-08 18:30:26 +02:00
Fox-McCloud
6abe982844 Adds in Cafe Mocha 2016-06-02 21:21:47 -04:00
TheDZD
8dcf46bf91 Sprites & fixes 2016-05-31 22:50:57 -04:00
TheDZD
95d7a68a75 Here we go again... 2016-05-31 22:50:53 -04:00
TheDZD
db7ba34b7b Merge pull request #4479 from Fox-McCloud/snack-tweaks
Snack Tweaks to Donk Pockets
2016-05-22 18:16:26 -04:00
TheDZD
2e97cb8cd0 Merge pull request #4478 from DaveTheHeadcrab/SyringeIcons
Updates Syringe Icons
2016-05-22 16:32:47 -04:00
SamCroswell
1bf59c22ef Bows Down to Overlord DZD 2016-05-22 16:28:23 -04:00
Fox-McCloud
f93b696d4d Snack Tweaks to Donk Pockets 2016-05-20 19:35:42 -04:00
FalseIncarnate
720aba1fa5 More Fudge Flavors
Adds 4 new fudge flavors!

Peanut Fudge:
- Made with 5u milk, 5u sugar, 1 chocolate bar, and 3 peanuts

Cherry Fudge:
- Made with 5u milk, 5u sugar, 1 chocolate bar, 3 cherries

Cookies 'n' Cream Fudge:
- Made with 5u milk, 5u sugar, 5u cream, 1 chocolate bar, 1 cookie

Turtle Fudge:
- Made with 5u milk, 5u sugar, 1 chocolate bar, 1 peanut, 1 caramel

Also adjusts the standard fudge recipe
- Now 5u milk, 5u sugar, 1 chocolate bar
- Fixes #4457
- REMINDER: These use chocolate bars made via reaction, not the candy
bars you make / buy from machines
2016-05-20 14:58:29 -04:00
TheDZD
f5c35a6486 Merge pull request #4357 from Fox-McCloud/chem-stuff-disease
A Few More Disease and Reagents
2016-05-06 18:12:18 -04:00
Fox-McCloud
38278e2f58 random drugs 2016-05-05 22:50:46 -04:00
Fox-McCloud
45fc535203 A Few More Disease and Reagents 2016-05-05 00:46:04 -04:00
Fox-McCloud
d2388f98e2 Mushrooms No Longer Taste Nasty 2016-05-04 18:20:06 -04:00
Fox McCloud
c70c8d9c39 Merge pull request #4304 from Aurorablade/JustTraitorThings
Crazy Fethas Traitor Emporium of Horrors
2016-05-04 01:22:13 -04:00
Tastyfish
8cd8ebffe3 Adds missing crushed cans, make cans that are technically bottles smash. 2016-04-30 20:12:48 -04:00
Aurorablade
7e405427aa changess 2016-04-29 02:09:05 -04:00