Commit Graph

2262 Commits

Author SHA1 Message Date
Shadowfire117
7c9d46a199 Drink reagent port
Ported drinks, added recipes, changed "Sit on my face" (please do) to use the peanutbutter already in codebase.
Made a system so reagents can have their metaglass sprite file be custom and the metaglass will change its own icon pathway dynamically.
Made the old commented out nutbutter cartridge be replaced with a peanutbutter cartridge
2020-02-22 12:19:44 +01: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
Razgriz
aafc858b30 Merge pull request #235 from Shadowfire117/Fluidvorebellies
Liquid vore bellies!
2020-02-19 01:28:34 -07:00
Heroman
a1081d8012 Adds biochemical dispenser to medical's chemistry 2020-02-19 16:07:59 +10:00
Nadyr
8fd3b260da Merge pull request #218 from Shadowfire117/Casinoport
Casino port!
2020-02-17 22:59:14 -05:00
Shadowfire
71b3c11df7 Liquid vore bellies!
After a week of non-stop work on coding this its finally here! Churn your friends into different liquids in your vore bellies, make some over time using nutrition, empty into containers, into other vore bellies or stomach, even into other people as well! You can write custom messages for every belly for people to see if you want them to, so this vore addition works well for not only vore, but also for inflation and other 'kinky' things, bottoms can take advantage of this as well to show off 'donation's from your tops!

It works for anything that has a vorepanel, so synths and borgs can also join in on the fun! (Not an expert on those folks, so sorry if there are some bugs when I made it to include them :c)

I plan on making on the second phase of this poject (wont start now, I need break and feedback x.x):

Allow people to set transfer verbs and custom names for liquids when they are transfered, sorry, there wont be actual custom fluids, thats not something that can really be done easily if at all!
Toggle for belly noises when walking around, so the more full people are the more often and clearly sloshing and such is heard
More reagents! Do give tell what you would like, of course meds and absurd chems will be a no!
Certain races/synths/borgs will be able to select additional liquids they can already produce in non-vore way!
Potential round persistency of liquids! This will only be the fullness of belly, not the content, since this can be abused to transfer powergaming reagents across shifts! So selected reagent of belly will be what the belly contains
Adjust how quick and slow the rate of liquid production can be
Possible custom messages to replace normal vore messages when at certain intervals of fullness, like prey splashing in fluids, folks seeing struggle messages with bulges appearing on liquid filled belly
Puddles! Puddles which name and color are based on fluid spilled on floor! Will also mean transfer will get a choice to dump onto floor

Finally I wanna thank Jon for a lot of code help, and Aronai to get the few final kinks worked out!
2020-02-16 12:40:29 +01:00
Erik
11268a3ff4 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into MyUpstreamMerge 2020-02-13 20:36:32 -08:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Repede
9a249b9138 Merge branch 'master' into promwaterchemreagentreadd 2020-02-10 08:28:27 -05:00
SplinterGP
b0fa26eb99 readds promethean damage izac forgot to add
would make in grey but organization yey
2020-02-10 01:52:47 -03:00
SplinterGP
674f5d3617 Adds ywedit
title
2020-02-09 23:41:38 -03:00
SplinterGP
090938cd06 Makes grey don't take damage from sulphuric acid
greys won't take damage from sacid
2020-02-09 23:34:01 -03:00
Shadowfire
e141872c31 Casino port
This is first phase of casino port where I have made my casino spaceship compatible with new chomp codebase. There isnt a connecting port at station yet due to changes being made to main map, but with second phase of casino port there should be one for casino shuttle to move back and forth to transfer visitors.

Non-casino changes
Port of:
purple assistant cap, wah!
wiggler hat, dont know if the sprite works fully yet.
The monocoole, every self respecting technomancer needs this! Also need this for casino rewards.
Snaps, can recommend for lunch, I prefer the licorice flavoured ones!
Space cleaner dispenser, yep any janitors dream, so far its only on casino spaceship.
Ported old modular sofa for station usage, is already on casino, future plans could involve making the modular sofa that can be built from steel be a little more pretty and made from wood as well and also get another overlay/color when added cloth for cushion.

also deleting a .txt file that I didnt get to delete before someone really wanted me to upload wip files so they could work off them, sorry about that but its fixed now!
deleted alienwhitelist and custom_items.txt since github doesnt seem to have those blacklisted

casino port:
Ported the map with the golden goose spacecasino
ported the deluxe edition bar and kitchen gear! Say hello to the good old deluxe dispenser, deluxe food vendor and deluxe drink vendor, perhaps one day they will be constructible by crew!
ported the casino stripper pole, casino roulette, slotmachine, poker/blackjack table, ported the casino wheel of fortune
casino wallet~
casino jukebox! And re implemented the system so the casino songs no longer are on the normal jukebox, sorry folks, hope you didnt like them too much :c
casino visitor and staff manual, might need a bit of revision depending on what event managers wants
Casino chips, gotta gamble with something!
fixed runtime errors from deluxe dispenser trying to add cartridges with reagents that have been renamed on new chomp

Be aware, there will be more casino changes in near future along with some other non-casino changes, including porting of pint metamorphic glass.
2020-02-08 22:21:59 +01:00
Shadowfire
57464baadc port 0.9.9.9
just uploading so others can see work, still not ready for commitment
2020-02-08 01:11:36 +01:00
izac112
933385020f Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved
2020-01-31 18:23:50 +01:00
Shadow
7e831fc9f1 Covfefe 2020-01-25 20:09:13 -06: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
Matica
52c9802c1f Makes it so soda metabolizes faster
Soda metabolizes faster as, with it's current speed, it isn't doing anything.
2020-01-20 17:00:23 -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
Ketrai
8095e02124 woops 2020-01-14 19:23:50 +01:00
Ketrai
b88a7351e2 Update Chemistry-Reagents-Food-Drinks_vr.dm 2020-01-14 19:12:45 +01:00
Ketrai
b979bdf5b4 Update Chemistry-Reagents-Food-Drinks_vr.dm 2020-01-14 19:08:42 +01:00
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