Commit Graph

2035 Commits

Author SHA1 Message Date
Razgriz
715c056bb1 Remove sleeving cure 2020-01-13 18:55:11 -07:00
Razgriz
ff138d6b88 Remove sleeving cure
As part of removing resleeving sickness
2020-01-13 18:53:47 -07:00
Razgriz
de24521619 First merge from upstream 2020-01-13 17:23:01 -07:00
Hawk_v3
6dcf1520b4 Let's get this wrapped up and ready to go.
Removed all KHI references, and the Vore AI Law stuff.
2020-01-13 19:38:10 +00:00
Hawk_v3
ba05f70db6 Merge remote-tracking branch 'upstream/master' 2020-01-13 18:37:42 +00:00
Hawk_v3
20596d9787 Merge remote-tracking branch 'upstream/master' 2020-01-13 00:01:47 +00:00
Razgriz
2c56213530 Merge pull request #111 from Somememeguy/sodafoob
Drinks with Nutriment Factors
2020-01-11 04:08:49 -07:00
Razgriz
1e02f6290a Standards conformation
Searching for a full word, CHOMP or CHOMPStation, is a lot easier than searching for CS and having it return every single time in the english language where CS occurs somehow.
2020-01-11 04:08:36 -07:00
Razgriz
f3e13456e0 Standard conformation
Searching for a full word, CHOMP or CHOMPStation, is a lot easier than searching for CS and having it return every single time in the english language where CS occurs somehow.
2020-01-11 04:06:38 -07: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
Matica
537aeb72c2 Forgot One of The Drinks 2020-01-10 17:16:51 -05:00
Matica
9a52274152 Adds in CS Edit For Edits Made 2020-01-10 17:14:51 -05:00
Matica
a96df58059 Liquids with Nutriment Values
Gives nutrient values to sodas, (most) drinks that have soda in their recipe, as well as gives high nutrient values to drinks that use honey, peanut butter, or corn oil.
2020-01-09 23:12:26 -05: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
Hawk_v3
717207490a Merge remote-tracking branch 'server/master' 2020-01-06 00:00:30 +00:00
Heroman
9490261230 Adds Kitsuhanan Cure for resleeving sickness 2020-01-06 07:15:13 +10:00
RadiantFlash7
e26b48d335 Map fixes.
Reduces RCD cost per use of mattercartridges.
Readds Fancy coffeeshop sign.
Re-adds Bluespace coffee.
Fixes bluespace coffee sprite and code.
Fixes access to rad shelter on sublevel 2,
Fixes space tiles in main level window of sec outpost,
Fixes SMES names and RCON names to be the same now.
Fixes Skydiving teleporter (Updated refractored code)
Removed extra APCs, and security cameras facing the wrong way.
Tries to fix Debris field teleporters (still don't understand why theres a second destination in the shuttle console. Halp.)
Increases explorer job slots. 2 is not 'nough.
Reduces efficiency of cooling loop for TEG. (Waiting on Izac's weakened TEGS for further update)
Buffs health of freezable airlocks, so spiders won't constantly destroy them so quick.
Fixes borked up wire connecting solars to main.
Fixes incorrect facing security camera in security.
Adds status displays to escape,
changes explorer limit from 5 to 3. (what was I thinking?)
Still an improvement over 2.
2020-01-05 01:09:08 -05:00
Hawk_v3
8a0b78c322 Merge remote-tracking branch 'upstream/master' 2020-01-01 15:16:53 +00:00
Novacat
524ef9ee17 Merge pull request #6349 from Novacat/nova-basicfixes
Misc Changes and bugfixes
2019-12-31 18:39:10 -05:00
JesusChristItsJasonBourne
6a18a3e928 re-structured the re-addition of CH chems 2019-12-30 19:22:02 +10:00
JesusChristItsJasonBourne
fbfa396987 re-adds CH files for reagents
tested ingame for functionality of 4 of the chems with full sucess, including aphrodisiac and gender changing.
2019-12-30 18:51:21 +10:00
Hawk_v3
a48b6f7cb2 Merge remote-tracking branch 'upstream/master' 2019-12-29 19:01:58 +00: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
Hawk_v3
6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00: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
RadiantFlash7
c98003a013 Fixes wine vats and all errors from travis
Fixes wine vats and all errors from travis
2019-12-12 18:41:21 -05:00
Repede
3c9731879a Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map 2019-12-09 17:15:36 -05:00
Repede
0159234240 Fixes outdoor platings
Phororeagent fixes
2019-12-09 12:04:41 -05:00
Hawk_v3
5b13642c12 Merge remote-tracking branch 'upstream/master' 2019-12-08 18:15:35 +00:00
Unknown
ea4c6075b7 Fixes busted syringes 2019-12-07 10:25:28 -05:00
Repede
9c61982751 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map
# Conflicts:
#	code/game/machinery/vending_yw.dm
#	icons/vore/custom_clothes_yw.dmi
#	vorestation.dme
2019-11-29 19:13:53 -05:00
Hawk_v3
a5c7909ed7 Merge remote-tracking branch 'upstream/master' 2019-11-17 12:42:55 +00: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
Hawk_v3
f976948ce3 Merge remote-tracking branch 'upstream/master' 2019-11-07 19:54:10 +00: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
Hawk_v3
3c8cd11eac Reupdated Station 1 map 2019-10-24 21:57:58 +01:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00