Commit Graph

316 Commits

Author SHA1 Message Date
MistakeNot4892
b22a0568a3 Sideports a couple of init unit tests from Neb. (#7893)
* Sideports a couple of init unit tests from Neb.

* Trying to unfuck initialize logic.

* Removing del()s.

* Adjusting return values to Initialize().

* Moving some dangerous object logic from obj onto the two types that use it.

* Rolling back some init changes and commenting out initialized atom unit test.

* this comment formatting is a minor war crime

* Removed sleep() from signaler circuit Initialize().

* Additional Init fixes post-rebase.

* Uncomments subsystem test since that's passing.
2021-02-21 12:03:34 -09:00
MistakeNot4892
a1a77f8a35 Removes a dangling carbon/slime path. 2021-02-18 22:36:46 +11:00
Verkister
90784c3f29 Fixes drinks having uncontrollable transfer amount
You can now set transfer amount on drink containers.
2021-02-15 02:28:05 +02:00
Cerebulon
5064cdbc41 Un-inverted oven messages, reagent-add code unborked 2021-02-01 03:28:10 +00:00
Cerebulon
dc41d2141d typo 2021-02-01 00:44:24 +00:00
Cerebulon
c5c97ff177 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into foodreview 2021-01-29 10:56:06 +00:00
Cerebulon
aa22ef3ef7 Every Food Fix 2021-01-29 10:46:10 +00:00
Cerebulon
3aedcc62a8 Renamed a meme + cinnamon bun sprite. (#7840)
* Filth + Graffiti Fixes

* Gigpuddied

* death to changes
2021-01-25 17:27:09 -08:00
H0lySquirr3l
77b0412acd Update snacks.dm 2021-01-10 15:48:45 -06:00
H0lySquirr3l
4daa8ab0a4 Update recipes_microwave.dm 2021-01-10 15:48:42 -06:00
Mechoid
2018d76cae Department and Round Goals (#7369)
* Baseline work for Department Goals. Implements round-end stats, based in 3 categories of roughly-more-interesting to less interesting.

* Active Goal Separation.

* Map.

* Actually does the second half of this in this PR instead of a different one.
2020-12-11 15:16:47 -09:00
Silver
e2773216c9 Porting Food Additions
Adds the Following Foods:
Gigapuddi
Happy Gigapuddi
Angry Gigapuddi
Omurice
Heart Omurice
Face Omurice
Suppermatter
Suppermatter Slice
Exciting Suppermatter
Exciting Suppermatter Slice
Cinnamon Bun

Also adds the following Festive Foods:
Buche de Noel
Turkey

Comment:
Not sure why, but I attempted to have Buche De Noel and Turkey as Oven recipes, but it was producing baked items rather than the intended recipe. It all tests out fine locally, as is, though.

All of the foods besides the Cinnamon Bun (which is original) are ported from /vg/station,  with minor modifications (missing Living Puddi code and some recipe alterations to make them play nice with existing ones), per their license.
2020-11-14 05:20:37 -06:00
Atermonera
f2c5078ad3 Merge pull request #7701 from Mechoid/Frostbelle
Adds the Frostbelle
2020-11-07 12:20:23 -08:00
Mechoid
68b370be8a Fresh Meat, Leatherworking (#7629)
* Make Butchering more modular. Don't tell the demon lords.

* No guts no glory. That was far more work than expected to get organs to just process and work for butchering holy shit.

* Chitin and hides oh my.

* squeak. ..Why did this not fire on local?

* Squelch.

* Seven cubed livers, for the doctors in their sterile halls.

* Changeling

* Prep for Datums

* Fix Broken Broken Guns

* Redundancy

* F l a g s
2020-11-07 12:06:35 -08:00
Meghan-Rossi
c8dd5f48e3 Makes the recipe dump take catalysts into account (#7732)
Makes the recipe dump provide information on catalysts needed for food and drink recipes.
2020-10-17 03:13:39 -07:00
Meghan-Rossi
2fd390cbdb Makes the recipe dump take coatings into account (#7723)
Makes the recipe dump provide information on coatings needed for food recipes.
2020-10-16 23:10:25 -07:00
Meghan-Rossi
151bafc768 fix infinite ratburgers (#7711)
fixes https://github.com/PolarisSS13/Polaris/issues/7709 (mice used in mouse burgers not being used up)
2020-10-16 23:05:13 -07:00
Mechoid
f513d884d0 Adds the Frostbelle to the game! Spawns rarely within the forest zones. 2020-09-28 16:07:31 -07:00
Mechoid
b371a42622 Berry 2020-09-23 21:04:40 -07:00
Cerebulon
0815a554c6 Tweaks to pickup/equip sounds. (#7651) 2020-09-20 03:56:41 -07:00
Atermonera
6bd15bc200 Merge pull request #7625 from ShadowLarkens/tgui_med
TGUI Medical Conversion
2020-09-19 18:52:23 -07:00
Mechoid
f518a31458 Hydro upkeep (#7475)
* Start work on Hydro upkeep.

* Fix Cyborg interactions with kitchen tools.

* Add Wurmwoad to the vendors.

* Map

* changeling
2020-09-16 16:38:43 -07:00
listerla
138bfcb303 carot -> carrot (#7612) 2020-09-05 06:27:48 -07:00
ShadowLarkens
44f65e2602 TGUI Medical Conversion 2020-09-04 16:25:32 -07:00
Cerebulon
811cd0b47e Vendor enhancement fixes (#7577)
* Vendor enhancement fixes

* skrellsnax trash, tuna name
2020-08-29 23:47:17 -07:00
Atermonera
3a554b776f Merge pull request #7575 from lbnesquik/Kot-Beer-IS-FOR-MEN
Make it so beer bottles are filled. No longer get scammed!
2020-08-27 18:30:42 -07:00
Atermonera
6d4d5d6efd Merge pull request #7571 from listerla/nomoresitemanager
Colony Director -> Site Manager
2020-08-27 17:41:52 -07:00
Atermonera
a7e1d20511 Merge pull request #7550 from Khloross/cookingfix
Fix combinination_cook() creating items with no reagents
2020-08-27 16:45:40 -07:00
Atermonera
4bf64e6b2a Merge pull request #7459 from Rykka-Stormheart/shep-dev-sound-overhaul
Massive Ambience and Sound Overhaul + Addition
2020-08-27 16:23:38 -07:00
lbnesquik
1974f6c84c Make it so beer bottles are filled. No longer get scammed! 2020-08-26 19:13:13 +02:00
Killian
8c1ef13113 ChewMAX Bar Fix (#7540)
* Update robotics.dm

* Update scanner.dm

* Update snacks.dm
2020-08-26 00:48:34 -07:00
listerla
d56974cb92 Colony Director -> Site Manager 2020-08-25 20:12:29 -04:00
Khloross
05cca83212 Replace trans_to with equivalent trans_to_holder call 2020-08-23 00:24:18 -04:00
Rykka
0c7a7fd2b8 Massive Ambience and Sound Overhaul + Addition, Squashed Commit Edition 2020-08-21 06:53:05 -04:00
Atermonera
a2c373c2b1 Merge pull request #7521 from Meghan-Rossi/metapint
Adds metamorphic pint glasses to RSF, autolathe, supply packs
2020-08-20 22:26:51 -07:00
Atermonera
2cbbb10521 Merge pull request #7518 from Meghan-Rossi/borgcookfix
Fix cyborgs not being able to cook
2020-08-20 22:24:03 -07:00
Atermonera
4a56ad2191 Merge pull request #7449 from Cerebulon/vendEnhance
Flavour Enhancement: Vending
2020-08-20 18:23:54 -07:00
Meghan-Rossi
369de519d4 Adds metamorphic pint glasses to RSF, autolathe, glass boxes, supplies
*The rapid service fabricator (found on service borgs) can now produce metamorphic pint glasses.
*The party supplies and bar supplies crates orderable from cargo now contain metamorphic pint glasses.
*The autolathe can now produce metamorphic pint and half-pint glasses.
*The autolathe can now produce all drinking glasses in batches of 5 or 10.
2020-08-19 19:52:56 +01:00
Meghan-Rossi
1d8a623972 Fix cyborgs not being able to cook
*Cyborgs can now put oven dishes in the oven with their grippers
*Cyborgs can now put things into oven dishes with their grippers
2020-08-17 04:31:18 +01:00
Atermonera
fa4025cc5c Merge pull request #7447 from Cyantime/patch-3
Gives NOREACT flag back to fixed microwaves
2020-08-12 11:22:42 -07:00
Cerebulon
cbce774745 typos, lighters, trash 2020-08-10 01:27:30 +01:00
Cerebulon
65add03407 chlog 2020-08-09 05:46:36 +01:00
Cerebulon
0f146f3349 Flavour Enhancement: Vending 2020-08-09 05:05:43 +01:00
Atermonera
864135b032 Merge pull request #7425 from lbnesquik/Kot-Cooking-tweak
Tweak to kitchen machinery:
2020-08-08 20:53:30 -07:00
Cyantime
f56b9c8532 Gives NOREACT flag to fixed microwaves 2020-08-08 17:52:10 -04:00
Rykka Stormheart
99357d2c12 Aurora Cooking Pre-heating bugfix (#7432)
Appliances previously had 60k resist and 30k resist, for fryer and oven respectively.

This meant that fryer would heat up in 62 minutes and oven would heat in 35-45. Obviously completely out of wack.

Now grill heats in at 6:50, fryer at 10:35, and oven at 12:10 to reach peak/cap temperatures!
2020-08-06 21:19:15 -07:00
lbnesquik
728699f1f7 Tweak to kitchen machinery:
- Add some extra indications to the new cooking machinery for how you use it
- Tad of feedback for the grinder and oven.
2020-08-04 21:45:20 +02:00
Rykka
af8d981a7b Critical Bugfix to Aurora Cooking not working with Reagents
Any recipes that had reagents involved in them would fail, because of a SINGLE MISPLACED ).

I spent two hours looking for this, I feel dumb as shit, but this should fix the recipe issues on live.
2020-08-03 16:48:24 -04:00
Rykka
484cfba507 Icon Updates!
* Adds new sprites for all kitchen appliances, from Aurora
* Adds new pre-heating light for Fryer, lined up with the spot for it
* Adds new grill rack sprites
* Updates multiple food sprites to no longer be downscaled PNGs, and gives us gloriously pretty waffles and brownies.
2020-07-31 03:28:44 -04:00
Rykka Stormheart
5ecd6d9895 Critical Priority Fix for Cooking! (#7399)
Check your indents. An if should be inside the for loop, not level with it!

(Hint, I was the dumbass)
2020-07-30 22:01:25 -07:00