Commit Graph

43 Commits

Author SHA1 Message Date
Aronai Sieyes
eb13ece148 Merge pull request #11356 from VOREStation/Arokha/sipp
Allows sipping proteans/prometheans
2021-08-07 21:33:48 +00:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Novacat
fa9eedd64c Merge pull request #10691 from TheFurryFeline/TFF-Pink_Russian-ise_Drink_Completion
Fix metaglass stuff
2021-06-18 21:41:38 +00:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Verkister
d8ddcb3026 Merge pull request #9224 from rboys2/clara-dev-more-drinks
Drink addons and sprites
2020-10-19 10:39:29 +00:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Atermonera
4a6d87c3a5 Merge pull request #7521 from Meghan-Rossi/metapint
Adds metamorphic pint glasses to RSF, autolathe, supply packs
2020-08-21 01:28:23 -04:00
rboys2
7de3ca1895 Update code/modules/food/drinkingglass/metaglass.dm
Co-authored-by: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
2020-08-12 13:21:30 -04:00
Riley
aacf8c9962 Pink moo drink
this took me too long, me sleepy
2020-08-12 03:32:07 -04:00
Shadowfire
b714f5cae7 goia sprite fix and metamorph drink fix
Fixed some small issues with goia taur sprites
Virgo has made the same multi dmi system as us for metamorphic glass sprites, this has broken our own original multi icon source system for the glasses and we have no choice but to delete it and use their variable. So now our own drinks shouldnt be invisible sprites!
2020-07-28 18:15:53 +02:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
SweetBlueSylveon
9640367e88 Fixes two drinks.
Correctly maps "Dumb Shroom Juice" and "Unsweetened Tea" to /ethanol.
2020-05-31 01:59:34 -07:00
Aronai Sieyes
a5de42d181 Merge pull request #8140 from SweetBlueSylveon/Drink-update
Drink update
2020-05-30 19:09:25 -04:00
SweetBlueSylveon
2c3c8e8450 Patch 2
Fixed indentations.
Removed "Icon_state" and "center_of_mass" where stated a second time.
2020-05-30 15:57:03 -07:00
SweetBlueSylveon
dcdf46212c Drink update
Adds 20 new drinks, 30 replaced sprites for old drinks, and adds 3 new sprites to drinks without one. Snow White recipe changed.
Requires"Allow reagents to have specific metaglass icon files" from Arokha.
2020-05-30 14:55:44 -07:00
Arokha Sieyes
982f523dd4 Allow reagents to have specific metaglass icon files 2020-05-30 16:58:05 -04:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Arokha Sieyes
e91418fa6d Add protean shakes 2020-05-17 00:05:01 -04:00
Aronai Sieyes
4a12194414 VS: Cached version of icon_states() proc 2020-05-06 16:06:48 -04:00
Aronai Sieyes
fa13c1089f Fix protein shaker name 2020-05-04 21:01:06 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
Novacat
65c9b4087f Merge pull request #6627 from VOREStation/aro-carafes
Adds carafes and pitchers
2020-03-01 10:52:28 -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
Shadowfire117
1ed5de2ec7 Second part of reagent porting
ported all chems of use, even the ones not produced by plants yet (they will be ported)
moved the metaglass sprite entries from metaglass to a new metaglass_ch to easy maintenance, the alt sprite code for metaglass still in original
Ported the drinks and plan on making in the future:
Bookwyrm not be straight up soporific and be something to drink without constantly going to sleep
Make high power stun without using obnoxious newbie solution I came up with a long time ago
Make the flapper and other blood drinks actually give nutrient to blood drinkers
Make Oilslide somehow be broken down and fuel synths

Ported the soy bean mutant chems and their recipes along with the recipe for blood clotting
ported all the fruit tea types, and made macha latte have large teacup metaglass sprite
ported the medical chems: Hannoa and Bullvalene
Ported Serazine made from a lavender mutant (not ported yet) and Alizine made from it acting as a tier 2 brute med.
2020-02-22 16:46:54 +01:00
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
Aronai Sieyes
55790864bd Adds carafes and pitchers
Also adds them to the bartender vendor.
2020-02-20 22:17:32 -05:00
Darlantan
0f4a6600ab Spacing
Added extra spacing in metaglass.dm
2020-02-15 04:16:48 -05:00
Nadyr
383b90e849 -Adds a metamorphic pint glass
-Adds said glass to the booze-o-mat
-Adds the icon for said glass
-Fixes metaglass icons for mojito and goldschlager
2020-02-15 03:46:46 -05:00
Novacat
4f4a29b5fc Merge pull request #6568 from VOREStation/stream
Remove use of <<
2020-02-14 09:34:12 -05:00
Atermonera
cae97cf4c0 Merge pull request #6659 from Darlantanis/MetamorphicPintGlas
Metamorphic Pint Glass
2020-02-13 00:31:59 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Atermonera
c9e3257d17 2020 Civilian Wing Overhaul 2020-02-08 13:56:05 -05:00
Schnayy
98d0b5a2bc Adds drink sprites for missing ones. Replaces lemonade to match the other -ade drinks. (#6644) 2020-01-23 23:52:12 -05:00
Anewbe
ffeb6ba7eb Merge pull request #6349 from MagmaRam/b52fix
Fixes the metamorphic glass sprite for the B-52
2019-07-28 14:00:16 -04:00
GeneriedJenelle
12df030c0a Adds Cider Bottles (#6201)
* Adds Cider

How has SS13 alcohol gone on so long without cider? Let's fix that.

* Update cartridge_presets.dm

* Update dispenser2_energy.dm

* Update dispenser_presets.dm

* Adds cider bottle sprite + adds to borgs

* Update Chemistry-Reagents-Food-Drinks.dm

* Removes additional cider entry
2019-06-18 20:05:06 -04:00
Heroman
e0d243d44f Fixes missing shaker sprite 2019-04-13 08:31:39 +10:00
Heroman
4c1bb4a4c9 Changes shakers to use initialize 2019-04-12 17:30:38 +10:00
Neerti
099ddeff20 Merge pull request #5815 from Heroman3003/eggnog
Adds eggnog drink to the game.
2019-01-12 04:29:39 -05:00
Anewbe
12e34de332 Move almost everything food related into the kitchen module. 2018-10-15 15:47:14 -04:00