Commit Graph

2562 Commits

Author SHA1 Message Date
Novacat 7031f896b9 Merge pull request #6606 from Heroman3003/biochem
Adds biochemical dispenser to medical's chemistry
2020-02-25 10:50:00 -05:00
Atermonera c1fe64ba6a Merge pull request #6717 from LeighKnapenberger/master
Fixes Mint Apple Sparkle having a recipe, but no drink
2020-02-24 16:00:57 -05:00
Atermonera 11eed81b92 Ports precision placement of items 2020-02-22 02:35:41 -05:00
Arokha Sieyes 1d9e5be122 Replace \image macro with bicon() 2020-02-19 19:55:01 -05:00
Heroman a1081d8012 Adds biochemical dispenser to medical's chemistry 2020-02-19 16:07:59 +10:00
Arokha Sieyes 47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Novacat 1688d86772 Merge pull request #6478 from VOREStation/upstream-merge-6621
[MIRROR] Moar descriptions for things
2020-01-21 01:33:06 -05:00
Novacat 5cac43ef0e Merge pull request #6480 from VOREStation/upstream-merge-6628
[MIRROR] Adds a mega cooking recipe
2020-01-21 01:26:48 -05:00
Atermonera d10a72a77f Adds a mega cooking recipe 2020-01-20 23:15:01 -05:00
Atermonera 5954adfe46 Merge pull request #6622 from Mechoid/WaterResistanceExists
Water resistance exists
2020-01-20 22:51:52 -05:00
Atermonera 9b93339969 Moar descriptions for things 2020-01-20 22:50:39 -05:00
Atermonera 7ae5204eaf Merge pull request #6619 from Shadow-Quill/Chem-Master-Building
Can now (de)construct chem masters
2020-01-15 23:16:19 -05:00
drexample 5e01ad45a5 coding standards are my passion 2020-01-11 06:59:33 +03:00
drexample 1be4fe8b3c hooh 2020-01-11 06:42:54 +03:00
Novacat 4f6a7972d6 Merge pull request #6404 from Ketrai/iwantdie
adds food cubes.
2020-01-09 22:51:32 -05:00
Heroman3003 5f05d26eb9 Merge branch 'master' into resleeving_sickness 2020-01-10 09:43:42 +10:00
Heroman a9c1f48a93 Adds a single cure pill to vault, doubles amount ERT gets, changes taste 2020-01-10 09:31:51 +10:00
Heroman c693bf558d Does virgo-side of xenoflora expansion 2020-01-09 08:30:42 +10:00
Novacat 09e10e2901 Merge pull request #6406 from VOREStation/upstream-merge-6592
[MIRROR] Xenoflora expansion take2
2020-01-08 17:18:49 -05:00
Ketrai 85667c2a9b adds gnomes. (#6595)
* adds gnomes

* Makes the house nice and bright.

* copypasta error

* Odd

* makes gnomes adminspawn only.

Co-authored-by: KitKetKetrai <49008286+KitKetKetrai@users.noreply.github.com>
2020-01-08 13:47:41 -05:00
Mechoid ec5e851399 Xenoflora expansion take2 2020-01-08 13:46:25 -05:00
Ketrai 9112a9a2b6 Food cubes
woop


removes a line of unneeded code
2020-01-07 22:51:12 +01:00
Heroman 2b10027024 Makes the sickness affect only people dying via non-vore deaths, adds fluff version with no downsides 2020-01-07 17:02:39 +10:00
Heroman 9490261230 Adds Kitsuhanan Cure for resleeving sickness 2020-01-06 07:15:13 +10:00
Novacat 524ef9ee17 Merge pull request #6349 from Novacat/nova-basicfixes
Misc Changes and bugfixes
2019-12-31 18:39:10 -05:00
Atermonera 45b4947d1e Merge pull request #6584 from TheFurryFeline/TFF-Print_Da_Sprayers
Printable Spray Bottles
2019-12-25 18:10:16 -05:00
Cerebulon 183b1d99b1 Coffee Shop Revamp 2019-12-22 22:54:01 -05:00
Unknown 2d81426a5a Juice no longer affects Unathi 2019-12-22 13:21:20 -05:00
PrismaticGynoid 41d2af1dcb Drink fix (#6564)
Fixes the Sex On The Beach drink being unable to be made by slightly altering the recipe - it's now made using the virgin version of the drink first, to prevent it from being interfered with by the Screwdriver recipe.
2019-12-13 20:37:03 -05:00
Unknown ea4c6075b7 Fixes busted syringes 2019-12-07 10:25:28 -05:00
Meghan-Rossi 03c82caa71 Makes Monster Tamer give nutrition
Seems to have been intended anyway but wasn't working because the nutriment factor was zero.  Made it work similar to protein since it's made with protein
2019-11-16 14:35:38 +00:00
Novacat dcd5900f83 Update Chemistry-Reagents-Food-Drinks.dm 2019-11-10 22:04:40 -05:00
Anewbe c9abdaabe9 Stop protein's affect_ingest calling nutriment's affect_ingest twice 2019-11-10 21:49:51 -05:00
Mechoid e1fa847bc2 Xenowork Prep For Future (#6491)
* Xenowork, weeds walls and material blobs.

* More weeds

* XenoUpdoots

* Stop that, me.
2019-11-04 21:38:02 -05:00
Mechoid 169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Novacat 369b9a0914 Merge pull request #6039 from Screemonster/chimeratweaks
chimera examinetext
2019-10-07 15:51:18 -04:00
Screemonster 513f59ea92 chimera examinetext 2019-10-06 20:14:26 +01:00
Atermonera 89aad128cf Blind port of Bay Radiation Subsystem 2019-10-06 03:30:36 -04:00
Unknown fdca4f7554 Master Runtime Fix 2019-10-01 03:09:58 -04:00
Heroman 31d459f230 Fixes Blood-Onator 2019-09-14 15:01:58 +10:00
Unknown 0d73c8ad76 Early Polaris Ports
Ports Polaris PRs 6424, 6426, 6428, 6430, 6431, 6432, 6433, and 6434

No vorestation edit markings because they are polariscode ports.
2019-08-30 23:55:58 -04:00
Unknown 14eb525030 Adjusts Vorestation pills and pillbottles 2019-08-28 04:06:19 -04:00
Novacat 775d175b11 Merge pull request #5682 from VOREStation/upstream-merge-6358
[MIRROR] Exploration Expansion 1: Or, How I Learned To Love The Tree
2019-08-21 18:02:59 -04:00
Atermonera 8f067fe785 Chemistry Expansion 2019-08-21 17:43:01 -04:00
Mechoid ae48659a68 Exploration Expansion 1: Or, How I Learned To Love The Tree 2019-08-21 17:23:07 -04:00
Novacat dd7a7842ed Merge pull request #5567 from Novacat/nova-survival
Adds Prototype Hypospray
2019-08-12 13:15:35 -04:00
Atermonera 0469a309cc Adds NOCONDUCT to Some Items 2019-08-08 16:07:50 -04:00
Novacat 8e321b3725 Update hypospray.dm 2019-08-06 22:10:50 -04:00
Unknown d7406088b5 Test 2019-08-06 21:07:40 -04:00
Unknown b5824871ed Removes unnecessary check 2019-08-06 21:05:51 -04:00