Commit Graph

587 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
4bcdb94a99 Merge with upstream/master
Fixes conflicts
2015-02-18 13:41:32 -05:00
DZD
fbd9c367c0 NODROP flag addition & handling
- Purges canremove
- Implements functionality for NODROP flag, replaces canremove
- Refactors mob inventory unequipping.
2015-02-18 13:22:41 -05:00
Mark van Alphen
87ed05c146 Merge pull request #326 from Artorp/AutolatheQueue
Added queue functionality to the autolathe
2015-02-18 16:16:05 +01:00
Artorp
e1eb2b9a1d Updated m_amt and g_amt to match their design 2015-02-17 18:52:31 +01:00
Markolie
f5e2d82953 (Plasma decal already fixed) - Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/machinery/atmoalter/canister.dm
2015-02-17 02:12:22 +01:00
Markolie
4d8481f83a Merge surgical borgs and crisis borgs 2015-02-16 22:47:55 +01:00
Fox-McCloud
0de7e1035c Cargo Supplies 2015-02-14 21:21:09 -05:00
DZD
b3a0c9a975 Removes TABLEPASS and FPRINT flags
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
2015-02-10 17:41:37 -05:00
DZD
4e93cc5203 Merge with upstream/maser 2015-02-09 18:22:19 -05:00
DZD
752bd825ac Cling Test, Syringe Changes, Species Edge Cases
- Syringes take 30 seconds to extract blood, 60 seconds if target is in
a hardsuit, instant if target is user.
- Slime people can no longer be lings.
- Species with NO_SCAN not affected by transform sting.
- Adds reaction between blood and welding fuel. If the blood is normal,
destroys the blood and gives a message, giving a specific message if the
blood belonged to a changeling.
2015-02-09 13:28:48 -05:00
Markolie
7285f39fc1 Defib update, cell path update 2015-02-09 16:12:01 +01:00
Fox-McCloud
0d93278247 Merge pull request #207 from FalseIncarnate/master
Botany Plant Additions
2015-01-30 16:35:37 -05:00
FalseIncarnate
5575ca217c Tea and Coffee Fixes
Fixes indentation issues preventing subtypes of coffee from inheriting
the base traits of coffee.

Adds indentation to allow Ice Tea to inherit base traits of Tea, just as
Iced Coffee does for Coffee. (standardization)

Adds Tea to the recognized list of Drinking Glass contents. Now it won't
show as a "Glass of ...What?"
2015-01-30 15:25:26 -05:00
Fox-McCloud
2b85b9b777 TG Mining Items 2015-01-30 00:23:53 -05:00
FalseIncarnate
fa2e1be750 Botany Plant Additions
> Reintroduced a number of previously removed plants:
+ Tobacco
+ Space Tobacco
+ Tea Aspera
+ Tea Astra
+ Coffee Arabica
+ Coffee Robusta
+ Moonflower
+ Novaflower
+ Koibean

> Fixed a typo preventing the mutation of Blood tomatoes into Killer
Tomatoes.
> Added an additional version of both tea and coffee powders and drinks.
> Added additional tea and coffee recipes to make and utilize the new
versions.
> Added coffee arabica, tobacco, and tea aspera seeds to seed vending
machines.
2015-01-23 02:24:06 -05:00
DZD
29d572ee23 Kitchen Food Processor Nerfs
- The cereal maker, deep fryer, and the grill can only process food
items instead of almost anything.
- Deep frying and cerealizing food add 3 nutriment from 30.
- Ice cream cones have a reagent storage volume of 50 from 300.
2015-01-10 20:14:07 -05:00
Fox-McCloud
8cec4742d0 Defib Unit 2014-12-15 04:55:02 -05:00
Fox-McCloud
fece84d974 Fixes-Tweakes 2014-12-14 03:18:10 -05:00
Fox-McCloud
4868d3795d Vox and Space 2014-12-09 03:47:46 -05:00
Fox-McCloud
261157cb58 AI, PDA, and Other changes 2014-11-26 01:18:49 -05:00
Markolie
dd70ba2030 Adds a psychiatrist's locker to the psychiatrist's locker, with a straight jacket, syringe and a pill bottle with 2x Citalopram and 2x Methylphenidate 2014-11-22 20:58:26 +01:00
Markolie
3e67587869 Allows the freezer/heater to actually be connected, minor machine fixes, janitor mop fix, drone can now clean bottles 2014-11-18 17:31:43 +01:00
Fox-McCloud
dd200af4bf Nuke Ops Rework Phase 2 2014-11-05 06:56:46 -05:00
Fox-McCloud
f77eb5c914 Traitor Gear and Balance 2014-10-28 01:35:03 -04:00
Fox-McCloud
8c1f6431e6 Tweaks and Fixes and Major Map Changed
More Info will be posted directly, later.
2014-10-13 22:00:07 -04:00
Fox-McCloud
9c8326e120 Fix, Tweak, and Revise
fixes a few non-functioning things, adds in a few new features,
basically the previous patch minus "controversial" stuff.
2014-09-29 02:10:28 -04:00
Artorp
32d14b8307 Medical belt can load into fridge
- Fixed compiling error with glass.dm

- Medical belt will load apropriate items into the medical fridge when
used on the fridge
2014-08-09 03:18:31 +02:00
Artorp
4c59644d95 Enable medical belt quick pickup
Using a medical belt on a bottle will attempt to pick up all bottles on
the tile.
2014-08-09 02:51:15 +02:00
ZomgPonies
8807058f9b Something I didnt add yet 2014-08-03 15:28:57 -04:00