Commit Graph

921 Commits

Author SHA1 Message Date
Fox-McCloud 6b543f37ff Merge remote-tracking branch 'upstream/master' into Health-Analyzer 2015-03-24 15:53:37 -04:00
Iamgoofball e5264815ee GOONCHEM 2015-03-24 02:04:47 -07:00
Fox-McCloud b095f866df Chemistry Balance 2015-03-24 00:33:24 -04:00
SamCroswell a6f251574a Adds an observer message for vampires combusting 2015-03-23 22:20:22 -04:00
SamCroswell b1ae7d37c3 Vampire Holy Water Balancing 2015-03-23 22:14:48 -04:00
Mark van Alphen bd1e58aa0e Merge pull request #632 from SamCroswell/master
Adds Admin Boozes
2015-03-24 02:45:44 +01:00
Fox-McCloud 69bc15604d Health Analyzer Upgrading 2015-03-23 19:44:06 -04:00
Mark van Alphen f8605bd406 Merge pull request #608 from Fox-McCloud/Temporary-Fires
New Feature: Temporary Fires, Napalm Rework, and Dragon's Breath Round Fix
2015-03-23 15:38:28 +01:00
SamCroswell 02638d1a60 Adds admin boozes 2015-03-22 21:54:49 -04:00
Fox-McCloud ba28d8e5b3 Incendiary Grenade 2015-03-20 17:02:22 -04:00
FalseIncarnate 0541f7c3c8 Grape Juice
Re-adds grape juice to the game.
- Adds Grapel Juice to the vending machine.
- Get your purple cans for 20 credits.
- Adds Grape Juice to the bar's soda fountain.
- Adds the ability to juice grapes into Grape Juice.

This makes purple candies possible, and who doesn't want to fill their
cup with PURPLE DRANK.
2015-03-20 00:24:23 -04:00
Mark van Alphen 9c97c44091 Merge pull request #598 from SamCroswell/NinjaDev
Pathing Fixes
2015-03-18 22:45:59 +01:00
SamCroswell c71b4c4f26 Pathing Fixes
Fixes a pathing issue with katans and hyposprays.
2015-03-18 17:22:15 -04:00
Fox-McCloud d3faf75a4d Changes. 2015-03-17 05:27:05 -04:00
Fox-McCloud 645167b49a Explosion Tweaks and Fixes 2015-03-15 18:05:13 -04:00
FalseIncarnate 1f9c11b194 Kitchen Overhaul Fixes
Fixes all cotton candy flavors/colors utilizing the plain version's
sprite.

Fixes fixing kitchen machines (candy maker, grill, oven, microwave) with
a wrench attempting to unfasten/refasten them to the ground.  You can
only unfasten these machines if they are not broken now.
2015-03-10 01:50:30 -04:00
FalseIncarnate ae13c938c5 Kitchen Overhaul
MASSIVE overhaul to the kitchen, should make the chef job more
interesting.

Additions:
- Candy Maker!
- - This machine allows the chef to create a variety of sugary treats
for the crew to enjoy.
- Candy! Lots of candy and this is only the first wave!
- - More candy planned / dreamed for the future
- Candy Moulds
- - Craftable from plastic sheets, also available in the kitchen vendor.
Use these to make different candy types
- - These are returned if you successfully make the candy. Screw up and
the mould is destroyed!
- Cardboard Tubes are now craftable from cardboard

Changes:
- Oven and Grill have been updated to work more in line with the
Microwave and Candy Maker.
- - This means that they are also buildable and upgradeable!
- - Boards for the oven, grill, and candy maker are available from the
circuit printer.
- Many recipes moved from the microwave to the oven and grill.
- - For example, bread is made in the oven, and kabobs are made on the
grill.
- Adds "byproduct" var to recipes
- - Allows for the return of an item in addition to the result,
currently used for candy moulds

Fixes
- Adds Grape Juice reagent.
- - This will fix a runtime and also allow people to actually drink from
the purple cans.

Sprite Credits
- Many thanks to FoS for their sprites for a lot of the candies which I
combined and recolored
- - Also thanks for the new sprites which were included, but not all
used (yet!)
- I also edited and created some horrible sprites for a few candy items
and machine states.
- - Hopefully they will be such an eyesore that a real spriter steps up
and provides something nice.

This overhaul should hopefully add a little variety to the chef role,
while keeping it largely unchanged in terms of difficulty.
2015-03-08 05:09:19 -04:00
Fox-McCloud 91fd4d9683 Frost Oil Fix 2015-03-04 20:56:14 -05:00
Fox-McCloud 5cad8fe41e Merge pull request #500 from ZomgPonies/blood
Proper colored blood
2015-03-04 00:24:53 -05:00
ZomgPonies 8a575700b9 Finally got colored blood working properly 2015-03-03 13:45:46 -05:00
SamCroswell b8a9c902a1 Removes Space Ninjas 2015-03-02 19:05:44 -05:00
Fox-McCloud dcd22fe5d7 Cooooloonnnsss 2015-03-01 17:42:49 -05:00
Fox-McCloud 9235af2a3d Tweaking 2015-03-01 17:34:03 -05:00
Fox-McCloud 3bed31e08c Chemistry Cleanup and Fixes 2015-03-01 16:34:23 -05:00
Mark van Alphen 5b4c156989 Merge pull request #459 from ZomgPonies/corgi
Ports CorgiUI
2015-03-01 18:30:21 +01:00
Markolie f7426c8d72 Add bandanas, mask toggling, camo armor jacket and bugfixes 2015-02-28 17:09:45 +01:00
ZomgPonies ba2b5589e9 Ported CorgiUI 2015-02-28 10:59:14 -05:00
Markolie 20ac07de8d Bug fixes 2015-02-27 17:51:57 +01:00
Markolie e9e4437e91 Re-add nymph code 2015-02-25 22:26:38 +01:00
Markolie d9f083c39c Fix nanites 2015-02-25 22:25:22 +01:00
Markolie 5d529c8086 Plant-B-Gone now affects Diona nymphs. Dionas now heal toxin/fire damage. 2015-02-25 22:07:23 +01:00
Markolie bfe8a12f1e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/objects/items/weapons/kitchen.dm
2015-02-25 20:44:32 +01:00
Markolie 6efa3bcdaa Fix trays (now bags) 2015-02-25 20:42:43 +01:00
Markolie e1f0d0fec7 Bug fixes, add atmos watertank 2015-02-25 19:47:04 +01:00
Mark van Alphen ab98e134e1 Merge pull request #423 from ZomgPonies/master
Emergency GC fix for reagents
2015-02-25 18:18:07 +01:00
ZomgPonies 739882d6d1 Emergency GC fix for reagents 2015-02-25 12:14:18 -05:00
ZomgPonies 3e4b4d2b6a Merge pull request #406 from SamCroswell/master
ERT Rework
2015-02-25 11:43:07 -05:00
Markolie b44255d250 Bug fixes 2015-02-24 18:57:12 +01:00
SamCroswell cd7b1a4075 ERT Rework - Part One 2015-02-24 09:47:44 -05:00
Markolie 004b365110 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/modules/reagents/reagent_containers/syringes.dm
2015-02-22 22:15:45 +01:00
Markolie 672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
Fox-McCloud bea78f2432 Chemistry Tweaks 2015-02-22 15:05:15 -05:00
Markolie 72db213067 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/jobs/job/support.dm
	code/setup.dm
2015-02-22 19:12:11 +01:00
Markolie 982102a407 Standardize mutations 2015-02-22 19:04:43 +01:00
Fox-McCloud edde2d10c6 Dart and Syringegun 2015-02-21 09:54:02 -05:00
Fox-McCloud 2a1028324c Thickmaterial Flag 2015-02-21 07:26:25 -05:00
Markolie 9fedfc7c62 Switch copytext and sanitize proc 2015-02-20 22:17:13 +01:00
DZD d0d6c8eebd Merge with upstream/master
Fixes merge conflicts.
2015-02-19 19:38:48 -05:00
ZomgPonies 4be5819122 Merge pull request #339 from Fox-McCloud/Explosives
Chem Boom Nerf
2015-02-19 17:39:27 -05:00
Fox-McCloud 6ef9346af7 Flash Powder Fixup 2015-02-18 23:51:54 -05:00